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

Commit 8ca302e9 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 Arnd Bergmann:
 "SoC platform changes (arch/arm/mach-*). This merge window, the bulk is
  for a few platforms:

   - Andres Färber adds initial support for the Actions Semi S500 (aka
     'owl') platform, a close relative of the S900 platform he adds for
     arm64.

   - in mach-omap2, we remove more legacy code

   - Rockchips gains support for the RV1108 SoC designed for camera
     applications.

   - For Atmel, we gain support for MMU-less SoCs (SAME70/V71/S70/V70)

   - Minor updates for other platforms, including davinci, s3c64xx,
     prima2, stm32, broadcom nsp, amlogic, pxa, imx and renesas"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (74 commits)
  ARM: owl: smp: Drop bogus holding pen
  ARM: owl: Drop custom machine
  ARM: owl: smp: Implement SPS power-gating for CPU2 and CPU3
  soc: actions: owl-sps: Factor out owl_sps_set_pg() for power-gating
  soc: actions: Add Owl SPS
  dt-bindings: power: Add Owl SPS power domains
  MAINTAINERS: Update Actions Semi section with SPS
  ARM: owl: Implement CPU enable-method for S500
  MAINTAINERS: Add Actions Semi Owl section
  ARM: Prepare Actions Semi S500
  ARM: socfpga: Increase max number of GPIOs
  ARM: stm32: Introduce MACH_STM32F469 flag
  ARM: prima2: remove redundant select CPU_V7
  ARM: davinci: fix const warnings
  ARM: shmobile: pm-rmobile: Use GENPD_FLAG_ALWAYS_ON
  ARM: OMAP4: hwmod_data: add SHAM crypto accelerator
  ARM: OMAP4: hwmod data: add des
  ARM: OMAP4: hwmod data: add aes2
  ARM: OMAP4: hwmod data: add aes1
  ARM: pxa: Delete an error message for a failed memory allocation in pxa3xx_u2d_probe()
  ...
parents 612341bd 18cfd942

Documentation/arm/Atmel/README

+37 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ git branches/tags and email subject always contain this "at91" sub-string. 


AT91 SoCs

---------

Documentation and detailled datasheet for each product are available on

Documentation and detailed datasheet for each product are available on

the Atmel website: http://www.atmel.com.



  Flavors:
@@ -101,6 +101,42 @@ the Atmel website: http://www.atmel.com. 
        + Datasheet

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



    * ARM Cortex-M7 MCUs

      - sams70 family

        - sams70j19

        - sams70j20

        - sams70j21

        - sams70n19

        - sams70n20

        - sams70n21

        - sams70q19

        - sams70q20

        - sams70q21

        + Datasheet

          http://www.atmel.com/Images/Atmel-11242-32-bit-Cortex-M7-Microcontroller-SAM-S70Q-SAM-S70N-SAM-S70J_Datasheet.pdf



      - samv70 family

        - samv70j19

        - samv70j20

        - samv70n19

        - samv70n20

        - samv70q19

        - samv70q20

        + Datasheet

          http://www.atmel.com/Images/Atmel-11297-32-bit-Cortex-M7-Microcontroller-SAM-V70Q-SAM-V70N-SAM-V70J_Datasheet.pdf



      - samv71 family

        - samv71j19

        - samv71j20

        - samv71j21

        - samv71n19

        - samv71n20

        - samv71n21

        - samv71q19

        - samv71q20

        - samv71q21

        + Datasheet

          http://www.atmel.com/Images/Atmel-44003-32-bit-Cortex-M7-Microcontroller-SAM-V71Q-SAM-V71N-SAM-V71J_Datasheet.pdf



Linux kernel information

------------------------

Documentation/devicetree/bindings/arm/atmel-at91.txt

+30 −0
Original line number Diff line number Diff line
@@ -41,6 +41,36 @@ compatible: must be one of: 
       - "atmel,sama5d43"

       - "atmel,sama5d44"



 * "atmel,samv7" for MCUs using a Cortex-M7, shall be extended with the specific

   SoC family:

    o "atmel,sams70" shall be extended with the specific MCU compatible:

       - "atmel,sams70j19"

       - "atmel,sams70j20"

       - "atmel,sams70j21"

       - "atmel,sams70n19"

       - "atmel,sams70n20"

       - "atmel,sams70n21"

       - "atmel,sams70q19"

       - "atmel,sams70q20"

       - "atmel,sams70q21"

    o "atmel,samv70" shall be extended with the specific MCU compatible:

       - "atmel,samv70j19"

       - "atmel,samv70j20"

       - "atmel,samv70n19"

       - "atmel,samv70n20"

       - "atmel,samv70q19"

       - "atmel,samv70q20"

    o "atmel,samv71" shall be extended with the specific MCU compatible:

       - "atmel,samv71j19"

       - "atmel,samv71j20"

       - "atmel,samv71j21"

       - "atmel,samv71n19"

       - "atmel,samv71n20"

       - "atmel,samv71n21"

       - "atmel,samv71q19"

       - "atmel,samv71q20"

       - "atmel,samv71q21"



Chipid required properties:

- compatible: Should be "atmel,sama5d2-chipid"

- reg : Should contain registers location and length

Documentation/devicetree/bindings/power/actions,owl-sps.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Actions Semi Owl Smart Power System (SPS)



Required properties:

- compatible          :  "actions,s500-sps" for S500

- reg                 :  Offset and length of the register set for the device.

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

                         See macros in:

                          include/dt-bindings/power/owl-s500-powergate.h for S500





Example:



		sps: power-controller@b01b0100 {

			compatible = "actions,s500-sps";

			reg = <0xb01b0100 0x100>;

			#power-domain-cells = <1>;

		};

MAINTAINERS

+16 −0
Original line number Diff line number Diff line
@@ -1036,6 +1036,22 @@ S: Maintained 
F:	drivers/amba/

F:	include/linux/amba/bus.h



ARM/ACTIONS SEMI ARCHITECTURE

M:	Andreas Färber <afaerber@suse.de>

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

S:	Maintained

N:	owl

F:	arch/arm/mach-actions/

F:	arch/arm/boot/dts/owl-*

F:	arch/arm64/boot/dts/actions/

F:	drivers/clocksource/owl-*

F:	drivers/soc/actions/

F:	include/dt-bindings/power/owl-*

F:	include/linux/soc/actions/

F:	Documentation/devicetree/bindings/arm/actions.txt

F:	Documentation/devicetree/bindings/power/actions,owl-sps.txt

F:	Documentation/devicetree/bindings/timer/actions,owl-timer.txt



ARM/ADS SPHERE MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

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

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -712,6 +712,8 @@ config ARCH_VIRT 
#

source "arch/arm/mach-mvebu/Kconfig"



source "arch/arm/mach-actions/Kconfig"



source "arch/arm/mach-alpine/Kconfig"



source "arch/arm/mach-artpec/Kconfig"
@@ -1462,6 +1464,7 @@ config ARM_PSCI 
# selected platforms.

config ARCH_NR_GPIO

	int

	default 2048 if ARCH_SOCFPGA

	default 1024 if ARCH_BRCMSTB || ARCH_SHMOBILE || ARCH_TEGRA || \

		ARCH_ZYNQ

	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \