]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
imx8mp-phyboard-pollux-rdk: sync with kernel devicetree from v6.8-rc2
authorBenjamin Hahn <B.Hahn@phytec.de>
Thu, 8 Feb 2024 12:03:08 +0000 (13:03 +0100)
committerFabio Estevam <festevam@denx.de>
Thu, 8 Feb 2024 13:11:46 +0000 (10:11 -0300)
sync devicetree with kernel v6.8-rc2.

New commits on kernel v6.8-rc2:
4a58fcdb1818 arm64: dts: imx8mp-phyboard-pollux: Add support for RS232/RS485
3bd7fdcc359e arm64: dts: imx8mp-phyboard-pollux: Add gpio-line-names
f5faa633daf8 arm64: dts: imx8mp-phyboard-pollux: Enable USB support
27c0dc128d04 arm64: dts: imx8mp-phyboard-pollux: Add flexcan support
fa2a1ec50456 arm64: dts: imx8mp-phyboard-pollux: Add missing usdhc clocks assignment
055e38c76388 arm64: dts: imx8mp-phyboard-pollux-rdk: Fix led sub-node names

Signed-off-by: Benjamin Hahn <B.Hahn@phytec.de>
arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts

index 6aa720bafe2898593b80f292e768d83a0a29a105..c8640cac3edceb15b6531bf2ad33aee4c150171b 100644 (file)
                stdout-path = &uart1;
        };
 
+       reg_can1_stby: regulator-can1-stby {
+               compatible = "regulator-fixed";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_flexcan1_reg>;
+               gpio = <&gpio3 20 GPIO_ACTIVE_LOW>;
+               regulator-max-microvolt = <3300000>;
+               regulator-min-microvolt = <3300000>;
+               regulator-name = "can1-stby";
+       };
+
+       reg_can2_stby: regulator-can2-stby {
+               compatible = "regulator-fixed";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_flexcan2_reg>;
+               gpio = <&gpio3 21 GPIO_ACTIVE_LOW>;
+               regulator-max-microvolt = <3300000>;
+               regulator-min-microvolt = <3300000>;
+               regulator-name = "can2-stby";
+       };
+
+       reg_usb1_vbus: regulator-usb1-vbus {
+               compatible = "regulator-fixed";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_usb1_vbus>;
+               gpio = <&gpio1 12 GPIO_ACTIVE_LOW>;
+               regulator-max-microvolt = <5000000>;
+               regulator-min-microvolt = <5000000>;
+               regulator-name = "usb1_host_vbus";
+       };
+
        reg_usdhc2_vmmc: regulator-usdhc2 {
                compatible = "regulator-fixed";
                pinctrl-names = "default";
        };
 };
 
+/* CAN FD */
+&flexcan1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan1>;
+       xceiver-supply = <&reg_can1_stby>;
+       status = "okay";
+};
+
+&flexcan2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan2>;
+       xceiver-supply = <&reg_can2_stby>;
+       status = "okay";
+};
+
 &i2c2 {
        clock-frequency = <400000>;
        pinctrl-names = "default", "gpio";
                compatible = "nxp,pca9533";
                reg = <0x62>;
 
-               led1 {
+               led-1 {
                        type = <PCA9532_TYPE_LED>;
                };
 
-               led2 {
+               led-2 {
                        type = <PCA9532_TYPE_LED>;
                };
 
-               led3 {
+               led-3 {
                        type = <PCA9532_TYPE_LED>;
                };
        };
        status = "okay";
 };
 
+/* USB1 Host mode Type-A */
+&usb3_phy0 {
+       vbus-supply = <&reg_usb1_vbus>;
+       status = "okay";
+};
+
+&usb3_0 {
+       status = "okay";
+};
+
+&usb_dwc3_0 {
+       dr_mode = "host";
+       status = "okay";
+};
+
+/* USB2 4-port USB3.0 HUB */
+&usb3_phy1 {
+       status = "okay";
+};
+
+&usb3_1 {
+       fsl,permanently-attached;
+       fsl,disable-port-power-control;
+       status = "okay";
+};
+
+&usb_dwc3_1 {
+       dr_mode = "host";
+       status = "okay";
+};
+
+/* RS232/RS485 */
+&uart2 {
+       assigned-clocks = <&clk IMX8MP_CLK_UART2>;
+       assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_80M>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart2>;
+       uart-has-rtscts;
+       status = "okay";
+};
+
 /* SD-Card */
 &usdhc2 {
+       assigned-clocks = <&clk IMX8MP_CLK_USDHC2>;
+       assigned-clock-rates = <200000000>;
        pinctrl-names = "default", "state_100mhz", "state_200mhz";
        pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_pins>;
        pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_pins>;
        status = "okay";
 };
 
+&gpio1 {
+       gpio-line-names = "", "", "X_PMIC_WDOG_B", "",
+               "PMIC_SD_VSEL", "", "", "", "", "",
+               "", "", "USB1_OTG_PWR", "", "", "X_nETHPHY_INT";
+};
+
+&gpio2 {
+       gpio-line-names = "", "", "", "",
+               "", "", "", "", "", "",
+               "", "", "X_SD2_CD_B", "", "", "",
+               "", "", "", "SD2_RESET_B";
+};
+
+&gpio3 {
+       gpio-line-names = "", "", "", "",
+               "", "", "", "", "", "",
+               "", "", "", "", "", "",
+               "", "", "", "", "nCAN1_EN", "nCAN2_EN";
+};
+
+&gpio4 {
+       gpio-line-names = "", "", "", "",
+               "", "", "", "", "", "",
+               "", "", "", "", "", "",
+               "", "", "X_PMIC_IRQ_B", "", "nENET0_INT_PWDN";
+};
+
 &iomuxc {
        pinctrl_eqos: eqosgrp {
                fsl,pins = <
                >;
        };
 
+       pinctrl_flexcan1: flexcan1grp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_SAI5_RXD2__CAN1_RX         0x154
+                       MX8MP_IOMUXC_SAI5_RXD1__CAN1_TX         0x154
+               >;
+       };
+
+       pinctrl_flexcan2: flexcan2grp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_SAI5_MCLK__CAN2_RX         0x154
+                       MX8MP_IOMUXC_SAI5_RXD3__CAN2_TX         0x154
+               >;
+       };
+
+       pinctrl_flexcan1_reg: flexcan1reggrp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_SAI5_RXC__GPIO3_IO20       0x154
+               >;
+       };
+
+       pinctrl_flexcan2_reg: flexcan2reggrp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_SAI5_RXD0__GPIO3_IO21      0x154
+               >;
+       };
+
        pinctrl_i2c2: i2c2grp {
                fsl,pins = <
                        MX8MP_IOMUXC_I2C2_SCL__I2C2_SCL         0x400001c2
                >;
        };
 
+       pinctrl_usb1_vbus: usb1vbusgrp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_GPIO1_IO12__GPIO1_IO12     0x10
+               >;
+       };
+
+       pinctrl_uart2: uart2grp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_UART2_RXD__UART2_DCE_RX    0x140
+                       MX8MP_IOMUXC_UART2_TXD__UART2_DCE_TX    0x140
+                       MX8MP_IOMUXC_SAI3_RXC__UART2_DCE_CTS    0x140
+                       MX8MP_IOMUXC_SAI3_RXD__UART2_DCE_RTS    0x140
+               >;
+       };
+
        pinctrl_usdhc2_pins: usdhc2-gpiogrp {
                fsl,pins = <
                        MX8MP_IOMUXC_SD2_CD_B__GPIO2_IO12       0x1c4