Skip to content

Commit 38557b2

Browse files
arndbarndb
committed
Merge tag 'imx-fixes-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc-fixes
i.MX fixes for 6.3: - A couple of i.MX93 fixes from Alexander Stein to correct EQoS Ethernet properties. - Correct clock-names of FlexSPI device in imx8-ss-lsio DT. - Fix EQoS PHY reset GPIO by dropping the deprecated/wrong property and switch to the new bindings. - Fix an issue with imx-weim bus driver that branch condition evaluates to a garbage value. - Correct WM8960 clock name for imx8mm-nitrogen-r2 board. - Fix LCDIF2 clocks for i.MX8MP DT. - Add missing #sound-dai-cells properties to SAI nodes for i.MX8MN DT. - Revert LS1028A DT changes of getting MAC addresses from VPD, as the dependency on NVMEM device is not in place. - A series from Peng Fan to add missing pinctrl property for i.MX6SL based devices. * tag 'imx-fixes-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: imx93: add missing #address-cells and #size-cells to i2c nodes bus: imx-weim: fix branch condition evaluates to a garbage value arm64: dts: imx8mn: specify #sound-dai-cells for SAI nodes ARM: dts: imx6sl: tolino-shine2hd: fix usbotg1 pinctrl ARM: dts: imx6sll: e60k02: fix usbotg1 pinctrl ARM: dts: imx6sll: e70k02: fix usbotg1 pinctrl arm64: dts: imx93: Fix eqos properties arm64: dts: imx8mp: Fix LCDIF2 node clock order arm64: dts: imx8mm-nitrogen-r2: fix WM8960 clock name arm64: dts: imx8dxl-evk: Fix eqos phy reset gpio Revert "arm64: dts: ls1028a: sl28: get MAC addresses from VPD" arm64: dts: freescale: imx8-ss-lsio: Fix flexspi clock order Link: https://lore.kernel.org/r/20230315132814.GF143566@dragon Signed-off-by: Arnd Bergmann <[email protected]>
2 parents e5bd100 + b3cdf73 commit 38557b2

15 files changed

+36
-52
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@
311311

312312
&usbotg1 {
313313
pinctrl-names = "default";
314+
pinctrl-0 = <&pinctrl_usbotg1>;
314315
disable-over-current;
315316
srp-disable;
316317
hnp-disable;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@
321321

322322
&usbotg1 {
323323
pinctrl-names = "default";
324+
pinctrl-0 = <&pinctrl_usbotg1>;
324325
disable-over-current;
325326
srp-disable;
326327
hnp-disable;

‎arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@
625625

626626
&usbotg1 {
627627
pinctrl-names = "default";
628+
pinctrl-0 = <&pinctrl_usbotg1>;
628629
disable-over-current;
629630
srp-disable;
630631
hnp-disable;

‎arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,10 @@
5656
};
5757

5858
&enetc_port2 {
59-
nvmem-cells = <&base_mac_address 2>;
60-
nvmem-cell-names = "mac-address";
6159
status = "okay";
6260
};
6361

6462
&enetc_port3 {
65-
nvmem-cells = <&base_mac_address 3>;
66-
nvmem-cell-names = "mac-address";
6763
status = "okay";
6864
};
6965

@@ -84,8 +80,6 @@
8480
managed = "in-band-status";
8581
phy-handle = <&qsgmii_phy0>;
8682
phy-mode = "qsgmii";
87-
nvmem-cells = <&base_mac_address 4>;
88-
nvmem-cell-names = "mac-address";
8983
status = "okay";
9084
};
9185

@@ -94,8 +88,6 @@
9488
managed = "in-band-status";
9589
phy-handle = <&qsgmii_phy1>;
9690
phy-mode = "qsgmii";
97-
nvmem-cells = <&base_mac_address 5>;
98-
nvmem-cell-names = "mac-address";
9991
status = "okay";
10092
};
10193

@@ -104,8 +96,6 @@
10496
managed = "in-band-status";
10597
phy-handle = <&qsgmii_phy2>;
10698
phy-mode = "qsgmii";
107-
nvmem-cells = <&base_mac_address 6>;
108-
nvmem-cell-names = "mac-address";
10999
status = "okay";
110100
};
111101

