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

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

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

Pull ARM SoC platform updates from Olof Johansson:
 "Improved and new platform support for various SoCs:

  New SoC support:
   - Broadcom BCM23550
   - Freescale i.MX7Solo
   - Qualcomm MDM9615
   - Renesas r8a7792

  Improvements:
   - convert clps711x to multiplatform
   - debug uart improvements for Atmel platforms
   - Tango platform improvements: HOTPLUG_CPU, Suspend-to-ram
   - OMAP tweaks and improvements to hwmod
   - OMAP support for kexec on SMP"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (109 commits)
  ARM: davinci: fix build break because of undeclared dm365_evm_snd_data
  ARM: s3c64xx: smartq: Avoid sparse warnings
  ARM: sti: Implement dummy L2 cache's write_sec
  ARM: STi: Update machine _namestr to be more generic.
  arm: meson: explicitly select clk drivers
  ARM: tango: add Suspend-to-RAM support
  ARM: hisi: consolidate the hisilicon machine entries
  ARM: tango: fix CONFIG_HOTPLUG_CPU=n build
  MAINTAINERS: Update BCM281XX/BCM11XXX/BCM216XX entry
  MAINTAINERS: Update BCM63XX entry
  MAINTAINERS: Add NS2 entry
  MAINTAINERS: Fix nsp false-positives
  MAINTAINERS: Change L to M for Broadcom ARM/ARM64 SoC entries
  ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
  ARM: clps711x: Switch to MULTIPLATFORM
  ARM: clps711x: Remove boards support
  ARM: clps711x: Add basic DT support
  ARM: clps711x: Reduce static map size
  ARM: SAMSUNG: Constify iomem address passed to s5p_init_cpu
  ARM: oxnas: Change OX810SE default driver config
  ...
parents 6f888fe3 4756f881

Documentation/arm/Atmel/README

+8 −2
Original line number Diff line number Diff line
@@ -91,9 +91,15 @@ the Atmel website: http://www.atmel.com. 
          http://www.atmel.com/Images/Atmel-11238-32-bit-Cortex-A5-Microcontroller-SAMA5D4_Datasheet.pdf



      - sama5d2 family

        - sama5d27

        - sama5d21

        - sama5d22

        - sama5d23

        - sama5d24

        - sama5d26

        - sama5d27 (device superset)

        - sama5d28 (device superset + environmental monitors)

        + Datasheet

          Coming soon

          http://www.atmel.com/Images/Atmel-11267-32-bit-Cortex-A5-Microcontroller-SAMA5D2_Datasheet.pdf





Linux kernel information

Documentation/devicetree/bindings/net/fsl-fec.txt

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ Optional properties: 
  number to 1.

- fsl,magic-packet : If present, indicates that the hardware supports waking

  up via magic packet.

- fsl,err006687-workaround-present: If present indicates that the system has

  the hardware workaround for ERR006687 applied and does not need a software

  workaround.



Optional subnodes:

- mdio : specifies the mdio bus in the FEC, used as a container for phy nodes

Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Required properties: 
      - "renesas,r8a7793-sysc" (R-Car M2-N)

      - "renesas,r8a7794-sysc" (R-Car E2)

      - "renesas,r8a7795-sysc" (R-Car H3)

      - "renesas,r8a7796-sysc" (R-Car M3-W)

  - reg: Address start and address range for the device.

  - #power-domain-cells: Must be 1.

MAINTAINERS

+22 −20
Original line number Diff line number Diff line
@@ -1613,8 +1613,10 @@ F: arch/arm/mach-s3c24*/ 
F:	arch/arm/mach-s3c64xx/

F:	arch/arm/mach-s5p*/

F:	arch/arm/mach-exynos*/

F:	drivers/*/*s3c2410*

F:	drivers/*/*/*s3c2410*

F:	drivers/*/*s3c24*

F:	drivers/*/*/*s3c24*

F:	drivers/*/*s3c64xx*

F:	drivers/*/*s5pv210*

