Commit 4f23683c authored Nov 18, 2016 by Olof Johansson

Merge tag 'sunxi-dt64-for-4.10' of...

Merge tag 'sunxi-dt64-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt64

Allwinner arm64 DT changes for 4.10

Support for the Allwinner A64, their first armv8 SoC.

* tag 'sunxi-dt64-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux

:
  arm64: dts: add Pine64 support
  Documentation: devicetree: add vendor prefix for Pine64
  arm64: dts: add Allwinner A64 SoC .dtsi

Signed-off-by: Olof Johansson <olof@lixom.net>

parents e702ddd3 4e388608

Documentation/devicetree/bindings/arm/sunxi.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -14,4 +14,5 @@ using one of the following compatible strings:
		allwinner,sun8i-a83t
		allwinner,sun8i-h3
		allwinner,sun9i-a80
		allwinner,sun50i-a64
		nextthing,gr8

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -208,6 +208,7 @@ parade Parade Technologies Inc.
		pericom Pericom Technology Inc.
		phytec PHYTEC Messtechnik GmbH
		picochip Picochip Ltd
		pine64 Pine64
		pixcir PIXCIR MICROELECTRONICS Co., Ltd
		plathome Plat'Home Co., Ltd.
		plda PLDA

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -1019,6 +1019,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		N: sun[x456789]i
		F: arch/arm/boot/dts/ntc-gr8*
		F: arch/arm64/boot/dts/allwinner/

		ARM/Allwinner SoC Clock Support
		M: Emilio López <emilio@elopez.com.ar>

arch/arm64/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		dts-dirs += al
		dts-dirs += allwinner
		dts-dirs += altera
		dts-dirs += amd
		dts-dirs += amlogic

arch/arm64/boot/dts/allwinner/Makefile

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb

		always := $(dtb-y)
		subdir-y := $(dts-dirs)
		clean-files := *.dtb