ARM: Tegra: Add clock entry for smp_twd clock
Prashant Gaikwad
maintainerPATCH 1/2 ARM: Tegra: Add clock entry for smp_twd clock
As DT support for clocks and smp_twd is enabled, add clock entry for smp_twd clock to DT.
--- arch/arm/boot/dts/tegra20.dtsi | 1 + arch/arm/boot/dts/tegra30.dtsi | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/boot/dts/tegra20.dtsi +1 -0
@@ -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
@@ -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.4.1
Prashant Gaikwad
maintainerPATCH 2/2 clk: Tegra: Remove duplicate smp_twd clock
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, 0 insertions(+), 2 deletions(-)
drivers/clk/tegra/clk-tegra20.c +0 -1
@@ -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
@@ -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.4.1
PATCH 1/2 ARM: Tegra: Add clock entry for smp_twd clock
In reply to Prashant GaikwadQuoted 2 lines · Prashant Gaikwad
As DT support for clocks and
smp_twdis enabled, add clock entry forsmp_twdclock 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?
PATCH 1/2 ARM: Tegra: Add clock entry for smp_twd clock
Quoted 6 lines · Stephen Warren
Quoted 2 lines · Prashant Gaikwad
As DT support for clocks and
smp_twdis enabled, add clock entry forsmp_twdclock 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>
PATCH 1/2 ARM: Tegra: Add clock entry for smp_twd clock
Quoted 5 lines · Thierry Reding
Quoted 4 lines · Stephen Warren
Quoted 2 lines · Prashant Gaikwad
As DT support for clocks and
smp_twdis enabled, add clock entry forsmp_twdclock to DT.
Quoted 8 lines
Quoted 2 lines
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.