diff options
| author | Andy Hu <andy.hu@starfivetech.com> | 2022-12-19 10:12:22 +0300 |
|---|---|---|
| committer | Andy Hu <andy.hu@starfivetech.com> | 2022-12-19 10:12:22 +0300 |
| commit | f0fce0037f9cc3fa6013d14d2f11fff7cf1a19da (patch) | |
| tree | b1c279c003c2ce2bd80212637ed76ca49b614070 /arch | |
| parent | 40befeb85a659c53cc08fcfc7458a47dbc01597a (diff) | |
| parent | b85f8dd876e2e579b169c397a03ff41b6dff9489 (diff) | |
| download | linux-VF2_v2.5.0.tar.xz | |
Merge tag 'JH7110_515_SDK_v3.5.1' from sdk into vf2-515-develVF2_v2.5.0
version JH7110_515_SDK_v3.5.1 for JH7110 EVB board
Diffstat (limited to 'arch')
4 files changed, 26 insertions, 3 deletions
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 2f7692edfe42..998076eec540 100644 --- 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 @@ -86,11 +86,17 @@ fragment@3 { target-path = "/soc/sdio1@16020000"; __overlay__ { - clock-frequency = <102400000>; max-frequency = <100000000>; card-detect-delay = <300>; bus-width = <4>; + no-sdio; + no-mmc; broken-cd; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + sd-uhs-ddr50; cap-sd-highspeed; post-power-on-delay-ms = <200>; pinctrl-names = "default"; diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb.dts b/arch/riscv/boot/dts/starfive/jh7110-evb.dts index d110913947f7..1845c12aaa09 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-evb.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-evb.dts @@ -30,6 +30,23 @@ status = "okay"; }; +&sdio1 { + max-frequency = <100000000>; + card-detect-delay = <300>; + bus-width = <4>; + no-sdio; + no-mmc; + broken-cd; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + sd-uhs-ddr50; + cap-sd-highspeed; + post-power-on-delay-ms = <200>; + status = "okay"; +}; + &usbdrd30 { status = "okay"; }; diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index 8c99ad45fa95..401a2cdc73d0 100644 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -656,7 +656,7 @@ reg = <0x0 0x1600C000 0x0 0x4000>; clocks = <&clkgen JH7110_SEC_HCLK>, <&clkgen JH7110_SEC_MISCAHB_CLK>; - clock-names = "hclk", "miscahb_clk"; + clock-names = "hclk", "ahb"; resets = <&rstgen RSTN_U0_SEC_TOP_HRESETN>; interrupts = <30>; status = "disabled"; diff --git a/arch/riscv/configs/starfive_jh7110_defconfig b/arch/riscv/configs/starfive_jh7110_defconfig index 77273dfcd401..b6b8fd00dae1 100644 --- a/arch/riscv/configs/starfive_jh7110_defconfig +++ b/arch/riscv/configs/starfive_jh7110_defconfig @@ -163,7 +163,7 @@ CONFIG_HVC_RISCV_SBI=y CONFIG_TTY_PRINTK=y CONFIG_VIRTIO_CONSOLE=y CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_HW_RANDOM_STARFIVE=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_SPI=y |