Commit 1f70935f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "I had queued up a batch of fixes that got a bit close to the release
  for sending in before the merge window opened, so I'm including them
  in the merge window batch instead.

  Mostly smaller DT tweaks and fixes, the usual mix that we tend to have
  through the releases"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: dts: iwg20d-q7-common: Fix touch controller probe failure
  ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails
  ARM: dts: am33xx: modify AM33XX_IOPAD for #pinctrl-cells = 2
  soc: actions: include header to fix missing prototype
  arm64: dts: ti: k3-j721e: Rename mux header and update macro names
  soc: qcom: pdr: Fixup array type of get_domain_list_resp message
  arm64: dts: qcom: pm660: Fix missing pound sign in interrupt-cells
  arm64: dts: qcom: kitakami: Temporarily disable SDHCI1
  arm64: dts: sdm630: Temporarily disable SMMUs by default
  arm64: dts: sdm845: Fixup OPP table for all qup devices
  arm64: dts: allwinner: h5: remove Mali GPU PMU module
  ARM: dts: sun8i: r40: bananapi-m2-ultra: Fix dcdc1 regulator
  soc: xilinx: Fix error code in zynqmp_pm_probe()
parents f11901ed 6869f774

arch/arm/boot/dts/iwg20d-q7-common.dtsi

+14 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 


	lvds-receiver {

		compatible = "ti,ds90cf384a", "lvds-decoder";

		powerdown-gpios = <&gpio7 25 GPIO_ACTIVE_LOW>;

		power-supply = <&vcc_3v3_tft1>;



		ports {

			#address-cells = <1>;
@@ -81,6 +81,7 @@ 
	panel {

		compatible = "edt,etm0700g0dh6";

		backlight = <&lcd_backlight>;

		power-supply = <&vcc_3v3_tft1>;



		port {

			panel_in: endpoint {
@@ -113,6 +114,17 @@ 
		};

	};



	vcc_3v3_tft1: regulator-panel {

		compatible = "regulator-fixed";



		regulator-name = "vcc-3v3-tft1";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		enable-active-high;

		startup-delay-us = <500>;

		gpio = <&gpio7 25 GPIO_ACTIVE_HIGH>;

	};



	vcc_sdhi1: regulator-vcc-sdhi1 {

		compatible = "regulator-fixed";
@@ -207,6 +219,7 @@ 
		reg = <0x38>;

		interrupt-parent = <&gpio2>;

		interrupts = <12 IRQ_TYPE_EDGE_FALLING>;

		vcc-supply = <&vcc_3v3_tft1>;

	};

};

arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts

+5 −5
Original line number Diff line number Diff line
@@ -223,16 +223,16 @@ 
};



&reg_dc1sw {

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-gmac-phy";

};



&reg_dcdc1 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "vcc-3v0";

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-3v3";

};



&reg_dcdc2 {

arch/arm/mach-omap2/cpuidle44xx.c

+3 −1
Original line number Diff line number Diff line
@@ -174,10 +174,12 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev, 
		 */

		if (mpuss_can_lose_context) {

			error = cpu_cluster_pm_enter();

			if (error)

			if (error) {

				omap_set_pwrdm_state(mpu_pd, PWRDM_POWER_ON);

				goto cpu_cluster_pm_out;

			}

		}

	}



	omap4_enter_lowpower(dev->cpu, cx->cpu_state);

	cpu_done[dev->cpu] = true;

arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi

+2 −4
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ 
				     <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;

				     <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "gp",

					  "gpmmu",

					  "pp",
@@ -151,8 +150,7 @@ 
					  "pp2",

					  "ppmmu2",

					  "pp3",

					  "ppmmu3",

					  "pmu";

					  "ppmmu3";

			clocks = <&ccu CLK_BUS_GPU>, <&ccu CLK_GPU>;

			clock-names = "bus", "core";

			resets = <&ccu RST_BUS_GPU>;

arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -221,7 +221,12 @@ 
};



&sdhc1 {

	status = "okay";

	/* There is an issue with the eMMC causing permanent

	 * damage to the card if a quirk isn't addressed.

	 * Until it's fixed, disable the MMC so as not to brick

	 * devices.

	 */

	status = "disabled";



	/* Downstream pushes 2.95V to the sdhci device,

	 * but upstream driver REALLY wants to make vmmc 1.8v

CRA Git | Maintained and supported by SUSTech CRA and CCSE