diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-04-05 02:08:06 +0400 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-04-05 02:08:06 +0400 |
| commit | 8aa15d82df291b398d604b527a20310f10c1c706 (patch) | |
| tree | 2e72fa6d6cdcb62c63f31bbd0f15a28909db7625 /arch/arm/boot/dts/tegra30.dtsi | |
| parent | 8bb9660418e05bb1845ac1a2428444d78e322cc7 (diff) | |
| parent | 4d82d0587b4a964ea3a7c73aa044b433000527dd (diff) | |
| download | linux-8aa15d82df291b398d604b527a20310f10c1c706.tar.xz | |
Merge branch 'for-3.10/soc' into for-3.10/clk
Diffstat (limited to 'arch/arm/boot/dts/tegra30.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index 9d87a3ffe998..9d7869f7151f 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -148,6 +148,7 @@ 0 42 0x04 0 121 0x04 0 122 0x04>; + clocks = <&tegra_car 5>; }; tegra_car: clock { @@ -291,6 +292,7 @@ compatible = "nvidia,tegra30-rtc", "nvidia,tegra20-rtc"; reg = <0x7000e000 0x100>; interrupts = <0 2 0x04>; + clocks = <&tegra_car 4>; }; i2c@7000c000 { @@ -423,8 +425,10 @@ }; pmc { - compatible = "nvidia,tegra20-pmc", "nvidia,tegra30-pmc"; + compatible = "nvidia,tegra30-pmc"; reg = <0x7000e400 0x400>; + clocks = <&tegra_car 218>, <&clk32k_in>; + clock-names = "pclk", "clk32k_in"; }; memory-controller { |