diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:31:43 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:31:43 -0400 |
| commit | 3be1812ea3b7193ee1a3993cadf9a7985121cf16 (patch) | |
| tree | 4aed605da38588bae8544dccdf6f81004d02ee0b /arch/arm/boot/dts/tegra114.dtsi | |
| parent | 759417ac74fedf74af9c1c1510a9e4e15b951239 (diff) | |
| parent | 6affb4826405dc1f53bae0e5c302a18f734a44ca (diff) | |
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/tegra114.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/tegra114.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index 1dfaf2874c57..e4ddeddcd437 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi | |||
| @@ -99,7 +99,7 @@ | |||
| 99 | }; | 99 | }; |
| 100 | 100 | ||
| 101 | pmc { | 101 | pmc { |
| 102 | compatible = "nvidia,tegra114-pmc", "nvidia,tegra30-pmc"; | 102 | compatible = "nvidia,tegra114-pmc"; |
| 103 | reg = <0x7000e400 0x400>; | 103 | reg = <0x7000e400 0x400>; |
| 104 | }; | 104 | }; |
| 105 | 105 | ||