Merge tag 'berlin64-dt-for-4.4-1' of... (c52864fb) · Commits · 戴 / test

arch/arm64/boot/dts/marvell/Makefile

+1 −0

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

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

arch/arm64/boot/dts/marvell/berlin4ct-stb.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 STB board";
		compatible = "marvell,berlin4ct-stb", "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

+120 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,96 @@
		interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) \| IRQ_TYPE_LEVEL_HIGH)>;
		};

		apb@e80000 {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <1>;

		ranges = <0 0xe80000 0x10000>;
		interrupt-parent = <&aic>;

		gpio0: gpio@0400 {
		compatible = "snps,dw-apb-gpio";
		reg = <0x0400 0x400>;
		#address-cells = <1>;
		#size-cells = <0>;

		porta: gpio-port@0 {
		compatible = "snps,dw-apb-gpio-port";
		gpio-controller;
		#gpio-cells = <2>;
		snps,nr-gpios = <32>;
		reg = <0>;
		interrupt-controller;
		#interrupt-cells = <2>;
		interrupts = <0>;
		};
		};

		gpio1: gpio@0800 {
		compatible = "snps,dw-apb-gpio";
		reg = <0x0800 0x400>;
		#address-cells = <1>;
		#size-cells = <0>;

		portb: gpio-port@1 {
		compatible = "snps,dw-apb-gpio-port";
		gpio-controller;
		#gpio-cells = <2>;
		snps,nr-gpios = <32>;
		reg = <0>;
		interrupt-controller;
		#interrupt-cells = <2>;
		interrupts = <1>;
		};
		};

		gpio2: gpio@0c00 {
		compatible = "snps,dw-apb-gpio";
		reg = <0x0c00 0x400>;
		#address-cells = <1>;
		#size-cells = <0>;

		portc: gpio-port@2 {
		compatible = "snps,dw-apb-gpio-port";
		gpio-controller;
		#gpio-cells = <2>;
		snps,nr-gpios = <32>;
		reg = <0>;
		interrupt-controller;
		#interrupt-cells = <2>;
		interrupts = <2>;
		};
		};

		gpio3: gpio@1000 {
		compatible = "snps,dw-apb-gpio";
		reg = <0x1000 0x400>;
		#address-cells = <1>;
		#size-cells = <0>;

		portd: gpio-port@3 {
		compatible = "snps,dw-apb-gpio-port";
		gpio-controller;
		#gpio-cells = <2>;
		snps,nr-gpios = <32>;
		reg = <0>;
		interrupt-controller;
		#interrupt-cells = <2>;
		interrupts = <3>;
		};
		};

		aic: interrupt-controller@3800 {
		compatible = "snps,dw-apb-ictl";
		reg = <0x3800 0x30>;
		interrupt-controller;
		#interrupt-cells = <1>;
		interrupt-parent = <&gic>;
		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
		};
		};

		apb@fc0000 {
		compatible = "simple-bus";
		#address-cells = <1>;
		@@ -151,6 +241,36 @@
		interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
		};

		sm_gpio0: gpio@8000 {
		compatible = "snps,dw-apb-gpio";
		reg = <0x8000 0x400>;
		#address-cells = <1>;
		#size-cells = <0>;

		porte: gpio-port@4 {
		compatible = "snps,dw-apb-gpio-port";
		gpio-controller;
		#gpio-cells = <2>;
		snps,nr-gpios = <32>;
		reg = <0>;
		};
		};

		sm_gpio1: gpio@9000 {
		compatible = "snps,dw-apb-gpio";
		reg = <0x9000 0x400>;
		#address-cells = <1>;
		#size-cells = <0>;

		portf: gpio-port@5 {
		compatible = "snps,dw-apb-gpio-port";
		gpio-controller;
		#gpio-cells = <2>;
		snps,nr-gpios = <32>;
		reg = <0>;
		};
		};

		uart0: uart@d000 {
		compatible = "snps,dw-apb-uart";
		reg = <0xd000 0x100>;

Admin message