Skip to content

Commit baba9e1

Browse files
arndbarndb
committed
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>
2 parents e2287e9 + c7418a6 commit baba9e1

17 files changed

Lines changed: 48 additions & 73 deletions

‎MAINTAINERS‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6650,19 +6650,14 @@ L: linux-rtc@vger.kernel.org
66506650
S: Maintained
66516651
F: drivers/rtc/rtc-sd2405al.c
66526652

6653-
DH ELECTRONICS IMX6 DHCOM/DHCOR BOARD SUPPORT
6653+
DH ELECTRONICS DHSOM SOM AND BOARD SUPPORT
66546654
M: Christoph Niedermaier <cniedermaier@dh-electronics.com>
6655-
L: kernel@dh-electronics.com
6656-
S: Maintained
6657-
F: arch/arm/boot/dts/nxp/imx/imx6*-dhcom-*
6658-
F: arch/arm/boot/dts/nxp/imx/imx6*-dhcor-*
6659-
6660-
DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT
66616655
M: Marek Vasut <marex@denx.de>
66626656
L: kernel@dh-electronics.com
66636657
S: Maintained
6664-
F: arch/arm/boot/dts/st/stm32mp1*-dhcom-*
6665-
F: arch/arm/boot/dts/st/stm32mp1*-dhcor-*
6658+
N: dhcom
6659+
N: dhcor
6660+
N: dhsom
66666661

66676662
DIALOG SEMICONDUCTOR DRIVERS
66686663
M: Support Opensource <support.opensource@diasemi.com>

‎arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
};
161161
};
162162

163-
mdio_gpio: mdio-gpio {
163+
mdio_gpio: mdio {
164164
compatible = "virtual,mdio-gpio";
165165
pinctrl-names = "default";
166166
pinctrl-0 = <&pinctrl_swmdio>;

‎arch/arm/boot/dts/nxp/imx/imx51-zii-scu2-mezz.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
regulator-max-microvolt = <5000000>;
3838
};
3939

40-
mdio_gpio: mdio-gpio {
40+
mdio_gpio: mdio {
4141
compatible = "virtual,mdio-gpio";
4242
pinctrl-names = "default";
4343
pinctrl-0 = <&pinctrl_swmdio>;

‎arch/arm/boot/dts/nxp/imx/imx6q-bx50v3.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
mdio-gpio0 = &mdio0;
9595
};
9696

97-
mdio0: mdio-gpio {
97+
mdio0: mdio {
9898
compatible = "virtual,mdio-gpio";
9999
gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>, /* mdc */
100100
<&gpio2 7 GPIO_ACTIVE_HIGH>; /* mdio */

‎arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi‎

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

692692
adv_7280: adv7280@21 {
693693
compatible = "adi,adv7280";
694-
adv,force-bt656-4;
694+
adi,force-bt656-4;
695695
pinctrl-names = "default";
696696
pinctrl-0 = <&pinctrl_ipu1_csi0>;
697697
reg = <0x21>;

‎arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
"DMICDAT", "DMIC";
114114
mux-int-port = <2>;
115115
mux-ext-port = <3>;
116-
hp-det-gpio = <&gpio7 8 GPIO_ACTIVE_LOW>;
117-
mic-det-gpio = <&gpio1 9 GPIO_ACTIVE_LOW>;
116+
hp-det-gpios = <&gpio7 8 GPIO_ACTIVE_LOW>;
117+
mic-det-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
118118
};
119119

120120
backlight_lvds: backlight-lvds {
@@ -804,6 +804,7 @@
804804
pinctrl-names = "default";
805805
pinctrl-0 = <&pinctrl_usbotg>;
806806
disable-over-current;
807+
dr_mode = "otg";
807808
status = "okay";
808809
};
809810

‎arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,8 +711,8 @@
711711
reg_vdd3p0: regulator-3p0 {
712712
compatible = "fsl,anatop-regulator";
713713
regulator-name = "vdd3p0";
714-
regulator-min-microvolt = <2800000>;
715-
regulator-max-microvolt = <3150000>;
714+
regulator-min-microvolt = <2625000>;
715+
regulator-max-microvolt = <3400000>;
716716
regulator-always-on;
717717
anatop-reg-offset = <0x120>;
718718
anatop-vol-bit-shift = <8>;
@@ -806,6 +806,7 @@
806806
reg = <0x020c9000 0x1000>;
807807
interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
808808
clocks = <&clks IMX6QDL_CLK_USBPHY1>;
809+
phy-3p0-supply = <&reg_vdd3p0>;
809810
fsl,anatop = <&anatop>;
810811
};
811812

@@ -814,6 +815,7 @@
814815
reg = <0x020ca000 0x1000>;
815816
interrupts = <0 45 IRQ_TYPE_LEVEL_HIGH>;
816817
clocks = <&clks IMX6QDL_CLK_USBPHY2>;
818+
phy-3p0-supply = <&reg_vdd3p0>;
817819
fsl,anatop = <&anatop>;
818820
};
819821

‎arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
"IN3R", "AMIC";
109109
mux-int-port = <2>;
110110
mux-ext-port = <3>;
111-
hp-det-gpio = <&gpio4 19 GPIO_ACTIVE_LOW>;
111+
hp-det-gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
112112
};
113113

114114
panel {

‎arch/arm/boot/dts/nxp/imx/imx6sl.dtsi‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,8 +546,8 @@
546546
reg_vdd3p0: regulator-3p0 {
547547
compatible = "fsl,anatop-regulator";
548548
regulator-name = "vdd3p0";
549-
regulator-min-microvolt = <2800000>;
550-
regulator-max-microvolt = <3150000>;
549+
regulator-min-microvolt = <2625000>;
550+
regulator-max-microvolt = <3400000>;
551551
regulator-always-on;
552552
anatop-reg-offset = <0x120>;
553553
anatop-vol-bit-shift = <8>;
@@ -640,6 +640,7 @@
640640
reg = <0x020c9000 0x1000>;
641641
interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
642642
clocks = <&clks IMX6SL_CLK_USBPHY1>;
643+
phy-3p0-supply = <&reg_vdd3p0>;
643644
fsl,anatop = <&anatop>;
644645
};
645646

@@ -648,6 +649,7 @@
648649
reg = <0x020ca000 0x1000>;
649650
interrupts = <0 45 IRQ_TYPE_LEVEL_HIGH>;
650651
clocks = <&clks IMX6SL_CLK_USBPHY2>;
652+
phy-3p0-supply = <&reg_vdd3p0>;
651653
fsl,anatop = <&anatop>;
652654
};
653655

‎arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
"IN3R", "AMIC";
158158
mux-int-port = <2>;
159159
mux-ext-port = <3>;
160-
hp-det-gpio = <&gpio4 24 GPIO_ACTIVE_LOW>;
160+
hp-det-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
161161
};
162162
};
163163

0 commit comments

Comments
 (0)