Amlogic ARM64 DT changes for v6.13:

- Add PWM nodes for Amlogic A1 & C3
 - Addd missing power-domains properties
 - Fix G12 uart node name
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmcrcasACgkQd9zb2sjI
 SdFYnQ//WJnC0RAlDA2lTLK2VbTkbrjcMzUmZt1dbfIYu8lYbeh0hbBZgXbR0QEn
 4noWnCMKDcVtGJJX88FubpT+Nvh9rbGft3nDMe/9Z+iei544nFczo5p45QO4G2PA
 5sW8YG4hHM2BWtX7uo4ohKwfVf5Vh0QhP5h7SH1uZU/Qoif8tbOCHrN4XoXX16K7
 ejIRp97vuL1QqcOaR5KTm+m970Xp1y2zCvXwWR93AsoEtmQZOIz648cVj9md55Gx
 OUMC7VkQTFn0dWVBOd6e+ANYZWgH7sL5sfiv5VeZBKsCEmG/lLGdR5p7KxbU9Dp5
 xyt+Dz6Tf6oDkW8jpliA/XFiDuKdRjXTVCZK7nbx+Dcw/icWhblTEPToVWLh8fFR
 KK5mZUxrdO8VnjCi35BnzYZDajAO9DUPCWefX6SdNbrDhlI2FmluSLwx3f0xzf1F
 wrqSMB3saHfD8iiTpvU5ehvR/3mXp78TnQG5jcDsFdXR5qbbidsrzJ15sKKj/gwo
 oOn2R6rHG0mTdxbNyJw/w3Z3aVARmF7pMch6KwxYkwjniob+r6+MA4pPNv6NgRgQ
 JT6O3vMprjKEIilLUNYbPh+6pijZtkSUXob34unHTQBJ8HHtKn7WzospytMBFdis
 XIbiy4ZncdLAh+WnIiuMxMCbDChz9O2twe2AdU8jHRuzCISeYeA=
 =wkwh
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmczzfoACgkQYKtH/8kJ
 UifpyhAA2JGpiKqGPlHzrmn7FcPYqH5r1RsvSD7sZACEkiWO7CZ/FfP8qZ595RXc
 4ugsBKmfaHg1Y3sZdp6Pa6IHa8xehBOqWhgINduQarabNAhRuV3jIUTj8D6l1wfg
 CZl9sRkNzAnb+0N9s9JO6Cvb5on5/8pgeRz4s+7gRrY0WRImHobUbINwlo2aOmf7
 rmbS1cU8IVxjWfHPg2oDr2z4npMl9POtywO4/xQMnH6W0Jpi7wAJV1nSvsqTEdpo
 uTg3/ioWl/9icp0CAKRBWpGngiy6wkOUOx+bVTPPw7wHQfqyr1cFxl9Vhr6ueDHd
 Z70wH9JRn93KWnQEQM0pzMuQYJ+a4/xpljTpBbTqj06qYRvGk74Bp1o5KCQtW0me
 q6YH+GFASL7S41sGtHow15gb7NiRZzai8OStyi7mTNU5iQDDONgu6q/LcI4WRjWI
 4g8LsmbzFozjawUV6eU1QeFyj8DV9WsC1AROulVgpTJz9tcGDEgNr8YdU6dbYMYa
 2Uo/MQsBtUCsUJQbZQSpwPNIFM7zQFRGaTdli5c4dSPA5owrqaB5iAZUEY28I9f3
 hK8hlXsgKNtMqKB2q5qU72A4OB5IQ2m7UZ0XIkCaMDQG8zUlE9CXv/0Tr1NSe2nd
 c3d0m5UAN1bpPAMQkZYGVjZcQf+cBhj1nQ7ePmMSptdkf56m2OY=
 =s/ur
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-arm64-dt-for-v6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt

