i.MX ARM device tree change for 6.14:

- Clean up TQMa7x device trees (Alexander Stein)
 - Correct node name pattern for mdio-gpio devices (Fabio Estevam)
 - Update deprecated GPIO properties for Generic ASoC Sound Card device
   (Geert Uytterhoeven)
 - Set USB dr_mode property to OTG explicitly for imx6qdl-sabresd based
   boards (Hui Wang)
 - Update MAINTAINERS entry for DH electronics DHSOM boards (Marek Vasut)
 - A series from Stefan Kerkmann to add phy-3p0-supply for usb phys
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAmd6UIIUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM4j6AgAk1FMLUFE/xk502BEqOUXvQVaFfqv
 IYo2ZDZrCsijdvfSoNAmgeCbT7MUgk6bBTM74K8xLvQPUi4OAOmuIloWyQXnMeiU
 BL0BQt2t6a4HdufpicrMpcVeot4TqkuZ3BGJ1I8v9eYbjA8VikNbOx77kJLmK/l0
 hXvis1S7TOMkZaiV3yhWpgdQvxfHiLoRPjwyNd5SAh/K69fy1pe3cUKAR7toTpx7
 eG5Tk/mzLVY/rRX8/HuJ0Da3dyGUD45i11i94TVTkHbSTiiX6N8lqjwdVsuXHwYS
 ANi/F+2kBnRO0kFk7l5o/dE1+ITMEK7nCg4lDSKHESSeNzjBx+SFXCUV3Q==
 =yXWY
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmeJDE0ACgkQYKtH/8kJ
 UieFRw/+KCoIkdIaejroQs4KWN7VzzBod7+HzqNe4ZPHDh97M0qMQ8dKOvbTUlNf
 RMoHt1JnLAzpArZrgWN5lB7pqoBPQYfdft4gEmpEt85CIzuXn4EVXCS7FTxtxKmS
 eOiipfqyX8UVOQTokEYWOHTy6sSY09c4pCuHT0Ld56ev7fc+x5OFCxJi2lfXRzGt
 /S//fQUjttEBasWk50voUSUFswRdAKNJ0cn6rT3eEs8r06Y2Sz35qMaJ7G3+YD/E
 yrIcq3Jp2PrksJASbyzAXkLSoVw9FGds/avHK5yXk0A0uxnkmADH9MfMgZOb/1N5
 sAZkhplmcKwGX8WrjPIpcAsGHRqFC9E++4kYP9qA5K3OGAjemuzrNOdHX218o2t+
 M2lrlNEhxszEYZbn/i8kss3tIjRx0NoyHw6D7wAr7Or5vf9K4WKSnbt4M5+HP8bT
 ef7u+/3vZP1t7bXeWD8fi+fclxk3lDEsCsioPLd2S09J6ZRFy17o2zyvCv5w6Bo9
 LrnHzyYHiWl3yk9AiAqt1C11NtuVAvkgdFhgTl7bmxe689nGGLjKBccc/YBGk80E
 Ivhvj99+7O8pVrC9oCT4d3pBI7c67OY2a1Vw40Ls8ktGtWLwag7CEjJwltlF/GkD
 m95oKyzZU4N27+r67Mf2nU/O/TFcxQspjht/IdNADddW5NFvAXQ=
 =cQmc
 -----END PGP SIGNATURE-----

Merge tag 'imx-dt-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt

i.MX ARM device tree change for 6.14:

- Clean up TQMa7x device trees (Alexander Stein)
- Correct node name pattern for mdio-gpio devices (Fabio Estevam)
- Update deprecated GPIO properties for Generic ASoC Sound Card device
  (Geert Uytterhoeven)
- Set USB dr_mode property to OTG explicitly for imx6qdl-sabresd based
  boards (Hui Wang)
- Update MAINTAINERS entry for DH electronics DHSOM boards (Marek Vasut)
- A series from Stefan Kerkmann to add phy-3p0-supply for usb phys

