Commit c1084b6c authored Jul 04, 2022 by Linus Torvalds

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Another set of minor patches for Arm DTS files and soc specific
  drivers:

   - More reference counting bug fixes for DT nodes, and other trivial
     code fixes

   - Multiple code fixes for the Arm SCMI firmware driver to improve
     compatibility with firmware implementations.

   - A patch series for at91 to address power management issues from
     using the wrong DT compatible properties.

   - A series of patches to fix pad settings for NXP imx8mp to leave the
     configuration untouched from the boot loader

   - Additional DT fixes for qualcomm and NXP platforms

   - A boot time fix for stm32mp15 DT

   - Konrad Dybcio becomes an additional reviewer for the Qualcomm
     platforms"

* tag 'soc-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (42 commits)
  soc: qcom: smem: use correct format characters
  ARM: dts: stm32: add missing usbh clock and fix clk order on stm32mp15
  ARM: dts: stm32: delete fixed clock node on STM32MP15-SCMI
  ARM: dts: stm32: DSI should use LSE SCMI clock on DK1/ED1 STM32 board
  ARM: dts: stm32: use the correct clock source for CEC on stm32mp151
  ARM: dts: stm32: fix pwr regulators references to use scmi
  soc: ixp4xx/npe: Fix unused match warning
  ARM: at91: pm: Mark at91_pm_secure_init as __init
  ARM: at91: fix soc detection for SAM9X60 SiPs
  ARM: dts: at91: sama5d2_icp: fix eeprom compatibles
  ARM: dts: at91: sam9x60ek: fix eeprom compatible and size
  ARM: at91: pm: use proper compatibles for sama7g5's rtc and rtt
  ARM: at91: pm: use proper compatibles for sam9x60's rtc and rtt
  ARM: at91: pm: use proper compatible for sama5d2's rtc
  arm64: dts: qcom: msm8992-*: Fix vdd_lvs1_2-supply typo
  firmware: arm_scmi: Remove usage of the deprecated ida_simple_xxx API
  firmware: arm_scmi: Fix response size warning for OPTEE transport
  arm64: dts: imx8mp-icore-mx8mp-edim2.2: correct pad settings
  arm64: dts: imx8mp-phyboard-pollux-rdk: correct i2c2 & mmc settings
  arm64: dts: imx8mp-phyboard-pollux-rdk: correct eqos pad settings
  ...

parents 88084a3d c0d1a7bd

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -2540,6 +2540,7 @@ W: http://www.armlinux.org.uk/
		ARM/QUALCOMM SUPPORT
		M: Andy Gross <agross@kernel.org>
		M: Bjorn Andersson <bjorn.andersson@linaro.org>
		R: Konrad Dybcio <konrad.dybcio@somainline.org>
		L: linux-arm-msm@vger.kernel.org
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git

arch/arm/boot/dts/at91-sam9x60ek.dts

+1 −2

Original line number	Diff line number	Diff line
		@@ -233,10 +233,9 @@
		status = "okay";

		eeprom@53 {
		compatible = "atmel,24c32";
		compatible = "atmel,24c02";
		reg = <0x53>;
		pagesize = <16>;
		size = <128>;
		status = "okay";
		};
		};

arch/arm/boot/dts/at91-sama5d2_icp.dts

+3 −3

Original line number	Diff line number	Diff line
		@@ -329,21 +329,21 @@
		status = "okay";

		eeprom@50 {
		compatible = "atmel,24c32";
		compatible = "atmel,24c02";
		reg = <0x50>;
		pagesize = <16>;
		status = "okay";
		};

		eeprom@52 {
		compatible = "atmel,24c32";
		compatible = "atmel,24c02";
		reg = <0x52>;
		pagesize = <16>;
		status = "disabled";
		};

		eeprom@53 {
		compatible = "atmel,24c32";
		compatible = "atmel,24c02";
		reg = <0x53>;
		pagesize = <16>;
		status = "disabled";

arch/arm/boot/dts/imx7d-smegw01.dts

+1 −3

Original line number	Diff line number	Diff line
		@@ -216,10 +216,8 @@
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_usdhc2>;
		bus-width = <4>;
		no-1-8-v;
		non-removable;
		cap-sd-highspeed;
		sd-uhs-ddr50;
		mmc-ddr-1_8v;
		vmmc-supply = <&reg_wifi>;
		enable-sdio-wakeup;
		status = "okay";

arch/arm/boot/dts/stm32mp15-scmi.dtsi

+58 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,37 @@
		reg = <0x16>;
		#reset-cells = <1>;
		};

		scmi_voltd: protocol@17 {
		reg = <0x17>;

		scmi_reguls: regulators {
		#address-cells = <1>;
		#size-cells = <0>;

		scmi_reg11: reg11@0 {
		reg = <0>;
		regulator-name = "reg11";
		regulator-min-microvolt = <1100000>;
		regulator-max-microvolt = <1100000>;
		};

		scmi_reg18: reg18@1 {
		voltd-name = "reg18";
		reg = <1>;
		regulator-name = "reg18";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		};

		scmi_usb33: usb33@2 {
		reg = <2>;
		regulator-name = "usb33";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		};
		};
		};
		};
		};

		@@ -45,3 +76,30 @@
		};
		};
		};

		&reg11 {
		status = "disabled";
		};

		&reg18 {
		status = "disabled";
		};

		&usb33 {
		status = "disabled";
		};

		&usbotg_hs {
		usb33d-supply = <&scmi_usb33>;
		};

		&usbphyc {
		vdda1v1-supply = <&scmi_reg11>;
		vdda1v8-supply = <&scmi_reg18>;
		};

		/delete-node/ &clk_hse;
		/delete-node/ &clk_hsi;
		/delete-node/ &clk_lse;
		/delete-node/ &clk_lsi;
		/delete-node/ &clk_csi;