Skip to content

Commit f50a4e5

Browse files
arndbarndb
committed
Merge tag 'imx-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX ARM device tree for 6.5: - New board support: Marantec Maveo Box. - Add HDMI support for TQMa6x/MBa6 board. - A series from Andrew Lunn to add phy-mode and fixed links for Ethernet devices on imx51, imx6qdl and vf610. - A bunch of changes from Fabio Estevam to clean up deprecated and invalid properies, fix up node names to remove dt-schema warnings. - A series of maintenance updates for Protonic Holland boards, mostly on the USB subsystem configuration, thermal zones, and the naming of GPIO keys. - Update dma-apbh device node name to remove dtbs_check warnings. - Remove invalid nodes from fan-controller for a couple of Gateworks boards. - Small random updates and clean-ups on various boards. * tag 'imx-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (53 commits) ARM: dts: imx6qdl: vicut1: rename power to power-button ARM: dts: imx6dl: prtrvt, prtvt7, prti6q, prtwd2: fix USB related warnings ARM: dts: imx6dl: plybas: fix USB over-current detection on USB OTG port ARM: dts: imx6ul: prti6g: fix USB over-current detection on USB OTG port ARM: dts: imx6qp: prtwd3: Enable USB over current detection on USB OTG port ARM: dts: imx6dl: prtmvt: fix different USB related warnings ARM: dts: imx6dl: alti6p: fix different USB related warnings ARM: dts: imx6dl: vicut1: Address USB related warnings ARM: dts: imx6dl: Add trip points to thermal zones on several devices ARM: dts: imx6dl: lanmcu: Configure over-current polarity for USB OTG node ARM: dts: imx6dl: lanmcu: Disable unused USB PHY nodes ARM: dts: imx6q: prtwd2: Correct iomux configuration for ENET MDIO and MDC ARM: dts: imx6dl: prtvt7: Remove touchscreen inversion ARM: dts: imx6dl: prtvt7: Adjust default backlight brightness to 65 ARM: dts: imx6qdl: vicut1: The sgtl5000 uses i2s not ac97 ARM: dts: imx: Use 'eeprom' as node name ARM: dts: imx6ul-ccimx6ulsom: Fix the "coin" regulator name ARM: dts: imx: Use 'pmic' as node name ARM: dts: imx6: Use the mux- prefix ARM: dts: imx7d-sdb: Allow UHS modes ... Link: https://lore.kernel.org/r/20230610072530.418847-2-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 3230271 + 5ef0f31 commit f50a4e5

87 files changed

Lines changed: 899 additions & 143 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎arch/arm/boot/dts/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
751751
imx6ull-dhcom-drc02.dtb \
752752
imx6ull-dhcom-pdk2.dtb \
753753
imx6ull-dhcom-picoitx.dtb \
754+
imx6ull-dhcor-maveo-box.dtb \
754755
imx6ull-jozacp.dtb \
755756
imx6ull-kontron-bl.dtb \
756757
imx6ull-myir-mys-6ulx-eval.dtb \

‎arch/arm/boot/dts/imx23.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
reg = <0x80000000 0x2000>;
6060
};
6161

