From 78233621aca725ef851c6c2fdace1c169680f94d Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 16 Sep 2024 10:08:30 +0200 Subject: [PATCH 01/12] ARM: dts: amlogic: meson6: fix clk81 node name Use the proper node name, fixing: arch/arm/boot/dts/amlogic/meson6-atv1200.dtb: /: clk@0: 'anyOf' conditional failed, one must be fixed: 'reg' is a required property 'ranges' is a required property from schema $id: http://devicetree.org/schemas/root-node.yaml# Reviewed-by: Martin Blumenstingl Link: https://lore.kernel.org/r/20240916-topic-amlogic-arm32-upstream-bindings-fixes-v2-1-0b20ed4f0571@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/meson6.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/amlogic/meson6.dtsi b/arch/arm/boot/dts/amlogic/meson6.dtsi index 4716030a48d0..1c4ea7266f66 100644 --- a/arch/arm/boot/dts/amlogic/meson6.dtsi +++ b/arch/arm/boot/dts/amlogic/meson6.dtsi @@ -36,7 +36,7 @@ apb2: bus@d0000000 { ranges = <0x0 0xd0000000 0x40000>; }; - clk81: clk@0 { + clk81: clk81 { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <200000000>; From 285d2d647f4dedb15f015d9fa5430defb9a35897 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 16 Sep 2024 10:08:31 +0200 Subject: [PATCH 02/12] ARM: dts: amlogic: meson8: fix soc thermal-zone node name Use proper name for the soc thermal, fixing: thermal-zones: 'soc' does not match any of the regexes: '^[a-zA-Z][a-zA-Z0-9\\-]{1,10}-thermal$', 'pinctrl-[0-9]+' from schema $id: http://devicetree.org/schemas/thermal/thermal-zones.yaml# Reviewed-by: Martin Blumenstingl Link: https://lore.kernel.org/r/20240916-topic-amlogic-arm32-upstream-bindings-fixes-v2-2-0b20ed4f0571@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/meson8.dtsi | 2 +- arch/arm/boot/dts/amlogic/meson8b.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi index f57be9ae150f..06174d8df789 100644 --- a/arch/arm/boot/dts/amlogic/meson8.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8.dtsi @@ -196,7 +196,7 @@ power-firmware@4f00000 { }; thermal-zones { - soc { + soc-thermal { polling-delay-passive = <250>; /* milliseconds */ polling-delay = <1000>; /* milliseconds */ thermal-sensors = <&thermal_sensor>; diff --git a/arch/arm/boot/dts/amlogic/meson8b.dtsi b/arch/arm/boot/dts/amlogic/meson8b.dtsi index 2d9d24d3a95d..a3669025d8da 100644 --- a/arch/arm/boot/dts/amlogic/meson8b.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi @@ -173,7 +173,7 @@ hwrom@0 { }; thermal-zones { - soc { + soc-thermal { polling-delay-passive = <250>; /* milliseconds */ polling-delay = <1000>; /* milliseconds */ thermal-sensors = <&thermal_sensor>; From e1d42e116770445e11a4062e28f23da70ea63d83 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 16 Sep 2024 10:08:32 +0200 Subject: [PATCH 03/12] ARM: dts: amlogic: meson8: fix ao_arc_sram node name Use the proper node name for the sram, fixing: sram@d9000000: 'ao-arc-sram@0' does not match any of the regexes: '^([a-z0-9]*-)?sram(-section)?@[a-f0-9]+$', 'pinctrl-[0-9]+' from schema $id: http://devicetree.org/schemas/sram/sram.yaml# Reviewed-by: Martin Blumenstingl Link: https://lore.kernel.org/r/20240916-topic-amlogic-arm32-upstream-bindings-fixes-v2-3-0b20ed4f0571@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/meson8.dtsi | 2 +- arch/arm/boot/dts/amlogic/meson8b.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi index 06174d8df789..1023ff0a4f9f 100644 --- a/arch/arm/boot/dts/amlogic/meson8.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8.dtsi @@ -589,7 +589,7 @@ mux { }; &ahb_sram { - ao_arc_sram: ao-arc-sram@0 { + ao_arc_sram: aoarc-sram@0 { compatible = "amlogic,meson8-ao-arc-sram"; reg = <0x0 0x8000>; pool; diff --git a/arch/arm/boot/dts/amlogic/meson8b.dtsi b/arch/arm/boot/dts/amlogic/meson8b.dtsi index a3669025d8da..641cd60781a3 100644 --- a/arch/arm/boot/dts/amlogic/meson8b.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi @@ -535,7 +535,7 @@ mux { }; &ahb_sram { - ao_arc_sram: ao-arc-sram@0 { + ao_arc_sram: aoarc-sram@0 { compatible = "amlogic,meson8b-ao-arc-sram"; reg = <0x0 0x8000>; pool; From e2a3f11ae11c9f9ee780bf49f00a69f12dce3529 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 16 Sep 2024 10:08:33 +0200 Subject: [PATCH 04/12] ARM: dts: amlogic: meson6: remove support for ATV1200 board The meson6 atv1200 has a lot of dtbs check errors, but since no active contributor have any boards with Meson6 SoC, plus no upstream GPIO, pinctrl, clock, MMC... for that SoC either, let's start decommissioning Meson6 support by removing the Device Tree files first then remove the MACH_MESON6 in a second time. If someone is interested in Meson6 support they should bring it back along with a few more patches for upstream support of further peripherals. Suggested-by: Martin Blumenstingl Reviewed-by: Martin Blumenstingl Link: https://lore.kernel.org/r/20240916-topic-amlogic-arm32-upstream-bindings-fixes-v2-4-0b20ed4f0571@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/Makefile | 2 - arch/arm/boot/dts/amlogic/meson6-atv1200.dts | 33 --------- arch/arm/boot/dts/amlogic/meson6.dtsi | 73 -------------------- 3 files changed, 108 deletions(-) delete mode 100644 arch/arm/boot/dts/amlogic/meson6-atv1200.dts delete mode 100644 arch/arm/boot/dts/amlogic/meson6.dtsi diff --git a/arch/arm/boot/dts/amlogic/Makefile b/arch/arm/boot/dts/amlogic/Makefile index a84310780ea3..504c533b1173 100644 --- a/arch/arm/boot/dts/amlogic/Makefile +++ b/arch/arm/boot/dts/amlogic/Makefile @@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_MACH_MESON6) += \ - meson6-atv1200.dtb dtb-$(CONFIG_MACH_MESON8) += \ meson8-minix-neo-x8.dtb \ meson8b-ec100.dtb \ diff --git a/arch/arm/boot/dts/amlogic/meson6-atv1200.dts b/arch/arm/boot/dts/amlogic/meson6-atv1200.dts deleted file mode 100644 index 98e1c94c0261..000000000000 --- a/arch/arm/boot/dts/amlogic/meson6-atv1200.dts +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 OR MIT -/* - * Copyright 2014 Carlo Caione - */ - -/dts-v1/; -#include "meson6.dtsi" - -/ { - model = "Geniatech ATV1200"; - compatible = "geniatech,atv1200", "amlogic,meson6"; - - aliases { - serial0 = &uart_AO; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - memory { - device_type = "memory"; - reg = <0x40000000 0x80000000>; - }; -}; - -&uart_AO { - status = "okay"; -}; - -ðmac { - status = "okay"; -}; diff --git a/arch/arm/boot/dts/amlogic/meson6.dtsi b/arch/arm/boot/dts/amlogic/meson6.dtsi deleted file mode 100644 index 1c4ea7266f66..000000000000 --- a/arch/arm/boot/dts/amlogic/meson6.dtsi +++ /dev/null @@ -1,73 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 OR MIT -/* - * Copyright 2014 Carlo Caione - */ - -#include "meson.dtsi" - -/ { - model = "Amlogic Meson6 SoC"; - compatible = "amlogic,meson6"; - - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu@200 { - device_type = "cpu"; - compatible = "arm,cortex-a9"; - next-level-cache = <&L2>; - reg = <0x200>; - }; - - cpu@201 { - device_type = "cpu"; - compatible = "arm,cortex-a9"; - next-level-cache = <&L2>; - reg = <0x201>; - }; - }; - - apb2: bus@d0000000 { - compatible = "simple-bus"; - reg = <0xd0000000 0x40000>; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0x0 0xd0000000 0x40000>; - }; - - clk81: clk81 { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <200000000>; - }; -}; /* end of / */ - -&efuse { - status = "disabled"; -}; - -&timer_abcde { - clocks = <&xtal>, <&clk81>; - clock-names = "xtal", "pclk"; -}; - -&uart_AO { - clocks = <&xtal>, <&clk81>, <&clk81>; - clock-names = "xtal", "pclk", "baud"; -}; - -&uart_A { - clocks = <&xtal>, <&clk81>, <&clk81>; - clock-names = "xtal", "pclk", "baud"; -}; - -&uart_B { - clocks = <&xtal>, <&clk81>, <&clk81>; - clock-names = "xtal", "pclk", "baud"; -}; - -&uart_C { - clocks = <&xtal>, <&clk81>, <&clk81>; - clock-names = "xtal", "pclk", "baud"; -}; From 6c180982d08b79271271e138399b68d2456c65f2 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 16 Sep 2024 10:08:34 +0200 Subject: [PATCH 05/12] ARM: dts: amlogic: meson8b-odroidc1: fix invalid reset-gpio Use the proper "-gpios" property name, fixing: hub@1: 'reset-gpio' does not match any of the regexes: 'pinctrl-[0-9]+' from schema $id: http://devicetree.org/schemas/usb/genesys,gl850g.yaml# Reviewed-by: Martin Blumenstingl Link: https://lore.kernel.org/r/20240916-topic-amlogic-arm32-upstream-bindings-fixes-v2-5-0b20ed4f0571@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts index 941682844faf..962bbe3337db 100644 --- a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts +++ b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts @@ -378,6 +378,6 @@ hub@1 { compatible = "usb5e3,610"; reg = <1>; vdd-supply = <&p5v0>; - reset-gpio = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>; }; }; From 7947fd2d350e6057e7514459c7ee2db39d1096a2 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 16 Sep 2024 10:08:35 +0200 Subject: [PATCH 06/12] ARM: dts: amlogic: fix /memory node name Use proper address in /memory node name, fixing: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[1073741824, 2147483648]]} Reviewed-by: Martin Blumenstingl Tested-by: Martin Blumenstingl # Odroid-C1 Link: https://lore.kernel.org/r/20240916-topic-amlogic-arm32-upstream-bindings-fixes-v2-6-0b20ed4f0571@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts | 2 +- arch/arm/boot/dts/amlogic/meson8b-ec100.dts | 2 +- arch/arm/boot/dts/amlogic/meson8b-mxq.dts | 2 +- arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts | 2 +- arch/arm/boot/dts/amlogic/meson8m2-mxiii-plus.dts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts b/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts index c6d1c5a8a3bf..b97531000d55 100644 --- a/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts +++ b/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts @@ -19,7 +19,7 @@ chosen { stdout-path = "serial0:115200n8"; }; - memory { + memory@40000000 { device_type = "memory"; reg = <0x40000000 0x80000000>; }; diff --git a/arch/arm/boot/dts/amlogic/meson8b-ec100.dts b/arch/arm/boot/dts/amlogic/meson8b-ec100.dts index 49890eb12781..36fc3e15ee9f 100644 --- a/arch/arm/boot/dts/amlogic/meson8b-ec100.dts +++ b/arch/arm/boot/dts/amlogic/meson8b-ec100.dts @@ -22,7 +22,7 @@ chosen { stdout-path = "serial0:115200n8"; }; - memory { + memory@40000000 { device_type = "memory"; reg = <0x40000000 0x40000000>; }; diff --git a/arch/arm/boot/dts/amlogic/meson8b-mxq.dts b/arch/arm/boot/dts/amlogic/meson8b-mxq.dts index 7adedd3258c3..fb28cb330f17 100644 --- a/arch/arm/boot/dts/amlogic/meson8b-mxq.dts +++ b/arch/arm/boot/dts/amlogic/meson8b-mxq.dts @@ -22,7 +22,7 @@ chosen { stdout-path = "serial0:115200n8"; }; - memory { + memory@40000000 { device_type = "memory"; reg = <0x40000000 0x40000000>; }; diff --git a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts index 962bbe3337db..2aa012f38a3b 100644 --- a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts +++ b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts @@ -22,7 +22,7 @@ chosen { stdout-path = "serial0:115200n8"; }; - memory { + memory@40000000 { device_type = "memory"; reg = <0x40000000 0x40000000>; }; diff --git a/arch/arm/boot/dts/amlogic/meson8m2-mxiii-plus.dts b/arch/arm/boot/dts/amlogic/meson8m2-mxiii-plus.dts index aa4d4bf70629..08aa661e17ad 100644 --- a/arch/arm/boot/dts/amlogic/meson8m2-mxiii-plus.dts +++ b/arch/arm/boot/dts/amlogic/meson8m2-mxiii-plus.dts @@ -26,7 +26,7 @@ chosen { stdout-path = "serial0:115200n8"; }; - memory { + memory@40000000 { device_type = "memory"; reg = <0x40000000 0x80000000>; }; From c3806b25c0f3b95a7f6e6edc23f93ff293173bfa Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 16 Sep 2024 10:08:36 +0200 Subject: [PATCH 07/12] ARM: dts: amlogic: meson8: use correct pinctrl bank node name Use the proper name for the pinctrl bank subnode, fixing: pinctrl@9880: Unevaluated properties are not allowed ('banks@80b0', 'banks@80b0', 'banks@80b0', 'banks@80b0', 'banks@80b0', 'banks@80b0', 'banks@80b0', 'banks@80b0', 'banks@80b0', 'banks@80b0', 'banks@80b0', 'banks@80b0', 'banks@80b0', 'banks@80b0', 'banks@80b0', 'reg', 'reg' were unexpected) from schema $id: http://devicetree.org/schemas/pinctrl/amlogic,meson8-pinctrl-cbus.yaml# pinctrl@84: Unevaluated properties are not allowed ('ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'ao-bank@14', 'reg', 'reg' were unexpected) Reviewed-by: Martin Blumenstingl Link: https://lore.kernel.org/r/20240916-topic-amlogic-arm32-upstream-bindings-fixes-v2-7-0b20ed4f0571@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/meson8.dtsi | 4 ++-- arch/arm/boot/dts/amlogic/meson8b.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi index 1023ff0a4f9f..6c7596c8b96b 100644 --- a/arch/arm/boot/dts/amlogic/meson8.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8.dtsi @@ -353,7 +353,7 @@ pinctrl_aobus: pinctrl@84 { #size-cells = <1>; ranges; - gpio_ao: ao-bank@14 { + gpio_ao: bank@14 { reg = <0x14 0x4>, <0x2c 0x4>, <0x24 0x8>; @@ -468,7 +468,7 @@ pinctrl_cbus: pinctrl@9880 { #size-cells = <1>; ranges; - gpio: banks@80b0 { + gpio: bank@80b0 { reg = <0x80b0 0x28>, <0x80e8 0x18>, <0x8120 0x18>, diff --git a/arch/arm/boot/dts/amlogic/meson8b.dtsi b/arch/arm/boot/dts/amlogic/meson8b.dtsi index 641cd60781a3..c8fbeede7e38 100644 --- a/arch/arm/boot/dts/amlogic/meson8b.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi @@ -315,7 +315,7 @@ pinctrl_aobus: pinctrl@84 { #size-cells = <1>; ranges; - gpio_ao: ao-bank@14 { + gpio_ao: bank@14 { reg = <0x14 0x4>, <0x2c 0x4>, <0x24 0x8>; @@ -422,7 +422,7 @@ pinctrl_cbus: pinctrl@9880 { #size-cells = <1>; ranges; - gpio: banks@80b0 { + gpio: bank@80b0 { reg = <0x80b0 0x28>, <0x80e8 0x18>, <0x8120 0x18>, From e4940a57791d6accf95e822c10807af18e8e3c7d Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 16 Sep 2024 10:08:37 +0200 Subject: [PATCH 08/12] ARM: dts: amlogic: add missing phy-mode in ethmac node The phy-node property is required, add it and fix: ethernet@c9410000: 'phy-mode' is a required property from schema $id: http://devicetree.org/schemas/net/snps,dwmac.yaml# Reviewed-by: Martin Blumenstingl Link: https://lore.kernel.org/r/20240916-topic-amlogic-arm32-upstream-bindings-fixes-v2-8-0b20ed4f0571@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts b/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts index b97531000d55..f42f97f2c7e7 100644 --- a/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts +++ b/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts @@ -94,4 +94,5 @@ ðmac { status = "okay"; pinctrl-0 = <ð_pins>; pnictrl-names = "default"; + phy-mode = "rmii"; }; From bf1f647c3af4b83683ba31b1ed359aa2cf5f6aed Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 16 Sep 2024 10:08:38 +0200 Subject: [PATCH 09/12] ARM: dts: amlogic: meson8-minix-neo-x8: fix invalid pnictrl-names The property pnictrl-names is wrong, rename it to pinctrl-names and fix: ethernet@c9410000: Unevaluated properties are not allowed ('clock-names', 'clocks', 'interrupt-names', 'interrupts', 'pnictrl-names', 'power-domains' were unexpected) from schema $id: http://devicetree.org/schemas/net/amlogic,meson-dwmac.yaml# Reviewed-by: Martin Blumenstingl Link: https://lore.kernel.org/r/20240916-topic-amlogic-arm32-upstream-bindings-fixes-v2-9-0b20ed4f0571@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts b/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts index f42f97f2c7e7..62987eadc747 100644 --- a/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts +++ b/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts @@ -93,6 +93,6 @@ &ir_receiver { ðmac { status = "okay"; pinctrl-0 = <ð_pins>; - pnictrl-names = "default"; + pinctrl-names = "default"; phy-mode = "rmii"; }; From ecb81fe2ffde2b925e46e4d02816a8292a7a3229 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 16 Sep 2024 10:08:39 +0200 Subject: [PATCH 10/12] ARM: dts: amlogic: meson8b-ec100: add missing clocks property in sound card Since [1], sound card must have the corresponding clocks property, add it to the EC100 DT, and fix: meson8b-ec100.dtb: sound: 'anyOf' conditional failed, one must be fixed: 'clocks' is a required property '#clock-cells' is a required property from schema $id: http://devicetree.org/schemas/clock/clock.yaml# [1] ASoC: dt-bindings: amlogic,gx-sound-card: document clocks property commit: f189c972f86b00318cf2547b62e461cb98374e34 Reviewed-by: Martin Blumenstingl Link: https://lore.kernel.org/r/20240916-topic-amlogic-arm32-upstream-bindings-fixes-v2-10-0b20ed4f0571@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/meson8b-ec100.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/amlogic/meson8b-ec100.dts b/arch/arm/boot/dts/amlogic/meson8b-ec100.dts index 36fc3e15ee9f..bf1ef07de6c1 100644 --- a/arch/arm/boot/dts/amlogic/meson8b-ec100.dts +++ b/arch/arm/boot/dts/amlogic/meson8b-ec100.dts @@ -98,6 +98,10 @@ sound { compatible = "amlogic,gx-sound-card"; model = "M8B-EC100"; + clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clocks = <&clkc CLKID_MPLL0>, <&clkc CLKID_MPLL1>, <&clkc CLKID_MPLL2>; From 9d8706ba5abe9cd2b7e326dc51bc2bbc7c0ab9fa Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 16 Sep 2024 10:08:40 +0200 Subject: [PATCH 11/12] ARM: dts: amlogic: meson8b-ec100: add missing gpio-line-names entry The EC100 gpio-line-names table is not the right size, add the missing cell and fix: meson8b-ec100.dtb: pinctrl@9880: bank@80b0:gpio-line-names: [...] is too short Reviewed-by: Martin Blumenstingl Link: https://lore.kernel.org/r/20240916-topic-amlogic-arm32-upstream-bindings-fixes-v2-11-0b20ed4f0571@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/meson8b-ec100.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/amlogic/meson8b-ec100.dts b/arch/arm/boot/dts/amlogic/meson8b-ec100.dts index bf1ef07de6c1..18ea6592b7d7 100644 --- a/arch/arm/boot/dts/amlogic/meson8b-ec100.dts +++ b/arch/arm/boot/dts/amlogic/meson8b-ec100.dts @@ -431,7 +431,7 @@ &gpio { "NAND_CS1 (EMMC)", "NAND_CS2 iNAND_RS1 (EMMC)", "NAND_nR/B iNAND_CMD (EMMC)", "NAND_ALE (EMMC)", "NAND_CLE (EMMC)", "nRE_S1 NAND_nRE (EMMC)", - "nWE_S1 NAND_nWE (EMMC)", "", "", "SPI_CS", + "nWE_S1 NAND_nWE (EMMC)", "", "", "", "SPI_CS", /* Bank DIF */ "RMII_RXD1", "RMII_RXD0", "RMII_CRS_DV", "RMII_50M_IN", "GPIODIF_4", "GPIODIF_5", From 2b901e9ef05d84e99582607e85393a6eba0e2363 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Tue, 15 Oct 2024 14:25:19 +0200 Subject: [PATCH 12/12] ARM: dts: amlogic: meson8/8b: remove invalid pinctrl reg The pinctrl aobus/cbus was originally here to configure the GPIO interrupt, but it was a bad design and was moved to a separate gpio_intc node because the GPIO interrupt is actually separate from the pinctrl/gpio registers. Drop this reg entry, and fix all the register offsets with a proper range property. Cc: Martin Blumenstingl Reviewed-by: Martin Blumenstingl Tested-by: Martin Blumenstingl # Odroid-C1 Link: https://lore.kernel.org/r/20241015-topic-amlogic-arm32-upstream-bindings-fixes-pinctrl-dtbs-v1-1-c7291f17063e@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/boot/dts/amlogic/meson8.dtsi | 28 ++++++++++++-------------- arch/arm/boot/dts/amlogic/meson8b.dtsi | 28 ++++++++++++-------------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi index 6c7596c8b96b..9ff142d9fe3f 100644 --- a/arch/arm/boot/dts/amlogic/meson8.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8.dtsi @@ -346,17 +346,16 @@ pmu: pmu@e0 { reg = <0xe0 0x18>; }; - pinctrl_aobus: pinctrl@84 { + pinctrl_aobus: pinctrl@14 { compatible = "amlogic,meson8-aobus-pinctrl"; - reg = <0x84 0xc>; #address-cells = <1>; #size-cells = <1>; - ranges; + ranges = <0x0 0x14 0x1c>; - gpio_ao: bank@14 { - reg = <0x14 0x4>, - <0x2c 0x4>, - <0x24 0x8>; + gpio_ao: bank@0 { + reg = <0x0 0x4>, + <0x18 0x4>, + <0x10 0x8>; reg-names = "mux", "pull", "gpio"; gpio-controller; #gpio-cells = <2>; @@ -461,18 +460,17 @@ clock-measure@8758 { reg = <0x8758 0x1c>; }; - pinctrl_cbus: pinctrl@9880 { + pinctrl_cbus: pinctrl@8030 { compatible = "amlogic,meson8-cbus-pinctrl"; - reg = <0x9880 0x10>; #address-cells = <1>; #size-cells = <1>; - ranges; + ranges = <0x0 0x8030 0x108>; - gpio: bank@80b0 { - reg = <0x80b0 0x28>, - <0x80e8 0x18>, - <0x8120 0x18>, - <0x8030 0x30>; + gpio: bank@80 { + reg = <0x80 0x28>, + <0xb8 0x18>, + <0xf0 0x18>, + <0x00 0x30>; reg-names = "mux", "pull", "pull-enable", "gpio"; gpio-controller; #gpio-cells = <2>; diff --git a/arch/arm/boot/dts/amlogic/meson8b.dtsi b/arch/arm/boot/dts/amlogic/meson8b.dtsi index c8fbeede7e38..9e02a97f86a0 100644 --- a/arch/arm/boot/dts/amlogic/meson8b.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi @@ -308,17 +308,16 @@ pmu: pmu@e0 { reg = <0xe0 0x18>; }; - pinctrl_aobus: pinctrl@84 { + pinctrl_aobus: pinctrl@14 { compatible = "amlogic,meson8b-aobus-pinctrl"; - reg = <0x84 0xc>; #address-cells = <1>; #size-cells = <1>; - ranges; + ranges = <0x0 0x14 0x1c>; - gpio_ao: bank@14 { - reg = <0x14 0x4>, - <0x2c 0x4>, - <0x24 0x8>; + gpio_ao: bank@0 { + reg = <0x0 0x4>, + <0x18 0x4>, + <0x10 0x8>; reg-names = "mux", "pull", "gpio"; gpio-controller; #gpio-cells = <2>; @@ -415,18 +414,17 @@ clock-measure@8758 { reg = <0x8758 0x1c>; }; - pinctrl_cbus: pinctrl@9880 { + pinctrl_cbus: pinctrl@8030 { compatible = "amlogic,meson8b-cbus-pinctrl"; - reg = <0x9880 0x10>; #address-cells = <1>; #size-cells = <1>; - ranges; + ranges = <0x0 0x8030 0x108>; - gpio: bank@80b0 { - reg = <0x80b0 0x28>, - <0x80e8 0x18>, - <0x8120 0x18>, - <0x8030 0x38>; + gpio: bank@80 { + reg = <0x80 0x28>, + <0xb8 0x18>, + <0xf0 0x18>, + <0x00 0x38>; reg-names = "mux", "pull", "pull-enable", "gpio"; gpio-controller; #gpio-cells = <2>;