Commit ddee928d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt64-4.9-1' of git://git.infradead.org/linux-mvebu into next/dt64 

Pull "mvebu dt64 for 4.9 (part 1)" from Gregory CLEMENT:

- add description for the new Armada 8040 dev board
- add the PIC and PMU on Armada 7K/8K

* tag 'mvebu-dt64-4.9-1' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: describe the PIC and PMU on Armada 7K/8K
  arm64: dts: marvell: add description for the Armada 8040 dev board
  arm64: dts: marvell: add description for the slave CP110 in Armada 8K
parents bd3af15a 98e45c16

arch/arm64/boot/dts/marvell/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-stb.dtb 
# Mvebu SoC Family

dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 


#include "armada-ap806-dual.dtsi"

#include "armada-cp110-master.dtsi"

#include "armada-cp110-slave.dtsi"



/ {

	model = "Marvell Armada 8020";

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

0 → 100644
+150 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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 8040 Development board platform

 */



#include "armada-8040.dtsi"



/ {

	model = "Marvell Armada 8040 DB board";

	compatible = "marvell,armada8040-db", "marvell,armada8040",

		     "marvell,armada-ap806-quad", "marvell,armada-ap806";



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory@00000000 {

		device_type = "memory";

		reg = <0x0 0x0 0x0 0x80000000>;

	};

};



&i2c0 {

	status = "okay";

	clock-frequency = <100000>;

};



&spi0 {

	status = "okay";



	spi-flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <10000000>;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "U-Boot";

				reg = <0 0x200000>;

			};

			partition@400000 {

				label = "Filesystem";

				reg = <0x200000 0xce0000>;

			};

		};

	};

};



/* Accessible over the mini-USB CON9 connector on the main board */

&uart0 {

	status = "okay";

};





/* CON5 on CP0 expansion */

&cpm_pcie2 {

	status = "okay";

};



&cpm_i2c0 {

	status = "okay";

	clock-frequency = <100000>;

};



/* CON4 on CP0 expansion */

&cpm_sata0 {

	status = "okay";

};



/* CON9 on CP0 expansion */

&cpm_usb3_0 {

	status = "okay";

};



/* CON10 on CP0 expansion */

&cpm_usb3_1 {

	status = "okay";

};



/* CON5 on CP1 expansion */

&cps_pcie2 {

	status = "okay";

};



&cps_i2c0 {

	status = "okay";

	clock-frequency = <100000>;

};



/* CON4 on CP1 expansion */

&cps_sata0 {

	status = "okay";

};



/* CON9 on CP1 expansion */

&cps_usb3_0 {

	status = "okay";

};



/* CON10 on CP1 expansion */

&cps_usb3_1 {

	status = "okay";

};

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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 


#include "armada-ap806-quad.dtsi"

#include "armada-cp110-master.dtsi"

#include "armada-cp110-slave.dtsi"



/ {

	model = "Marvell Armada 8040";

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

+14 −0
Original line number Diff line number Diff line
@@ -128,6 +128,12 @@ 
					     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;

			};



			pmu {

				compatible = "arm,cortex-a72-pmu";

				interrupt-parent = <&pic>;

				interrupts = <17>;

			};



			odmi: odmi@300000 {

				compatible = "marvell,odmi-controller";

				interrupt-controller;
@@ -140,6 +146,14 @@ 
				marvell,spi-base = <128>, <136>, <144>, <152>;

			};



			pic: interrupt-controller@3f0100 {

				compatible = "marvell,armada-8k-pic";

				reg = <0x3f0100 0x10>;

				#interrupt-cells = <1>;

				interrupt-controller;

				interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>;

			};



			xor@400000 {

				compatible = "marvell,armada-7k-xor", "marvell,xor-v2";

				reg = <0x400000 0x1000>,

CRA Git | Maintained and supported by SUSTech CRA and CCSE