Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull ARM SoC fixes from Arnd Bergmann:
 "A small number of bugfixes, nothing serious this time. Here is a full
  list.

  4.13 regression fix:

   - imx7d-sdb pinctrl support regressed in 4.13 due to an incomplete
     patch

  DT fixes for recently added devices:

   - badly copied DT entries on imx6qdl-nitrogen6_som broke PCI reset

   - sama5d2 memory controller had the wrong ID and registers

   - imx7 power domains did not work correctly with deferred probing
     (driver added in 4.12)

   - Allwinner H5 pinctrl (added in 4.12) did not work right with GPIO
     interrupts

  Fixes for older bugs that just got noticed:

   - i.MX25 ADC support (added in 4.6) apparently never worked right due
     to a missing 'ranges' property in DT.

   - Renesas Salvador Audio support (added in v4.5) was broken for
     device repeated bind/unbind due to a naming conflict.

   - Various allwinner boards are missing an 'ethernet' alias in DT,
     leading to unstable device naming.

  Preventive bugfix:

   - TI Keystone needs a fix to prevent a NULL pointer dereference with
     an upcoming PM change"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  soc: ti: ti_sci_pm_domains: Populate name for genpd
  ARM: dts: imx6qdl-nitrogen6_som2: fix PCIe reset
  arm64: allwinner: h5: fix pinctrl IRQs
  arm64: allwinner: a64: sopine: add missing ethernet0 alias
  arm64: allwinner: a64: pine64: add missing ethernet0 alias
  arm64: allwinner: a64: bananapi-m64: add missing ethernet0 alias
  arm64: renesas: salvator-common: avoid audio_clkout naming conflict
  ARM: dts: i.MX25: add ranges to tscadc
  soc: imx: gpcv2: fix regulator deferred probe
  ARM: dts: at91: sama5d2: fix EBI/NAND controllers declaration
  ARM: dts: at91: sama5d2: use sama5d2 compatible string for SMC
  ARM: dts: imx7d-sdb: Put pinctrl_spi4 in the correct location
parents cb247857 4dd6a997

arch/arm/boot/dts/imx25.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ 
				#address-cells = <1>;

				#size-cells = <1>;

				status = "disabled";

				ranges;



				adc: adc@50030800 {

					compatible = "fsl,imx25-gcq";

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

+2 −2
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ 
	pinctrl_pcie: pciegrp {

		fsl,pins = <

			/* PCIe reset */

			MX6QDL_PAD_EIM_BCLK__GPIO6_IO31	0x030b0

			MX6QDL_PAD_EIM_DA0__GPIO3_IO00	0x030b0

			MX6QDL_PAD_EIM_DA4__GPIO3_IO04	0x030b0

		>;

	};
@@ -668,7 +668,7 @@ 
&pcie {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_pcie>;

	reset-gpio = <&gpio6 31 GPIO_ACTIVE_LOW>;

	reset-gpio = <&gpio3 0 GPIO_ACTIVE_LOW>;

	status = "okay";

};

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

+8 −8
Original line number Diff line number Diff line
@@ -557,6 +557,14 @@ 
			>;

		};



		pinctrl_spi4: spi4grp {

			fsl,pins = <

				MX7D_PAD_GPIO1_IO09__GPIO1_IO9	0x59

				MX7D_PAD_GPIO1_IO12__GPIO1_IO12	0x59

				MX7D_PAD_GPIO1_IO13__GPIO1_IO13	0x59

			>;

		};



		pinctrl_tsc2046_pendown: tsc2046_pendown {

			fsl,pins = <

				MX7D_PAD_EPDC_BDR1__GPIO2_IO29		0x59
@@ -697,13 +705,5 @@ 
		fsl,pins = <

			MX7D_PAD_LPSR_GPIO1_IO01__PWM1_OUT		0x110b0

		>;



		pinctrl_spi4: spi4grp {

			fsl,pins = <

				MX7D_PAD_GPIO1_IO09__GPIO1_IO9	0x59

				MX7D_PAD_GPIO1_IO12__GPIO1_IO12	0x59

				MX7D_PAD_GPIO1_IO13__GPIO1_IO13	0x59

			>;

		};

	};

};

arch/arm/boot/dts/sama5d2.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ 
			#size-cells = <1>;

			atmel,smc = <&hsmc>;

			reg = <0x10000000 0x10000000

			       0x40000000 0x30000000>;

			       0x60000000 0x30000000>;

			ranges = <0x0 0x0 0x10000000 0x10000000

				  0x1 0x0 0x60000000 0x10000000

				  0x2 0x0 0x70000000 0x10000000
@@ -1048,18 +1048,18 @@ 
			};



			hsmc: hsmc@f8014000 {

				compatible = "atmel,sama5d3-smc", "syscon", "simple-mfd";

				compatible = "atmel,sama5d2-smc", "syscon", "simple-mfd";

				reg = <0xf8014000 0x1000>;

				interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>;

				interrupts = <17 IRQ_TYPE_LEVEL_HIGH 6>;

				clocks = <&hsmc_clk>;

				#address-cells = <1>;

				#size-cells = <1>;

				ranges;



				pmecc: ecc-engine@ffffc070 {

				pmecc: ecc-engine@f8014070 {

					compatible = "atmel,sama5d2-pmecc";

					reg = <0xffffc070 0x490>,

					      <0xffffc500 0x100>;

					reg = <0xf8014070 0x490>,

					      <0xf8014500 0x100>;

				};

			};

arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
	compatible = "sinovoip,bananapi-m64", "allwinner,sun50i-a64";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

		serial1 = &uart1;

	};