diff options
| author | Andy Hu <andy.hu@starfivetech.com> | 2023-09-01 06:28:56 +0300 |
|---|---|---|
| committer | Andy Hu <andy.hu@starfivetech.com> | 2023-09-01 06:28:56 +0300 |
| commit | 8578097ed9b6f67dfc06624fde5fbbf707cf96d6 (patch) | |
| tree | 16e9731690113fcc31e719387f0e4356251f76a6 /arch | |
| parent | 9e6518bb7b942db3d7551955ca5e407d428fd1db (diff) | |
| parent | 0d701ee1b4151b613ab3d2bb52af59164be7d782 (diff) | |
| download | linux-8578097ed9b6f67dfc06624fde5fbbf707cf96d6.tar.xz | |
Merge tag 'JH7110_6.1_SDK_v5.7.1' into vf2-6.1.y-develVF2_6.1_v3.7.1
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/riscv/boot/dts/starfive/jh7110-evb.dtsi | 41 | ||||
| -rw-r--r-- | arch/riscv/configs/starfive_jh7110_defconfig | 6 |
2 files changed, 44 insertions, 3 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb.dtsi b/arch/riscv/boot/dts/starfive/jh7110-evb.dtsi index ed6fa2fd18c5..23f7094c850a 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-evb.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-evb.dtsi @@ -9,8 +9,47 @@ &i2c5 { pmic: jh7110_evb_reg@50 { - compatible = "x-powers,axp15060"; + compatible = "starfive,jh7110-evb-regulator"; reg = <0x50>; + + regulators { + hdmi_1p8: LDO_REG1 { + regulator-name = "hdmi_1p8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + mipitx_1p8: LDO_REG2 { + regulator-name = "mipitx_1p8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + mipirx_1p8: LDO_REG3 { + regulator-name = "mipirx_1p8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + hdmi_0p9: LDO_REG4 { + regulator-name = "hdmi_0p9"; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + }; + mipitx_0p9: LDO_REG5 { + regulator-name = "mipitx_0p9"; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + }; + mipirx_0p9: LDO_REG6 { + regulator-name = "mipirx_0p9"; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + }; + sdio_vdd: LDO_REG7 { + regulator-name = "sdio_vdd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + }; + }; }; diff --git a/arch/riscv/configs/starfive_jh7110_defconfig b/arch/riscv/configs/starfive_jh7110_defconfig index a487f0dce723..5d55f5899edc 100644 --- a/arch/riscv/configs/starfive_jh7110_defconfig +++ b/arch/riscv/configs/starfive_jh7110_defconfig @@ -192,6 +192,7 @@ CONFIG_WATCHDOG_SYSFS=y CONFIG_STARFIVE_WATCHDOG=y CONFIG_MFD_AXP20X_I2C=y CONFIG_REGULATOR=y +CONFIG_REGULATOR_AXP15060=y CONFIG_REGULATOR_AXP20X=y CONFIG_REGULATOR_STARFIVE_JH7110=y # CONFIG_MEDIA_CEC_SUPPORT is not set @@ -199,13 +200,13 @@ CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_WAVE_VPU=m CONFIG_VIN_SENSOR_SC2235=y CONFIG_VIN_SENSOR_OV4689=y CONFIG_VIN_SENSOR_IMX219=y CONFIG_VIDEO_STF_VIN=y CONFIG_VIDEO_IMX708=y -CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_WAVE_VPU=m CONFIG_DRM_I2C_NXP_TDA998X=y CONFIG_DRM_I2C_NXP_TDA9950=y CONFIG_DRM_RADEON=m @@ -320,6 +321,7 @@ CONFIG_SECURITY=y CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_APPARMOR=y CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_INIT_STACK_NONE=y CONFIG_CRYPTO_USER=y CONFIG_CRYPTO_USER_API_HASH=y CONFIG_CRYPTO_USER_API_SKCIPHER=y |