Unverified Commit 38557b2d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-6.3' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents e5bd1002 b3cdf730

arch/arm/boot/dts/e60k02.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ 


&usbotg1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbotg1>;

	disable-over-current;

	srp-disable;

	hnp-disable;

arch/arm/boot/dts/e70k02.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ 


&usbotg1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbotg1>;

	disable-over-current;

	srp-disable;

	hnp-disable;

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

+1 −0
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@ 


&usbotg1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbotg1>;

	disable-over-current;

	srp-disable;

	hnp-disable;

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

+0 −12
Original line number Diff line number Diff line
@@ -56,14 +56,10 @@ 
};



&enetc_port2 {

	nvmem-cells = <&base_mac_address 2>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};



&enetc_port3 {

	nvmem-cells = <&base_mac_address 3>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};
@@ -84,8 +80,6 @@ 
	managed = "in-band-status";

	phy-handle = <&qsgmii_phy0>;

	phy-mode = "qsgmii";

	nvmem-cells = <&base_mac_address 4>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};
@@ -94,8 +88,6 @@ 
	managed = "in-band-status";

	phy-handle = <&qsgmii_phy1>;

	phy-mode = "qsgmii";

	nvmem-cells = <&base_mac_address 5>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};
@@ -104,8 +96,6 @@ 
	managed = "in-band-status";

	phy-handle = <&qsgmii_phy2>;

	phy-mode = "qsgmii";

	nvmem-cells = <&base_mac_address 6>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};
@@ -114,8 +104,6 @@ 
	managed = "in-band-status";

	phy-handle = <&qsgmii_phy3>;

	phy-mode = "qsgmii";

	nvmem-cells = <&base_mac_address 7>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};

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

+0 −2
Original line number Diff line number Diff line
@@ -55,7 +55,5 @@ 
&enetc_port1 {

	phy-handle = <&phy0>;

	phy-mode = "rgmii-id";

	nvmem-cells = <&base_mac_address 0>;

	nvmem-cell-names = "mac-address";

	status = "okay";

};