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

Commit f340a59f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-3.16' of... 

Merge tag 'imx-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

Pull "i.MX fixes for 3.16" from Shawn Guo:

 - Use GPIO for card CD/WP on imx51-babbage and eukrea-mbimxsd51,
   because controller base CD/WP is not working in esdhc driver due to
   runtime PM support
 - A couple of random ventana gw5xxx board fixes
 - Add IMX_IPUV3_CORE back to defconfig, which gets lost when moving
   IPUv3 driver out of staging tree
 - Fix enet/fec clock selection on imx6sl
 - Fix display node on imx53-m53evk board
 - A couple of Cubox-i updates from Russell, which were omitted from
   the merge window due to dependency

* tag 'imx-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx51-eukrea-mbimxsd51-baseboard: unbreak esdhc.
  ARM: dts: imx51-babbage: Fix esdhc setup
  ARM: dts: mx5: Move the display out of soc {} node
  ARM: dts: mx5: Fix IPU port node placement
  ARM: imx_v6_v7_defconfig: Enable CONFIG_IMX_IPUV3_CORE
  ARM: dts: hummingboard/cubox-i: move usb otg configuration to platform level
  ARM: dts: cubox-i: add support for PWM-driven front panel LED
  ARM: dts: imx6: ventana: correct gw52xx sgtl5000 clock source
  ARM: dts: imx6qdl-gw5xxx: Fix Linear Technology vendor prefix
  ARM: dts: imx6: ventana: fix include typo
  ARM: dts: imx6sl: correct the fec ipg clock source
  ARM: imx6sl: add missing enet clock for imx6sl
parents 9cbf3d2b 7d278f27

arch/arm/boot/dts/imx51-babbage.dts

+5 −5
Original line number Diff line number Diff line
@@ -315,15 +315,15 @@ 
&esdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1>;

	fsl,cd-controller;

	fsl,wp-controller;

	cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;

	status = "okay";

};



&esdhc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc2>;

	cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;

	status = "okay";

};
@@ -468,8 +468,8 @@ 
				MX51_PAD_SD1_DATA1__SD1_DATA1		0x20d5

				MX51_PAD_SD1_DATA2__SD1_DATA2		0x20d5

				MX51_PAD_SD1_DATA3__SD1_DATA3		0x20d5

				MX51_PAD_GPIO1_0__SD1_CD		0x20d5

				MX51_PAD_GPIO1_1__SD1_WP		0x20d5

				MX51_PAD_GPIO1_0__GPIO1_0		0x100

				MX51_PAD_GPIO1_1__GPIO1_1		0x100

			>;

		};

arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 
&esdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1 &pinctrl_esdhc1_cd>;

	fsl,cd-controller;

	cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;

	status = "okay";

};
@@ -206,7 +206,7 @@ 


		pinctrl_esdhc1_cd: esdhc1_cd {

			fsl,pins = <

				MX51_PAD_GPIO1_0__SD1_CD 0x20d5

				MX51_PAD_GPIO1_0__GPIO1_0 0xd5

			>;

		};

arch/arm/boot/dts/imx53-m53evk.dts

+19 −21
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
		      <0xb0000000 0x20000000>;

	};



	soc {

	display1: display@di1 {

		compatible = "fsl,imx-parallel-display";

		interface-pix-fmt = "bgr666";
@@ -43,7 +42,6 @@ 
				vsync-active = <1>;

			};

		};

		};



		port {

			display1_in: endpoint {

arch/arm/boot/dts/imx6dl-hummingboard.dts

+10 −0
Original line number Diff line number Diff line
@@ -143,6 +143,14 @@ 
			fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0>;

		};



		pinctrl_hummingboard_usbotg_id: hummingboard-usbotg-id {

			/*

			 * Similar to pinctrl_usbotg_2, but we want it

			 * pulled down for a fixed host connection.

			 */

			fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;

		};



		pinctrl_hummingboard_usbotg_vbus: hummingboard-usbotg-vbus {

			fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0>;

		};
@@ -178,6 +186,8 @@ 
};



&usbotg {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;

	vbus-supply = <&reg_usbotg_vbus>;

	status = "okay";

};

arch/arm/boot/dts/imx6q-gw51xx.dts

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


/dts-v1/;

#include "imx6q.dtsi"

#include "imx6qdl-gw54xx.dtsi"

#include "imx6qdl-gw51xx.dtsi"



/ {

	model = "Gateworks Ventana i.MX6 Quad GW51XX";