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

Merge tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu into next/dt 

Merge "mvebu dt changes for v3.15 (incremental pull #3)" from Jason Cooper:

 - mvebu
    - merge armada 375, 380, 385 boards (mvebu/dt-3xx)

 - kirkwood
    - Add many Synology NAS boards
    - add board HP T5325
    - add L2 cache node
    - add system-controller node
    - add audio node

 - dove
    - add pinctrl and global-config register

Depends:
 - tags/mvebu-dt-fixes-3.14 (mvebu/dt-fixes)
    - removed dove PMU interrupt controller

Conflicts:
 - mvebu/soc (arch/arm/boot/dts/Makefile)
    - add/add conflict.
    - move CONFIG_ARCH_LPC32XX to alphabetical order (after KIRKWOOD)

* tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu

:
  ARM: kirkwood: Add dts file describing HP T5325 thin client
  ARM: kirkwood: Add i2c alias so setting bus number
  ARM: kirkwood: Add audio node to kirkwood.dtsi
  ARM: mvebu: select dtbs from MACH_ARMADA_*
  ARM: dove: add global-config register node
  ARM: dove: add additional pinctrl registers
  ARM: mvebu: Instantiate system controller in kirkwood.dtsi
  ARM: kirkwood: Instantiate L2 cache from DT.
  ARM: mvebu: use macros for interrupt flags on Armada 375/38x
  ARM: mvebu: use GIC_{SPI,PPI} in Armada 375/38x DTs
  ARM: mvebu: use C preprocessor include for Armada 375/38x DTs
  ARM: Kirkwood: Add support for many Synology NAS devices
  DT: i2c: Trivial: Add sii,s35390a
  DT: Vendor prefixes: Add ricoh, qnap, sii and synology
  ARM: dove: dt: revert PMU interrupt controller node
  ARM: mvebu: add Device Tree for the Armada 385 DB board
  ARM: mvebu: add Device Tree description of the Armada 380/385 SoCs
  ARM: mvebu: add Device Tree for the Armada 375 DB board
  ARM: mvebu: add Device Tree description of the Armada 375 SoC
  ARM: mvebu: dt: add missing alias 'eth3' on Armada XP mv78260

Conflicts:
	Documentation/devicetree/bindings/vendor-prefixes.txt
	arch/arm/boot/dts/Makefile

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3c883ef3 e2b15689

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ plx,pex8648 48-Lane, 12-Port PCI Express Gen 2 (5.0 GT/s) Switch 
ramtron,24c64		i2c serial eeprom  (24cxx)

ricoh,rs5c372a		I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC

samsung,24ad0xd1	S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)

sii,s35390a		2-wire CMOS real-time clock

st-micro,24c256		i2c serial eeprom  (24cxx)

stm,m41t00		Serial Access TIMEKEEPER

stm,m41t62		Serial real-time clock (RTC) with alarm

Documentation/devicetree/bindings/vendor-prefixes.txt

+4 −0
Original line number Diff line number Diff line
@@ -70,10 +70,12 @@ picochip Picochip Ltd 
powervr	PowerVR (deprecated, use img)

qca	Qualcomm Atheros, Inc.

qcom	Qualcomm Technologies, Inc

qnap	QNAP Systems, Inc.

ralink	Mediatek/Ralink Technology Corp.

ramtron	Ramtron International

realtek Realtek Semiconductor Corp.

renesas	Renesas Electronics Corporation

ricoh	Ricoh Co. Ltd.

rockchip	Fuzhou Rockchip Electronics Co., Ltd

samsung	Samsung Semiconductor

sbs	Smart Battery System
@@ -81,12 +83,14 @@ schindler Schindler 
sil	Silicon Image

silabs	Silicon Laboratories

simtek

sii	Seiko Instruments, Inc.

sirf	SiRF Technology, Inc.

snps 	Synopsys, Inc.

spansion	Spansion Inc.

st	STMicroelectronics

ste	ST-Ericsson

stericsson	ST-Ericsson

synology	Synology, Inc.

ti	Texas Instruments

tlm	Trusted Logic Mobility

toshiba	Toshiba Corporation

arch/arm/boot/dts/Makefile

