-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
meson64-6.13: prepare new edge by copying 6.12 (current)
- Loading branch information
1 parent
16fd47f
commit 51f111f
Showing
122 changed files
with
10,782 additions
and
0 deletions.
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
patch/kernel/archive/meson64-6.13/0000.patching_config.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| config: | ||
|
|
||
| # Just some info stuff; not used by the patching scripts | ||
| name: meson64-6.7 | ||
| kind: kernel | ||
| type: mainline # or: vendor | ||
| branch: linux-6.7.y | ||
| last-known-good-tag: v6.7.0 | ||
| maintainers: | ||
| - { github: rpardini, name: Ricardo Pardini, email: [email protected], armbian-forum: rpardini } | ||
|
|
||
| # .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones. | ||
| # This is meant to provide a way to "add a board DTS" without having to null-patch them in. | ||
| dts-directories: | ||
| # will copy patch/kernel/archive/meson64-MAJOR.MINOR/dt-boards/*.dts to arch/arm64/boot/dts/amlogic | ||
| - { source: "dt", target: "arch/arm64/boot/dts/amlogic" } | ||
|
|
||
| # every file in these directories will be copied as-is to the build tree; later ones overwrite earlier ones | ||
| # This is meant as a way to have overlays, bare, in a directory, without having to null-patch them in. | ||
| # @TODO need a solution to auto-Makefile the overlays as well | ||
| overlay-directories: | ||
| # will copy patch/kernel/archive/meson64-MAJOR.MINOR/overlay/**/* to arch/arm64/boot/dts/amlogic/overlay | ||
| - { source: "overlay", target: "arch/arm64/boot/dts/amlogic/overlay" } | ||
|
|
||
| # the Makefile in each of these directories will be magically patched to include the dts files copied | ||
| # or patched-in; overlay subdir will be included "-y" if it exists. | ||
| # No more Makefile patching needed, yay! | ||
| auto-patch-dt-makefile: | ||
| - { directory: "arch/arm64/boot/dts/amlogic", config-var: "CONFIG_ARCH_MESON" } | ||
|
|
||
| # configuration for when applying patches to git / auto-rewriting patches (development cycle helpers) | ||
| patches-to-git: | ||
| do-not-commit-files: | ||
| - "MAINTAINERS" # constant churn, drop them. sorry. | ||
| - "Documentation/devicetree/bindings/arm/amlogic.yaml" # constant churn, conflicts on every bump, drop it. sorry. | ||
| do-not-commit-regexes: # Python-style regexes | ||
| - "^arch/([a-zA-Z0-9]+)/boot/dts/([a-zA-Z0-9]+)/Makefile$" # ignore DT Makefile patches, we've an auto-patcher now | ||
|
|
121 changes: 121 additions & 0 deletions
121
patch/kernel/archive/meson64-6.13/board-bananapi-cm4-cm4io.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Patrick Yavitz <[email protected]> | ||
| Date: Tue, 25 Jul 2023 13:31:54 -0400 | ||
| Subject: arch: arm64: dts: amlogic: meson g12b bananapi cm4 | ||
|
|
||
| Signed-off-by: Patrick Yavitz <[email protected]> | ||
| --- | ||
| arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 9 +++++-- | ||
| arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 12 ++++++++-- | ||
| 2 files changed, 17 insertions(+), 4 deletions(-) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | ||
| +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | ||
| @@ -50,14 +50,15 @@ leds { | ||
| led-blue { | ||
| color = <LED_COLOR_ID_BLUE>; | ||
| function = LED_FUNCTION_STATUS; | ||
| - gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>; | ||
| + gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_LOW>; | ||
| linux,default-trigger = "heartbeat"; | ||
| }; | ||
|
|
||
| led-green { | ||
| color = <LED_COLOR_ID_GREEN>; | ||
| function = LED_FUNCTION_STATUS; | ||
| - gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; | ||
| + gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>; | ||
| + linux,default-trigger = "default-on"; | ||
| }; | ||
| }; | ||
|
|
||
| @@ -120,6 +121,10 @@ codec { | ||
| }; | ||
| }; | ||
|
|
||
| +&reboot { | ||
| + sd-vqen = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; | ||
| +}; | ||
| + | ||
| &cecb_AO { | ||
| status = "okay"; | ||
| }; | ||
| diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | ||
| +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | ||
| @@ -12,6 +12,15 @@ aliases { | ||
| rtc1 = &vrtc; | ||
| }; | ||
|
|
||
| + reboot: meson64-reboot { | ||
| + compatible = "meson64,reboot"; | ||
| + sys_reset = <0x84000009>; | ||
| + sys_poweroff = <0x84000008>; | ||
| + | ||
| + sd-vqsw = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>; | ||
| + sd-vmmc = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>; | ||
| + }; | ||
| + | ||
| chosen { | ||
| stdout-path = "serial0:115200n8"; | ||
| }; | ||
| @@ -369,8 +378,7 @@ &uart_A { | ||
|
|
||
| bluetooth { | ||
| compatible = "realtek,rtl8822cs-bt"; | ||
| - enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; | ||
| - host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; | ||
| + enable-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; | ||
| device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
| }; | ||
| -- | ||
| Armbian | ||
|
|
||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Patrick Yavitz <[email protected]> | ||
| Date: Sun, 8 Sep 2024 05:55:13 -0400 | ||
| Subject: BananaPi CM4: improve SDIO WiFi speeds | ||
|
|
||
| Signed-off-by: Patrick Yavitz <[email protected]> | ||
| --- | ||
| arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 9 +++++++-- | ||
| 1 file changed, 7 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | ||
| +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | ||
| @@ -303,8 +303,10 @@ &sd_emmc_a { | ||
| #size-cells = <0>; | ||
|
|
||
| bus-width = <4>; | ||
| + cap-sd-highspeed; | ||
| + sd-uhs-sdr50; | ||
| sd-uhs-sdr104; | ||
| - max-frequency = <50000000>; | ||
| + max-frequency = <100000000>; | ||
|
|
||
| non-removable; | ||
| disable-wp; | ||
| @@ -312,10 +314,13 @@ &sd_emmc_a { | ||
| /* WiFi firmware requires power in suspend */ | ||
| keep-power-in-suspend; | ||
|
|
||
| + /* Removing quirk improves WiFi performance */ | ||
| + /delete-property/ amlogic,dram-access-quirk; | ||
| + | ||
| mmc-pwrseq = <&sdio_pwrseq>; | ||
|
|
||
| vmmc-supply = <&vddao_3v3>; | ||
| - vqmmc-supply = <&vddao_3v3>; | ||
| + vqmmc-supply = <&vddao_1v8>; | ||
|
|
||
| status = "okay"; | ||
|
|
||
| -- | ||
| Armbian | ||
|
|
62 changes: 62 additions & 0 deletions
62
patch/kernel/archive/meson64-6.13/board-bananapi-m2s.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Patrick Yavitz <[email protected]> | ||
| Date: Tue, 25 Jul 2023 13:34:18 -0400 | ||
| Subject: arch: arm64: dts: amlogic: meson g12b bananapi m2s | ||
|
|
||
| Signed-off-by: Patrick Yavitz <[email protected]> | ||
| --- | ||
| arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts | 4 ++++ | ||
| arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 9 +++++++++ | ||
| arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts | 4 ++++ | ||
| 3 files changed, 17 insertions(+) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts | ||
| +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts | ||
| @@ -18,6 +18,10 @@ aliases { | ||
| }; | ||
| }; | ||
|
|
||
| +&reboot { | ||
| + sd-vqen = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; | ||
| +}; | ||
| + | ||
| /* Camera (CSI) bus */ | ||
| &i2c1 { | ||
| status = "okay"; | ||
| diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | ||
| +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | ||
| @@ -17,6 +17,15 @@ aliases { | ||
| rtc1 = &vrtc; | ||
| }; | ||
|
|
||
| + reboot: meson64-reboot { | ||
| + compatible = "meson64,reboot"; | ||
| + sys_reset = <0x84000009>; | ||
| + sys_poweroff = <0x84000008>; | ||
| + | ||
| + sd-vqsw = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>; | ||
| + sd-vmmc = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>; | ||
| + }; | ||
| + | ||
| chosen { | ||
| stdout-path = "serial0:115200n8"; | ||
| }; | ||
| diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts | ||
| +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts | ||
| @@ -12,3 +12,7 @@ / { | ||
| compatible = "bananapi,bpi-m2s", "amlogic,s922x", "amlogic,g12b"; | ||
| model = "BananaPi M2S"; | ||
| }; | ||
| + | ||
| +&reboot { | ||
| + sd-vqen = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; | ||
| +}; | ||
| -- | ||
| Armbian | ||
|
|
45 changes: 45 additions & 0 deletions
45
.../kernel/archive/meson64-6.13/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Igor Pecovnik <[email protected]> | ||
| Date: Sat, 11 Feb 2023 18:30:00 +0100 | ||
| Subject: BananaPi M5: 270 clock phase, via amlogic,mmc-phase | ||
|
|
||
| Rework of Ricardo Pardini <[email protected]> patch. | ||
|
|
||
| Signed-off-by: Igor Pecovnik <[email protected]> | ||
| --- | ||
| arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 5 +++++ | ||
| 1 file changed, 5 insertions(+) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | ||
| +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | ||
| @@ -8,6 +8,7 @@ | ||
| #include <dt-bindings/leds/common.h> | ||
| #include <dt-bindings/input/linux-event-codes.h> | ||
| #include <dt-bindings/gpio/meson-g12a-gpio.h> | ||
| +#include <dt-bindings/mmc/meson-gx-mmc.h> | ||
|
|
||
| / { | ||
| adc-keys { | ||
| @@ -394,6 +395,8 @@ &sd_emmc_b { | ||
| cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; | ||
| vmmc-supply = <&tflash_vdd>; | ||
| vqmmc-supply = <&vddio_c>; | ||
| + | ||
| + amlogic,mmc-phase = <CLK_PHASE_270 CLK_PHASE_0 CLK_PHASE_0>; | ||
| }; | ||
|
|
||
| /* eMMC */ | ||
| @@ -413,6 +416,8 @@ &sd_emmc_c { | ||
| mmc-pwrseq = <&emmc_pwrseq>; | ||
| vmmc-supply = <&vddao_3v3>; | ||
| vqmmc-supply = <&emmc_1v8>; | ||
| + | ||
| + amlogic,mmc-phase = <CLK_PHASE_270 CLK_PHASE_0 CLK_PHASE_0>; | ||
| }; | ||
|
|
||
| &uart_AO { | ||
| -- | ||
| Armbian | ||
|
|
112 changes: 112 additions & 0 deletions
112
patch/kernel/archive/meson64-6.13/board-bananapim5-002-add-wifi-bt-support.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Patrick Yavitz <[email protected]> | ||
| Date: Wed, 2 Aug 2023 19:36:07 -0400 | ||
| Subject: arch: arm64: dts: amlogic: add wifi/bt support to bananapi m5 | ||
|
|
||
| The BPI-M5 has an optional RTL8822CS WiFi/BT mezzanine board. Describe | ||
| the board but mark the sd_emmc_a and uart_A nodes disabled so they can | ||
| be enabled via overlay or fdtput when the board is connected. | ||
|
|
||
| Signed-off-by: Patrick Yavitz <[email protected]> | ||
| --- | ||
| arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 66 +++++++++- | ||
| 1 file changed, 65 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | ||
| index 111111111111..222222222222 100644 | ||
| --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | ||
| +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | ||
| @@ -25,6 +25,20 @@ cvbs_connector_in: endpoint { | ||
| }; | ||
| }; | ||
|
|
||
| + sdio_pwrseq: sdio-pwrseq { | ||
| + compatible = "mmc-pwrseq-simple"; | ||
| + reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; | ||
| + clocks = <&wifi32k>; | ||
| + clock-names = "ext_clock"; | ||
| + }; | ||
| + | ||
| + wifi32k: wifi32k { | ||
| + compatible = "pwm-clock"; | ||
| + #clock-cells = <0>; | ||
| + clock-frequency = <32768>; | ||
| + pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ | ||
| + }; | ||
| + | ||
| sound { | ||
| compatible = "amlogic,axg-sound-card"; | ||
| model = "BPI-M5"; | ||
| @@ -153,7 +167,6 @@ &acodec { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| - | ||
| &clkc_audio { | ||
| status = "okay"; | ||
| }; | ||
| @@ -176,6 +189,42 @@ &frddr_c { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| +&pwm_ef { | ||
| + status = "okay"; | ||
| + pinctrl-0 = <&pwm_e_pins>; | ||
| + pinctrl-names = "default"; | ||
| +}; | ||
| + | ||
| +/* SDIO */ | ||
| +&sd_emmc_a { | ||
| + /* enable if WiFi/BT board connected */ | ||
| + status = "disabled"; | ||
| + pinctrl-0 = <&sdio_pins>; | ||
| + pinctrl-1 = <&sdio_clk_gate_pins>; | ||
| + pinctrl-names = "default", "clk-gate"; | ||
| + #address-cells = <1>; | ||
| + #size-cells = <0>; | ||
| + | ||
| + bus-width = <4>; | ||
| + sd-uhs-sdr104; | ||
| + max-frequency = <50000000>; | ||
| + | ||
| + non-removable; | ||
| + disable-wp; | ||
| + | ||
| + /* WiFi firmware requires power in suspend */ | ||
| + keep-power-in-suspend; | ||
| + | ||
| + mmc-pwrseq = <&sdio_pwrseq>; | ||
| + | ||
| + vmmc-supply = <&vddao_3v3>; | ||
| + vqmmc-supply = <&vddao_1v8>; | ||
| + | ||
| + rtl8822cs: wifi@1 { | ||
| + reg = <1>; | ||
| + }; | ||
| +}; | ||
| + | ||
| &tdmif_b { | ||
| status = "okay"; | ||
| }; | ||
| @@ -223,3 +272,18 @@ &toddr_b { | ||
| &toddr_c { | ||
| status = "okay"; | ||
| }; | ||
| + | ||
| +&uart_A { | ||
| + /* enable if WiFi/BT board connected */ | ||
| + status = "disabled"; | ||
| + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; | ||
| + pinctrl-names = "default"; | ||
| + uart-has-rtscts; | ||
| + | ||
| + bluetooth { | ||
| + compatible = "realtek,rtl8822cs-bt"; | ||
| + enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; | ||
| + host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; | ||
| + device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; | ||
| + }; | ||
| +}; | ||
| -- | ||
| Armbian | ||
|
|
Oops, something went wrong.