From c1d76d3b25dd1a2e10a5883b859ee4994d97aad2 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Wed, 9 Nov 2022 23:15:12 +0800 Subject: [PATCH] rockchip: opc-h68k: add sata support --- .../boot/dts/rockchip/rk3568-opc-h68k.dts | 23 ++++++++----------- target/linux/rockchip/image/armv8.mk | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-opc-h68k.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-opc-h68k.dts index 9fea2d58d..43b76ce06 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-opc-h68k.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-opc-h68k.dts @@ -76,13 +76,13 @@ }; }; - dc_12v: dc-12v { + vcc12v_dcin: vcc12v-dcin { compatible = "regulator-fixed"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <12000000>; regulator-max-microvolt = <12000000>; - regulator-name = "dc_12v"; + regulator-name = "vcc12v_dcin"; }; vcc3v3_sys: vcc3v3-sys { @@ -92,7 +92,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-name = "vcc3v3_sys"; - vin-supply = <&dc_12v>; + vin-supply = <&vcc12v_dcin>; }; vcc5v0_sys: vcc5v0-sys { @@ -102,7 +102,7 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-name = "vcc5v0_sys"; - vin-supply = <&dc_12v>; + vin-supply = <&vcc12v_dcin>; }; vcc5v0_usb: vcc5v0-usb { @@ -112,7 +112,7 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-name = "vcc5v0_usb"; - vin-supply = <&dc_12v>; + vin-supply = <&vcc12v_dcin>; }; vcc5v0_usb_host: vcc5v0-usb-host { @@ -621,6 +621,10 @@ status = "okay"; }; +&sata0 { + status = "okay"; +}; + &sdhci { bus-width = <8>; max-frequency = <200000000>; @@ -661,11 +665,6 @@ status = "okay"; }; -&usb_host0_xhci { - dr_mode = "host"; - status = "okay"; -}; - &usb_host1_ehci { status = "okay"; }; @@ -687,10 +686,6 @@ status = "okay"; }; -&usb2phy0_otg { - status = "okay"; -}; - &usb2phy1 { status = "okay"; }; diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index ec9e66d43..df83fe86a 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -18,7 +18,7 @@ define Device/hinlink_opc-h68k SOC := rk3568 UBOOT_DEVICE_NAME := opc-h68k-rk3568 IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r5s | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-mt7921e kmod-r8125 + DEVICE_PACKAGES := kmod-ata-ahci-platform kmod-mt7921e kmod-r8125 endef TARGET_DEVICES += hinlink_opc-h68k