From: Jianlong Huang <jianlong.huang@starfivetech.com>
Date: Wed, 27 Jul 2022 10:02:18 +0000 (+0800)
Subject: dts: starfive: sync evb dts and config
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f22bae780c162c0d97711812d840311f1c837815;p=platform%2Fkernel%2Flinux-starfive.git

dts: starfive: sync evb dts and config

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

diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts
index f6ce12c7677b..3723b61ab786 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts
@@ -517,8 +517,8 @@
 &i2c0 {
 	clock-frequency = <100000>;
 	i2c-sda-hold-time-ns = <300>;
-	i2c-sda-falling-time-ns = <3000>;
-	i2c-scl-falling-time-ns = <3000>;
+	i2c-sda-falling-time-ns = <510>;
+	i2c-scl-falling-time-ns = <510>;
 	auto_calc_scl_lhcnt;
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c0_pins>;
@@ -544,8 +544,8 @@
 &i2c2 {
 	clock-frequency = <100000>;
 	i2c-sda-hold-time-ns = <300>;
-	i2c-sda-falling-time-ns = <3000>;
-	i2c-scl-falling-time-ns = <3000>;
+	i2c-sda-falling-time-ns = <510>;
+	i2c-scl-falling-time-ns = <510>;
 	auto_calc_scl_lhcnt;
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c2_pins>;
@@ -567,8 +567,8 @@
 &i2c5 {
 	clock-frequency = <100000>;
 	i2c-sda-hold-time-ns = <300>;
-	i2c-sda-falling-time-ns = <3000>;
-	i2c-scl-falling-time-ns = <3000>;
+	i2c-sda-falling-time-ns = <510>;
+	i2c-scl-falling-time-ns = <510>;
 	auto_calc_scl_lhcnt;
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c5_pins>;
@@ -628,8 +628,8 @@
 &i2c6 {
 	clock-frequency = <100000>;
 	i2c-sda-hold-time-ns = <300>;
-	i2c-sda-falling-time-ns = <3000>;
-	i2c-scl-falling-time-ns = <3000>;
+	i2c-sda-falling-time-ns = <510>;
+	i2c-scl-falling-time-ns = <510>;
 	auto_calc_scl_lhcnt;
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c6_pins>;
@@ -662,8 +662,8 @@
 };
 
 &sdio0 {
-	clock-frequency = <204800000>;
-	max-frequency = <200000000>;
+	clock-frequency = <102400000>;
+	max-frequency = <100000000>;
 	card-detect-delay = <300>;
 	bus-width = <8>;
 	cap-mmc-highspeed;
@@ -680,7 +680,7 @@
 
 &sdio1 {
 	clock-frequency = <102400000>;
-	max-frequency = <100000000>;
+	max-frequency = <200000000>;
 	card-detect-delay = <300>;
 	bus-width = <4>;
 	broken-cd;
@@ -700,8 +700,8 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		port@3 {
-			reg = <3>;
+		port@1 {
+			reg = <1>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 
diff --git a/arch/riscv/configs/starfive_visionfive2_defconfig b/arch/riscv/configs/starfive_visionfive2_defconfig
index 956a1683fdba..3c0939ffb8fd 100644
--- a/arch/riscv/configs/starfive_visionfive2_defconfig
+++ b/arch/riscv/configs/starfive_visionfive2_defconfig
@@ -187,10 +187,10 @@ CONFIG_USB_VIDEO_CLASS=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_STF_VIN=y
 CONFIG_VIN_SENSOR_IMX219=y
-CONFIG_DRM=y
 CONFIG_DRM_VERISILICON=y
 CONFIG_STARFIVE_INNO_HDMI=y
 CONFIG_STARFIVE_DSI=y
+CONFIG_DRM_IMG_ROGUE=y
 # CONFIG_DRM_IMG_NULLDISP is not set
 CONFIG_DRM_LEGACY=y
 CONFIG_FB=y
@@ -229,6 +229,7 @@ CONFIG_DMATEST=y
 # CONFIG_VIRTIO_MENU is not set
 # CONFIG_VHOST_MENU is not set
 CONFIG_GOLDFISH=y
+CONFIG_CLK_STARFIVE_JH7110_PLL=y
 CONFIG_STARFIVE_TIMER=y
 CONFIG_MAILBOX=y
 CONFIG_STARFIVE_MBOX=m