* tag 'imx-dt-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx: Use the correct mdio pattern
  ARM: dts: imx6qdl-sabresd: add dr_mode to usbotg
  ARM: dts: imx6qdl-apalis: Change to "adi,force-bt656-4"
  ARM: dts: imx6sx: add phy-3p0-supply to usb phys
  ARM: dts: imx6sl: add phy-3p0-supply to usb phys
  ARM: dts: imx6qdl: add phy-3p0-supply to usb phys
  MAINTAINERS: Update entry for DH electronics DHSOM SoMs and boards
  ARM: dts: imx7[d]-mba7: add Ethernet PHY IRQ support
  ARM: dts: imx7-mba7: Remove duplicated power supply
  ARM: dts: imx7-mba7: Fix SD card vmmc-supply
  ARM: dts: imx7-mba7: Add 3.3V and 5.0V regulators
  ARM: dts: imx7-tqma7: add missing vs-supply for LM75A (rev. 01xxx)
  ARM: dts: imx7-tqma7: Remove superfluous status="okay" property
  ARM: dts: imx7-mba7: remove LVDS transmitter regulator
  ARM: dts: imx: Switch to {hp,mic}-det-gpios

Link: https://lore.kernel.org/r/20250105095139.714590-3-shawnguo2@yeah.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-01-16 14:40:29 +01:00
commit baba9e1db2
17 changed files with 48 additions and 73 deletions

View File

@ -6650,19 +6650,14 @@ L: linux-rtc@vger.kernel.org
S: Maintained
F: drivers/rtc/rtc-sd2405al.c
DH ELECTRONICS IMX6 DHCOM/DHCOR BOARD SUPPORT
DH ELECTRONICS DHSOM SOM AND BOARD SUPPORT
M: Christoph Niedermaier <cniedermaier@dh-electronics.com>
L: kernel@dh-electronics.com
S: Maintained
F: arch/arm/boot/dts/nxp/imx/imx6*-dhcom-*
F: arch/arm/boot/dts/nxp/imx/imx6*-dhcor-*
DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT
M: Marek Vasut <marex@denx.de>
L: kernel@dh-electronics.com
S: Maintained
F: arch/arm/boot/dts/st/stm32mp1*-dhcom-*
F: arch/arm/boot/dts/st/stm32mp1*-dhcor-*
N: dhcom
N: dhcor
N: dhsom
DIALOG SEMICONDUCTOR DRIVERS
M: Support Opensource <support.opensource@diasemi.com>

View File

