diff --git a/config/targets-cli-beta.conf b/config/targets-cli-beta.conf index e0430732f1..aa03847854 100644 --- a/config/targets-cli-beta.conf +++ b/config/targets-cli-beta.conf @@ -2,6 +2,11 @@ # board branch release desktop|cli|minimal stable|beta create images # #################################################################################################################### +# Innovato Quadra +aw-h6-tv current jammy minimal beta yes +aw-h6-tv edge jammy minimal beta yes + + # JetHub J80 jethubj80 edge jammy cli beta yes diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/arm64-dts-sun50i-h6-tanix-tx6-Enable-ethernet-eMMC-a.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm64-dts-sun50i-h6-tanix-tx6-Enable-ethernet-eMMC-a.patch new file mode 100644 index 0000000000..ab9c9b3e98 --- /dev/null +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm64-dts-sun50i-h6-tanix-tx6-Enable-ethernet-eMMC-a.patch @@ -0,0 +1,131 @@ +From 33b021f99a794780edac7d74fe66a44a1b2718a6 Mon Sep 17 00:00:00 2001 +From: Igor Pecovnik +Date: Tue, 10 Jan 2023 20:58:47 +0100 +Subject: [PATCH] arm64:dts: sun50i-h6-tanix-tx6 Enable ethernet, eMMC and + Xradio wireless + +Signed-off-by: Igor Pecovnik +--- + .../dts/allwinner/sun50i-h6-tanix-tx6.dts | 65 +++++++++++++++++++ + 1 file changed, 65 insertions(+) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts +index e91860a9e..b0d3815c6 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts +@@ -13,6 +13,8 @@ / { + compatible = "oranth,tanix-tx6", "allwinner,sun50i-h6"; + + aliases { ++ ethernet0 = &emac; ++ ethernet1 = &xr819; + serial0 = &uart0; + }; + +@@ -52,12 +54,28 @@ reg_vdd_cpu_gpu: regulator-vdd-cpu-gpu { + regulator-min-microvolt = <1135000>; + regulator-max-microvolt = <1135000>; + }; ++ ++ wifi_pwrseq: wifi_pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ clocks = <&rtc 1>; ++ clock-names = "ext_clock"; ++ reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */ ++ post-power-on-delay-ms = <200>; ++ }; + }; + + &cpu0 { + cpu-supply = <®_vdd_cpu_gpu>; + }; + ++&ac200_ephy { ++ status = "okay"; ++}; ++ ++&ac200_pwm_clk { ++ status = "okay"; ++}; ++ + &de { + status = "okay"; + }; +@@ -66,6 +84,14 @@ &dwc3 { + status = "okay"; + }; + ++&emac { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&ext_rmii_pins>; ++ phy-mode = "rmii"; ++ phy-handle = <&ext_rmii_phy>; ++ status = "okay"; ++}; ++ + &ehci0 { + status = "okay"; + }; +@@ -93,6 +119,17 @@ &i2s1 { + status = "okay"; + }; + ++&i2c3 { ++ status = "okay"; ++}; ++ ++&mdio { ++ ext_rmii_phy: ethernet-phy@1 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <1>; ++ }; ++}; ++ + &mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; +@@ -102,6 +139,30 @@ &mmc0 { + status = "okay"; + }; + ++&mmc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc1_pins>; ++ vmmc-supply = <®_vcc3v3>; ++ vqmmc-supply = <®_vcc1v8>; ++ mmc-pwrseq = <&wifi_pwrseq>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++ ++ /* ++ * Explicitly define the sdio device, so that we can add an ethernet ++ * alias for it (which e.g. makes u-boot set a mac-address). ++ */ ++ xr819: sdio_wifi@1 { ++ reg = <1>; ++ compatible = "xradio,xr819"; ++ interrupt-parent = <&r_pio>; ++ local-mac-address = [dc 44 6d c0 ff ee]; ++ interrupts = <1 0 IRQ_TYPE_EDGE_RISING>; /* PM0 */ ++ interrupt-names = "host-wake"; ++ }; ++}; ++ + &mmc2 { + vmmc-supply = <®_vcc3v3>; + vqmmc-supply = <®_vcc1v8>; +@@ -126,6 +187,10 @@ &pio { + vcc-pg-supply = <®_vcc1v8>; + }; + ++&pwm { ++ status = "okay"; ++}; ++ + &r_ir { + linux,rc-map-name = "rc-tanix-tx5max"; + status = "okay"; +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/arm64-dts-sun50i-h6-tanix-tx6-Enable-ethernet.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm64-dts-sun50i-h6-tanix-tx6-Enable-ethernet.patch deleted file mode 100644 index 9974d4909e..0000000000 --- a/patch/kernel/archive/sunxi-5.15/patches.armbian/arm64-dts-sun50i-h6-tanix-tx6-Enable-ethernet.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 30ac1964293d718fe9fe16f8beec7c1cc80e18cc Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Sun, 12 Jan 2020 12:19:51 +0100 -Subject: [PATCH 013/101] arm64:dts: sun50i-h6-tanix-tx6 Enable ethernet - -Signed-off-by: Jernej Skrabec ---- - .../dts/allwinner/sun50i-h6-tanix-tx6.dts | 32 +++++++++++++++++++ - 1 file changed, 32 insertions(+) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts -index e91860a9e..d21dfe721 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts -@@ -13,6 +13,7 @@ / { - compatible = "oranth,tanix-tx6", "allwinner,sun50i-h6"; - - aliases { -+ ethernet0 = &emac; - serial0 = &uart0; - }; - -@@ -58,6 +59,14 @@ &cpu0 { - cpu-supply = <®_vdd_cpu_gpu>; - }; - -+&ac200_ephy { -+ status = "okay"; -+}; -+ -+&ac200_pwm_clk { -+ status = "okay"; -+}; -+ - &de { - status = "okay"; - }; -@@ -66,6 +75,14 @@ &dwc3 { - status = "okay"; - }; - -+&emac { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&ext_rmii_pins>; -+ phy-mode = "rmii"; -+ phy-handle = <&ext_rmii_phy>; -+ status = "okay"; -+}; -+ - &ehci0 { - status = "okay"; - }; -@@ -93,6 +110,17 @@ &i2s1 { - status = "okay"; - }; - -+&i2c3 { -+ status = "okay"; -+}; -+ -+&mdio { -+ ext_rmii_phy: ethernet-phy@1 { -+ compatible = "ethernet-phy-ieee802.3-c22"; -+ reg = <1>; -+ }; -+}; -+ - &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; -@@ -126,6 +154,10 @@ &pio { - vcc-pg-supply = <®_vcc1v8>; - }; - -+&pwm { -+ status = "okay"; -+}; -+ - &r_ir { - linux,rc-map-name = "rc-tanix-tx5max"; - status = "okay"; --- -2.31.1 - diff --git a/patch/kernel/archive/sunxi-5.15/series.armbian b/patch/kernel/archive/sunxi-5.15/series.armbian index aad49c91ca..a117778e9a 100644 --- a/patch/kernel/archive/sunxi-5.15/series.armbian +++ b/patch/kernel/archive/sunxi-5.15/series.armbian @@ -100,7 +100,7 @@ patches.armbian/arm-dts-sunxi-h3-h5.dtsi-force-mmc0-bus-width.patch patches.armbian/arm64-dts-sun50i-a64-pine64-enable-wifi-mmc1.patch patches.armbian/arm64-dts-sun50i-h6-Add-AC200-EPHY-related-nodes.patch - patches.armbian/arm64-dts-sun50i-h6-tanix-tx6-Enable-ethernet.patch + patches.armbian/arm64-dts-sun50i-h6-tanix-tx6-Enable-ethernet-eMMC-a.patch patches.armbian/arm64-dts-sun50i-a64-sopine-baseboard-Add-i2s2-mmc1.patch patches.armbian/arm64-dts-sun50i-h6-Add-r_uart-uart2-3-pins.patch patches.armbian/arm64-dts-allwinner-Add-sun50i-h616.dtsi-file.patch diff --git a/patch/kernel/archive/sunxi-5.15/series.conf b/patch/kernel/archive/sunxi-5.15/series.conf index 5628d3d1ac..b8ac534345 100644 --- a/patch/kernel/archive/sunxi-5.15/series.conf +++ b/patch/kernel/archive/sunxi-5.15/series.conf @@ -566,7 +566,7 @@ patches.armbian/arm-dts-sunxi-h3-h5.dtsi-force-mmc0-bus-width.patch patches.armbian/arm64-dts-sun50i-a64-pine64-enable-wifi-mmc1.patch patches.armbian/arm64-dts-sun50i-h6-Add-AC200-EPHY-related-nodes.patch - patches.armbian/arm64-dts-sun50i-h6-tanix-tx6-Enable-ethernet.patch + patches.armbian/arm64-dts-sun50i-h6-tanix-tx6-Enable-ethernet-eMMC-a.patch patches.armbian/arm64-dts-sun50i-a64-sopine-baseboard-Add-i2s2-mmc1.patch patches.armbian/arm64-dts-sun50i-h6-Add-r_uart-uart2-3-pins.patch patches.armbian/arm64-dts-allwinner-Add-sun50i-h616.dtsi-file.patch diff --git a/patch/kernel/archive/sunxi-6.1/patches.armbian/arm64-dts-sun50i-h6-tanix-add-wifi.patch b/patch/kernel/archive/sunxi-6.1/patches.armbian/arm64-dts-sun50i-h6-tanix-add-wifi.patch new file mode 100644 index 0000000000..48fcd29f45 --- /dev/null +++ b/patch/kernel/archive/sunxi-6.1/patches.armbian/arm64-dts-sun50i-h6-tanix-add-wifi.patch @@ -0,0 +1,121 @@ +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi +index edb71e4a0304..f8614e2b297c 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi +@@ -10,6 +10,8 @@ + + / { + aliases { ++ ethernet0 = &emac; ++ ethernet1 = &xr819; + serial0 = &uart0; + }; + +@@ -81,6 +83,7 @@ wifi_pwrseq: wifi-pwrseq { + clocks = <&rtc 1>; + clock-names = "ext_clock"; + reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */ ++ post-power-on-delay-ms = <200>; + }; + }; + +@@ -88,6 +91,14 @@ &cpu0 { + cpu-supply = <®_vdd_cpu_gpu>; + }; + ++&ac200_ephy { ++ status = "okay"; ++}; ++ ++&ac200_pwm_clk { ++ status = "okay"; ++}; ++ + &de { + status = "okay"; + }; +@@ -96,6 +107,15 @@ &dwc3 { + status = "okay"; + }; + ++&emac { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&ext_rmii_pins>; ++ phy-mode = "rmii"; ++ phy-handle = <&ext_rmii_phy>; ++ status = "okay"; ++}; ++ ++ + &ehci0 { + status = "okay"; + }; +@@ -119,6 +139,21 @@ hdmi_out_con: endpoint { + }; + }; + ++&i2s1 { ++ status = "okay"; ++}; ++ ++&i2c3 { ++ status = "okay"; ++}; ++ ++&mdio { ++ ext_rmii_phy: ethernet-phy@1 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <1>; ++ }; ++}; ++ + &mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; +@@ -129,12 +164,27 @@ &mmc0 { + }; + + &mmc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc1_pins>; + vmmc-supply = <®_vcc3v3>; + vqmmc-supply = <®_vcc1v8>; + mmc-pwrseq = <&wifi_pwrseq>; + bus-width = <4>; + non-removable; + status = "okay"; ++ ++ /* ++ * Explicitly define the sdio device, so that we can add an ethernet ++ * alias for it (which e.g. makes u-boot set a mac-address). ++ */ ++ xr819: sdio_wifi@1 { ++ reg = <1>; ++ compatible = "xradio,xr819"; ++ interrupt-parent = <&r_pio>; ++ local-mac-address = [dc 44 6d c0 ff ee]; ++ interrupts = <1 0 IRQ_TYPE_EDGE_RISING>; /* PM0 */ ++ interrupt-names = "host-wake"; ++ }; + }; + + &mmc2 { +@@ -161,10 +211,18 @@ &pio { + vcc-pg-supply = <®_vcc1v8>; + }; + ++&pwm { ++ status = "okay"; ++}; ++ + &r_ir { + status = "okay"; + }; + ++&sound_hdmi { ++ status = "okay"; ++}; ++ + &spdif { + status = "okay"; + }; diff --git a/patch/kernel/archive/sunxi-6.1/series.armbian b/patch/kernel/archive/sunxi-6.1/series.armbian index d703decfc3..1baa747ec5 100644 --- a/patch/kernel/archive/sunxi-6.1/series.armbian +++ b/patch/kernel/archive/sunxi-6.1/series.armbian @@ -155,6 +155,7 @@ patches.armbian/arm64-dts-sun50i-h5-add-termal-zones.patch patches.armbian/arm64-dts-sun50i-h6-orangepi-add-cpu-opp-refs.patch patches.armbian/arm64-dts-sun50i-h6-orangepi-enable-higher-clock-regulator-max-.patch + patches.armbian/arm64-dts-sun50i-h6-tanix-add-wifi.patch patches.armbian/Fix-compile-error-node-not-found.patch patches.armbian/drv-staging-rtl8723bs-AP-bugfix.patch patches.armbian/arm-dts-sun8i-h3-orangepi-pc-plus-add-wifi_pwrseq.patch diff --git a/patch/kernel/archive/sunxi-6.1/series.conf b/patch/kernel/archive/sunxi-6.1/series.conf index 88e62187ba..3364d91370 100644 --- a/patch/kernel/archive/sunxi-6.1/series.conf +++ b/patch/kernel/archive/sunxi-6.1/series.conf @@ -556,6 +556,7 @@ patches.armbian/arm64-dts-sun50i-h5-add-termal-zones.patch patches.armbian/arm64-dts-sun50i-h6-orangepi-add-cpu-opp-refs.patch patches.armbian/arm64-dts-sun50i-h6-orangepi-enable-higher-clock-regulator-max-.patch + patches.armbian/arm64-dts-sun50i-h6-tanix-add-wifi.patch patches.armbian/Fix-compile-error-node-not-found.patch patches.armbian/drv-staging-rtl8723bs-AP-bugfix.patch patches.armbian/arm-dts-sun8i-h3-orangepi-pc-plus-add-wifi_pwrseq.patch