Commit e76db6e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-fixes-6.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "As usual, most of the bug fixes address issues in the devicetree
  files, and out of these, most are for the Qualcomm and NXP platforms,
  including:

   - A missing 'reserved-memory' property on LG G Watch R that is needed
     to prevent clashing with firmware

   - Annotations for cache coherency on multiple machines

   - Corrections for pinctrl, regulator, clock, iommu and power domain
     properties for i.MX and Qualcomm to correctly reflect the hardware
     settings

   - Firmware file names on multiple machines SA8540P Ride board

   - An incompatible change to the qcom vadc driver requires adding
     individual labels

   - Fix EQoS PHY reset GPIO by dropping the deprecated/wrong property
     and switch to the new bindings.

   - A fix for PCI bus address translation Tegra194 and Tegra234.

  There are also a couple of device driver fixes, addressing:

   - A race condition in the amdtee driver

   - A performance regression in the Qualcomm 'llcc' driver

   - An unitialized variable use NXP i.MX 'weim' driver

   - Error handling issues in Qualcomm 'rmtfs', and 'scm' drivers and
     the Arm scmi firmware driver"

* tag 'arm-fixes-6.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (48 commits)
  arm64: dts: qcom: sc8280xp-x13s: mark bob regulator as always-on
  arm64: dts: qcom: sc8280xp-x13s: mark s12b regulator as always-on
  arm64: dts: qcom: sc8280xp-x13s: mark s10b regulator as always-on
  arm64: dts: qcom: sc8280xp-x13s: mark s11b regulator as always-on
  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
  firmware: qcom: scm: fix bogus irq error at probe
  arm64: dts: qcom: sm8550: Mark UFS controller as cache coherent
  arm64: dts: qcom: sa8540p-ride: correct name of remoteproc_nsp0 firmware
  arm64: dts: qcom: sm8450: Mark UFS controller as cache coherent
  arm64: dts: qcom: sm8350: Mark UFS controller as cache coherent
  arm64: dts: qcom: sm8550: fix LPASS pinctrl slew base address
  ...
parents d7b5c942 ec7d8bd7

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/arm/boot/dts/qcom-apq8026-lg-lenok.dts

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,16 @@ 
	};



	reserved-memory {

		sbl_region: sbl@2f00000 {

			reg = <0x02f00000 0x100000>;

			no-map;

		};



		external_image_region: external-image@3100000 {

			reg = <0x03100000 0x200000>;

			no-map;

		};



		adsp_region: adsp@3300000 {

			reg = <0x03300000 0x1400000>;

			no-map;

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";

};