+33 −11
Original line number Diff line number Diff line
@@ -91,6 +91,18 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \ 
	kirkwood-dns325.dtb \

	kirkwood-dockstar.dtb \

	kirkwood-dreamplug.dtb \

	kirkwood-ds109.dtb \

	kirkwood-ds110jv10.dtb \

	kirkwood-ds111.dtb \

	kirkwood-ds209.dtb \

	kirkwood-ds210.dtb \

	kirkwood-ds212.dtb \

	kirkwood-ds212j.dtb \

	kirkwood-ds409.dtb \

	kirkwood-ds409slim.dtb \

	kirkwood-ds411.dtb \

	kirkwood-ds411j.dtb \

	kirkwood-ds411slim.dtb \

	kirkwood-goflexnet.dtb \

	kirkwood-guruplug-server-plus.dtb \

	kirkwood-ib62x0.dtb \
@@ -116,8 +128,12 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \ 
	kirkwood-rd88f6192.dtb \

	kirkwood-rd88f6281-a0.dtb \

	kirkwood-rd88f6281-a1.dtb \

	kirkwood-rs212.dtb \

	kirkwood-rs409.dtb \

	kirkwood-rs411.dtb \

	kirkwood-sheevaplug.dtb \

	kirkwood-sheevaplug-esata.dtb \

	kirkwood-t5325.dtb \

	kirkwood-topkick.dtb \

	kirkwood-ts219-6281.dtb \

	kirkwood-ts219-6282.dtb \
@@ -125,17 +141,6 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \ 
	kirkwood-ts419-6282.dtb

dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb

dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \

	armada-370-mirabox.dtb \

	armada-370-netgear-rn102.dtb \

	armada-370-netgear-rn104.dtb \

	armada-370-rd.dtb \

	armada-xp-axpwifiap.dtb \

	armada-xp-db.dtb \

	armada-xp-gp.dtb \

	armada-xp-netgear-rn2120.dtb \

	armada-xp-matrix.dtb \

	armada-xp-openblocks-ax3-4.dtb

dtb-$(CONFIG_ARCH_MXC) += \

	imx25-eukrea-mbimxsd25-baseboard.dtb \

	imx25-karo-tx25.dtb \
@@ -361,6 +366,23 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ 
dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \

	zynq-zc706.dtb \

	zynq-zed.dtb

dtb-$(CONFIG_MACH_ARMADA_370) += \

	armada-370-db.dtb \

	armada-370-mirabox.dtb \

	armada-370-netgear-rn102.dtb \

	armada-370-netgear-rn104.dtb \

	armada-370-rd.dtb

dtb-$(CONFIG_MACH_ARMADA_375) += \

	armada-375-db.dtb

dtb-$(CONFIG_MACH_ARMADA_38X) += \

	armada-385-db.dtb

dtb-$(CONFIG_MACH_ARMADA_XP) += \

	armada-xp-axpwifiap.dtb \

	armada-xp-db.dtb \

	armada-xp-gp.dtb \

	armada-xp-netgear-rn2120.dtb \

	armada-xp-matrix.dtb \

	armada-xp-openblocks-ax3-4.dtb



targets += dtbs

targets += $(dtb-y)

arch/arm/boot/dts/armada-375-db.dts

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

 * Device Tree file for Marvell Armada 375 evaluation board

 * (DB-88F6720)

 *

 *  Copyright (C) 2014 Marvell

 *

 * Gregory CLEMENT <gregory.clement@free-electrons.com>

 * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include "armada-375.dtsi"



/ {

	model = "Marvell Armada 375 Development Board";

	compatible = "marvell,a375-db", "marvell,armada375";



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

	};



	memory {

		device_type = "memory";

		reg = <0x00000000 0x40000000>; /* 1 GB */

	};



	soc {

		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000

			  MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;



		internal-regs {

			spi@10600 {

				pinctrl-0 = <&spi0_pins>;

				pinctrl-names = "default";

				/*

				 * SPI conflicts with NAND, so we disable it

				 * here, and select NAND as the enabled device

				 * by default.

				 */

				status = "disabled";



				spi-flash@0 {

					#address-cells = <1>;

					#size-cells = <1>;

					compatible = "n25q128a13";

					reg = <0>; /* Chip select 0 */

					spi-max-frequency = <108000000>;

				};

			};



			i2c@11000 {

				status = "okay";

				clock-frequency = <100000>;

				pinctrl-0 = <&i2c0_pins>;

				pinctrl-names = "default";

			};



			i2c@11100 {

				status = "okay";

				clock-frequency = <100000>;

				pinctrl-0 = <&i2c1_pins>;

				pinctrl-names = "default";

			};



			serial@12000 {

				clock-frequency = <200000000>;

				status = "okay";

			};



			pinctrl {

				sdio_st_pins: sdio-st-pins {

					marvell,pins = "mpp44", "mpp45";

					marvell,function = "gpio";

				};

			};



			nand: nand@d0000 {

				pinctrl-0 = <&nand_pins>;

				pinctrl-names = "default";

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;



				partition@0 {

					label = "U-Boot";

					reg = <0 0x800000>;

				};

				partition@800000 {

					label = "Linux";

					reg = <0x800000 0x800000>;

				};

				partition@1000000 {

					label = "Filesystem";

					reg = <0x1000000 0x3f000000>;

				};

			};



			mvsdio@d4000 {

				pinctrl-0 = <&sdio_pins &sdio_st_pins>;

				pinctrl-names = "default";

				status = "okay";

				cd-gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;

				wp-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;

			};

		};



		pcie-controller {

			status = "okay";

			/*

			 * The two PCIe units are accessible through

			 * standard PCIe slots on the board.

			 */

			pcie@1,0 {

				/* Port 0, Lane 0 */

				status = "okay";

			};

			pcie@2,0 {

				/* Port 1, Lane 0 */

				status = "okay";

			};

		};

	};

};

arch/arm/boot/dts/armada-375.dtsi

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

 * Device Tree Include file for Marvell Armada 375 family SoC

 *

 * Copyright (C) 2014 Marvell

 *

 * Gregory CLEMENT <gregory.clement@free-electrons.com>

 * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#include "skeleton.dtsi"

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

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



#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))



