Merge branch 'CR_2026_compatible_5.15_ziv.xu' into 'jh7110-5.15.y-devel'

CR_2026_compatible_standard_515

See merge request sdk/linux!459

diff --git a/Documentation/devicetree/bindings/pinctrl/starfive,jh7110-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/starfive,jh7110-pinctrl.yaml
new file mode 100644 (file)
index 0000000..6bb0b1d
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/starfive,jh7110-pinctrl.yaml
@@ -0,0 +1,77 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pinctrl/starfive,jh7110-pinctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: StarFive JH7110 Pin Controller Device Tree Bindings
+
+description: |
+  Bindings for the JH7110 RISC-V SoC from StarFive Ltd.
+
+maintainers:
+  - Jianlong Huang <jianlong.huang@starfivetech.com>
+
+properties:
+  compatible:
+    enum:
+    - starfive,jh7110-sys-pinctrl
+    - starfive,jh7110-aon-pinctrl
+
+  reg:
+    minItems: 2
+    maxItems: 2
+
+  reg-names:
+    items:
+      - const: control
+
+  clocks:
+    maxItems: 1
+
+  resets:
+    maxItems: 1
+
+  "#gpio-cells":
+    const: 2
+
+  interrupts:
+    maxItems: 1
+    description: The GPIO parent interrupt.
+
+  interrupt-controller: true
+
+  "#interrupt-cells":
+    const: 2
+
+  ngpios:
+    enum:
+    - 64
+    - 4
+
+required:
+  - compatible
+  - reg
+  - reg-names
+  - clocks
+  - "#gpio-cells"
+  - interrupts
+  - interrupt-controller
+  - "#interrupt-cells"
+
+examples:
+  - |
+    gpio: gpio@13040000 {
+                       compatible = "starfive,jh7110-sys-pinctrl";
+                       reg = <0x0 0x13040000 0x0 0x10000>;
+                       reg-names = "control";
+                       clocks = <&clkgen JH7110_SYS_IOMUX_PCLK>;
+                       resets = <&rstgen RSTN_U0_SYS_IOMUX_PRESETN>;
+                       interrupts = <86>;
+                       interrupt-controller;
+                       #gpio-cells = <2>;
+                       ngpios = <64>;
+                       status = "okay";
+               };
+
+...

diff --git a/Documentation/devicetree/bindings/timer/starfive,timers.yaml b/Documentation/devicetree/bindings/timer/starfive,timers.yaml
index 9406633..081e7ca 100644 (file)
--- a/Documentation/devicetree/bindings/timer/starfive,timers.yaml
+++ b/Documentation/devicetree/bindings/timer/starfive,timers.yaml
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 %YAML 1.2
 ---
-$id: http://devicetree.org/schemas/timer/starfive,timers.yaml#
+$id: http://devicetree.org/schemas/timer/starfive,jh7110-timers.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
 title: StarFive timers bindings
@@ -12,7 +12,7 @@ maintainers:
 
 properties:
   compatible:
-    const: starfive,timers
+    const: starfive,jh7110-timers
 
   reg:
     maxItems: 1
