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

Commit 788a73f4 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 Olof Johansson:
 "Been sitting on these for a couple of weeks waiting on some larger
  batches to come in but it's been pretty quiet.

  Just your garden variety fixes here:

   - A few maintainers updates (ep93xx, Exynos, TI, Marvell)
   - Some PM fixes for Atmel/at91 and Marvell
   - A few DT fixes for Marvell, Versatile, TI Keystone, bcm283x
   - A reset driver patch to set module license for symbol access"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  MAINTAINERS: EP93XX: Update maintainership
  MAINTAINERS: remove kernel@stlinux.com obsolete mailing list
  ARM: dts: versatile: use #include "..." to include local DT
  MAINTAINERS: add device-tree files to TI DaVinci entry
  ARM: at91: select CONFIG_ARM_CPU_SUSPEND
  ARM: dts: keystone-k2l: fix broken Ethernet due to disabled OSR
  arm64: defconfig: enable some core options for 64bit Rockchip socs
  arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes
  reset: hi6220: Set module license so that it can be loaded
  MAINTAINERS: add irqchip related drivers to Marvell EBU maintainers
  MAINTAINERS: sort F entries for Marvell EBU maintainers
  ARM: davinci: PM: Do not free useful resources in normal path in 'davinci_pm_init'
  ARM: davinci: PM: Free resources in error handling path in 'davinci_pm_init'
  ARM: dts: bcm283x: Reserve first page for firmware
  memory: atmel-ebi: mark PM ops as __maybe_unused
  MAINTAINERS: Remove Javier Martinez Canillas as reviewer for Exynos
parents 0d22df90 151d1d75

MAINTAINERS

+7 −7
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ N: clps711x 


ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE

M:	Hartley Sweeten <hsweeten@visionengravers.com>

M:	Ryan Mallon <rmallon@gmail.com>

M:	Alexander Sverdlin <alexander.sverdlin@gmail.com>

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

S:	Maintained

F:	arch/arm/mach-ep93xx/
@@ -1489,13 +1489,15 @@ M: Gregory Clement <gregory.clement@free-electrons.com> 
M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

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

S:	Maintained

F:	arch/arm/mach-mvebu/

F:	drivers/rtc/rtc-armada38x.c

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

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

F:	arch/arm/configs/mvebu_*_defconfig

F:	arch/arm/mach-mvebu/

F:	arch/arm64/boot/dts/marvell/armada*

F:	drivers/cpufreq/mvebu-cpufreq.c

F:	arch/arm/configs/mvebu_*_defconfig

F:	drivers/irqchip/irq-armada-370-xp.c

F:	drivers/irqchip/irq-mvebu-*

F:	drivers/rtc/rtc-armada38x.c



ARM/Marvell Berlin SoC support

M:	Jisheng Zhang <jszhang@marvell.com>
@@ -1721,7 +1723,6 @@ N: rockchip 
ARM/SAMSUNG EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene@kernel.org>

M:	Krzysztof Kozlowski <krzk@kernel.org>

R:	Javier Martinez Canillas <javier@osg.samsung.com>

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

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/
@@ -1829,7 +1830,6 @@ F: drivers/edac/altera_edac. 
ARM/STI ARCHITECTURE

M:	Patrice Chotard <patrice.chotard@st.com>

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

L:	kernel@stlinux.com

W:	http://www.stlinux.com

S:	Maintained

F:	arch/arm/mach-sti/
@@ -11268,7 +11268,6 @@ F: drivers/media/rc/serial_ir.c 


STI CEC DRIVER

M:	Benjamin Gaignard <benjamin.gaignard@linaro.org>

L:	kernel@stlinux.com

S:	Maintained

F:	drivers/staging/media/st-cec/

F:	Documentation/devicetree/bindings/media/stih-cec.txt
@@ -11778,6 +11777,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git 
S:	Supported

F:	arch/arm/mach-davinci/

F:	drivers/i2c/busses/i2c-davinci.c

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



TI DAVINCI SERIES MEDIA DRIVER

M:	"Lad, Prabhakar" <prabhakar.csengg@gmail.com>

arch/arm/boot/dts/bcm283x.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 
#include <dt-bindings/clock/bcm2835-aux.h>

#include <dt-bindings/gpio/gpio.h>



/* firmware-provided startup stubs live here, where the secondary CPUs are

 * spinning.

 */

/memreserve/ 0x00000000 0x00001000;



/* This include file covers the common peripherals and configuration between

 * bcm2835 and bcm2836 implementations, leaving the CPU configuration to

 * bcm2835.dtsi and bcm2836.dtsi.

arch/arm/boot/dts/keystone-k2l-netcp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ netcp: netcp@26000000 { 
	/* NetCP address range */

	ranges = <0 0x26000000 0x1000000>;



	clocks = <&clkpa>, <&clkcpgmac>, <&chipclk12>, <&clkosr>;

	clock-names = "pa_clk", "ethss_clk", "cpts", "osr_clk";

	clocks = <&clkpa>, <&clkcpgmac>, <&chipclk12>;

	clock-names = "pa_clk", "ethss_clk", "cpts";

	dma-coherent;



	ti,navigator-dmas = <&dma_gbe 0>,

arch/arm/boot/dts/keystone-k2l.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -232,6 +232,14 @@ 
			};

		};



		osr: sram@70000000 {

			compatible = "mmio-sram";

			reg = <0x70000000 0x10000>;

			#address-cells = <1>;

			#size-cells = <1>;

			clocks = <&clkosr>;

		};



		dspgpio0: keystone_dsp_gpio@02620240 {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

arch/arm/boot/dts/versatile-pb.dts

+1 −1
Original line number Diff line number Diff line 
#include <versatile-ab.dts>

#include "versatile-ab.dts"



/ {

	model = "ARM Versatile PB";