diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 03:17:40 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 03:17:40 -0500 |
| commit | bcc5155d05003f1addc91e125082dca886981a31 (patch) | |
| tree | 253761543a0af664bd69f0edfeb883a76bfd1159 | |
| parent | d4819dc969d0544edd0d0b819a741f10059adcaa (diff) | |
| parent | bb1de8877c960b3b3e1c8337730df970b262fd44 (diff) | |
Merge tag 'tegra-for-3.8-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
From Stephen Warren:
ARM: tegra: cleanup for 3.8
Various trivial cleanup changes of the Tegra code for 3.8.
Many of the changes simply remove useless #include statements, which
enable those headers to be removed or moved later, as work towards
multi-platform zImage support.
<mach/{iram,io}map.h> are moved up to arch/arm/mach-tegra to prevent
any new code outside mach-tegra from using them.
Finally, the regulator definitions in all board device tree files are
updated to use the new simpler syntax that was agreed upon.
* tag 'tegra-for-3.8-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: tegra: move irammap.h to mach-tegra
ARM: tegra: move iomap.h to mach-tegra
ARM: tegra: remove <mach/dma.h>
ARM: tegra: move tegra-ahb.h out of arch/arm/mach-tegra/
ARM: tegra: remove unnecessary includes of <mach/*.h>
iommu: tegra: remove include of <mach/iomap.h>
staging: nvec: remove include of <mach/iomap.h>
crypto: tegra: remove include of <mach/clk.h>
ARM: tegra: update *.dts for regulator-compatible deprecation
usb: phy: tegra remove include of <mach/iomap.h>
usb: host: tegra remove include of <mach/iomap.h>
48 files changed, 150 insertions, 480 deletions
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts index c3ef1ad26b6a..74b8a47adf91 100644 --- a/arch/arm/boot/dts/tegra20-harmony.dts +++ b/arch/arm/boot/dts/tegra20-harmony.dts | |||
| @@ -297,131 +297,98 @@ | |||
| 297 | vinldo9-supply = <&sm2_reg>; | 297 | vinldo9-supply = <&sm2_reg>; |
| 298 | 298 | ||
| 299 | regulators { | 299 | regulators { |
| 300 | #address-cells = <1>; | 300 | sys_reg: sys { |
| 301 | #size-cells = <0>; | ||
| 302 | |||
| 303 | sys_reg: regulator@0 { | ||
| 304 | reg = <0>; | ||
| 305 | regulator-compatible = "sys"; | ||
| 306 | regulator-name = "vdd_sys"; | 301 | regulator-name = "vdd_sys"; |
| 307 | regulator-always-on; | 302 | regulator-always-on; |
| 308 | }; | 303 | }; |
| 309 | 304 | ||
| 310 | regulator@1 { | 305 | sm0 { |
| 311 | reg = <1>; | ||
| 312 | regulator-compatible = "sm0"; | ||
| 313 | regulator-name = "vdd_sm0,vdd_core"; | 306 | regulator-name = "vdd_sm0,vdd_core"; |
| 314 | regulator-min-microvolt = <1200000>; | 307 | regulator-min-microvolt = <1200000>; |
| 315 | regulator-max-microvolt = <1200000>; | 308 | regulator-max-microvolt = <1200000>; |
| 316 | regulator-always-on; | 309 | regulator-always-on; |
| 317 | }; | 310 | }; |
| 318 | 311 | ||
| 319 | regulator@2 { | 312 | sm1 { |
| 320 | reg = <2>; | ||
| 321 | regulator-compatible = "sm1"; | ||
| 322 | regulator-name = "vdd_sm1,vdd_cpu"; | 313 | regulator-name = "vdd_sm1,vdd_cpu"; |
| 323 | regulator-min-microvolt = <1000000>; | 314 | regulator-min-microvolt = <1000000>; |
| 324 | regulator-max-microvolt = <1000000>; | 315 | regulator-max-microvolt = <1000000>; |
| 325 | regulator-always-on; | 316 | regulator-always-on; |
| 326 | }; | 317 | }; |
| 327 | 318 | ||
| 328 | sm2_reg: regulator@3 { | 319 | sm2_reg: sm2 { |
| 329 | reg = <3>; | ||
| 330 | regulator-compatible = "sm2"; | ||
| 331 | regulator-name = "vdd_sm2,vin_ldo*"; | 320 | regulator-name = "vdd_sm2,vin_ldo*"; |
| 332 | regulator-min-microvolt = <3700000>; | 321 | regulator-min-microvolt = <3700000>; |
| 333 | regulator-max-microvolt = <3700000>; | 322 | regulator-max-microvolt = <3700000>; |
| 334 | regulator-always-on; | 323 | regulator-always-on; |
| 335 | }; | 324 | }; |
| 336 | 325 | ||
| 337 | regulator@4 { | 326 | ldo0 { |
| 338 | reg = <4>; | ||
| 339 | regulator-compatible = "ldo0"; | ||
| 340 | regulator-name = "vdd_ldo0,vddio_pex_clk"; | 327 | regulator-name = "vdd_ldo0,vddio_pex_clk"; |
| 341 | regulator-min-microvolt = <3300000>; | 328 | regulator-min-microvolt = <3300000>; |
| 342 | regulator-max-microvolt = <3300000>; | 329 | regulator-max-microvolt = <3300000>; |
| 343 | }; | 330 | }; |
| 344 | 331 | ||
| 345 | regulator@5 { | 332 | ldo1 { |
| 346 | reg = <5>; | ||
| 347 | regulator-compatible = "ldo1"; | ||
| 348 | regulator-name = "vdd_ldo1,avdd_pll*"; | 333 | regulator-name = "vdd_ldo1,avdd_pll*"; |
| 349 | regulator-min-microvolt = <1100000>; | 334 | regulator-min-microvolt = <1100000>; |
| 350 | regulator-max-microvolt = <1100000>; | 335 | regulator-max-microvolt = <1100000>; |
| 351 | regulator-always-on; | 336 | regulator-always-on; |
| 352 | }; | 337 | }; |
| 353 | 338 | ||
| 354 | regulator@6 { | 339 | ldo2 { |
| 355 | reg = <6>; | ||
| 356 | regulator-compatible = "ldo2"; | ||
| 357 | regulator-name = "vdd_ldo2,vdd_rtc"; | 340 | regulator-name = "vdd_ldo2,vdd_rtc"; |
| 358 | regulator-min-microvolt = <1200000>; | 341 | regulator-min-microvolt = <1200000>; |
| 359 | regulator-max-microvolt = <1200000>; | 342 | regulator-max-microvolt = <1200000>; |
| 360 | }; | 343 | }; |
| 361 | 344 | ||
| 362 | regulator@7 { | 345 | ldo3 { |
| 363 | reg = <7>; | ||
| 364 | regulator-compatible = "ldo3"; | ||
| 365 | regulator-name = "vdd_ldo3,avdd_usb*"; | 346 | regulator-name = "vdd_ldo3,avdd_usb*"; |
