mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 16:37:50 +00:00
Code Issues Releases Wiki Activity

Amlogic ARM64 DT changes for v6.8:

Browse source 
- 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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmWBZJgACgkQd9zb2sjI
 SdFZjQ//c0m2kS36jOgx+xiztcCX4tuM1Mn56wDGXub8CU5BFrUuj9nxn+b6AEYk
 DHfUx0wo2vf+/ITgjlH2WU4MmcZT6IUQmccIfK5L+ZJJPlJufbuZBdsD2abq3lJZ
 qhK7Mc1s73UczxFzpxYO8wF7QOVZwWGQ9wg3nUrG3Vtt2mndCzVpF5uQqPYf7FXe
 /YoC6Opd2GYWe8Yyd9p0fd+M2KO/taLChPaSrncQc6a9a/W6go4VNaDwIljc6SvR
 x/7oFiOVwQQ1niGAkM2w0oLvXnLA6bC9P+co03a6YNlE1zOP53y1WSV8378SjJTL
 C9L8zmneXuAUGD2lewHaTslbjbbj7iRE4AzX9M9Sp07P0pJQ4ej5WQXKnEBU+m/c
 HC9CY7bolnxh3CBpvcxL4KaYRwd9NUz5pPYOSmLTWxUaFjei/vYByf6yNhjwJFBS
 RlglbqQlsHIq0jG1QF5kq7WC7OIteCf8LMgmyYN5pzdXLHOuAP1fYGPW3+QYGBdZ
 I3XJrhvCrYXaYc3ClxToFwki/t1zbq+tQdxFA41ms1xqa92MBx619Nq0cPLiNkgN
 3e3pCSlPoCeTZp/jROmlrSegvGM+MMS+m+ezdGdZMnvWrvsqUMIe9w/EK9n9Unaj
 508VmiHzG1kNyQ2NmNdJk7dHVeNZWYiYV1RhCkOFdY6qGcaU8CQ=
 =55q5
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmWEcQIACgkQYKtH/8kJ
 UierZxAA2MuB7Oipq8hPNxi4nOvo2LzeAp0IRWmWaMgWoeneDAXZbX9rkEbMULuE
 yRhIkE8xkfUqvj+dqc4O0WcGvECx+k6ktN4iCbfYbS71EF+QJTDxeswzYmzR74My
 VP7SxOTSYuLWGcYddAS6dVhBaPdHkDoTgPAIKI8OW1c5O5dlTSQvCxQOAJdYOOTS
 6DHpQhDWHOzSs5so+5EhTrvTGeo6K45kSlT2T9qQ2mcF1ijQAy6cmMJ8enGN+X9G
 MG6sBfDZcQdQwy2AfLd0NrN+F8XF+Xf0hJULAM4kHRLsewkETeqtLD55SxnjwuID
 2wEYvb9IzQ9h/h2IVH05H0bu6+tO2lQrJs9Zd7tM9n3uNqBpirxlYqi+qbrEQPV+
 AGpuJbeMyMwIPVhnDC5xOIXEM7IalboGk+WqVRZ+6JpqVkrk3PQtRLIr4vE2AA9V
 ZAK60QlesydjlbJUHjWI1Fy5zRD2cmdRkjBCz3izkSf6NcDyB/j9426M9yovdTCV
 FTBTaqJErwnUT0uog6rAre2X5vP/Dczjy+YQxoICjBARRECqg577u2qvuAnJzgqQ
 /VNSfhCv1awzDUZA7jEyprzQ7Mo06MnBltrN/mAJf/X1JkorZK5jJvquz5f8pLym
 i+PN0USsrukoqjn2R7A0CoHeec/qb+0LoT76oBtduM4svtyQSb8=
 =8wr4
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2023-12-21 17:07:47 +00:00
commit 3654ffdc13
22 changed files with 504 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml
View file

@ -158,3 +158,36 @@ examples:
};
};
};
- |
system-controller@ff63c000 {
compatible = "amlogic,meson-axg-hhi-sysctrl", "simple-mfd", "syscon";
reg = <0xff63c000 0x400>;
clock-controller {
compatible = "amlogic,axg-clkc";
#clock-cells = <1>;
clocks = <&xtal>;
clock-names = "xtal";
};
power-controller {
compatible = "amlogic,meson-axg-pwrc";
#power-domain-cells = <1>;
amlogic,ao-sysctrl = <&sysctrl_AO>;
resets = <&reset_viu>,
<&reset_venc>,
<&reset_vcbus>,
<&reset_vencl>,
<&reset_vid_lock>;
reset-names = "viu", "venc", "vcbus", "vencl", "vid_lock";
clocks = <&clk_vpu>, <&clk_vapb>;
clock-names = "vpu", "vapb";
};
phy {
compatible = "amlogic,axg-mipi-pcie-analog-phy";
#phy-cells = <0>;
};
};

