Merge tag 'berlin64-dt-for-v4.18' of... (fef8f9b1) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm64/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,5 +22,6 @@ subdir-y += renesas
		subdir-y += rockchip
		subdir-y += socionext
		subdir-y += sprd
		subdir-y += synaptics
		subdir-y += xilinx
		subdir-y += zte

arch/arm64/boot/dts/marvell/Makefile

+0 −4

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		# Berlin SoC Family
		dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-dmp.dtb
		dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-stb.dtb

		# Mvebu SoC Family
		dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.dtb
		dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb

arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts

deleted100644 → 0

+0 −66

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 Marvell Technology Group Ltd.
		*
		* Author: Jisheng Zhang <jszhang@marvell.com>
		*
		* This file is dual-licensed: you can use it either under the terms
		* of the GPLv2 or the X11 license, at your option. Note that this dual
		* licensing only applies to this file, and not this project as a
		* whole.
		*
		* a) This library is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License as
		* published by the Free Software Foundation; either version 2 of the
		* License, or (at your option) any later version.
		*
		* This library is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* Or, alternatively,
		*
		* b) Permission is hereby granted, free of charge, to any person
		* obtaining a copy of this software and associated documentation
		* files (the "Software"), to deal in the Software without
		* restriction, including without limitation the rights to use,
		* copy, modify, merge, publish, distribute, sublicense, and/or
		* sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following
		* conditions:
		*
		* The above copyright notice and this permission notice shall be
		* included in all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
		* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
		* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
		* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
		* OTHER DEALINGS IN THE SOFTWARE.
		*/

		/dts-v1/;

		#include "berlin4ct.dtsi"

		/ {
		model = "Marvell BG4CT DMP board";
		compatible = "marvell,berlin4ct-dmp", "marvell,berlin4ct", "marvell,berlin";

		chosen {
		stdout-path = "serial0:115200n8";
		};

		memory@1000000 {
		device_type = "memory";
		/* the first 16MB is for firmwares' usage */
		reg = <0 0x01000000 0 0x7f000000>;
		};
		};

		&uart0 {
		status = "okay";
		};

arch/arm64/boot/dts/marvell/berlin4ct-stb.dts

deleted100644 → 0

+0 −66

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 Marvell Technology Group Ltd.
		*
		* Author: Jisheng Zhang <jszhang@marvell.com>
		*
		* This file is dual-licensed: you can use it either under the terms
		* of the GPLv2 or the X11 license, at your option. Note that this dual
		* licensing only applies to this file, and not this project as a
		* whole.
		*
		* a) This library is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License as
		* published by the Free Software Foundation; either version 2 of the
		* License, or (at your option) any later version.
		*
		* This library is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* Or, alternatively,
		*
		* b) Permission is hereby granted, free of charge, to any person
		* obtaining a copy of this software and associated documentation
		* files (the "Software"), to deal in the Software without
		* restriction, including without limitation the rights to use,
		* copy, modify, merge, publish, distribute, sublicense, and/or
		* sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following
		* conditions:
		*
		* The above copyright notice and this permission notice shall be
		* included in all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
		* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
		* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
		* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
		* OTHER DEALINGS IN THE SOFTWARE.
		*/

		/dts-v1/;

		#include "berlin4ct.dtsi"

		/ {
		model = "Marvell BG4CT STB board";
		compatible = "marvell,berlin4ct-stb", "marvell,berlin4ct", "marvell,berlin";

		chosen {
		stdout-path = "serial0:115200n8";
		};

		memory@1000000 {
		device_type = "memory";
		/* the first 16MB is for firmwares' usage */
		reg = <0 0x01000000 0 0x7f000000>;
		};
		};

		&uart0 {
		status = "okay";
		};

arch/arm64/boot/dts/synaptics/Makefile

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		# Berlin SoC Family
		dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-dmp.dtb
		dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-stb.dtb