Skip to contentSkip to conversation

ARM: Tegra: Add clock entry for smp_twd clock

PATCH New Stephen Warren 2 participants 3 messages Mar 1, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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

From: Prashant Gaikwad <[email protected]>

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

[swarren: include kernel log spew that this fixes]

---
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(+)
arch/arm/boot/dts/tegra20.dtsi +1 -0
index 9a42893..48d00a0 100644
@@ -118,6 +118,7 @@
 		compatible = "arm,cortex-a9-twd-timer";
 		reg = <0x50040600 0x20>;
 		interrupts = <1 13 0x304>;
+		clocks = <&tegra_car 132>;
 	};
 
 	intc: interrupt-controller {
arch/arm/boot/dts/tegra30.dtsi +1 -0
index 767803e..9d87a3f 100644
@@ -119,6 +119,7 @@
 		compatible = "arm,cortex-a9-twd-timer";
 		reg = <0x50040600 0x20>;
 		interrupts = <1 13 0xf04>;
+		clocks = <&tegra_car 214>;
 	};
 
 	intc: interrupt-controller {
Signature · 1 line
1.7.10.4
#1 lore raw

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

From: Prashant Gaikwad <[email protected]>

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

---
 drivers/clk/tegra/clk-tegra20.c |    1 -
 drivers/clk/tegra/clk-tegra30.c |    1 -
 2 files changed, 2 deletions(-)
drivers/clk/tegra/clk-tegra20.c +0 -1
index 143ce1f..1e2de73 100644
@@ -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 */
 };
 
drivers/clk/tegra/clk-tegra30.c +0 -1
index 32c61cb..ba6f51b 100644
@@ -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 */
 };
Signature · 1 line
1.7.10.4
#2 lore raw

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

In reply to Stephen Warren
Quoted 5 lines · Stephen Warren

From: Prashant Gaikwad <[email protected]>

As DT support for clocks and smp_twd is enabled, add clock entry for smp_twd clock to DT.

Quoted 8 lines

This fixes the following error while booting the kernel:
smp_twd: clock not found -2

[swarren: include kernel log spew that this fixes]

---
Arnd, Olof, these are fixes intended for 3.9.

Thanks, applied 1-2 to fixes.

-Olof