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

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

Merge tag 'imx-fixes-3.17-2' of... 

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

Merge "ARM: imx: fixes for 3.17, 2nd take" from Shawn Guo:

i.MX fixes for 3.17, 2nd take:
 - Fixes suspend/resume issue on imx53-qsrb due to PMIC IRQ pin
   configuration missing
 - A couple small SolidRun board fixes/correction from Rabeeh
   and Russell

* tag 'imx-fixes-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: dts: microsom-ar8035: MDIO pad must be set open drain
  ARM: dts: hummingboard/cubox-i: change SPDIF output to be more descriptive
  ARM: dts: hummingboard/cubox-i: add USB OC pinctrl configuration
  ARM: dts: imx53-qsrb: Fix suspend/resume

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

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

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ 
				MX53_PAD_CSI0_DAT9__I2C1_SCL      0x400001ec

			>;

		};



		pinctrl_pmic: pmicgrp {

			fsl,pins = <

				MX53_PAD_CSI0_DAT5__GPIO5_23	0x1e4 /* IRQ */

			>;

		};

	};

};
@@ -38,6 +44,8 @@ 


	pmic: mc34708@8 {

		compatible = "fsl,mc34708";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_pmic>;

		reg = <0x08>;

		interrupt-parent = <&gpio5>;

		interrupts = <23 0x8>;

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

+3 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 


	sound-spdif {

		compatible = "fsl,imx-audio-spdif";

		model = "imx-spdif";

		model = "On-board SPDIF";

		/* IMX6 doesn't implement this yet */

		spdif-controller = <&spdif>;

		spdif-out;
@@ -181,11 +181,13 @@ 
};



&usbh1 {

	disable-over-current;

	vbus-supply = <&reg_usbh1_vbus>;

	status = "okay";

};



&usbotg {

	disable-over-current;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;

	vbus-supply = <&reg_usbotg_vbus>;

arch/arm/boot/dts/imx6qdl-cubox-i.dtsi

+14 −5
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 


	sound-spdif {

		compatible = "fsl,imx-audio-spdif";

		model = "imx-spdif";

		model = "Integrated SPDIF";

		/* IMX6 doesn't implement this yet */

		spdif-controller = <&spdif>;

		spdif-out;
@@ -130,16 +130,23 @@ 
			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;

		};



		pinctrl_cubox_i_usbh1: cubox-i-usbh1 {

			fsl,pins = <MX6QDL_PAD_GPIO_3__USB_H1_OC 0x1b0b0>;

		};



		pinctrl_cubox_i_usbh1_vbus: cubox-i-usbh1-vbus {

			fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x4001b0b0>;

		};



		pinctrl_cubox_i_usbotg_id: cubox-i-usbotg-id {

		pinctrl_cubox_i_usbotg: cubox-i-usbotg {

			/*

			 * The Cubox-i pulls this low, but as it's pointless

			 * The Cubox-i pulls ID low, but as it's pointless

			 * leaving it as a pull-up, even if it is just 10uA.

			 */

			fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;

			fsl,pins = <

				MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059

				MX6QDL_PAD_KEY_COL4__USB_OTG_OC 0x1b0b0

			>;

		};



		pinctrl_cubox_i_usbotg_vbus: cubox-i-usbotg-vbus {
@@ -173,13 +180,15 @@ 
};



&usbh1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_cubox_i_usbh1>;

	vbus-supply = <&reg_usbh1_vbus>;

	status = "okay";

};



&usbotg {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_cubox_i_usbotg_id>;

	pinctrl-0 = <&pinctrl_cubox_i_usbotg>;

	vbus-supply = <&reg_usbotg_vbus>;

	status = "okay";

};

arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
	enet {

		pinctrl_microsom_enet_ar8035: microsom-enet-ar8035 {

			fsl,pins = <

				MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0

				MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b8b0

				MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0

				/* AR8035 reset */

				MX6QDL_PAD_KEY_ROW4__GPIO4_IO15		0x130b0