/ {

	model = "Marvell Armada 375 family SoC";

	compatible = "marvell,armada375";



	aliases {

		gpio0 = &gpio0;

		gpio1 = &gpio1;

		gpio2 = &gpio2;

	};



	clocks {

		/* 2 GHz fixed main PLL */

		mainpll: mainpll {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <2000000000>;

		};

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0>;

		};

		cpu@1 {

			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <1>;

		};

	};



	soc {

		compatible = "marvell,armada375-mbus", "marvell,armada370-mbus", "simple-bus";

		#address-cells = <2>;

		#size-cells = <1>;

		controller = <&mbusc>;

		interrupt-parent = <&gic>;

		pcie-mem-aperture = <0xe0000000 0x8000000>;

		pcie-io-aperture  = <0xe8000000 0x100000>;



		bootrom {

			compatible = "marvell,bootrom";

			reg = <MBUS_ID(0x01, 0x1d) 0 0x100000>;

		};



		devbus-bootcs {

			compatible = "marvell,mvebu-devbus";

			reg = <MBUS_ID(0xf0, 0x01) 0x10400 0x8>;

			ranges = <0 MBUS_ID(0x01, 0x2f) 0 0xffffffff>;

			#address-cells = <1>;

			#size-cells = <1>;

			clocks = <&coreclk 0>;

			status = "disabled";

		};



		devbus-cs0 {

			compatible = "marvell,mvebu-devbus";

			reg = <MBUS_ID(0xf0, 0x01) 0x10408 0x8>;

			ranges = <0 MBUS_ID(0x01, 0x3e) 0 0xffffffff>;

			#address-cells = <1>;

			#size-cells = <1>;

			clocks = <&coreclk 0>;

			status = "disabled";

		};



		devbus-cs1 {

			compatible = "marvell,mvebu-devbus";

			reg = <MBUS_ID(0xf0, 0x01) 0x10410 0x8>;

			ranges = <0 MBUS_ID(0x01, 0x3d) 0 0xffffffff>;

			#address-cells = <1>;

			#size-cells = <1>;

			clocks = <&coreclk 0>;

			status = "disabled";

		};



		devbus-cs2 {

			compatible = "marvell,mvebu-devbus";

			reg = <MBUS_ID(0xf0, 0x01) 0x10418 0x8>;

			ranges = <0 MBUS_ID(0x01, 0x3b) 0 0xffffffff>;

			#address-cells = <1>;

			#size-cells = <1>;

			clocks = <&coreclk 0>;

			status = "disabled";

		};



		devbus-cs3 {

			compatible = "marvell,mvebu-devbus";

			reg = <MBUS_ID(0xf0, 0x01) 0x10420 0x8>;

			ranges = <0 MBUS_ID(0x01, 0x37) 0 0xffffffff>;

			#address-cells = <1>;

			#size-cells = <1>;

			clocks = <&coreclk 0>;

			status = "disabled";

		};



		internal-regs {

			compatible = "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;



			L2: cache-controller@8000 {

				compatible = "arm,pl310-cache";

				reg = <0x8000 0x1000>;

				cache-unified;

				cache-level = <2>;

			};



			timer@c600 {

				compatible = "arm,cortex-a9-twd-timer";

				reg = <0xc600 0x20>;

				interrupts = <GIC_PPI 13 (IRQ_TYPE_EDGE_RISING | GIC_CPU_MASK_SIMPLE(2))>;

				clocks = <&coreclk 2>;

			};



			gic: interrupt-controller@d000 {

				compatible = "arm,cortex-a9-gic";

				#interrupt-cells = <3>;

				#size-cells = <0>;

				interrupt-controller;

				reg = <0xd000 0x1000>,

				      <0xc100 0x100>;

			};



			spi0: spi@10600 {

				compatible = "marvell,orion-spi";

				reg = <0x10600 0x50>;

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <0>;

				interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			spi1: spi@10680 {

				compatible = "marvell,orion-spi";

				reg = <0x10680 0x50>;

				#address-cells = <1>;

				#size-cells = <0>;

				cell-index = <1>;

				interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			i2c0: i2c@11000 {

				compatible = "marvell,mv64xxx-i2c";

				reg = <0x11000 0x20>;

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

				timeout-ms = <1000>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			i2c1: i2c@11100 {

				compatible = "marvell,mv64xxx-i2c";

				reg = <0x11100 0x20>;

				#address-cells = <1>;

				#size-cells = <0>;

				interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;

				timeout-ms = <1000>;

				clocks = <&coreclk 0>;

				status = "disabled";

			};



			serial@12000 {

				compatible = "snps,dw-apb-uart";

				reg = <0x12000 0x100>;

				reg-shift = <2>;

				interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;

				reg-io-width = <1>;

				status = "disabled";

			};



			serial@12100 {

				compatible = "snps,dw-apb-uart";

				reg = <0x12100 0x100>;

				reg-shift = <2>;

				interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;

				reg-io-width = <1>;

				status = "disabled";

			};



			pinctrl {

				compatible = "marvell,mv88f6720-pinctrl";

				reg = <0x18000 0x24>;



				i2c0_pins: i2c0-pins {

					marvell,pins = "mpp14",  "mpp15";

					marvell,function = "i2c0";

				};



				i2c1_pins: i2c1-pins {

					marvell,pins = "mpp61",  "mpp62";

					marvell,function = "i2c1";

				};



				nand_pins: nand-pins {

					marvell,pins = "mpp0", "mpp1", "mpp2",

						"mpp3", "mpp4", "mpp5",

						"mpp6", "mpp7", "mpp8",

						"mpp9", "mpp10", "mpp11",

						"mpp12", "mpp13";

					marvell,function = "nand";

				};



				sdio_pins: sdio-pins {

					marvell,pins = "mpp24",  "mpp25", "mpp26",

						     "mpp27", "mpp28", "mpp29";

					marvell,function = "sd";

				};



				spi0_pins: spi0-pins {

					marvell,pins = "mpp0",  "mpp1", "mpp4",

						     "mpp5", "mpp8", "mpp9";

					marvell,function = "spi0";

				};

			};



			gpio0: gpio@18100 {

				compatible = "marvell,orion-gpio";

				reg = <0x18100 0x40>;

				ngpios = <32>;

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;

			};



			gpio1: gpio@18140 {

				compatible = "marvell,orion-gpio";

				reg = <0x18140 0x40>;

				ngpios = <32>;

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;

			};



			gpio2: gpio@18180 {

				compatible = "marvell,orion-gpio";

				reg = <0x18180 0x40>;

				ngpios = <3>;

				gpio-controller;

				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;

			};



			system-controller@18200 {

				compatible = "marvell,armada-375-system-controller";

				reg = <0x18200 0x100>;

			};



			gateclk: clock-gating-control@18220 {

				compatible = "marvell,armada-375-gating-clock";

				reg = <0x18220 0x4>;

				clocks = <&coreclk 0>;

				#clock-cells = <1>;

			};



			mbusc: mbus-controller@20000 {

				compatible = "marvell,mbus-controller";

				reg = <0x20000 0x100>, <0x20180 0x20>;

			};



			mpic: interrupt-controller@20000 {

				compatible = "marvell,mpic";

				reg = <0x20a00 0x2d0>, <0x21070 0x58>;

				#interrupt-cells = <1>;

				#size-cells = <1>;

				interrupt-controller;

				msi-controller;

				interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>;

			};



			timer@20300 {

				compatible = "marvell,armada-375-timer", "marvell,armada-370-timer";

				reg = <0x20300 0x30>, <0x21040 0x30>;

				interrupts-extended = <&gic  GIC_SPI  8 IRQ_TYPE_LEVEL_HIGH>,

						      <&gic  GIC_SPI  9 IRQ_TYPE_LEVEL_HIGH>,

						      <&gic  GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,

						      <&gic  GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,

						      <&mpic 5>,

						      <&mpic 6>;

				clocks = <&coreclk 0>;

			};



			xor@60800 {

				compatible = "marvell,orion-xor";

				reg = <0x60800 0x100

				       0x60A00 0x100>;

				clocks = <&gateclk 22>;

				status = "okay";



				xor00 {

					interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;

					dmacap,memcpy;

					dmacap,xor;

				};

				xor01 {

					interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;

					dmacap,memcpy;

					dmacap,xor;

					dmacap,memset;

				};

			};



			xor@60900 {

				compatible = "marvell,orion-xor";

				reg = <0x60900 0x100

				       0x60b00 0x100>;

				clocks = <&gateclk 23>;

				status = "okay";



				xor10 {

					interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;

					dmacap,memcpy;

					dmacap,xor;

				};

				xor11 {

					interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;

					dmacap,memcpy;

					dmacap,xor;

					dmacap,memset;

				};

			};



			sata@a0000 {

				compatible = "marvell,orion-sata";

				reg = <0xa0000 0x5000>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gateclk 14>, <&gateclk 20>;

				clock-names = "0", "1";

				status = "disabled";

			};



			nand@d0000 {

				compatible = "marvell,armada370-nand";

				reg = <0xd0000 0x54>;

				#address-cells = <1>;

				#size-cells = <1>;

				interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gateclk 11>;

				status = "disabled";

			};



			mvsdio@d4000 {

				compatible = "marvell,orion-sdio";

				reg = <0xd4000 0x200>;

				interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gateclk 17>;

				bus-width = <4>;

				cap-sdio-irq;

				cap-sd-highspeed;

				cap-mmc-highspeed;

				status = "disabled";

			};



			coreclk: mvebu-sar@e8204 {

				compatible = "marvell,armada-375-core-clock";

				reg = <0xe8204 0x04>;

				#clock-cells = <1>;

			};



			coredivclk: corediv-clock@e8250 {

				compatible = "marvell,armada-375-corediv-clock";

				reg = <0xe8250 0xc>;

				#clock-cells = <1>;

				clocks = <&mainpll>;

				clock-output-names = "nand";

			};

		};



		pcie-controller {

			compatible = "marvell,armada-370-pcie";

			status = "disabled";

			device_type = "pci";



			#address-cells = <3>;

			#size-cells = <2>;



			msi-parent = <&mpic>;

			bus-range = <0x00 0xff>;



			ranges =

			       <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000

				0x82000000 0 0x44000 MBUS_ID(0xf0, 0x01) 0x44000 0 0x00002000

				0x82000000 0x1 0       MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0 MEM */

				0x81000000 0x1 0       MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0 IO  */

				0x82000000 0x2 0       MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 1 MEM */

				0x81000000 0x2 0       MBUS_ID(0x04, 0xd0) 0 1 0 /* Port 1 IO  */>;



			pcie@1,0 {

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;

				reg = <0x0800 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				#interrupt-cells = <1>;

				ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0

					  0x81000000 0 0 0x81000000 0x1 0 1 0>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

				marvell,pcie-port = <0>;

				marvell,pcie-lane = <0>;

				clocks = <&gateclk 5>;

				status = "disabled";

			};



			pcie@2,0 {

				device_type = "pci";

				assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;

				reg = <0x1000 0 0 0 0>;

				#address-cells = <3>;

				#size-cells = <2>;

				#interrupt-cells = <1>;

				ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0

					  0x81000000 0 0 0x81000000 0x2 0 1 0>;

				interrupt-map-mask = <0 0 0 0>;

				interrupt-map = <0 0 0 0 &gic GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;

				marvell,pcie-port = <0>;

				marvell,pcie-lane = <1>;

				clocks = <&gateclk 6>;

				status = "disabled";

			};



		};

	};

};