diff --git a/patch/kernel/archive/meson64-5.10/jethome-0009-arm64-meson-dts-fix-sdio-in-dts-for-JetHub-D1.patch b/patch/kernel/archive/meson64-5.10/jethome-0009-arm64-meson-dts-fix-sdio-in-dts-for-JetHub-D1.patch deleted file mode 100644 index 3698d2bade..0000000000 --- a/patch/kernel/archive/meson64-5.10/jethome-0009-arm64-meson-dts-fix-sdio-in-dts-for-JetHub-D1.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 76ff4ce956542827f5eff43f402aae0254e3ec3a Mon Sep 17 00:00:00 2001 -From: Vyacheslav Bocharov -Date: Fri, 10 Dec 2021 08:30:10 +0300 -Subject: [PATCH 3/3] arm64: meson: dts: fix sdio in dts for JetHub D1 - -Fix the dts to match board's reference design: -- update vddio_boot regulator to 3.3v -- remove emmc hs200 support due to the lack of 1.8v regulator - -Signed-off-by: Vyacheslav Bocharov ---- - .../boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts -index 9951217ef997..2965346fc47e 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts -@@ -81,8 +81,8 @@ vddio_ao18: regulator-vddio_ao18 { - vddio_boot: regulator-vddio_boot { - compatible = "regulator-fixed"; - regulator-name = "VDDIO_BOOT"; -- regulator-min-microvolt = <1800000>; -- regulator-max-microvolt = <1800000>; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; - vin-supply = <&vddao_3v3>; - regulator-always-on; - }; -@@ -276,8 +276,7 @@ &sd_emmc_c { - max-frequency = <200000000>; - non-removable; - disable-wp; -- mmc-ddr-1_8v; -- mmc-hs200-1_8v; -+ mmc-ddr-3_3v; - - mmc-pwrseq = <&emmc_pwrseq>; - --- -2.30.2 - diff --git a/patch/kernel/archive/meson64-5.10/jethome-0009-arm64-meson-fix-sdio-in-dts-for-JetHub-D1.patch b/patch/kernel/archive/meson64-5.10/jethome-0009-arm64-meson-fix-sdio-in-dts-for-JetHub-D1.patch new file mode 100644 index 0000000000..1b7993dc6e --- /dev/null +++ b/patch/kernel/archive/meson64-5.10/jethome-0009-arm64-meson-fix-sdio-in-dts-for-JetHub-D1.patch @@ -0,0 +1,68 @@ +From 48642ffdc5245f55d95fdd9719617b864c2c9206 Mon Sep 17 00:00:00 2001 +From: Vyacheslav Bocharov +Date: Sun, 9 Jan 2022 12:32:21 +0300 +Subject: [PATCH] arm64: meson: fix sdio in dts for JetHub D1 + +Fix the dts to match board's reference design: +- update vddio_boot regulator to 3.3v (Wi-Fi SDIO module) +- add vccq_1v8 regulator with 1.8v for eMMC SDIO + +In the first revision of JetHub D1 the vccq_1v8 regulator was 3.3v. +All installed eMMC modules were tested to work in HS200 mode at 3.3v +supply voltage. In the next revisions of the board eMMC will be +powered with 1.8v according to the standard. + +Signed-off-by: Vyacheslav Bocharov +--- + .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts +index 561eec21b4de..3d98fa36633c 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts +@@ -81,12 +81,22 @@ vddio_ao18: regulator-vddio_ao18 { + vddio_boot: regulator-vddio_boot { + compatible = "regulator-fixed"; + regulator-name = "VDDIO_BOOT"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ vccq_1v8: regulator-vccq_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCCQ_1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vddao_3v3>; + regulator-always-on; + }; + ++ + usb_pwr: regulator-usb_pwr { + compatible = "regulator-fixed"; + regulator-name = "USB_PWR"; +@@ -248,8 +258,7 @@ &sd_emmc_b { + + bus-width = <4>; + cap-sd-highspeed; +- sd-uhs-sdr104; +- max-frequency = <200000000>; ++ max-frequency = <50000000>; + non-removable; + disable-wp; + +@@ -282,7 +291,7 @@ &sd_emmc_c { + mmc-pwrseq = <&emmc_pwrseq>; + + vmmc-supply = <&vcc_3v3>; +- vqmmc-supply = <&vddio_boot>; ++ vqmmc-supply = <&vccq_1v8>; + }; + + /* UART Bluetooth */ +-- +2.30.2 + diff --git a/patch/kernel/archive/meson64-5.15/jethome-0009-arm64-meson-dts-fix-sdio-in-dts-for-JetHub-D1.patch b/patch/kernel/archive/meson64-5.15/jethome-0009-arm64-meson-dts-fix-sdio-in-dts-for-JetHub-D1.patch deleted file mode 100644 index 3698d2bade..0000000000 --- a/patch/kernel/archive/meson64-5.15/jethome-0009-arm64-meson-dts-fix-sdio-in-dts-for-JetHub-D1.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 76ff4ce956542827f5eff43f402aae0254e3ec3a Mon Sep 17 00:00:00 2001 -From: Vyacheslav Bocharov -Date: Fri, 10 Dec 2021 08:30:10 +0300 -Subject: [PATCH 3/3] arm64: meson: dts: fix sdio in dts for JetHub D1 - -Fix the dts to match board's reference design: -- update vddio_boot regulator to 3.3v -- remove emmc hs200 support due to the lack of 1.8v regulator - -Signed-off-by: Vyacheslav Bocharov ---- - .../boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts -index 9951217ef997..2965346fc47e 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts -@@ -81,8 +81,8 @@ vddio_ao18: regulator-vddio_ao18 { - vddio_boot: regulator-vddio_boot { - compatible = "regulator-fixed"; - regulator-name = "VDDIO_BOOT"; -- regulator-min-microvolt = <1800000>; -- regulator-max-microvolt = <1800000>; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; - vin-supply = <&vddao_3v3>; - regulator-always-on; - }; -@@ -276,8 +276,7 @@ &sd_emmc_c { - max-frequency = <200000000>; - non-removable; - disable-wp; -- mmc-ddr-1_8v; -- mmc-hs200-1_8v; -+ mmc-ddr-3_3v; - - mmc-pwrseq = <&emmc_pwrseq>; - --- -2.30.2 - diff --git a/patch/kernel/archive/meson64-5.15/jethome-0009-arm64-meson-fix-sdio-in-dts-for-JetHub-D1.patch b/patch/kernel/archive/meson64-5.15/jethome-0009-arm64-meson-fix-sdio-in-dts-for-JetHub-D1.patch new file mode 100644 index 0000000000..1b7993dc6e --- /dev/null +++ b/patch/kernel/archive/meson64-5.15/jethome-0009-arm64-meson-fix-sdio-in-dts-for-JetHub-D1.patch @@ -0,0 +1,68 @@ +From 48642ffdc5245f55d95fdd9719617b864c2c9206 Mon Sep 17 00:00:00 2001 +From: Vyacheslav Bocharov +Date: Sun, 9 Jan 2022 12:32:21 +0300 +Subject: [PATCH] arm64: meson: fix sdio in dts for JetHub D1 + +Fix the dts to match board's reference design: +- update vddio_boot regulator to 3.3v (Wi-Fi SDIO module) +- add vccq_1v8 regulator with 1.8v for eMMC SDIO + +In the first revision of JetHub D1 the vccq_1v8 regulator was 3.3v. +All installed eMMC modules were tested to work in HS200 mode at 3.3v +supply voltage. In the next revisions of the board eMMC will be +powered with 1.8v according to the standard. + +Signed-off-by: Vyacheslav Bocharov +--- + .../dts/amlogic/meson-axg-jethome-jethub-j100.dts | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts +index 561eec21b4de..3d98fa36633c 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j100.dts +@@ -81,12 +81,22 @@ vddio_ao18: regulator-vddio_ao18 { + vddio_boot: regulator-vddio_boot { + compatible = "regulator-fixed"; + regulator-name = "VDDIO_BOOT"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ vccq_1v8: regulator-vccq_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCCQ_1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vddao_3v3>; + regulator-always-on; + }; + ++ + usb_pwr: regulator-usb_pwr { + compatible = "regulator-fixed"; + regulator-name = "USB_PWR"; +@@ -248,8 +258,7 @@ &sd_emmc_b { + + bus-width = <4>; + cap-sd-highspeed; +- sd-uhs-sdr104; +- max-frequency = <200000000>; ++ max-frequency = <50000000>; + non-removable; + disable-wp; + +@@ -282,7 +291,7 @@ &sd_emmc_c { + mmc-pwrseq = <&emmc_pwrseq>; + + vmmc-supply = <&vcc_3v3>; +- vqmmc-supply = <&vddio_boot>; ++ vqmmc-supply = <&vccq_1v8>; + }; + + /* UART Bluetooth */ +-- +2.30.2 +