@ -160,7 +160,7 @@ eeprom@0 {
};
};
mdio_gpio: mdio-gpio {
mdio_gpio: mdio {
compatible = "virtual,mdio-gpio";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_swmdio>;

View File

@ -37,7 +37,7 @@ usb_vbus: regulator-usb-vbus {
regulator-max-microvolt = <5000000>;
};
mdio_gpio: mdio-gpio {
mdio_gpio: mdio {
compatible = "virtual,mdio-gpio";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_swmdio>;

View File

@ -94,7 +94,7 @@ aliases {
mdio-gpio0 = &mdio0;
};
mdio0: mdio-gpio {
mdio0: mdio {
compatible = "virtual,mdio-gpio";
gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>, /* mdc */
<&gpio2 7 GPIO_ACTIVE_HIGH>; /* mdio */

View File

@ -691,7 +691,7 @@ &i2c3 {
adv_7280: adv7280@21 {
compatible = "adi,adv7280";
adv,force-bt656-4;
adi,force-bt656-4;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ipu1_csi0>;
reg = <0x21>;

View File

@ -113,8 +113,8 @@ sound {
"DMICDAT", "DMIC";
mux-int-port = <2>;
mux-ext-port = <3>;
hp-det-gpio = <&gpio7 8 GPIO_ACTIVE_LOW>;
mic-det-gpio = <&gpio1 9 GPIO_ACTIVE_LOW>;
hp-det-gpios = <&gpio7 8 GPIO_ACTIVE_LOW>;
mic-det-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
};
backlight_lvds: backlight-lvds {
@ -804,6 +804,7 @@ &usbotg {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbotg>;
disable-over-current;
dr_mode = "otg";
status = "okay";
};

View File

@ -711,8 +711,8 @@ reg_vdd1p1: regulator-1p1 {
reg_vdd3p0: regulator-3p0 {
compatible = "fsl,anatop-regulator";
regulator-name = "vdd3p0";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <3150000>;
regulator-min-microvolt = <2625000>;
regulator-max-microvolt = <3400000>;
regulator-always-on;
anatop-reg-offset = <0x120>;
anatop-vol-bit-shift = <8>;
@ -806,6 +806,7 @@ usbphy1: usbphy@20c9000 {
reg = <0x020c9000 0x1000>;
interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6QDL_CLK_USBPHY1>;
phy-3p0-supply = <&reg_vdd3p0>;
fsl,anatop = <&anatop>;
};
@ -814,6 +815,7 @@ usbphy2: usbphy@20ca000 {
reg = <0x020ca000 0x1000>;
interrupts = <0 45 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6QDL_CLK_USBPHY2>;
phy-3p0-supply = <&reg_vdd3p0>;
fsl,anatop = <&anatop>;
};

View File

@ -108,7 +108,7 @@ sound {
"IN3R", "AMIC";
mux-int-port = <2>;
mux-ext-port = <3>;
hp-det-gpio = <&gpio4 19 GPIO_ACTIVE_LOW>;
hp-det-gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
};
panel {

View File

@ -546,8 +546,8 @@ reg_vdd1p1: regulator-1p1 {
reg_vdd3p0: regulator-3p0 {
compatible = "fsl,anatop-regulator";
regulator-name = "vdd3p0";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <3150000>;
regulator-min-microvolt = <2625000>;
regulator-max-microvolt = <3400000>;
regulator-always-on;
anatop-reg-offset = <0x120>;
anatop-vol-bit-shift = <8>;
@ -640,6 +640,7 @@ usbphy1: usbphy@20c9000 {
reg = <0x020c9000 0x1000>;
interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_USBPHY1>;
phy-3p0-supply = <&reg_vdd3p0>;
fsl,anatop = <&anatop>;
};
@ -648,6 +649,7 @@ usbphy2: usbphy@20ca000 {
reg = <0x020ca000 0x1000>;
interrupts = <0 45 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_USBPHY2>;
phy-3p0-supply = <&reg_vdd3p0>;
fsl,anatop = <&anatop>;
};

View File

@ -157,7 +157,7 @@ sound {
"IN3R", "AMIC";
mux-int-port = <2>;
mux-ext-port = <3>;
hp-det-gpio = <&gpio4 24 GPIO_ACTIVE_LOW>;
hp-det-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
};
};

View File

@ -167,7 +167,7 @@ sound {
"IN3R", "AMIC";
mux-int-port = <2>;
mux-ext-port = <6>;
hp-det-gpio = <&gpio1 17 GPIO_ACTIVE_LOW>;
hp-det-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
};
panel {

View File

@ -637,8 +637,8 @@ reg_vdd1p1: regulator-1p1 {
reg_vdd3p0: regulator-3p0 {
compatible = "fsl,anatop-regulator";
regulator-name = "vdd3p0";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <3150000>;
regulator-min-microvolt = <2625000>;
regulator-max-microvolt = <3400000>;
regulator-always-on;
anatop-reg-offset = <0x120>;
anatop-vol-bit-shift = <8>;
@ -731,6 +731,7 @@ usbphy1: usbphy@20c9000 {
reg = <0x020c9000 0x1000>;
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SX_CLK_USBPHY1>;
phy-3p0-supply = <&reg_vdd3p0>;
fsl,anatop = <&anatop>;
};
@ -739,6 +740,7 @@ usbphy2: usbphy@20ca000 {
reg = <0x020ca000 0x1000>;
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SX_CLK_USBPHY2>;
phy-3p0-supply = <&reg_vdd3p0>;
fsl,anatop = <&anatop>;
};

View File

@ -68,7 +68,7 @@ sound-wm8960 {
audio-cpu = <&sai2>;
audio-codec = <&codec>;
audio-asrc = <&asrc>;
hp-det-gpio = <&gpio5 4 0>;
hp-det-gpios = <&gpio5 4 0>;
audio-routing =
"Headphone Jack", "HP_L",
"Headphone Jack", "HP_R",

View File

@ -87,34 +87,6 @@ iio-hwmon {
<&adc2 0>, <&adc2 1>, <&adc2 2>, <&adc2 3>;
};
reg_sd1_vmmc: regulator-sd1-vmmc {
compatible = "regulator-fixed";
regulator-name = "VCC3V3_SD1";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_fec1_pwdn: regulator-fec1-pwdn {
compatible = "regulator-fixed";
regulator-name = "PWDN_FEC1";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
reg_fec2_pwdn: regulator-fec2-pwdn {
compatible = "regulator-fixed";
regulator-name = "PWDN_FEC2";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
compatible = "regulator-fixed";
regulator-name = "VBUS_USBOTG1";
@ -141,6 +113,7 @@ reg_mpcie_1v5: regulator-mpcie-1v5 {
gpio = <&pca9555 12 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-always-on;
vin-supply = <&reg_mba_5v>;
};
reg_mpcie_3v3: regulator-mpcie-3v3 {
@ -151,6 +124,7 @@ reg_mpcie_3v3: regulator-mpcie-3v3 {
gpio = <&pca9555 10 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-always-on;
vin-supply = <&reg_mba_3v3>;
};
reg_mba_12v0: regulator-mba-12v0 {
@ -162,13 +136,18 @@ reg_mba_12v0: regulator-mba-12v0 {
enable-active-high;
};
reg_lvds_transmitter: regulator-lvds-transmitter {
reg_mba_5v: regulator-mba-5v {
compatible = "regulator-fixed";
regulator-name = "#SHTDN_LVDS";
regulator-name = "VCC5V";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
};
reg_mba_3v3: regulator-mba-3v3 {
compatible = "regulator-fixed";
regulator-name = "VCC3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&pca9555 1 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
reg_vref_1v8: regulator-vref-1v8 {
@ -186,14 +165,7 @@ reg_audio_3v3: regulator-audio-3v3 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_vcc_3v3: regulator-vcc-3v3 {
compatible = "regulator-fixed";
regulator-name = "VCC3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
vin-supply = <&reg_mba_3v3>;
};
sound {
@ -239,7 +211,6 @@ &fec1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet1>;
phy-mode = "rgmii-id";
phy-supply = <&reg_fec1_pwdn>;
phy-handle = <&ethphy1_0>;
fsl,magic-packet;
status = "okay";
@ -260,6 +231,8 @@ ethphy1_0: ethernet-phy@0 {
reset-gpios = <&gpio7 15 GPIO_ACTIVE_LOW>;
reset-assert-us = <1000>;
reset-deassert-us = <500>;
interrupt-parent = <&gpio1>;
interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
};
};
};
@ -318,7 +291,7 @@ &i2c1 {
lm75: temperature-sensor@49 {
compatible = "national,lm75a";
reg = <0x49>;
vs-supply = <&reg_vcc_3v3>;
vs-supply = <&reg_mba_3v3>;
};
};
@ -351,7 +324,7 @@ pca9555: gpio-expander@20 {
interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
interrupt-controller;
#interrupt-cells = <2>;
vcc-supply = <&reg_vcc_3v3>;
vcc-supply = <&reg_mba_3v3>;
};
};
@ -668,7 +641,7 @@ &usdhc1 {
pinctrl-2 = <&pinctrl_usdhc1_200mhz>, <&pinctrl_usdhc1_gpio>;
cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
vmmc-supply = <&reg_sd1_vmmc>;
vmmc-supply = <&reg_mba_3v3>;
bus-width = <4>;
no-1-8-v;
no-sdio;

View File

@ -135,6 +135,7 @@ vgen6_reg: vldo4 {
lm75a: temperature-sensor@48 {
compatible = "national,lm75a";
reg = <0x48>;
vs-supply = <&vgen4_reg>;
};
/* NXP SE97BTP with temperature sensor + eeprom, TQMa7x 02xx */
@ -150,7 +151,6 @@ m24c64: eeprom@50 {
reg = <0x50>;
pagesize = <32>;
vcc-supply = <&vgen4_reg>;
status = "okay";
};
at24c02: eeprom@56 {
@ -158,7 +158,6 @@ at24c02: eeprom@56 {
reg = <0x56>;
pagesize = <16>;
vcc-supply = <&vgen4_reg>;
status = "okay";
};
ds1339: rtc@68 {

View File

@ -21,7 +21,6 @@ &fec2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet2>;
phy-mode = "rgmii-id";
phy-supply = <&reg_fec2_pwdn>;
phy-handle = <&ethphy2_0>;
fsl,magic-packet;
status = "okay";
@ -42,6 +41,8 @@ ethphy2_0: ethernet-phy@0 {
reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
reset-assert-us = <1000>;
reset-deassert-us = <500>;
interrupt-parent = <&gpio2>;
interrupts = <31 IRQ_TYPE_EDGE_FALLING>;
};
};
};

View File

@ -169,7 +169,7 @@ sound {
model = "wm8960-audio";
audio-cpu = <&sai1>;
audio-codec = <&codec>;
hp-det-gpio = <&gpio2 28 GPIO_ACTIVE_HIGH>;
hp-det-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>;
audio-routing =
"Headphone Jack", "HP_L",
"Headphone Jack", "HP_R",