diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 14:31:43 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 14:31:43 (GMT) |
| commit | 3be1812ea3b7193ee1a3993cadf9a7985121cf16 (patch) | |
| tree | 4aed605da38588bae8544dccdf6f81004d02ee0b /arch/arm/boot/dts/tegra30.dtsi | |
| parent | 759417ac74fedf74af9c1c1510a9e4e15b951239 (diff) | |
| parent | 6affb4826405dc1f53bae0e5c302a18f734a44ca (diff) | |
| download | linux-fsl-qoriq-3be1812ea3b7193ee1a3993cadf9a7985121cf16.tar.xz | |
Merge branch 'tegra/cleanup' into next/soc
This is a dependency for the tegra/soc branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/tegra30.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index dbf46c2..9491edf 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,7 +425,7 @@ }; pmc { - compatible = "nvidia,tegra20-pmc", "nvidia,tegra30-pmc"; + compatible = "nvidia,tegra30-pmc"; reg = <0x7000e400 0x400>; }; |