diff --git a/patch/kernel/archive/meson-6.1/onecloud-0001-add-dts.patch b/patch/kernel/archive/meson-6.1/onecloud-0001-add-dts.patch index d3e6119c0..2723bea89 100644 --- a/patch/kernel/archive/meson-6.1/onecloud-0001-add-dts.patch +++ b/patch/kernel/archive/meson-6.1/onecloud-0001-add-dts.patch @@ -1,13 +1,13 @@ -From 9f464b612acedc4b38be20a045a6be44d9d47ac1 Mon Sep 17 00:00:00 2001 +From 7ee5e1ab3026c8011af1e49d7930bdcf782c3c56 Mon Sep 17 00:00:00 2001 From: hzy -Date: Sat, 1 Apr 2023 10:54:19 +0800 +Date: Sat, 1 Apr 2023 13:24:42 +0800 Subject: [PATCH 1/2] ARM: dts: meson8b: Add DTS for Xunlei Onecloud Signed-off-by: hzy --- arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/meson8b-onecloud.dts | 407 +++++++++++++++++++++++++ - 2 files changed, 408 insertions(+) + arch/arm/boot/dts/meson8b-onecloud.dts | 410 +++++++++++++++++++++++++ + 2 files changed, 411 insertions(+) create mode 100644 arch/arm/boot/dts/meson8b-onecloud.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile @@ -24,10 +24,10 @@ index 6aa7dc4d..e3a3577b 100644 pxa168-aspenite.dtb \ diff --git a/arch/arm/boot/dts/meson8b-onecloud.dts b/arch/arm/boot/dts/meson8b-onecloud.dts new file mode 100644 -index 00000000..590eb42b +index 00000000..1fa5420f --- /dev/null +++ b/arch/arm/boot/dts/meson8b-onecloud.dts -@@ -0,0 +1,407 @@ +@@ -0,0 +1,410 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Author: hzy @@ -416,6 +416,9 @@ index 00000000..590eb42b + +&usb0 { + status = "okay"; ++ dr_mode = "otg"; ++ usb-role-switch; ++ role-switch-default-mode = "host"; +}; + +&usb0_phy { diff --git a/patch/kernel/archive/meson-6.1/onecloud-0002-dts-Support-HDMI.patch b/patch/kernel/archive/meson-6.1/onecloud-0002-dts-Support-HDMI.patch index 02dd1f404..abde0aa50 100644 --- a/patch/kernel/archive/meson-6.1/onecloud-0002-dts-Support-HDMI.patch +++ b/patch/kernel/archive/meson-6.1/onecloud-0002-dts-Support-HDMI.patch @@ -1,4 +1,4 @@ -From 86ed72c1eb2b532583c2bacf266fb9ab795f4d8b Mon Sep 17 00:00:00 2001 +From c358aa892b4f6f12114ad516b3ce5393f3f6d60a Mon Sep 17 00:00:00 2001 From: hzy Date: Sat, 1 Apr 2023 10:26:14 +0800 Subject: [PATCH 2/2] ARM: dts: meson8b: onecloud: Support HDMI @@ -9,7 +9,7 @@ Signed-off-by: hzy 1 file changed, 58 insertions(+) diff --git a/arch/arm/boot/dts/meson8b-onecloud.dts b/arch/arm/boot/dts/meson8b-onecloud.dts -index 590eb42b..15702b4c 100644 +index 1fa5420f..6ed19522 100644 --- a/arch/arm/boot/dts/meson8b-onecloud.dts +++ b/arch/arm/boot/dts/meson8b-onecloud.dts @@ -80,6 +80,48 @@ blue { @@ -72,7 +72,7 @@ index 590eb42b..15702b4c 100644 &gpio { gpio-line-names = /* 0 */ "WIFI_SDIO_D0 PIN18 (GPIOX_0)", -@@ -400,6 +446,18 @@ &usb1_phy { +@@ -403,6 +449,18 @@ &usb1_phy { status = "okay"; }; diff --git a/patch/kernel/archive/meson-6.1/onecloud-usb-disable-ACA-check.patch b/patch/kernel/archive/meson-6.1/onecloud-usb-disable-ACA-check.patch deleted file mode 100644 index cc72cdc7d..000000000 --- a/patch/kernel/archive/meson-6.1/onecloud-usb-disable-ACA-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -USB: Disable ACA check - -In V1.3, USB0 fails in this check. -But it can work normally. -So just disable this check. - ---- - drivers/phy/amlogic/phy-meson8b-usb2.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c -index dd96763911b..dff1bc44f1c 100644 ---- a/drivers/phy/amlogic/phy-meson8b-usb2.c -+++ b/drivers/phy/amlogic/phy-meson8b-usb2.c -@@ -197,13 +197,13 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) - udelay(ACA_ENABLE_COMPLETE_TIME); - - regmap_read(priv->regmap, REG_ADP_BC, ®); -- if (reg & REG_ADP_BC_ACA_PIN_FLOAT) { -+ /*if (reg & REG_ADP_BC_ACA_PIN_FLOAT) { - dev_warn(&phy->dev, "USB ID detect failed!\n"); - clk_disable_unprepare(priv->clk_usb); - clk_disable_unprepare(priv->clk_usb_general); - reset_control_rearm(priv->reset); - return -EINVAL; -- } -+ }*/ - } - } - --- -2.34.1 -