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

Commit 39b1bb2e authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'devel-dt-regulator' into devel-dt

parents 85d7ff9b 624411ce

arch/arm/boot/dts/am33xx.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -163,5 +163,10 @@ 
			ti,hwmods = "i2c3";

			ti,hwmods = "i2c3";

			status = "disabled";

			status = "disabled";

		};

		};



		wdt2: wdt@44e35000 {

			compatible = "ti,omap3-wdt";

			ti,hwmods = "wd_timer2";

		};

	};

	};

};
 
};

arch/arm/boot/dts/omap3-beagle.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ 
		interrupts = <7>; /* SYS_NIRQ cascaded to intc */

		interrupts = <7>; /* SYS_NIRQ cascaded to intc */

		interrupt-parent = <&intc>;

		interrupt-parent = <&intc>;





		vsim: regulator@10 {

		vsim: regulator-vsim {

			compatible = "ti,twl4030-vsim";

			compatible = "ti,twl4030-vsim";

			regulator-min-microvolt = <1800000>;

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <3000000>;

			regulator-max-microvolt = <3000000>;

arch/arm/boot/dts/omap4-sdp.dts

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
		reg = <0x80000000 0x40000000>; /* 1 GB */

		reg = <0x80000000 0x40000000>; /* 1 GB */

	};

	};





	vdd_eth: fixedregulator@0 {

	vdd_eth: fixedregulator-vdd-eth {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

		regulator-name = "VDD_ETH";

		regulator-name = "VDD_ETH";

		regulator-min-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;
@@ -28,7 +28,7 @@ 
		regulator-boot-on;

		regulator-boot-on;

	};

	};





	vbat: fixedregulator@2 {

	vbat: fixedregulator-vbat {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

		regulator-name = "VBAT";

		regulator-name = "VBAT";

		regulator-min-microvolt = <3750000>;

		regulator-min-microvolt = <3750000>;

arch/arm/boot/dts/twl4030.dtsi

+3 −3
Original line number Original line Diff line number Diff line
@@ -19,19 +19,19 @@ 
		interrupts = <11>;

		interrupts = <11>;

	};

	};





	vdac: regulator@0 {

	vdac: regulator-vdac {

		compatible = "ti,twl4030-vdac";

		compatible = "ti,twl4030-vdac";

		regulator-min-microvolt = <1800000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};

	};





	vpll2: regulator@1 {

	vpll2: regulator-vpll2 {

		compatible = "ti,twl4030-vpll2";

		compatible = "ti,twl4030-vpll2";

		regulator-min-microvolt = <1800000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};

	};





	vmmc1: regulator@2 {

	vmmc1: regulator-vmmc1 {

		compatible = "ti,twl4030-vmmc1";

		compatible = "ti,twl4030-vmmc1";

		regulator-min-microvolt = <1850000>;

		regulator-min-microvolt = <1850000>;

		regulator-max-microvolt = <3150000>;

		regulator-max-microvolt = <3150000>;

arch/arm/boot/dts/twl6030.dtsi

+16 −13
Original line number Original line Diff line number Diff line
@@ -20,67 +20,70 @@ 
		interrupts = <11>;

		interrupts = <11>;

	};

	};





	vaux1: regulator@0 {

	vaux1: regulator-vaux1 {

		compatible = "ti,twl6030-vaux1";

		compatible = "ti,twl6030-vaux1";

		regulator-min-microvolt = <1000000>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

	};

	};





	vaux2: regulator@1 {

	vaux2: regulator-vaux2 {

		compatible = "ti,twl6030-vaux2";

		compatible = "ti,twl6030-vaux2";

		regulator-min-microvolt = <1200000>;

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <2800000>;

		regulator-max-microvolt = <2800000>;

	};

	};





	vaux3: regulator@2 {

	vaux3: regulator-vaux3 {

		compatible = "ti,twl6030-vaux3";

		compatible = "ti,twl6030-vaux3";

		regulator-min-microvolt = <1000000>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

	};

	};





	vmmc: regulator@3 {

	vmmc: regulator-vmmc {

		compatible = "ti,twl6030-vmmc";

		compatible = "ti,twl6030-vmmc";

		regulator-min-microvolt = <1200000>;

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

	};

	};





	vpp: regulator@4 {

	vpp: regulator-vpp {

		compatible = "ti,twl6030-vpp";

		compatible = "ti,twl6030-vpp";

		regulator-min-microvolt = <1800000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2500000>;

		regulator-max-microvolt = <2500000>;

	};

	};





	vusim: regulator@5 {

	vusim: regulator-vusim {

		compatible = "ti,twl6030-vusim";

		compatible = "ti,twl6030-vusim";

		regulator-min-microvolt = <1200000>;

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <2900000>;

		regulator-max-microvolt = <2900000>;

	};

	};





	vdac: regulator@6 {

	vdac: regulator-vdac {

		compatible = "ti,twl6030-vdac";

		compatible = "ti,twl6030-vdac";

	};

	};





	vana: regulator@7 {

	vana: regulator-vana {

		compatible = "ti,twl6030-vana";

		compatible = "ti,twl6030-vana";

	};

	};





	vcxio: regulator@8 {

	vcxio: regulator-vcxio {

		compatible = "ti,twl6030-vcxio";

		compatible = "ti,twl6030-vcxio";

		regulator-always-on;

	};

	};





	vusb: regulator@9 {

	vusb: regulator-vusb {

		compatible = "ti,twl6030-vusb";

		compatible = "ti,twl6030-vusb";

	};

	};





	v1v8: regulator@10 {

	v1v8: regulator-v1v8 {

		compatible = "ti,twl6030-v1v8";

		compatible = "ti,twl6030-v1v8";

		regulator-always-on;

	};

	};





	v2v1: regulator@11 {

	v2v1: regulator-v2v1 {

		compatible = "ti,twl6030-v2v1";

		compatible = "ti,twl6030-v2v1";

		regulator-always-on;

	};

	};





	clk32kg: regulator@12 {

	clk32kg: regulator-clk32kg {

		compatible = "ti,twl6030-clk32kg";

		compatible = "ti,twl6030-clk32kg";

	};

	};

};
 
};