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

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

Merge tag 'omap-for-v4.7-dts-fixes1' of... 

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

DTS fixes for omaps for v4.7 merge window for issues noted
with patches in Linux next:

- Fix omap5 and am57xx-idk input voltages to fix micro-sd
  probing at least for some omap5-uevm configurations

- Fix unhandled fault for igepv5 audio

- Fix UART wakeirqs for omap5 by removing WAKUP_EN flags,
  those are managed by the wakeirq and can currently confuse
  the wakeirqs as there is no handler necessarily registered

- Fix LDO7 source for igepv5

Also included are few minor changes not strictly fixes
are good to have merged:

- Fix HP T410 boot time warnings for eMMC and disable the
  unused MMC interfaces while at it

- Add dra7 gpmc dma channel

- Add igep00x0 SD card detect and write protect GPIOs

* tag 'omap-for-v4.7-dts-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: igep0020: Add SD card write-protect pin.
  ARM: dts: igep00x0: Add SD card-detect.
  ARM: dts: am57xx-idk-common: Fix input supply names
  ARM: dts: dra7: Add gpmc dma channel
  ARM: dts: disable mmc by default and enable when needed for dm814x
  ARM: dts: Add non-removable to hsmmc on hp-t410
  ARM: dts: Fix ldo7 source for HDMI on igepv5
  ARM: dts: Fix uart wakeirq on omap5 by removing WAKEUP_EN for omaps
  ARM: dts: Fix igepv5 audiopwon-gpio
  ARM: dts: omap5-board-common: Describe the voltage supply mapping accurately

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c2b8d920 a1f6ad14

arch/arm/boot/dts/am57xx-idk-common.dtsi

