Skip to content

Commit 3654ffd

Browse files
arndbarndb
committed
Merge tag 'amlogic-arm64-dt-for-v6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt
Amlogic ARM64 DT changes for v6.8: - DT cleanups - s4 uart node - drop redundant status=okay - minor whitespace cleanup around '=' - Watchdog nodes for S4 & C4 SoCs - Clock, I2C, SPICC, NAND, Ethernet nodes for S4 And the AQ222 dev board - Add EEPROM on the jethub-jxx boards - Update of the amlogic,meson-gx-hhi-sysctrl bindings * tag 'amlogic-arm64-dt-for-v6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: arm64: dts: amlogic: fix format for s4 uart node arm64: dts: amlogic: drop redundant status=okay arm64: dts: amlogic: enable some nodes for board AQ222 arm64: dts: amlogic: add some device nodes for S4 arm64: dts: meson-axg: jethub-jxx add support for EEPROM arm64: dts: amlogic: meson-axg: pinctrl node for NAND arm64: dts: amlogic: minor whitespace cleanup around '=' arm64: dts: Add watchdog node for Amlogic S4 SoCs arm64: dts: Add watchdog node for Amlogic C3 SoCs dt-bindings: soc: amlogic,meson-gx-hhi-sysctrl: add example covering meson-axg-hhi-sysctrl Link: https://lore.kernel.org/r/e38724be-c9f0-4916-bfd0-d20b316db2da@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 46a51db + eb54ef3 commit 3654ffd

22 files changed

Lines changed: 504 additions & 25 deletions

‎Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,36 @@ examples:
158158
};
159159
};
160160
};
161+
162+
- |
163+
system-controller@ff63c000 {
164+
compatible = "amlogic,meson-axg-hhi-sysctrl", "simple-mfd", "syscon";
165+
reg = <0xff63c000 0x400>;
166+
167+
clock-controller {
168+
compatible = "amlogic,axg-clkc";
169+
#clock-cells = <1>;
170+
clocks = <&xtal>;
171+
clock-names = "xtal";
172+
};
173+
174+
power-controller {
175+
compatible = "amlogic,meson-axg-pwrc";
176+
#power-domain-cells = <1>;
177+
amlogic,ao-sysctrl = <&sysctrl_AO>;
178+
179+
resets = <&reset_viu>,
180+
<&reset_venc>,
181+
<&reset_vcbus>,
182+
<&reset_vencl>,
183+
<&reset_vid_lock>;
184+
reset-names = "viu", "venc", "vcbus", "vencl", "vid_lock";
185+
clocks = <&clk_vpu>, <&clk_vapb>;
186+
clock-names = "vpu", "vapb";
187+
};
188+
189+
phy {
190+
compatible = "amlogic,axg-mipi-pcie-analog-phy";
191+
#phy-cells = <0>;
192+
};
193+
};

‎arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@
8181
#size-cells = <2>;
8282
ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
8383

84+
watchdog@2100 {
85+
compatible = "amlogic,c3-wdt", "amlogic,t7-wdt";
86+
reg = <0x0 0x2100 0x0 0x10>;
87+
clocks = <&xtal>;
88+
};
89+
8490
periphs_pinctrl: pinctrl@4000 {
8591
compatible = "amlogic,c3-periphs-pinctrl";
8692
#address-cells = <2>;

‎arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,20 @@
3030
&uart_B {
3131
bluetooth {
3232
compatible = "realtek,rtl8822cs-bt";
33-
enable-gpios = <&gpio GPIOZ_7 GPIO_ACTIVE_HIGH>;
33+
enable-gpios = <&gpio GPIOZ_7 GPIO_ACTIVE_HIGH>;
3434
host-wake-gpios = <&gpio GPIOZ_8 GPIO_ACTIVE_HIGH>;
3535
device-wake-gpios = <&gpio GPIOZ_6 GPIO_ACTIVE_HIGH>;
3636
};
3737
};
38+
39+
&i2c_AO {
40+
/* EEPROM on base board */
41+
eeprompd: eeprom@56 {
42+
compatible = "atmel,24c64";
43+
reg = <0x56>;
44+
pagesize = <0x20>;
45+
label = "eeprompd";
46+
address-width = <0x10>;
47+
vcc-supply = <&vddao_3v3>;
48+
};
49+
};

‎arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,15 @@
2525
&sd_emmc_b {
2626
broken-cd;/* cd-gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;*/
2727
};
28+
29+
&i2c_AO {
30+
/* EEPROM on base board */
31+
eeprompd: eeprom@56 {
32+
compatible = "atmel,24c64";
33+
reg = <0x56>;
34+
pagesize = <0x20>;
35+
label = "eeprompd";
36+
address-width = <0x10>;
37+
vcc-supply = <&vddao_3v3>;
38+
};
39+
};

‎arch/arm64/boot/dts/amlogic/meson-axg-s400.dts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
VDDA-supply = <&vcc_3v3>;
6767
VDDP-supply = <&vcc_3v3>;
6868
VDDD-supply = <&vcc_3v3>;
69-
status = "okay";
7069
sound-name-prefix = "Linein";
7170
};
7271

