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

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

Merge tag 'omap-for-v4.3/fixes-rc2' of... 

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

Fixes for omaps for v4.3-rc cycle:

- Two more patches to fix most of the MMC regressions with the
  PBIAS regulator changes. At least two MMC driver related issues
  still seems to remain for omap3 legacy booting and omap4 duovero.
  Note that the dts changes depend on a recent regulator fix, and
  are based on the regulator commit now in mainline kernel

- Enable autoidle for am43xx clocks to prevent clocks from staying
  always on

- Fix i2c5 pinctrl offsets for omap5-uevm

- Enable PCA953X as that's needed for HDMI to work on omap5

- Update phy supplies for beagle x15 beta board

- Use palmas-usb for on beagle x15 to start using the related
  driver that recently got merged

* tag 'omap-for-v4.3/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: fix omap2+ address translation for pbias
  ARM: dts: am57xx-beagle-x15: use palmas-usb for USB2
  ARM: omap2plus_defconfig: enable GPIO_PCA953X
  ARM: dts: omap5-uevm.dts: fix i2c5 pinctrl offsets
  ARM: OMAP2+: AM43XX: Enable autoidle for clks in am43xx_init_late
  ARM: dts: am57xx-beagle-x15: Update Phy supplies
  regulator: pbias: program pbias register offset in pbias driver
  ARM: omap2plus_defconfig: Enable MUSB DMA support
  ARM: DRA752: Add ID detect for ES2.0
  ARM: OMAP3: vc: fix 'or' always true warning
  ARM: OMAP2+: Fix booting if no timer parent clock is available
  ARM: OMAP2+: omap-device: fix race deferred probe of omap_hsmmc vs omap_device_late_init

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fe5b2756 9a5e3f27

Documentation/devicetree/bindings/regulator/pbias-regulator.txt

+6 −1
Original line number Diff line number Diff line
@@ -2,7 +2,12 @@ PBIAS internal regulator for SD card dual voltage i/o pads on OMAP SoCs. 


Required properties:

- compatible:

  - "ti,pbias-omap" for OMAP2, OMAP3, OMAP4, OMAP5, DRA7.

  - should be "ti,pbias-dra7" for DRA7

  - should be "ti,pbias-omap2" for OMAP2

  - should be "ti,pbias-omap3" for OMAP3

  - should be "ti,pbias-omap4" for OMAP4

  - should be "ti,pbias-omap5" for OMAP5

  - "ti,pbias-omap" is deprecated

- reg: pbias register offset from syscon base and size of pbias register.

- syscon : phandle of the system control module

- regulator-name : should be

arch/arm/boot/dts/am57xx-beagle-x15.dts

+27 −15
Original line number Diff line number Diff line
@@ -98,13 +98,6 @@ 
		pinctrl-0 = <&extcon_usb1_pins>;

	};



	extcon_usb2: extcon_usb2 {

		compatible = "linux,extcon-usb-gpio";

		id-gpio = <&gpio7 24 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&extcon_usb2_pins>;

	};



	hdmi0: connector {

		compatible = "hdmi-connector";

		label = "hdmi";
@@ -326,12 +319,6 @@ 
		>;

	};



	extcon_usb2_pins: extcon_usb2_pins {

		pinctrl-single,pins = <

			0x3e8 (PIN_INPUT_PULLUP | MUX_MODE14) /* uart1_ctsn.gpio7_24 */

		>;

	};



	tpd12s015_pins: pinmux_tpd12s015_pins {

		pinctrl-single,pins = <

			0x3b0 (PIN_OUTPUT | MUX_MODE14)		/* gpio7_10 CT_CP_HPD */
@@ -432,7 +419,7 @@ 
				};



				ldo3_reg: ldo3 {

					/* VDDA_1V8_PHY */

					/* VDDA_1V8_PHYA */

					regulator-name = "ldo3";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -440,6 +427,15 @@ 
					regulator-boot-on;

				};



				ldo4_reg: ldo4 {

					/* VDDA_1V8_PHYB */

					regulator-name = "ldo4";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

					regulator-boot-on;

				};



				ldo9_reg: ldo9 {

					/* VDD_RTC */

					regulator-name = "ldo9";
@@ -495,6 +491,14 @@ 
			gpio-controller;

			#gpio-cells = <2>;

		};



		extcon_usb2: tps659038_usb {

			compatible = "ti,palmas-usb-vid";

			ti,enable-vbus-detection;

			ti,enable-id-detection;

			id-gpios = <&gpio7 24 GPIO_ACTIVE_HIGH>;

		};



	};



	tmp102: tmp102@48 {
@@ -623,6 +627,14 @@ 
};



&usb2 {

	/*

	 * Stand alone usage is peripheral only.

	 * However, with some resistor modifications

	 * this port can be used via expansion connectors

	 * as "host" or "dual-role". If so, provide

	 * the necessary dr_mode override in the expansion

	 * board's DT.

	 */

	dr_mode = "peripheral";

};
@@ -681,7 +693,7 @@ 


&hdmi {

	status = "ok";

	vdda-supply = <&ldo3_reg>;

	vdda-supply = <&ldo4_reg>;



	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_pins>;

arch/arm/boot/dts/dra7.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 
					reg = <0x0 0x1400>;

					#address-cells = <1>;

					#size-cells = <1>;

					ranges = <0 0x0 0x1400>;



					pbias_regulator: pbias_regulator {

						compatible = "ti,pbias-dra7", "ti,pbias-omap";

arch/arm/boot/dts/omap2430.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
					reg = <0x270 0x240>;

					#address-cells = <1>;

					#size-cells = <1>;

					ranges = <0 0x270 0x240>;



					scm_clocks: clocks {

						#address-cells = <1>;

arch/arm/boot/dts/omap3.dtsi

+13 −12
Original line number Diff line number Diff line
@@ -113,10 +113,22 @@ 
				};



				scm_conf: scm_conf@270 {

					compatible = "syscon";

					compatible = "syscon", "simple-bus";

					reg = <0x270 0x330>;

					#address-cells = <1>;

					#size-cells = <1>;

					ranges = <0 0x270 0x330>;



					pbias_regulator: pbias_regulator {

						compatible = "ti,pbias-omap3", "ti,pbias-omap";

						reg = <0x2b0 0x4>;

						syscon = <&scm_conf>;

						pbias_mmc_reg: pbias_mmc_omap2430 {

							regulator-name = "pbias_mmc_omap2430";

							regulator-min-microvolt = <1800000>;

							regulator-max-microvolt = <3000000>;

						};

					};



					scm_clocks: clocks {

						#address-cells = <1>;
@@ -202,17 +214,6 @@ 
			dma-requests = <96>;

		};



		pbias_regulator: pbias_regulator {

			compatible = "ti,pbias-omap3", "ti,pbias-omap";

			reg = <0x2b0 0x4>;

			syscon = <&scm_conf>;

			pbias_mmc_reg: pbias_mmc_omap2430 {

				regulator-name = "pbias_mmc_omap2430";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3000000>;

			};

		};



		gpio1: gpio@48310000 {

			compatible = "ti,omap3-gpio";

			reg = <0x48310000 0x200>;