Merge tag 'samsung-dt-4.17' of... (e238310c) · Commits · 戴 / test

Merge tag 'samsung-dt-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt Pull "Samsung DTS ARM changes for v4.17" from Krzysztof Kozłowski: 1. Add WiFi to Artik 5 board. 2. Remove unused samsung_k3pe0e000b memory DTSI. 3. Add few remaining SPDX license identifiers. 4. Refactor Exynos4 by using labels for overriding/extending nodes and moving respective nodes under the 'soc' node. 5. Add three new Exynos4412-based boards: GT-I9300 (Samsung Galaxy S3), GT-I9305 (Samsung Galaxy S3 LTE) and GT-N7100/N7105 (Samsung Note 2). They are based heavily on existing Trats2 board. 6. Fix PMIC interrupts on Trats board. 7. Fix IOMMU for GScaler devices on Exynos5250. 8. Minor fixes in unit addresses pointed by DTC. 9. Minor cleanups from unused properties and duplicated code. * tag 'samsung-dt-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux: (29 commits) ARM: dts: exynos: Fix IOMMU support for GScaler devices on Exynos5250 ARM: dts: exynos: Remove unused bypass-smu property from Xyref5260 ARM: dts: exynos: Add missing interrupts property to PMIC on Trats board ARM: dts: exynos: Fix unit addresses of PDMA nodes in Exynos5410 ARM: dts: exynos: Fix address of PPMU ACP on Exynos4210 ARM: dts: exynos: Cleanup power domain nodes in exynos3250.dtsi ARM: dts: exynos: Add touchscreen node to Exynos4412 N710x ARM: dts: exynos: Add Samsung's Exynos4412-based Midas boards ARM: dts: exynos: Split Trats2 DTS in preparation for Midas boards ARM: dts: exynos: Remove "cooling-{min|max}-level" for CPU nodes dt-bindings: samsung: Document bindings for Midas family boards ARM: dts: exynos: Add soc node to exynos4412 ARM: dts: exynos: Add soc node to exynos4210 ARM: dts: exynos: Add soc node to exynos4 ARM: dts: exynos: Add soc node to exynos5440 ARM: dts: exynos: Use pmu label in exynos4412 ARM: dts: exynos: Remove duplicated inclusion of syscon restart nodes on Exynos5410 ARM: dts: exynos: Use label instead of full path in exynos4412-itop-elite ARM: dts: exynos: Use labels instead of full paths in exynos4412-trats2 ARM: dts: exynos: Use label instead of full path in exynos4412-odroid-common ...

Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -9,7 +9,11 @@ Required root node properties:
		- "samsung,smdkv310" - for Exynos4210-based Samsung SMDKV310 eval board.
		- "samsung,trats" - for Exynos4210-based Tizen Reference board.
		- "samsung,universal_c210" - for Exynos4210-based Samsung board.
		- "samsung,i9300" - for Exynos4412-based Samsung GT-I9300 board.
		- "samsung,i9305" - for Exynos4412-based Samsung GT-I9305 board.
		- "samsung,midas" - for Exynos4412-based Samsung Midas board.
		- "samsung,smdk4412", - for Exynos4412-based Samsung SMDK4412 eval board.
		- "samsung,n710x" - for Exynos4412-based Samsung GT-N7100/GT-N7105 board.
		- "samsung,trats2" - for Exynos4412-based Tizen Reference board.
		- "samsung,smdk5250" - for Exynos5250-based Samsung SMDK5250 eval board.
		- "samsung,xyref5260" - for Exynos5260-based Samsung board.

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -1863,7 +1863,6 @@ Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
		S: Maintained
		F: arch/arm/boot/dts/s3c*
		F: arch/arm/boot/dts/s5p*
		F: arch/arm/boot/dts/samsung*
		F: arch/arm/boot/dts/exynos*
		F: arch/arm64/boot/dts/exynos/
		F: arch/arm/plat-samsung/

arch/arm/boot/dts/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -163,7 +163,10 @@ dtb-$(CONFIG_ARCH_EXYNOS4) += \
		exynos4210-smdkv310.dtb \
		exynos4210-trats.dtb \
		exynos4210-universal_c210.dtb \
		exynos4412-i9300.dtb \
		exynos4412-i9305.dtb \
		exynos4412-itop-elite.dtb \
		exynos4412-n710x.dtb \
		exynos4412-odroidu3.dtb \
		exynos4412-odroidx.dtb \
		exynos4412-odroidx2.dtb \

arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi

+1 −4

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Samsung's Exynos SoC MFC (Video Codec) reserved memory common definition.
		*
		* Copyright (c) 2016 Samsung Electronics Co., Ltd
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/

		/ {

arch/arm/boot/dts/exynos-syscon-restart.dtsi

+1 −4

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Samsung's Exynos SoC syscon reboot/poweroff nodes common definition.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/

		/ {

Admin message