Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcc5155d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.8-cleanup' of... 

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>
parents d4819dc9 bb1de887

arch/arm/boot/dts/tegra20-harmony.dts

+15 −48
Original line number Diff line number Diff line
@@ -297,131 +297,98 @@ 
			vinldo9-supply = <&sm2_reg>;



			regulators {

				#address-cells = <1>;

				#size-cells = <0>;



				sys_reg: regulator@0 {

					reg = <0>;

					regulator-compatible = "sys";

				sys_reg: sys {

					regulator-name = "vdd_sys";

					regulator-always-on;

				};



				regulator@1 {

					reg = <1>;

					regulator-compatible = "sm0";

				sm0 {

					regulator-name = "vdd_sm0,vdd_core";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					regulator-always-on;

				};



				regulator@2 {

					reg = <2>;

					regulator-compatible = "sm1";

				sm1 {

					regulator-name = "vdd_sm1,vdd_cpu";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

				};



				sm2_reg: regulator@3 {

					reg = <3>;

					regulator-compatible = "sm2";

				sm2_reg: sm2 {

					regulator-name = "vdd_sm2,vin_ldo*";

					regulator-min-microvolt = <3700000>;

					regulator-max-microvolt = <3700000>;

					regulator-always-on;

				};



				regulator@4 {

					reg = <4>;

					regulator-compatible = "ldo0";

				ldo0 {

					regulator-name = "vdd_ldo0,vddio_pex_clk";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@5 {

					reg = <5>;

					regulator-compatible = "ldo1";

				ldo1 {

					regulator-name = "vdd_ldo1,avdd_pll*";

					regulator-min-microvolt = <1100000>;

					regulator-max-microvolt = <1100000>;

					regulator-always-on;

				};



				regulator@6 {

					reg = <6>;

					regulator-compatible = "ldo2";

				ldo2 {

					regulator-name = "vdd_ldo2,vdd_rtc";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				regulator@7 {

					reg = <7>;

					regulator-compatible = "ldo3";

				ldo3 {

					regulator-name = "vdd_ldo3,avdd_usb*";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

				};



				regulator@8 {

					reg = <8>;

					regulator-compatible = "ldo4";

				ldo4 {

					regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				regulator@9 {

					reg = <9>;

					regulator-compatible = "ldo5";

				ldo5 {

					regulator-name = "vdd_ldo5,vcore_mmc";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@10 {

					reg = <10>;

					regulator-compatible = "ldo6";

				ldo6 {

					regulator-name = "vdd_ldo6,avdd_vdac";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@11 {

					reg = <11>;

					regulator-compatible = "ldo7";

				ldo7 {

					regulator-name = "vdd_ldo7,avdd_hdmi";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@12 {

					reg = <12>;

					regulator-compatible = "ldo8";

				ldo8 {

					regulator-name = "vdd_ldo8,avdd_hdmi_pll";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@13 {

					reg = <13>;

					regulator-compatible = "ldo9";

				ldo9 {

					regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@14 {

					reg = <14>;

					regulator-compatible = "ldo_rtc";

				ldo_rtc {

					regulator-name = "vdd_rtc_out,vdd_cell";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

arch/arm/boot/dts/tegra20-paz00.dts

+14 −45
Original line number Diff line number Diff line
@@ -291,37 +291,26 @@ 
			vinldo9-supply = <&sm2_reg>;



			regulators {

				#address-cells = <1>;

				#size-cells = <0>;



				sys_reg: regulator@0 {

					reg = <0>;

					regulator-compatible = "sys";

				sys_reg: sys {

					regulator-name = "vdd_sys";

					regulator-always-on;

				};



				regulator@1 {

					reg = <1>;

					regulator-compatible = "sm0";

				sm0 {

					regulator-name = "+1.2vs_sm0,vdd_core";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					regulator-always-on;

				};



				regulator@2 {

					reg = <2>;

					regulator-compatible = "sm1";

				sm1 {

					regulator-name = "+1.0vs_sm1,vdd_cpu";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

				};



				sm2_reg: regulator@3 {

					reg = <3>;

					regulator-compatible = "sm2";

				sm2_reg: sm2 {

					regulator-name = "+3.7vs_sm2,vin_ldo*";

					regulator-min-microvolt = <3700000>;

					regulator-max-microvolt = <3700000>;
@@ -330,53 +319,41 @@ 


				/* LDO0 is not connected to anything */



				regulator@5 {

					reg = <5>;

					regulator-compatible = "ldo1";

				ldo1 {

					regulator-name = "+1.1vs_ldo1,avdd_pll*";

					regulator-min-microvolt = <1100000>;

					regulator-max-microvolt = <1100000>;

					regulator-always-on;

				};



				regulator@6 {

					reg = <6>;

					regulator-compatible = "ldo2";

				ldo2 {

					regulator-name = "+1.2vs_ldo2,vdd_rtc";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				regulator@7 {

					reg = <7>;

					regulator-compatible = "ldo3";

				ldo3 {

					regulator-name = "+3.3vs_ldo3,avdd_usb*";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

				};



				regulator@8 {

					reg = <8>;

					regulator-compatible = "ldo4";

				ldo4 {

					regulator-name = "+1.8vs_ldo4,avdd_osc,vddio_sys";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				regulator@9 {

					reg = <9>;

					regulator-compatible = "ldo5";

				ldo5 {

					regulator-name = "+2.85vs_ldo5,vcore_mmc";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@10 {

					reg = <10>;

					regulator-compatible = "ldo6";

				ldo6 {

					/*

					 * Research indicates this should be

					 * 1.8v; other boards that use this
@@ -390,34 +367,26 @@ 
					regulator-max-microvolt = <1800000>;

				};



				regulator@11 {

					reg = <11>;

					regulator-compatible = "ldo7";

				ldo7 {

					regulator-name = "+3.3vs_ldo7,avdd_hdmi";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@12 {

					reg = <12>;

					regulator-compatible = "ldo8";

				ldo8 {

					regulator-name = "+1.8vs_ldo8,avdd_hdmi_pll";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@13 {

					reg = <13>;

					regulator-compatible = "ldo9";

				ldo9 {

					regulator-name = "+2.85vs_ldo9,vdd_ddr_rx";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@14 {

					reg = <14>;

					regulator-compatible = "ldo_rtc";

				ldo_rtc {

					regulator-name = "+3.3vs_rtc";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

arch/arm/boot/dts/tegra20-seaboard.dts

+14 −45
Original line number Diff line number Diff line
@@ -395,37 +395,26 @@ 
			vinldo9-supply = <&sm2_reg>;



			regulators {

				#address-cells = <1>;

				#size-cells = <0>;



				sys_reg: regulator@0 {

					reg = <0>;

					regulator-compatible = "sys";

				sys_reg: sys {

					regulator-name = "vdd_sys";

					regulator-always-on;

				};



				regulator@1 {

					reg = <1>;

					regulator-compatible = "sm0";

				sm0 {

					regulator-name = "vdd_sm0,vdd_core";

					regulator-min-microvolt = <1300000>;

					regulator-max-microvolt = <1300000>;

					regulator-always-on;

				};



				regulator@2 {

					reg = <2>;

					regulator-compatible = "sm1";

				sm1 {

					regulator-name = "vdd_sm1,vdd_cpu";

					regulator-min-microvolt = <1125000>;

					regulator-max-microvolt = <1125000>;

					regulator-always-on;

				};



				sm2_reg: regulator@3 {

					reg = <3>;

					regulator-compatible = "sm2";

				sm2_reg: sm2 {

					regulator-name = "vdd_sm2,vin_ldo*";

					regulator-min-microvolt = <3700000>;

					regulator-max-microvolt = <3700000>;
@@ -434,86 +423,66 @@ 


				/* LDO0 is not connected to anything */



				regulator@5 {

					reg = <5>;

					regulator-compatible = "ldo1";

				ldo1 {

					regulator-name = "vdd_ldo1,avdd_pll*";

					regulator-min-microvolt = <1100000>;

					regulator-max-microvolt = <1100000>;

					regulator-always-on;

				};



				regulator@6 {

					reg = <6>;

					regulator-compatible = "ldo2";

				ldo2 {

					regulator-name = "vdd_ldo2,vdd_rtc";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				regulator@7 {

					reg = <7>;

					regulator-compatible = "ldo3";

				ldo3 {

					regulator-name = "vdd_ldo3,avdd_usb*";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

				};



				regulator@8 {

					reg = <8>;

					regulator-compatible = "ldo4";

				ldo4 {

					regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				regulator@9 {

					reg = <9>;

					regulator-compatible = "ldo5";

				ldo5 {

					regulator-name = "vdd_ldo5,vcore_mmc";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@10 {

					reg = <10>;

					regulator-compatible = "ldo6";

				ldo6 {

					regulator-name = "vdd_ldo6,avdd_vdac,vddio_vi,vddio_cam";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@11 {

					reg = <11>;

					regulator-compatible = "ldo7";

				ldo7 {

					regulator-name = "vdd_ldo7,avdd_hdmi,vdd_fuse";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@12 {

					reg = <12>;

					regulator-compatible = "ldo8";

				ldo8 {

					regulator-name = "vdd_ldo8,avdd_hdmi_pll";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@13 {

					reg = <13>;

					regulator-compatible = "ldo9";

				ldo9 {

					regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@14 {

					reg = <14>;

					regulator-compatible = "ldo_rtc";

				ldo_rtc {

					regulator-name = "vdd_rtc_out,vdd_cell";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

arch/arm/boot/dts/tegra20-tamonten.dtsi

+15 −48
Original line number Diff line number Diff line
@@ -271,97 +271,72 @@ 
			vinldo9-supply = <&sm2_reg>;



			regulators {

				#address-cells = <1>;

				#size-cells = <0>;



				sys_reg: regulator@0 {

					reg = <0>;

					regulator-compatible = "sys";

				sys_reg: sys {

					regulator-name = "vdd_sys";

					regulator-always-on;

				};



				regulator@1 {

					reg = <1>;

					regulator-compatible = "sm0";

				sm0 {

					regulator-name = "vdd_sys_sm0,vdd_core";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					regulator-always-on;

				};



				regulator@2 {

					reg = <2>;

					regulator-compatible = "sm1";

				sm1 {

					regulator-name = "vdd_sys_sm1,vdd_cpu";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

				};



				sm2_reg: regulator@3 {

					reg = <3>;

					regulator-compatible = "sm2";

				sm2_reg: sm2 {

					regulator-name = "vdd_sys_sm2,vin_ldo*";

					regulator-min-microvolt = <3700000>;

					regulator-max-microvolt = <3700000>;

					regulator-always-on;

				};



				regulator@4 {

					reg = <4>;

					regulator-compatible = "ldo0";

				ldo0 {

					regulator-name = "vdd_ldo0,vddio_pex_clk";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@5 {

					reg = <5>;

					regulator-compatible = "ldo1";

				ldo1 {

					regulator-name = "vdd_ldo1,avdd_pll*";

					regulator-min-microvolt = <1100000>;

					regulator-max-microvolt = <1100000>;

					regulator-always-on;

				};



				regulator@6 {

					reg = <6>;

					regulator-compatible = "ldo2";

				ldo2 {

					regulator-name = "vdd_ldo2,vdd_rtc";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				regulator@7 {

					reg = <7>;

					regulator-compatible = "ldo3";

				ldo3 {

					regulator-name = "vdd_ldo3,avdd_usb*";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

				};



				regulator@8 {

					reg = <8>;

					regulator-compatible = "ldo4";

				ldo4 {

					regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				regulator@9 {

					reg = <9>;

					regulator-compatible = "ldo5";

				ldo5 {

					regulator-name = "vdd_ldo5,vcore_mmc";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

				};



				regulator@10 {

					reg = <10>;

					regulator-compatible = "ldo6";

				ldo6 {

					regulator-name = "vdd_ldo6,avdd_vdac";

					/*

					 * According to the Tegra 2 Automotive
@@ -373,25 +348,19 @@ 
					regulator-max-microvolt = <2850000>;

				};



				regulator@11 {

					reg = <11>;

					regulator-compatible = "ldo7";

				ldo7 {

					regulator-name = "vdd_ldo7,avdd_hdmi";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@12 {

					reg = <12>;

					regulator-compatible = "ldo8";

				ldo8 {

					regulator-name = "vdd_ldo8,avdd_hdmi_pll";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@13 {

					reg = <13>;

					regulator-compatible = "ldo9";

				ldo9 {

					regulator-name = "vdd_ldo9,vdd_ddr_rx,avdd_cam";

					/*

					 * According to the Tegra 2 Automotive
@@ -404,9 +373,7 @@ 
					regulator-always-on;

				};



				regulator@14 {

					reg = <14>;

					regulator-compatible = "ldo_rtc";

				ldo_rtc {

					regulator-name = "vdd_rtc_out";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

arch/arm/boot/dts/tegra20-ventana.dts

+14 −45
Original line number Diff line number Diff line
@@ -311,37 +311,26 @@ 
			vinldo9-supply = <&sm2_reg>;



			regulators {

				#address-cells = <1>;

				#size-cells = <0>;



				sys_reg: regulator@0 {

					reg = <0>;

					regulator-compatible = "sys";

				sys_reg: sys {

					regulator-name = "vdd_sys";

					regulator-always-on;

				};



				regulator@1 {

					reg = <1>;

					regulator-compatible = "sm0";

				sm0 {

					regulator-name = "vdd_sm0,vdd_core";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					regulator-always-on;

				};



				regulator@2 {

					reg = <2>;

					regulator-compatible = "sm1";

				sm1 {

					regulator-name = "vdd_sm1,vdd_cpu";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

				};



				sm2_reg: regulator@3 {

					reg = <3>;

					regulator-compatible = "sm2";

				sm2_reg: sm2 {

					regulator-name = "vdd_sm2,vin_ldo*";

					regulator-min-microvolt = <3700000>;

					regulator-max-microvolt = <3700000>;
@@ -350,86 +339,66 @@ 


				/* LDO0 is not connected to anything */



				regulator@5 {

					reg = <5>;

					regulator-compatible = "ldo1";

				ldo1 {

					regulator-name = "vdd_ldo1,avdd_pll*";

					regulator-min-microvolt = <1100000>;

					regulator-max-microvolt = <1100000>;

					regulator-always-on;

				};



				regulator@6 {

					reg = <6>;

					regulator-compatible = "ldo2";

				ldo2 {

					regulator-name = "vdd_ldo2,vdd_rtc";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				regulator@7 {

					reg = <7>;

					regulator-compatible = "ldo3";

				ldo3 {

					regulator-name = "vdd_ldo3,avdd_usb*";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

				};



				regulator@8 {

					reg = <8>;

					regulator-compatible = "ldo4";

				ldo4 {

					regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				regulator@9 {

					reg = <9>;

					regulator-compatible = "ldo5";

				ldo5 {

					regulator-name = "vdd_ldo5,vcore_mmc";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@10 {

					reg = <10>;

					regulator-compatible = "ldo6";

				ldo6 {

					regulator-name = "vdd_ldo6,avdd_vdac";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@11 {

					reg = <11>;

					regulator-compatible = "ldo7";

				ldo7 {

					regulator-name = "vdd_ldo7,avdd_hdmi,vdd_fuse";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@12 {

					reg = <12>;

					regulator-compatible = "ldo8";

				ldo8 {

					regulator-name = "vdd_ldo8,avdd_hdmi_pll";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@13 {

					reg = <13>;

					regulator-compatible = "ldo9";

				ldo9 {

					regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx";

					regulator-min-microvolt = <2850000>;

					regulator-max-microvolt = <2850000>;

					regulator-always-on;

				};



				regulator@14 {

					reg = <14>;

					regulator-compatible = "ldo_rtc";

				ldo_rtc {

					regulator-name = "vdd_rtc_out,vdd_cell";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;