62-
dma_apbh: dma-apbh@80004000 {
62+
dma_apbh: dma-controller@80004000 {
6363
compatible = "fsl,imx23-dma-apbh";
6464
reg = <0x80004000 0x2000>;
6565
interrupts = <0 14 20 0

‎arch/arm/boot/dts/imx28-cfa10049.dts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@
100100
pinctrl-names = "default";
101101
pinctrl-0 = <&spi2_pins_cfa10049>;
102102
status = "okay";
103-
gpio-sck = <&gpio2 16 0>;
104-
gpio-mosi = <&gpio2 17 0>;
105-
gpio-miso = <&gpio2 18 0>;
103+
sck-gpios = <&gpio2 16 0>;
104+
mosi-gpios = <&gpio2 17 0>;
105+
miso-gpios = <&gpio2 18 0>;
106106
cs-gpios = <&gpio3 5 0>;
107107
num-chipselects = <1>;
108108
#address-cells = <1>;
@@ -124,8 +124,8 @@
124124
pinctrl-names = "default";
125125
pinctrl-0 = <&spi3_pins_cfa10049>;
126126
status = "okay";
127-
gpio-sck = <&gpio0 24 0>;
128-
gpio-mosi = <&gpio0 28 0>;
127+
sck-gpios = <&gpio0 24 0>;
128+
mosi-gpios = <&gpio0 28 0>;
129129
cs-gpios = <&gpio0 17 0 &gpio0 26 0 &gpio0 27 0>;
130130
num-chipselects = <3>;
131131
#address-cells = <1>;

‎arch/arm/boot/dts/imx28-cfa10055.dts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
pinctrl-names = "default";
2020
pinctrl-0 = <&spi2_pins_cfa10055>;
2121
status = "okay";
22-
gpio-sck = <&gpio2 16 0>;
23-
gpio-mosi = <&gpio2 17 0>;
24-
gpio-miso = <&gpio2 18 0>;
22+
sck-gpios = <&gpio2 16 0>;
23+
mosi-gpios = <&gpio2 17 0>;
24+
miso-gpios = <&gpio2 18 0>;
2525
cs-gpios = <&gpio3 5 0>;
2626
num-chipselects = <1>;
2727
#address-cells = <1>;

‎arch/arm/boot/dts/imx28-cfa10056.dts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
pinctrl-names = "default";
1919
pinctrl-0 = <&spi2_pins_cfa10056>;
2020
status = "okay";
21-
gpio-sck = <&gpio2 16 0>;
22-
gpio-mosi = <&gpio2 17 0>;
23-
gpio-miso = <&gpio2 18 0>;
21+
sck-gpios = <&gpio2 16 0>;
22+
mosi-gpios = <&gpio2 17 0>;
23+
miso-gpios = <&gpio2 18 0>;
2424
cs-gpios = <&gpio3 5 0>;
2525
num-chipselects = <1>;
2626
#address-cells = <1>;

‎arch/arm/boot/dts/imx28-tx28.dts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@
192192
pinctrl-names = "default";
193193
pinctrl-0 = <&tx28_spi_gpio_pins>;
194194

195-
gpio-sck = <&gpio2 24 GPIO_ACTIVE_HIGH>;
196-
gpio-mosi = <&gpio2 25 GPIO_ACTIVE_HIGH>;
197-
gpio-miso = <&gpio2 26 GPIO_ACTIVE_HIGH>;
195+
sck-gpios = <&gpio2 24 GPIO_ACTIVE_HIGH>;
196+
mosi-gpios = <&gpio2 25 GPIO_ACTIVE_HIGH>;
197+
miso-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
198198
num-chipselects = <3>;
199199
cs-gpios = <
200200
&gpio2 27 GPIO_ACTIVE_LOW

‎arch/arm/boot/dts/imx28.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
status = "disabled";
7979
};
8080

81-
dma_apbh: dma-apbh@80004000 {
81+
dma_apbh: dma-controller@80004000 {
8282
compatible = "fsl,imx28-dma-apbh";
8383
reg = <0x80004000 0x2000>;
8484
interrupts = <82 83 84 85

‎arch/arm/boot/dts/imx35.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@
298298
compatible = "fsl,imx35-wdt", "fsl,imx21-wdt";
299299
reg = <0x53fdc000 0x4000>;
300300
clocks = <&clks 74>;
301-
clock-names = "";
302301
interrupts = <55>;
303302
};
304303

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@
145145
pinctrl-0 = <&pinctrl_gpiospi0>;
146146
status = "okay";
147147

148-
gpio-sck = <&gpio4 15 GPIO_ACTIVE_HIGH>;
149-
gpio-mosi = <&gpio4 12 GPIO_ACTIVE_HIGH>;
150-
gpio-miso = <&gpio4 11 GPIO_ACTIVE_HIGH>;
148+
sck-gpios = <&gpio4 15 GPIO_ACTIVE_HIGH>;
149+
mosi-gpios = <&gpio4 12 GPIO_ACTIVE_HIGH>;
150+
miso-gpios = <&gpio4 11 GPIO_ACTIVE_HIGH>;
151151
num-chipselects = <1>;
152152
cs-gpios = <&gpio4 14 GPIO_ACTIVE_HIGH>;
153153

@@ -181,7 +181,7 @@
181181

182182
port@0 {
183183
reg = <0>;
184-
label = "cpu";
184+
phy-mode = "rev-mii";
185185
ethernet = <&fec>;
186186

187187
fixed-link {

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

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

8383
port@4 {
8484
reg = <4>;
85-
label = "cpu";
85+
phy-mode = "rev-mii";
8686
ethernet = <&fec>;
8787

8888
fixed-link {

0 commit comments

Comments
 (0)