github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Amlogic ARM DT changes for v6.4:

Browse Source 
- adjust order of some compatibles
 - meson8: add the xtal_32k_out pin
 - meson8: add the SDXC_A pins
 - mxiii-plus: Enable Bluetooth and WiFi support
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmQr6dIACgkQd9zb2sjI
 SdGIxQ//ZpbqL6CT8CFWxRiat+vP7t5XqJKug/tMPVAurGSVqelNrPqnUUZbkOWo
 ycTNIhEIbZFh89pH0C/NtTV84Pu14z6Z/lie6/RXudoy5jaH9mgNM+VZKIJlKxFb
 EhAabAlWOYooSbP3Am5WyH5QvFU9tybogIDTRLU+mgctuEDEgGC1kQdpxLKmjLjv
 pD7TvT85OSZNH6oustn0vZ17EIvFePF3ZJ649o05sdq0X6xQBSk+R5zFgk0X1hNY
 VJJEgvL8IBa7Qjd8Pnv1yZoc0P8G09oMwqdiLMq/XjEA/r7bNEUwQqeQfGq31i8T
 ZWHtzzoenLMrJ5V6UKG3qrI8ksXjx8wr6U0n4AnBH9URSqRBs4S9bbOgR3UCt5fN
 L9IlAOd+yy8B5TO/aAsPUYdpAr7cRIl/K+KaLanhyf+4NLgti2mTJjYk2bFf/DmS
 Z1+CTOd8Qkzckt7c7T4JxRWF+tLSUPi/krXBbzupK5wPBd9AxYGWiD2TBErb1WCA
 G3+AxuKT8RjE4BZtrMsAaWCNLtgY2C5yixIvh3wYL6ZVKGi7odv6kAbL/yaT2MbY
 G/t6iiug7rJfW25xyYp6SKkREUtR4au+kzHnt/KLUDUBwpBZ38pKFRShA4r3/cvH
 S5sGKv05OxbC//9pLhMsvrPUG/1V3RFgCGtGTlxqjPCfjvlXto0=
 =gZEJ
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmQsM9sACgkQmmx57+YA
 GNkzjQ/7BfkCJ6t+XPnF792Zc3o+nNopuvIIMUfc11H+yA8mkkHdNDgpIlwVQYgB
 4VooSfVwQJg9HrgekRgybCf/5lasN7EFk1NBrlZQU6U3ahH2oPBKJPPsoaMtoTyU
 ScMf+3+YXgv2nx6ZJ8dbSi2la1ElKhXv6QbSl08HvueUNkAW4ybdnwbJU4PkwplT
 WGSLAPtAt6NUcmeAOASXBd8lNdqhRyjfswgB+uPNqeBewYvkyxbl5NPBiCTCf6yx
 4u3QLkSgiASRxjsTwBkK+cklxl6Z/A2vCOQV7oi0mclAjygypdlD3qimyHmZEBLm
 7/dRtakvQMiPdztgDVnsQjGsqRinJiswbZCmSkSkM39kuzdO3/MzbwOKVKlNP4IC
 eFyWV+7a7Ykshll4ij3QjUavjHqf358hfIng7FbmUc368hTCDxY5rZ6n8CMP+MjF
 3vF/jaDwnjO3j7McxRHwqPHem6ezp2HqTL4abBWyHjiK83mz+EBiYKw96ktk9V+s
 W44WiL2YnQEWVfYFXf2dmK7mpYeqfdZtjuRcQqEjCZVsu4Sm+ZzwYYlvymgPTtI3
 /MNoVvAhgcD5tt6k9grqsA5Dg6OrX5OngcVyI2+KQHZtCPdtFyYMJTAyYpVfX2zn
 dUqpt2gNqlJUchFuUcpxhbxNfoaHnWK5SycxrCdSy0k7/5GL1m4=
 =juyK
 -----END PGP SIGNATURE-----

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

Amlogic ARM DT changes for v6.4:
- adjust order of some compatibles
- meson8: add the xtal_32k_out pin
- meson8: add the SDXC_A pins
- mxiii-plus: Enable Bluetooth and WiFi support

* tag 'amlogic-arm-dt-for-v6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  ARM: dts: meson8m2: mxiii-plus: Enable Bluetooth and WiFi support
  ARM: dts: meson8: add the SDXC_A pins
  ARM: dts: meson8: add the xtal_32k_out pin
  arm: dts: meson: adjust order of some compatibles

Link: https://lore.kernel.org/r/eb1f32f8-822d-9cfc-fca6-9e044bf4a5ab@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-04-04 16:27:38 +02:00
commit 9514e51932
3 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/boot/dts/meson8.dtsi
View File

@ -506,6 +506,15 @@ mux {
};
};
sdxc_a_pins: sdxc-a {
mux {
groups = "sdxc_d0_a", "sdxc_d13_a",
"sdxc_clk_a", "sdxc_cmd_a";
function = "sdxc_a";
bias-pull-up;
};
};
sdxc_b_pins: sdxc-b {
mux {
groups = "sdxc_d0_b", "sdxc_d13_b",
@ -568,6 +577,14 @@ mux {
bias-disable;
};
};
xtal_32k_out_pins: xtal-32k-out {
mux {
groups = "xtal_32k_out";
function = "xtal";
bias-disable;
};
};
};
};

4
arch/arm/boot/dts/meson8b.dtsi
View File

@ -580,8 +580,8 @@ &ethmac {
};
&gpio_intc {
compatible = "amlogic,meson-gpio-intc",
"amlogic,meson8b-gpio-intc";
compatible = "amlogic,meson8b-gpio-intc",
"amlogic,meson-gpio-intc";
status = "okay";
};

48
arch/arm/boot/dts/meson8m2-mxiii-plus.dts
View File

@ -19,7 +19,6 @@ aliases {
ethernet0 = &ethmac;
i2c0 = &i2c_AO;
serial0 = &uart_AO;
serial1 = &uart_A;
mmc0 = &sd_card_slot;
};
@ -45,12 +44,32 @@ button-function {
};
};
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
pinctrl-0 = <&xtal_32k_out_pins>;
pinctrl-names = "default";
reset-gpios = <&gpio GPIOX_11 GPIO_ACTIVE_LOW>,
<&gpio_ao GPIOAO_6 GPIO_ACTIVE_LOW>;
clocks = <&xtal_32k_out>;
clock-names = "ext_clock";
};
vcc_3v3: regulator-vcc3v3 {
compatible = "regulator-fixed";
regulator-name = "VCC3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
xtal_32k_out: xtal-32k-out-clk {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <32768>;
clock-output-names = "xtal_32k_out";
};
};
&cpu0 {
@ -192,6 +211,27 @@ &saradc {
vref-supply = <&vddio_ao1v8>;
};
/* SDIO wifi */
&sdhc {
status = "okay";
pinctrl-0 = <&sdxc_a_pins>;
pinctrl-names = "default";
bus-width = <4>;
max-frequency = <50000000>;
disable-wp;
non-removable;
cap-mmc-highspeed;
cap-sd-highspeed;
mmc-pwrseq = <&sdio_pwrseq>;
vmmc-supply = <&vcc_3v3>;
vqmmc-supply = <&vcc_3v3>;
};
&sdio {
status = "okay";
@ -222,6 +262,12 @@ &uart_A {
pinctrl-0 = <&uart_a1_pins>, <&uart_a1_cts_rts_pins>;
pinctrl-names = "default";
uart-has-rtscts;
bluetooth {
compatible = "brcm,bcm20702a1";
shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>;
max-speed = <2000000>;
};
};
&uart_AO {