Commit 97ace515 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:
 "This is the first set of bugfixes for ARM SoCs, fixing a couple of
  stability problems, mostly on TI OMAP and Rockchips platforms:

   - OMAP2 hwmod clocks must be enabled in the correct order

   - OMAP3 Wakeup from resume through PRM IRQ was unreliable

   - one regression on OMAP5 caused by a kexec fix

   - Rockchip ethernet needs some settings for stable operation on
     Rock64

   - Rockchip based Chrombook Plus needs another clock setting for
     stable display suspend/resume

   - Rockchip based phyCORE-RK3288 was able to run at an invalid CPU
     clock frequency

   - Rockchip MMC link was sometimes unreliable

   - multiple fixes to avoid crashes in the Broadcom STB DPFE driver

  Other minor changes include:

   - Devicetree fixes for incorrect hardware description (rockchip,
     omap, Gemini, amlogic)

   - some MAINTAINER file updates to correct email and git addresses

   - some fixes addressing 'make W=1' dtc warnings (broadcom, amlogic,
     cavium, qualcomm, hisilicon, zx)

   - fixes for LTO-compilation (orion, davinci, clps711x)

   - one fix for an incorrect Kconfig errata selection

   - a memory leak in the OMAP timer driver

   - a kernel data leak in OMAP1 debugfs files"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
  MAINTAINERS: update entries for ARM/STM32
  ARM: dts: bcm283x: Move arm-pmu out of soc node
  ARM: dts: bcm283x: Fix unit address of local_intc
  ARM: dts: NSP: Fix amount of RAM on BCM958625HR
  ARM: dts: Set D-Link DNS-313 SATA to muxmode 0
  ARM: omap2: set CONFIG_LIRC=y in defconfig
  ARM: dts: imx6dl: Include correct dtsi file for Engicam i.CoreM6 DualLite/Solo RQS
  memory: brcmstb: dpfe: support new way of passing data from the DCPU
  memory: brcmstb: dpfe: fix type declaration of variable "ret"
  memory: brcmstb: dpfe: properly mask vendor error bits
  ARM: BCM: dts: Remove leading 0x and 0s from bindings notation
  ARM: orion: fix orion_ge00_switch_board_info initialization
  ARM: davinci: mark spi_board_info arrays as const
  ARM: clps711x: mark clps711x_compat as const
  arm: zx: dts: Remove leading 0x and 0s from bindings notation
  arm64: dts: Remove leading 0x and 0s from bindings notation
  arm64: dts: cavium: fix PCI bus dtc warnings
  MAINTAINERS: ARM: at91: update my email address
  soc: imx: gpc: de-register power domains only if initialized
  ARM: dts: rockchip: Fix DWMMC clocks
  ...
parents b5e792f1 8f148f32

MAINTAINERS

+6 −4
Original line number Diff line number Diff line
@@ -1238,7 +1238,7 @@ F: drivers/clk/at91 


ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

M:	Alexandre Belloni <alexandre.belloni@free-electrons.com>

M:	Alexandre Belloni <alexandre.belloni@bootlin.com>

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

W:	http://www.linux4sam.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
@@ -1590,7 +1590,7 @@ ARM/Marvell Dove/MV78xx0/Orion SOC support 
M:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

M:	Gregory Clement <gregory.clement@free-electrons.com>

M:	Gregory Clement <gregory.clement@bootlin.com>

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

S:	Maintained

F:	Documentation/devicetree/bindings/soc/dove/
@@ -1604,7 +1604,7 @@ F: arch/arm/boot/dts/orion5x* 
ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support

M:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Gregory Clement <gregory.clement@free-electrons.com>

M:	Gregory Clement <gregory.clement@bootlin.com>

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

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

S:	Maintained
@@ -1999,8 +1999,10 @@ M: Maxime Coquelin <mcoquelin.stm32@gmail.com> 
M:	Alexandre Torgue <alexandre.torgue@st.com>

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

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next

N:	stm32

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

F:	arch/arm/mach-stm32/

F:	drivers/clocksource/armv7m_systick.c



ARM/TANGO ARCHITECTURE

arch/arm/boot/dts/bcm11351.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
		      <0x3ff00100 0x100>;

	};



	smc@0x3404c000 {

	smc@3404c000 {

		compatible = "brcm,bcm11351-smc", "brcm,kona-smc";

		reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */

	};

arch/arm/boot/dts/bcm21664.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
		      <0x3ff00100 0x100>;

	};



	smc@0x3404e000 {

	smc@3404e000 {

		compatible = "brcm,bcm21664-smc", "brcm,kona-smc";

		reg = <0x3404e000 0x400>; /* 1 KiB in SRAM */

	};

arch/arm/boot/dts/bcm2835.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ 
	soc {

		ranges = <0x7e000000 0x20000000 0x02000000>;

		dma-ranges = <0x40000000 0x00000000 0x20000000>;

	};



	arm-pmu {

		compatible = "arm,arm1176-pmu";

	};

};

};



&cpu_thermal {

	coefficients = <(-538)	407000>;

arch/arm/boot/dts/bcm2836.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -9,20 +9,20 @@ 
			 <0x40000000 0x40000000 0x00001000>;

		dma-ranges = <0xc0000000 0x00000000 0x3f000000>;



		local_intc: local_intc {

		local_intc: local_intc@40000000 {

			compatible = "brcm,bcm2836-l1-intc";

			reg = <0x40000000 0x100>;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupt-parent = <&local_intc>;

		};

	};



	arm-pmu {

		compatible = "arm,cortex-a7-pmu";

		interrupt-parent = <&local_intc>;

		interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;

	};

	};



	timer {

		compatible = "arm,armv7-timer";

CRA Git | Maintained and supported by SUSTech CRA and CCSE