Commit f3042a86 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Shawn Guo
Browse files

ARM: dts: imx6: rdu2: Add node for UCS1002 USB charger chip 



Add node for UCS1002 USB charger chip connected to front panel USB and
replace "regulator-fixed" previously used to control VBUS.

Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-by: default avatarLucas Stach <l.stach@pengutronix.de>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 02f8eb40

arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi

+59 −18
Original line number Diff line number Diff line
@@ -60,18 +60,6 @@ reg_5p0v_main: regulator-5p0v-main { 
		regulator-always-on;

	};



	reg_5p0v_user_usb: regulator-5p0v-user-usb {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_reg_user_usb>;

		vin-supply = <&reg_5p0v_main>;

		regulator-name = "5V_USER_USB";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio3 22 GPIO_ACTIVE_LOW>;

		startup-delay-us = <1000>;

	};



	reg_3p3v_pmic: regulator-3p3v-pmic {

		compatible = "regulator-fixed";

		vin-supply = <&reg_12p0v>;
@@ -331,6 +319,39 @@ flash@0 { 
	};

};



&gpio3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_gpio3_hog>;



	usb-emulation {

		gpio-hog;

		gpios = <19 GPIO_ACTIVE_HIGH>;

		output-low;

		line-name = "usb-emulation";

	};



	usb-mode1 {

		gpio-hog;

		gpios = <20 GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "usb-mode1";

	};



	usb-pwr {

		gpio-hog;

		gpios = <22 GPIO_ACTIVE_LOW>;

		output-high;

		line-name = "usb-pwr-ctrl-en-n";

	};



	usb-mode2 {

		gpio-hog;

		gpios = <23 GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "usb-mode2";

	};

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c1>;
@@ -592,6 +613,16 @@ touchscreen@2a { 
		status = "disabled";

	};



	reg_5p0v_user_usb: charger@32 {

		compatible = "microchip,ucs1002";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_ucs1002_pins>;

		reg = <0x32>;

		interrupts-extended = <&gpio5 2 IRQ_TYPE_EDGE_BOTH>,

				      <&gpio3 21 IRQ_TYPE_EDGE_BOTH>;

		interrupt-names = "a_det", "alert";

	};



	hpa1: amp@60 {

		compatible = "ti,tpa6130a2";

		pinctrl-names = "default";
@@ -936,6 +967,15 @@ MX6QDL_PAD_ENET_REF_CLK__GPIO1_IO23 0x1b0b0 
		>;

	};



	pinctrl_gpio3_hog: gpio3hoggrp {

		fsl,pins = <

			MX6QDL_PAD_EIM_D19__GPIO3_IO19		0x1b0b0

			MX6QDL_PAD_EIM_D20__GPIO3_IO20		0x1b0b0

			MX6QDL_PAD_EIM_D22__GPIO3_IO22		0x1b0b0

			MX6QDL_PAD_EIM_D23__GPIO3_IO23		0x1b0b0

		>;

	};



	pinctrl_i2c1: i2c1grp {

		fsl,pins = <

			MX6QDL_PAD_CSI0_DAT8__I2C1_SDA		0x4001b8b1
@@ -983,12 +1023,6 @@ MX6QDL_PAD_SD3_RST__GPIO7_IO08 0x858 
		>;

	};



	pinctrl_reg_user_usb: usbotggrp {

		fsl,pins = <

			MX6QDL_PAD_EIM_D22__GPIO3_IO22		0x40000038

		>;

	};



	pinctrl_rmii_phy_irq: phygrp {

		fsl,pins = <

			MX6QDL_PAD_EIM_D30__GPIO3_IO30		0x40010000
@@ -1048,6 +1082,13 @@ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1 
		>;

	};



	pinctrl_ucs1002_pins: ucs1002grp {

		fsl,pins = <

			MX6QDL_PAD_EIM_A25__GPIO5_IO02  	0x1b0b0

			MX6QDL_PAD_EIM_D21__GPIO3_IO21  	0x1b0b0

		>;

	};



	pinctrl_usdhc2: usdhc2grp {

		fsl,pins = <

			MX6QDL_PAD_SD2_CMD__SD2_CMD		0x10059