dts: starfive: Add pwmdac and wm8960 config

configs : starfive: sync JH7110_515_SDK_v1.0.0-rc2 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 72da42b..f0eaad3 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts
@@ -8,7 +8,12 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/starfive,jh7110-pinfunc.h>
 #include "jh7110.dtsi"
+#include "codecs/sf_pwmdac.dtsi"
+#undef WM8960_ENABLED
 
+#ifdef WM8960_ENABLED
+#include "codecs/sf_wm8960.dtsi"
+#endif
 
 / {
        model = "StarFive VisionFive V2";
@@ -22,6 +27,14 @@
                mmc0 = &sdio0;
                mmc1 = &sdio1;
                serial0 = &uart0;
+               serial3 = &uart3;
+               i2c0 = &i2c0;
+               i2c1 = &i2c1;
+               i2c2 = &i2c2;
+               i2c3 = &i2c3;
+               i2c4 = &i2c4;
+               i2c5 = &i2c5;
+               i2c6 = &i2c6;
        };
 
        chosen {
@@ -401,6 +414,46 @@
                        sf,pin-gpio-doen = <OEN_LOW>;
                };
        };
+
+#ifdef WM8960_ENABLED
+       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>;
+               };
+       };
+
+       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>;
+               };
+
+               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>;
+               };
+       };
+
+       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>;
+               };
+       };
+#endif
 };
 
 &uart0 {
@@ -441,7 +494,7 @@
                #sound-dai-cells = <0>;
                data-protocol = <0>;
        };
-
+#ifdef WM8960_ENABLED
        wm8960: codec@1a {
                compatible = "wlf,wm8960";
                reg = <0x1a>;
@@ -449,6 +502,7 @@
 
                wlf,shared-lrclk;
        };
+#endif
 };
 
 &i2c2 {
@@ -508,8 +562,8 @@
        card-detect-delay = <300>;
        bus-width = <8>;
        cap-mmc-highspeed;
-       mmc-hs400-1_8v;
-       mmc-hs400-enhanced-strobe;
+       //mmc-hs400-1_8v;
+       //mmc-hs400-enhanced-strobe;
        non-removable;
        cap-mmc-hw-reset;
        post-power-on-delay-ms = <200>;
@@ -519,21 +573,16 @@
 };
 
 &sdio1 {
-       clock-frequency = <4000000>;
-       max-frequency = <1000000>;
+       clock-frequency = <102400000>;
+       max-frequency = <100000000>;
        card-detect-delay = <300>;
        bus-width = <4>;
+       broken-cd;
        cap-sd-highspeed;
-       cap-sdio-irq;
-       cap-mmc-hw-reset;
-       non-removable;
-       enable-sdio-wakeup;
-       keep-power-in-suspend;
-       cap-mmc-highspeed;
        post-power-on-delay-ms = <200>;
        pinctrl-names = "default";
        pinctrl-0 = <&sdcard1_pins>;
-       cd-gpios = <&gpio 6 0>;
+       //cd-gpios = <&gpio 6 0>;
        status = "okay";
 };
 
@@ -578,6 +627,20 @@
        status = "okay";
 };
 
+#ifdef WM8960_ENABLED
+&i2srx_3ch {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2srx_pins>;
+       status = "okay";
+};
+
+&i2stx_4ch1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2s_clk_pins &i2stx_pins>;
+       status = "okay";
+};
+#endif
+
 &pwmdac_codec {
        status = "okay";
 };
@@ -710,10 +773,6 @@
        status = "okay";
 };
 
-&mipi_dphy {
-       status = "disabled";
-};
-
 &co_process {
        status = "okay";
 };

diff --git a/arch/riscv/configs/starfive_visionfive2_defconfig b/arch/riscv/configs/starfive_visionfive2_defconfig
index 013e856..c149c5c 100644 (file)
--- a/arch/riscv/configs/starfive_visionfive2_defconfig
+++ b/arch/riscv/configs/starfive_visionfive2_defconfig
@@ -20,6 +20,9 @@ CONFIG_SOC_STARFIVE=y
 CONFIG_SOC_STARFIVE_JH7110=y
 CONFIG_SMP=y
 CONFIG_HZ_100=y
+CONFIG_PM=y
+CONFIG_CPU_IDLE=y
+CONFIG_RISCV_SBI_CPUIDLE=y
 # CONFIG_SECCOMP is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
@@ -83,8 +86,6 @@ CONFIG_PCIEASPM_POWERSAVE=y
 CONFIG_PCIE_PLDA=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_EXTRA_FIRMWARE="iwlwifi-ty-a0-gf-a0-66.ucode iwlwifi-ty-a0-gf-a0.pnvm"
-CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_OF_CONFIGFS=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_VIRTIO_BLK=y
@@ -140,6 +141,7 @@ CONFIG_IWLWIFI=y
 CONFIG_IWLDVM=y
 CONFIG_IWLMVM=y
 # CONFIG_RTL_CARDS is not set
+CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_SERIO_LIBPS2=y
@@ -160,7 +162,7 @@ CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
-CONFIG_SPI_PL022=y
+CONFIG_SPI_PL022_STARFIVE=y
 CONFIG_SPI_SIFIVE=y
 CONFIG_SPI_SPIDEV=y
 # CONFIG_PTP_1588_CLOCK is not set
@@ -173,6 +175,7 @@ CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 CONFIG_SENSORS_SFCTEMP=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_SYSFS=y
 CONFIG_STARFIVE_WATCHDOG=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_STF7110=y
@@ -184,9 +187,11 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_STF_VIN=y
 CONFIG_VIN_SENSOR_SC2235=y
 CONFIG_VIN_SENSOR_OV4689=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_NULLDISP is not set
 CONFIG_DRM_LEGACY=y
 CONFIG_FB=y
@@ -262,6 +267,8 @@ CONFIG_NFS_V4=y
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
 CONFIG_CRYPTO_USER=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_USER_API_HASH=y