From 1f46cadd4c9cbc4a7e597bc5bf008d50a0a2b71d Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Fri, 2 Aug 2019 15:27:02 +0200 Subject: [PATCH] linux: refresh orange-pi-zero wifi patch Signed-off-by: Marek Belisko --- ...dts-orange-pi-zero-Add-wifi-support.patch} | 45 ++++++++++++++----- .../linux/linux-mainline_4.19.63.bb | 2 +- recipes-kernel/linux/linux-mainline_5.2.5.bb | 2 +- .../linux/linux-mainline_5.3-rc2.bb | 3 +- 4 files changed, 36 insertions(+), 16 deletions(-) rename recipes-kernel/linux/linux-mainline/orange-pi-zero/{0001-add-wifi-support.patch => 0001-dts-orange-pi-zero-Add-wifi-support.patch} (67%) diff --git a/recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-add-wifi-support.patch b/recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-dts-orange-pi-zero-Add-wifi-support.patch similarity index 67% rename from recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-add-wifi-support.patch rename to recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-dts-orange-pi-zero-Add-wifi-support.patch index 9487681..a57379b 100644 --- a/recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-add-wifi-support.patch +++ b/recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-dts-orange-pi-zero-Add-wifi-support.patch @@ -1,28 +1,44 @@ +From 055155f463693e61f9018a011ad600d872d6736f Mon Sep 17 00:00:00 2001 +From: Marek Belisko +Date: Fri, 2 Aug 2019 14:46:10 +0200 +Subject: [PATCH] dts: orange-pi-zero: Add wifi support + +Signed-off-by: Marek Belisko +--- + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 47 ++++++++++++++++++----- + 1 file changed, 37 insertions(+), 10 deletions(-) + diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -index 6713d0f2b3f4..ad0829e8f716 100644 +index 84cd9c0..77b2fc6 100644 --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -@@ -80,19 +80,22 @@ +@@ -80,13 +80,14 @@ }; }; - reg_vcc_wifi: reg_vcc_wifi { -+ vdd_wifi: vdd_wifi { - compatible = "regulator-fixed"; +- compatible = "regulator-fixed"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-name = "vcc-wifi"; - enable-active-high; ++ vdd_wifi: vdd_wifi { + regulator-name = "wifi"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; gpio = <&pio 0 20 GPIO_ACTIVE_HIGH>; + startup-delay-us = <70000>; + enable-active-high; ++ + }; + + reg_vdd_cpux: vdd-cpux-regulator { +@@ -106,10 +107,12 @@ + 1300000 1>; }; - wifi_pwrseq: wifi_pwrseq { -+ pwrseq_wifi: pwrseq_wifi@0 { ++ pwrseq_wifi: pwrseq_wifi { compatible = "mmc-pwrseq-simple"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_rst>; @@ -32,10 +48,10 @@ index 6713d0f2b3f4..ad0829e8f716 100644 }; }; -@@ -124,9 +127,11 @@ +@@ -140,9 +143,11 @@ + }; + &mmc1 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins_a>; - vmmc-supply = <®_vcc_wifi>; - mmc-pwrseq = <&wifi_pwrseq>; + vmmc-supply = <®_vcc3v3>; @@ -46,7 +62,7 @@ index 6713d0f2b3f4..ad0829e8f716 100644 non-removable; status = "okay"; -@@ -136,9 +141,30 @@ +@@ -152,6 +157,13 @@ */ xr819: sdio_wifi@1 { reg = <1>; @@ -60,6 +76,11 @@ index 6713d0f2b3f4..ad0829e8f716 100644 }; }; +@@ -208,3 +220,18 @@ + status = "okay"; + usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ + }; ++ +&pio { + wifi_wake: wifi_wake { + pins = "PG10"; @@ -74,6 +95,6 @@ index 6713d0f2b3f4..ad0829e8f716 100644 + }; +}; + - &mmc1_pins_a { - bias-pull-up; - }; +-- +2.7.4 + diff --git a/recipes-kernel/linux/linux-mainline_4.19.63.bb b/recipes-kernel/linux/linux-mainline_4.19.63.bb index c7430d9..86623fc 100644 --- a/recipes-kernel/linux/linux-mainline_4.19.63.bb +++ b/recipes-kernel/linux/linux-mainline_4.19.63.bb @@ -28,5 +28,5 @@ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \ " SRC_URI_append_orange-pi-zero += "\ - file://0001-add-wifi-support.patch \ + file://0001-dts-orange-pi-zero-Add-wifi-support.patch \ " diff --git a/recipes-kernel/linux/linux-mainline_5.2.5.bb b/recipes-kernel/linux/linux-mainline_5.2.5.bb index 653520c..4fec308 100644 --- a/recipes-kernel/linux/linux-mainline_5.2.5.bb +++ b/recipes-kernel/linux/linux-mainline_5.2.5.bb @@ -28,5 +28,5 @@ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \ " SRC_URI_append_orange-pi-zero += "\ - file://0001-add-wifi-support.patch \ + file://0001-dts-orange-pi-zero-Add-wifi-support.patch \ " diff --git a/recipes-kernel/linux/linux-mainline_5.3-rc2.bb b/recipes-kernel/linux/linux-mainline_5.3-rc2.bb index ef98415..5e17725 100644 --- a/recipes-kernel/linux/linux-mainline_5.3-rc2.bb +++ b/recipes-kernel/linux/linux-mainline_5.3-rc2.bb @@ -26,9 +26,8 @@ SRC_URI = "https://git.kernel.org/torvalds/t/linux-${PV}.tar.gz \ file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \ file://defconfig \ " - SRC_URI_append_orange-pi-zero += "\ - file://0001-add-wifi-support.patch \ + file://0001-dts-orange-pi-zero-Add-wifi-support.patch \ " FILES_${KERNEL_PACKAGE_NAME}-base_append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"