diff --git a/device/testing/linux-postmarketos-amlogic/0001-add-xiaomi-once-support.patch b/device/testing/linux-postmarketos-amlogic/0001-ARM64-dts-meson-gxl-add-support-for-the-Xiaomi-Mi-Bo.patch similarity index 93% rename from device/testing/linux-postmarketos-amlogic/0001-add-xiaomi-once-support.patch rename to device/testing/linux-postmarketos-amlogic/0001-ARM64-dts-meson-gxl-add-support-for-the-Xiaomi-Mi-Bo.patch index 6b5ae526b..915e46028 100644 --- a/device/testing/linux-postmarketos-amlogic/0001-add-xiaomi-once-support.patch +++ b/device/testing/linux-postmarketos-amlogic/0001-ARM64-dts-meson-gxl-add-support-for-the-Xiaomi-Mi-Bo.patch @@ -1,7 +1,8 @@ -From efd1039ff812f1d6bb58d57ea84802a428b58ccd Mon Sep 17 00:00:00 2001 -From: "@exkc" +From bc868a43030b823b4318ce098f6975358b0b028a Mon Sep 17 00:00:00 2001 +From: "@exkc" <@exkc> Date: Tue, 14 Mar 2023 23:08:03 +0800 -Subject: [PATCH] ARM64: dts: meson-gxl: add support for the Xiaomi Mi Box 3 +Subject: [PATCH 1/4] ARM64: dts: meson-gxl: add support for the Xiaomi Mi Box + 3 The Xiaomi Mi Box 3 is a TV box based on the Amlogic S905X chipset. There are two variants: @@ -22,10 +23,10 @@ boards, which is why it includes meson-gxl-s905x-p212.dtsi: create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index e213aeebb..904bb1e19 100644 +index 6f61798a109f..8b9b9a6a8c7e 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -45,6 +45,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb +@@ -52,6 +52,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb @@ -35,7 +36,7 @@ index e213aeebb..904bb1e19 100644 dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts new file mode 100644 -index 000000000..6169c0dc0 +index 000000000000..120cdf001297 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts @@ -0,0 +1,142 @@ @@ -182,5 +183,5 @@ index 000000000..6169c0dc0 + status = "okay"; +}; -- -2.39.2 +2.41.0 diff --git a/device/testing/linux-postmarketos-amlogic/0002-add-x96-mini-support.patch b/device/testing/linux-postmarketos-amlogic/0002-add-x96-mini-support.patch index 8c3404eca..be5c5a00a 100644 --- a/device/testing/linux-postmarketos-amlogic/0002-add-x96-mini-support.patch +++ b/device/testing/linux-postmarketos-amlogic/0002-add-x96-mini-support.patch @@ -1,7 +1,7 @@ -From e9138e8584286fdc5fe1f9c0c5bb1bc37a6de8b1 Mon Sep 17 00:00:00 2001 -From: "@exkc" +From e6ba4e61b5545439b8a59c99a119ec3a7a3edb61 Mon Sep 17 00:00:00 2001 +From: "@exkc" <@exkc> Date: Thu, 30 Mar 2023 21:11:41 +0800 -Subject: [PATCH] add x96-mini support +Subject: [PATCH 2/4] add x96-mini support --- arch/arm64/boot/dts/amlogic/Makefile | 1 + @@ -10,10 +10,10 @@ Subject: [PATCH] add x96-mini support create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905w-x96-mini.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index e213aeebb..857bb7c00 100644 +index 8b9b9a6a8c7e..fb7aa1a7d966 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -39,6 +39,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-vero4k-plus.dtb +@@ -46,6 +46,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-vero4k-plus.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-jethome-jethub-j80.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb @@ -23,7 +23,7 @@ index e213aeebb..857bb7c00 100644 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-x96-mini.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-x96-mini.dts new file mode 100644 -index 000000000..bd69f8897 +index 000000000000..26b364de3191 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-x96-mini.dts @@ -0,0 +1,38 @@ @@ -66,5 +66,5 @@ index 000000000..bd69f8897 + dr_mode = "host"; +}; -- -2.39.2 +2.41.0 diff --git a/device/testing/linux-postmarketos-amlogic/0003-dt-bindings-arm-amlogic-add-libretech-cottonwood-sup.patch b/device/testing/linux-postmarketos-amlogic/0003-dt-bindings-arm-amlogic-add-libretech-cottonwood-sup.patch new file mode 100644 index 000000000..8635e5734 --- /dev/null +++ b/device/testing/linux-postmarketos-amlogic/0003-dt-bindings-arm-amlogic-add-libretech-cottonwood-sup.patch @@ -0,0 +1,41 @@ +From 8e22ad11c8d0c2a5b1ae70d439a57782d3b8d775 Mon Sep 17 00:00:00 2001 +From: Jerome Brunet +Date: Fri, 6 Oct 2023 12:34:59 +0200 +Subject: [PATCH 3/4] dt-bindings: arm: amlogic: add libretech cottonwood + support + +Add compatibles for the Libretech cottonwood board family + +Co-developed-by: Da Xue +Signed-off-by: Da Xue +Signed-off-by: Jerome Brunet +Acked-by: Conor Dooley +Link: https://lore.kernel.org/r/20231006103500.2015183-2-jbrunet@baylibre.com +Signed-off-by: Neil Armstrong +--- + Documentation/devicetree/bindings/arm/amlogic.yaml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml +index 08d59842655c..067e0d6d9aaa 100644 +--- a/Documentation/devicetree/bindings/arm/amlogic.yaml ++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml +@@ -155,6 +155,7 @@ properties: + - enum: + - bananapi,bpi-m2s + - khadas,vim3 ++ - libretech,aml-a311d-cc + - radxa,zero2 + - const: amlogic,a311d + - const: amlogic,g12b +@@ -196,6 +197,7 @@ properties: + - hardkernel,odroid-hc4 + - haochuangyi,h96-max + - khadas,vim3l ++ - libretech,aml-s905d3-cc + - seirobotics,sei610 + - const: amlogic,sm1 + +-- +2.41.0 + diff --git a/device/testing/linux-postmarketos-amlogic/0004-arm64-dts-amlogic-add-libretech-cottonwood-support.patch b/device/testing/linux-postmarketos-amlogic/0004-arm64-dts-amlogic-add-libretech-cottonwood-support.patch new file mode 100644 index 000000000..a586dcdd0 --- /dev/null +++ b/device/testing/linux-postmarketos-amlogic/0004-arm64-dts-amlogic-add-libretech-cottonwood-support.patch @@ -0,0 +1,892 @@ +From 59d7530f4b1078a5f65093b921ac90701d1d6919 Mon Sep 17 00:00:00 2001 +From: Jerome Brunet +Date: Fri, 6 Oct 2023 12:35:00 +0200 +Subject: [PATCH 4/4] arm64: dts: amlogic: add libretech cottonwood support + +Add support for the Libretech cottonwood board family. +These 2 boards are based on the same PCB, with an RPi B form factor. + +The "Alta" board uses an a311d while the "Solitude" variant uses an s905d3. + +Co-developed-by: Da Xue +Signed-off-by: Da Xue +Signed-off-by: Jerome Brunet +Reviewed-by: Neil Armstrong +Link: https://lore.kernel.org/r/20231006103500.2015183-3-jbrunet@baylibre.com +[narmstrong: squashed blue/green led inversion fix] +Signed-off-by: Neil Armstrong +--- + arch/arm64/boot/dts/amlogic/Makefile | 2 + + .../amlogic/meson-g12b-a311d-libretech-cc.dts | 121 ++++ + .../amlogic/meson-libretech-cottonwood.dtsi | 614 ++++++++++++++++++ + .../amlogic/meson-sm1-s905d3-libretech-cc.dts | 89 +++ + 4 files changed, 826 insertions(+) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-s905d3-libretech-cc.dts + +diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile +index fb7aa1a7d966..6eecaa3c3617 100644 +--- a/arch/arm64/boot/dts/amlogic/Makefile ++++ b/arch/arm64/boot/dts/amlogic/Makefile +@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb ++dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-libretech-cc.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-go-ultra.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb +@@ -72,6 +73,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m2-pro.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-h96-max.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb ++dtb-$(CONFIG_ARCH_MESON) += meson-sm1-s905d3-libretech-cc.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts +new file mode 100644 +index 000000000000..65b963d794cd +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts +@@ -0,0 +1,121 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 BayLibre, SAS. ++ * Author: Jerome Brunet ++ */ ++ ++/dts-v1/; ++ ++#include ++#include "meson-g12b-a311d.dtsi" ++#include "meson-libretech-cottonwood.dtsi" ++ ++/ { ++ compatible = "libretech,aml-a311d-cc", "amlogic,a311d", "amlogic,g12b"; ++ model = "Libre Computer AML-A311D-CC Alta"; ++ ++ vddcpu_a: regulator-vddcpu-a { ++ compatible = "pwm-regulator"; ++ regulator-name = "VDDCPU_A"; ++ regulator-min-microvolt = <730000>; ++ regulator-max-microvolt = <1011000>; ++ regulator-boot-on; ++ regulator-always-on; ++ pwm-supply = <&dc_in>; ++ pwms = <&pwm_ab 0 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ }; ++ ++ sound { ++ model = "LC-ALTA"; ++ audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0", ++ "TDMOUT_A IN 1", "FRDDR_B OUT 0", ++ "TDMOUT_A IN 2", "FRDDR_C OUT 0", ++ "TDM_A Playback", "TDMOUT_A OUT", ++ "TDMOUT_B IN 0", "FRDDR_A OUT 1", ++ "TDMOUT_B IN 1", "FRDDR_B OUT 1", ++ "TDMOUT_B IN 2", "FRDDR_C OUT 1", ++ "TDM_B Playback", "TDMOUT_B OUT", ++ "TDMOUT_C IN 0", "FRDDR_A OUT 2", ++ "TDMOUT_C IN 1", "FRDDR_B OUT 2", ++ "TDMOUT_C IN 2", "FRDDR_C OUT 2", ++ "TDM_C Playback", "TDMOUT_C OUT", ++ "TDMIN_A IN 0", "TDM_A Capture", ++ "TDMIN_B IN 0", "TDM_A Capture", ++ "TDMIN_C IN 0", "TDM_A Capture", ++ "TDMIN_A IN 3", "TDM_A Loopback", ++ "TDMIN_B IN 3", "TDM_A Loopback", ++ "TDMIN_C IN 3", "TDM_A Loopback", ++ "TDMIN_A IN 1", "TDM_B Capture", ++ "TDMIN_B IN 1", "TDM_B Capture", ++ "TDMIN_C IN 1", "TDM_B Capture", ++ "TDMIN_A IN 4", "TDM_B Loopback", ++ "TDMIN_B IN 4", "TDM_B Loopback", ++ "TDMIN_C IN 4", "TDM_B Loopback", ++ "TDMIN_A IN 2", "TDM_C Capture", ++ "TDMIN_B IN 2", "TDM_C Capture", ++ "TDMIN_C IN 2", "TDM_C Capture", ++ "TDMIN_A IN 5", "TDM_C Loopback", ++ "TDMIN_B IN 5", "TDM_C Loopback", ++ "TDMIN_C IN 5", "TDM_C Loopback", ++ "TODDR_A IN 0", "TDMIN_A OUT", ++ "TODDR_B IN 0", "TDMIN_A OUT", ++ "TODDR_C IN 0", "TDMIN_A OUT", ++ "TODDR_A IN 1", "TDMIN_B OUT", ++ "TODDR_B IN 1", "TDMIN_B OUT", ++ "TODDR_C IN 1", "TDMIN_B OUT", ++ "TODDR_A IN 2", "TDMIN_C OUT", ++ "TODDR_B IN 2", "TDMIN_C OUT", ++ "TODDR_C IN 2", "TDMIN_C OUT", ++ "Lineout", "ACODEC LOLP", ++ "Lineout", "ACODEC LORP"; ++ }; ++}; ++ ++&cpu0 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table_0>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu1 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table_0>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu100 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu101 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu102 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu103 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&pwm_ab { ++ pinctrl-0 = <&pwm_a_e_pins>, <&pwm_b_x7_pins>; ++ clocks = <&xtal>, <&xtal>; ++ clock-names = "clkin0", "clkin1"; ++}; +diff --git a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi +new file mode 100644 +index 000000000000..35e8f5bae990 +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi +@@ -0,0 +1,614 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 BayLibre, SAS. ++ * Author: Jerome Brunet ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/ { ++ aliases { ++ serial0 = &uart_AO; ++ ethernet0 = ðmac; ++ spi0 = &spifc; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x0 0x0 0x80000000>; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ dioo2133: audio-amplifier-0 { ++ compatible = "simple-audio-amplifier"; ++ enable-gpios = <&gpio GPIOX_0 GPIO_ACTIVE_HIGH>; ++ VCC-supply = <&vcc_5v>; ++ sound-name-prefix = "10U2"; ++ }; ++ ++ /* TOFIX: handle CVBS_DET on SARADC channel 0 */ ++ cvbs-connector { ++ compatible = "composite-video-connector"; ++ ++ port { ++ cvbs_connector_in: endpoint { ++ remote-endpoint = <&cvbs_vdac_out>; ++ }; ++ }; ++ }; ++ ++ emmc_pwrseq: emmc-pwrseq { ++ compatible = "mmc-pwrseq-emmc"; ++ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; ++ }; ++ ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_connector_in: endpoint { ++ remote-endpoint = <&hdmi_tx_tmds_out>; ++ }; ++ }; ++ }; ++ ++ led-blue { ++ compatible = "pwm-leds"; ++ ++ led { ++ color = ; ++ function = LED_FUNCTION_ACTIVITY; ++ linux,default-trigger = "heartbeat"; ++ max-brightness = <255>; ++ pwms = <&pwm_ab 1 1250 0>; ++ active-low; ++ }; ++ }; ++ ++ led-green { ++ compatible = "pwm-leds"; ++ ++ led { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ linux,default-trigger = "default-on"; ++ max-brightness = <255>; ++ pwms = <&pwm_cd 1 1250 0>; ++ active-low; ++ }; ++ }; ++ ++ led-orange { ++ compatible = "gpio-leds"; ++ ++ led { ++ color = ; ++ function = LED_FUNCTION_STANDBY; ++ gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; ++ panic-indicator; ++ }; ++ }; ++ ++ dc_in: regulator-dc-in { ++ compatible = "regulator-fixed"; ++ regulator-name = "5V_IN"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ flash_1v8: regulator-flash-1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "FLASH_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ vin-supply = <&vcc_3v3>; ++ }; ++ ++ vcc_card: regulator-vcc-card { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_CARD"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vddao_3v3>; ++ gpio = <&gpio GPIOX_2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; ++ enable-active-high; ++ gpio-open-drain; ++ }; ++ ++ vcc_3v3: regulator-vcc-3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ vin-supply = <&vddao_3v3>; ++ ++ /* FIXME: controlled by TEST_N */ ++ }; ++ ++ vcc_5v: regulator-vcc-5v { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_5V"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ vin-supply = <&dc_in>; ++ gpio = <&gpio GPIOH_8 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; ++ enable-active-high; ++ gpio-open-drain; ++ }; ++ ++ vddao_3v3: regulator-vddao_3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDAO_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ vin-supply = <&dc_in>; ++ }; ++ ++ vddcpu_b: regulator-vddcpu-b { ++ compatible = "pwm-regulator"; ++ regulator-name = "VDDCPU_B"; ++ regulator-min-microvolt = <730000>; ++ regulator-max-microvolt = <1011000>; ++ regulator-boot-on; ++ regulator-always-on; ++ pwm-supply = <&dc_in>; ++ pwms = <&pwm_AO_cd 1 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ }; ++ ++ vddio_ao18: regulator-vddio_ao18 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDIO_AO18"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ vin-supply = <&vddao_3v3>; ++ }; ++ ++ vddio_c: regulator-vddio_c { ++ compatible = "regulator-gpio"; ++ regulator-name = "VDDIO_C"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-settling-time-up-us = <200>; ++ regulator-settling-time-down-us = <50000>; ++ vin-supply = <&vddao_3v3>; ++ gpios = <&gpio GPIOX_4 GPIO_ACTIVE_HIGH>; ++ states = <3300000 0>, ++ <1800000 1>; ++ }; ++ ++ sound { ++ compatible = "amlogic,axg-sound-card"; ++ audio-widgets = "Line", "Lineout"; ++ audio-aux-devs = <&tdmout_a>, <&tdmout_b>, <&tdmout_c>, ++ <&tdmin_a>, <&tdmin_b>, <&tdmin_c>, ++ <&dioo2133>; ++ ++ assigned-clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ assigned-clock-parents = <0>, <0>, <0>; ++ assigned-clock-rates = <294912000>, ++ <270950400>, ++ <393216000>; ++ ++ dai-link-0 { ++ sound-dai = <&frddr_a>; ++ }; ++ ++ dai-link-1 { ++ sound-dai = <&frddr_b>; ++ }; ++ ++ dai-link-2 { ++ sound-dai = <&frddr_c>; ++ }; ++ ++ dai-link-3 { ++ sound-dai = <&toddr_a>; ++ }; ++ ++ dai-link-4 { ++ sound-dai = <&toddr_b>; ++ }; ++ ++ dai-link-5 { ++ sound-dai = <&toddr_c>; ++ }; ++ ++ /* ++ * Audio setup: The 40 pins header provides access to 2 TDMs, ++ * SPDIF In/Out and PDM inputs. ++ * - TDM A: 2 lanes ++ * D0: 40/X9 ++ * D1: 38/X8 ++ * BCLK: 12/X11 ++ * FS: 35/X10 ++ * - TDM B: 4 lanes ++ * D0: 37/A3 ++ * D1: 16/A4 ++ * D2: 18/A5 or 7/AO6 ++ * D3: 22/A6 or 21/H5 ++ * BCLK: 29/A1 or 8/AO8 ++ * FS: 31/A2 or 11/AO7 ++ * - 2 Master Clocks: ++ * MCLK0: 15/A0 or 10/AO9 ++ * MCLK1: 33/X15 ++ * - SPDIF: ++ * OUT: 32/A11 ++ * IN: 21/H5 ++ * - PDM Input: ++ * DO: 13/A8 ++ * D1: 26/A9 ++ * D2: 22/A6 ++ * D3: 18/A5 ++ * DCLK: 36/A7 ++ * ++ * TDM C is not usable on the 40 pins connector so it is ++ * setup for the HDMI 4 lanes i2s. ++ * ++ * No pinctrl is enabled by default to preserve the ++ * genericity of the 40 pins header. Many configurations are ++ * possible based on the desired use case. Please adjust TDM ++ * masks, clock setups and pinctrl accordingly. ++ */ ++ ++ dai-link-6 { ++ sound-dai = <&tdmif_a>; ++ dai-format = "dsp_a"; ++ dai-tdm-slot-tx-mask-0 = <1 1>; ++ mclk-fs = <256>; ++ ++ codec-0 { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>; ++ }; ++ ++ codec-1 { ++ sound-dai = <&toacodec TOACODEC_IN_A>; ++ }; ++ }; ++ ++ dai-link-7 { ++ sound-dai = <&tdmif_b>; ++ dai-format = "i2s"; ++ dai-tdm-slot-tx-mask-0 = <1 1>; ++ dai-tdm-slot-rx-mask-1 = <1 1>; ++ mclk-fs = <256>; ++ ++ codec-0 { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; ++ }; ++ ++ codec-1 { ++ sound-dai = <&toacodec TOACODEC_IN_B>; ++ }; ++ }; ++ ++ dai-link-8 { ++ sound-dai = <&tdmif_c>; ++ dai-format = "i2s"; ++ dai-tdm-slot-tx-mask-0 = <1 1>; ++ dai-tdm-slot-tx-mask-1 = <1 1>; ++ dai-tdm-slot-tx-mask-2 = <1 1>; ++ dai-tdm-slot-tx-mask-3 = <1 1>; ++ mclk-fs = <256>; ++ ++ codec-0 { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_C>; ++ }; ++ ++ codec-1 { ++ sound-dai = <&toacodec TOACODEC_IN_C>; ++ }; ++ }; ++ ++ dai-link-9 { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; ++ ++ codec { ++ sound-dai = <&hdmi_tx>; ++ }; ++ }; ++ ++ dai-link-10 { ++ sound-dai = <&toacodec TOACODEC_OUT>; ++ ++ codec { ++ sound-dai = <&acodec>; ++ }; ++ }; ++ }; ++}; ++ ++&acodec { ++ status = "okay"; ++ AVDD-supply = <&vddio_ao18>; ++}; ++ ++&arb { ++ status = "okay"; ++}; ++ ++&cecb_AO { ++ status = "okay"; ++ pinctrl-0 = <&cec_ao_b_h_pins>; ++ pinctrl-names = "default"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&clkc_audio { ++ status = "okay"; ++}; ++ ++&cvbs_vdac_port { ++ cvbs_vdac_out: endpoint { ++ remote-endpoint = <&cvbs_connector_in>; ++ }; ++}; ++ ++&dwc3 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ hub: hub@1 { ++ compatible = "usb5e3,626"; ++ reg = <1>; ++ reset-gpios = <&gpio GPIOC_7 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; ++ vdd-supply = <&vcc_5v>; ++ }; ++}; ++ ++ðmac { ++ pinctrl-0 = <ð_pins>, <ð_rgmii_pins>, <ð_phy_irq_pins>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ phy-mode = "rgmii"; ++ phy-handle = <&external_phy>; ++ amlogic,tx-delay-ns = <2>; ++}; ++ ++&ext_mdio { ++ external_phy: ethernet-phy@0 { ++ /* Realtek RTL8211F (0x001cc916) */ ++ reg = <0>; ++ max-speed = <1000>; ++ ++ reset-assert-us = <100000>; ++ reset-deassert-us = <100000>; ++ reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; ++ ++ interrupt-parent = <&gpio_intc>; ++ /* MAC_INTR on GPIOZ_14 */ ++ interrupts = <26 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++&frddr_a { ++ status = "okay"; ++}; ++ ++&frddr_b { ++ status = "okay"; ++}; ++ ++&frddr_c { ++ status = "okay"; ++}; ++ ++&hdmi_tx { ++ status = "okay"; ++ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; ++ pinctrl-names = "default"; ++ hdmi-supply = <&vcc_5v>; ++}; ++ ++&hdmi_tx_tmds_port { ++ hdmi_tx_tmds_out: endpoint { ++ remote-endpoint = <&hdmi_connector_in>; ++ }; ++}; ++ ++&ir { ++ status = "okay"; ++ pinctrl-0 = <&remote_input_ao_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&periphs_pinctrl { ++ spi_cs_disable_pins: spi-cs-disable { ++ mux { ++ groups = "BOOT_14"; ++ function = "gpio_periphs"; ++ bias-disable; ++ output-high; ++ }; ++ }; ++ ++ eth_phy_irq_pins: eth-phy-irq { ++ mux { ++ groups = "GPIOZ_14"; ++ function = "gpio_periphs"; ++ bias-pull-up; ++ output-disable; ++ }; ++ }; ++}; ++ ++&pwm_AO_cd { ++ status = "okay"; ++ pinctrl-0 = <&pwm_ao_d_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin1"; ++}; ++ ++&pwm_ab { ++ status = "okay"; ++ pinctrl-0 = <&pwm_b_x7_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin1"; ++}; ++ ++&pwm_cd { ++ status = "okay"; ++ pinctrl-0 = <&pwm_d_x3_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin1"; ++}; ++ ++&saradc { ++ status = "okay"; ++ vref-supply = <&vddio_ao18>; ++}; ++ ++/* SD card */ ++&sd_emmc_b { ++ status = "okay"; ++ pinctrl-0 = <&sdcard_c_pins>; ++ pinctrl-1 = <&sdcard_clk_gate_c_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <4>; ++ cap-sd-highspeed; ++ sd-uhs-sdr12; ++ sd-uhs-sdr25; ++ sd-uhs-sdr50; ++ sd-uhs-sdr104; ++ max-frequency = <200000000>; ++ disable-wp; ++ ++ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; ++ vmmc-supply = <&vcc_card>; ++ vqmmc-supply = <&vddio_c>; ++}; ++ ++/* ++ * EMMC_D4, EMMC_D5, EMMC_D6 and EMMC_D7 pins are shared between SPI NOR CS ++ * and eMMC Data 4 to 7 pins. ++ * Replace emmc_data_8b_pins to emmc_data_4b_pins from sd_emmc_c pinctrl-0, ++ * and change bus-width to 4 then spifc can be enabled. ++ */ ++&sd_emmc_c { ++ status = "okay"; ++ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>, ++ <&spi_cs_disable_pins>; ++ pinctrl-1 = <&emmc_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ mmc-hs200-1_8v; ++ max-frequency = <200000000>; ++ disable-wp; ++ ++ mmc-pwrseq = <&emmc_pwrseq>; ++ vmmc-supply = <&vcc_3v3>; ++ vqmmc-supply = <&flash_1v8>; ++}; ++ ++&spifc { ++ status = "disabled"; ++ pinctrl-0 = <&nor_pins>; ++ pinctrl-names = "default"; ++ cs-gpios = <&gpio BOOT_14 GPIO_ACTIVE_LOW>; ++ ++ w25lq128d: flash@0 { ++ compatible = "jedec,spi-nor"; ++ reg = <0>; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ spi-max-frequency = <80000000>; ++ }; ++}; ++ ++&tdmif_a { ++ status = "okay"; ++}; ++ ++&tdmif_b { ++ status = "okay"; ++}; ++ ++&tdmif_c { ++ status = "okay"; ++}; ++ ++&tdmin_a { ++ status = "okay"; ++}; ++ ++&tdmin_b { ++ status = "okay"; ++}; ++ ++&tdmin_c { ++ status = "okay"; ++}; ++ ++&tdmout_a { ++ status = "okay"; ++}; ++ ++&tdmout_b { ++ status = "okay"; ++}; ++ ++&tdmout_c { ++ status = "okay"; ++}; ++ ++&toacodec { ++ status = "okay"; ++}; ++ ++&toddr_a { ++ status = "okay"; ++}; ++ ++&toddr_b { ++ status = "okay"; ++}; ++ ++&toddr_c { ++ status = "okay"; ++}; ++ ++&tohdmitx { ++ status = "okay"; ++}; ++ ++&uart_AO { ++ status = "okay"; ++ pinctrl-0 = <&uart_ao_a_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&usb2_phy1 { ++ phy-supply = <&dc_in>; ++}; ++ ++&usb3_pcie_phy { ++ phy-supply = <&vcc_5v>; ++}; ++ ++&usb { ++ status = "okay"; ++}; +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-s905d3-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-s905d3-libretech-cc.dts +new file mode 100644 +index 000000000000..537370db360f +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-s905d3-libretech-cc.dts +@@ -0,0 +1,89 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 BayLibre, SAS. ++ * Author: Jerome Brunet ++ */ ++ ++/dts-v1/; ++ ++#include ++#include "meson-sm1.dtsi" ++#include "meson-libretech-cottonwood.dtsi" ++ ++/ { ++ compatible = "libretech,aml-s905d3-cc", "amlogic,sm1"; ++ model = "Libre Computer AML-S905D3-CC Solitude"; ++ ++ sound { ++ model = "LC-SOLITUDE"; ++ audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0", ++ "TDMOUT_A IN 1", "FRDDR_B OUT 0", ++ "TDMOUT_A IN 2", "FRDDR_C OUT 0", ++ "TDM_A Playback", "TDMOUT_A OUT", ++ "TDMOUT_B IN 0", "FRDDR_A OUT 1", ++ "TDMOUT_B IN 1", "FRDDR_B OUT 1", ++ "TDMOUT_B IN 2", "FRDDR_C OUT 1", ++ "TDM_B Playback", "TDMOUT_B OUT", ++ "TDMOUT_C IN 0", "FRDDR_A OUT 2", ++ "TDMOUT_C IN 1", "FRDDR_B OUT 2", ++ "TDMOUT_C IN 2", "FRDDR_C OUT 2", ++ "TDM_C Playback", "TDMOUT_C OUT", ++ "TDMIN_A IN 0", "TDM_A Capture", ++ "TDMIN_B IN 0", "TDM_A Capture", ++ "TDMIN_C IN 0", "TDM_A Capture", ++ "TDMIN_A IN 13", "TDM_A Loopback", ++ "TDMIN_B IN 13", "TDM_A Loopback", ++ "TDMIN_C IN 13", "TDM_A Loopback", ++ "TDMIN_A IN 1", "TDM_B Capture", ++ "TDMIN_B IN 1", "TDM_B Capture", ++ "TDMIN_C IN 1", "TDM_B Capture", ++ "TDMIN_A IN 14", "TDM_B Loopback", ++ "TDMIN_B IN 14", "TDM_B Loopback", ++ "TDMIN_C IN 14", "TDM_B Loopback", ++ "TDMIN_A IN 2", "TDM_C Capture", ++ "TDMIN_B IN 2", "TDM_C Capture", ++ "TDMIN_C IN 2", "TDM_C Capture", ++ "TDMIN_A IN 15", "TDM_C Loopback", ++ "TDMIN_B IN 15", "TDM_C Loopback", ++ "TDMIN_C IN 15", "TDM_C Loopback", ++ "TODDR_A IN 0", "TDMIN_A OUT", ++ "TODDR_B IN 0", "TDMIN_A OUT", ++ "TODDR_C IN 0", "TDMIN_A OUT", ++ "TODDR_A IN 1", "TDMIN_B OUT", ++ "TODDR_B IN 1", "TDMIN_B OUT", ++ "TODDR_C IN 1", "TDMIN_B OUT", ++ "TODDR_A IN 2", "TDMIN_C OUT", ++ "TODDR_B IN 2", "TDMIN_C OUT", ++ "TODDR_C IN 2", "TDMIN_C OUT", ++ "Lineout", "ACODEC LOLP", ++ "Lineout", "ACODEC LORP"; ++ }; ++}; ++ ++&cpu0 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu1 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table>; ++ clocks = <&clkc CLKID_CPU1_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu2 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table>; ++ clocks = <&clkc CLKID_CPU2_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu3 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table>; ++ clocks = <&clkc CLKID_CPU3_CLK>; ++ clock-latency = <50000>; ++}; +-- +2.41.0 + diff --git a/device/testing/linux-postmarketos-amlogic/APKBUILD b/device/testing/linux-postmarketos-amlogic/APKBUILD index abbe2741a..474fd02bd 100644 --- a/device/testing/linux-postmarketos-amlogic/APKBUILD +++ b/device/testing/linux-postmarketos-amlogic/APKBUILD @@ -4,7 +4,7 @@ # Co-Maintainer: exkc pkgname=linux-postmarketos-amlogic pkgver=6.5.5 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline kernel for Amlogic devices" arch="aarch64" _carch="arm64" @@ -34,9 +34,11 @@ _config="config-$_flavor.$arch" source=" $pkgname-$pkgver.tar.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$pkgver.tar.xz $_config - 0001-add-xiaomi-once-support.patch + 0001-ARM64-dts-meson-gxl-add-support-for-the-Xiaomi-Mi-Bo.patch 0002-add-x96-mini-support.patch -" + 0003-dt-bindings-arm-amlogic-add-libretech-cottonwood-sup.patch + 0004-arm64-dts-amlogic-add-libretech-cottonwood-support.patch + " builddir="$srcdir/linux-$pkgver" prepare() { @@ -66,6 +68,8 @@ package() { sha512sums=" c95ad978847915e044146f254c9cec7d3d32e4afc28a5cbbeec2f0591aef28f584f0a273f7bb5bd8706cd7cc849dfd0cdb764fbc2c84e8b3c1b0f30fb6bfd306 linux-postmarketos-amlogic-6.5.5.tar.xz d2a663bbd6842b612b4bcba8a00035e5f1ab20d62fd1f94c0cd57095c2c2e3095b69faddff5f16b4d7f73228cfbcb59000dcbe00276888c2279dbc2a0f513a24 config-postmarketos-amlogic.aarch64 -9d664c9cc6168a7aa4804662886941744e92c0748e7b7b4fad2472740a4931c89a60cbc4a519913b58933718d02f33f48ff72ea182d912bcd50014ca8d7ff110 0001-add-xiaomi-once-support.patch -3ea569b69297fdb196006b1e1bd82a9dec8d89362ec3ef17918018b6c573143f299a968b8227119660442f6a6e0b795aa4c8a272f6bc23e9622f3fd41ddc97eb 0002-add-x96-mini-support.patch +2c40c1c32eec37c33034f7c11a0423ce6a752cfb98bab38198a64c20f24545436c3a53f0d50c60236518585d42489314123636395242b3d013d51d65f1977a51 0001-ARM64-dts-meson-gxl-add-support-for-the-Xiaomi-Mi-Bo.patch +4538994c7d3bbb0c4740e8ce108b6838618be239a549e407ca239f3ceca8eed29b5a9ca75d162567dbc06b13ac7caacc61ebf55b247ce6fe122fecc7e5b275d5 0002-add-x96-mini-support.patch +141f0cd494dc915ad4bc6bec02b830f351d497b3e4f8bbbcd83240d72aaabcf0ad5fad81f91bea538e301aa483cd482b06405f64f522d5c8cc8c915f0e7f0b63 0003-dt-bindings-arm-amlogic-add-libretech-cottonwood-sup.patch +a0ff579a9bd82baa5c0d1592fb3d0a0c2998fd79374b07a25f9401095a230cc22f24ecd701e154baf95310a5dd55d1fc882c97b340098171ea07f8fe0b982b98 0004-arm64-dts-amlogic-add-libretech-cottonwood-support.patch "