F:	drivers/memory/samsung/*

F:	drivers/soc/samsung/*

F:	drivers/spi/spi-s3c*
@@ -1752,8 +1754,7 @@ ARM/TANGO ARCHITECTURE 
M:	Marc Gonzalez <marc_gonzalez@sigmadesigns.com>

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

S:	Maintained

F:	arch/arm/mach-tango/

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

N:	tango



ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>
@@ -2507,17 +2508,14 @@ BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE 
M:	Florian Fainelli <f.fainelli@gmail.com>

M:	Ray Jui <rjui@broadcom.com>

M:	Scott Branden <sbranden@broadcom.com>

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

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

T:	git git://github.com/broadcom/mach-bcm

S:	Maintained

N:	bcm281*

N:	bcm113*

N:	bcm216*

N:	kona

F:	arch/arm/mach-bcm/

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

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

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

F:	arch/arm64/boot/dts/broadcom/

F:	arch/arm/configs/bcm_defconfig

F:	drivers/mmc/host/sdhci-bcm-kona.c

F:	drivers/clocksource/bcm_kona_timer.c



BROADCOM BCM2835 ARM ARCHITECTURE

M:	Stephen Warren <swarren@wwwdotorg.org>
@@ -2540,20 +2538,21 @@ F: arch/mips/include/asm/mach-bcm47xx/* 


BROADCOM BCM5301X ARM ARCHITECTURE

M:	Hauke Mehrtens <hauke@hauke-m.de>

M:	Rafał Miłecki <zajec5@gmail.com>

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

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

S:	Maintained

F:	arch/arm/mach-bcm/bcm_5301x.c

F:	arch/arm/boot/dts/bcm5301x.dtsi

F:	arch/arm/boot/dts/bcm5301x*.dtsi

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



BROADCOM BCM63XX ARM ARCHITECTURE

M:	Florian Fainelli <f.fainelli@gmail.com>

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

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

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

T:	git git://github.com/broadcom/stblinux.git

S:	Maintained

F:	arch/arm/mach-bcm/bcm63xx.c

F:	arch/arm/include/debug/bcm63xx.S

N:	bcm63xx



BROADCOM BCM63XX/BCM33XX UDC DRIVER

M:	Kevin Cernekee <cernekee@gmail.com>
@@ -2565,8 +2564,8 @@ BROADCOM BCM7XXX ARM ARCHITECTURE 
M:	Brian Norris <computersforpeace@gmail.com>

M:	Gregory Fong <gregory.0xf0@gmail.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

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

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

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

T:	git git://github.com/broadcom/stblinux.git

S:	Maintained

F:	arch/arm/mach-bcm/*brcmstb*
@@ -2623,13 +2622,13 @@ BROADCOM IPROC ARM ARCHITECTURE 
M:	Ray Jui <rjui@broadcom.com>

M:	Scott Branden <sbranden@broadcom.com>

M:	Jon Mason <jonmason@broadcom.com>

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

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

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

T:	git git://github.com/broadcom/cygnus-linux.git

S:	Maintained

N:	iproc

N:	cygnus

N:	nsp

N:	bcm[-_]nsp

N:	bcm9113*

N:	bcm9583*

N:	bcm9585*
@@ -2640,6 +2639,9 @@ N: bcm583* 
N:	bcm585*

N:	bcm586*

N:	bcm88312

F:	arch/arm64/boot/dts/broadcom/ns2*

F:	drivers/clk/bcm/clk-ns*

F:	drivers/pinctrl/bcm/pinctrl-ns*



BROADCOM BRCMSTB GPIO DRIVER

M:	Gregory Fong <gregory.0xf0@gmail.com>
@@ -2684,8 +2686,8 @@ F: drivers/net/ethernet/broadcom/bcmsysport.* 


BROADCOM VULCAN ARM64 SOC

M:	Jayachandran C. <jchandra@broadcom.com>

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

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

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

S:	Maintained

F:	arch/arm64/boot/dts/broadcom/vulcan*

arch/arm/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -351,20 +351,6 @@ config ARM_SINGLE_ARMV7M 
	select SPARSE_IRQ

	select USE_OF





config ARCH_CLPS711X

	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"

	select AUTO_ZRELADDR

	select COMMON_CLK

	select CPU_ARM720T

	select GENERIC_CLOCKEVENTS

	select CLPS711X_TIMER

	select GPIOLIB

	select MFD_SYSCON

	select SOC_BUS

	help

	  Support for Cirrus Logic 711x/721x/731x based boards.



config ARCH_GEMINI

	bool "Cortina Systems Gemini"

	select CLKSRC_MMIO