Commit fe2da896 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:
 "A smaller batch of fixes, nothing that stands out as risky or scary.

  Mostly DTS tweaks for a few issues:

   - GPU fixlets for Meson

   - CPU idle fix for LS1028A

   - PWM interrupt fixes for i.MX6UL

  Also, enable a driver (FSL_EDMA) on arm64 defconfig, and a warning and
  two MAINTAINER tweaks"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: dts: imx6ul: fix PWM[1-4] interrupts
  ARM: omap2: remove incorrect __init annotation
  ARM: dts: gemini Fix up DNS-313 compatible string
  ARM: dts: Blank D-Link DIR-685 console
  arm64: defconfig: Enable FSL_EDMA driver
  arm64: dts: ls1028a: Fix CPU idle fail.
  MAINTAINERS: BCM53573: Add internal Broadcom mailing list
  MAINTAINERS: BCM2835: Add internal Broadcom mailing list
  ARM: dts: meson8b: fix the operating voltage of the Mali GPU
  ARM: dts: meson8b: drop undocumented property from the Mali GPU node
  ARM: dts: meson8: fix GPU interrupts and drop an undocumented property
parents cd0f3aae e73f6593

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -3122,6 +3122,7 @@ F: arch/arm/mach-bcm/ 
BROADCOM BCM2835 ARM ARCHITECTURE

M:	Eric Anholt <eric@anholt.net>

M:	Stefan Wahren <wahrenst@gmx.net>

L:	bcm-kernel-feedback-list@broadcom.com

L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://github.com/anholt/linux
@@ -3151,6 +3152,7 @@ F: arch/arm/boot/dts/bcm953012* 


BROADCOM BCM53573 ARM ARCHITECTURE

M:	Rafał Miłecki <rafal@milecki.pl>

L:	bcm-kernel-feedback-list@broadcom.com

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	arch/arm/boot/dts/bcm53573*

arch/arm/boot/dts/gemini-dlink-dir-685.dts

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
	};



	chosen {

		bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait";

		bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait consoleblank=300";

		stdout-path = "uart0:19200n8";

	};

arch/arm/boot/dts/gemini-dlink-dns-313.dts

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


/ {

	model = "D-Link DNS-313 1-Bay Network Storage Enclosure";

	compatible = "dlink,dir-313", "cortina,gemini";

	compatible = "dlink,dns-313", "cortina,gemini";

	#address-cells = <1>;

	#size-cells = <1>;

arch/arm/boot/dts/imx6ul.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ 
			pwm1: pwm@2080000 {

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				reg = <0x02080000 0x4000>;

				interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6UL_CLK_PWM1>,

					 <&clks IMX6UL_CLK_PWM1>;

				clock-names = "ipg", "per";
@@ -369,7 +369,7 @@ 
			pwm2: pwm@2084000 {

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				reg = <0x02084000 0x4000>;

				interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6UL_CLK_PWM2>,

					 <&clks IMX6UL_CLK_PWM2>;

				clock-names = "ipg", "per";
@@ -380,7 +380,7 @@ 
			pwm3: pwm@2088000 {

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				reg = <0x02088000 0x4000>;

				interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6UL_CLK_PWM3>,

					 <&clks IMX6UL_CLK_PWM3>;

				clock-names = "ipg", "per";
@@ -391,7 +391,7 @@ 
			pwm4: pwm@208c000 {

				compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";

				reg = <0x0208c000 0x4000>;

				interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6UL_CLK_PWM4>,

					 <&clks IMX6UL_CLK_PWM4>;

				clock-names = "ipg", "per";

arch/arm/boot/dts/meson8.dtsi

+2 −3
Original line number Diff line number Diff line
@@ -248,8 +248,8 @@ 
				     <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,
@@ -264,7 +264,6 @@ 
			clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>;

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

			operating-points-v2 = <&gpu_opp_table>;

			switch-delay = <0xffff>;

		};

	};

}; /* end of / */

CRA Git | Maintained and supported by SUSTech CRA and CCSE