Merge tag 'mvebu-dt64-4.14-3' of git://git.infradead.org/linux-mvebu into next/dt64 (c78c4ec2) · Commits · 戴 / test

Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		Marvell Armada 8KPlus Platforms Device Tree Bindings
		----------------------------------------------------

		Boards using a SoC of the Marvell Armada 8KP families must carry
		the following root node property:

		- compatible, with one of the following values:

		- "marvell,armada-8080", "marvell,armada-ap810-octa", "marvell,armada-ap810"
		when the SoC being used is the Armada 8080

		Example:

		compatible = "marvell,armada-8080-db", "marvell,armada-8080",
		"marvell,armada-ap810-octa", "marvell,armada-ap810"

arch/arm64/boot/dts/marvell/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb
		dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb
		dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb
		dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
		dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb

		always := $(dtb-y)
		subdir-y := $(dts-dirs)

arch/arm64/boot/dts/marvell/armada-8080-db.dts

0 → 100644

+67 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 Marvell Technology Group Ltd.
		*
		* 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.
		*/

		/*
		* Device Tree file for Marvell Armada-8080 Development board platform
		*/

		#include "armada-8080.dtsi"

		/ {
		model = "Marvell 8080 board";
		compatible = "marvell,armada-8080-db", "marvell,armada-8080",
		"marvell,armada-ap810-octa", "marvell,armada-ap810";

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

		memory@00000000 {
		device_type = "memory";
		reg = <0x0 0x0 0x0 0x80000000>;
		};
		};

		&uart0_ap0 {
		clock-frequency = <384000>;
		status = "okay";
		};

arch/arm64/boot/dts/marvell/armada-8080.dtsi

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 Marvell Technology Group Ltd.
		*
		* 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.
		*/

		/*
		* Device Tree file for Marvell Armada-8080 SoC, made of an AP810 OCTA.
		*/

		#include "armada-ap810-ap0-octa-core.dtsi"

		/ {
		model = "Marvell 8080 board";
		compatible = "marvell,armada-8080", "marvell,armada-ap810-octa",
		"marvell,armada-ap810";
		};

arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi

0 → 100644

+104 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 Marvell Technology Group Ltd.
		*
		* 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.
		*/

		/*
		* Device Tree file for Marvell Armada AP810 OCTA cores.
		*/

		#include "armada-ap810-ap0.dtsi"

		/ {
		cpus {
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "marvell,armada-ap810-octa";

		cpu@000 {
		device_type = "cpu";
		compatible = "arm,cortex-a72", "arm,armv8";
		reg = <0x000>;
		enable-method = "psci";
		};
		cpu@001 {
		device_type = "cpu";
		compatible = "arm,cortex-a72", "arm,armv8";
		reg = <0x001>;
		enable-method = "psci";
		};
		cpu@100 {
		device_type = "cpu";
		compatible = "arm,cortex-a72", "arm,armv8";
		reg = <0x100>;
		enable-method = "psci";
		};
		cpu@101 {
		device_type = "cpu";
		compatible = "arm,cortex-a72", "arm,armv8";
		reg = <0x101>;
		enable-method = "psci";
		};
		cpu@200 {
		device_type = "cpu";
		compatible = "arm,cortex-a72", "arm,armv8";
		reg = <0x200>;
		enable-method = "psci";
		};
		cpu@201 {
		device_type = "cpu";
		compatible = "arm,cortex-a72", "arm,armv8";
		reg = <0x201>;
		enable-method = "psci";
		};
		cpu@300 {
		device_type = "cpu";
		compatible = "arm,cortex-a72", "arm,armv8";
		reg = <0x300>;
		enable-method = "psci";
		};
		cpu@301 {
		device_type = "cpu";
		compatible = "arm,cortex-a72", "arm,armv8";
		reg = <0x301>;
		enable-method = "psci";
		};
		};
		};

Admin message