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

Commit 94379acc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.6/fixes-rc5-signed' of... 

Merge tag 'omap-for-v4.6/fixes-rc5-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fixes for omaps for v4.6-rc cycle. All dts fixes, mostly
affecting voltages and pinctrl for various device drivers:

- Regulator minimum voltage fixes for omap5

- ISP syscon register offset fix for omap3

- Fix regulator initial modes for n900

- Fix omap5 pinctrl wkup instance size

* tag 'omap-for-v4.6/fixes-rc5-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap5: fix range of permitted wakeup pinmux registers
  ARM: dts: omap3-n900: Specify peripherals LDO regulators initial mode
  ARM: dts: omap3: Fix ISP syscon register offset
  ARM: dts: omap5-cm-t54: fix ldo1_reg and ldo4_reg ranges
  ARM: dts: omap5-board-common: fix ldo1_reg and ldo4_reg ranges
parents 5616f367 7472931f

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

+9 −0
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ 
	regulator-name = "V28";

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

	regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */

	regulator-always-on; /* due to battery cover sensor */

};
@@ -336,30 +337,35 @@ 
	regulator-name = "VCSI";

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */

};



&vaux3 {

	regulator-name = "VMMC2_30";

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <3000000>;

	regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */

};



&vaux4 {

	regulator-name = "VCAM_ANA_28";

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

	regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */

};



&vmmc1 {

	regulator-name = "VMMC1";

	regulator-min-microvolt = <1850000>;

	regulator-max-microvolt = <3150000>;

	regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */

};



&vmmc2 {

	regulator-name = "V28_A";

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <3000000>;

	regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */

	regulator-always-on; /* due VIO leak to AIC34 VDDs */

};
@@ -367,6 +373,7 @@ 
	regulator-name = "VPLL";

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */

	regulator-always-on;

};
@@ -374,6 +381,7 @@ 
	regulator-name = "VSDI_CSI";

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */

	regulator-always-on;

};
@@ -381,6 +389,7 @@ 
	regulator-name = "VMMC2_IO_18";

	regulator-min-microvolt = <1800000>;

	regulator-max-microvolt = <1800000>;

	regulator-initial-mode = <0x0e>; /* RES_STATE_ACTIVE */

};



&vio {

arch/arm/boot/dts/omap34xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
			       0x480bd800 0x017c>;

			interrupts = <24>;

			iommus = <&mmu_isp>;

			syscon = <&scm_conf 0xdc>;

			syscon = <&scm_conf 0x6c>;

			ti,phy-type = <OMAP3ISP_PHY_TYPE_COMPLEX_IO>;

			#clock-cells = <1>;

			ports {

arch/arm/boot/dts/omap5-board-common.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ 
				ldo1_reg: ldo1 {

					/* VDDAPHY_CAM: vdda_csiport */

					regulator-name = "ldo1";

					regulator-min-microvolt = <1500000>;

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};
@@ -498,7 +498,7 @@ 
				ldo4_reg: ldo4 {

					/* VDDAPHY_DISP: vdda_dsiport/hdmi */

					regulator-name = "ldo4";

					regulator-min-microvolt = <1500000>;

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};

arch/arm/boot/dts/omap5-cm-t54.dts

+2 −2
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ 
				ldo1_reg: ldo1 {

					/* VDDAPHY_CAM: vdda_csiport */

					regulator-name = "ldo1";

					regulator-min-microvolt = <1500000>;

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};
@@ -537,7 +537,7 @@ 
				ldo4_reg: ldo4 {

					/* VDDAPHY_DISP: vdda_dsiport/hdmi */

					regulator-name = "ldo4";

					regulator-min-microvolt = <1500000>;

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};

arch/arm/boot/dts/omap5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ 
			omap5_pmx_wkup: pinmux@c840 {

				compatible = "ti,omap5-padconf",

					     "pinctrl-single";

				reg = <0xc840 0x0038>;

				reg = <0xc840 0x003c>;

				#address-cells = <1>;

				#size-cells = <0>;

				#interrupt-cells = <1>;