From: Jianlong Huang <jianlong.huang@starfivetech.com>
Date: Thu, 15 Sep 2022 00:47:20 +0000 (+0800)
Subject: dts: starfive: Replace sf to starfive
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c45637e2d8d8e0cef11638aa7a5ea858bbe6bd69;p=platform%2Fkernel%2Flinux-starfive.git

dts: starfive: Replace sf to starfive

Because upstream requirement.
Replace sf to starfive.
Replace hdmi_output to rgb_output.
Replace encoder to dsi_output

Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com>
---

diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-A10.dts b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-A10.dts
index 88c9cd030b44..d28a606183ac 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-A10.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-A10.dts
@@ -15,133 +15,133 @@
 &gpio {
 	uart0_pins: uart0-pins {
 		uart0-pins-tx {
-			sf,pins = <PAD_GPIO41>;
-			sf,pinmux = <PAD_GPIO41_FUNC_SEL 0>;
-			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_GPIO41>;
+			starfive,pinmux = <PAD_GPIO41_FUNC_SEL 0>;
+			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_GPIO40>;
-			sf,pinmux = <PAD_GPIO40_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_GPIO40>;
+			starfive,pinmux = <PAD_GPIO40_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>;
 		};
 	};
 
 	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>;
 		};
 	};
 
 	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>;
 		};
 	};
 
 	sdcard1_pins: sdcard1-pins {
 		sdcard1-pins0 {
-			sf,pins = <PAD_GPIO4>;
-			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_GPIO4>;
+			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_GPIO5>;
-			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_GPIO5>;
+			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_GPIO0>;
-			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_GPIO0>;
+			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_GPIO1>;
-			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_GPIO1>;
+			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_GPIO2>;
-			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_GPIO2>;
+			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_GPIO3>;
-			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_GPIO3>;
+			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>;
 		};
 	};
 
 	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>;
 		};
 	};
 };
diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts
index 5686bccd8b77..657caa545e9f 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts
@@ -15,134 +15,134 @@
 &gpio {
 	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>;
 		};
 	};
 
 	i2c2_pins: i2c2-pins {
 		i2c2-pins-scl {
-			sf,pins = <PAD_GPIO3>;
-			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_GPIO3>;
+			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_GPIO2>;
-			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_GPIO2>;
+			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>;
 		};
 	};
 
 	mmc0_pins: mmc0-pins {
 		 mmc0-pins-rest {
-			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_SDIO0_RST_N>;
-			sf,pin-gpio-doen = <OEN_LOW>;
+			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_SDIO0_RST_N>;
+			starfive,pin-gpio-doen = <OEN_LOW>;
 		};
 	};
 
 	sdcard1_pins: sdcard1-pins {
 		sdcard1-pins0 {
-			sf,pins = <PAD_GPIO10>;
-			sf,pinmux = <PAD_GPIO10_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_GPIO10>;
+			starfive,pinmux = <PAD_GPIO10_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_GPIO9>;
-			sf,pinmux = <PAD_GPIO9_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_GPIO9>;
+			starfive,pinmux = <PAD_GPIO9_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_GPIO11>;
-			sf,pinmux = <PAD_GPIO11_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_GPIO11>;
+			starfive,pinmux = <PAD_GPIO11_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_GPIO12>;
-			sf,pinmux = <PAD_GPIO12_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_GPIO12>;
+			starfive,pinmux = <PAD_GPIO12_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_GPIO7>;
-			sf,pinmux = <PAD_GPIO7_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_GPIO7>;
+			starfive,pinmux = <PAD_GPIO7_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_GPIO8>;
-			sf,pinmux = <PAD_GPIO8_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_GPIO8>;
+			starfive,pinmux = <PAD_GPIO8_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>;
 		};
 	};
 
 	inno_hdmi_pins: inno_hdmi-pins {
 		inno_hdmi-scl {
-			sf,pins = <PAD_GPIO0>;
-			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_GPIO0>;
+			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_GPIO1>;
-			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_GPIO1>;
+			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>;
 		};
 	};
 };
diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
index d53248e1b1cc..ba229c9fd817 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
@@ -80,275 +80,275 @@
 &gpio {
 	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>;
 		};
 	};
 
 	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: csi-pins {
 		csi-pins-pwdn {
-			sf,pins = <PAD_GPIO18>;
-			sf,pinmux = <PAD_GPIO18_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_GPIO18>;
+			starfive,pinmux = <PAD_GPIO18_FUNC_SEL 0>;
+			starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+			starfive,pin-gpio-dout = <GPO_HIGH>;
+			starfive,pin-gpio-doen = <OEN_LOW>;
 		};
 	};
 
 	pwmdac0_pins: pwmdac0-pins {
 		pwmdac0-pins-left {
-			sf,pins = <PAD_GPIO33>;
-			sf,pinmux = <PAD_GPIO33_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_GPIO33>;
+			starfive,pinmux = <PAD_GPIO33_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_GPIO34>;
-			sf,pinmux = <PAD_GPIO34_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_GPIO34>;
+			starfive,pinmux = <PAD_GPIO34_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>;
 		};
 	};
 
 	pwm_pins: pwm-pins {
 		pwm_ch0-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_0>;
-			sf,pin-gpio-doen = <OEN_PTC0_PWM_0_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_0>;
+			starfive,pin-gpio-doen = <OEN_PTC0_PWM_0_OE_N>;
 		};
 
 		pwm_ch1-pins {
-			sf,pins = <PAD_GPIO59>;
-			sf,pinmux = <PAD_GPIO59_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_GPIO59>;
+			starfive,pinmux = <PAD_GPIO59_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>;
 		};
 	};
 
 	ssp0_pins: ssp0-pins {
 		ssp0-pins_tx {
-			sf,pins = <PAD_GPIO52>;
-			sf,pinmux = <PAD_GPIO52_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_GPIO52>;
+			starfive,pinmux = <PAD_GPIO52_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_GPIO53>;
-			sf,pinmux = <PAD_GPIO53_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_GPIO53>;
+			starfive,pinmux = <PAD_GPIO53_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_GPIO48>;
-			sf,pinmux = <PAD_GPIO48_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_GPIO48>;
+			starfive,pinmux = <PAD_GPIO48_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_GPIO49>;
-			sf,pinmux = <PAD_GPIO49_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_GPIO49>;
+			starfive,pinmux = <PAD_GPIO49_FUNC_SEL 0>;
+			starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+			starfive,pin-gpio-dout = <GPO_SPI0_SSPFSSOUT>;
+			starfive,pin-gpio-doen = <OEN_LOW>;
 		};
 	};
 
 	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_wake_default: pcie0_wake_default {
 		wake-pins {
-			sf,pins = <PAD_GPIO32>;
-			sf,pinmux = <PAD_GPIO32_FUNC_SEL 0>;
-			sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-			sf,pin-gpio-doen = <OEN_HIGH>;
+			starfive,pins = <PAD_GPIO32>;
+			starfive,pinmux = <PAD_GPIO32_FUNC_SEL 0>;
+			starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+			starfive,pin-gpio-doen = <OEN_HIGH>;
 		};
 	};
 
 	pcie0_clkreq_default: pcie0_clkreq_default {
 		clkreq-pins {
-			sf,pins = <PAD_GPIO27>;
-			sf,pinmux = <PAD_GPIO27_FUNC_SEL 0>;
-			sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-			sf,pin-gpio-doen = <OEN_HIGH>;
+			starfive,pins = <PAD_GPIO27>;
+			starfive,pinmux = <PAD_GPIO27_FUNC_SEL 0>;
+			starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+			starfive,pin-gpio-doen = <OEN_HIGH>;
 		};
 	};
 
 	pcie0_vbus_default: pcie0_vbus_default {
 		drive-vbus-pin {
-			sf,pins = <PAD_GPIO25>;
-			sf,pinmux = <PAD_GPIO25_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_GPIO25>;
+			starfive,pinmux = <PAD_GPIO25_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_wake_default: pcie1_wake_default {
 		wake-pins {
-			sf,pins = <PAD_GPIO21>;
-			sf,pinmux = <PAD_GPIO21_FUNC_SEL 0>;
-			sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-			sf,pin-gpio-doen = <OEN_HIGH>;
+			starfive,pins = <PAD_GPIO21>;
+			starfive,pinmux = <PAD_GPIO21_FUNC_SEL 0>;
+			starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+			starfive,pin-gpio-doen = <OEN_HIGH>;
 		};
 	};
 
 	pcie1_clkreq_default: pcie1_clkreq_default {
 		clkreq-pins {
-			sf,pins = <PAD_GPIO29>;
-			sf,pinmux = <PAD_GPIO29_FUNC_SEL 0>;
-			sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-			sf,pin-gpio-doen = <OEN_HIGH>;
+			starfive,pins = <PAD_GPIO29>;
+			starfive,pinmux = <PAD_GPIO29_FUNC_SEL 0>;
+			starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+			starfive,pin-gpio-doen = <OEN_HIGH>;
 		};
 	};
 
 	usb_pins: usb-pins {
 		drive-vbus-pin {
-			sf,pins = <PAD_GPIO25>;
-			sf,pinmux = <PAD_GPIO25_FUNC_SEL 0>;
-			sf,pin-ioconfig = <IO(GPIO_IE(1))>;
-			sf,pin-gpio-dout = <GPO_USB0_DRIVE_VBUS_IO>;
-			sf,pin-gpio-doen = <OEN_LOW>;
+			starfive,pins = <PAD_GPIO25>;
+			starfive,pinmux = <PAD_GPIO25_FUNC_SEL 0>;
+			starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
+			starfive,pin-gpio-dout = <GPO_USB0_DRIVE_VBUS_IO>;
+			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>;
 		};
 	};
 
 	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>;
 		};
 	};
 };
@@ -714,7 +714,7 @@
 	};
 };
 
-&hdmi_output {
+&rgb_output {
 	status = "okay";
 
 	ports {
@@ -732,7 +732,7 @@
 	};
 };
 
-&encoder {
+&dsi_output {
 	status = "okay";
 
 	ports {