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

Commit ee036df9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'bitmain-initial-soc-v5.1' of... 

Merge tag 'bitmain-initial-soc-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-bitmain into arm/newsoc

Bitmain SoC changes for v5.1:

- Document Bitmain BM1880 SoC bindings
- Add ARCH_BITMAIN for supporting Bitmain SoC platforms
- Add devicetree support for Bitmain BM1880 SoC
- Add devicetree support for Sophon Edge board
- Add MAINTAINERS entry for Bitmain SoC platform

* tag 'bitmain-initial-soc-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-bitmain

:
  MAINTAINERS: Add entry for Bitmain SoC platform
  arm64: dts: bitmain: Add Sophon Egde board support
  arm64: dts: bitmain: Add BM1880 SoC support
  arm64: Add ARCH_BITMAIN platform
  dt-bindings: arm: Document Bitmain BM1880 SoC

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d1393711 51d7d931

Documentation/devicetree/bindings/arm/bitmain.yaml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/bitmain.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Bitmain platform device tree bindings



maintainers:

  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>



properties:

  compatible:

    items:

      - enum:

        - bitmain,sophon-edge

      - const: bitmain,bm1880

...

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1372,6 +1372,13 @@ F: arch/arm/mach-aspeed/ 
F:	arch/arm/boot/dts/aspeed-*

N:	aspeed



ARM/BITMAIN ARCHITECTURE

M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

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

S:	Maintained

F:	arch/arm64/boot/dts/bitmain/

F:	Documentation/devicetree/bindings/arm/bitmain.yaml



ARM/CALXEDA HIGHBANK ARCHITECTURE

M:	Rob Herring <robh@kernel.org>

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

arch/arm64/Kconfig.platforms

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,11 @@ config ARCH_BERLIN 
	help

	  This enables support for Marvell Berlin SoC Family



config ARCH_BITMAIN

	bool "Bitmain SoC Platforms"

	help

	  This enables support for the Bitmain SoC Family.



config ARCH_BRCMSTB

	bool "Broadcom Set-Top-Box SoCs"

	select BRCMSTB_L2_IRQ

arch/arm64/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ subdir-y += amd 
subdir-y += amlogic

subdir-y += apm

subdir-y += arm

subdir-y += bitmain

subdir-y += broadcom

subdir-y += cavium

subdir-y += exynos

arch/arm64/boot/dts/bitmain/Makefile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0+



dtb-$(CONFIG_ARCH_BITMAIN) += bm1880-sophon-edge.dtb