Commit 7485e08e authored Jan 28, 2021 by Linus Torvalds

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

Pull ARM SoC fixes from Arnd Bergmann:
 "These are the current arm-soc bug fixes for linux-5.11. I already
  merged a larger set that just came in during the past three days but
  has not had much exposure in linux-next, but this is the subset I
  merged last week.

  Most of these are for the NXP i.MX platform (descriptions from their
  pull request):

   - Fix pcf2127 reset for imx7d-flex-concentrator board.
   - Fix i.MX6 suspend with Thumb-2 kernel.
   - Fix ethernet-phy address issue on imx6qdl-sr-som board.
   - Fix GPIO3 `gpio-ranges` on i.MX8MP.
   - Select SOC_BUS for IMX_SCU driver to fix build issue.
   - Fix backlight pwm on imx6qdl-kontron-samx6i which is lost from
     #pwm-cells conversion.
   - Fix duplicated bus node name for i.MX8MN SoC.
   - Fix reset register offset on LS1028A SoC.
   - Rename MMC node aliases for imx6q-tbs2910 to keep the MMC device
     index consistent with previous kernel version.
   - Selecting ARM_GIC_V3 on non-CP15 processors to fix one build
     failure with i.MX8M SoC driver.
   - Fix typos with status property on imx6qdl-kontron-samx6i board.
   - Fix duplicated regulator-name on imx6qdl-gw52xx board.

  Aside from i.MX, the bugfixes are all over the place:

   - Coccinelle found a refcount imbalance on integrator
   - defconfig fix for TI K3
   - A boot regression fix for ST ux500
   - A code preemption fix for the optee driver
   - USB DMA regression on Broadcom Stingray
   - A bogus boot time warning fix for at91 code"

* tag 'arm-soc-fixes-v5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  MAINTAINERS: Include bcm2835 subsequents into search
  arm64: dts: broadcom: Fix USB DMA address translation for Stingray
  drivers: soc: atmel: add null entry at the end of at91_soc_allowed_list[]
  drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs
  tee: optee: replace might_sleep with cond_resched
  firmware: imx: select SOC_BUS to fix firmware build
  arm64: dts: imx8mp: Correct the gpio ranges of gpio3
  ARM: dts: imx6qdl-sr-som: fix some cubox-i platforms
  ARM: imx: build suspend-imx6.S with arm instruction set
  ARM: dts: imx7d-flex-concentrator: fix pcf2127 reset
  ARM: dts: ux500: Reserve memory carveouts
  arm64: defconfig: Drop unused K3 SoC specific options
  bus: arm-integrator-lm: Add of_node_put() before return statement
  ARM: dts: imx6qdl-gw52xx: fix duplicate regulator naming
  ARM: dts: imx6qdl-kontron-samx6i: fix i2c_lcd/cam default status
  ARM: imx: fix imx8m dependencies
  ARM: dts: tbs2910: rename MMC node aliases
  arm64: dts: ls1028a: fix the offset of the reset register
  arm64: dts: imx8mn: Fix duplicate node name
  ARM: dts: imx6qdl-kontron-samx6i: fix pwms for lcd-backlight

parents b0dfa64d e49c24c8

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -3411,7 +3411,7 @@ F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
		F: drivers/pci/controller/pcie-brcmstb.c
		F: drivers/staging/vc04_services
		N: bcm2711
		N: bcm2835
		N: bcm283*

		BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
		M: Florian Fainelli <f.fainelli@gmail.com>

arch/arm/boot/dts/imx6q-tbs2910.dts

+7 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,13 @@
		stdout-path = &uart1;
		};

		aliases {
		mmc0 = &usdhc2;
		mmc1 = &usdhc3;
		mmc2 = &usdhc4;
		/delete-property/ mmc3;
		};

		memory@10000000 {
		device_type = "memory";
		reg = <0x10000000 0x80000000>;

arch/arm/boot/dts/imx6qdl-gw52xx.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -418,7 +418,7 @@

		/* VDD_AUD_1P8: Audio codec */
		reg_aud_1p8v: ldo3 {
		regulator-name = "vdd1p8";
		regulator-name = "vdd1p8a";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		regulator-boot-on;

arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi

+3 −3

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@

		lcd_backlight: lcd-backlight {
		compatible = "pwm-backlight";
		pwms = <&pwm4 0 5000000>;
		pwms = <&pwm4 0 5000000 0>;
		pwm-names = "LCD_BKLT_PWM";

		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
		@@ -167,7 +167,7 @@
		i2c-gpio,delay-us = <2>; /* ~100 kHz */
		#address-cells = <1>;
		#size-cells = <0>;
		status = "disabld";
		status = "disabled";
		};

		i2c_cam: i2c-gpio-cam {
		@@ -179,7 +179,7 @@
		i2c-gpio,delay-us = <2>; /* ~100 kHz */
		#address-cells = <1>;
		#size-cells = <0>;
		status = "disabld";
		status = "disabled";
		};
		};

arch/arm/boot/dts/imx6qdl-sr-som.dtsi

+10 −2

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@
		&fec {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;
		phy-handle = <&phy>;
		phy-mode = "rgmii-id";
		phy-reset-duration = <2>;
		phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
		@@ -63,10 +62,19 @@
		#address-cells = <1>;
		#size-cells = <0>;

		phy: ethernet-phy@0 {
		/*
		* The PHY can appear at either address 0 or 4 due to the
		* configuration (LED) pin not being pulled sufficiently.
		*/
		ethernet-phy@0 {
		reg = <0>;
		qca,clk-out-frequency = <125000000>;
		};

		ethernet-phy@4 {
		reg = <4>;
		qca,clk-out-frequency = <125000000>;
		};
		};
		};