From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Tue, 25 Jul 2023 13:31:54 -0400 Subject: arch: arm64: dts: amlogic: meson g12b bananapi cm4 Signed-off-by: Patrick Yavitz --- 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 = ; 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 = ; 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 Date: Sun, 8 Sep 2024 05:55:13 -0400 Subject: BananaPi CM4: improve SDIO WiFi speeds Signed-off-by: Patrick Yavitz --- 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