Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf4af012 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC board updates from Olof Johansson:
 "This branch contains a set of various board updates for ARM platforms.

  A few shmobile platforms that are stale have been removed, some
  defconfig updates for various boards selecting new features such as
  pinctrl subsystem support, and various updates enabling peripherals,
  etc."

Fix up conflicts mostly as per Olof.

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (58 commits)
  ARM: S3C64XX: Add dummy supplies for Glenfarclas LDOs
  ARM: S3C64XX: Add registration of WM2200 Bells device on Cragganmore
  ARM: kirkwood: Add Plat'Home OpenBlocks A6 support
  ARM: Dove: update defconfig
  ARM: Kirkwood: update defconfig for new boards
  arm: orion5x: add DT related options in defconfig
  arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree
  arm: orion5x: basic Device Tree support
  arm: orion5x: mechanical defconfig update
  ARM: kirkwood: Add support for the MPL CEC4
  arm: kirkwood: add support for ZyXEL NSA310
  ARM: Kirkwood: new board USI Topkick
  ARM: kirkwood: use gpio-fan DT binding on lsxl
  ARM: Kirkwood: add Netspace boards to defconfig
  ARM: kirkwood: DT board setup for Network Space Mini v2
  ARM: kirkwood: DT board setup for Network Space Lite v2
  ARM: kirkwood: DT board setup for Network Space v2 and parents
  leds: leds-ns2: add device tree binding
  ARM: Kirkwood: Enable the second I2C bus
  ARM: mmp: select pinctrl driver
  ...
parents d027db13 00630913

Documentation/devicetree/bindings/arm/davinci.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Texas Instruments DaVinci Platforms Device Tree Bindings

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



DA850/OMAP-L138/AM18x Evaluation Module (EVM) board

Required root node properties:

    - compatible = "ti,da850-evm", "ti,da850";



EnBW AM1808 based CMC board

Required root node properties:

    - compatible = "enbw,cmc", "ti,da850;



Generic DaVinci Boards

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



DA850/OMAP-L138/AM18x generic board

Required root node properties:

    - compatible = "ti,da850";

Documentation/devicetree/bindings/gpio/leds-ns2.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Binding for dual-GPIO LED found on Network Space v2 (and parents).



Required properties:

- compatible: "lacie,ns2-leds".



Each LED is represented as a sub-node of the ns2-leds device.



Required sub-node properties:

- cmd-gpio: Command LED GPIO. See OF device-tree GPIO specification.

- slow-gpio: Slow LED GPIO. See OF device-tree GPIO specification.



Optional sub-node properties:

- label: Name for this LED. If omitted, the label is taken from the node name.

- linux,default-trigger: Trigger assigned to the LED.



Example:



ns2-leds {

	compatible = "lacie,ns2-leds";



	blue-sata {

		label = "ns2:blue:sata";

		slow-gpio = <&gpio0 29 0>;

		cmd-gpio = <&gpio0 30 0>;

	};

};

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -926,6 +926,7 @@ config ARCH_DAVINCI 
	select GENERIC_IRQ_CHIP

	select HAVE_IDE

	select NEED_MACH_GPIO_H

	select USE_OF

	select ZONE_DMA

	help

	  Support for TI's DaVinci platform.

arch/arm/boot/dts/Makefile

+13 −2
Original line number Diff line number Diff line
@@ -55,11 +55,20 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ 
	kirkwood-ib62x0.dtb \

	kirkwood-iconnect.dtb \

	kirkwood-iomega_ix2_200.dtb \

	kirkwood-is2.dtb \

	kirkwood-km_kirkwood.dtb \

	kirkwood-lschlv2.dtb \

	kirkwood-lsxhl.dtb \

	kirkwood-mplcec4.dtb \

	kirkwood-ns2.dtb \

	kirkwood-ns2lite.dtb \

	kirkwood-ns2max.dtb \

	kirkwood-ns2mini.dtb \

	kirkwood-nsa310.dtb \

	kirkwood-topkick.dtb \

	kirkwood-ts219-6281.dtb \

	kirkwood-ts219-6282.dtb

	kirkwood-ts219-6282.dtb \

	kirkwood-openblocks_a6.dtb

dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

	msm8960-cdp.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
@@ -94,11 +103,13 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	am335x-evm.dtb \

	am335x-evmsk.dtb \

	am335x-bone.dtb

dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

	r8a7740-armadillo800eva.dtb \

	sh73a0-kzm9g.dtb

	sh73a0-kzm9g.dtb \

	sh7372-mackerel.dtb

dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \

	spear1340-evb.dtb

dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \

arch/arm/boot/dts/da850-enbw-cmc.dts

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

 * Device Tree for AM1808 EnBW CMC board

 *

 * Copyright 2012 DENX Software Engineering GmbH

 * Heiko Schocher <hs@denx.de>

 *

 * This program 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.

 */

/dts-v1/;

/include/ "da850.dtsi"



/ {

	compatible = "enbw,cmc", "ti,da850";

	model = "EnBW CMC";



	soc {

		serial0: serial@1c42000 {

			status = "okay";

		};

		serial1: serial@1d0c000 {

			status = "okay";

		};

		serial2: serial@1d0d000 {

			status = "okay";

		};

	};

};