Re: [PATCH v2 1/4] imx8mp-phyboard-pollux-rdk: sync with kernel devicetree from v6.8-rc2
On Tue, Feb 06, 2024 at 10:36:33AM +, Teresa Remmet wrote: > Hello Benjamin, > > > Am Mittwoch, dem 31.01.2024 um 09:45 +0100 schrieb Benjamin Hahn: > > Signed-off-by: Benjamin Hahn > > please add a proper patch description. Adding only a subject line > ist not enough. > One idea that I had is when people are synching with mainline they could put the oneline summary of the stuff that's getting merged. In this case it's the 6 most recent commits. $ git log --oneline arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts 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 regards, dan carpenter
Re: [PATCH v2 1/4] imx8mp-phyboard-pollux-rdk: sync with kernel devicetree from v6.8-rc2
Hello Benjamin,
Am Mittwoch, dem 31.01.2024 um 09:45 +0100 schrieb Benjamin Hahn:
> Signed-off-by: Benjamin Hahn
please add a proper patch description. Adding only a subject line
ist not enough.
Thanks,
Teresa
> ---
> arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts | 162
> +++-
> 1 file changed, 159 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts
> b/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts
> index 6aa720bafe..c8640cac3e 100644
> --- a/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts
> +++ b/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts
> @@ -19,6 +19,36 @@
> stdout-path =
> };
>
> + reg_can1_stby: regulator-can1-stby {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <_flexcan1_reg>;
> + gpio = < 20 GPIO_ACTIVE_LOW>;
> + regulator-max-microvolt = <330>;
> + regulator-min-microvolt = <330>;
> + regulator-name = "can1-stby";
> + };
> +
> + reg_can2_stby: regulator-can2-stby {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <_flexcan2_reg>;
> + gpio = < 21 GPIO_ACTIVE_LOW>;
> + regulator-max-microvolt = <330>;
> + regulator-min-microvolt = <330>;
> + regulator-name = "can2-stby";
> + };
> +
> + reg_usb1_vbus: regulator-usb1-vbus {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <_usb1_vbus>;
> + gpio = < 12 GPIO_ACTIVE_LOW>;
> + regulator-max-microvolt = <500>;
> + regulator-min-microvolt = <500>;
> + regulator-name = "usb1_host_vbus";
> + };
> +
> reg_usdhc2_vmmc: regulator-usdhc2 {
> compatible = "regulator-fixed";
> pinctrl-names = "default";
> @@ -57,6 +87,21 @@
> };
> };
>
> +/* CAN FD */
> + {
> + pinctrl-names = "default";
> + pinctrl-0 = <_flexcan1>;
> + xceiver-supply = <_can1_stby>;
> + status = "okay";
> +};
> +
> + {
> + pinctrl-names = "default";
> + pinctrl-0 = <_flexcan2>;
> + xceiver-supply = <_can2_stby>;
> + status = "okay";
> +};
> +
> {
> clock-frequency = <40>;
> pinctrl-names = "default", "gpio";
> @@ -76,15 +121,15 @@
> compatible = "nxp,pca9533";
> reg = <0x62>;
>
> - led1 {
> + led-1 {
> type = ;
> };
>
> - led2 {
> + led-2 {
> type = ;
> };
>
> - led3 {
> + led-3 {
> type = ;
> };
> };
> @@ -101,8 +146,51 @@
> status = "okay";
> };
>
> +/* USB1 Host mode Type-A */
> +_phy0 {
> + vbus-supply = <_usb1_vbus>;
> + status = "okay";
> +};
> +
> +_0 {
> + status = "okay";
> +};
> +
> +_dwc3_0 {
> + dr_mode = "host";
> + status = "okay";
> +};
> +
> +/* USB2 4-port USB3.0 HUB */
> +_phy1 {
> + status = "okay";
> +};
> +
> +_1 {
> + fsl,permanently-attached;
> + fsl,disable-port-power-control;
> + status = "okay";
> +};
> +
> +_dwc3_1 {
> + dr_mode = "host";
> + status = "okay";
> +};
> +
> +/* RS232/RS485 */
> + {
> + assigned-clocks = < IMX8MP_CLK_UART2>;
> + assigned-clock-parents = < IMX8MP_SYS_PLL1_80M>;
> + pinctrl-names = "default";
> + pinctrl-0 = <_uart2>;
> + uart-has-rtscts;
> + status = "okay";
> +};
> +
> /* SD-Card */
> {
> + assigned-clocks = < IMX8MP_CLK_USDHC2>;
> + assigned-clock-rates = <2>;
> pinctrl-names = "default", "state_100mhz", "state_200mhz";
> pinctrl-0 = <_usdhc2>, <_usdhc2_pins>;
> pinctrl-1 = <_usdhc2_100mhz>, <_usdhc2_pins>;
> @@ -113,6 +201,33 @@
> status = "okay";
> };
>
> + {
> + gpio-line-names = "", "", "X_PMIC_WDOG_B", "",
> + "PMIC_SD_VSEL", "", "", "", "", "",
> + "", "", "USB1_OTG_PWR", "", "", "X_nETHPHY_INT";
> +};
> +
> + {
> + gpio-line-names = "", "", "", "",
> + "", "", "", "", "", "",
> + "", "", "X_SD2_CD_B", "", "", "",
> + "", "", "", "SD2_RESET_B";
> +};
> +
> + {
> + gpio-line-names = "", "", "", "",
> + "", "", "", "", "", "",
> + "", "", "", "", "", "",
> + "", "", "", "", "nCAN1_EN", "nCAN2_EN";
> +};
> +
> + {
> + gpio-line-names = "", "", "", "",
> + "", "", "", "", "", "",
> + "", "", "", "", "", "",
> + "", "", "X_PMIC_IRQ_B", "", "nENET0_INT_PWDN";
> +};
> +
> {
>
[PATCH v2 1/4] imx8mp-phyboard-pollux-rdk: sync with kernel devicetree from v6.8-rc2
Signed-off-by: Benjamin Hahn
---
arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts | 162 +++-
1 file changed, 159 insertions(+), 3 deletions(-)
diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts
b/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts
index 6aa720bafe..c8640cac3e 100644
--- a/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts
+++ b/arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts
@@ -19,6 +19,36 @@
stdout-path =
};
+ reg_can1_stby: regulator-can1-stby {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <_flexcan1_reg>;
+ gpio = < 20 GPIO_ACTIVE_LOW>;
+ regulator-max-microvolt = <330>;
+ regulator-min-microvolt = <330>;
+ regulator-name = "can1-stby";
+ };
+
+ reg_can2_stby: regulator-can2-stby {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <_flexcan2_reg>;
+ gpio = < 21 GPIO_ACTIVE_LOW>;
+ regulator-max-microvolt = <330>;
+ regulator-min-microvolt = <330>;
+ regulator-name = "can2-stby";
+ };
+
+ reg_usb1_vbus: regulator-usb1-vbus {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <_usb1_vbus>;
+ gpio = < 12 GPIO_ACTIVE_LOW>;
+ regulator-max-microvolt = <500>;
+ regulator-min-microvolt = <500>;
+ regulator-name = "usb1_host_vbus";
+ };
+
reg_usdhc2_vmmc: regulator-usdhc2 {
compatible = "regulator-fixed";
pinctrl-names = "default";
@@ -57,6 +87,21 @@
};
};
+/* CAN FD */
+ {
+ pinctrl-names = "default";
+ pinctrl-0 = <_flexcan1>;
+ xceiver-supply = <_can1_stby>;
+ status = "okay";
+};
+
+ {
+ pinctrl-names = "default";
+ pinctrl-0 = <_flexcan2>;
+ xceiver-supply = <_can2_stby>;
+ status = "okay";
+};
+
{
clock-frequency = <40>;
pinctrl-names = "default", "gpio";
@@ -76,15 +121,15 @@
compatible = "nxp,pca9533";
reg = <0x62>;
- led1 {
+ led-1 {
type = ;
};
- led2 {
+ led-2 {
type = ;
};
- led3 {
+ led-3 {
type = ;
};
};
@@ -101,8 +146,51 @@
status = "okay";
};
+/* USB1 Host mode Type-A */
+_phy0 {
+ vbus-supply = <_usb1_vbus>;
+ status = "okay";
+};
+
+_0 {
+ status = "okay";
+};
+
+_dwc3_0 {
+ dr_mode = "host";
+ status = "okay";
+};
+
+/* USB2 4-port USB3.0 HUB */
+_phy1 {
+ status = "okay";
+};
+
+_1 {
+ fsl,permanently-attached;
+ fsl,disable-port-power-control;
+ status = "okay";
+};
+
+_dwc3_1 {
+ dr_mode = "host";
+ status = "okay";
+};
+
+/* RS232/RS485 */
+ {
+ assigned-clocks = < IMX8MP_CLK_UART2>;
+ assigned-clock-parents = < IMX8MP_SYS_PLL1_80M>;
+ pinctrl-names = "default";
+ pinctrl-0 = <_uart2>;
+ uart-has-rtscts;
+ status = "okay";
+};
+
/* SD-Card */
{
+ assigned-clocks = < IMX8MP_CLK_USDHC2>;
+ assigned-clock-rates = <2>;
pinctrl-names = "default", "state_100mhz", "state_200mhz";
pinctrl-0 = <_usdhc2>, <_usdhc2_pins>;
pinctrl-1 = <_usdhc2_100mhz>, <_usdhc2_pins>;
@@ -113,6 +201,33 @@
status = "okay";
};
+ {
+ gpio-line-names = "", "", "X_PMIC_WDOG_B", "",
+ "PMIC_SD_VSEL", "", "", "", "", "",
+ "", "", "USB1_OTG_PWR", "", "", "X_nETHPHY_INT";
+};
+
+ {
+ gpio-line-names = "", "", "", "",
+ "", "", "", "", "", "",
+ "", "", "X_SD2_CD_B", "", "", "",
+ "", "", "", "SD2_RESET_B";
+};
+
+ {
+ gpio-line-names = "", "", "", "",
+ "", "", "", "", "", "",
+ "", "", "", "", "", "",
+ "", "", "", "", "nCAN1_EN", "nCAN2_EN";
+};
+
+ {
+ gpio-line-names = "", "", "", "",
+ "", "", "", "", "", "",
+ "", "", "", "", "", "",
+ "", "", "X_PMIC_IRQ_B", "", "nENET0_INT_PWDN";
+};
+
{
pinctrl_eqos: eqosgrp {
fsl,pins = <
@@ -134,6 +249,32 @@
>;
};
+ 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
+
