From a352c4ed3fab2b31c4beacf047838435b68efdb9 Mon Sep 17 00:00:00 2001
From: Li Jun <jun.li@nxp.com>
Date: Tue, 30 Jul 2019 15:29:10 +0800
Subject: [PATCH] MLK-22356 arm64: dts: imx8mn: Correct typec node

Use the correct typec node properties according to typec driver
update.

Acked-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
---
 .../dts/freescale/fsl-imx8mn-ddr4-evk.dts     | 60 ++++++++++++-------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mn-ddr4-evk.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mn-ddr4-evk.dts
index 56882fc7b352..578d38645f34 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mn-ddr4-evk.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mn-ddr4-evk.dts
@@ -13,7 +13,7 @@
  */
 
 /dts-v1/;
-
+#include <dt-bindings/usb/pd.h>
 #include "fsl-imx8mn.dtsi"
 
 / {
@@ -296,6 +296,12 @@
 			>;
 		};
 
+		pinctrl_typec2: typec2grp {
+			fsl,pins = <
+				MX8MN_IOMUXC_SD2_CD_B_GPIO2_IO12	0x159
+			>;
+		};
+
 		pinctrl_usdhc1_gpio: usdhc1grpgpio {
 			fsl,pins = <
 				MX8MN_IOMUXC_SD1_RESET_B_GPIO2_IO10	0x41
@@ -675,36 +681,46 @@
 		};
 	};
 
-	typec_ptn5110_1: ptn5110@50 {
-		compatible = "usb,tcpci";
+	typec1_ptn5110: tcpci@50 {
+		compatible = "nxp,ptn5110";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_typec1>;
 		reg = <0x50>;
 		interrupt-parent = <&gpio2>;
 		interrupts = <11 8>;
-		src-pdos = <0x380190c8>;
-		snk-pdos = <0x380190c8>;
-		max-snk-mv = <5000>;
-		max-snk-ma = <3000>;
-		op-snk-mw = <10000>;
-		max-snk-mw = <15000>;
-		port-type = "drp";
-		default-role = "sink";
 		status = "okay";
+
+		usb_con1: connector {
+			compatible = "usb-c-connector";
+			label = "USB-C";
+			power-role = "dual";
+			data-role = "dual";
+			try-power-role = "sink";
+			source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
+			sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)
+				     PDO_VAR(5000, 20000, 3000)>;
+			op-sink-microwatt = <15000000>;
+			self-powered;
+		};
 	};
 
-	typec_ptn5110_2: ptn5110@52 {
-		compatible = "usb,tcpci";
+	typec2_ptn5110: tcpci@52 {
+		compatible = "nxp,ptn5110";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_typec2>;
 		reg = <0x52>;
-		src-pdos = <0x380190c8>;
-		snk-pdos = <0x380190c8 0x3802d0c8>;
-		max-snk-mv = <9000>;
-		max-snk-ma = <2000>;
-		op-snk-mw = <9000>;
-		max-snk-mw = <18000>;
-		port-type = "drp";
-		default-role = "sink";
+		interrupt-parent = <&gpio2>;
+		interrupts = <12 8>;
 		status = "disabled";
+
+		usb_con2: connector {
+			compatible = "usb-c-connector";
+			label = "USB-C";
+			power-role = "sink";
+			sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_HIGHER_CAP)
+				     PDO_VAR(5000, 20000, 3000)>;
+			op-sink-microwatt = <15000000>;
+		};
 	};
 };
 
@@ -956,7 +972,7 @@
 
 &usbotg1 {
 	dr_mode = "otg";
-	extcon = <0>, <&typec_ptn5110_1>;
+	extcon = <0>, <&typec1_ptn5110>;
 	picophy,pre-emp-curr-control = <3>;
 	picophy,dc-vol-level-adjust = <7>;
 	status = "okay";
-- 
2.17.1