Skip to content

Commit bf76260

Browse files
arndbarndb
committed
Merge tag 'amlogic-arm-dt-for-v6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt
Amlogic ARM DT changes for v6.13: - DT fixes to pass bindings chedk, including: - fixing nodes names - dropping meson6 ATV1200 board - add missing properties * tag 'amlogic-arm-dt-for-v6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: ARM: dts: amlogic: meson8/8b: remove invalid pinctrl reg ARM: dts: amlogic: meson8b-ec100: add missing gpio-line-names entry ARM: dts: amlogic: meson8b-ec100: add missing clocks property in sound card ARM: dts: amlogic: meson8-minix-neo-x8: fix invalid pnictrl-names ARM: dts: amlogic: add missing phy-mode in ethmac node ARM: dts: amlogic: meson8: use correct pinctrl bank node name ARM: dts: amlogic: fix /memory node name ARM: dts: amlogic: meson8b-odroidc1: fix invalid reset-gpio ARM: dts: amlogic: meson6: remove support for ATV1200 board ARM: dts: amlogic: meson8: fix ao_arc_sram node name ARM: dts: amlogic: meson8: fix soc thermal-zone node name ARM: dts: amlogic: meson6: fix clk81 node name Link: https://lore.kernel.org/r/ffaa3755-8c5d-4fc3-86bf-9129d3889bff@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 4453328 + 2b901e9 commit bf76260

10 files changed

Lines changed: 43 additions & 150 deletions

‎arch/arm/boot/dts/amlogic/Makefile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
dtb-$(CONFIG_MACH_MESON6) += \
3-
meson6-atv1200.dtb
42
dtb-$(CONFIG_MACH_MESON8) += \
53
meson8-minix-neo-x8.dtb \
64
meson8b-ec100.dtb \

‎arch/arm/boot/dts/amlogic/meson6-atv1200.dts‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎arch/arm/boot/dts/amlogic/meson6.dtsi‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
stdout-path = "serial0:115200n8";
2020
};
2121

22-
memory {
22+
memory@40000000 {
2323
device_type = "memory";
2424
reg = <0x40000000 0x80000000>;
2525
};
@@ -93,5 +93,6 @@
9393
&ethmac {
9494
status = "okay";
9595
pinctrl-0 = <&eth_pins>;
96-
pnictrl-names = "default";
96+
pinctrl-names = "default";
97+
phy-mode = "rmii";
9798
};

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

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
};
197197

198198
thermal-zones {
199-
soc {
199+
soc-thermal {
200200
polling-delay-passive = <250>; /* milliseconds */
201201
polling-delay = <1000>; /* milliseconds */
202202
thermal-sensors = <&thermal_sensor>;
@@ -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: 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: banks@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>;
@@ -589,7 +587,7 @@
589587
};
590588

591589
&ahb_sram {
592-
ao_arc_sram: ao-arc-sram@0 {
590+
ao_arc_sram: aoarc-sram@0 {
593591
compatible = "amlogic,meson8-ao-arc-sram";
594592
reg = <0x0 0x8000>;
595593
pool;

‎arch/arm/boot/dts/amlogic/meson8b-ec100.dts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
stdout-path = "serial0:115200n8";
2323
};
2424

25-
memory {
25+
memory@40000000 {
2626
device_type = "memory";
2727
reg = <0x40000000 0x40000000>;
2828
};
@@ -98,6 +98,10 @@
9898
compatible = "amlogic,gx-sound-card";
9999
model = "M8B-EC100";
100100

101+
clocks = <&clkc CLKID_MPLL0>,
102+
<&clkc CLKID_MPLL1>,
103+
<&clkc CLKID_MPLL2>;
104+
101105
assigned-clocks = <&clkc CLKID_MPLL0>,
102106
<&clkc CLKID_MPLL1>,
103107
<&clkc CLKID_MPLL2>;
@@ -427,7 +431,7 @@
427431
"NAND_CS1 (EMMC)", "NAND_CS2 iNAND_RS1 (EMMC)",
428432
"NAND_nR/B iNAND_CMD (EMMC)", "NAND_ALE (EMMC)",
429433
"NAND_CLE (EMMC)", "nRE_S1 NAND_nRE (EMMC)",
430-
"nWE_S1 NAND_nWE (EMMC)", "", "", "SPI_CS",
434+
"nWE_S1 NAND_nWE (EMMC)", "", "", "", "SPI_CS",
431435
/* Bank DIF */
432436
"RMII_RXD1", "RMII_RXD0", "RMII_CRS_DV",
433437
"RMII_50M_IN", "GPIODIF_4", "GPIODIF_5",

‎arch/arm/boot/dts/amlogic/meson8b-mxq.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
stdout-path = "serial0:115200n8";
2323
};
2424

25-
memory {
25+
memory@40000000 {
2626
device_type = "memory";
2727
reg = <0x40000000 0x40000000>;
2828
};

‎arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
stdout-path = "serial0:115200n8";
2323
};
2424

25-
memory {
25+
memory@40000000 {
2626
device_type = "memory";
2727
reg = <0x40000000 0x40000000>;
2828
};
@@ -378,6 +378,6 @@
378378
compatible = "usb5e3,610";
379379
reg = <1>;
380380
vdd-supply = <&p5v0>;
381-
reset-gpio = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>;
381+
reset-gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>;
382382
};
383383
};

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

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
};
174174

175175
thermal-zones {
176-
soc {
176+
soc-thermal {
177177
polling-delay-passive = <250>; /* milliseconds */
178178
polling-delay = <1000>; /* milliseconds */
179179
thermal-sensors = <&thermal_sensor>;
@@ -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: 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: banks@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>;
@@ -535,7 +533,7 @@
535533
};
536534

537535
&ahb_sram {
538-
ao_arc_sram: ao-arc-sram@0 {
536+
ao_arc_sram: aoarc-sram@0 {
539537
compatible = "amlogic,meson8b-ao-arc-sram";
540538
reg = <0x0 0x8000>;
541539
pool;

‎arch/arm/boot/dts/amlogic/meson8m2-mxiii-plus.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
stdout-path = "serial0:115200n8";
2727
};
2828

29-
memory {
29+
memory@40000000 {
3030
device_type = "memory";
3131
reg = <0x40000000 0x80000000>;
3232
};

0 commit comments

Comments
 (0)