Configure PTN5150 on Columbia

- Unlike the evk, Columbia uses PTN5150 for type-c detection (also, only
has a single type-c port). Remove references to the ptn5110 and add
ptn5150.

Change-Id: Id70662943347321abe721cf2c978001efb3f57f6
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mm-columbia.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mm-columbia.dts
index 32c3801..89ddeeb 100755
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mm-columbia.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mm-columbia.dts
@@ -225,18 +225,6 @@
 			>;
 		};
 
-		pinctrl_typec1: typec1grp {
-			fsl,pins = <
-				MX8MM_IOMUXC_SD1_STROBE_GPIO2_IO11	0x159
-			>;
-		};
-
-		pinctrl_typec2: typec2grp {
-			fsl,pins = <
-				MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12	0x159
-			>;
-		};
-
 		pinctrl_sai1: sai1grp {
 			fsl,pins = <
 				MX8MM_IOMUXC_SAI1_MCLK_SAI1_MCLK	0xd6
@@ -479,6 +467,12 @@
 				MX8MM_IOMUXC_SAI3_RXFS_GPIO4_IO28 0x41
 			>;
 		};
+
+		pinctrl_ptn5150: ptn5150grp {
+			fsl,pins = <
+				MX8MM_IOMUXC_GPIO1_IO11_GPIO1_IO11 0x41
+			>;
+		};
 	};
 };
 
@@ -668,47 +662,8 @@
 			};
 		};
 	};
-
-	typec1_ptn5110: tcpci@50 {
-		compatible = "usb,tcpci";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_typec1>;
-		reg = <0x50>;
-		interrupt-parent = <&gpio2>;
-		interrupts = <11 8>;
-		src-pdos = <0x380190c8>;
-		snk-pdos = <0x380190c8>;
-		/* Only can sink 5V for safe */
-		max-snk-mv = <5000>;
-		max-snk-ma = <3000>;
-		op-snk-mw = <10000>;
-		max-snk-mw = <15000>;
-		port-type = "drp";
-		default-role = "sink";
-		status = "okay";
-	};
-
-	typec2_ptn5110: tcpci@52 {
-		compatible = "usb,tcpci";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_typec2>;
-		reg = <0x52>;
-		interrupt-parent = <&gpio2>;
-		interrupts = <12 8>;
-		src-pdos = <0x380190c8>;
-		snk-pdos = <0x380190c8>;
-		/* Only can sink 5V for safe */
-		max-snk-mv = <5000>;
-		max-snk-ma = <3000>;
-		op-snk-mw = <10000>;
-		max-snk-mw = <15000>;
-		port-type = "drp";
-		default-role = "sink";
-		status = "okay";
-	};
 };
 
-
 &mipi_csi_1 {
 	#address-cells = <1>;
 	#size-cells = <0>;
@@ -778,6 +733,16 @@
 		reg = <0x30>;
 		status = "okay";
 	};
+
+	typec_ptn5150: ptn5150@3d {
+		compatible = "nxp,ptn5150a";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_ptn5150>;
+		reg = <0x3d>;
+		interrupt-parent = <&gpio1>;
+		interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
+		status = "okay";
+	};
 };
 
 &lcdif {
@@ -919,7 +884,7 @@
 
 &usbotg1 {
 	dr_mode = "otg";
-	extcon = <0>, <&typec1_ptn5110>;
+	extcon = <0>, <&typec_ptn5150>;
 	picophy,pre-emp-curr-control = <3>;
 	picophy,dc-vol-level-adjust = <7>;
 	status = "okay";