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

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

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Nothing frightening this time, just smaller fixes in a number of
  places.

  The other changes contained here are:

   MAINTAINERS file updates:

   - The mach-gemini maintainer is back in action and has a new git tree

   - Krzysztof Kozlowski has volunteered to be a new co-maintainer for
     the samsung platforms

   - updates to the files that belong to Marvell mvebu

  Bug fixes:

   - The largest changes are on omap2, but are only to avoid some
     harmless warnings and to fix reset on omap4

   - a small regression fix on tegra

   - multiple fixes for incorrect IRQ affinity on vexpress

   - the missing system controller on arm64 juno is added

   - one revert of a patch that was accidentally applied twice for
     mach-rockchip

   - two clock related DT fixes for mvebu

   - a workaround for suspend with old DT binaries on new exynos kernels

   - Another fix for suspend on exynos, needs to be backported"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
  MAINTAINERS: Add dts entries for some of the Marvell SoCs
  MAINTAINERS: ARM: EXYNOS: Add Krzysztof Kozlowski as co-maintainer
  ARM: EXYNOS: Use of_machine_is_compatible instead of soc_is_exynos4
  ARM: EXYNOS: Fix failed second suspend on Exynos4
  Revert "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"
  ARM: EXYNOS: Fix dereference of ERR_PTR returned by of_genpd_get_from_provider
  ARM: EXYNOS: Don't try to initialize suspend on old DT
  ARM: dts: Add keep-power-in-suspend to WiFi SDIO node for Peach Boards
  ARM: gemini: fix compiler warning due wrong data type
  ARM: vexpress/tc2: Add interrupt-affinity to the PMU node
  ARM: vexpress/ca9: Add interrupt-affinity to the PMU node
  ARM: vexpress/ca9: Add unified-cache property to l2 cache node
  ARM64: juno: add sp810 support and fix sp804 clock frequency
  ARM: Gemini: Maintainers update
  ARM: OMAP2+: Remove bogus struct clk comparison for timer clock
  ARM: dove: Add clock-names to CuBox Si5351 clk generator
  ARM: AM33xx+: hwmod: re-use omap4 implementations for reset functionality
  ARM: OMAP4+: PRM: add support for passing status register/bit info to reset
  ARM: AM43xx: hwmod: add VPFE hwmod entries
  ARM: mvebu: Fix the main PLL frequency on Armada 375, 38x and 39x SoCs
  ...
parents 73786683 56523eef

MAINTAINERS

+11 −2
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ S: Maintained 
ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE

M:	Hans Ulli Kroll <ulli.kroll@googlemail.com>

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

T:	git git://git.berlios.de/gemini-board

T:	git git://github.com/ulli-kroll/linux.git

S:	Maintained

F:	arch/arm/mach-gemini/
@@ -1193,7 +1193,7 @@ ARM/MAGICIAN MACHINE SUPPORT 
M:	Philipp Zabel <philipp.zabel@gmail.com>

S:	Maintained



ARM/Marvell Armada 370 and Armada XP SOC support

ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support

M:	Jason Cooper <jason@lakedaemon.net>

M:	Andrew Lunn <andrew@lunn.ch>

M:	Gregory Clement <gregory.clement@free-electrons.com>
@@ -1202,12 +1202,17 @@ 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*





ARM/Marvell Berlin SoC support

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

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

S:	Maintained

F:	arch/arm/mach-berlin/

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





ARM/Marvell Dove/MV78xx0/Orion SOC support

M:	Jason Cooper <jason@lakedaemon.net>
@@ -1220,6 +1225,9 @@ F: arch/arm/mach-dove/ 
F:	arch/arm/mach-mv78xx0/

F:	arch/arm/mach-orion5x/

F:	arch/arm/plat-orion/

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

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





ARM/Orion SoC/Technologic Systems TS-78xx platform support

M:	Alexander Clouter <alex@digriz.org.uk>
@@ -1371,6 +1379,7 @@ N: rockchip 


ARM/SAMSUNG EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene@kernel.org>

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

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

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

S:	Maintained

arch/arm/boot/dts/armada-375.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
		mainpll: mainpll {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <2000000000>;

			clock-frequency = <1000000000>;

		};

		/* 25 MHz reference crystal */

		refclk: oscillator {

arch/arm/boot/dts/armada-38x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ 
		mainpll: mainpll {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <2000000000>;

			clock-frequency = <1000000000>;

		};



		/* 25 MHz reference crystal */

arch/arm/boot/dts/armada-39x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ 
		mainpll: mainpll {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <2000000000>;

			clock-frequency = <1000000000>;

		};

	};

};

arch/arm/boot/dts/dove-cubox.dts

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 


		/* connect xtal input to 25MHz reference */

		clocks = <&ref25>;

		clock-names = "xtal";



		/* connect xtal input as source of pll0 and pll1 */

		silabs,pll-source = <0 0>, <1 0>;