arm64: dts: amlogic: move ao_pinctrl into aobus

The AO pinctrl was mis-described as beeing part of AO rti sysctrl, move it
it into aobus like it's also done in GX SoCs, and remove the now invalid
'#address-cells', '#size-cells' & 'ranges from the sys-ctrl@0 node.

This fixes:
sys-ctrl@0: '#address-cells', '#size-cells', 'ranges' do not match any of the regexes: 'pinctrl-[0-9]+'

Tested-by: Christian Hewitt <christianshewitt@gmail.com>
Link: https://lore.kernel.org/r/20240606-topic-amlogic-upstream-bindings-fixes-dts-v1-2-62e812729541@linaro.org
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index b058ed78faf00682791ce38ca60c1b0d6ff8db66..138fb18c648084ef64c5a6b235ca3bbfc8469bf1 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -1741,9 +1741,6 @@
                                compatible = "amlogic,meson-gx-ao-sysctrl",
                                             "simple-mfd", "syscon";
                                reg = <0x0 0x0 0x0 0x100>;
-                               #address-cells = <2>;
-                               #size-cells = <2>;
-                               ranges = <0x0 0x0 0x0 0x0 0x0 0x100>;
 
                                clkc_AO: clock-controller {
                                        compatible = "amlogic,meson-g12a-aoclkc";
@@ -1752,278 +1749,278 @@
                                        clocks = <&xtal>, <&clkc CLKID_CLK81>;
                                        clock-names = "xtal", "mpeg-clk";
                                };
+                       };
 
