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

Commit a6f243a4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'nmk-dt-on-cleanups' of... 

Merge tag 'nmk-dt-on-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

From Linus Walleij:
Nomadik Device Tree conversion rebased on ARM SoC cleanup branch

This patch set converts the Nomadik (mach-nomadik) to
Device Tree and delete the old board files, paving the
road for single zImage.

* tag 'nmk-dt-on-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik

:
  ARM: nomadik: get rid of <mach/hardware.h>
  ARM: nomadik: delete old board files
  ARM: nomadik: add I2C devices to the device tree
  ARM: nomadik: migrate MMC/SD card support to device tree
  ARM: nomadik: convert SMSC91x ethernet to device tree
  ARM: nomadik: move GPIO and pinctrl to device tree
  ARM: nomadik: add FSMC NAND
  ARM: nomadik: move remaining PrimeCells to device tree
  ARM: nomadik: move pin maps to cpu file
  ARM: nomadik: initial devicetree support
  ARM: nomadik: move last custom calls to pinctrl

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 440f39a4 dea3eacd

Documentation/devicetree/bindings/arm/ste-nomadik.txt

0 → 100644
+27 −0
Original line number Original line Diff line number Diff line 
ST-Ericsson Nomadik Device Tree Bindings



For various board the "board" node may contain specific properties

that pertain to this particular board, such as board-specific GPIOs.



Boards with the Nomadik SoC include:



S8815 "MiniKit" manufactured by Calao Systems:



Required root node property:



compatible="calaosystems,usb-s8815";



Required node: usb-s8815



Example:



usb-s8815 {

		ethernet-gpio {

			gpios = <&gpio3 19 0x1>;

			interrupts = <19 0x1>;

			interrupt-parent = <&gpio3>;

		};

		mmcsd-gpio {

			gpios = <&gpio3 16 0x1>;

		};

};

Documentation/devicetree/bindings/mtd/fsmc-nand.txt

+1 −1
Original line number Original line Diff line number Diff line 
* FSMC NAND

* FSMC NAND





Required properties:

Required properties:

- compatible : "st,spear600-fsmc-nand"

- compatible : "st,spear600-fsmc-nand", "stericsson,fsmc-nand"

- reg : Address range of the mtd chip

- reg : Address range of the mtd chip

- reg-names: Should contain the reg names "fsmc_regs", "nand_data", "nand_addr" and "nand_cmd"

- reg-names: Should contain the reg names "fsmc_regs", "nand_data", "nand_addr" and "nand_cmd"

arch/arm/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -899,10 +899,12 @@ config ARCH_NOMADIK 
	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select ARM_AMBA

	select ARM_VIC

	select ARM_VIC

	select CLKSRC_NOMADIK_MTU

	select COMMON_CLK

	select COMMON_CLK

	select CPU_ARM926T

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select MIGHT_HAVE_CACHE_L2X0

	select OF

	select PINCTRL

	select PINCTRL

	select PINCTRL_STN8815

	select PINCTRL_STN8815

	select SPARSE_IRQ

	select SPARSE_IRQ

arch/arm/boot/dts/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -100,6 +100,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ 
	imx28-m28evk.dtb \

	imx28-m28evk.dtb \

	imx28-sps1.dtb \

	imx28-sps1.dtb \

	imx28-tx28.dtb

	imx28-tx28.dtb

dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb

dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \

dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \

	omap3-beagle.dtb \

	omap3-beagle.dtb \

	omap3-beagle-xm.dtb \

	omap3-beagle-xm.dtb \

arch/arm/boot/dts/ste-nomadik-s8815.dts

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

 * Device Tree for the ST-Ericsson Nomadik S8815 board

 * Produced by Calao Systems

 */



/dts-v1/;

/include/ "ste-nomadik-stn8815.dtsi"



/ {

	model = "Calao Systems USB-S8815";

	compatible = "calaosystems,usb-s8815";



	chosen {

		bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk";

	};



	/* Custom board node with GPIO pins to active etc */

	usb-s8815 {

		/* The S8815 is using this very GPIO pin for the SMSC91x IRQs */

		ethernet-gpio {

			gpios = <&gpio3 19 0x1>;

			interrupts = <19 0x1>;

			interrupt-parent = <&gpio3>;

		};

		/* This will bias the MMC/SD card detect line */

		mmcsd-gpio {

			gpios = <&gpio3 16 0x1>;

		};

	};

};