* [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock @ 2013-02-28 7:43 Prashant Gaikwad 2013-02-28 7:43 ` [PATCH 2/2] clk: Tegra: Remove duplicate " Prashant Gaikwad 2013-02-28 18:18 ` [PATCH 1/2] ARM: Tegra: Add clock entry for " Stephen Warren 0 siblings, 2 replies; 7+ messages in thread From: Prashant Gaikwad @ 2013-02-28 7:43 UTC (permalink / raw) To: linux-arm-kernel As DT support for clocks and smp_twd is enabled, add clock entry for smp_twd clock to DT. Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia•com> --- arch/arm/boot/dts/tegra20.dtsi | 1 + arch/arm/boot/dts/tegra30.dtsi | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 9a42893..48d00a0 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi @@ -118,6 +118,7 @@ compatible = "arm,cortex-a9-twd-timer"; reg = <0x50040600 0x20>; interrupts = <1 13 0x304>; + clocks = <&tegra_car 132>; }; intc: interrupt-controller { diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index 767803e..9d87a3f 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -119,6 +119,7 @@ compatible = "arm,cortex-a9-twd-timer"; reg = <0x50040600 0x20>; interrupts = <1 13 0xf04>; + clocks = <&tegra_car 214>; }; intc: interrupt-controller { -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] clk: Tegra: Remove duplicate smp_twd clock 2013-02-28 7:43 [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock Prashant Gaikwad @ 2013-02-28 7:43 ` Prashant Gaikwad 2013-02-28 18:18 ` [PATCH 1/2] ARM: Tegra: Add clock entry for " Stephen Warren 1 sibling, 0 replies; 7+ messages in thread From: Prashant Gaikwad @ 2013-02-28 7:43 UTC (permalink / raw) To: linux-arm-kernel Remove duplicate smp_twd clocks as these clocks are accessed using DT now. Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia•com> --- drivers/clk/tegra/clk-tegra20.c | 1 - drivers/clk/tegra/clk-tegra30.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/drivers/clk/tegra/clk-tegra20.c b/drivers/clk/tegra/clk-tegra20.c index 143ce1f..1e2de73 100644 --- a/drivers/clk/tegra/clk-tegra20.c +++ b/drivers/clk/tegra/clk-tegra20.c @@ -1292,7 +1292,6 @@ static struct tegra_clk_duplicate tegra_clk_duplicates[] = { TEGRA_CLK_DUPLICATE(usbd, "tegra-ehci.0", NULL), TEGRA_CLK_DUPLICATE(usbd, "tegra-otg", NULL), TEGRA_CLK_DUPLICATE(cclk, NULL, "cpu"), - TEGRA_CLK_DUPLICATE(twd, "smp_twd", NULL), TEGRA_CLK_DUPLICATE(clk_max, NULL, NULL), /* Must be the last entry */ }; diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c index 32c61cb..ba6f51b 100644 --- a/drivers/clk/tegra/clk-tegra30.c +++ b/drivers/clk/tegra/clk-tegra30.c @@ -1931,7 +1931,6 @@ static struct tegra_clk_duplicate tegra_clk_duplicates[] = { TEGRA_CLK_DUPLICATE(cml1, "tegra_sata_cml", NULL), TEGRA_CLK_DUPLICATE(cml0, "tegra_pcie", "cml"), TEGRA_CLK_DUPLICATE(pciex, "tegra_pcie", "pciex"), - TEGRA_CLK_DUPLICATE(twd, "smp_twd", NULL), TEGRA_CLK_DUPLICATE(vcp, "nvavp", "vcp"), TEGRA_CLK_DUPLICATE(clk_max, NULL, NULL), /* MUST be the last entry */ }; -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock 2013-02-28 7:43 [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock Prashant Gaikwad 2013-02-28 7:43 ` [PATCH 2/2] clk: Tegra: Remove duplicate " Prashant Gaikwad @ 2013-02-28 18:18 ` Stephen Warren 2013-02-28 20:04 ` Thierry Reding 1 sibling, 1 reply; 7+ messages in thread From: Stephen Warren @ 2013-02-28 18:18 UTC (permalink / raw) To: linux-arm-kernel On 02/28/2013 12:43 AM, Prashant Gaikwad wrote: > As DT support for clocks and smp_twd is enabled, add clock entry > for smp_twd clock to DT. Is this a cleanup for 3.10, or a bug-fix for 3.9? Perhaps it solves the "twd: clock not found" bug I reported? ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock 2013-02-28 18:18 ` [PATCH 1/2] ARM: Tegra: Add clock entry for " Stephen Warren @ 2013-02-28 20:04 ` Thierry Reding 2013-03-01 18:25 ` Stephen Warren 0 siblings, 1 reply; 7+ messages in thread From: Thierry Reding @ 2013-02-28 20:04 UTC (permalink / raw) To: linux-arm-kernel On Thu, Feb 28, 2013 at 11:18:01AM -0700, Stephen Warren wrote: > On 02/28/2013 12:43 AM, Prashant Gaikwad wrote: > > As DT support for clocks and smp_twd is enabled, add clock entry > > for smp_twd clock to DT. > > Is this a cleanup for 3.10, or a bug-fix for 3.9? Perhaps it solves the > "twd: clock not found" bug I reported? Yes. This is pretty much identical to the patch I sent a few days ago before your patch that fixed the clock drivers to match the devicetree binding documentation. The "clock not found" is exactly what this fixes. Thierry -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130228/6b14cd82/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock 2013-02-28 20:04 ` Thierry Reding @ 2013-03-01 18:25 ` Stephen Warren 0 siblings, 0 replies; 7+ messages in thread From: Stephen Warren @ 2013-03-01 18:25 UTC (permalink / raw) To: linux-arm-kernel On 02/28/2013 01:04 PM, Thierry Reding wrote: > On Thu, Feb 28, 2013 at 11:18:01AM -0700, Stephen Warren wrote: >> On 02/28/2013 12:43 AM, Prashant Gaikwad wrote: >>> As DT support for clocks and smp_twd is enabled, add clock >>> entry for smp_twd clock to DT. >> >> Is this a cleanup for 3.10, or a bug-fix for 3.9? Perhaps it >> solves the "twd: clock not found" bug I reported? > > Yes. This is pretty much identical to the patch I sent a few days > ago before your patch that fixed the clock drivers to match the > devicetree binding documentation. > > The "clock not found" is exactly what this fixes. OK. I'll forward these patches to arm-soc as fixes for 3.9 then. I tested them and they work for me, on top of Linus' latest master. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock @ 2013-03-01 18:32 Stephen Warren 2013-03-01 21:07 ` Olof Johansson 0 siblings, 1 reply; 7+ messages in thread From: Stephen Warren @ 2013-03-01 18:32 UTC (permalink / raw) To: linux-arm-kernel From: Prashant Gaikwad <pgaikwad@nvidia•com> As DT support for clocks and smp_twd is enabled, add clock entry for smp_twd clock to DT. This fixes the following error while booting the kernel: smp_twd: clock not found -2 Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia•com> [swarren: include kernel log spew that this fixes] Signed-off-by: Stephen Warren <swarren@nvidia•com> --- Arnd, Olof, these are fixes intended for 3.9. arch/arm/boot/dts/tegra20.dtsi | 1 + arch/arm/boot/dts/tegra30.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 9a42893..48d00a0 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi @@ -118,6 +118,7 @@ compatible = "arm,cortex-a9-twd-timer"; reg = <0x50040600 0x20>; interrupts = <1 13 0x304>; + clocks = <&tegra_car 132>; }; intc: interrupt-controller { diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index 767803e..9d87a3f 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -119,6 +119,7 @@ compatible = "arm,cortex-a9-twd-timer"; reg = <0x50040600 0x20>; interrupts = <1 13 0xf04>; + clocks = <&tegra_car 214>; }; intc: interrupt-controller { -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock 2013-03-01 18:32 Stephen Warren @ 2013-03-01 21:07 ` Olof Johansson 0 siblings, 0 replies; 7+ messages in thread From: Olof Johansson @ 2013-03-01 21:07 UTC (permalink / raw) To: linux-arm-kernel On Fri, Mar 01, 2013 at 11:32:24AM -0700, Stephen Warren wrote: > From: Prashant Gaikwad <pgaikwad@nvidia•com> > > As DT support for clocks and smp_twd is enabled, add clock entry > for smp_twd clock to DT. > > This fixes the following error while booting the kernel: > smp_twd: clock not found -2 > > Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia•com> > [swarren: include kernel log spew that this fixes] > Signed-off-by: Stephen Warren <swarren@nvidia•com> > --- > Arnd, Olof, these are fixes intended for 3.9. Thanks, applied 1-2 to fixes. -Olof ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-03-01 21:07 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-02-28 7:43 [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock Prashant Gaikwad 2013-02-28 7:43 ` [PATCH 2/2] clk: Tegra: Remove duplicate " Prashant Gaikwad 2013-02-28 18:18 ` [PATCH 1/2] ARM: Tegra: Add clock entry for " Stephen Warren 2013-02-28 20:04 ` Thierry Reding 2013-03-01 18:25 ` Stephen Warren -- strict thread matches above, loose matches on Subject: below -- 2013-03-01 18:32 Stephen Warren 2013-03-01 21:07 ` Olof Johansson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox