forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f
kernel/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
....@@ -107,7 +107,7 @@
107107 pinctrl-0 = <&pinctrl_ecspi1>;
108108 status = "okay";
109109
110
- flash: m25p80@0 {
110
+ flash: flash@0 {
111111 compatible = "microchip,sst25vf016b";
112112 spi-max-frequency = <20000000>;
113113 reg = <0>;
....@@ -229,6 +229,7 @@
229229 };
230230
231231 &pwm4 {
232
+ #pwm-cells = <2>;
232233 pinctrl-names = "default";
233234 pinctrl-0 = <&pinctrl_pwm4>;
234235 status = "okay";
....@@ -484,31 +485,31 @@
484485
485486 pinctrl_uart1: uart1grp {
486487 fsl,pins = <
487
- MX6SX_PAD_GPIO1_IO04__UART1_TX 0x1b0b1
488
- MX6SX_PAD_GPIO1_IO05__UART1_RX 0x1b0b1
488
+ MX6SX_PAD_GPIO1_IO04__UART1_DCE_TX 0x1b0b1
489
+ MX6SX_PAD_GPIO1_IO05__UART1_DCE_RX 0x1b0b1
489490 >;
490491 };
491492
492493 pinctrl_uart2: uart2grp {
493494 fsl,pins = <
494
- MX6SX_PAD_GPIO1_IO06__UART2_TX 0x1b0b1
495
- MX6SX_PAD_GPIO1_IO07__UART2_RX 0x1b0b1
495
+ MX6SX_PAD_GPIO1_IO06__UART2_DCE_TX 0x1b0b1
496
+ MX6SX_PAD_GPIO1_IO07__UART2_DCE_RX 0x1b0b1
496497 >;
497498 };
498499
499500 pinctrl_uart3: uart3grp {
500501 fsl,pins = <
501
- MX6SX_PAD_QSPI1B_SS0_B__UART3_TX 0x1b0b1
502
- MX6SX_PAD_QSPI1B_SCLK__UART3_RX 0x1b0b1
502
+ MX6SX_PAD_QSPI1B_SS0_B__UART3_DCE_TX 0x1b0b1
503
+ MX6SX_PAD_QSPI1B_SCLK__UART3_DCE_RX 0x1b0b1
503504 >;
504505 };
505506
506507 pinctrl_uart5: uart5grp {
507508 fsl,pins = <
508
- MX6SX_PAD_KEY_COL3__UART5_TX 0x1b0b1
509
- MX6SX_PAD_KEY_ROW3__UART5_RX 0x1b0b1
510
- MX6SX_PAD_SD3_DATA6__UART3_RTS_B 0x1b0b1
511
- MX6SX_PAD_SD3_DATA7__UART3_CTS_B 0x1b0b1
509
+ MX6SX_PAD_KEY_COL3__UART5_DCE_TX 0x1b0b1
510
+ MX6SX_PAD_KEY_ROW3__UART5_DCE_RX 0x1b0b1
511
+ MX6SX_PAD_SD3_DATA6__UART3_DCE_RTS 0x1b0b1
512
+ MX6SX_PAD_SD3_DATA7__UART3_DCE_CTS 0x1b0b1
512513 >;
513514 };
514515