Commit 5eb4573e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "There are a lot of minor DT fixes for Mediatek, Rockchip, Qualcomm and
  Microchip and NXP, addressing both build-time warnings and bugs found
  during runtime testing.

  Most of these changes are machine specific fixups, but there are a few
  notable regressions that affect an entire SoC:

   - The Qualcomm MSI support that was improved for 6.9 ended up being
     wrong on some chips and now gets fixed.

   - The i.MX8MP camera interface broke due to a typo and gets updated
     again.

  The main driver fix is also for Qualcomm platforms, rewriting an
  interface in the QSEECOM firmware support that could lead to crashing
  the kernel from a trusted application.

  The only other code changes are minor fixes for Mediatek SoC drivers"

* tag 'soc-fixes-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (50 commits)
  ARM: dts: imx6ull-tarragon: fix USB over-current polarity
  soc: mediatek: mtk-socinfo: depends on CONFIG_SOC_BUS
  soc: mediatek: mtk-svs: Append "-thermal" to thermal zone names
  arm64: dts: imx8mp: Fix assigned-clocks for second CSI2
  ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property
  ARM: dts: microchip: at91-sama7g5ek: Replace regulator-suspend-voltage with the valid property
  arm64: dts: rockchip: Fix USB interface compatible string on kobol-helios64
  arm64: dts: qcom: sc8180x: Fix ss_phy_irq for secondary USB controller
  arm64: dts: qcom: sm8650: Fix the msi-map entries
  arm64: dts: qcom: sm8550: Fix the msi-map entries
  arm64: dts: qcom: sm8450: Fix the msi-map entries
  arm64: dts: qcom: sc8280xp: add missing PCIe minimum OPP
  arm64: dts: qcom: x1e80100: Fix the compatible for cluster idle states
  arm64: dts: qcom: Fix type of "wdog" IRQs for remoteprocs
  arm64: dts: rockchip: regulator for sd needs to be always on for BPI-R2Pro
  dt-bindings: rockchip: grf: Add missing type to 'pcie-phy' node
  arm64: dts: rockchip: drop redundant disable-gpios in Lubancat 2
  arm64: dts: rockchip: drop redundant disable-gpios in Lubancat 1
  arm64: dts: rockchip: drop redundant pcie-reset-suspend in Scarlet Dumo
  arm64: dts: rockchip: mark system power controller and fix typo on orangepi-5-plus
  ...
parents e6ebf011 9f26bc71

Documentation/devicetree/bindings/soc/rockchip/grf.yaml

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ allOf: 
          unevaluatedProperties: false



        pcie-phy:

          type: object

          description:

            Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt

arch/arm/boot/dts/microchip/at91-sama7g54_curiosity.dts

+4 −4
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ vddcore: VDD_CORE { 


					regulator-state-standby {

						regulator-on-in-suspend;

						regulator-suspend-voltage = <1150000>;

						regulator-suspend-microvolt = <1150000>;

						regulator-mode = <4>;

					};
@@ -263,7 +263,7 @@ vddcpu: VDD_OTHER { 


					regulator-state-standby {

						regulator-on-in-suspend;

						regulator-suspend-voltage = <1050000>;

						regulator-suspend-microvolt = <1050000>;

						regulator-mode = <4>;

					};
@@ -280,7 +280,7 @@ vldo1: LDO1 { 
					regulator-always-on;



					regulator-state-standby {

						regulator-suspend-voltage = <1800000>;

						regulator-suspend-microvolt = <1800000>;

						regulator-on-in-suspend;

					};
@@ -296,7 +296,7 @@ vldo2: LDO2 { 
					regulator-always-on;



					regulator-state-standby {

						regulator-suspend-voltage = <3300000>;

						regulator-suspend-microvolt = <3300000>;

						regulator-on-in-suspend;

					};

arch/arm/boot/dts/microchip/at91-sama7g5ek.dts

+4 −4
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ vddcore: VDD_CORE { 


					regulator-state-standby {

						regulator-on-in-suspend;

						regulator-suspend-voltage = <1150000>;

						regulator-suspend-microvolt = <1150000>;

						regulator-mode = <4>;

					};
@@ -314,7 +314,7 @@ vddcpu: VDD_OTHER { 


					regulator-state-standby {

						regulator-on-in-suspend;

						regulator-suspend-voltage = <1050000>;

						regulator-suspend-microvolt = <1050000>;

						regulator-mode = <4>;

					};
@@ -331,7 +331,7 @@ vldo1: LDO1 { 
					regulator-always-on;



					regulator-state-standby {

						regulator-suspend-voltage = <1800000>;

						regulator-suspend-microvolt = <1800000>;

						regulator-on-in-suspend;

					};
@@ -346,7 +346,7 @@ vldo2: LDO2 { 
					regulator-max-microvolt = <3700000>;



					regulator-state-standby {

						regulator-suspend-voltage = <1800000>;

						regulator-suspend-microvolt = <1800000>;

						regulator-on-in-suspend;

					};

arch/arm/boot/dts/nxp/imx/imx6ull-tarragon-common.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -805,6 +805,7 @@ &usbotg1 { 
		     &pinctrl_usb_pwr>;

	dr_mode = "host";

	power-active-high;

	over-current-active-low;

	disable-over-current;

	status = "okay";

};

arch/arm64/boot/dts/freescale/imx8mp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1672,7 +1672,7 @@ mipi_csi_1: csi@32e50000 { 
					 <&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF_ROOT>,

					 <&clk IMX8MP_CLK_MEDIA_AXI_ROOT>;

				clock-names = "pclk", "wrap", "phy", "axi";

				assigned-clocks = <&clk IMX8MP_CLK_MEDIA_CAM1_PIX>,

				assigned-clocks = <&clk IMX8MP_CLK_MEDIA_CAM2_PIX>,

						  <&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF>;

				assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_1000M>,

							 <&clk IMX8MP_CLK_24M>;