diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:52:43 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:52:43 +0200 |
| commit | f8da810cbb823c9781d703319ac4303568008fae (patch) | |
| tree | 03b33a2e85f0cfc2547749aa28acf4630f6989ac /arch/arm/boot/dts/tegra20.dtsi | |
| parent | Merge tag 'mxs-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 int... (diff) | |
| parent | clk: tegra: fix enum tegra114_clk to match binding (diff) | |
| download | linux-f8da810cbb823c9781d703319ac4303568008fae.tar.xz linux-f8da810cbb823c9781d703319ac4303568008fae.zip | |
Merge branch 'tegra/clk' into next/dt2
This is a dependency for the tegra/dt branch.
Conflicts:
drivers/clocksource/tegra20_timer.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/tegra20.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 3d3f64d2111a..fc7febc2b386 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi @@ -145,6 +145,7 @@ 0 1 0x04 0 41 0x04 0 42 0x04>; + clocks = <&tegra_car 5>; }; tegra_car: clock { @@ -304,6 +305,7 @@ compatible = "nvidia,tegra20-rtc"; reg = <0x7000e000 0x100>; interrupts = <0 2 0x04>; + clocks = <&tegra_car 4>; }; i2c@7000c000 { @@ -416,6 +418,8 @@ pmc { compatible = "nvidia,tegra20-pmc"; reg = <0x7000e400 0x400>; + clocks = <&tegra_car 110>, <&clk32k_in>; + clock-names = "pclk", "clk32k_in"; }; memory-controller@7000f000 { |