Merge tag 'berlin64-for-v4.3-1' of... (509b642e) · Commits · 戴 / test

arch/arm64/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ dts-dirs += cavium
		dts-dirs += exynos
		dts-dirs += freescale
		dts-dirs += hisilicon
		dts-dirs += marvell
		dts-dirs += mediatek
		dts-dirs += qcom
		dts-dirs += rockchip

arch/arm64/boot/dts/marvell/Makefile

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-dmp.dtb

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

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

0 → 100644

+66 −0

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 {
		device_type = "memory";
		/* the first 16MB is for firmwares' usage */
		reg = <0 0x01000000 0 0x7f000000>;
		};
		};

		&uart0 {
		status = "okay";
		};

arch/arm64/boot/dts/marvell/berlin4ct.dtsi

0 → 100644

+164 −0

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.
		*/

		#include <dt-bindings/interrupt-controller/arm-gic.h>

		/ {
		compatible = "marvell,berlin4ct", "marvell,berlin";
		interrupt-parent = <&gic>;
		#address-cells = <2>;
		#size-cells = <2>;

		aliases {
		serial0 = &uart0;
		};

		psci {
		compatible = "arm,psci-0.2";
		method = "smc";
		};

		cpus {
		#address-cells = <1>;
		#size-cells = <0>;

		cpu0: cpu@0 {
		compatible = "arm,cortex-a53", "arm,armv8";
		device_type = "cpu";
		reg = <0x0>;
		enable-method = "psci";
		};

		cpu1: cpu@1 {
		compatible = "arm,cortex-a53", "arm,armv8";
		device_type = "cpu";
		reg = <0x1>;
		enable-method = "psci";
		};

		cpu2: cpu@2 {
		compatible = "arm,cortex-a53", "arm,armv8";
		device_type = "cpu";
		reg = <0x2>;
		enable-method = "psci";
		};

		cpu3: cpu@3 {
		compatible = "arm,cortex-a53", "arm,armv8";
		device_type = "cpu";
		reg = <0x3>;
		enable-method = "psci";
		};
		};

		osc: osc {
		compatible = "fixed-clock";
		#clock-cells = <0>;
		clock-frequency = <25000000>;
		};

		pmu {
		compatible = "arm,armv8-pmuv3";
		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
		interrupt-affinity = <&cpu0>,
		<&cpu1>,
		<&cpu2>,
		<&cpu3>;
		};

		timer {
		compatible = "arm,armv8-timer";
		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) \| IRQ_TYPE_LEVEL_LOW)>,
		<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) \| IRQ_TYPE_LEVEL_LOW)>,
		<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) \| IRQ_TYPE_LEVEL_LOW)>,
		<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) \| IRQ_TYPE_LEVEL_LOW)>;
		};

		soc {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0 0 0xf7000000 0x1000000>;

		gic: interrupt-controller@901000 {
		compatible = "arm,gic-400";
		#interrupt-cells = <3>;
		interrupt-controller;
		reg = <0x901000 0x1000>,
		<0x902000 0x2000>,
		<0x904000 0x2000>,
		<0x906000 0x2000>;
		interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) \| IRQ_TYPE_LEVEL_HIGH)>;
		};

		apb@fc0000 {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0 0xfc0000 0x10000>;
		interrupt-parent = <&sic>;

		sic: interrupt-controller@1000 {
		compatible = "snps,dw-apb-ictl";
		reg = <0x1000 0x30>;
		interrupt-controller;
		#interrupt-cells = <1>;
		interrupt-parent = <&gic>;
		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
		};

		uart0: uart@d000 {
		compatible = "snps,dw-apb-uart";
		reg = <0xd000 0x100>;
		interrupts = <8>;
		clocks = <&osc>;
		reg-shift = <2>;
		status = "disabled";
		};
		};
		};
		};

Admin message