diff options
author | Andy Hu <andy.hu@starfivetech.com> | 2023-05-19 10:23:20 +0300 |
---|---|---|
committer | Andy Hu <andy.hu@starfivetech.com> | 2023-05-19 10:23:20 +0300 |
commit | bf206008e3bd4335944d83aae4951ef89c611c27 (patch) | |
tree | 0083438bc80b28cdb35cc803d6a3c92ed4c2aca3 /arch/riscv/boot | |
parent | b4920a1a3dd328124c61b07e8a6ab48c67881037 (diff) | |
parent | 3a895ddbc113b8424a203fec76a5719245d8d5bd (diff) | |
download | linux-bf206008e3bd4335944d83aae4951ef89c611c27.tar.xz |
Merge tag 'JH7110_515_SDK_v4.9.1' into vf2-515-devel
Diffstat (limited to 'arch/riscv/boot')
-rwxr-xr-x | arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | arch/riscv/boot/dts/starfive/jh7110.dtsi | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi index 423facea12cc..6f5fc7ae24b3 100755 --- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi @@ -631,6 +631,7 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&inno_hdmi_pins>; + hpd-gpio = <&gpio 15 GPIO_ACTIVE_HIGH>; hdmi_in: port { #address-cells = <1>; diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index 6089bdcacb18..51d19bf34f51 100644..100755 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -45,6 +45,26 @@ #address-cells = <1>; #size-cells = <0>; + cpu-map { + cluster0 { + core0 { + cpu = <&cpu1>; + }; + + core1 { + cpu = <&cpu2>; + }; + + core2 { + cpu = <&cpu3>; + }; + + core3 { + cpu = <&cpu4>; + }; + }; + }; + cpu0: cpu@0 { compatible = "sifive,u74-mc", "riscv"; reg = <0>; |