@@ -75,14 +74,12 @@
7574
compatible = "everest,es7154";
7675
VDD-supply = <&vcc_3v3>;
7776
PVDD-supply = <&vcc_5v>;
78-
status = "okay";
7977
sound-name-prefix = "Lineout";
8078
};
8179

8280
spdif_dit: audio-codec-2 {
8381
#sound-dai-cells = <0>;
8482
compatible = "linux,spdif-dit";
85-
status = "okay";
8683
sound-name-prefix = "DIT";
8784
};
8885

@@ -91,14 +88,12 @@
9188
compatible = "dmic-codec";
9289
num-channels = <7>;
9390
wakeup-delay-ms = <50>;
94-
status = "okay";
9591
sound-name-prefix = "MIC";
9692
};
9793

9894
spdif_dir: audio-codec-4 {
9995
#sound-dai-cells = <0>;
10096
compatible = "linux,spdif-dir";
101-
status = "okay";
10297
sound-name-prefix = "DIR";
10398
};
10499

‎arch/arm64/boot/dts/amlogic/meson-axg.dtsi‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,27 @@
432432
};
433433
};
434434

435+
nand_all_pins: nand-all-pins {
436+
mux {
437+
groups = "emmc_nand_d0",
438+
"emmc_nand_d1",
439+
"emmc_nand_d2",
440+
"emmc_nand_d3",
441+
"emmc_nand_d4",
442+
"emmc_nand_d5",
443+
"emmc_nand_d6",
444+
"emmc_nand_d7",
445+
"nand_ce0",
446+
"nand_ale",
447+
"nand_cle",
448+
"nand_wen_clk",
449+
"nand_ren_wr";
450+
function = "nand";
451+
input-enable;
452+
bias-pull-up;
453+
};
454+
};
455+
435456
emmc_ds_pins: emmc_ds {
436457
mux {
437458
groups = "emmc_ds";
@@ -1913,6 +1934,8 @@
19131934
reg = <0x0 0x7800 0x0 0x100>,
19141935
<0x0 0x7000 0x0 0x800>;
19151936
reg-names = "nfc", "emmc";
1937+
pinctrl-0 = <&nand_all_pins>;
1938+
pinctrl-names = "default";
19161939
#address-cells = <1>;
19171940
#size-cells = <0>;
19181941
interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>;

‎arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
compatible = "dmic-codec";
4646
num-channels = <2>;
4747
wakeup-delay-ms = <50>;
48-
status = "okay";
4948
sound-name-prefix = "MIC";
5049
};
5150

‎arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
spdif_dit: audio-codec-1 {
2323
#sound-dai-cells = <0>;
2424
compatible = "linux,spdif-dit";
25-
status = "okay";
2625
sound-name-prefix = "DIT";
2726
};
2827

‎arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@
369369

370370
bluetooth {
371371
compatible = "realtek,rtl8822cs-bt";
372-
enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
372+
enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
373373
host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
374374
device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
375375
};

‎arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@
487487

488488
bluetooth {
489489
compatible = "realtek,rtl8822cs-bt";
490-
enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
490+
enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
491491
host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
492492
device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
493493
};

0 commit comments

Comments
 (0)