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

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

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

Pull ARM SoC device tree conversions from Arnd Bergmann:
 "These are device tree conversions for a number of platforms, with the
  intention of turning code from board files into device tree
  descriptions.  Notable changes are:

   - davinci bindings for pinctrl, MTD, RTC, watchdog and i2c

   - nomadik bindings for all devices, removing the board files

   - bcm2835 bindings for mmc and i2c

   - tegra bindings for hdmi, keyboard, audio, as well as some updates

   - at91 bindings for hardware ecc and for devices on RM9200

   - mxs bindings for cfa100xx

   - sunxi support for Miniand Hackberry board"

* tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (72 commits)
  Revert "sunxi: a10-cubieboard: Add user LEDs to the device tree"
  Revert "sunxi: a13-olinuxino: Add user LED to the device tree"
  clk: tegra: initialise parent of uart clocks
  ARM: tegra: remove clock-frequency properties from serial nodes
  clk: tegra: fix driver to match DT binding
  clk: tegra: local arrays should be static
  clk: tegra: Add missing spinlock for hclk and pclk
  clk: tegra: Implement locking for super clock
  clk: tegra: fix wrong clock index between se to sata_cold
  sunxi: a13-olinuxino: Add user LED to the device tree
  ARM: davinci: da850 DT: add support for machine reboot
  ARM: davinci: da850: add wdt DT node
  ARM: davinci: da850: add DT node for I2C0
  ARM: at91: at91sam9n12: add DT parameters to enable PMECC
  ARM: at91: at91sam9x5: add DT parameters to enable PMECC
  ARM: at91: add EMAC bindings to RM9200 DT
  ARM: at91: add SSC bindings to RM9200 DT
  ARM: at91: add MMC bindings to RM9200 DT
  ARM: at91: Animeo IP: enable watchdog support
  ARM: nomadik: fix OF compilation regression
  ...
parents 6c5096e5 89dfe564

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

0 → 100644
+27 −0
Original line number 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/arm/tegra.txt

+26 −6
Original line number Diff line number Diff line 
NVIDIA Tegra device tree bindings

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



Boards with the tegra20 SoC shall have the following properties:

SoCs

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



Required root node property:

Each device tree must specify which Tegra SoC it uses, using one of the

following compatible values:



compatible = "nvidia,tegra20";

  nvidia,tegra20

  nvidia,tegra30



Boards with the tegra30 SoC shall have the following properties:

Boards

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



Required root node property:

Each device tree must specify which one or more of the following

board-specific compatible values:



compatible = "nvidia,tegra30";
 
  ad,medcom-wide

  ad,plutux

  ad,tamonten

  ad,tec

  compal,paz00

  compulab,trimslice

  nvidia,beaver

  nvidia,cardhu

  nvidia,cardhu-a02

  nvidia,cardhu-a04

  nvidia,harmony

  nvidia,seaboard

  nvidia,ventana

  nvidia,whistler

  toradex,colibri_t20-512

  toradex,iris

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

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



Required properties:

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

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

- reg : Address range of the mtd chip

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

arch/arm/Kconfig

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

	select ARM_AMBA

	select ARM_VIC

	select CLKSRC_NOMADIK_MTU

	select COMMON_CLK

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select USE_OF

	select PINCTRL

	select PINCTRL_STN8815

	select SPARSE_IRQ

arch/arm/boot/dts/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -96,11 +96,13 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ 
	imx28-apf28dev.dtb \

	imx28-apx4devkit.dtb \

	imx28-cfa10036.dtb \

	imx28-cfa10037.dtb \

	imx28-cfa10049.dtb \

	imx28-evk.dtb \

	imx28-m28evk.dtb \

	imx28-sps1.dtb \

	imx28-tx28.dtb

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

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

	omap3-beagle.dtb \

	omap3-beagle-xm.dtb \
@@ -135,8 +137,10 @@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ 
	spear320-hmi.dtb

dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \

	sun4i-a10-hackberry.dtb \

	sun5i-a13-olinuxino.dtb

dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \

	tegra20-iris-512.dtb \

	tegra20-medcom-wide.dtb \

	tegra20-paz00.dtb \

	tegra20-plutux.dtb \
@@ -145,6 +149,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ 
	tegra20-trimslice.dtb \

	tegra20-ventana.dtb \

	tegra20-whistler.dtb \

	tegra30-beaver.dtb \

	tegra30-cardhu-a02.dtb \

	tegra30-cardhu-a04.dtb \

	tegra114-dalmore.dtb \