Commit 7c00e8ae 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:
 "Here are the main updates for SoC support (besides DT additions) for
  ARM 32- and 64-bit platforms. The branch also contains defconfig
  updates to turn on drivers and options as needed on the various
  platforms.

  The largest parts of the delta are from cleanups moving platform data
  and board file setup of TI platforms to ti-sysc bus drivers. There are
  also some sweeping changes of eeprom and nand setup on Davinci, i.MX
  and other platforms.

  Samsung is removing support for Exynos5440, which was an oddball SoC
  that hasn't been seen much use in designs.

  Renesas is adding support for new SoCs (R-Car E3, RZ/G1C and RZ/N1D).

  Linus Walleij is also removing support for ux500 (Sony Ericsson)
  U8540/9540 SoCs that never made it to significant mass production and
  products"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (133 commits)
  MAINTAINERS: add NXP linux team maillist as i.MX reviewer
  ARM: stm32: Don't select DMA unconditionally on STM32MP157C
  arm64: defconfig: Enable PCIe on msm8996 and db820c
  ARM: pxa3xx: enable external wakeup pins
  ARM: pxa: stargate2: use device properties for at24 eeprom
  arm64: defconfig: Enable HISILICON_LPC
  arm64: defconfig: enable drivers for Poplar support
  arm64: defconfig: Enable UFS on msm8996
  ARM: berlin: switch to SPDX license identifier
  arm: berlin: remove non-necessary flush_cache_all()
  ARM: berlin: extend BG2CD Kconfig entry
  OMAP: CLK: CLKSRC: Add suspend resume hooks
  ARM: AM43XX: Add functions to save/restore am43xx control registers
  ASoC: ams_delta: use GPIO lookup table
  ARM: OMAP1: ams-delta: add GPIO lookup tables
  bus: ti-sysc: Fix optional clocks array access
  ARM: OMAP2+: Make sure LOGICRETSTATE bits are not cleared
  ARM: OMAP2+: prm44xx: Inroduce cpu_pm notifiers for context save/restore
  ARM: OMAP2+: prm44xx: Introduce context save/restore for am43 PRCM IO
  ARM: OMAP2+: powerdomain: Introduce cpu_pm notifiers for context save/restore
  ...
parents a2b7ab45 958da6e3

Documentation/devicetree/bindings/arm/shmobile.txt

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ SoCs: 
    compatible = "renesas,r8a7744"

  - RZ/G1E (R8A77450)

    compatible = "renesas,r8a7745"

  - RZ/G1C (R8A77470)

    compatible = "renesas,r8a77470"

  - R-Car M1A (R8A77781)

    compatible = "renesas,r8a7778"

  - R-Car H1 (R8A77790)

Documentation/devicetree/bindings/bus/ti-sysc.txt

+5 −1
Original line number Diff line number Diff line
@@ -79,7 +79,11 @@ Optional properties: 
		mode as for example omap4 L4_CFG_CLKCTRL



- clock-names	should contain at least "fck", and optionally also "ick"

		depending on the SoC and the interconnect target module

		depending on the SoC and the interconnect target module,

		some interconnect target modules also need additional

		optional clocks that can be specified as listed in TRM

		for the related CLKCTRL register bits 8 to 15 such as

		"dbclk" or "clk32k" depending on their role



- ti,hwmods	optional TI interconnect module name to use legacy

		hwmod platform data

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

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
  - compatible: Must contain exactly one of the following:

      - "renesas,r8a7743-sysc" (RZ/G1M)

      - "renesas,r8a7745-sysc" (RZ/G1E)

      - "renesas,r8a77470-sysc" (RZ/G1C)

      - "renesas,r8a7779-sysc" (R-Car H1)

      - "renesas,r8a7790-sysc" (R-Car H2)

      - "renesas,r8a7791-sysc" (R-Car M2-W)
@@ -20,6 +21,7 @@ Required properties: 
      - "renesas,r8a77965-sysc" (R-Car M3-N)

      - "renesas,r8a77970-sysc" (R-Car V3M)

      - "renesas,r8a77980-sysc" (R-Car V3H)

      - "renesas,r8a77990-sysc" (R-Car E3)

      - "renesas,r8a77995-sysc" (R-Car D3)

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

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

Documentation/devicetree/bindings/reset/renesas,rst.txt

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Required properties: 
		Examples with soctypes are:

		  - "renesas,r8a7743-rst" (RZ/G1M)

		  - "renesas,r8a7745-rst" (RZ/G1E)

		  - "renesas,r8a77470-rst" (RZ/G1C)

		  - "renesas,r8a7778-reset-wdt" (R-Car M1A)

		  - "renesas,r8a7779-reset-wdt" (R-Car H1)

		  - "renesas,r8a7790-rst" (R-Car H2)
@@ -29,6 +30,7 @@ Required properties: 
		  - "renesas,r8a77965-rst" (R-Car M3-N)

		  - "renesas,r8a77970-rst" (R-Car V3M)

		  - "renesas,r8a77980-rst" (R-Car V3H)

		  - "renesas,r8a77990-rst" (R-Car E3)

		  - "renesas,r8a77995-rst" (R-Car D3)

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

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1419,6 +1419,7 @@ M: Shawn Guo <shawnguo@kernel.org> 
M:	Sascha Hauer <s.hauer@pengutronix.de>

R:	Pengutronix Kernel Team <kernel@pengutronix.de>

R:	Fabio Estevam <fabio.estevam@nxp.com>

R:	NXP Linux Team <linux-imx@nxp.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/shawnguo/linux.git

CRA Git | Maintained and supported by SUSTech CRA and CCSE