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

Commit 227db588 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-drivers-for-4.20' of... 

Merge tag 'sunxi-drivers-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/drivers

Allwinner drivers changes for 4.20

The H6 is now supported in our SRAM driver bindings, and we have a small
Makefile change for the SRAM driver to build it without building the
ARCH_SUNXI architecture, especially relevant for the COMPILE_TEST case.

* tag 'sunxi-drivers-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  dt-bindings: sunxi-sram: add binding for Allwinner H6 SRAM C
  drivers: soc: Allow building the sunxi driver without ARCH_SUNXI

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 86e762d9 69a8c245

Documentation/devicetree/bindings/sram/sunxi-sram.txt

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required properties: 
    - "allwinner,sun8i-h3-system-control"

    - "allwinner,sun50i-a64-sram-controller" (deprecated)

    - "allwinner,sun50i-a64-system-control"

    - "allwinner,sun50i-h6-system-control", "allwinner,sun50i-a64-system-control"

- reg : sram controller register offset + length



SRAM nodes
@@ -54,6 +55,9 @@ The valid sections compatible for H3 are: 
The valid sections compatible for A64 are:

    - allwinner,sun50i-a64-sram-c



The valid sections compatible for H6 are:

    - allwinner,sun50i-h6-sram-c, allwinner,sun50i-a64-sram-c



Devices using SRAM sections

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

drivers/soc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ obj-y += qcom/ 
obj-y				+= renesas/

obj-$(CONFIG_ARCH_ROCKCHIP)	+= rockchip/

obj-$(CONFIG_SOC_SAMSUNG)	+= samsung/

obj-$(CONFIG_ARCH_SUNXI)	+= sunxi/

obj-y				+= sunxi/

obj-$(CONFIG_ARCH_TEGRA)	+= tegra/

obj-$(CONFIG_SOC_TI)		+= ti/

obj-$(CONFIG_ARCH_U8500)	+= ux500/