clk: imx8mn: correct the usb1_ctrl parent to be usb_bus
PATCH 1/3 clk: imx8mn: correct the usb1_ctrl parent to be usb_bus
From: Li Jun <[email protected]>
Per latest imx8mn datasheet of CCM, the parent of usb1_ctrl_root_clk should be usb_bus.
--- drivers/clk/imx/clk-imx8mn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/imx/clk-imx8mn.c +1 -1
@@ -512,7 +512,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) clks[IMX8MN_CLK_UART2_ROOT ] =imx_clk_gate4 ("uart2_root_clk" ,"uart2" , base +0x44a0 ,0 ); clks[IMX8MN_CLK_UART3_ROOT ] =imx_clk_gate4 ("uart3_root_clk" ,"uart3" , base +0x44b0 ,0 ); clks[IMX8MN_CLK_UART4_ROOT ] =imx_clk_gate4 ("uart4_root_clk" ,"uart4" , base +0x44c0 ,0 ); - clks[IMX8MN_CLK_USB1_CTRL_ROOT ] =imx_clk_gate4 ("usb1_ctrl_root_clk" ,"usb_core_ref" , base +0x44d0 ,0 ); + clks[IMX8MN_CLK_USB1_CTRL_ROOT ] =imx_clk_gate4 ("usb1_ctrl_root_clk" ,"usb_bus" , base +0x44d0 ,0 ); clks[IMX8MN_CLK_GPU_CORE_ROOT ] =imx_clk_gate4 ("gpu_core_root_clk" ,"gpu_core_div" , base +0x44f0 ,0 ); clks[IMX8MN_CLK_USDHC1_ROOT ] =imx_clk_gate4 ("usdhc1_root_clk" ,"usdhc1" , base +0x4510 ,0 ); clks[IMX8MN_CLK_USDHC2_ROOT ] =imx_clk_gate4 ("usdhc2_root_clk" ,"usdhc2" , base +0x4520 ,0 );
Signature · 1 line
2.7.4
PATCH 2/3 arm64: dts: imx8mn: Remove setting for IMX8MN_CLK_USB_CORE_REF
From: Li Jun <[email protected]>
Since IMX8MN_CLK_USB_CORE_REF is not used at all, so remove the setting for it.
--- arch/arm64/boot/dts/freescale/imx8mn.dtsi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/freescale/imx8mn.dtsi +2 -4
@@ -683,10 +683,8 @@ interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk IMX8MN_CLK_USB1_CTRL_ROOT>; clock-names = "usb1_ctrl_root_clk"; - assigned-clocks = <&clk IMX8MN_CLK_USB_BUS>, - <&clk IMX8MN_CLK_USB_CORE_REF>; - assigned-clock-parents = <&clk IMX8MN_SYS_PLL2_500M>, - <&clk IMX8MN_SYS_PLL1_100M>; + assigned-clocks = <&clk IMX8MN_CLK_USB_BUS>; + assigned-clock-parents = <&clk IMX8MN_SYS_PLL2_500M>; fsl,usbphy = <&usbphynop1>; fsl,usbmisc = <&usbmisc1 0>; status = "disabled";
Signature · 1 line
2.7.4
PATCH 3/3 arm64: dts: imx8mn-evk: enable usb1 and typec support
In reply to Jun LiFrom: Li Jun <[email protected]>
USB1 port has typec connector with power delivery support:
- Dual data role: host and device.
- Dual power role: source and sink, prefer power sink.
--- arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 65 +++++++++++++++++++++++++++ 1 file changed, 65 insertions(+)
arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi +65 -0
@@ -3,6 +3,7 @@ * Copyright 2019 NXP */ +#include <dt-bindings/usb/pd.h> #include "imx8mn.dtsi" / {
@@ -60,6 +61,42 @@ status = "okay"; }; +&i2c2 { + clock-frequency = <400000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; + + ptn5110: tcpc@50 { + compatible = "nxp,ptn5110"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_typec1>; + reg = <0x50>; + interrupt-parent = <&gpio2>; + interrupts = <11 8>; + status = "okay"; + + port { + typec1_dr_sw: endpoint { + remote-endpoint = <&usb1_drd_sw>; + }; + }; + + typec1_con: 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; + }; + }; +}; + &snvs_pwrkey { status = "okay"; };
@@ -70,6 +107,21 @@ status = "okay"; }; +&usbotg1 { + dr_mode = "otg"; + hnp-disable; + srp-disable; + adp-disable; + usb-role-switch; + status = "okay"; + + port { + usb1_drd_sw: endpoint { + remote-endpoint = <&typec1_dr_sw>; + }; + }; +}; + &usdhc2 { assigned-clocks = <&clk IMX8MN_CLK_USDHC2>; assigned-clock-rates = <200000000>;
@@ -138,12 +190,25 @@ >; }; + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX8MN_IOMUXC_I2C2_SCL_I2C2_SCL 0x400001c3 + MX8MN_IOMUXC_I2C2_SDA_I2C2_SDA 0x400001c3 + >; + }; + pinctrl_reg_usdhc2_vmmc: regusdhc2vmmc { fsl,pins = < MX8MN_IOMUXC_SD2_RESET_B_GPIO2_IO19 0x41 >; }; + pinctrl_typec1: typec1grp { + fsl,pins = < + MX8MN_IOMUXC_SD1_STROBE_GPIO2_IO11 0x159 + >; + }; + pinctrl_uart2: uart2grp { fsl,pins = < MX8MN_IOMUXC_UART2_RXD_UART2_DCE_RX 0x140
Signature · 1 line
2.7.4
Re: [PATCH 3/3] arm64: dts: imx8mn-evk: enable usb1 and typec support
Quoted 30 lines · Jun Li
From: Li Jun <[email protected]>
USB1 port has typec connector with power delivery support:
- Dual data role: host and device.
- Dual power role: source and sink, prefer power sink.Signed-off-by Li Jun <[email protected]>--- arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 65 +++++++++++++++++++++++++++ 1 file changed, 65 insertions(+)arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi +4
-0@@ -3,6 +3,7 @@ * Copyright 2019 NXP */ +#include <dt-bindings/usb/pd.h> #include "imx8mn.dtsi" / {@@ -60,6 +61,42 @@ status = "okay"; }; +&i2c2 { + clock-frequency = <400000>; + pinctrl-names = "default";
arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi line 76
Quoted 10 lines
arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi +10
-0+ pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; + + ptn5110: tcpc@50 { + compatible = "nxp,ptn5110"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_typec1>; + reg = <0x50>; + interrupt-parent = <&gpio2>; + interrupts = <11 8>;
We prefer to use macro for IRQ type:
s/8/IRQ_TYPE_LEVEL_LOW
I fixed it up and applied all 3 patches.
Shawn
Quoted 77 lines
arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi +51
-0+ status = "okay"; + + port { + typec1_dr_sw: endpoint { + remote-endpoint = <&usb1_drd_sw>; + }; + }; + + typec1_con: 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; + }; + }; +}; + &snvs_pwrkey { status = "okay"; };@@ -70,6 +107,21 @@ status = "okay"; }; +&usbotg1 { + dr_mode = "otg"; + hnp-disable; + srp-disable; + adp-disable; + usb-role-switch; + status = "okay"; + + port { + usb1_drd_sw: endpoint { + remote-endpoint = <&typec1_dr_sw>; + }; + }; +}; + &usdhc2 { assigned-clocks = <&clk IMX8MN_CLK_USDHC2>; assigned-clock-rates = <200000000>;@@ -138,12 +190,25 @@ >; }; + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX8MN_IOMUXC_I2C2_SCL_I2C2_SCL 0x400001c3 + MX8MN_IOMUXC_I2C2_SDA_I2C2_SDA 0x400001c3 + >; + }; + pinctrl_reg_usdhc2_vmmc: regusdhc2vmmc { fsl,pins = < MX8MN_IOMUXC_SD2_RESET_B_GPIO2_IO19 0x41 >; }; + pinctrl_typec1: typec1grp { + fsl,pins = < + MX8MN_IOMUXC_SD1_STROBE_GPIO2_IO11 0x159 + >; + }; + pinctrl_uart2: uart2grp { fsl,pins = < MX8MN_IOMUXC_UART2_RXD_UART2_DCE_RX 0x140Signature · 1 line
2.7.4