6
arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
View file

@ -81,6 +81,12 @@ apb4: bus@fe000000 {
#size-cells = <2>;
ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
watchdog@2100 {
compatible = "amlogic,c3-wdt", "amlogic,t7-wdt";
reg = <0x0 0x2100 0x0 0x10>;
clocks = <&xtal>;
};
periphs_pinctrl: pinctrl@4000 {
compatible = "amlogic,c3-periphs-pinctrl";
#address-cells = <2>;

14
arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts
View file

@ -30,8 +30,20 @@ &sd_emmc_b {
&uart_B {
bluetooth {
compatible = "realtek,rtl8822cs-bt";
enable-gpios = <&gpio GPIOZ_7 GPIO_ACTIVE_HIGH>;
enable-gpios = <&gpio GPIOZ_7 GPIO_ACTIVE_HIGH>;
host-wake-gpios = <&gpio GPIOZ_8 GPIO_ACTIVE_HIGH>;
device-wake-gpios = <&gpio GPIOZ_6 GPIO_ACTIVE_HIGH>;
};
};
&i2c_AO {
/* EEPROM on base board */
eeprompd: eeprom@56 {
compatible = "atmel,24c64";
reg = <0x56>;
pagesize = <0x20>;
label = "eeprompd";
address-width = <0x10>;
vcc-supply = <&vddao_3v3>;
};
};

12
arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts
View file

@ -25,3 +25,15 @@ memory@0 {
&sd_emmc_b {
broken-cd;/* cd-gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;*/
};
&i2c_AO {
/* EEPROM on base board */
eeprompd: eeprom@56 {
compatible = "atmel,24c64";
reg = <0x56>;
pagesize = <0x20>;
label = "eeprompd";
address-width = <0x10>;
vcc-supply = <&vddao_3v3>;
};
};

5
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
View file

@ -66,7 +66,6 @@ linein: audio-codec-0 {
VDDA-supply = <&vcc_3v3>;
VDDP-supply = <&vcc_3v3>;
VDDD-supply = <&vcc_3v3>;
status = "okay";
sound-name-prefix = "Linein";
};
@ -75,14 +74,12 @@ lineout: audio-codec-1 {
compatible = "everest,es7154";
VDD-supply = <&vcc_3v3>;
PVDD-supply = <&vcc_5v>;
status = "okay";
sound-name-prefix = "Lineout";
};
spdif_dit: audio-codec-2 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};
@ -91,14 +88,12 @@ dmics: audio-codec-3 {
compatible = "dmic-codec";
num-channels = <7>;
wakeup-delay-ms = <50>;
status = "okay";
sound-name-prefix = "MIC";
};
spdif_dir: audio-codec-4 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dir";
status = "okay";
sound-name-prefix = "DIR";
};

23
arch/arm64/boot/dts/amlogic/meson-axg.dtsi
View file

@ -432,6 +432,27 @@ mux-1 {
};
};
nand_all_pins: nand-all-pins {
mux {
groups = "emmc_nand_d0",
"emmc_nand_d1",
"emmc_nand_d2",
"emmc_nand_d3",
"emmc_nand_d4",
"emmc_nand_d5",
"emmc_nand_d6",
"emmc_nand_d7",
"nand_ce0",
"nand_ale",
"nand_cle",
"nand_wen_clk",
"nand_ren_wr";
function = "nand";
input-enable;
bias-pull-up;
};
};
emmc_ds_pins: emmc_ds {
mux {
groups = "emmc_ds";
@ -1913,6 +1934,8 @@ nfc: nand-controller@7800 {
reg = <0x0 0x7800 0x0 0x100>,
<0x0 0x7000 0x0 0x800>;
reg-names = "nfc", "emmc";
pinctrl-0 = <&nand_all_pins>;
pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>;

1
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
View file

@ -45,7 +45,6 @@ dmics: audio-codec-1 {
compatible = "dmic-codec";
num-channels = <2>;
wakeup-delay-ms = <50>;
status = "okay";
sound-name-prefix = "MIC";
};

1
arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
View file

@ -22,7 +22,6 @@ aliases {
spdif_dit: audio-codec-1 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};

2
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
View file

@ -369,7 +369,7 @@ &uart_A {
bluetooth {
compatible = "realtek,rtl8822cs-bt";
enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
};

2
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
View file

@ -487,7 +487,7 @@ &uart_A {
bluetooth {
compatible = "realtek,rtl8822cs-bt";
enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
};

1
arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts
View file

@ -22,7 +22,6 @@ aliases {
spdif_dit: audio-codec-1 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};

1
arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts
View file

@ -17,7 +17,6 @@ / {
spdif_dit: audio-codec-1 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};

1
arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
View file

@ -26,7 +26,6 @@ dio2133: analog-amplifier {
spdif_dit: audio-codec-0 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};

1
arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts
View file

@ -18,7 +18,6 @@ / {
spdif_dit: audio-codec-0 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};

1
arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
View file

@ -18,7 +18,6 @@ / {
spdif_dit: audio-codec-0 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};

1
arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
View file

@ -21,7 +21,6 @@ chosen {
spdif_dit: audio-codec-0 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};

1
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
View file

@ -17,7 +17,6 @@ / {
spdif_dit: audio-codec-0 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};

1
arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
View file

@ -28,7 +28,6 @@ chosen {
spdif_dit: audio-codec-0 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};

1
arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
View file

@ -37,7 +37,6 @@ memory@0 {
spdif_dit: audio-codec-0 {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
status = "okay";
sound-name-prefix = "DIT";
};

60
arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts
View file

@ -15,7 +15,7 @@ / {
#size-cells = <2>;
aliases {
serial0 = &uart_B;
serial0 = &uart_b;
};
memory@0 {
@ -23,9 +23,20 @@ memory@0 {
reg = <0x0 0x0 0x0 0x40000000>;
};
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
ranges;
/* 52 MiB reserved for ARM Trusted Firmware */
secmon_reserved: secmon@5000000 {
reg = <0x0 0x05000000 0x0 0x3400000>;
no-map;
};
};
};
&uart_B {
&uart_b {
status = "okay";
};
@ -34,3 +45,48 @@ &ir {
pinctrl-0 = <&remote_pins>;
pinctrl-names = "default";
};
&nand {
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&nand_pins>;
pinctrl-names = "default";
nand@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
nand-on-flash-bbt;
partition@0 {
label = "boot";
reg = <0x0 0x00200000>;
};
partition@200000 {
label = "env";
reg = <0x00200000 0x00400000>;
};
partition@600000 {
label = "system";
reg = <0x00600000 0x00a00000>;
};
partition@1000000 {
label = "rootfs";
reg = <0x01000000 0x03000000>;
};
partition@4000000 {
label = "media";
reg = <0x04000000 0x8000000>;
};
};
};
&spicc0 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&spicc0_pins_x>;
cs-gpios = <&gpio GPIOX_10 GPIO_ACTIVE_LOW>;
};

360
arch/arm64/boot/dts/amlogic/meson-s4.dtsi
View file

@ -6,6 +6,10 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/gpio/meson-s4-gpio.h>
#include <dt-bindings/clock/amlogic,s4-pll-clkc.h>
#include <dt-bindings/clock/amlogic,s4-peripherals-clkc.h>
#include <dt-bindings/power/meson-s4-power.h>
/ {
cpus {
@ -92,6 +96,44 @@ apb4: bus@fe000000 {
#size-cells = <2>;
ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
clkc_periphs: clock-controller@0 {
compatible = "amlogic,s4-peripherals-clkc";
reg = <0x0 0x0 0x0 0x49c>;
clocks = <&clkc_pll CLKID_FCLK_DIV2>,
<&clkc_pll CLKID_FCLK_DIV2P5>,
<&clkc_pll CLKID_FCLK_DIV3>,
<&clkc_pll CLKID_FCLK_DIV4>,
<&clkc_pll CLKID_FCLK_DIV5>,
<&clkc_pll CLKID_FCLK_DIV7>,
<&clkc_pll CLKID_HIFI_PLL>,
<&clkc_pll CLKID_GP0_PLL>,
<&clkc_pll CLKID_MPLL0>,
<&clkc_pll CLKID_MPLL1>,
<&clkc_pll CLKID_MPLL2>,
<&clkc_pll CLKID_MPLL3>,
<&clkc_pll CLKID_HDMI_PLL>,
<&xtal>;
clock-names = "fclk_div2", "fclk_div2p5", "fclk_div3",
"fclk_div4", "fclk_div5", "fclk_div7",
"hifi_pll", "gp0_pll", "mpll0", "mpll1",
"mpll2", "mpll3", "hdmi_pll", "xtal";
#clock-cells = <1>;
};
clkc_pll: clock-controller@8000 {
compatible = "amlogic,s4-pll-clkc";
reg = <0x0 0x8000 0x0 0x1e8>;
clocks = <&xtal>;
clock-names = "xtal";
#clock-cells = <1>;
};
watchdog@2100 {
compatible = "amlogic,s4-wdt", "amlogic,t7-wdt";
reg = <0x0 0x2100 0x0 0x10>;
clocks = <&xtal>;
};
periphs_pinctrl: pinctrl@4000 {
compatible = "amlogic,meson-s4-periphs-pinctrl";
#address-cells = <2>;
@ -114,6 +156,187 @@ mux {
bias-disable;
};
};
i2c0_pins1: i2c0-pins1 {
mux {
groups = "i2c0_sda",
"i2c0_scl";
function = "i2c0";
drive-strength-microamp = <3000>;
bias-disable;
};
};
i2c1_pins1: i2c1-pins1 {
mux {
groups = "i2c1_sda_c",
"i2c1_scl_c";
function = "i2c1";
drive-strength-microamp = <3000>;
bias-disable;
};
};
i2c1_pins2: i2c1-pins2 {
mux {
groups = "i2c1_sda_d",
"i2c1_scl_d";
function = "i2c1";
drive-strength-microamp = <3000>;
bias-disable;
};
};
i2c1_pins3: i2c1-pins3 {
mux {
groups = "i2c1_sda_h",
"i2c1_scl_h";
function = "i2c1";
drive-strength-microamp = <3000>;
bias-disable;
};
};
i2c1_pins4: i2c1-pins4 {
mux {
groups = "i2c1_sda_x",
"i2c1_scl_x";
function = "i2c1";
drive-strength-microamp = <3000>;
bias-disable;
};
};
i2c2_pins1: i2c2-pins1 {
mux {
groups = "i2c2_sda_d",
"i2c2_scl_d";
function = "i2c2";
drive-strength-microamp = <3000>;
bias-disable;
};
};
i2c2_pins2: i2c2-pins2 {
mux {
groups = "i2c2_sda_h8",
"i2c2_scl_h9";
function = "i2c2";
drive-strength-microamp = <3000>;
bias-disable;
};
};
i2c2_pins3: i2c2-pins3 {
mux {
groups = "i2c2_sda_h0",
"i2c2_scl_h1";
function = "i2c2";
drive-strength-microamp = <3000>;
bias-disable;
};
};
i2c3_pins1: i2c3-pins1 {
mux {
groups = "i2c3_sda_x",
"i2c3_scl_x";
function = "i2c3";
drive-strength-microamp = <3000>;
bias-disable;
};
};
i2c3_pins2: i2c3-pins2 {
mux {
groups = "i2c3_sda_z",
"i2c3_scl_z";
function = "i2c3";
drive-strength-microamp = <3000>;
bias-disable;
};
};
i2c4_pins1: i2c4-pins1 {
mux {
groups = "i2c4_sda_c",
"i2c4_scl_c";
function = "i2c4";
drive-strength-microamp = <3000>;
bias-disable;
};
};
i2c4_pins2: i2c4-pins2 {
mux {
groups = "i2c4_sda_d",
"i2c4_scl_d";
function = "i2c4";
drive-strength-microamp = <3000>;
bias-disable;
};
};
i2c4_pins3: i2c4-pins3 {
mux {
groups = "i2c4_sda_z",
"i2c4_scl_z";
function = "i2c4";
drive-strength-microamp = <3000>;
bias-disable;
};
};
nand_pins: nand-pins {
mux {
groups = "emmc_nand_d0",
"emmc_nand_d1",
"emmc_nand_d2",
"emmc_nand_d3",
"emmc_nand_d4",
"emmc_nand_d5",
"emmc_nand_d6",
"emmc_nand_d7",
"nand_ce0",
"nand_ale",
"nand_cle",
"nand_wen_clk",
"nand_ren_wr";
function = "nand";
input-enable;
};
};
spicc0_pins_x: spicc0-pins_x {
mux {
groups = "spi_a_mosi_x",
"spi_a_miso_x",
"spi_a_clk_x";
function = "spi_a";
drive-strength-microamp = <3000>;
};
};
spicc0_pins_h: spicc0-pins-h {
mux {
groups = "spi_a_mosi_h",
"spi_a_miso_h",
"spi_a_clk_h";
function = "spi_a";
drive-strength-microamp = <3000>;
};
};
spicc0_pins_z: spicc0-pins-z {
mux {
groups = "spi_a_mosi_z",
"spi_a_miso_z",
"spi_a_clk_z";
function = "spi_a";
drive-strength-microamp = <3000>;
};
};
};
gpio_intc: interrupt-controller@4080 {
@ -126,14 +349,120 @@ gpio_intc: interrupt-controller@4080 {
<10 11 12 13 14 15 16 17 18 19 20 21>;
};
uart_B: serial@7a000 {
eth_phy: mdio-multiplexer@28000 {
compatible = "amlogic,g12a-mdio-mux";
reg = <0x0 0x28000 0x0 0xa4>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clkc_periphs CLKID_ETHPHY>,
<&xtal>,
<&clkc_pll CLKID_MPLL_50M>;
clock-names = "pclk", "clkin0", "clkin1";
mdio-parent-bus = <&mdio0>;
ext_mdio: mdio@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
};
int_mdio: mdio@1 {
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
internal_ephy: ethernet-phy@8 {
compatible = "ethernet-phy-id0180.3301",
"ethernet-phy-ieee802.3-c22";
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
reg = <8>;
max-speed = <100>;
};
};
};
spicc0: spi@50000 {
compatible = "amlogic,meson-g12a-spicc";
reg = <0x0 0x50000 0x0 0x44>;
interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clkc_periphs CLKID_SPICC0>,
<&clkc_periphs CLKID_SPICC0_EN>;
clock-names = "core", "pclk";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
i2c0: i2c@66000 {
compatible = "amlogic,meson-axg-i2c";
reg = <0x0 0x66000 0x0 0x20>;
interrupts = <GIC_SPI 160 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkc_periphs CLKID_I2C_M_A>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
i2c1: i2c@68000 {
compatible = "amlogic,meson-axg-i2c";
reg = <0x0 0x68000 0x0 0x20>;
interrupts = <GIC_SPI 161 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkc_periphs CLKID_I2C_M_B>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
i2c2: i2c@6a000 {
compatible = "amlogic,meson-axg-i2c";
reg = <0x0 0x6a000 0x0 0x20>;
interrupts = <GIC_SPI 162 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkc_periphs CLKID_I2C_M_C>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
i2c3: i2c@6c000 {
compatible = "amlogic,meson-axg-i2c";
reg = <0x0 0x6c000 0x0 0x20>;
interrupts = <GIC_SPI 163 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkc_periphs CLKID_I2C_M_D>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
i2c4: i2c@6e000 {
compatible = "amlogic,meson-axg-i2c";
reg = <0x0 0x6e000 0x0 0x20>;
interrupts = <GIC_SPI 164 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkc_periphs CLKID_I2C_M_E>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
nand: nand-controller@8c800 {
compatible = "amlogic,meson-axg-nfc";
reg = <0x0 0x8c800 0x0 0x100>, <0x0 0x8c000 0x0 0x4>;
reg-names = "nfc", "emmc";
interrupts = <GIC_SPI 175 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkc_periphs CLKID_SD_EMMC_C>,
<&clkc_pll CLKID_FCLK_DIV2>;
clock-names = "core", "device";
status = "disabled";
};
uart_b: serial@7a000 {
compatible = "amlogic,meson-s4-uart",
"amlogic,meson-ao-uart";
reg = <0x0 0x7a000 0x0 0x18>;
interrupts = <GIC_SPI 169 IRQ_TYPE_EDGE_RISING>;
status = "disabled";
clocks = <&xtal>, <&xtal>, <&xtal>;
clocks = <&xtal>, <&clkc_periphs CLKID_UART_B>, <&xtal>;
clock-names = "xtal", "pclk", "baud";
status = "disabled";
};
reset: reset-controller@2000 {
@ -154,5 +483,30 @@ hwrng: rng@440788 {
reg = <0x0 0x440788 0x0 0x0c>;
};
};
ethmac: ethernet@fdc00000 {
compatible = "amlogic,meson-axg-dwmac",
"snps,dwmac-3.70a",
"snps,dwmac";
reg = <0x0 0xfdc00000 0x0 0x10000>,
<0x0 0xfe024000 0x0 0x8>;
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "macirq";
power-domains = <&pwrc PWRC_S4_ETH_ID>;
clocks = <&clkc_periphs CLKID_ETH>,
<&clkc_pll CLKID_FCLK_DIV2>,
<&clkc_pll CLKID_MPLL2>;
clock-names = "stmmaceth", "clkin0", "clkin1";
rx-fifo-depth = <4096>;
tx-fifo-depth = <2048>;
status = "disabled";
mdio0: mdio {
#address-cells = <1>;
#size-cells = <0>;
compatible = "snps,dwmac-mdio";
};
};
};
};

1
arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
View file

@ -32,7 +32,6 @@ dmics: audio-codec-1 {
compatible = "dmic-codec";
num-channels = <2>;
wakeup-delay-ms = <50>;
status = "okay";
sound-name-prefix = "MIC";
};