+17 −15
Original line number Diff line number Diff line
@@ -60,10 +60,26 @@ 


		tps659038_pmic {

			compatible = "ti,tps659038-pmic";



			smps12-in-supply = <&vmain>;

			smps3-in-supply = <&vmain>;

			smps45-in-supply = <&vmain>;

			smps6-in-supply = <&vmain>;

			smps7-in-supply = <&vmain>;

			smps8-in-supply = <&vmain>;

			smps9-in-supply = <&vmain>;

			ldo1-in-supply = <&vmain>;

			ldo2-in-supply = <&vmain>;

			ldo3-in-supply = <&vmain>;

			ldo4-in-supply = <&vmain>;

			ldo9-in-supply = <&vmain>;

			ldoln-in-supply = <&vmain>;

			ldousb-in-supply = <&vmain>;

			ldortc-in-supply = <&vmain>;



			regulators {

				smps12_reg: smps12 {

					/* VDD_MPU */

					vin-supply = <&vmain>;

					regulator-name = "smps12";

					regulator-min-microvolt = <850000>;

					regulator-max-microvolt = <1250000>;
@@ -73,7 +89,6 @@ 


				smps3_reg: smps3 {

					/* VDD_DDR EMIF1 EMIF2 */

					vin-supply = <&vmain>;

					regulator-name = "smps3";

					regulator-min-microvolt = <1350000>;

					regulator-max-microvolt = <1350000>;
@@ -84,7 +99,6 @@ 
				smps45_reg: smps45 {

					/* VDD_DSPEVE on AM572 */

					/* VDD_IVA + VDD_DSP on AM571 */

					vin-supply = <&vmain>;

					regulator-name = "smps45";

					regulator-min-microvolt = <850000>;

					regulator-max-microvolt = <1250000>;
@@ -94,7 +108,6 @@ 


				smps6_reg: smps6 {

					/* VDD_GPU */

					vin-supply = <&vmain>;

					regulator-name = "smps6";

					regulator-min-microvolt = <850000>;

					regulator-max-microvolt = <1250000>;
@@ -104,7 +117,6 @@ 


				smps7_reg: smps7 {

					/* VDD_CORE */

					vin-supply = <&vmain>;

					regulator-name = "smps7";

					regulator-min-microvolt = <850000>;

					regulator-max-microvolt = <1150000>;
@@ -115,13 +127,11 @@ 
				smps8_reg: smps8 {

					/* 5728 - VDD_IVAHD */

					/* 5718 - N.C. test point */

					vin-supply = <&vmain>;

					regulator-name = "smps8";

				};



				smps9_reg: smps9 {

					/* VDD_3_3D */

					vin-supply = <&vmain>;

					regulator-name = "smps9";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;
@@ -132,7 +142,6 @@ 
				ldo1_reg: ldo1 {

					/* VDDSHV8 - VSDMMC  */

					/* NOTE: on rev 1.3a, data supply */

					vin-supply = <&vmain>;

					regulator-name = "ldo1";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <3300000>;
@@ -142,7 +151,6 @@ 


				ldo2_reg: ldo2 {

					/* VDDSH18V */

					vin-supply = <&vmain>;

					regulator-name = "ldo2";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -152,7 +160,6 @@ 


				ldo3_reg: ldo3 {

					/* R1.3a 572x V1_8PHY_LDO3: USB, SATA */

					vin-supply = <&vmain>;

					regulator-name = "ldo3";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -162,7 +169,6 @@ 


				ldo4_reg: ldo4 {

					/* R1.3a 572x V1_8PHY_LDO4: PCIE, HDMI*/

					vin-supply = <&vmain>;

					regulator-name = "ldo4";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -174,7 +180,6 @@ 


				ldo9_reg: ldo9 {

					/* VDD_RTC  */

					vin-supply = <&vmain>;

					regulator-name = "ldo9";

					regulator-min-microvolt = <840000>;

					regulator-max-microvolt = <1160000>;
@@ -184,7 +189,6 @@ 


				ldoln_reg: ldoln {

					/* VDDA_1V8_PLL */

					vin-supply = <&vmain>;

					regulator-name = "ldoln";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;
@@ -194,7 +198,6 @@ 


				ldousb_reg: ldousb {

					/* VDDA_3V_USB: VDDA_USBHS33 */

					vin-supply = <&vmain>;

					regulator-name = "ldousb";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;
@@ -204,7 +207,6 @@ 


				ldortc_reg: ldortc {

					/* VDDA_RTC  */

					vin-supply = <&vmain>;

					regulator-name = "ldortc";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

arch/arm/boot/dts/dm8148-evm.dts

+8 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ 
	};

};



&mmc1 {

        status = "disabled";

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&sd1_pins>;
@@ -101,6 +105,10 @@ 
	cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;

};



&mmc3 {

        status = "disabled";

};



&pincntl {

	sd1_pins: pinmux_sd1_pins {

		pinctrl-single,pins = <

arch/arm/boot/dts/dm8148-t410.dts

+9 −0
Original line number Diff line number Diff line
@@ -45,6 +45,14 @@ 
	phy-mode = "rgmii";

};



&mmc1 {

	status = "disabled";

};



&mmc2 {

	status = "disabled";

};



&mmc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&sd2_pins>;
@@ -53,6 +61,7 @@ 
	dmas = <&edma_xbar 8 0 1	/* use SDTXEVT1 instead of MCASP0TX */

		&edma_xbar 9 0 2>;	/* use SDRXEVT1 instead of MCASP0RX */

	dma-names = "tx", "rx";

	non-removable;

};



&pincntl {

arch/arm/boot/dts/dra7.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -1451,6 +1451,8 @@ 
			ti,hwmods = "gpmc";

			reg = <0x50000000 0x37c>;      /* device IO registers */

			interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&edma_xbar 4 0>;

			dma-names = "rxtx";

			gpmc,num-cs = <8>;

			gpmc,num-waitpins = <2>;

			#address-cells = <2>;

arch/arm/boot/dts/omap3-evm-37xx.dts

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
			OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_clk.sdmmc2_clk */

			OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_cmd.sdmmc2_cmd */

			OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat0.sdmmc2_dat0 */

			OMAP3_CORE1_IOPAD(0x215e, WAKEUP_EN | PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */

			OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */

			OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat2.sdmmc2_dat2 */

			OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat3.sdmmc2_dat3 */

		>;