@@ -62,7 +62,7 @@ examples:
     #include <dt-bindings/clock/starfive-jh7110-clkgen.h>
 
     timer0: timer@15200000 {
-            compatible = "starfive,timers";
+            compatible = "starfive,jh7110-timers";
             reg = <0x15200000 0x10000>;
             interrupts = <85>, <86>, <87> ,<88>;
             interrupt-names = "timer0", "timer1", "timer2", "timer3";

diff --git a/Documentation/devicetree/bindings/watchdog/starfive,wdt.yaml b/Documentation/devicetree/bindings/watchdog/starfive,wdt.yaml
index eed74e0..a2d9b4e 100644 (file)
--- a/Documentation/devicetree/bindings/watchdog/starfive,wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/starfive,wdt.yaml
@@ -16,8 +16,8 @@ maintainers:
 properties:
   compatible:
     enum:
-      - starfive,wdt
-      - starfive,dskit-wdt
+      - starfive,jh7100-wdt
+      - starfive,jh7110-wdt
 
   reg:
     maxItems: 1
@@ -64,7 +64,7 @@ examples:
     #include <dt-bindings/reset/starfive-jh7110.h>
 
     wdog: watchdog@13070000 {
-            compatible = "starfive,dskit-wdt";
+            compatible = "starfive,jh7110-wdt";
             reg = <0x13070000 0x10000>;
             interrupts = <68>;
             clocks = <&clkgen JH7110_DSKIT_WDT_CLK_WDT>,

diff --git a/MAINTAINERS b/MAINTAINERS
index 95a1d9d..5f733d5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20847,3 +20847,8 @@ M:      Jianlong Huang <jianlong.huang@starfivetech.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/riscv/starfive-jh7110.yaml
 
+STARFIVE JH7110 PINCTRL
+M:     Jianlong Huang <jianlong.huang@starfivetech.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/pinctrl/starfive,jh7110-pinctrl.yaml
+

diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile
index fc946b3..5598347 100644 (file)
--- a/arch/riscv/boot/dts/starfive/Makefile
+++ b/arch/riscv/boot/dts/starfive/Makefile
@@ -4,6 +4,7 @@ dtb-$(CONFIG_SOC_STARFIVE_JH7110) += jh7110-visionfive-v2.dtb   \
                                jh7110-evb.dtb                  \
                                jh7110-fpga.dtb                 \
                                jh7110-evb-can-pdm-pwmdac.dtb   \
+                               jh7110-evb-canfd.dtb            \
                                jh7110-evb-dvp-rgb2hdmi.dtb     \
                                jh7110-evb-pcie-i2s-sd.dtb      \
                                jh7110-evb-i2s-ac108.dtb        \

diff --git a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-sdio.dts b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-sdio.dts
index b2ad0b1..2f7692e 100644 (file)
--- a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-sdio.dts
+++ b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-sdio.dts
@@ -11,56 +11,56 @@
                __overlay__ {
                        dt_sdcard1_pins: dt-sdcard1-pins {
                                sdcard1-pins0 {
-                                       sf,pins = <PAD_GPIO56>;
-                                       sf,pinmux = <PAD_GPIO56_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CCLK_OUT>;
-                                       sf,pin-gpio-doen = <OEN_LOW>;
+                                       starfive,pins = <PAD_GPIO56>;
+                                       starfive,pinmux = <PAD_GPIO56_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CCLK_OUT>;
+                                       starfive,pin-gpio-doen = <OEN_LOW>;
                                };
 
                                sdcard1-pins1 {
-                                       sf,pins = <PAD_GPIO50>;
-                                       sf,pinmux = <PAD_GPIO50_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CCMD_OUT>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CCMD_OUT_EN>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CCMD_IN>;
+                                       starfive,pins = <PAD_GPIO50>;
+                                       starfive,pinmux = <PAD_GPIO50_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CCMD_OUT>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CCMD_OUT_EN>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CCMD_IN>;
                                };
 
                                sdcard1-pins2 {
-                                       sf,pins = <PAD_GPIO49>;
-                                       sf,pinmux = <PAD_GPIO49_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_0>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_0>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_0>;
+                                       starfive,pins = <PAD_GPIO49>;
+                                       starfive,pinmux = <PAD_GPIO49_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_0>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_0>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_0>;
                                };
 
                                sdcard1-pins3 {
-                                       sf,pins = <PAD_GPIO45>;
-                                       sf,pinmux = <PAD_GPIO45_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_1>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_1>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_1>;
+                                       starfive,pins = <PAD_GPIO45>;
+                                       starfive,pinmux = <PAD_GPIO45_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_1>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_1>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_1>;
                                };
 
                                sdcard1-pins4 {
-                                       sf,pins = <PAD_GPIO62>;
-                                       sf,pinmux = <PAD_GPIO62_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_2>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_2>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_2>;
+                                       starfive,pins = <PAD_GPIO62>;
+                                       starfive,pinmux = <PAD_GPIO62_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_2>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_2>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_2>;
                                };
 
                                sdcard1-pins5 {
-                                       sf,pins = <PAD_GPIO40>;
-                                       sf,pinmux = <PAD_GPIO40_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_3>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_3>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_3>;
+                                       starfive,pins = <PAD_GPIO40>;
+                                       starfive,pinmux = <PAD_GPIO40_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_3>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_3>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_3>;
                                };
                        };
                };

diff --git a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-spi.dts b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-spi.dts
index 58e0deb..366592d 100755 (executable)
--- a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-spi.dts
+++ b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-spi.dts
@@ -9,7 +9,7 @@
        fragment@0 {
                target-path = "/soc/spi@10060000";
                __overlay__ {
-                       compatible = "starfive-of,pl022";
+                       compatible = "starfive,jh7110-spi-pl022";
                        status = "okay";
                };
        };
@@ -18,7 +18,7 @@
        fragment@1 {
                target-path = "/soc/spi@10070000";
                __overlay__ {
-                       compatible = "starfive-of,pl022";
+                       compatible = "starfive,jh7110-spi-pl022";
                        status = "okay";
                };
        };
@@ -27,7 +27,7 @@
        fragment@2 {
                target-path = "/soc/spi@10080000";
                __overlay__ {
-                       compatible = "starfive-of,pl022";
+                       compatible = "starfive,jh7110-spi-pl022";
                        status = "okay";
                };
        };
@@ -36,7 +36,7 @@
        fragment@3 {
                target-path = "/soc/spi@12070000";
                __overlay__ {
-                       compatible = "starfive-of,pl022";
+                       compatible = "starfive,jh7110-spi-pl022";
                        status = "okay";
                };
        };
@@ -45,7 +45,7 @@
        fragment@4 {
                target-path = "/soc/spi@12080000";
                __overlay__ {
-                       compatible = "starfive-of,pl022";
+                       compatible = "starfive,jh7110-spi-pl022";
                        status = "okay";
                };
        };
@@ -54,7 +54,7 @@
        fragment@5 {
                target-path = "/soc/spi@12090000";
                __overlay__ {
-                       compatible = "starfive-of,pl022";
+                       compatible = "starfive,jh7110-spi-pl022";
                        status = "okay";
                };
        };
@@ -63,7 +63,7 @@
        fragment@6 {
                target-path = "/soc/spi@120A0000";
                __overlay__ {
-                       compatible = "starfive-of,pl022";
+                       compatible = "starfive,jh7110-spi-pl022";
                        status = "okay";
                };
        };

diff --git a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart4-emmc.dts b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart4-emmc.dts
index 359fe2d..1f62f5a 100644 (file)
--- a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart4-emmc.dts
+++ b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart4-emmc.dts
@@ -11,111 +11,111 @@
                __overlay__ {
                        dt_emmc0_pins: dt-emmc0-pins {
                                emmc0-pins-rest {
-                                       sf,pins = <PAD_GPIO22>;
-                                       sf,pinmux = <PAD_GPIO22_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO0_RST_N>;
-                                       sf,pin-gpio-doen = <OEN_LOW>;
+                                       starfive,pins = <PAD_GPIO22>;
+                                       starfive,pinmux = <PAD_GPIO22_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO0_RST_N>;
+                                       starfive,pin-gpio-doen = <OEN_LOW>;
                                };
                        };
 
                        dt_emmc1_pins: dt-emmc1-pins {
                                emmc1-pins0-rest {
-                                       sf,pins = <PAD_GPIO51>;
-                                       sf,pinmux = <PAD_GPIO51_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_RST_N>;
-                                       sf,pin-gpio-doen = <OEN_LOW>;
+                                       starfive,pins = <PAD_GPIO51>;
+                                       starfive,pinmux = <PAD_GPIO51_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_RST_N>;
+                                       starfive,pin-gpio-doen = <OEN_LOW>;
                                };
 
                                emmc1-pins1 {
-                                       sf,pins = <PAD_GPIO38>;
-                                       sf,pinmux = <PAD_GPIO38_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CCLK_OUT>;
-                                       sf,pin-gpio-doen = <OEN_LOW>;
+                                       starfive,pins = <PAD_GPIO38>;
+                                       starfive,pinmux = <PAD_GPIO38_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CCLK_OUT>;
+                                       starfive,pin-gpio-doen = <OEN_LOW>;
                                };
 
 
                                emmc1-pins2 {
-                                       sf,pins = <PAD_GPIO36>;
-                                       sf,pinmux = <PAD_GPIO36_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CCMD_OUT>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CCMD_OUT_EN>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CCMD_IN>;
+                                       starfive,pins = <PAD_GPIO36>;
+                                       starfive,pinmux = <PAD_GPIO36_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CCMD_OUT>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CCMD_OUT_EN>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CCMD_IN>;
                                };
 
                                emmc1-pins3 {
-                                       sf,pins = <PAD_GPIO43>;
-                                       sf,pinmux = <PAD_GPIO43_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_0>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_0>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_0>;
+                                       starfive,pins = <PAD_GPIO43>;
+                                       starfive,pinmux = <PAD_GPIO43_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_0>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_0>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_0>;
                                };
 
                                emmc1-pins4 {
-                                       sf,pins = <PAD_GPIO48>;
-                                       sf,pinmux = <PAD_GPIO48_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_1>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_1>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_1>;
+                                       starfive,pins = <PAD_GPIO48>;
+                                       starfive,pinmux = <PAD_GPIO48_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_1>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_1>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_1>;
                                };
 
                                emmc1-pins5 {
-                                       sf,pins = <PAD_GPIO53>;
-                                       sf,pinmux = <PAD_GPIO53_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_2>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_2>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_2>;
+                                       starfive,pins = <PAD_GPIO53>;
+                                       starfive,pinmux = <PAD_GPIO53_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_2>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_2>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_2>;
                                };
 
                                emmc1-pins6 {
-                                       sf,pins = <PAD_GPIO63>;
-                                       sf,pinmux = <PAD_GPIO63_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_3>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_3>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_3>;
+                                       starfive,pins = <PAD_GPIO63>;
+                                       starfive,pinmux = <PAD_GPIO63_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_3>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_3>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_3>;
                                };
 
                                emmc1-pins7 {
-                                       sf,pins = <PAD_GPIO52>;
-                                       sf,pinmux = <PAD_GPIO52_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_4>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_4>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_4>;
+                                       starfive,pins = <PAD_GPIO52>;
+                                       starfive,pinmux = <PAD_GPIO52_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_4>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_4>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_4>;
                                };
 
                                emmc1-pins8 {
-                                       sf,pins = <PAD_GPIO39>;
-                                       sf,pinmux = <PAD_GPIO39_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_5>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_5>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_5>;
+                                       starfive,pins = <PAD_GPIO39>;
+                                       starfive,pinmux = <PAD_GPIO39_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_5>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_5>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_5>;
                                };
 
                                emmc1-pins9 {
-                                       sf,pins = <PAD_GPIO46>;
-                                       sf,pinmux = <PAD_GPIO46_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_6>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_6>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_6>;
+                                       starfive,pins = <PAD_GPIO46>;
+                                       starfive,pinmux = <PAD_GPIO46_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_6>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_6>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_6>;
                                };
 
                                emmc1-pins10 {
-                                       sf,pins = <PAD_GPIO47>;
-                                       sf,pinmux = <PAD_GPIO47_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_7>;
-                                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_7>;
-                                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_7>;
+                                       starfive,pins = <PAD_GPIO47>;
+                                       starfive,pinmux = <PAD_GPIO47_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_7>;
+                                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_7>;
+                                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_7>;
                                };
                        };
                };
@@ -127,17 +127,17 @@
                __overlay__ {
                        dt_pwm_ch6to7_pins: dt-pwm-ch6to7-pins {
                                pwm-ch6-pins {
-                                       sf,pins = <PAD_RGPIO0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                                       sf,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_6>;
-                                       sf,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_6>;
+                                       starfive,pins = <PAD_RGPIO0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                                       starfive,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_6>;
+                                       starfive,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_6>;
                                };
 
                                pwm-ch7-pins {
-                                       sf,pins = <PAD_RGPIO1>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                                       sf,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_7>;
-                                       sf,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_7>;
+                                       starfive,pins = <PAD_RGPIO1>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                                       starfive,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_7>;
+                                       starfive,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_7>;
                                };
                        };
                };

diff --git a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart5-pwm.dts b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart5-pwm.dts
index feb6d29..59489b0 100644 (file)
--- a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart5-pwm.dts
+++ b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart5-pwm.dts
@@ -11,35 +11,35 @@
                __overlay__ {
                        dt_pwm_ch0to3_pins: dt-pwm-ch0to3-pins {
                                pwm_ch0-pins {
-                                       sf,pins = <PAD_GPIO45>;
-                                       sf,pinmux = <PAD_GPIO45_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                                       sf,pin-gpio-dout = <GPO_PTC0_PWM_0>;
-                                       sf,pin-gpio-doen = <OEN_PTC0_PWM_0_OE_N>;
+                                       starfive,pins = <PAD_GPIO45>;
+                                       starfive,pinmux = <PAD_GPIO45_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                                       starfive,pin-gpio-dout = <GPO_PTC0_PWM_0>;
+                                       starfive,pin-gpio-doen = <OEN_PTC0_PWM_0_OE_N>;
                                };
 
                                pwm_ch1-pins {
-                                       sf,pins = <PAD_GPIO46>;
-                                       sf,pinmux = <PAD_GPIO46_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                                       sf,pin-gpio-dout = <GPO_PTC0_PWM_1>;
-                                       sf,pin-gpio-doen = <OEN_PTC0_PWM_1_OE_N>;
+                                       starfive,pins = <PAD_GPIO46>;
+                                       starfive,pinmux = <PAD_GPIO46_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                                       starfive,pin-gpio-dout = <GPO_PTC0_PWM_1>;
+                                       starfive,pin-gpio-doen = <OEN_PTC0_PWM_1_OE_N>;
                                };
 
                                pwm_ch2-pins {
-                                       sf,pins = <PAD_GPIO47>;
-                                       sf,pinmux = <PAD_GPIO47_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                                       sf,pin-gpio-dout = <GPO_PTC0_PWM_2>;
-                                       sf,pin-gpio-doen = <OEN_PTC0_PWM_2_OE_N>;
+                                       starfive,pins = <PAD_GPIO47>;
+                                       starfive,pinmux = <PAD_GPIO47_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                                       starfive,pin-gpio-dout = <GPO_PTC0_PWM_2>;
+                                       starfive,pin-gpio-doen = <OEN_PTC0_PWM_2_OE_N>;
                                };
 
                                pwm_ch3-pins {
-                                       sf,pins = <PAD_GPIO48>;
-                                       sf,pinmux = <PAD_GPIO48_FUNC_SEL 0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                                       sf,pin-gpio-dout = <GPO_PTC0_PWM_3>;
-                                       sf,pin-gpio-doen = <OEN_PTC0_PWM_3_OE_N>;
+                                       starfive,pins = <PAD_GPIO48>;
+                                       starfive,pinmux = <PAD_GPIO48_FUNC_SEL 0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                                       starfive,pin-gpio-dout = <GPO_PTC0_PWM_3>;
+                                       starfive,pin-gpio-doen = <OEN_PTC0_PWM_3_OE_N>;
                                };
                        };
                };
@@ -51,17 +51,17 @@
                __overlay__ {
                        dt_pwm_ch4to5_pins: dt-pwm-ch4to5-pins {
                                pwm-ch4-pins {
-                                       sf,pins = <PAD_RGPIO0>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                                       sf,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_4>;
-                                       sf,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_4>;
+                                       starfive,pins = <PAD_RGPIO0>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                                       starfive,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_4>;
+                                       starfive,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_4>;
                                };
 
                                pwm-ch5-pins {
-                                       sf,pins = <PAD_RGPIO1>;
-                                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                                       sf,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_5>;
-                                       sf,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_5>;
+                                       starfive,pins = <PAD_RGPIO1>;
+                                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                                       starfive,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_5>;
+                                       starfive,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_5>;
                                };
                        };
                };

diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
old mode 100644 (file)
new mode 100755 (executable)
index 8de5586..cf058fc
--- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
@@ -206,7 +206,7 @@
        status = "okay";
 
        sc2235: sc2235@30 {
-               compatible = "sc2235";
+               compatible = "smartsens,sc2235";
                reg = <0x30>;
                clocks = <&clk_ext_camera>;
                clock-names = "xclk";
@@ -277,8 +277,8 @@
                };
        };
 
-       imx219@10 {
-               compatible = "imx219";
+       imx219: imx219@10 {
+               compatible = "sony,imx219";
                reg = <0x10>;
                clocks = <&clk_ext_camera>;
                clock-names = "xclk";
@@ -473,14 +473,6 @@
 };
 
 &spdif_transmitter {
-       compatible = "linux,spdif-dit";
-       #sound-dai-cells = <0>;
-       status = "disabled";
-};
-
-&spdif_receiver {
-       compatible = "linux,spdif-dir";
-       #sound-dai-cells = <0>;
        status = "disabled";
 };
 

diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts
index 2c543cc..e947156 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts
@@ -37,10 +37,12 @@
 };
 
 &can0 {
+       syscon,can_or_canfd = <0>;
        status = "okay";
 };
 
 &can1 {
+       syscon,can_or_canfd = <0>;
        status = "okay";
 };
 

diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-canfd.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-canfd.dts
new file mode 100644 (file)
index 0000000..81cd20b
--- /dev/null
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-canfd.dts
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.
+ * Copyright (C) 2022 William Qiu <william.qiu@starfivetech.com>
+ */
+
+/dts-v1/;
+#include "jh7110-evb.dtsi"
+
+/ {
+       model = "StarFive JH7110 EVB";
+       compatible = "starfive,jh7110-evb", "starfive,jh7110";
+};
+
+/* default sd card */
+&sdio0 {
+       clock-frequency = <102400000>;
+       max-frequency = <200000000>;
+       card-detect-delay = <300>;
+       bus-width = <4>;
+       broken-cd;
+       cap-sd-highspeed;
+       post-power-on-delay-ms = <200>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&sdcard0_pins>;
+       status = "okay";
+};
+
+&usbdrd30 {
+       status = "okay";
+};
+
+&pcie1 {
+       status = "okay";
+};
+
+&can0 {
+       syscon,can_or_canfd = <1>;
+       status = "okay";
+};
+
+&can1 {
+       syscon,can_or_canfd = <1>;
+       status = "okay";
+};
\ No newline at end of file

diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-pinctrl.dtsi b/arch/riscv/boot/dts/starfive/jh7110-evb-pinctrl.dtsi
index 59f7a2a..3553b13 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-pinctrl.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-pinctrl.dtsi
@@ -9,1387 +9,1387 @@
 &gpio {
        gmac0_pins: gmac0-pins {
                gmac0-pins-reset {
-                       sf,pins = <PAD_GPIO13>;
-                       sf,pinmux = <PAD_GPIO13_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_HIGH>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO13>;
+                       starfive,pinmux = <PAD_GPIO13_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_HIGH>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        gmac1_pins: gmac1-pins {
                gmac1-pins0 {
-                       sf,pins = <PAD_GMAC1_MDC>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1)|GPIO_SMT(1) | GPIO_DS(3))>;
-                       sf,pin-syscon = <PADCFG_PAD_GMAC1_MDC_SYSCON IO_3_3V>;
+                       starfive,pins = <PAD_GMAC1_MDC>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1)|GPIO_SMT(1) | GPIO_DS(3))>;
+                       starfive,pin-syscon = <PADCFG_PAD_GMAC1_MDC_SYSCON IO_3_3V>;
                };
        };
 
        uart0_pins: uart0-pins {
                uart0-pins-tx {
-                       sf,pins = <PAD_GPIO5>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_DS(3))>;
-                       sf,pin-gpio-dout = <GPO_UART0_SOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO5>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_DS(3))>;
+                       starfive,pin-gpio-dout = <GPO_UART0_SOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                uart0-pins-rx {
-                       sf,pins = <PAD_GPIO6>;
-                       sf,pinmux = <PAD_GPIO6_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PU(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_UART0_SIN>;
+                       starfive,pins = <PAD_GPIO6>;
+                       starfive,pinmux = <PAD_GPIO6_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PU(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_UART0_SIN>;
                };
        };
 
        uart1_pins: uart1-pins {
                uart1-pins-tx {
-                       sf,pins = <PAD_GPIO30>;
-                       sf,pinmux = <PAD_GPIO30_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_DS(3))>;
-                       sf,pin-gpio-dout = <GPO_UART1_SOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO30>;
+                       starfive,pinmux = <PAD_GPIO30_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_DS(3))>;
+                       starfive,pin-gpio-dout = <GPO_UART1_SOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                uart1-pins-rx {
-                       sf,pins = <PAD_GPIO31>;
-                       sf,pinmux = <PAD_GPIO31_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PU(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_UART1_SIN>;
+                       starfive,pins = <PAD_GPIO31>;
+                       starfive,pinmux = <PAD_GPIO31_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PU(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_UART1_SIN>;
                };
 
                uart1-pins-cts {
-                       sf,pins = <PAD_GPIO29>;
-                       sf,pinmux = <PAD_GPIO29_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_UART1_CTS_N>;
+                       starfive,pins = <PAD_GPIO29>;
+                       starfive,pinmux = <PAD_GPIO29_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_UART1_CTS_N>;
                };
 
                uart1-pins-rts {
-                       sf,pins = <PAD_GPIO27>;
-                       sf,pinmux = <PAD_GPIO27_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_UART1_RTS_N>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO27>;
+                       starfive,pinmux = <PAD_GPIO27_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_UART1_RTS_N>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        uart2_pins: uart2-pins {
                uart2-pins-tx {
-                       sf,pins = <PAD_GPIO30>;
-                       sf,pinmux = <PAD_GPIO30_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_DS(3))>;
-                       sf,pin-gpio-dout = <GPO_UART2_SOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO30>;
+                       starfive,pinmux = <PAD_GPIO30_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_DS(3))>;
+                       starfive,pin-gpio-dout = <GPO_UART2_SOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                uart2-pins-rx {
-                       sf,pins = <PAD_GPIO31>;
-                       sf,pinmux = <PAD_GPIO31_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PU(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_UART2_SIN>;
+                       starfive,pins = <PAD_GPIO31>;
+                       starfive,pinmux = <PAD_GPIO31_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PU(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_UART2_SIN>;
                };
 
                uart2-pins-cts {
-                       sf,pins = <PAD_GPIO29>;
-                       sf,pinmux = <PAD_GPIO29_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_UART2_CTS_N>;
+                       starfive,pins = <PAD_GPIO29>;
+                       starfive,pinmux = <PAD_GPIO29_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_UART2_CTS_N>;
                };
 
                uart2-pins-rts {
-                       sf,pins = <PAD_GPIO27>;
-                       sf,pinmux = <PAD_GPIO27_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_UART2_RTS_N>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO27>;
+                       starfive,pinmux = <PAD_GPIO27_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_UART2_RTS_N>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        uart3_pins: uart3-pins {
                uart3-pins-tx {
-                       sf,pins = <PAD_GPIO30>;
-                       sf,pinmux = <PAD_GPIO30_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_DS(3))>;
-                       sf,pin-gpio-dout = <GPO_UART3_SOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO30>;
+                       starfive,pinmux = <PAD_GPIO30_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_DS(3))>;
+                       starfive,pin-gpio-dout = <GPO_UART3_SOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                uart3-pins-rx {
-                       sf,pins = <PAD_GPIO31>;
-                       sf,pinmux = <PAD_GPIO31_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PU(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_UART3_SIN>;
+                       starfive,pins = <PAD_GPIO31>;
+                       starfive,pinmux = <PAD_GPIO31_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PU(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_UART3_SIN>;
                };
        };
 
        uart4_pins: uart4-pins {
                uart4-pins-tx {
-                       sf,pins = <PAD_GPIO30>;
-                       sf,pinmux = <PAD_GPIO30_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_DS(3))>;
-                       sf,pin-gpio-dout = <GPO_UART4_SOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO30>;
+                       starfive,pinmux = <PAD_GPIO30_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_DS(3))>;
+                       starfive,pin-gpio-dout = <GPO_UART4_SOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                uart4-pins-rx {
-                       sf,pins = <PAD_GPIO31>;
-                       sf,pinmux = <PAD_GPIO31_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PU(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_UART4_SIN>;
+                       starfive,pins = <PAD_GPIO31>;
+                       starfive,pinmux = <PAD_GPIO31_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PU(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_UART4_SIN>;
                };
 
                uart4-pins-cts {
-                       sf,pins = <PAD_GPIO29>;
-                       sf,pinmux = <PAD_GPIO29_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_UART4_CTS_N>;
+                       starfive,pins = <PAD_GPIO29>;
+                       starfive,pinmux = <PAD_GPIO29_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_UART4_CTS_N>;
                };
 
                uart4-pins-rts {
-                       sf,pins = <PAD_GPIO27>;
-                       sf,pinmux = <PAD_GPIO27_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_UART4_RTS_N>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO27>;
+                       starfive,pinmux = <PAD_GPIO27_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_UART4_RTS_N>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        uart5_pins: uart5-pins {
                uart5-pins-tx {
-                       sf,pins = <PAD_GPIO30>;
-                       sf,pinmux = <PAD_GPIO30_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_DS(3))>;
-                       sf,pin-gpio-dout = <GPO_UART5_SOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO30>;
+                       starfive,pinmux = <PAD_GPIO30_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_DS(3))>;
+                       starfive,pin-gpio-dout = <GPO_UART5_SOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                uart5-pins-rx {
-                       sf,pins = <PAD_GPIO31>;
-                       sf,pinmux = <PAD_GPIO31_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PU(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_UART5_SIN>;
+                       starfive,pins = <PAD_GPIO31>;
+                       starfive,pinmux = <PAD_GPIO31_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PU(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_UART5_SIN>;
                };
 
                uart5-pins-cts {
-                       sf,pins = <PAD_GPIO29>;
-                       sf,pinmux = <PAD_GPIO29_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_UART5_CTS_N>;
+                       starfive,pins = <PAD_GPIO29>;
+                       starfive,pinmux = <PAD_GPIO29_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_UART5_CTS_N>;
                };
 
                uart5-pins-rts {
-                       sf,pins = <PAD_GPIO27>;
-                       sf,pinmux = <PAD_GPIO27_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_UART5_RTS_N>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO27>;
+                       starfive,pinmux = <PAD_GPIO27_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_UART5_RTS_N>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        i2c0_pins: i2c0-pins {
                i2c0-pins-scl {
-                       sf,pins = <PAD_GPIO57>;
-                       sf,pinmux = <PAD_GPIO57_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C0_IC_CLK_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C0_IC_CLK_IN_A>;
+                       starfive,pins = <PAD_GPIO57>;
+                       starfive,pinmux = <PAD_GPIO57_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C0_IC_CLK_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C0_IC_CLK_IN_A>;
                };
 
                i2c0-pins-sda {
-                       sf,pins = <PAD_GPIO58>;
-                       sf,pinmux = <PAD_GPIO58_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C0_IC_DATA_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C0_IC_DATA_IN_A>;
+                       starfive,pins = <PAD_GPIO58>;
+                       starfive,pinmux = <PAD_GPIO58_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C0_IC_DATA_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C0_IC_DATA_IN_A>;
                };
        };
 
        i2c1_pins: i2c1-pins {
                i2c1-pins-scl {
-                       sf,pins = <PAD_GPIO49>;
-                       sf,pinmux = <PAD_GPIO49_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C1_IC_CLK_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C1_IC_CLK_IN_A>;
+                       starfive,pins = <PAD_GPIO49>;
+                       starfive,pinmux = <PAD_GPIO49_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C1_IC_CLK_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C1_IC_CLK_IN_A>;
                };
 
                i2c1-pins-sda {
-                       sf,pins = <PAD_GPIO50>;
-                       sf,pinmux = <PAD_GPIO50_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C1_IC_DATA_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C1_IC_DATA_IN_A>;
+                       starfive,pins = <PAD_GPIO50>;
+                       starfive,pinmux = <PAD_GPIO50_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C1_IC_DATA_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C1_IC_DATA_IN_A>;
                };
        };
 
        i2c2_pins: i2c2-pins {
                i2c2-pins-scl {
-                       sf,pins = <PAD_GPIO11>;
-                       sf,pinmux = <PAD_GPIO11_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C2_IC_CLK_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C2_IC_CLK_IN_A>;
+                       starfive,pins = <PAD_GPIO11>;
+                       starfive,pinmux = <PAD_GPIO11_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C2_IC_CLK_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C2_IC_CLK_IN_A>;
                };
 
                i2c2-pins-sda {
-                       sf,pins = <PAD_GPIO9>;
-                       sf,pinmux = <PAD_GPIO9_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C2_IC_DATA_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C2_IC_DATA_IN_A>;
+                       starfive,pins = <PAD_GPIO9>;
+                       starfive,pinmux = <PAD_GPIO9_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C2_IC_DATA_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C2_IC_DATA_IN_A>;
                };
        };
 
        i2c3_pins: i2c3-pins {
                i2c3-pins-scl {
-                       sf,pins = <PAD_GPIO51>;
-                       sf,pinmux = <PAD_GPIO51_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C3_IC_CLK_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C3_IC_CLK_IN_A>;
+                       starfive,pins = <PAD_GPIO51>;
+                       starfive,pinmux = <PAD_GPIO51_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C3_IC_CLK_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C3_IC_CLK_IN_A>;
                };
 
                i2c3-pins-sda {
-                       sf,pins = <PAD_GPIO52>;
-                       sf,pinmux = <PAD_GPIO52_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C3_IC_DATA_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C3_IC_DATA_IN_A>;
+                       starfive,pins = <PAD_GPIO52>;
+                       starfive,pinmux = <PAD_GPIO52_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C3_IC_DATA_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C3_IC_DATA_IN_A>;
                };
        };
 
        i2c4_pins: i2c4-pins {
                i2c4-pins-scl {
-                       sf,pins = <PAD_GPIO18>;
-                       sf,pinmux = <PAD_GPIO18_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C4_IC_CLK_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C4_IC_CLK_IN_A>;
+                       starfive,pins = <PAD_GPIO18>;
+                       starfive,pinmux = <PAD_GPIO18_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C4_IC_CLK_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C4_IC_CLK_IN_A>;
                };
 
                i2c4-pins-sda {
-                       sf,pins = <PAD_GPIO12>;
-                       sf,pinmux = <PAD_GPIO12_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C4_IC_DATA_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C4_IC_DATA_IN_A>;
+                       starfive,pins = <PAD_GPIO12>;
+                       starfive,pinmux = <PAD_GPIO12_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C4_IC_DATA_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C4_IC_DATA_IN_A>;
                };
        };
 
        i2c5_pins: i2c5-pins {
                i2c5-pins-scl {
-                       sf,pins = <PAD_GPIO19>;
-                       sf,pinmux = <PAD_GPIO19_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C5_IC_CLK_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C5_IC_CLK_IN_A>;
+                       starfive,pins = <PAD_GPIO19>;
+                       starfive,pinmux = <PAD_GPIO19_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C5_IC_CLK_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C5_IC_CLK_IN_A>;
                };
 
                i2c5-pins-sda {
-                       sf,pins = <PAD_GPIO20>;
-                       sf,pinmux = <PAD_GPIO20_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C5_IC_DATA_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C5_IC_DATA_IN_A>;
+                       starfive,pins = <PAD_GPIO20>;
+                       starfive,pinmux = <PAD_GPIO20_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C5_IC_DATA_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C5_IC_DATA_IN_A>;
                };
        };
 
        i2c6_pins: i2c6-pins {
                i2c6-pins-scl {
-                       sf,pins = <PAD_GPIO16>;
-                       sf,pinmux = <PAD_GPIO16_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C6_IC_CLK_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C6_IC_CLK_IN_A>;
+                       starfive,pins = <PAD_GPIO16>;
+                       starfive,pinmux = <PAD_GPIO16_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C6_IC_CLK_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C6_IC_CLK_IN_A>;
                };
 
                i2c6-pins-sda {
-                       sf,pins = <PAD_GPIO17>;
-                       sf,pinmux = <PAD_GPIO17_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_I2C6_IC_DATA_OE>;
-                       sf,pin-gpio-din =  <GPI_I2C6_IC_DATA_IN_A>;
+                       starfive,pins = <PAD_GPIO17>;
+                       starfive,pinmux = <PAD_GPIO17_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_I2C6_IC_DATA_OE>;
+                       starfive,pin-gpio-din =  <GPI_I2C6_IC_DATA_IN_A>;
                };
        };
 
        csi_pins_default: csi-pins-default {
                csi-pins-default {
-                       sf,pins = <PAD_GPIO10>;
-                       sf,pinmux = <PAD_GPIO10_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO10>;
+                       starfive,pinmux = <PAD_GPIO10_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        csi_pins_pwup: csi-pins-pwup {
                csi-pins-pwup {
-                       sf,pins = <PAD_GPIO10>;
-                       sf,pinmux = <PAD_GPIO10_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_HIGH>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO10>;
+                       starfive,pinmux = <PAD_GPIO10_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_HIGH>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        csi_pins_pwdn: csi-pins-pwdn {
                csi-pins-pwdn {
-                       sf,pins = <PAD_GPIO10>;
-                       sf,pinmux = <PAD_GPIO10_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO10>;
+                       starfive,pinmux = <PAD_GPIO10_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        mmc0_pins: mmc0-pins {
                 mmc0-pins-rest {
-                       sf,pins = <PAD_GPIO22>;
-                       sf,pinmux = <PAD_GPIO22_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO0_RST_N>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO22>;
+                       starfive,pinmux = <PAD_GPIO22_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO0_RST_N>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        sdcard0_pins: sdcard0-pins {
                 sdcard0-pins-rest {
-                       sf,pins = <PAD_GPIO24>;
-                       sf,pinmux = <PAD_GPIO24_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO0_RST_N>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO24>;
+                       starfive,pinmux = <PAD_GPIO24_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO0_RST_N>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        emmc1_pins: emmc1-pins {
                emmc1-pins0-rest {
-                       sf,pins = <PAD_GPIO51>;
-                       sf,pinmux = <PAD_GPIO51_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_RST_N>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO51>;
+                       starfive,pinmux = <PAD_GPIO51_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_RST_N>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                emmc1-pins1 {
-                       sf,pins = <PAD_GPIO38>;
-                       sf,pinmux = <PAD_GPIO38_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CCLK_OUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO38>;
+                       starfive,pinmux = <PAD_GPIO38_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CCLK_OUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                emmc1-pins2 {
-                       sf,pins = <PAD_GPIO36>;
-                       sf,pinmux = <PAD_GPIO36_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CCMD_OUT>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CCMD_OUT_EN>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CCMD_IN>;
+                       starfive,pins = <PAD_GPIO36>;
+                       starfive,pinmux = <PAD_GPIO36_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CCMD_OUT>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CCMD_OUT_EN>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CCMD_IN>;
                };
 
                emmc1-pins3 {
-                       sf,pins = <PAD_GPIO43>;
-                       sf,pinmux = <PAD_GPIO43_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_0>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_0>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_0>;
+                       starfive,pins = <PAD_GPIO43>;
+                       starfive,pinmux = <PAD_GPIO43_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_0>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_0>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_0>;
                };
 
                emmc1-pins4 {
-                       sf,pins = <PAD_GPIO48>;
-                       sf,pinmux = <PAD_GPIO48_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_1>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_1>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_1>;
+                       starfive,pins = <PAD_GPIO48>;
+                       starfive,pinmux = <PAD_GPIO48_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_1>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_1>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_1>;
                };
 
                emmc1-pins5 {
-                       sf,pins = <PAD_GPIO53>;
-                       sf,pinmux = <PAD_GPIO53_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_2>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_2>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_2>;
+                       starfive,pins = <PAD_GPIO53>;
+                       starfive,pinmux = <PAD_GPIO53_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_2>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_2>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_2>;
                };
 
                emmc1-pins6 {
-                       sf,pins = <PAD_GPIO63>;
-                       sf,pinmux = <PAD_GPIO63_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_3>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_3>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_3>;
+                       starfive,pins = <PAD_GPIO63>;
+                       starfive,pinmux = <PAD_GPIO63_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_3>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_3>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_3>;
                };
 
                emmc1-pins7 {
-                       sf,pins = <PAD_GPIO52>;
-                       sf,pinmux = <PAD_GPIO52_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_4>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_4>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_4>;
+                       starfive,pins = <PAD_GPIO52>;
+                       starfive,pinmux = <PAD_GPIO52_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_4>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_4>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_4>;
                };
 
                emmc1-pins8 {
-                       sf,pins = <PAD_GPIO39>;
-                       sf,pinmux = <PAD_GPIO39_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_5>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_5>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_5>;
+                       starfive,pins = <PAD_GPIO39>;
+                       starfive,pinmux = <PAD_GPIO39_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_5>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_5>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_5>;
                };
 
                emmc1-pins9 {
-                       sf,pins = <PAD_GPIO46>;
-                       sf,pinmux = <PAD_GPIO46_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_6>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_6>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_6>;
+                       starfive,pins = <PAD_GPIO46>;
+                       starfive,pinmux = <PAD_GPIO46_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_6>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_6>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_6>;
                };
 
                emmc1-pins10 {
-                       sf,pins = <PAD_GPIO47>;
-                       sf,pinmux = <PAD_GPIO47_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_7>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_7>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_7>;
+                       starfive,pins = <PAD_GPIO47>;
+                       starfive,pinmux = <PAD_GPIO47_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_7>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_7>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_7>;
                };
        };
 
        sdcard1_pins: sdcard1-pins {
                sdcard1-pins0 {
-                       sf,pins = <PAD_GPIO56>;
-                       sf,pinmux = <PAD_GPIO56_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CCLK_OUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO56>;
+                       starfive,pinmux = <PAD_GPIO56_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CCLK_OUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                sdcard1-pins1 {
-                       sf,pins = <PAD_GPIO50>;
-                       sf,pinmux = <PAD_GPIO50_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CCMD_OUT>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CCMD_OUT_EN>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CCMD_IN>;
+                       starfive,pins = <PAD_GPIO50>;
+                       starfive,pinmux = <PAD_GPIO50_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CCMD_OUT>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CCMD_OUT_EN>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CCMD_IN>;
                };
 
                sdcard1-pins2 {
-                       sf,pins = <PAD_GPIO49>;
-                       sf,pinmux = <PAD_GPIO49_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_0>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_0>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_0>;
+                       starfive,pins = <PAD_GPIO49>;
+                       starfive,pinmux = <PAD_GPIO49_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_0>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_0>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_0>;
                };
 
                sdcard1-pins3 {
-                       sf,pins = <PAD_GPIO45>;
-                       sf,pinmux = <PAD_GPIO45_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_1>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_1>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_1>;
+                       starfive,pins = <PAD_GPIO45>;
+                       starfive,pinmux = <PAD_GPIO45_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_1>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_1>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_1>;
                };
 
                sdcard1-pins4 {
-                       sf,pins = <PAD_GPIO62>;
-                       sf,pinmux = <PAD_GPIO62_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_2>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_2>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_2>;
+                       starfive,pins = <PAD_GPIO62>;
+                       starfive,pinmux = <PAD_GPIO62_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_2>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_2>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_2>;
                };
 
                sdcard1-pins5 {
-                       sf,pins = <PAD_GPIO40>;
-                       sf,pinmux = <PAD_GPIO40_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_3>;
-                       sf,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_3>;
-                       sf,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_3>;
+                       starfive,pins = <PAD_GPIO40>;
+                       starfive,pinmux = <PAD_GPIO40_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SDIO1_CDATA_OUT_3>;
+                       starfive,pin-gpio-doen = <OEN_SDIO1_CDATA_OUT_EN_3>;
+                       starfive,pin-gpio-din =  <GPI_SDIO1_CDATA_IN_3>;
                };
        };
 
        spdif0_pins: spdif0-pins {
                spdif0-pins {
-                       sf,pins = <PAD_GPIO57>;
-                       sf,pinmux = <PAD_GPIO57_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1)|(GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_SPDIF0_SPDIFO>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO57>;
+                       starfive,pinmux = <PAD_GPIO57_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1)|(GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_SPDIF0_SPDIFO>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        pwmdac0_pins: pwmdac0-pins {
                pwmdac0-pins-left {
-                       sf,pins = <PAD_GPIO57>;
-                       sf,pinmux = <PAD_GPIO57_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_PWMDAC0_LEFT_OUTPUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO57>;
+                       starfive,pinmux = <PAD_GPIO57_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_PWMDAC0_LEFT_OUTPUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                pwmdac0-pins-right {
-                       sf,pins = <PAD_GPIO42>;
-                       sf,pinmux = <PAD_GPIO42_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_PWMDAC0_RIGHT_OUTPUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO42>;
+                       starfive,pinmux = <PAD_GPIO42_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_PWMDAC0_RIGHT_OUTPUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        pdm0_pins: pdm0-pins {
                pdm0-pins-mclk {
-                       sf,pins = <PAD_GPIO54>;
-                       sf,pinmux = <PAD_GPIO54_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_PDM_4MIC0_DMIC_MCLK>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO54>;
+                       starfive,pinmux = <PAD_GPIO54_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_PDM_4MIC0_DMIC_MCLK>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                pdm0-pins-sdin {
-                       sf,pins = <PAD_GPIO60>;
-                       sf,pinmux = <PAD_GPIO60_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_PDM_4MIC0_DMIC0_DIN>;
+                       starfive,pins = <PAD_GPIO60>;
+                       starfive,pinmux = <PAD_GPIO60_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_PDM_4MIC0_DMIC0_DIN>;
                };
        };
 
        tdm0_pins: tdm0-pins {
                tdm0-pins-tx {
-                       sf,pins = <PAD_GPIO44>;
-                       sf,pinmux = <PAD_GPIO44_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_TDM0_PCM_TXD>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO44>;
+                       starfive,pinmux = <PAD_GPIO44_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_TDM0_PCM_TXD>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                tdm0-pins-rx {
-                       sf,pins = <PAD_GPIO61>;
-                       sf,pinmux = <PAD_GPIO61_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_TDM0_PCM_RXD>;
+                       starfive,pins = <PAD_GPIO61>;
+                       starfive,pinmux = <PAD_GPIO61_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_TDM0_PCM_RXD>;
                };
 
                tdm0-pins-sync {
-                       sf,pins = <PAD_GPIO63>;
-                       sf,pinmux = <PAD_GPIO63_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din = <GPI_TDM0_PCM_SYNCIN>;
+                       starfive,pins = <PAD_GPIO63>;
+                       starfive,pinmux = <PAD_GPIO63_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din = <GPI_TDM0_PCM_SYNCIN>;
                };
 
                tdm0-pins-pcmclk {
-                       sf,pins = <PAD_GPIO38>;
-                       sf,pinmux = <PAD_GPIO38_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din = <GPI_TDM0_CLK_SLV>;
+                       starfive,pins = <PAD_GPIO38>;
+                       starfive,pinmux = <PAD_GPIO38_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din = <GPI_TDM0_CLK_SLV>;
                };
        };
 
        i2s_clk_pins: i2s-clk0 {
                i2s-clk0_bclk {
-                       sf,pins = <PAD_GPIO38>;
-                       sf,pinmux = <PAD_GPIO38_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-din = <GPI_I2STX0_BCLK_SLV GPI_I2SRX0_BCLK_SLV>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pins = <PAD_GPIO38>;
+                       starfive,pinmux = <PAD_GPIO38_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-din = <GPI_I2STX0_BCLK_SLV GPI_I2SRX0_BCLK_SLV>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
                };
 
                i2s-clk0_lrclk {
-                       sf,pins = <PAD_GPIO63>;
-                       sf,pinmux = <PAD_GPIO63_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-din = <GPI_I2STX0_LRCK_SLV GPI_I2SRX0_LRCK_SLV>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pins = <PAD_GPIO63>;
+                       starfive,pinmux = <PAD_GPIO63_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-din = <GPI_I2STX0_LRCK_SLV GPI_I2SRX0_LRCK_SLV>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
                };
        };
 
        i2stx_pins: i2stx-pins {
                i2stx-pins0 {
-                       sf,pins = <PAD_GPIO44>;
-                       sf,pinmux = <PAD_GPIO44_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_I2STX_4CH1_SDO0>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO44>;
+                       starfive,pinmux = <PAD_GPIO44_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_I2STX_4CH1_SDO0>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        i2srx_pins: i2srx-pins {
                i2srx-pins0 {
-                       sf,pins = <PAD_GPIO61>;
-                       sf,pinmux = <PAD_GPIO61_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_I2SRX0_EXT_SDIN0>;
+                       starfive,pins = <PAD_GPIO61>;
+                       starfive,pinmux = <PAD_GPIO61_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_I2SRX0_EXT_SDIN0>;
                };
        };
 
        i2srx_clk_pins: i2srx-clk-pins {
                i2srx-clk-pins-mclk {
-                       sf,pins = <PAD_GPIO58>;
-                       sf,pinmux = <PAD_GPIO58_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_CRG0_MCLK_OUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO58>;
+                       starfive,pinmux = <PAD_GPIO58_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_CRG0_MCLK_OUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        can0_pins: can0-pins {
                can0-pins0 {
-                       sf,pins = <PAD_GPIO30>;
-                       sf,pinmux = <PAD_GPIO30_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_CAN0_CTRL_TXD>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO30>;
+                       starfive,pinmux = <PAD_GPIO30_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_CAN0_CTRL_TXD>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                can0-pins1 {
-                       sf,pins = <PAD_GPIO31>;
-                       sf,pinmux = <PAD_GPIO31_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_CAN0_CTRL_RXD>;
+                       starfive,pins = <PAD_GPIO31>;
+                       starfive,pinmux = <PAD_GPIO31_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_CAN0_CTRL_RXD>;
                };
 
                can0-pins2 {
-                       sf,pins = <PAD_GPIO32>;
-                       sf,pinmux = <PAD_GPIO32_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_CAN0_CTRL_STBY>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO32>;
+                       starfive,pinmux = <PAD_GPIO32_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_CAN0_CTRL_STBY>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        can1_pins: can1-pins {
                can1-pins0 {
-                       sf,pins = <PAD_GPIO29>;
-                       sf,pinmux = <PAD_GPIO29_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_CAN1_CTRL_TXD>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO29>;
+                       starfive,pinmux = <PAD_GPIO29_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_CAN1_CTRL_TXD>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                can1-pins1 {
-                       sf,pins = <PAD_GPIO27>;
-                       sf,pinmux = <PAD_GPIO27_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_CAN1_CTRL_RXD>;
+                       starfive,pins = <PAD_GPIO27>;
+                       starfive,pinmux = <PAD_GPIO27_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_CAN1_CTRL_RXD>;
                };
 
                can1-pins2 {
-                       sf,pins = <PAD_GPIO45>;
-                       sf,pinmux = <PAD_GPIO45_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_CAN1_CTRL_STBY>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO45>;
+                       starfive,pinmux = <PAD_GPIO45_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_CAN1_CTRL_STBY>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        pwm_ch0to3_pins: pwm-ch0to3-pins {
                pwm_ch0-pins {
-                       sf,pins = <PAD_GPIO45>;
-                       sf,pinmux = <PAD_GPIO45_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_PTC0_PWM_0>;
-                       sf,pin-gpio-doen = <OEN_PTC0_PWM_0_OE_N>;
+                       starfive,pins = <PAD_GPIO45>;
+                       starfive,pinmux = <PAD_GPIO45_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_PTC0_PWM_0>;
+                       starfive,pin-gpio-doen = <OEN_PTC0_PWM_0_OE_N>;
                };
 
                pwm_ch1-pins {
-                       sf,pins = <PAD_GPIO46>;
-                       sf,pinmux = <PAD_GPIO46_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_PTC0_PWM_1>;
-                       sf,pin-gpio-doen = <OEN_PTC0_PWM_1_OE_N>;
+                       starfive,pins = <PAD_GPIO46>;
+                       starfive,pinmux = <PAD_GPIO46_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_PTC0_PWM_1>;
+                       starfive,pin-gpio-doen = <OEN_PTC0_PWM_1_OE_N>;
                };
 
                pwm_ch2-pins {
-                       sf,pins = <PAD_GPIO47>;
-                       sf,pinmux = <PAD_GPIO47_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_PTC0_PWM_2>;
-                       sf,pin-gpio-doen = <OEN_PTC0_PWM_2_OE_N>;
+                       starfive,pins = <PAD_GPIO47>;
+                       starfive,pinmux = <PAD_GPIO47_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_PTC0_PWM_2>;
+                       starfive,pin-gpio-doen = <OEN_PTC0_PWM_2_OE_N>;
                };
 
                pwm_ch3-pins {
-                       sf,pins = <PAD_GPIO48>;
-                       sf,pinmux = <PAD_GPIO48_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_PTC0_PWM_3>;
-                       sf,pin-gpio-doen = <OEN_PTC0_PWM_3_OE_N>;
+                       starfive,pins = <PAD_GPIO48>;
+                       starfive,pinmux = <PAD_GPIO48_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_PTC0_PWM_3>;
+                       starfive,pin-gpio-doen = <OEN_PTC0_PWM_3_OE_N>;
                };
        };
 
        ssp0_pins: ssp0-pins {
                ssp0-pins_tx {
-                       sf,pins = <PAD_GPIO38>;
-                       sf,pinmux = <PAD_GPIO38_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI0_SSPTXD>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO38>;
+                       starfive,pinmux = <PAD_GPIO38_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI0_SSPTXD>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp0-pins_rx {
-                       sf,pins = <PAD_GPIO39>;
-                       sf,pinmux = <PAD_GPIO39_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_SPI0_SSPRXD>;
+                       starfive,pins = <PAD_GPIO39>;
+                       starfive,pinmux = <PAD_GPIO39_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_SPI0_SSPRXD>;
                };
 
                ssp0-pins_clk {
-                       sf,pins = <PAD_GPIO36>;
-                       sf,pinmux = <PAD_GPIO36_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI0_SSPCLKOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO36>;
+                       starfive,pinmux = <PAD_GPIO36_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI0_SSPCLKOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp0-pins_cs {
-                       sf,pins = <PAD_GPIO37>;
-                       sf,pinmux = <PAD_GPIO37_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI0_SSPFSSOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO37>;
+                       starfive,pinmux = <PAD_GPIO37_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI0_SSPFSSOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        ssp1_pins: ssp1-pins {
                ssp1-pins_tx {
-                       sf,pins = <PAD_GPIO42>;
-                       sf,pinmux = <PAD_GPIO42_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI1_SSPTXD>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO42>;
+                       starfive,pinmux = <PAD_GPIO42_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI1_SSPTXD>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp1-pins_rx {
-                       sf,pins = <PAD_GPIO43>;
-                       sf,pinmux = <PAD_GPIO43_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_SPI1_SSPRXD>;
+                       starfive,pins = <PAD_GPIO43>;
+                       starfive,pinmux = <PAD_GPIO43_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_SPI1_SSPRXD>;
                };
 
                ssp1-pins_clk {
-                       sf,pins = <PAD_GPIO40>;
-                       sf,pinmux = <PAD_GPIO40_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI1_SSPCLKOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO40>;
+                       starfive,pinmux = <PAD_GPIO40_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI1_SSPCLKOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp1-pins_cs {
-                       sf,pins = <PAD_GPIO41>;
-                       sf,pinmux = <PAD_GPIO41_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI1_SSPFSSOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO41>;
+                       starfive,pinmux = <PAD_GPIO41_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI1_SSPFSSOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        ssp2_pins: ssp2-pins {
                ssp2-pins_tx {
-                       sf,pins = <PAD_GPIO46>;
-                       sf,pinmux = <PAD_GPIO46_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI2_SSPTXD>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO46>;
+                       starfive,pinmux = <PAD_GPIO46_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI2_SSPTXD>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp2-pins_rx {
-                       sf,pins = <PAD_GPIO47>;
-                       sf,pinmux = <PAD_GPIO47_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_SPI2_SSPRXD>;
+                       starfive,pins = <PAD_GPIO47>;
+                       starfive,pinmux = <PAD_GPIO47_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_SPI2_SSPRXD>;
                };
 
                ssp2-pins_clk {
-                       sf,pins = <PAD_GPIO44>;
-                       sf,pinmux = <PAD_GPIO44_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI2_SSPCLKOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO44>;
+                       starfive,pinmux = <PAD_GPIO44_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI2_SSPCLKOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp2-pins_cs {
-                       sf,pins = <PAD_GPIO45>;
-                       sf,pinmux = <PAD_GPIO45_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI2_SSPFSSOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO45>;
+                       starfive,pinmux = <PAD_GPIO45_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI2_SSPFSSOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        ssp3_pins: ssp3-pins {
                ssp3-pins_tx {
-                       sf,pins = <PAD_GPIO50>;
-                       sf,pinmux = <PAD_GPIO50_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI3_SSPTXD>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO50>;
+                       starfive,pinmux = <PAD_GPIO50_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI3_SSPTXD>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp3-pins_rx {
-                       sf,pins = <PAD_GPIO51>;
-                       sf,pinmux = <PAD_GPIO51_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_SPI3_SSPRXD>;
+                       starfive,pins = <PAD_GPIO51>;
+                       starfive,pinmux = <PAD_GPIO51_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_SPI3_SSPRXD>;
                };
 
                ssp3-pins_clk {
-                       sf,pins = <PAD_GPIO48>;
-                       sf,pinmux = <PAD_GPIO48_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI3_SSPCLKOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO48>;
+                       starfive,pinmux = <PAD_GPIO48_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI3_SSPCLKOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp3-pins_cs {
-                       sf,pins = <PAD_GPIO49>;
-                       sf,pinmux = <PAD_GPIO49_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI3_SSPFSSOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO49>;
+                       starfive,pinmux = <PAD_GPIO49_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI3_SSPFSSOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        ssp4_pins: ssp4-pins {
                ssp4-pins_tx {
-                       sf,pins = <PAD_GPIO54>;
-                       sf,pinmux = <PAD_GPIO54_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI4_SSPTXD>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO54>;
+                       starfive,pinmux = <PAD_GPIO54_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI4_SSPTXD>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp4-pins_rx {
-                       sf,pins = <PAD_GPIO55>;
-                       sf,pinmux = <PAD_GPIO55_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_SPI4_SSPRXD>;
+                       starfive,pins = <PAD_GPIO55>;
+                       starfive,pinmux = <PAD_GPIO55_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_SPI4_SSPRXD>;
                };
 
                ssp4-pins_clk {
-                       sf,pins = <PAD_GPIO52>;
-                       sf,pinmux = <PAD_GPIO52_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI4_SSPCLKOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO52>;
+                       starfive,pinmux = <PAD_GPIO52_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI4_SSPCLKOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp4-pins_cs {
-                       sf,pins = <PAD_GPIO53>;
-                       sf,pinmux = <PAD_GPIO53_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI4_SSPFSSOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO53>;
+                       starfive,pinmux = <PAD_GPIO53_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI4_SSPFSSOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        ssp5_pins: ssp5-pins {
                ssp5-pins_tx {
-                       sf,pins = <PAD_GPIO58>;
-                       sf,pinmux = <PAD_GPIO58_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI5_SSPTXD>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO58>;
+                       starfive,pinmux = <PAD_GPIO58_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI5_SSPTXD>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp5-pins_rx {
-                       sf,pins = <PAD_GPIO59>;
-                       sf,pinmux = <PAD_GPIO59_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_SPI5_SSPRXD>;
+                       starfive,pins = <PAD_GPIO59>;
+                       starfive,pinmux = <PAD_GPIO59_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_SPI5_SSPRXD>;
                };
 
                ssp5-pins_clk {
-                       sf,pins = <PAD_GPIO56>;
-                       sf,pinmux = <PAD_GPIO56_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI5_SSPCLKOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO56>;
+                       starfive,pinmux = <PAD_GPIO56_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI5_SSPCLKOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp5-pins_cs {
-                       sf,pins = <PAD_GPIO57>;
-                       sf,pinmux = <PAD_GPIO57_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI5_SSPFSSOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO57>;
+                       starfive,pinmux = <PAD_GPIO57_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI5_SSPFSSOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        ssp6_pins: ssp6-pins {
                ssp6-pins_tx {
-                       sf,pins = <PAD_GPIO62>;
-                       sf,pinmux = <PAD_GPIO62_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI6_SSPTXD>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO62>;
+                       starfive,pinmux = <PAD_GPIO62_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI6_SSPTXD>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp6-pins_rx {
-                       sf,pins = <PAD_GPIO63>;
-                       sf,pinmux = <PAD_GPIO63_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_SPI6_SSPRXD>;
+                       starfive,pins = <PAD_GPIO63>;
+                       starfive,pinmux = <PAD_GPIO63_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_SPI6_SSPRXD>;
                };
 
                ssp6-pins_clk {
-                       sf,pins = <PAD_GPIO60>;
-                       sf,pinmux = <PAD_GPIO60_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI6_SSPCLKOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO60>;
+                       starfive,pinmux = <PAD_GPIO60_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI6_SSPCLKOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                ssp6-pins_cs {
-                       sf,pins = <PAD_GPIO61>;
-                       sf,pinmux = <PAD_GPIO61_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_SPI6_SSPFSSOUT>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO61>;
+                       starfive,pinmux = <PAD_GPIO61_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_SPI6_SSPFSSOUT>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        dvp_pins: dvp-pins {
                dvp-clk-pins {
-                       sf,pins = <PAD_GPIO21>;
-                       sf,pinmux = <PAD_GPIO21_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_SYS_CRG_DVP_CLK_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO21>;
+                       starfive,pinmux = <PAD_GPIO21_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_SYS_CRG_DVP_CLK_FUNC_SEL 1>;
                };
 
                dvp-vsync-pins {
-                       sf,pins = <PAD_GPIO22>;
-                       sf,pinmux = <PAD_GPIO22_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_VVALID_C_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO22>;
+                       starfive,pinmux = <PAD_GPIO22_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_VVALID_C_FUNC_SEL 1>;
                };
 
                dvp-hsync-pins {
-                       sf,pins = <PAD_GPIO23>;
-                       sf,pinmux = <PAD_GPIO23_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_HVALID_C_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO23>;
+                       starfive,pinmux = <PAD_GPIO23_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_HVALID_C_FUNC_SEL 1>;
                };
 
                dvp-data0-pins {
-                       sf,pins = <PAD_GPIO24>;
-                       sf,pinmux = <PAD_GPIO24_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C0_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO24>;
+                       starfive,pinmux = <PAD_GPIO24_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C0_FUNC_SEL 1>;
                };
 
                dvp-data1-pins {
-                       sf,pins = <PAD_GPIO25>;
-                       sf,pinmux = <PAD_GPIO25_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C1_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO25>;
+                       starfive,pinmux = <PAD_GPIO25_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C1_FUNC_SEL 1>;
                };
 
                dvp-data2-pins {
-                       sf,pins = <PAD_GPIO26>;
-                       sf,pinmux = <PAD_GPIO26_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C2_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO26>;
+                       starfive,pinmux = <PAD_GPIO26_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C2_FUNC_SEL 1>;
                };
 
                dvp-data3-pins {
-                       sf,pins = <PAD_GPIO27>;
-                       sf,pinmux = <PAD_GPIO27_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C3_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO27>;
+                       starfive,pinmux = <PAD_GPIO27_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C3_FUNC_SEL 1>;
                };
 
                dvp-data4-pins {
-                       sf,pins = <PAD_GPIO28>;
-                       sf,pinmux = <PAD_GPIO28_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C4_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO28>;
+                       starfive,pinmux = <PAD_GPIO28_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C4_FUNC_SEL 1>;
                };
 
                dvp-data5-pins {
-                       sf,pins = <PAD_GPIO29>;
-                       sf,pinmux = <PAD_GPIO29_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C5_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO29>;
+                       starfive,pinmux = <PAD_GPIO29_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C5_FUNC_SEL 1>;
                };
 
                dvp-data6-pins {
-                       sf,pins = <PAD_GPIO30>;
-                       sf,pinmux = <PAD_GPIO30_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C6_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO30>;
+                       starfive,pinmux = <PAD_GPIO30_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C6_FUNC_SEL 1>;
                };
 
                dvp-data7-pins {
-                       sf,pins = <PAD_GPIO31>;
-                       sf,pinmux = <PAD_GPIO31_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C7_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO31>;
+                       starfive,pinmux = <PAD_GPIO31_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C7_FUNC_SEL 1>;
                };
 
                dvp-data8-pins {
-                       sf,pins = <PAD_GPIO32>;
-                       sf,pinmux = <PAD_GPIO32_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C8_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO32>;
+                       starfive,pinmux = <PAD_GPIO32_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C8_FUNC_SEL 1>;
                };
 
                dvp-data9-pins {
-                       sf,pins = <PAD_GPIO33>;
-                       sf,pinmux = <PAD_GPIO33_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C9_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO33>;
+                       starfive,pinmux = <PAD_GPIO33_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C9_FUNC_SEL 1>;
                };
 
                dvp-data10-pins {
-                       sf,pins = <PAD_GPIO34>;
-                       sf,pinmux = <PAD_GPIO34_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C10_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO34>;
+                       starfive,pinmux = <PAD_GPIO34_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C10_FUNC_SEL 1>;
                };
 
                dvp-data11-pins {
-                       sf,pins = <PAD_GPIO35>;
-                       sf,pinmux = <PAD_GPIO35_FUNC_SEL 2>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PD(1))>;
-                       sf,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C11_FUNC_SEL 1>;
+                       starfive,pins = <PAD_GPIO35>;
+                       starfive,pinmux = <PAD_GPIO35_FUNC_SEL 2>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | GPIO_PD(1))>;
+                       starfive,padmux = <U0_DOM_ISP_TOP_U0_VIN_DVP_DATA_C11_FUNC_SEL 1>;
                };
        };
 
        rgb_pad_pins: rgb-pad-pins {
                rgb-0-pins {
-                       sf,pins = <PAD_GPIO36>;
-                       sf,pinmux = <PAD_GPIO36_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0)|GPIO_SLEW(1)|GPIO_DS(3))>;
+                       starfive,pins = <PAD_GPIO36>;
+                       starfive,pinmux = <PAD_GPIO36_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0)|GPIO_SLEW(1)|GPIO_DS(3))>;
                };
                rgb-1-pins {
-                       sf,pins = <PAD_GPIO37>;
-                       sf,pinmux = <PAD_GPIO37_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO37>;
+                       starfive,pinmux = <PAD_GPIO37_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
 
                rgb-2-pins {
-                       sf,pins = <PAD_GPIO38>;
-                       sf,pinmux = <PAD_GPIO38_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO38>;
+                       starfive,pinmux = <PAD_GPIO38_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
 
                rgb-3-pins {
-                       sf,pins = <PAD_GPIO39>;
-                       sf,pinmux = <PAD_GPIO39_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO39>;
+                       starfive,pinmux = <PAD_GPIO39_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-4-pins {
-                       sf,pins = <PAD_GPIO40>;
-                       sf,pinmux = <PAD_GPIO40_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO40>;
+                       starfive,pinmux = <PAD_GPIO40_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-5-pins {
-                       sf,pins = <PAD_GPIO41>;
-                       sf,pinmux = <PAD_GPIO41_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO41>;
+                       starfive,pinmux = <PAD_GPIO41_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-6-pins {
-                       sf,pins = <PAD_GPIO42>;
-                       sf,pinmux = <PAD_GPIO42_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO42>;
+                       starfive,pinmux = <PAD_GPIO42_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-7-pins {
-                       sf,pins = <PAD_GPIO43>;
-                       sf,pinmux = <PAD_GPIO43_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO43>;
+                       starfive,pinmux = <PAD_GPIO43_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
 
                rgb-8-pins {
-                       sf,pins = <PAD_GPIO44>;
-                       sf,pinmux = <PAD_GPIO44_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO44>;
+                       starfive,pinmux = <PAD_GPIO44_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
 
                rgb-9-pins {
-                       sf,pins = <PAD_GPIO45>;
-                       sf,pinmux = <PAD_GPIO45_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO45>;
+                       starfive,pinmux = <PAD_GPIO45_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-10-pins {
-                       sf,pins = <PAD_GPIO46>;
-                       sf,pinmux = <PAD_GPIO46_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO46>;
+                       starfive,pinmux = <PAD_GPIO46_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-11-pins {
-                       sf,pins = <PAD_GPIO47>;
-                       sf,pinmux = <PAD_GPIO47_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO47>;
+                       starfive,pinmux = <PAD_GPIO47_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-12-pins {
-                       sf,pins = <PAD_GPIO48>;
-                       sf,pinmux = <PAD_GPIO48_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO48>;
+                       starfive,pinmux = <PAD_GPIO48_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-13-pins {
-                       sf,pins = <PAD_GPIO49>;
-                       sf,pinmux = <PAD_GPIO49_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO49>;
+                       starfive,pinmux = <PAD_GPIO49_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-14-pins {
-                       sf,pins = <PAD_GPIO50>;
-                       sf,pinmux = <PAD_GPIO50_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO50>;
+                       starfive,pinmux = <PAD_GPIO50_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-15-pins {
-                       sf,pins = <PAD_GPIO51>;
-                       sf,pinmux = <PAD_GPIO51_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO51>;
+                       starfive,pinmux = <PAD_GPIO51_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-16-pins {
-                       sf,pins = <PAD_GPIO52>;
-                       sf,pinmux = <PAD_GPIO52_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO52>;
+                       starfive,pinmux = <PAD_GPIO52_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-17-pins {
-                       sf,pins = <PAD_GPIO53>;
-                       sf,pinmux = <PAD_GPIO53_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO53>;
+                       starfive,pinmux = <PAD_GPIO53_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-18-pins {
-                       sf,pins = <PAD_GPIO54>;
-                       sf,pinmux = <PAD_GPIO54_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO54>;
+                       starfive,pinmux = <PAD_GPIO54_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-19-pins {
-                       sf,pins = <PAD_GPIO55>;
-                       sf,pinmux = <PAD_GPIO55_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO55>;
+                       starfive,pinmux = <PAD_GPIO55_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-20-pins {
-                       sf,pins = <PAD_GPIO56>;
-                       sf,pinmux = <PAD_GPIO56_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO56>;
+                       starfive,pinmux = <PAD_GPIO56_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
 
                rgb-21-pins {
-                       sf,pins = <PAD_GPIO57>;
-                       sf,pinmux = <PAD_GPIO57_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO57>;
+                       starfive,pinmux = <PAD_GPIO57_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-22-pins {
-                       sf,pins = <PAD_GPIO58>;
-                       sf,pinmux = <PAD_GPIO58_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO58>;
+                       starfive,pinmux = <PAD_GPIO58_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
 
                rgb-23-pins {
-                       sf,pins = <PAD_GPIO59>;
-                       sf,pinmux = <PAD_GPIO59_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO59>;
+                       starfive,pinmux = <PAD_GPIO59_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-24-pins {
-                       sf,pins = <PAD_GPIO60>;
-                       sf,pinmux = <PAD_GPIO60_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO60>;
+                       starfive,pinmux = <PAD_GPIO60_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-25-pins {
-                       sf,pins = <PAD_GPIO61>;
-                       sf,pinmux = <PAD_GPIO61_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO61>;
+                       starfive,pinmux = <PAD_GPIO61_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                rgb-26-pins {
-                       sf,pins = <PAD_GPIO62>;
-                       sf,pinmux = <PAD_GPIO62_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO62>;
+                       starfive,pinmux = <PAD_GPIO62_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
 
                rgb-27-pins {
-                       sf,pins = <PAD_GPIO63>;
-                       sf,pinmux = <PAD_GPIO63_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO63>;
+                       starfive,pinmux = <PAD_GPIO63_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
 
        };
 
        inno_hdmi_pins: inno_hdmi-pins {
                inno_hdmi-scl {
-                       sf,pins = <PAD_GPIO7>;
-                       //sf,pinmux = <PAD_GPIO7_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_HDMI0_DDC_SCL_OUT>;
-                       sf,pin-gpio-doen = <OEN_HDMI0_DDC_SCL_OEN>;
-                       sf,pin-gpio-din =  <GPI_HDMI0_DDC_SCL_IN>;
+                       starfive,pins = <PAD_GPIO7>;
+                       //starfive,pinmux = <PAD_GPIO7_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_HDMI0_DDC_SCL_OUT>;
+                       starfive,pin-gpio-doen = <OEN_HDMI0_DDC_SCL_OEN>;
+                       starfive,pin-gpio-din =  <GPI_HDMI0_DDC_SCL_IN>;
                };
 
                inno_hdmi-sda {
-                       sf,pins = <PAD_GPIO8>;
-                       //sf,pinmux = <PAD_GPIO8_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-dout = <GPO_HDMI0_DDC_SDA_OUT>;
-                       sf,pin-gpio-doen = <OEN_HDMI0_DDC_SDA_OEN>;
-                       sf,pin-gpio-din =  <GPI_HDMI0_DDC_SDA_IN>;
+                       starfive,pins = <PAD_GPIO8>;
+                       //starfive,pinmux = <PAD_GPIO8_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-dout = <GPO_HDMI0_DDC_SDA_OUT>;
+                       starfive,pin-gpio-doen = <OEN_HDMI0_DDC_SDA_OEN>;
+                       starfive,pin-gpio-din =  <GPI_HDMI0_DDC_SDA_IN>;
                };
                inno_hdmi-cec-pins {
-                       sf,pins = <PAD_GPIO14>;
-                       //sf,pinmux = <PAD_GPIO14_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
-                       sf,pin-gpio-doen = <OEN_HDMI0_CEC_SDA_OEN>;
-                       sf,pin-gpio-dout = <GPO_HDMI0_CEC_SDA_OUT>;
-                       sf,pin-gpio-din =  <GPI_HDMI0_CEC_SDA_IN>;
+                       starfive,pins = <PAD_GPIO14>;
+                       //starfive,pinmux = <PAD_GPIO14_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+                       starfive,pin-gpio-doen = <OEN_HDMI0_CEC_SDA_OEN>;
+                       starfive,pin-gpio-dout = <GPO_HDMI0_CEC_SDA_OUT>;
+                       starfive,pin-gpio-din =  <GPI_HDMI0_CEC_SDA_IN>;
                };
                inno_hdmi-hpd-pins {
-                       sf,pins = <PAD_GPIO15>;
-                       //sf,pinmux = <PAD_GPIO15_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
-                       sf,pin-gpio-din =  <GPI_HDMI0_HPD>;
+                       starfive,pins = <PAD_GPIO15>;
+                       //starfive,pinmux = <PAD_GPIO15_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pin-gpio-din =  <GPI_HDMI0_HPD>;
                };
        };
 
        mipitx_pins: mipitx-pins {
                mipitx-1-pins {
-                       sf,pins = <PAD_GPIO36>;
-                       sf,pinmux = <PAD_GPIO36_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO36>;
+                       starfive,pinmux = <PAD_GPIO36_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                mipitx-2-pins {
-                       sf,pins = <PAD_GPIO37>;
-                       sf,pinmux = <PAD_GPIO37_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO37>;
+                       starfive,pinmux = <PAD_GPIO37_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
 
                mipitx-3-pins {
-                       sf,pins = <PAD_GPIO38>;
-                       sf,pinmux = <PAD_GPIO38_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO38>;
+                       starfive,pinmux = <PAD_GPIO38_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
 
                mipitx-4-pins {
-                       sf,pins = <PAD_GPIO39>;
-                       sf,pinmux = <PAD_GPIO39_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO39>;
+                       starfive,pinmux = <PAD_GPIO39_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
                mipitx-5-pins {
-                       sf,pins = <PAD_GPIO40>;
-                       sf,pinmux = <PAD_GPIO40_FUNC_SEL 1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(0))>;
+                       starfive,pins = <PAD_GPIO40>;
+                       starfive,pinmux = <PAD_GPIO40_FUNC_SEL 1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(0))>;
                };
        };
 
        pcie0_perst_default: pcie0_perst_default {
                perst-pins {
-                       sf,pins = <PAD_GPIO26>;
-                       sf,pinmux = <PAD_GPIO26_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_HIGH>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO26>;
+                       starfive,pinmux = <PAD_GPIO26_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_HIGH>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        pcie0_perst_active: pcie0_perst_active {
                perst-pins {
-                       sf,pins = <PAD_GPIO26>;
-                       sf,pinmux = <PAD_GPIO26_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO26>;
+                       starfive,pinmux = <PAD_GPIO26_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        pcie0_power_active: pcie0_power_active {
                power-pins {
-                       sf,pins = <PAD_GPIO32>;
-                       sf,pinmux = <PAD_GPIO32_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_HIGH>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO32>;
+                       starfive,pinmux = <PAD_GPIO32_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_HIGH>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        pcie1_perst_default: pcie1_perst_default {
                perst-pins {
-                       sf,pins = <PAD_GPIO28>;
-                       sf,pinmux = <PAD_GPIO28_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_HIGH>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO28>;
+                       starfive,pinmux = <PAD_GPIO28_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_HIGH>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        pcie1_perst_active: pcie1_perst_active {
                perst-pins {
-                       sf,pins = <PAD_GPIO28>;
-                       sf,pinmux = <PAD_GPIO28_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_LOW>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO28>;
+                       starfive,pinmux = <PAD_GPIO28_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_LOW>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        pcie1_power_active: pcie1_power_active {
                power-pins {
-                       sf,pins = <PAD_GPIO21>;
-                       sf,pinmux = <PAD_GPIO21_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_HIGH>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO21>;
+                       starfive,pinmux = <PAD_GPIO21_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_HIGH>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
        };
 
        usb_pins: usb-pins {
                drive-vbus-pin {
-                       sf,pins = <PAD_GPIO33>;
-                       sf,pinmux = <PAD_GPIO33_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <GPO_HIGH>;
-                       sf,pin-gpio-doen = <OEN_LOW>;
+                       starfive,pins = <PAD_GPIO33>;
+                       starfive,pinmux = <PAD_GPIO33_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <GPO_HIGH>;
+                       starfive,pin-gpio-doen = <OEN_LOW>;
                };
 
                overcurrent-pin {
-                       sf,pins = <PAD_GPIO34>;
-                       sf,pinmux = <PAD_GPIO34_FUNC_SEL 0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-din = <GPI_USB0_OVERCURRENT_N_IO>;
-                       sf,pin-gpio-doen = <OEN_HIGH>;
+                       starfive,pins = <PAD_GPIO34>;
+                       starfive,pinmux = <PAD_GPIO34_FUNC_SEL 0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-din = <GPI_USB0_OVERCURRENT_N_IO>;
+                       starfive,pin-gpio-doen = <OEN_HIGH>;
                };
        };
 };
@@ -1397,33 +1397,33 @@
 &gpioa {
        pwm_ch4to5_pins: pwm-ch4to5-pins {
                pwm-ch4-pins {
-                       sf,pins = <PAD_RGPIO0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_4>;
-                       sf,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_4>;
+                       starfive,pins = <PAD_RGPIO0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_4>;
+                       starfive,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_4>;
                };
 
                pwm-ch5-pins {
-                       sf,pins = <PAD_RGPIO1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_5>;
-                       sf,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_5>;
+                       starfive,pins = <PAD_RGPIO1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_5>;
+                       starfive,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_5>;
                };
        };
 
        pwm_ch6to7_pins: pwm-ch6to7-pins {
                pwm-ch6-pins {
-                       sf,pins = <PAD_RGPIO0>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_6>;
-                       sf,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_6>;
+                       starfive,pins = <PAD_RGPIO0>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_6>;
+                       starfive,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_6>;
                };
 
                pwm-ch7-pins {
-                       sf,pins = <PAD_RGPIO1>;
-                       sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-                       sf,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_7>;
-                       sf,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_7>;
+                       starfive,pins = <PAD_RGPIO1>;
+                       starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+                       starfive,pin-gpio-dout = <U0_PWM_8CH_PTC_PWM_7>;
+                       starfive,pin-gpio-doen = <U0_PWM_8CH_PTC_OE_N_7>;
                };
        };
 };

diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts
old mode 100644 (file)
new mode 100755 (executable)
index 285d125..3ea9c0e
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts
@@ -70,6 +70,3 @@
        status = "okay";
 };
 
-&spdif_receiver {
-       status = "okay";
-};

diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index 729a4f1..531750f 100755 (executable)
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -466,7 +466,7 @@
                };
 
                timer: timer@13050000 {
-                       compatible = "starfive,timers";
+                       compatible = "starfive,jh7110-timers";
                        reg = <0x0 0x13050000 0x0 0x10000>;
                        interrupts = <69>, <70>, <71> ,<72>;
                        interrupt-names = "timer0", "timer1",
@@ -490,7 +490,7 @@
                };
 
                wdog: wdog@13070000 {
-                       compatible = "starfive,dskit-wdt";
+                       compatible = "starfive,jh7110-wdt";
                        reg = <0x0 0x13070000 0x0 0x10000>;
                        interrupts = <68>;
                        interrupt-names = "wdog";
@@ -712,8 +712,7 @@
                };
 
                sec_dma: sec_dma@16008000 {
-                       /*compatible = "arm,pl080", "arm,primecell";*/
-                       compatible = "starfive,pl080";
+                       compatible = "starfive,pl080", "arm,pl080", "arm,primecell";
                        reg = <0x0 0x16008000 0x0 0x4000>;
                        reg-names = "sec_dma";
                        interrupts = <29>;
@@ -843,7 +842,7 @@
 
                /* unremovable emmc as mmcblk0 */
                sdio0: sdio0@16010000 {
-                       compatible = "snps,dw-mshc";
+                       compatible = "starfive,jh7110-sdio", "snps,dw-mshc";
                        reg = <0x0 0x16010000 0x0 0x10000>;
                        clocks = <&clkgen JH7110_SDIO0_CLK_AHB>,
                                 <&clkgen JH7110_SDIO0_CLK_SDCARD>;
@@ -858,7 +857,7 @@
                };
 
                sdio1: sdio1@16020000 {
-                       compatible = "snps,dw-mshc";
+                       compatible = "starfive,jh7110-sdio", "snps,dw-mshc";
                        reg = <0x0 0x16020000 0x0 0x10000>;
                        clocks = <&clkgen JH7110_SDIO1_CLK_AHB>,
                                 <&clkgen JH7110_SDIO1_CLK_SDCARD>;
@@ -873,7 +872,7 @@
                };
 
                vin_sysctl: vin_sysctl@19800000 {
-                       compatible = "starfive,stf-vin";
+                       compatible = "starfive,jh7110-vin";
                        reg = <0x0 0x19800000 0x0 0x10000>,
                                <0x0 0x19810000 0x0 0x10000>,
                                <0x0 0x19820000 0x0 0x10000>,
@@ -1119,7 +1118,7 @@
                };
 
                can0: can@130d0000 {
-                       compatible = "ipms,can";
+                       compatible = "starfive,jh7110-can", "ipms,can";
                        reg = <0x0 0x130d0000 0x0 0x1000>;
                        interrupts = <112>;
                        clocks = <&clkgen JH7110_CAN0_CTRL_CLK_APB>,
@@ -1131,12 +1130,11 @@
                                 <&rstgen RSTN_U0_CAN_CTRL_TIMER>;
                        reset-names = "rst_apb", "rst_core", "rst_timer";
                        starfive,sys-syscon = <&sys_syscon 0x10 0x3 0x8>;
-                       syscon,can_or_canfd = <0>;
                        status = "disabled";
                };
 
                can1: can@130e0000 {
-                       compatible = "ipms,can";
+                       compatible = "starfive,jh7110-can", "ipms,can";
                        reg = <0x0 0x130e0000 0x0 0x1000>;
                        interrupts = <113>;
                        clocks = <&clkgen JH7110_CAN1_CTRL_CLK_APB>,
@@ -1148,12 +1146,11 @@
                                 <&rstgen RSTN_U1_CAN_CTRL_TIMER>;
                        reset-names = "rst_apb", "rst_core", "rst_timer";
                        starfive,sys-syscon = <&sys_syscon 0x88 0x12 0x40000>;
-                       syscon,can_or_canfd = <0>;
                        status = "disabled";
                };
 
                tdm: tdm@10090000 {
-                       compatible = "starfive,sf-tdm";
+                       compatible = "starfive,jh7110-tdm";
                        reg = <0x0 0x10090000 0x0 0x1000>;
                        reg-names = "tdm";
                        clocks = <&clkgen JH7110_AHB0>,
@@ -1179,7 +1176,7 @@
                };
 
                spdif0: spdif0@100a0000 {
-                       compatible = "starfive,sf-spdif";
+                       compatible = "starfive,jh7110-spdif";
                        reg = <0x0 0x100a0000 0x0 0x1000>;
                        clocks = <&clkgen JH7110_SPDIF_CLK_APB>,
                                 <&clkgen JH7110_SPDIF_CLK_CORE>,
@@ -1196,7 +1193,7 @@
                };
 
                pwmdac: pwmdac@100b0000 {
-                       compatible = "starfive,pwmdac";
+                       compatible = "starfive,jh7110-pwmdac";
                        reg = <0x0 0x100b0000 0x0 0x1000>;
                        clocks = <&clkgen JH7110_APB0>,
                                 <&clkgen JH7110_PWMDAC_CLK_APB>,
@@ -1221,7 +1218,7 @@
                };
 
                pdm: pdm@100d0000 {
-                       compatible = "starfive,sf-pdm";
+                       compatible = "starfive,jh7110-pdm";
                        reg = <0x0 0x100d0000 0x0 0x1000>;
                        reg-names = "pdm";
                        clocks = <&clkgen JH7110_PDM_CLK_DMIC>,
@@ -1240,7 +1237,7 @@
                };
 
                i2srx_mst: i2srx_mst@100e0000 {
-                       compatible = "snps,i2srx-master";
+                       compatible = "starfive,jh7110-i2srx-master";
                        reg = <0x0 0x100e0000 0x0 0x1000>;
                        clocks = <&clkgen JH7110_APB0>,
                                 <&clkgen JH7110_I2SRX0_3CH_CLK_APB>,
@@ -1262,7 +1259,7 @@
                };
 
                i2srx_3ch: i2srx_3ch@100e0000 {
-                       compatible = "snps,designware-i2srx";
+                       compatible = "starfive,jh7110-i2srx", "snps,designware-i2s";
                        reg = <0x0 0x100e0000 0x0 0x1000>;
                        clocks = <&clkgen JH7110_APB0>,
                                 <&clkgen JH7110_I2SRX0_3CH_CLK_APB>,
@@ -1276,11 +1273,11 @@
                                 <&i2srx_bclk_ext>,
                                 <&i2srx_lrck_ext>;
                        clock-names = "apb0", "3ch-apb",
-                                       "audioroot", "mclk-inner",
-                                       "bclk_mst", "3ch-lrck",
-                                       "rx-bclk", "rx-lrck",
-                                       "mclk", "bclk-ext",
-                                       "lrck-ext";
+                                     "audioroot", "mclk-inner",
+                                     "bclk_mst", "3ch-lrck",
+                                     "rx-bclk", "rx-lrck",
+                                     "mclk", "bclk-ext",
+                                     "lrck-ext";
                        resets = <&rstgen RSTN_U0_I2SRX_3CH_APB>,
                                 <&rstgen RSTN_U0_I2SRX_3CH_BCLK>;
                        dmas = <&dma 24 1>;
@@ -1311,7 +1308,7 @@
                };
 
                i2stx_4ch1: i2stx_4ch1@120c0000 {
-                       compatible = "snps,designware-i2stx-4ch1";
+                       compatible = "starfive,jh7110-i2stx-4ch1", "snps,designware-i2s";
                        reg = <0x0 0x120c0000 0x0 0x1000>;
                        clocks = <&clkgen JH7110_AUDIO_ROOT>,
                                 <&clkgen JH7110_MCLK_INNER>,
@@ -1326,12 +1323,11 @@
                                 <&mclk_ext>,
                                 <&i2stx_bclk_ext>,
                                 <&i2stx_lrck_ext>;
-                        clock-names = "audroot", "mclk_inner", "bclk_mst",
-                                        "lrck_mst", "mclk", "4chbclk",
-                                        "4chlrck", "mclk_out",
-                                       "apb0", "clk_apb",
-                                       "mclk_ext", "bclk_ext", "lrck_ext";
-
+                       clock-names = "audroot", "mclk_inner", "bclk_mst",
+                                     "lrck_mst", "mclk", "4chbclk",
+                                     "4chlrck", "mclk_out",
+                                     "apb0", "clk_apb",
+                                     "mclk_ext", "bclk_ext", "lrck_ext";
                        resets = <&rstgen RSTN_U1_I2STX_4CH_APB>,
                                 <&rstgen RSTN_U1_I2STX_4CH_BCLK>;
                        dmas = <&dma 48 1>;
@@ -1358,14 +1354,8 @@
                        status = "disabled";
                };
 
-               spdif_receiver: spdif_receiver {
-                       compatible = "linux,spdif-dir";
-                       #sound-dai-cells = <0>;
-                       status = "disabled";
-               };
-
                pwmdac_codec: pwmdac-transmitter {
-                       compatible = "linux,pwmdac-dit";
+                       compatible = "starfive,jh7110-pwmdac-dit";
                        #sound-dai-cells = <0>;
                        status = "disabled";
                };

diff --git a/drivers/clocksource/timer-starfive.c b/drivers/clocksource/timer-starfive.c
index 9802874..ea1f41b 100755 (executable)
--- a/drivers/clocksource/timer-starfive.c
+++ b/drivers/clocksource/timer-starfive.c
@@ -458,7 +458,7 @@ static int __init starfive_timer_of_init(struct device_node *np)
 {
        return do_starfive_timer_of_init(np, &jh7110_starfive_timer);
 }
-TIMER_OF_DECLARE(starfive_timer, "starfive,timers", starfive_timer_of_init);
+TIMER_OF_DECLARE(starfive_timer, "starfive,jh7110-timers", starfive_timer_of_init);
 
 MODULE_AUTHOR("xingyu.wu <xingyu.wu@starfivetech.com>");
 MODULE_AUTHOR("samin.guo <samin.guo@starfivetech.com>");

diff --git a/drivers/gpu/drm/verisilicon/inno_hdmi.c b/drivers/gpu/drm/verisilicon/inno_hdmi.c
index 48f2a21..71545bf 100755 (executable)
--- a/drivers/gpu/drm/verisilicon/inno_hdmi.c
+++ b/drivers/gpu/drm/verisilicon/inno_hdmi.c
@@ -91,6 +91,7 @@ static const struct pre_pll_config pre_pll_cfg_table[] = {
        { 25175000,  25175000, 1,  100, 2, 3, 3, 12, 3, 3, 4, 0, 0},
        { 25200000,  25200000, 1,  100, 2, 3, 3, 12, 3, 3, 4, 0, 0},
        { 27000000,  27000000, 1,  90, 3, 2, 2, 10, 3, 3, 4, 0, 0},
+       { 27027000,  27027000, 1,  90, 3, 2, 2, 10, 3, 3, 4, 0, 0},
        { 27000000,  33750000, 1,  90, 1, 3, 3, 10, 3, 3, 4, 0, 0},
        { 40000000,  40000000, 1,  80, 2, 2, 2, 12, 2, 2, 2, 0, 0},
        { 59341000,  59341000, 1,  98, 3, 1, 2,  1, 3, 3, 4, 0, 0xE6AE6B},

diff --git a/drivers/gpu/drm/verisilicon/vs_crtc.c b/drivers/gpu/drm/verisilicon/vs_crtc.c
index 1ebe490..21398bb 100644 (file)
--- a/drivers/gpu/drm/verisilicon/vs_crtc.c
+++ b/drivers/gpu/drm/verisilicon/vs_crtc.c
@@ -189,6 +189,10 @@ static int vs_crtc_late_register(struct drm_crtc *crtc)
 static int vs_crtc_enable_vblank(struct drm_crtc *crtc)
 {
        struct vs_crtc *vs_crtc = to_vs_crtc(crtc);
+       struct vs_crtc_state *vs_crtc_state = to_vs_crtc_state(crtc->state);
+
+       if (vs_crtc_state->encoder_type == DRM_MODE_ENCODER_DSI)
+               vs_crtc->funcs->enable(vs_crtc->dev, crtc);
 
        vs_crtc->funcs->enable_vblank(vs_crtc->dev, true);
 
@@ -271,7 +275,10 @@ static void vs_crtc_atomic_enable(struct drm_crtc *crtc,
        if (vs_crtc_state->encoder_type != DRM_MODE_ENCODER_DSI){
                vs_crtc->funcs->enable(vs_crtc->dev, crtc);
                drm_crtc_vblank_on(crtc);
+       } else {
+               drm_crtc_vblank_on(crtc);
        }
+
 }
 
 static void vs_crtc_atomic_disable(struct drm_crtc *crtc,
@@ -305,11 +312,6 @@ static void vs_crtc_atomic_begin(struct drm_crtc *crtc,
        struct drm_color_lut *lut;
        struct vs_crtc_state *vs_crtc_state = to_vs_crtc_state(crtc->state);
 
-       if (vs_crtc_state->encoder_type == DRM_MODE_ENCODER_DSI){
-               vs_crtc->funcs->enable(vs_crtc->dev, crtc);
-               drm_crtc_vblank_on(crtc);
-       }
-
        if (crtc_state->color_mgmt_changed) {
                if ((blob) && (blob->length)) {
                        lut = blob->data;

diff --git a/drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c b/drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c
index 7c1de20..c6c80db 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c
+++ b/drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c
@@ -1649,7 +1649,7 @@ static int imx219_remove(struct i2c_client *client)
 }
 
 static const struct of_device_id imx219_dt_ids[] = {
-       { .compatible = "imx219" },
+       { .compatible = "sony,imx219" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, imx219_dt_ids);

diff --git a/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c b/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c
index 25b54b2..211c24c 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c
+++ b/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c
@@ -3006,7 +3006,7 @@ static int ov4689_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ov4689_id[] = {
-       {"ov4689", 0},
+       { "ov4689", 0 },
        {},
 };
 MODULE_DEVICE_TABLE(i2c, ov4689_id);

diff --git a/drivers/media/platform/starfive/v4l2_driver/sc2235.c b/drivers/media/platform/starfive/v4l2_driver/sc2235.c
index c1a77f8..e50de3a 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/sc2235.c
+++ b/drivers/media/platform/starfive/v4l2_driver/sc2235.c
@@ -1926,13 +1926,13 @@ static int sc2235_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id sc2235_id[] = {
-       {"sc2235", 0},
+       { "sc2235", 0 },
        {},
 };
 MODULE_DEVICE_TABLE(i2c, sc2235_id);
 
 static const struct of_device_id sc2235_dt_ids[] = {
-       { .compatible = "sc2235" },
+       { .compatible = "smartsens,sc2235" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, sc2235_dt_ids);

diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c
index d5201f0..44d4fa7 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c
@@ -85,8 +85,18 @@ static int stf_csi_clk_enable(struct stf_csi_dev *csi_dev)
        reset_control_deassert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF1].rstc);
        reset_control_deassert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF2].rstc);
        reset_control_deassert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF3].rstc);
-       reset_control_deassert(stfcamss->sys_rst[STFRST_AXIRD].rstc);
-       reset_control_deassert(stfcamss->sys_rst[STFRST_AXIWR].rstc);
+
+       switch (csi_dev->s_type) {
+       case SENSOR_VIN:
+               reset_control_deassert(stfcamss->sys_rst[STFRST_AXIWR].rstc);
+               clk_set_parent(stfcamss->sys_clk[STFCLK_AXIWR].clk,
+                       stfcamss->sys_clk[STFCLK_MIPI_RX0_PXL].clk);
+               break;
+       case SENSOR_ISP:
+               clk_set_parent(stfcamss->sys_clk[STFCLK_WRAPPER_CLK_C].clk,
+                       stfcamss->sys_clk[STFCLK_MIPI_RX0_PXL].clk);
+               break;
+       }
 
        return 0;
 }
@@ -95,17 +105,23 @@ static int stf_csi_clk_disable(struct stf_csi_dev *csi_dev)
 {
        struct stfcamss *stfcamss = csi_dev->stfcamss;
 
-       reset_control_assert(stfcamss->sys_rst[STFRST_AXIWR].rstc);
-       reset_control_assert(stfcamss->sys_rst[STFRST_AXIRD].rstc);
+       switch (csi_dev->s_type) {
+       case SENSOR_VIN:
+               reset_control_assert(stfcamss->sys_rst[STFRST_AXIWR].rstc);
+               break;
+       case SENSOR_ISP:
+               break;
+       }
+
        reset_control_assert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF3].rstc);
        reset_control_assert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF2].rstc);
        reset_control_assert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF1].rstc);
        reset_control_assert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF0].rstc);
 
-       clk_disable_unprepare(stfcamss->sys_clk[STFCLK_PIXEL_CLK_IF0].clk);
-       clk_disable_unprepare(stfcamss->sys_clk[STFCLK_PIXEL_CLK_IF1].clk);
-       clk_disable_unprepare(stfcamss->sys_clk[STFCLK_PIXEL_CLK_IF2].clk);
        clk_disable_unprepare(stfcamss->sys_clk[STFCLK_PIXEL_CLK_IF3].clk);
+       clk_disable_unprepare(stfcamss->sys_clk[STFCLK_PIXEL_CLK_IF2].clk);
+       clk_disable_unprepare(stfcamss->sys_clk[STFCLK_PIXEL_CLK_IF1].clk);
+       clk_disable_unprepare(stfcamss->sys_clk[STFCLK_PIXEL_CLK_IF0].clk);
 
        return 0;
 }
@@ -214,15 +230,11 @@ static void csi2rx_stop(struct stf_csi_dev *csi_dev, void *reg_base)
 static int stf_csi_stream_set(struct stf_csi_dev *csi_dev,
                                        int on, u32 dt, u32 width)
 {
-       struct stfcamss *stfcamss = csi_dev->stfcamss;
        struct stf_vin_dev *vin = csi_dev->stfcamss->vin;
        void __iomem *reg_base = vin->csi2rx_base;
 
        switch (csi_dev->s_type) {
        case SENSOR_VIN:
-               clk_set_parent(stfcamss->sys_clk[STFCLK_AXIWR].clk,
-                       stfcamss->sys_clk[STFCLK_MIPI_RX0_PXL].clk);
-
                reg_set_bit(vin->sysctrl_base, SYSCONSAIF_SYSCFG_20,
                        BIT(3)|BIT(2)|BIT(1)|BIT(0),
                        0<<0);          //u0_vin_cnfg_axiwr0_channel_sel
@@ -237,9 +249,6 @@ static int stf_csi_stream_set(struct stf_csi_dev *csi_dev,
                        (width / 4 - 1)<<2);    //u0_vin_cnfg_axiwr0_pix_cnt_end
                break;
        case SENSOR_ISP:
-               clk_set_parent(stfcamss->sys_clk[STFCLK_WRAPPER_CLK_C].clk,
-                       stfcamss->sys_clk[STFCLK_MIPI_RX0_PXL].clk);
-
                reg_set_bit(vin->sysctrl_base,  SYSCONSAIF_SYSCFG_36,
                        BIT(7)|BIT(6),
                        0<<6);          //u0_vin_cnfg_mipi_byte_en_isp
@@ -255,8 +264,6 @@ static int stf_csi_stream_set(struct stf_csi_dev *csi_dev,
                                BIT(12),
                                1<<12);         //u0_vin_cnfg_p_i_mipi_header_en0
                break;
-       default:
-               break;
        }
 
        if (on)

diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_dvp_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_dvp_hw_ops.c
index 965c12a..c618159 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/stf_dvp_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_dvp_hw_ops.c
@@ -10,18 +10,16 @@ static int stf_dvp_clk_enable(struct stf_dvp_dev *dvp_dev)
 
        switch (dvp_dev->s_type) {
        case SENSOR_VIN:
+               reset_control_deassert(stfcamss->sys_rst[STFRST_AXIWR].rstc);
                clk_set_phase(stfcamss->sys_clk[STFCLK_DVP_INV].clk, 0);
                clk_set_parent(stfcamss->sys_clk[STFCLK_AXIWR].clk,
                        stfcamss->sys_clk[STFCLK_DVP_INV].clk);
-               reset_control_deassert(stfcamss->sys_rst[STFRST_AXIWR].rstc);
                break;
        case SENSOR_ISP:
                clk_set_phase(stfcamss->sys_clk[STFCLK_DVP_INV].clk, 0);
                clk_set_parent(stfcamss->sys_clk[STFCLK_WRAPPER_CLK_C].clk,
                        stfcamss->sys_clk[STFCLK_DVP_INV].clk);
                break;
-       default:
-               break;
        }
 
        return 0;
@@ -31,8 +29,17 @@ static int stf_dvp_clk_disable(struct stf_dvp_dev *dvp_dev)
 {
        struct stfcamss *stfcamss = dvp_dev->stfcamss;
 
-       if (dvp_dev->s_type == SENSOR_VIN)
+       switch (dvp_dev->s_type) {
+       case SENSOR_VIN:
+               clk_set_parent(stfcamss->sys_clk[STFCLK_AXIWR].clk,
+                       stfcamss->sys_clk[STFCLK_MIPI_RX0_PXL].clk);
                reset_control_assert(stfcamss->sys_rst[STFRST_AXIWR].rstc);
+               break;
+       case SENSOR_ISP:
+               clk_set_parent(stfcamss->sys_clk[STFCLK_WRAPPER_CLK_C].clk,
+                       stfcamss->sys_clk[STFCLK_MIPI_RX0_PXL].clk);
+               break;
+       }
 
        return 0;
 }
@@ -139,7 +146,6 @@ static int stf_dvp_set_format(struct stf_dvp_dev *dvp_dev,
 
 static int stf_dvp_stream_set(struct stf_dvp_dev *dvp_dev, int on)
 {
-       struct stfcamss *stfcamss = dvp_dev->stfcamss;
        struct stf_vin_dev *vin = dvp_dev->stfcamss->vin;
 
        switch (dvp_dev->s_type) {
@@ -165,8 +171,6 @@ static int stf_dvp_stream_set(struct stf_dvp_dev *dvp_dev, int on)
                        U0_VIN_CNFG_GEN_EN_AXIRD,
                        0);
                break;
-       default:
-               break;
        }
 
        return 0;

diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_isp_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_isp_hw_ops.c
index 415cc72..d2e9021 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/stf_isp_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_isp_hw_ops.c
@@ -775,8 +775,7 @@ static int stf_isp_clk_disable(struct stf_isp_dev *isp_dev)
 {
        struct stfcamss *stfcamss = isp_dev->stfcamss;
 
-       //reset STFRST_WRAPPER_C would cause error
-       //reset_control_assert(stfcamss->sys_rst[STFRST_WRAPPER_C].rstc);
+       reset_control_assert(stfcamss->sys_rst[STFRST_WRAPPER_C].rstc);
        reset_control_assert(stfcamss->sys_rst[STFRST_WRAPPER_P].rstc);
        clk_disable_unprepare(stfcamss->sys_clk[STFCLK_WRAPPER_CLK_C].clk);
 

diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_vin_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_vin_hw_ops.c
index 7854998..8080e2c 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/stf_vin_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_vin_hw_ops.c
@@ -288,7 +288,6 @@ static int stf_vin_config_set(struct stf_vin2_dev *vin_dev)
 
 static int stf_vin_wr_stream_set(struct stf_vin2_dev *vin_dev, int on)
 {
-       struct stfcamss *stfcamss = vin_dev->stfcamss;
        struct stf_vin_dev *vin = vin_dev->stfcamss->vin;
 
        //make the axiwr alway on

diff --git a/drivers/media/platform/starfive/v4l2_driver/stfcamss.c b/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
index 63f0d8e..f699766 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
@@ -1182,7 +1182,7 @@ static int stfcamss_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id stfcamss_of_match[] = {
-       {.compatible = "starfive,stf-vin"},
+       { .compatible = "starfive,jh7110-vin" },
        { /* end node */ },
 };
 

diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
index 56c7415..1e7a20b 100755 (executable)
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
@@ -1069,10 +1069,10 @@ static void starfive_jh7110_sys_parse_pin_config(
                        + SYS_GPO_PDA_89_94_CFG_BASE_REG;
        }
 
-       if (!of_property_read_u32(np, "sf,pin-ioconfig", &value))
+       if (!of_property_read_u32(np, "starfive,pin-ioconfig", &value))
                pin_data->pin_config.io_config = value;
 
-       list = of_get_property(np, "sf,pinmux", &size);
+       list = of_get_property(np, "starfive,pinmux", &size);
        if (list) {
                pin_reg->func_sel_reg = be32_to_cpu(*list++);
                pin_reg->func_sel_shift = be32_to_cpu(*list++);
@@ -1080,7 +1080,7 @@ static void starfive_jh7110_sys_parse_pin_config(
                pin_data->pin_config.pinmux_func = be32_to_cpu(*list++);
        }
 
-       list = of_get_property(np, "sf,padmux", &size);
+       list = of_get_property(np, "starfive,padmux", &size);
        if (list) {
                pin_reg->pad_sel_reg = be32_to_cpu(*list++);
                pin_reg->pad_sel_shift = be32_to_cpu(*list++);
@@ -1088,7 +1088,7 @@ static void starfive_jh7110_sys_parse_pin_config(
                pin_data->pin_config.padmux_func = be32_to_cpu(*list++);
        }
 
-       list = of_get_property(np, "sf,pin-syscon", &size);
+       list = of_get_property(np, "starfive,pin-syscon", &size);
        if (list) {
                pin_reg->syscon_reg = be32_to_cpu(*list++);
                pin_data->pin_config.syscon = be32_to_cpu(*list++);
@@ -1098,21 +1098,21 @@ static void starfive_jh7110_sys_parse_pin_config(
                pin_data->pin_config.gpio_num = pin_data->pin;
                n = pin_data->pin_config.gpio_num >> GPIO_NUM_SHIFT;
 
-               if (!of_property_read_u32(np, "sf,pin-gpio-dout", &value)) {
+               if (!of_property_read_u32(np, "starfive,pin-gpio-dout", &value)) {
                        pin_data->pin_config.gpio_dout = value;
                        pin_reg->gpo_dout_reg = info->dout_reg_base + n * 4;
                }
 
-               if (!of_property_read_u32(np, "sf,pin-gpio-doen", &value)) {
+               if (!of_property_read_u32(np, "starfive,pin-gpio-doen", &value)) {
                        pin_data->pin_config.gpio_doen = value;
                        pin_reg->gpo_doen_reg = info->doen_reg_base + n * 4;
                }
 
-               list_din = of_get_property(np, "sf,pin-gpio-din", &size_din);
+               list_din = of_get_property(np, "starfive,pin-gpio-din", &size_din);
                if (list_din) {
                        if (!size_din || size_din % pin_size) {
                                dev_err(pctl->dev,
-                                       "Invalid sf,pin-gpio-din property in node\n");
+                                       "Invalid starfive,pin-gpio-din property in node\n");
                                return;
                        }
 
@@ -1232,10 +1232,10 @@ static void starfive_jh7110_aon_parse_pin_config(
                                        AON_GPO_PDA_0_5_CFG_BASE_REG;
        }
 
-       if (!of_property_read_u32(np, "sf,pin-ioconfig", &value))
+       if (!of_property_read_u32(np, "starfive,pin-ioconfig", &value))
                pin_data->pin_config.io_config = value;
 
-       list = of_get_property(np, "sf,pinmux", &size);
+       list = of_get_property(np, "starfive,pinmux", &size);
        if (list) {
                pin_reg->func_sel_reg = be32_to_cpu(*list++);
                pin_reg->func_sel_shift = be32_to_cpu(*list++);
@@ -1243,7 +1243,7 @@ static void starfive_jh7110_aon_parse_pin_config(
                pin_data->pin_config.pinmux_func = be32_to_cpu(*list++);
        }
 
-       list = of_get_property(np, "sf,pin-syscon", &size);
+       list = of_get_property(np, "starfive,pin-syscon", &size);
        if (list) {
                pin_reg->syscon_reg = be32_to_cpu(*list++);
                pin_data->pin_config.syscon = be32_to_cpu(*list++);
@@ -1254,17 +1254,17 @@ static void starfive_jh7110_aon_parse_pin_config(
                pin_reg->gpo_dout_reg = info->dout_reg_base;
                pin_reg->gpo_doen_reg = info->doen_reg_base;
 
-               if (!of_property_read_u32(np, "sf,pin-gpio-dout", &value))
+               if (!of_property_read_u32(np, "starfive,pin-gpio-dout", &value))
                        pin_data->pin_config.gpio_dout = value;
 
-               if (!of_property_read_u32(np, "sf,pin-gpio-doen", &value))
+               if (!of_property_read_u32(np, "starfive,pin-gpio-doen", &value))
                        pin_data->pin_config.gpio_doen = value;
 
-               list_din = of_get_property(np, "sf,pin-gpio-din", &size_din);
+               list_din = of_get_property(np, "starfive,pin-gpio-din", &size_din);
                if (list_din) {
                        if (!size_din || size_din % pin_size) {
                                dev_err(pctl->dev,
-                                       "Invalid sf,pin-gpio-din property in node\n");
+                                       "Invalid starfive,pin-gpio-din property in node\n");
                                return;
                        }
                        pin_data->pin_config.gpio_din_num = size_din / pin_size;

diff --git a/drivers/pinctrl/starfive/pinctrl-starfive.c b/drivers/pinctrl/starfive/pinctrl-starfive.c
index 801fa3f..262f573 100644 (file)
--- a/drivers/pinctrl/starfive/pinctrl-starfive.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive.c
@@ -79,10 +79,10 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
        pin_size = STARFIVE_PINS_SIZE;
 
        for_each_child_of_node(np, child) {
-               list = of_get_property(child, "sf,pins", &psize);
+               list = of_get_property(child, "starfive,pins", &psize);
                if (!list) {
                        dev_err(sfp->dev,
-                               "no sf,pins and pins property in node %pOF\n", np);
+                               "no starfive,pins and pins property in node %pOF\n", np);
                        return -EINVAL;
                }
                size += psize;
@@ -90,7 +90,7 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
 
        if (!size || size % pin_size) {
                dev_err(sfp->dev,
-                       "Invalid sf,pins or pins property in node %pOF\n", np);
+                       "Invalid starfive,pins or pins property in node %pOF\n", np);
                return -EINVAL;
        }
 
@@ -139,10 +139,10 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
                nmaps += 1;
 
 
-               list = of_get_property(child, "sf,pins", &psize);
+               list = of_get_property(child, "starfive,pins", &psize);
                if (!list) {
                        dev_err(sfp->dev,
-                               "no sf,pins and pins property in node %pOF\n", np);
+                               "no starfive,pins and pins property in node %pOF\n", np);
                        goto put_child;
                }
                child_num_pins = psize / pin_size;
@@ -171,36 +171,13 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
                        list++;
                }
                offset += i;
-/*
-               map[nmaps].type = PIN_MAP_TYPE_MUX_GROUP;
-               map[nmaps].data.mux.function = np->name;
-               map[nmaps].data.mux.group = grpname;
-               nmaps += 1;
-*/
+
                ret = pinctrl_generic_add_group(pctldev,
                                grpname, pins_id, child_num_pins, pin_data);
                if (ret < 0) {
                        dev_err(dev, "error adding group %s: %d\n", grpname, ret);
                        goto put_child;
                }
-#if 0
-               ret = pinconf_generic_parse_dt_config(child, pctldev,
-                               &map[nmaps].data.configs.configs,
-                               &map[nmaps].data.configs.num_configs);
-               if (ret) {
-                       dev_err(dev, "error parsing pin config of group %s: %d\n",
-                                       grpname, ret);
-                       goto put_child;
-               }
-
-               /* don't create a map if there are no pinconf settings */
-               if (map[nmaps].data.configs.num_configs == 0)
-                       continue;
-
-               map[nmaps].type = PIN_MAP_TYPE_CONFIGS_GROUP;
-               map[nmaps].data.configs.group_or_pin = grpname;
-               nmaps += 1;
-#endif
        }
 
        ret = pinmux_generic_add_function(pctldev, np->name, pgnames, ngroups, NULL);

diff --git a/drivers/spi/spi-pl022-starfive.c b/drivers/spi/spi-pl022-starfive.c
index dcc6551..c783cc9 100755 (executable)
--- a/drivers/spi/spi-pl022-starfive.c
+++ b/drivers/spi/spi-pl022-starfive.c
@@ -2601,14 +2601,14 @@ static int starfive_of_pl022_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id starfive_of_pl022_match[] = {
-       { .compatible = "starfive-of,pl022" },
+       { .compatible = "starfive,jh7110-spi-pl022" },
        { },
 };
 MODULE_DEVICE_TABLE(of, starfive_of_pl022_match);
 
 static struct platform_driver starfive_of_pl022_driver = {
        .driver = {
-               .name = "starfive-pl022",
+               .name = "starfive-spi-pl022",
                .of_match_table = starfive_of_pl022_match,
                .pm     = &pl022_dev_pm_ops,
        },

diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
index 6db31d3..70588a5 100755 (executable)
--- a/drivers/watchdog/starfive-wdt.c
+++ b/drivers/watchdog/starfive-wdt.c
@@ -183,9 +183,9 @@ static const struct starfive_wdt_variant drv_data_jh7110 = {
 };
 
 static const struct of_device_id starfive_wdt_match[] = {
-       { .compatible = "starfive,wdt",
+       { .compatible = "starfive,jh7100-wdt",
                .data = &drv_data_jh7100 },
-       { .compatible = "starfive,dskit-wdt",
+       { .compatible = "starfive,jh7110-wdt",
                .data = &drv_data_jh7110 },
        {},
 };

diff --git a/include/video/stf-vin.h b/include/video/stf-vin.h
index ee1a716..bdae4aa 100755 (executable)
--- a/include/video/stf-vin.h
+++ b/include/video/stf-vin.h
@@ -15,7 +15,7 @@
 
 #include <linux/cdev.h>
 
-#define DRV_NAME "stf-vin"
+#define DRV_NAME "jh7110-vin"
 #define FB_FIRST_ADDR      0xf9000000
 #define FB_SECOND_ADDR     0xf97e9000
 

diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index d32ffc8..fbcf9e7 100755 (executable)
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -871,8 +871,6 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
                snd_soc_component_write(component, WM8960_POWER1, 0xfe);
                snd_soc_component_write(component, WM8960_POWER2, 0x1f8);
                snd_soc_component_write(component, WM8960_POWER2, 0x1f9);
-               snd_soc_component_write(component, WM8960_PLL1, 0x28);
-               snd_soc_component_write(component, WM8960_PLL1, 0x38);
 
                freq_in = wm8960->freq_in;
                freq_out = wm8960_configure_pll(component, freq_in, &i, &j, &k);
@@ -940,15 +938,15 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
                        snd_soc_component_write(component, WM8960_BYPASS1, 0x00);
                        snd_soc_component_write(component, WM8960_BYPASS2, 0x00);
                        snd_soc_component_update_bits(component, WM8960_ADDCTL4, 0x73, 0);
-               } else {
+
                        if (params_channels(params) == 1)
-                               snd_soc_component_write(component, WM8960_LOUT1, 0x100);
-                       else {
-                               if (snd_soc_component_read(component, WM8960_LOUT1) & 0x7f)
-                                       snd_soc_component_update_bits(component, WM8960_LOUT1, 0x100, 0x100);
-                               else
-                                       snd_soc_component_write(component, WM8960_LOUT1, 0x170);
-                       }
+                               wm8960->lrclk /= 2;
+               } else {
+                       if (params_channels(params) == 1) {
+                               snd_soc_component_update_bits(component, WM8960_ADDCTL1, 0x10, 0x10);
+                               wm8960->lrclk /= 2;
+                       } else
+                               snd_soc_component_update_bits(component, WM8960_ADDCTL1, 0x10, 0);
                }
        }
 
@@ -962,9 +960,9 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
 
        if (tx) {
                snd_soc_component_update_bits(component, WM8960_POWER3, 0xc, 0xc);
-               msleep(100);
+               msleep(20);
                snd_soc_component_update_bits(component, WM8960_POWER2, 0x1e0, 0x1e0);
-               msleep(100);
+               msleep(20);
        }
 
        return 0;
@@ -1024,7 +1022,7 @@ static int wm8960_set_bias_level_out3(struct snd_soc_component *component,
                                return ret;
 
                        snd_soc_component_update_bits(component, WM8960_POWER3, 0xc, 0xc);
-                       msleep(100);
+                       msleep(20);
                        /* Set VMID to 2x50k */
                        snd_soc_component_update_bits(component, WM8960_POWER1, 0x180, 0x80);
                        break;
@@ -1325,7 +1323,7 @@ static int wm8960_set_pll(struct snd_soc_component *component,
 
        /* Turn it on */
        snd_soc_component_update_bits(component, WM8960_POWER2, 0x1, 0x1);
-       msleep(250);
+       msleep(150);
        snd_soc_component_update_bits(component, WM8960_CLOCK1, 0x1, 0x1);
 
        return 0;

diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c
index 88042dd..f2ddcfd 100755 (executable)
--- a/sound/soc/dwc/dwc-i2s.c
+++ b/sound/soc/dwc/dwc-i2s.c
@@ -252,9 +252,19 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream,
 
        dai_link->stop_dma_first = 1;
        config->chan_nr = params_channels(params);
+       config->sample_rate = params_rate(params);
 
        switch (params_format(params)) {
        case SNDRV_PCM_FORMAT_S16_LE:
+               if (config->sample_rate == 8000) {
+                       dev_err(dev->dev, "I2S: unsupported 8000 rate with S16_LE, Stereo.\n");
+                       return -EINVAL;
+               }
+
+               if (txrx == SNDRV_PCM_STREAM_PLAYBACK)
+                       dev->play_dma_data.dt.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
+               else
+                       dev->capture_dma_data.dt.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
                config->data_width = 16;
                dev->ccr = 0x00;
                dev->xfer_resolution = 0x02;
@@ -267,25 +277,18 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream,
                break;
 
        case SNDRV_PCM_FORMAT_S32_LE:
-               if (config->chan_nr == 1) {
-                       if (txrx == SNDRV_PCM_STREAM_PLAYBACK)
-                               dev->play_dma_data.dt.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
-                       else
-                               dev->capture_dma_data.dt.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
-
-                       config->data_width = 16;
-                       dev->ccr = 0x00;
-                       dev->xfer_resolution = 0x02;
-               } else if (config->chan_nr == 2) {
-                       if (txrx == SNDRV_PCM_STREAM_PLAYBACK)
-                               dev->play_dma_data.dt.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-                       else
-                               dev->capture_dma_data.dt.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-
-                       config->data_width = 32;
-                       dev->ccr = 0x10;
-                       dev->xfer_resolution = 0x05;
+               if ((config->sample_rate == 16000) && (config->chan_nr == 1)) {
+                       dev_err(dev->dev, "I2S: unsupported 16000 rate with S32_LE, Mono.\n");
+                       return -EINVAL;
                }
+               if (txrx == SNDRV_PCM_STREAM_PLAYBACK)
+                       dev->play_dma_data.dt.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+               else
+                       dev->capture_dma_data.dt.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+
+               config->data_width = 32;
+               dev->ccr = 0x10;
+               dev->xfer_resolution = 0x05;
                break;
 
        default:
@@ -360,8 +363,6 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream,
 
        i2s_write_reg(dev->i2s_base, CCR, dev->ccr);
 
-       config->sample_rate = params_rate(params);
-
        if (dev->capability & DW_I2S_MASTER) {
                if (dev->i2s_clk_cfg) {
                        ret = dev->i2s_clk_cfg(config);
@@ -1018,6 +1019,9 @@ static int dw_configure_dai(struct dw_i2s_dev *dev,
                dw_i2s_dai->playback.channels_max =
                                1 << (COMP1_TX_CHANNELS(comp1) + 1);
                dw_i2s_dai->playback.formats = formats[idx];
+               for (;idx > 0; idx--)
+                       dw_i2s_dai->playback.formats |= formats[idx - 1];
+
                dw_i2s_dai->playback.rates = rates;
        }
 
@@ -1032,6 +1036,9 @@ static int dw_configure_dai(struct dw_i2s_dev *dev,
                dw_i2s_dai->capture.channels_max =
                                1 << (COMP1_RX_CHANNELS(comp1) + 1);
                dw_i2s_dai->capture.formats = formats[idx];
+               for (;idx > 0; idx--)
+                       dw_i2s_dai->capture.formats |= formats[idx - 1];
+
                dw_i2s_dai->capture.rates = rates;
        }
 
@@ -1179,7 +1186,7 @@ static int dw_i2s_probe(struct platform_device *pdev)
                }
        }
 
-       if (of_device_is_compatible(np, "snps,designware-i2srx")) { //record
+       if (of_device_is_compatible(np, "starfive,jh7110-i2srx")) { //record
                ret = of_parse_phandle_with_fixed_args(dev->dev->of_node,
                                                        "starfive,sys-syscon", 2, 0, &args);
                if (ret) {
@@ -1200,7 +1207,7 @@ static int dw_i2s_probe(struct platform_device *pdev)
                ret = dw_i2stx_4ch0_clk_init(pdev, dev);
                if (ret < 0)
                        goto err_clk_disable;
-       } else if (of_device_is_compatible(np, "snps,designware-i2stx-4ch1")) {   //playback
+       } else if (of_device_is_compatible(np, "starfive,jh7110-i2stx-4ch1")) {   //playback
                ret = dw_i2stx_4ch1_clk_init(pdev, dev);
                if (ret < 0)
                        goto err_clk_disable;
@@ -1292,8 +1299,8 @@ static int dw_i2s_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id dw_i2s_of_match[] = {
-       { .compatible = "snps,designware-i2stx-4ch1",    },
-       { .compatible = "snps,designware-i2srx",         },
+       { .compatible = "starfive,jh7110-i2stx-4ch1",    },
+       { .compatible = "starfive,jh7110-i2srx",         },
        { .compatible = "snps,designware-i2stx-4ch0",    },
        {},
 };

diff --git a/sound/soc/starfive/i2srx-master.c b/sound/soc/starfive/i2srx-master.c
index d6e96bd..b13b414 100644 (file)
--- a/sound/soc/starfive/i2srx-master.c
+++ b/sound/soc/starfive/i2srx-master.c
@@ -774,7 +774,7 @@ static int dw_i2s_probe(struct platform_device *pdev)
                }
        }
 
-       if (of_device_is_compatible(np, "snps,i2srx-master")) {
+       if (of_device_is_compatible(np, "starfive,jh7110-i2srx-master")) {
                /* config i2s data source: PDM  */
                regmap_update_bits(dev->syscon_base, dev->syscon_offset_34,
                                        AUDIO_SDIN_MUX_MASK, I2SRX_DATA_SRC_PDM);
@@ -849,7 +849,7 @@ static int dw_i2s_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id dw_i2s_of_match[] = {
-       { .compatible = "snps,i2srx-master", },
+       { .compatible = "starfive,jh7110-i2srx-master", },
        {},
 };
 
@@ -864,7 +864,7 @@ static struct platform_driver dw_i2s_driver = {
        .probe          = dw_i2s_probe,
        .remove         = dw_i2s_remove,
        .driver         = {
-               .name   = "designware-i2srx-master",
+               .name   = "i2srx-master",
                .of_match_table = of_match_ptr(dw_i2s_of_match),
                .pm = &dwc_pm_ops,
        },

diff --git a/sound/soc/starfive/starfive_pdm.c b/sound/soc/starfive/starfive_pdm.c
index 64d98b9..5f8e910 100644 (file)
--- a/sound/soc/starfive/starfive_pdm.c
+++ b/sound/soc/starfive/starfive_pdm.c
@@ -249,7 +249,7 @@ static int pdm_probe(struct snd_soc_component *component)
 }
 
 static const struct snd_soc_component_driver sf_pdm_component_drv = {
-       .name = "sf-pdm",
+       .name = "jh7110-pdm",
        .probe = pdm_probe,
 };
 
@@ -415,15 +415,14 @@ static int sf_pdm_dev_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id sf_pdm_of_match[] = {
-       {.compatible = "starfive,sf-pdm",},
+       {.compatible = "starfive,jh7110-pdm",},
        {}
 };
 MODULE_DEVICE_TABLE(of, sf_pdm_of_match);
 
 static struct platform_driver sf_pdm_driver = {
-
        .driver = {
-               .name = "sf-pdm",
+               .name = "jh7110-pdm",
                .of_match_table = sf_pdm_of_match,
        },
        .probe = sf_pdm_probe,

diff --git a/sound/soc/starfive/starfive_pwmdac.c b/sound/soc/starfive/starfive_pwmdac.c
index 4f6325a..fd30a17 100755 (executable)
--- a/sound/soc/starfive/starfive_pwmdac.c
+++ b/sound/soc/starfive/starfive_pwmdac.c
@@ -766,7 +766,7 @@ static const struct snd_soc_dai_ops sf_pwmdac_dai_ops = {
 };
 
 static const struct snd_soc_component_driver sf_pwmdac_component = {
-       .name           = "sf-pwmdac",
+       .name           = "starfive-pwmdac",
        .probe          = pwmdac_probe,
 };
 
@@ -849,7 +849,7 @@ static int sf_pwmdac_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id sf_pwmdac_of_match[] = {
-       { .compatible = "starfive,pwmdac", },
+       { .compatible = "starfive,jh7110-pwmdac", },
        {},
 };
 
@@ -861,7 +861,7 @@ static struct platform_driver sf_pwmdac_driver = {
        .probe          = sf_pwmdac_probe,
        .remove         = sf_pwmdac_remove,
        .driver         = {
-               .name   = "sf-pwmdac",
+               .name   = "starfive-pwmdac",
                .of_match_table = of_match_ptr(sf_pwmdac_of_match),
        },
 };

diff --git a/sound/soc/starfive/starfive_pwmdac_transmitter.c b/sound/soc/starfive/starfive_pwmdac_transmitter.c
index b5445e5..6d58fcf 100755 (executable)
--- a/sound/soc/starfive/starfive_pwmdac_transmitter.c
+++ b/sound/soc/starfive/starfive_pwmdac_transmitter.c
@@ -76,7 +76,7 @@ static int pwmdac_dit_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static const struct of_device_id pwmdac_dit_dt_ids[] = {
-       { .compatible = "linux,pwmdac-dit", },
+       { .compatible = "starfive,jh7110-pwmdac-dit", },
        { }
 };
 MODULE_DEVICE_TABLE(of, pwmdac_dit_dt_ids);

diff --git a/sound/soc/starfive/starfive_spdif.c b/sound/soc/starfive/starfive_spdif.c
index cbc5c42..aff3de1 100755 (executable)
--- a/sound/soc/starfive/starfive_spdif.c
+++ b/sound/soc/starfive/starfive_spdif.c
@@ -387,7 +387,7 @@ static struct snd_soc_dai_driver sf_spdif_dai = {
 };
 
 static const struct snd_soc_component_driver sf_spdif_component = {
-       .name = "sf-spdif",
+       .name = "starfive-spdif",
 };
 
 static const struct regmap_config sf_spdif_regmap_config = {
@@ -477,14 +477,14 @@ err_clk_disable:
 }
 
 static const struct of_device_id sf_spdif_of_match[] = {
-       { .compatible = "starfive,sf-spdif", },
+       { .compatible = "starfive,jh7110-spdif", },
        {},
 };
 MODULE_DEVICE_TABLE(of, sf_spdif_of_match);
 
 static struct platform_driver sf_spdif_driver = {
        .driver = {
-               .name = "sf-spdif",
+               .name = "starfive-spdif",
                .of_match_table = sf_spdif_of_match,
        },
        .probe = sf_spdif_probe,

diff --git a/sound/soc/starfive/starfive_tdm.c b/sound/soc/starfive/starfive_tdm.c
old mode 100755 (executable)
new mode 100644 (file)
index 6a154b6..9d5a8ec
--- a/sound/soc/starfive/starfive_tdm.c
+++ b/sound/soc/starfive/starfive_tdm.c
@@ -147,7 +147,7 @@ static int sf_pcm_trigger(struct snd_soc_component *component,
 }
 
 static const struct snd_soc_component_driver sf_tdm_component = {
-       .name           = "sf-tdm",
+       .name           = "jh7110-tdm",
        .suspend        = sf_tdm_suspend,
        .resume         = sf_tdm_resume,
        .trigger        = sf_pcm_trigger,
@@ -600,15 +600,14 @@ static int sf_tdm_dev_remove(struct platform_device *pdev)
        return 0;
 }
 static const struct of_device_id sf_tdm_of_match[] = {
-       {.compatible = "starfive,sf-tdm",},
+       {.compatible = "starfive,jh7110-tdm",},
        {}
 };
 MODULE_DEVICE_TABLE(of, sf_tdm_of_match);
 
 static struct platform_driver sf_tdm_driver = {
-
        .driver = {
-               .name = "sf-tdm",
+               .name = "jh7110-tdm",
                .of_match_table = sf_tdm_of_match,
        },
        .probe = sf_tdm_probe,