Amlogic ARM64 DT changes for v6.13:
- Add PWM nodes for Amlogic A1 & C3
- Addd missing power-domains properties
- Fix G12 uart node name

* tag 'amlogic-arm64-dt-for-v6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: amlogic: Add Amlogic C3 PWM
  arm64: dts: meson-g12-common: fix uart-ao-a typo
  arm64: dts: meson: a1: bind power domain to temperature sensor
  arm64: dts: meson: a1: add definitions for meson PWM

Link: https://lore.kernel.org/r/6fb3d64a-3913-4db0-9cdc-336af32a88a9@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-11-12 22:51:53 +01:00
commit f0cba6f523
3 changed files with 581 additions and 1 deletions

View File

@ -410,6 +410,300 @@ mux {
drive-strength-microamp = <4000>;
};
};
pwm_a_pins1: pwm-a-pins1 {
mux {
groups = "pwm_a";
function = "pwm_a";
};
};
pwm_b_pins1: pwm-b-pins1 {
mux {
groups = "pwm_b";
function = "pwm_b";
};
};
pwm_c_pins1: pwm-c-pins1 {
mux {
groups = "pwm_c";
function = "pwm_c";
};
};
pwm_d_pins1: pwm-d-pins1 {
mux {
groups = "pwm_d";
function = "pwm_d";
};
};
pwm_e_pins1: pwm-e-pins1 {
mux {
groups = "pwm_e";
function = "pwm_e";
};
};
pwm_f_pins1: pwm-f-pins1 {
mux {
groups = "pwm_f";
function = "pwm_f";
};
};
pwm_g_pins1: pwm-g-pins1 {
mux {
groups = "pwm_g_b";
function = "pwm_g";
};
};
pwm_g_pins2: pwm-g-pins2 {
mux {
groups = "pwm_g_c";
function = "pwm_g";
};
};
pwm_g_pins3: pwm-g-pins3 {
mux {
groups = "pwm_g_d";
function = "pwm_g";
};
};
pwm_g_pins4: pwm-g-pins4 {
mux {
groups = "pwm_g_x0";
function = "pwm_g";
};
};
pwm_g_pins5: pwm-g-pins5 {
mux {
groups = "pwm_g_x8";
function = "pwm_g";
};
};
pwm_h_pins1: pwm-h-pins1 {
mux {
groups = "pwm_h_b";
function = "pwm_h";
};
};
pwm_h_pins2: pwm-h-pins2 {
mux {
groups = "pwm_h_c";
function = "pwm_h";
};
};
pwm_h_pins3: pwm-h-pins3 {
mux {
groups = "pwm_h_d";
function = "pwm_h";
};
};
pwm_h_pins4: pwm-h-pins4 {
mux {
groups = "pwm_h_x1";
function = "pwm_h";
};
};
pwm_h_pins5: pwm-h-pins5 {
mux {
groups = "pwm_h_x9";
function = "pwm_h";
};
};
pwm_i_pins1: pwm-i-pins1 {
mux {
groups = "pwm_i_b";
function = "pwm_i";
};
};
pwm_i_pins2: pwm-i-pins2 {
mux {
groups = "pwm_i_c";
function = "pwm_i";
};
};
pwm_i_pins3: pwm-i-pins3 {
mux {
groups = "pwm_i_d";
function = "pwm_i";
};
};
pwm_i_pins4: pwm-i-pins4 {
mux {
groups = "pwm_i_x2";
function = "pwm_i";
};
};
pwm_i_pins5: pwm-i-pins5 {
mux {
groups = "pwm_i_x10";
function = "pwm_i";
};
};
pwm_j_pins1: pwm-j-pins1 {
mux {
groups = "pwm_j_c";
function = "pwm_j";
};
};
pwm_j_pins2: pwm-j-pins2 {
mux {
groups = "pwm_j_d";
function = "pwm_j";
};
};
pwm_j_pins3: pwm-j-pins3 {
mux {
groups = "pwm_j_b";
function = "pwm_j";
};
};
pwm_j_pins4: pwm-j-pins4 {
mux {
groups = "pwm_j_x3";
function = "pwm_j";
};
};
pwm_j_pins5: pwm-j-pins5 {
mux {
groups = "pwm_j_x12";
function = "pwm_j";
};
};
pwm_k_pins1: pwm-k-pins1 {
mux {
groups = "pwm_k_c";
function = "pwm_k";
};
};
pwm_k_pins2: pwm-k-pins2 {
mux {
groups = "pwm_k_d";
function = "pwm_k";
};
};
pwm_k_pins3: pwm-k-pins3 {
mux {
groups = "pwm_k_b";
function = "pwm_k";
};
};
pwm_k_pins4: pwm-k-pins4 {
mux {
groups = "pwm_k_x4";
function = "pwm_k";
};
};
pwm_k_pins5: pwm-k-pins5 {
mux {
groups = "pwm_k_x13";
function = "pwm_k";
};
};
pwm_l_pins1: pwm-l-pins1 {
mux {
groups = "pwm_l_c";
function = "pwm_l";
};
};
pwm_l_pins2: pwm-l-pins2 {
mux {
groups = "pwm_l_x";
function = "pwm_l";
};
};
pwm_l_pins3: pwm-l-pins3 {
mux {
groups = "pwm_l_b";
function = "pwm_l";
};
};
pwm_l_pins4: pwm-l-pins4 {
mux {
groups = "pwm_l_a";
function = "pwm_l";
};
};
pwm_m_pins1: pwm-m-pins1 {
mux {
groups = "pwm_m_c";
function = "pwm_m";
};
};
pwm_m_pins2: pwm-m-pins2 {
mux {
groups = "pwm_m_x";
function = "pwm_m";
};
};
pwm_m_pins3: pwm-m-pins3 {
mux {
groups = "pwm_m_a";
function = "pwm_m";
};
};
pwm_m_pins4: pwm-m-pins4 {
mux {
groups = "pwm_m_b";
function = "pwm_m";
};
};
pwm_n_pins1: pwm-n-pins1 {
mux {
groups = "pwm_n_x";
function = "pwm_n";
};
};
pwm_n_pins2: pwm-n-pins2 {
mux {
groups = "pwm_n_a";
function = "pwm_n";
};
};
pwm_n_pins3: pwm-n-pins3 {
mux {
groups = "pwm_n_b";
function = "pwm_n";
};
};
};
gpio_intc: interrupt-controller@4080 {
@ -490,6 +784,16 @@ spicc1: spi@52000 {
status = "disabled";
};
pwm_mn: pwm@54000 {
compatible = "amlogic,c3-pwm",
"amlogic,meson-s4-pwm";
reg = <0x0 54000 0x0 0x24>;
clocks = <&clkc_periphs CLKID_PWM_M>,
<&clkc_periphs CLKID_PWM_N>;
#pwm-cells = <3>;
status = "disabled";
};
spifc: spi@56000 {
compatible = "amlogic,a1-spifc";
reg = <0x0 0x56000 0x0 0x290>;
@ -499,6 +803,66 @@ spifc: spi@56000 {
status = "disabled";
};
pwm_ab: pwm@58000 {
compatible = "amlogic,c3-pwm",
"amlogic,meson-s4-pwm";
reg = <0x0 0x58000 0x0 0x24>;
clocks = <&clkc_periphs CLKID_PWM_A>,
<&clkc_periphs CLKID_PWM_B>;
#pwm-cells = <3>;
status = "disabled";
};
pwm_cd: pwm@5a000 {
compatible = "amlogic,c3-pwm",
"amlogic,meson-s4-pwm";
reg = <0x0 0x5a000 0x0 0x24>;
clocks = <&clkc_periphs CLKID_PWM_C>,
<&clkc_periphs CLKID_PWM_D>;
#pwm-cells = <3>;
status = "disabled";
};
pwm_ef: pwm@5c000 {
compatible = "amlogic,c3-pwm",
"amlogic,meson-s4-pwm";
reg = <0x0 0x5c000 0x0 0x24>;
clocks = <&clkc_periphs CLKID_PWM_E>,
<&clkc_periphs CLKID_PWM_F>;
#pwm-cells = <3>;
status = "disabled";
};
pwm_gh: pwm@5e000 {
compatible = "amlogic,c3-pwm",
"amlogic,meson-s4-pwm";
reg = <0x0 0x5e000 0x0 0x24>;
clocks = <&clkc_periphs CLKID_PWM_G>,
<&clkc_periphs CLKID_PWM_H>;
#pwm-cells = <3>;
status = "disabled";
};
pwm_ij: pwm@60000 {
compatible = "amlogic,c3-pwm",
"amlogic,meson-s4-pwm";
reg = <0x0 0x60000 0x0 0x24>;
clocks = <&clkc_periphs CLKID_PWM_I>,
<&clkc_periphs CLKID_PWM_J>;
#pwm-cells = <3>;
status = "disabled";
};
pwm_kl: pwm@62000 {
compatible = "amlogic,c3-pwm",
"amlogic,meson-s4-pwm";
reg = <0x0 0x62000 0x0 0x24>;
clocks = <&clkc_periphs CLKID_PWM_K>,
<&clkc_periphs CLKID_PWM_L>;
#pwm-cells = <3>;
status = "disabled";
};
i2c0: i2c@66000 {
compatible = "amlogic,meson-axg-i2c";
reg = <0x0 0x66000 0x0 0x24>;

View File

@ -245,6 +245,188 @@ mux {
};
};
pwm_a_pins1: pwm-a-pins1 {
mux {
groups = "pwm_a_x6";
function = "pwm_a";
};
};
pwm_a_pins2: pwm-a-pins2 {
mux {
groups = "pwm_a_x7";
function = "pwm_a";
};
};
pwm_a_pins3: pwm-a-pins3 {
mux {
groups = "pwm_a_f10";
function = "pwm_a";
};
};
pwm_a_pins4: pwm-a-pins4 {
mux {
groups = "pwm_a_f6";
function = "pwm_a";
};
};
pwm_a_pins5: pwm-a-pins5 {
mux {
groups = "pwm_a_a";
function = "pwm_a";
};
};
pwm_b_pins1: pwm-b-pins1 {
mux {
groups = "pwm_b_x";
function = "pwm_b";
};
};
pwm_b_pins2: pwm-b-pins2 {
mux {
groups = "pwm_b_f";
function = "pwm_b";
};
};
pwm_b_pins3: pwm-b-pins3 {
mux {
groups = "pwm_b_a";
function = "pwm_b";
};
};
pwm_c_pins1: pwm-c-pins1 {
mux {
groups = "pwm_c_x";
function = "pwm_c";
};
};
pwm_c_pins2: pwm-c-pins2 {
mux {
groups = "pwm_c_f3";
function = "pwm_c";
};
};
pwm_c_pins3: pwm-c-pins3 {
mux {
groups = "pwm_c_f8";
function = "pwm_c";
};
};
pwm_c_pins4: pwm-c-pins4 {
mux {
groups = "pwm_c_a";
function = "pwm_c";
};
};
pwm_d_pins1: pwm-d-pins1 {
mux {
groups = "pwm_d_x15";
function = "pwm_d";
};
};
pwm_d_pins2: pwm-d-pins2 {
mux {
groups = "pwm_d_x13";
function = "pwm_d";
};
};
pwm_d_pins3: pwm-d-pins3 {
mux {
groups = "pwm_d_x10";
function = "pwm_d";
};
};
pwm_d_pins4: pwm-d-pins4 {
mux {
groups = "pwm_d_f";
function = "pwm_d";
};
};
pwm_e_pins1: pwm-e-pins1 {
mux {
groups = "pwm_e_p";
function = "pwm_e";
};
};
pwm_e_pins2: pwm-e-pins2 {
mux {
groups = "pwm_e_x16";
function = "pwm_e";
};
};
pwm_e_pins3: pwm-e-pins3 {
mux {
groups = "pwm_e_x14";
function = "pwm_e";
};
};
pwm_e_pins4: pwm-e-pins4 {
mux {
groups = "pwm_e_x2";
function = "pwm_e";
};
};
pwm_e_pins5: pwm-e-pins5 {
mux {
groups = "pwm_e_f";
function = "pwm_e";
};
};
pwm_e_pins6: pwm-e-pins6 {
mux {
groups = "pwm_e_a";
function = "pwm_e";
};
};
pwm_f_pins1: pwm-f-pins1 {
mux {
groups = "pwm_f_b";
function = "pwm_f";
};
};
pwm_f_pins2: pwm-f-pins2 {
mux {
groups = "pwm_f_x";
function = "pwm_f";
};
};
pwm_f_pins3: pwm-f-pins3 {
mux {
groups = "pwm_f_f4";
function = "pwm_f";
};
};
pwm_f_pins4: pwm-f-pins4 {
mux {
groups = "pwm_f_f12";
function = "pwm_f";
};
};
sdio_pins: sdio {
mux0 {
groups = "sdcard_d0_x",
@ -340,6 +522,28 @@ uart_AO_B: serial@2000 {
status = "disabled";
};
pwm_ab: pwm@2400 {
compatible = "amlogic,meson-a1-pwm",
"amlogic,meson-s4-pwm";
reg = <0x0 0x2400 0x0 0x24>;
#pwm-cells = <3>;
clocks = <&clkc_periphs CLKID_PWM_A>,
<&clkc_periphs CLKID_PWM_B>;
power-domains = <&pwrc PWRC_I2C_ID>;
status = "disabled";
};
pwm_cd: pwm@2800 {
compatible = "amlogic,meson-a1-pwm",
"amlogic,meson-s4-pwm";
reg = <0x0 0x2800 0x0 0x24>;
#pwm-cells = <3>;
clocks = <&clkc_periphs CLKID_PWM_C>,
<&clkc_periphs CLKID_PWM_D>;
power-domains = <&pwrc PWRC_I2C_ID>;
status = "disabled";
};
saradc: adc@2c00 {
compatible = "amlogic,meson-g12a-saradc",
"amlogic,meson-saradc";
@ -409,6 +613,7 @@ cpu_temp: temperature-sensor@4c00 {
assigned-clock-rates = <500000>;
#thermal-sensor-cells = <0>;
amlogic,ao-secure = <&sec_AO>;
power-domains = <&pwrc PWRC_I2C_ID>;
};
hwrng: rng@5118 {
@ -423,6 +628,17 @@ sec_AO: ao-secure@5a20 {
amlogic,has-chip-id;
};
pwm_ef: pwm@5400 {
compatible = "amlogic,meson-a1-pwm",
"amlogic,meson-s4-pwm";
reg = <0x0 0x5400 0x0 0x24>;
#pwm-cells = <3>;
clocks = <&clkc_periphs CLKID_PWM_E>,
<&clkc_periphs CLKID_PWM_F>;
power-domains = <&pwrc PWRC_I2C_ID>;
status = "disabled";
};
clkc_pll: pll-clock-controller@7c80 {
compatible = "amlogic,a1-pll-clkc";
reg = <0 0x7c80 0 0x18c>;

View File

@ -1913,7 +1913,7 @@ mux {
};
};
uart_ao_a_pins: uart-a-ao {
uart_ao_a_pins: uart-ao-a {
mux {
groups = "uart_ao_a_tx",
"uart_ao_a_rx";