Unverified Commit 42accadb authored Jul 09, 2021 by Olof Johansson

Merge branch 'arm/fixes' into arm/soc

Merging in the last batch of fixes that didn't go in before previous
release, just a few smaller DT fixups and a MAINTAINERS update

* arm/fixes: (29 commits)
  MAINTAINERS: Add myself as TEE subsystem reviewer
  ARM: dts: ux500: Fix LED probing
  arm64: dts: rockchip: Update RK3399 PCI host bridge window to 32-bit address memory
  arm64: dts: allwinner: a64-sopine-baseboard: change RGMII mode to TXID
  arm64: meson: select COMMON_CLK
  soc: amlogic: meson-clk-measure: remove redundant dev_err call in meson_msr_probe()
  ARM: dts: qcom: sdx55-telit: Represent secure-regions as 64-bit elements
  ARM: dts: qcom: sdx55-t55: Represent secure-regions as 64-bit elements
  ARM: dts: sun8i: h3: orangepi-plus: Fix ethernet phy-mode
  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
  optee: use export_uuid() to copy client UUID
  arm64: dts: ti: k3*: Introduce reg definition for interrupt routers
  ...

parents 95ef7152 048c958f

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -17921,6 +17921,7 @@ F: include/media/i2c/tw9910.h

		TEE SUBSYSTEM
		M: Jens Wiklander <jens.wiklander@linaro.org>
		R: Sumit Garg <sumit.garg@linaro.org>
		L: op-tee@lists.trustedfirmware.org
		S: Maintained
		F: Documentation/staging/tee.rst

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -105,9 +105,13 @@ &fec {
		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 @@ &reg_soc {
		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 @@ boardid: gpio@3a {
		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 @@ &usdhc1 {
		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;