Commit 1a32c58b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC mvebu platform changes from Olof Johansson:
 "This series contains changes for the Marvell EBU platforms (mvebu,
  orion, kirkwood, dove) that were not part of the first set of pull
  requests because of dependencies on the MMC tree, and being submitted
  a little late.

  Notable changes are:

   - More devices get moved out of board files into device tree
     descriptions.  The remaining devices listed in there have patches
     that will get sent for 3.10, after which we can remove a lot of the
     board files entirely.  We are doing the pinctrl and mmc drivers
     here, ethernet and PCI still remain.

   - SMP support for mvebu is improved with support for the local
     interrupt controller.

   - The Guruplug board file gets replaced with a DT description.

  Unfortunately, the dependency on the MMC tree turned out to be a much
  larger problem than expected, when the MMC maintainer rebased the
  patches in his tree that all of the patches in this branch are based
  on, which caused merge conflicts between the new and old versions of
  those patches.

  To work around the merge conflicts, this branch rebases all patches on
  top of the respective MMC patches that did get merged into 3.9.  The
  patches are all identical to the versions that were part of
  linux-next, but have a new commit date."

* tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (90 commits)
  arm: mvebu: enable the SD card slot on Armada 370 Reference Design board
  ARM: kirkwood: topkick: init mvsdio via DT
  ARM: kirkwood: nsa310: convert to pinctrl
  ARM: Kirkwood: topkick: Enable i2c bus.
  ARM: kirkwood: topkick: convert to pinctrl
  ARM: dove: convert serial DT nodes to clocks property
  arm: mvebu: Add SPI flash on Armada 370 DB board
  arm: mvebu: Add SPI flash on Armada XP-DB board
  arm: mvebu: Add SPI flash on Armada XP-GP board
  arm: mvebu: Add support for SPI controller in Armada 370/XP
  clocksource: update and move armada-370-xp-timer documentation to timer directory
  arm: mvebu: update DT to support local timers
  ARM: Dove: convert usb host controller to DT
  arm: mvebu: Enable USB controllers on Armada 370/XP boards
  arm: mvebu: Add support for USB host controllers in Armada 370/XP
  arm: mvebu: add button for OpenBlocks AX3-4
  ARM: Kirkwood: Convert NS2 to gpio-poweroff.
  ARM: Kirkwood: Convert NSA310 I2C to device tree
  ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driver
  ARM: Kirkwood: Convert NSA310 to DT based regulators.
  ...
parents 7307c00f 56499120

Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt→Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt

+7 −4
Original line number Diff line number Diff line 
Marvell Armada 370 and Armada XP Global Timers

----------------------------------------------

Marvell Armada 370 and Armada XP Timers

---------------------------------------



Required properties:

- compatible: Should be "marvell,armada-370-xp-timer"

- interrupts: Should contain the list of Global Timer interrupts

- reg: Should contain the base address of the Global Timer registers

- interrupts: Should contain the list of Global Timer interrupts and

  then local timer interrupts

- reg: Should contain location and length for timers register. First

  pair for the Global Timer registers, second pair for the

  local/private timers.

- clocks: clock driving the timer hardware



Optional properties:

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ 
	kirkwood-dockstar.dtb \

	kirkwood-dreamplug.dtb \

	kirkwood-goflexnet.dtb \

	kirkwood-guruplug-server-plus.dtb \

	kirkwood-ib62x0.dtb \

	kirkwood-iconnect.dtb \

	kirkwood-iomega_ix2_200.dtb \
@@ -78,7 +79,9 @@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \ 
	msm8960-cdp.dtb

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

	armada-370-mirabox.dtb \

	armada-370-rd.dtb \

	armada-xp-db.dtb \

	armada-xp-gp.dtb \

	armada-xp-openblocks-ax3-4.dtb

dtb-$(CONFIG_ARCH_MXC) += \

	imx25-karo-tx25.dtb \

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

+35 −0
Original line number Diff line number Diff line
@@ -59,5 +59,40 @@ 
			phy = <&phy1>;

			phy-mode = "rgmii-id";

		};



		mvsdio@d00d4000 {

			pinctrl-0 = <&sdio_pins1>;

			pinctrl-names = "default";

			/*

			 * This device is disabled by default, because

			 * using the SD card connector requires

			 * changing the default CON40 connector

			 * "DB-88F6710_MPP_2xRGMII_DEVICE_Jumper" to a

			 * different connector

			 * "DB-88F6710_MPP_RGMII_SD_Jumper".

			 */

			status = "disabled";

			/* No CD or WP GPIOs */

		};



		usb@d0050000 {

			status = "okay";

		};



		usb@d0051000 {

			status = "okay";

		};



		spi0: spi@d0010600 {

			status = "okay";



			spi-flash@0 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "mx25l25635e";

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

				spi-max-frequency = <50000000>;

			};

		};

	};

};

arch/arm/boot/dts/armada-370-mirabox.dts

+18 −0
Original line number Diff line number Diff line
@@ -52,5 +52,23 @@ 
			phy = <&phy1>;

			phy-mode = "rgmii-id";

		};



		mvsdio@d00d4000 {

			pinctrl-0 = <&sdio_pins2>;

			pinctrl-names = "default";

			status = "okay";

			/*

			 * No CD or WP GPIOs: SDIO interface used for

			 * Wifi/Bluetooth chip

			 */

		};



		usb@d0050000 {

			status = "okay";

		};



		usb@d0051000 {

			status = "okay";

		};

	};

};

arch/arm/boot/dts/armada-370-rd.dts

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

 * Device Tree file for Marvell Armada 370 Reference Design board

 * (RD-88F6710-A1)

 *

 *  Copied from arch/arm/boot/dts/armada-370-db.dts

 *

 *  Copyright (C) 2013 Florian Fainelli <florian@openwrt.org>

 *

 * 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/ "armada-370.dtsi"



/ {

	model = "Marvell Armada 370 Reference Design";

	compatible = "marvell,a370-rd", "marvell,armada370", "marvell,armada-370-xp";



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

	};



	memory {

		device_type = "memory";

		reg = <0x00000000 0x20000000>; /* 512 MB */

	};



	soc {

		serial@d0012000 {

			clock-frequency = <200000000>;

			status = "okay";

		};

		sata@d00a0000 {

			nr-ports = <2>;

			status = "okay";

		};



		mdio {

			phy0: ethernet-phy@0 {

				reg = <0>;

			};



			phy1: ethernet-phy@1 {

				reg = <1>;

			};

		};



		ethernet@d0070000 {

			status = "okay";

			phy = <&phy0>;

			phy-mode = "sgmii";

		};

		ethernet@d0074000 {

			status = "okay";

			phy = <&phy1>;

			phy-mode = "rgmii-id";

		};



		mvsdio@d00d4000 {

			pinctrl-0 = <&sdio_pins1>;

			pinctrl-names = "default";

			status = "okay";

			/* No CD or WP GPIOs */

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE