Skip to content

Commit 2b901e9

Browse files
committed
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>
1 parent 9d8706b commit 2b901e9

2 files changed

Lines changed: 26 additions & 30 deletions

File tree

arch/arm/boot/dts/amlogic/meson8.dtsi

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -346,17 +346,16 @@
346346
reg = <0xe0 0x18>;
347347
};
348348

349-
pinctrl_aobus: pinctrl@84 {
349+
pinctrl_aobus: pinctrl@14 {
350350
compatible = "amlogic,meson8-aobus-pinctrl";
351-
reg = <0x84 0xc>;
352351
#address-cells = <1>;
353352
#size-cells = <1>;
354-
ranges;
353+
ranges = <0x0 0x14 0x1c>;
355354

356-
gpio_ao: bank@14 {
357-
reg = <0x14 0x4>,
358-
<0x2c 0x4>,
359-
<0x24 0x8>;
355+
gpio_ao: bank@0 {
356+
reg = <0x0 0x4>,
357+
<0x18 0x4>,
358+
<0x10 0x8>;
360359
reg-names = "mux", "pull", "gpio";
361360
gpio-controller;
362361
#gpio-cells = <2>;
@@ -461,18 +460,17 @@
461460
reg = <0x8758 0x1c>;
462461
};
463462

464-
pinctrl_cbus: pinctrl@9880 {
463+
pinctrl_cbus: pinctrl@8030 {
465464
compatible = "amlogic,meson8-cbus-pinctrl";
466-
reg = <0x9880 0x10>;
467465
#address-cells = <1>;
468466
#size-cells = <1>;
469-
ranges;
467+
ranges = <0x0 0x8030 0x108>;
470468

471-
gpio: bank@80b0 {
472-
reg = <0x80b0 0x28>,
473-
<0x80e8 0x18>,
474-
<0x8120 0x18>,
475-
<0x8030 0x30>;
469+
gpio: bank@80 {
470+
reg = <0x80 0x28>,
471+
<0xb8 0x18>,
472+
<0xf0 0x18>,
473+
<0x00 0x30>;
476474
reg-names = "mux", "pull", "pull-enable", "gpio";
477475
gpio-controller;
478476
#gpio-cells = <2>;

arch/arm/boot/dts/amlogic/meson8b.dtsi

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -308,17 +308,16 @@
308308
reg = <0xe0 0x18>;
309309
};
310310

311-
pinctrl_aobus: pinctrl@84 {
311+
pinctrl_aobus: pinctrl@14 {
312312
compatible = "amlogic,meson8b-aobus-pinctrl";
313-
reg = <0x84 0xc>;
314313
#address-cells = <1>;
315314
#size-cells = <1>;
316-
ranges;
315+
ranges = <0x0 0x14 0x1c>;
317316

318-
gpio_ao: bank@14 {
319-
reg = <0x14 0x4>,
320-
<0x2c 0x4>,
321-
<0x24 0x8>;
317+
gpio_ao: bank@0 {
318+
reg = <0x0 0x4>,
319+
<0x18 0x4>,
320+
<0x10 0x8>;
322321
reg-names = "mux", "pull", "gpio";
323322
gpio-controller;
324323
#gpio-cells = <2>;
@@ -415,18 +414,17 @@
415414
reg = <0x8758 0x1c>;
416415
};
417416

418-
pinctrl_cbus: pinctrl@9880 {
417+
pinctrl_cbus: pinctrl@8030 {
419418
compatible = "amlogic,meson8b-cbus-pinctrl";
420-
reg = <0x9880 0x10>;
421419
#address-cells = <1>;
422420
#size-cells = <1>;
423-
ranges;
421+
ranges = <0x0 0x8030 0x108>;
424422

425-
gpio: bank@80b0 {
426-
reg = <0x80b0 0x28>,
427-
<0x80e8 0x18>,
428-
<0x8120 0x18>,
429-
<0x8030 0x38>;
423+
gpio: bank@80 {
424+
reg = <0x80 0x28>,
425+
<0xb8 0x18>,
426+
<0xf0 0x18>,
427+
<0x00 0x38>;
430428
reg-names = "mux", "pull", "pull-enable", "gpio";
431429
gpio-controller;
432430
#gpio-cells = <2>;

0 commit comments

Comments
 (0)