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

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

Pull ARM SoC fixes from Olof Johansson:
 "A set of fixes that have been coming in over the last few weeks, the
  usual mix of fixes:

   - DT fixups for TI K3

   - SATA drive detection fix for TI DRA7

   - Power management fixes and a few build warning removals for OMAP

   - OP-TEE fix to use standard API for UUID exporting

   - DT fixes for a handful of i.MX boards

  And a few other smaller items"

* tag 'arm-soc-fixes-v5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (29 commits)
  arm64: meson: select COMMON_CLK
  soc: amlogic: meson-clk-measure: remove redundant dev_err call in meson_msr_probe()
  ARM: OMAP1: ams-delta: remove unused function ams_delta_camera_power
  bus: ti-sysc: Fix flakey idling of uarts and stop using swsup_sidle_act
  ARM: dts: imx: emcon-avari: Fix nxp,pca8574 #gpio-cells
  ARM: dts: imx7d-pico: Fix the 'tuning-step' property
  ARM: dts: imx7d-meerkat96: Fix the 'tuning-step' property
  arm64: dts: freescale: sl28: var1: fix RGMII clock and voltage
  arm64: dts: freescale: sl28: var4: fix RGMII clock and voltage
  ARM: imx: pm-imx27: Include "common.h"
  arm64: dts: zii-ultra: fix 12V_MAIN voltage
  arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance
  arm64: dts: ls1028a: fix memory node
  bus: ti-sysc: Fix am335x resume hang for usb otg module
  ARM: OMAP2+: Fix build warning when mmc_omap is not built
  ARM: OMAP1: isp1301-omap: Add missing gpiod_add_lookup_table function
  ARM: OMAP1: Fix use of possibly uninitialized irq variable
  optee: use export_uuid() to copy client UUID
  arm64: dts: ti: k3*: Introduce reg definition for interrupt routers
  arm64: dts: ti: k3-am65|j721e|am64: Map the dma / navigator subsystem via explicit ranges
  ...
parents bd7b12aa b9c112f2

arch/arm/boot/dts/imx6dl-yapp4-common.dtsi

+5 −1
Original line number Diff line number Diff line
@@ -105,9 +105,13 @@ 
	phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;

	phy-reset-duration = <20>;

	phy-supply = <&sw2_reg>;

	phy-handle = <&ethphy0>;

	status = "okay";



	fixed-link {

		speed = <1000>;

		full-duplex;

	};



	mdio {

		#address-cells = <1>;

		#size-cells = <0>;

arch/arm/boot/dts/imx6q-dhcom-som.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -406,6 +406,18 @@ 
	vin-supply = <&sw1_reg>;

};



&reg_pu {

	vin-supply = <&sw1_reg>;

};



&reg_vdd1p1 {

	vin-supply = <&sw2_reg>;

};



&reg_vdd2p5 {

	vin-supply = <&sw2_reg>;

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart1>;

arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ 
		compatible = "nxp,pca8574";

		reg = <0x3a>;

		gpio-controller;

		#gpio-cells = <1>;

		#gpio-cells = <2>;

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc1>;

	keep-power-in-suspend;

	tuning-step = <2>;

	fsl,tuning-step = <2>;

	vmmc-supply = <&reg_3p3v>;

	no-1-8-v;

	broken-cd;

arch/arm/boot/dts/imx7d-pico.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ 
	pinctrl-2 = <&pinctrl_usdhc1_200mhz>;

	cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;

	bus-width = <4>;

	tuning-step = <2>;

	fsl,tuning-step = <2>;

	vmmc-supply = <&reg_3p3v>;

	wakeup-source;

	no-1-8-v;