[PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock

[PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock

[Prashant Gaikwad]

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-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 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

[PATCH 2/2] clk: Tegra: Remove duplicate smp_twd clock

[Prashant Gaikwad]

Remove duplicate smp_twd clocks as these clocks are accessed using
DT now.

Signed-off-by: Prashant Gaikwad <pgaikwad-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 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

Re: [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock

[Stephen Warren]

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?

Re: [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock

[Stephen Warren]

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.

[PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock

[Stephen Warren]

From: Prashant Gaikwad <pgaikwad-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

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-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
[swarren: include kernel log spew that this fixes]
Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
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

Re: [PATCH 1/2] ARM: Tegra: Add clock entry for smp_twd clock

[Olof Johansson]

On Fri, Mar 01, 2013 at 11:32:24AM -0700, Stephen Warren wrote:
> From: Prashant Gaikwad <pgaikwad-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> 
> 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-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> [swarren: include kernel log spew that this fixes]
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---
> Arnd, Olof, these are fixes intended for 3.9.

Thanks, applied 1-2 to fixes.


-Olof