@@ -114,8 +104,6 @@
114104
managed = "in-band-status";
115105
phy-handle = <&qsgmii_phy3>;
116106
phy-mode = "qsgmii";
117-
nvmem-cells = <&base_mac_address 7>;
118-
nvmem-cell-names = "mac-address";
119107
status = "okay";
120108
};
121109

‎arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var1.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,5 @@
5555
&enetc_port1 {
5656
phy-handle = <&phy0>;
5757
phy-mode = "rgmii-id";
58-
nvmem-cells = <&base_mac_address 0>;
59-
nvmem-cell-names = "mac-address";
6058
status = "okay";
6159
};

‎arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,10 @@
3636
};
3737

3838
&enetc_port2 {
39-
nvmem-cells = <&base_mac_address 2>;
40-
nvmem-cell-names = "mac-address";
4139
status = "okay";
4240
};
4341

4442
&enetc_port3 {
45-
nvmem-cells = <&base_mac_address 3>;
46-
nvmem-cell-names = "mac-address";
4743
status = "okay";
4844
};
4945

@@ -56,8 +52,6 @@
5652
managed = "in-band-status";
5753
phy-handle = <&phy0>;
5854
phy-mode = "sgmii";
59-
nvmem-cells = <&base_mac_address 0>;
60-
nvmem-cell-names = "mac-address";
6155
status = "okay";
6256
};
6357

@@ -66,8 +60,6 @@
6660
managed = "in-band-status";
6761
phy-handle = <&phy1>;
6862
phy-mode = "sgmii";
69-
nvmem-cells = <&base_mac_address 1>;
70-
nvmem-cell-names = "mac-address";
7163
status = "okay";
7264
};
7365

‎arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var4.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,5 @@
4343
&enetc_port1 {
4444
phy-handle = <&phy1>;
4545
phy-mode = "rgmii-id";
46-
nvmem-cells = <&base_mac_address 1>;
47-
nvmem-cell-names = "mac-address";
4846
status = "okay";
4947
};

‎arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@
9292
phy-handle = <&phy0>;
9393
phy-mode = "sgmii";
9494
managed = "in-band-status";
95-
nvmem-cells = <&base_mac_address 0>;
96-
nvmem-cell-names = "mac-address";
9795
status = "okay";
9896
};
9997

@@ -156,21 +154,6 @@
156154
label = "bootloader environment";
157155
};
158156
};
159-
160-
otp-1 {
161-
compatible = "user-otp";
162-
163-
nvmem-layout {
164-
compatible = "kontron,sl28-vpd";
165-
166-
serial_number: serial-number {
167-
};
168-
169-
base_mac_address: base-mac-address {
170-
#nvmem-cell-cells = <1>;
171-
};
172-
};
173-
};
174157
};
175158
};
176159

‎arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ lsio_subsys: bus@5d000000 {
117117
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
118118
clocks = <&clk IMX_SC_R_FSPI_0 IMX_SC_PM_CLK_PER>,
119119
<&clk IMX_SC_R_FSPI_0 IMX_SC_PM_CLK_PER>;
120-
clock-names = "fspi", "fspi_en";
120+
clock-names = "fspi_en", "fspi";
121121
power-domains = <&pd IMX_SC_R_FSPI_0>;
122122
status = "disabled";
123123
};

‎arch/arm64/boot/dts/freescale/imx8dxl-evk.dts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@
121121
phy-handle = <&ethphy0>;
122122
nvmem-cells = <&fec_mac1>;
123123
nvmem-cell-names = "mac-address";
124-
snps,reset-gpios = <&pca6416_1 2 GPIO_ACTIVE_LOW>;
125-
snps,reset-delays-us = <10 20 200000>;
126124
status = "okay";
127125

128126
mdio {
@@ -136,6 +134,9 @@
136134
eee-broken-1000t;
137135
qca,disable-smarteee;
138136
qca,disable-hibernation-mode;
137+
reset-gpios = <&pca6416_1 2 GPIO_ACTIVE_LOW>;
138+
reset-assert-us = <20>;
139+
reset-deassert-us = <200000>;
139140
vddio-supply = <&vddio0>;
140141

141142
vddio0: vddio-regulator {

0 commit comments

Comments
 (0)