-                               ao_pinctrl: pinctrl {
-                                       compatible = "amlogic,meson-g12a-aobus-pinctrl";
-                                       #address-cells = <2>;
-                                       #size-cells = <2>;
-                                       ranges;
+                       ao_pinctrl: pinctrl@14 {
+                               compatible = "amlogic,meson-g12a-aobus-pinctrl";
+                               #address-cells = <2>;
+                               #size-cells = <2>;
+                               ranges;
+
+                               gpio_ao: bank@14 {
+                                       reg = <0x0 0x14 0x0 0x8>,
+                                             <0x0 0x1c 0x0 0x8>,
+                                             <0x0 0x24 0x0 0x14>;
+                                       reg-names = "mux",
+                                                   "ds",
+                                                   "gpio";
+                                       gpio-controller;
+                                       #gpio-cells = <2>;
+                                       gpio-ranges = <&ao_pinctrl 0 0 15>;
+                               };
 
-                                       gpio_ao: bank@14 {
-                                               reg = <0x0 0x14 0x0 0x8>,
-                                                     <0x0 0x1c 0x0 0x8>,
-                                                     <0x0 0x24 0x0 0x14>;
-                                               reg-names = "mux",
-                                                           "ds",
-                                                           "gpio";
-                                               gpio-controller;
-                                               #gpio-cells = <2>;
-                                               gpio-ranges = <&ao_pinctrl 0 0 15>;
+                               i2c_ao_sck_pins: i2c_ao_sck_pins {
+                                       mux {
+                                               groups = "i2c_ao_sck";
+                                               function = "i2c_ao";
+                                               bias-disable;
+                                               drive-strength-microamp = <3000>;
                                        };
+                               };
 
-                                       i2c_ao_sck_pins: i2c_ao_sck_pins {
-                                               mux {
-                                                       groups = "i2c_ao_sck";
-                                                       function = "i2c_ao";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
+                               i2c_ao_sda_pins: i2c_ao_sda {
+                                       mux {
+                                               groups = "i2c_ao_sda";
+                                               function = "i2c_ao";
+                                               bias-disable;
+                                               drive-strength-microamp = <3000>;
                                        };
+                               };
 
-                                       i2c_ao_sda_pins: i2c_ao_sda {
-                                               mux {
-                                                       groups = "i2c_ao_sda";
-                                                       function = "i2c_ao";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
+                               i2c_ao_sck_e_pins: i2c_ao_sck_e {
+                                       mux {
+                                               groups = "i2c_ao_sck_e";
+                                               function = "i2c_ao";
+                                               bias-disable;
+                                               drive-strength-microamp = <3000>;
                                        };
+                               };
 
-                                       i2c_ao_sck_e_pins: i2c_ao_sck_e {
-                                               mux {
-                                                       groups = "i2c_ao_sck_e";
-                                                       function = "i2c_ao";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
+                               i2c_ao_sda_e_pins: i2c_ao_sda_e {
+                                       mux {
+                                               groups = "i2c_ao_sda_e";
+                                               function = "i2c_ao";
+                                               bias-disable;
+                                               drive-strength-microamp = <3000>;
                                        };
+                               };
 
-                                       i2c_ao_sda_e_pins: i2c_ao_sda_e {
-                                               mux {
-                                                       groups = "i2c_ao_sda_e";
-                                                       function = "i2c_ao";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
-                                       };
-
-                                       mclk0_ao_pins: mclk0-ao {
-                                               mux {
-                                                       groups = "mclk0_ao";
-                                                       function = "mclk0_ao";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
+                               mclk0_ao_pins: mclk0-ao {
+                                       mux {
+                                               groups = "mclk0_ao";
+                                               function = "mclk0_ao";
+                                               bias-disable;
+                                               drive-strength-microamp = <3000>;
                                        };
+                               };
 
-                                       tdm_ao_b_din0_pins: tdm-ao-b-din0 {
-                                               mux {
-                                                       groups = "tdm_ao_b_din0";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                               };
+                               tdm_ao_b_din0_pins: tdm-ao-b-din0 {
+                                       mux {
+                                               groups = "tdm_ao_b_din0";
+                                               function = "tdm_ao_b";
+                                               bias-disable;
                                        };
+                               };
 
-                                       spdif_ao_out_pins: spdif-ao-out {
-                                               mux {
-                                                       groups = "spdif_ao_out";
-                                                       function = "spdif_ao_out";
-                                                       drive-strength-microamp = <500>;
-                                                       bias-disable;
-                                               };
+                               spdif_ao_out_pins: spdif-ao-out {
+                                       mux {
+                                               groups = "spdif_ao_out";
+                                               function = "spdif_ao_out";
+                                               drive-strength-microamp = <500>;
+                                               bias-disable;
                                        };
+                               };
 
-                                       tdm_ao_b_din1_pins: tdm-ao-b-din1 {
-                                               mux {
-                                                       groups = "tdm_ao_b_din1";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                               };
+                               tdm_ao_b_din1_pins: tdm-ao-b-din1 {
+                                       mux {
+                                               groups = "tdm_ao_b_din1";
+                                               function = "tdm_ao_b";
+                                               bias-disable;
                                        };
+                               };
 
-                                       tdm_ao_b_din2_pins: tdm-ao-b-din2 {
-                                               mux {
-                                                       groups = "tdm_ao_b_din2";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                               };
+                               tdm_ao_b_din2_pins: tdm-ao-b-din2 {
+                                       mux {
+                                               groups = "tdm_ao_b_din2";
+                                               function = "tdm_ao_b";
+                                               bias-disable;
                                        };
+                               };
 
-                                       tdm_ao_b_dout0_pins: tdm-ao-b-dout0 {
-                                               mux {
-                                                       groups = "tdm_ao_b_dout0";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
+                               tdm_ao_b_dout0_pins: tdm-ao-b-dout0 {
+                                       mux {
+                                               groups = "tdm_ao_b_dout0";
+                                               function = "tdm_ao_b";
+                                               bias-disable;
+                                               drive-strength-microamp = <3000>;
                                        };
+                               };
 
-                                       tdm_ao_b_dout1_pins: tdm-ao-b-dout1 {
-                                               mux {
-                                                       groups = "tdm_ao_b_dout1";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
+                               tdm_ao_b_dout1_pins: tdm-ao-b-dout1 {
+                                       mux {
+                                               groups = "tdm_ao_b_dout1";
+                                               function = "tdm_ao_b";
+                                               bias-disable;
+                                               drive-strength-microamp = <3000>;
                                        };
+                               };
 
-                                       tdm_ao_b_dout2_pins: tdm-ao-b-dout2 {
-                                               mux {
-                                                       groups = "tdm_ao_b_dout2";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
+                               tdm_ao_b_dout2_pins: tdm-ao-b-dout2 {
+                                       mux {
+                                               groups = "tdm_ao_b_dout2";
+                                               function = "tdm_ao_b";
+                                               bias-disable;
+                                               drive-strength-microamp = <3000>;
                                        };
+                               };
 
-                                       tdm_ao_b_fs_pins: tdm-ao-b-fs {
-                                               mux {
-                                                       groups = "tdm_ao_b_fs";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
+                               tdm_ao_b_fs_pins: tdm-ao-b-fs {
+                                       mux {
+                                               groups = "tdm_ao_b_fs";
+                                               function = "tdm_ao_b";
+                                               bias-disable;
+                                               drive-strength-microamp = <3000>;
                                        };
+                               };
 
-                                       tdm_ao_b_sclk_pins: tdm-ao-b-sclk {
-                                               mux {
-                                                       groups = "tdm_ao_b_sclk";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                                       drive-strength-microamp = <3000>;
-                                               };
+                               tdm_ao_b_sclk_pins: tdm-ao-b-sclk {
+                                       mux {
+                                               groups = "tdm_ao_b_sclk";
+                                               function = "tdm_ao_b";
+                                               bias-disable;
+                                               drive-strength-microamp = <3000>;
                                        };
+                               };
 
-                                       tdm_ao_b_slv_fs_pins: tdm-ao-b-slv-fs {
-                                               mux {
-                                                       groups = "tdm_ao_b_slv_fs";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                               };
+                               tdm_ao_b_slv_fs_pins: tdm-ao-b-slv-fs {
+                                       mux {
+                                               groups = "tdm_ao_b_slv_fs";
+                                               function = "tdm_ao_b";
+                                               bias-disable;
                                        };
+                               };
 
-                                       tdm_ao_b_slv_sclk_pins: tdm-ao-b-slv-sclk {
-                                               mux {
-                                                       groups = "tdm_ao_b_slv_sclk";
-                                                       function = "tdm_ao_b";
-                                                       bias-disable;
-                                               };
+                               tdm_ao_b_slv_sclk_pins: tdm-ao-b-slv-sclk {
+                                       mux {
+                                               groups = "tdm_ao_b_slv_sclk";
+                                               function = "tdm_ao_b";
+                                               bias-disable;
                                        };
+                               };
 
-                                       uart_ao_a_pins: uart-a-ao {
-                                               mux {
-                                                       groups = "uart_ao_a_tx",
-                                                                "uart_ao_a_rx";
-                                                       function = "uart_ao_a";
-                                                       bias-disable;
-                                               };
+                               uart_ao_a_pins: uart-a-ao {
+                                       mux {
+                                               groups = "uart_ao_a_tx",
+                                                        "uart_ao_a_rx";
+                                               function = "uart_ao_a";
+                                               bias-disable;
                                        };
+                               };
 
-                                       uart_ao_a_cts_rts_pins: uart-ao-a-cts-rts {
-                                               mux {
-                                                       groups = "uart_ao_a_cts",
-                                                                "uart_ao_a_rts";
-                                                       function = "uart_ao_a";
-                                                       bias-disable;
-                                               };
+                               uart_ao_a_cts_rts_pins: uart-ao-a-cts-rts {
+                                       mux {
+                                               groups = "uart_ao_a_cts",
+                                                        "uart_ao_a_rts";
+                                               function = "uart_ao_a";
+                                               bias-disable;
                                        };
+                               };
 
-                                       uart_ao_b_2_3_pins: uart-ao-b-2-3 {
-                                               mux {
-                                                       groups = "uart_ao_b_tx_2",
-                                                                "uart_ao_b_rx_3";
-                                                       function = "uart_ao_b";
-                                                       bias-disable;
-                                               };
+                               uart_ao_b_2_3_pins: uart-ao-b-2-3 {
+                                       mux {
+                                               groups = "uart_ao_b_tx_2",
+                                                        "uart_ao_b_rx_3";
+                                               function = "uart_ao_b";
+                                               bias-disable;
                                        };
+                               };
 
-                                       uart_ao_b_8_9_pins: uart-ao-b-8-9 {
-                                               mux {
-                                                       groups = "uart_ao_b_tx_8",
-                                                                "uart_ao_b_rx_9";
-                                                       function = "uart_ao_b";
-                                                       bias-disable;
-                                               };
+                               uart_ao_b_8_9_pins: uart-ao-b-8-9 {
+                                       mux {
+                                               groups = "uart_ao_b_tx_8",
+                                                        "uart_ao_b_rx_9";
+                                               function = "uart_ao_b";
+                                               bias-disable;
                                        };
+                               };
 
-                                       uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts {
-                                               mux {
-                                                       groups = "uart_ao_b_cts",
-                                                                "uart_ao_b_rts";
-                                                       function = "uart_ao_b";
-                                                       bias-disable;
-                                               };
+                               uart_ao_b_cts_rts_pins: uart-ao-b-cts-rts {
+                                       mux {
+                                               groups = "uart_ao_b_cts",
+                                                        "uart_ao_b_rts";
+                                               function = "uart_ao_b";
+                                               bias-disable;
                                        };
+                               };
 
-                                       pwm_a_e_pins: pwm-a-e {
-                                               mux {
-                                                       groups = "pwm_a_e";
-                                                       function = "pwm_a_e";
-                                                       bias-disable;
-                                               };
+                               pwm_a_e_pins: pwm-a-e {
+                                       mux {
+                                               groups = "pwm_a_e";
+                                               function = "pwm_a_e";
+                                               bias-disable;
                                        };
+                               };
 
-                                       pwm_ao_a_pins: pwm-ao-a {
-                                               mux {
-                                                       groups = "pwm_ao_a";
-                                                       function = "pwm_ao_a";
-                                                       bias-disable;
-                                               };
+                               pwm_ao_a_pins: pwm-ao-a {
+                                       mux {
+                                               groups = "pwm_ao_a";
+                                               function = "pwm_ao_a";
+                                               bias-disable;
                                        };
+                               };
 
-                                       pwm_ao_b_pins: pwm-ao-b {
-                                               mux {
-                                                       groups = "pwm_ao_b";
-                                                       function = "pwm_ao_b";
-                                                       bias-disable;
-                                               };
+                               pwm_ao_b_pins: pwm-ao-b {
+                                       mux {
+                                               groups = "pwm_ao_b";
+                                               function = "pwm_ao_b";
+                                               bias-disable;
                                        };
+                               };
 
-                                       pwm_ao_c_4_pins: pwm-ao-c-4 {
-                                               mux {
-                                                       groups = "pwm_ao_c_4";
-                                                       function = "pwm_ao_c";
-                                                       bias-disable;
-                                               };
+                               pwm_ao_c_4_pins: pwm-ao-c-4 {
+                                       mux {
+                                               groups = "pwm_ao_c_4";
+                                               function = "pwm_ao_c";
+                                               bias-disable;
                                        };
+                               };
 
-                                       pwm_ao_c_6_pins: pwm-ao-c-6 {
-                                               mux {
-                                                       groups = "pwm_ao_c_6";
-                                                       function = "pwm_ao_c";
-                                                       bias-disable;
-                                               };
+                               pwm_ao_c_6_pins: pwm-ao-c-6 {
+                                       mux {
+                                               groups = "pwm_ao_c_6";
+                                               function = "pwm_ao_c";
+                                               bias-disable;
                                        };
+                               };
 
-                                       pwm_ao_d_5_pins: pwm-ao-d-5 {
-                                               mux {
-                                                       groups = "pwm_ao_d_5";
-                                                       function = "pwm_ao_d";
-                                                       bias-disable;
-                                               };
+                               pwm_ao_d_5_pins: pwm-ao-d-5 {
+                                       mux {
+                                               groups = "pwm_ao_d_5";
+                                               function = "pwm_ao_d";
+                                               bias-disable;
                                        };
+                               };
 
-                                       pwm_ao_d_10_pins: pwm-ao-d-10 {
-                                               mux {
-                                                       groups = "pwm_ao_d_10";
-                                                       function = "pwm_ao_d";
-                                                       bias-disable;
-                                               };
+                               pwm_ao_d_10_pins: pwm-ao-d-10 {
+                                       mux {
+                                               groups = "pwm_ao_d_10";
+                                               function = "pwm_ao_d";
+                                               bias-disable;
                                        };
+                               };
 
-                                       pwm_ao_d_e_pins: pwm-ao-d-e {
-                                               mux {
-                                                       groups = "pwm_ao_d_e";
-                                                       function = "pwm_ao_d";
-                                               };
+                               pwm_ao_d_e_pins: pwm-ao-d-e {
+                                       mux {
+                                               groups = "pwm_ao_d_e";
+                                               function = "pwm_ao_d";
                                        };
+                               };
 
-                                       remote_input_ao_pins: remote-input-ao {
-                                               mux {
-                                                       groups = "remote_ao_input";
-                                                       function = "remote_ao_input";
-                                                       bias-disable;
-                                               };
+                               remote_input_ao_pins: remote-input-ao {
+                                       mux {
+                                               groups = "remote_ao_input";
+                                               function = "remote_ao_input";
+                                               bias-disable;
                                        };
                                };
                        };