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 <martin.blumenstingl@googlemail.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Tested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> # 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 <neil.armstrong@linaro.org>

diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi
index 6c7596c8b96b7f4437f5781ea32fc5029f44cab4..9ff142d9fe3f4576fdd3230a966c8a6250870de7 100644 (file)
--- a/arch/arm/boot/dts/amlogic/meson8.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8.dtsi
@@ -346,17 +346,16 @@
                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 @@
                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 c8fbeede7e38d9041d4184320f0601bf192fd55e..9e02a97f86a0ef76ac856a8983f4aea0234ec859 100644 (file)
--- a/arch/arm/boot/dts/amlogic/meson8b.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi
@@ -308,17 +308,16 @@
                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 @@
                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>;