OSDN Git Service

uclinux-h8/linux.git
9 years agoMerge tag 'v4.1-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
Olof Johansson [Fri, 3 Apr 2015 17:48:38 +0000 (10:48 -0700)]
Merge tag 'v4.1-dt' of git://git./linux/kernel/git/tmlind/linux-omap into next/dt

Merge "omap device tree changes for v4.1, part1" from Tony Lindgren:

Device tree related changes for omaps:

- Add support for ChiliSOM

- Add support for OpenPandora

- Add support for BeagleBoard NAND

- Enable crypto devices for omap3 devices

- Add bindings for omap3 camera support

- Updates for am437x and dra7x and dm816x SoCs

* tag 'v4.1-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits)
  ARM: dts: Update Nanobone dts file
  ARM: dts: n950, n9: Add primary camera support
  ARM: dts: omap3: Add DT entries for OMAP 3 ISP
  Documentation: DT: Add bindings for omap3isp
  ARM: dts: Remove files omap34xx-hs.dtsi and omap36xx-hs.dtsi
  ARM: dts: omap3-tao3530: Include directly omap34xx.dtsi
  ARM: dts: n900: Enable omap sham and include directly omap34xx.dtsi
  ARM: dts: n9/n950: Enable omap crypto support
  ARM: dts: Remove PIN_INPUT for dm816x McSPI
  ARM: dts: Add cppi41 support for dm816x MUSB
  ARM: dts: Fix typo for dm816x usb0_pins
  ARM: dts: dra7x-evm: beagle-x15: Fix USB Peripheral
  ARM: dts: am57xx-beagle-x15: Do not include the atl header
  ARM: dts: DRA7: Remove ti,timer-dsp and ti,timer-pwm properties
  Documentation: omap-twl4030: Move ti,codec property to optional
  ARM: dts: omap3: Remove all references to ti,codec property
  ARM: dts: omap3-beagle: Add NAND device
  ARM: dts: AM4372: update hdq compatible property
  ARM: dts: omap3-pandora: add DM3730 1 GHz version
  ARM: dts: omap3-pandora: add OMAP3530 600 MHz version
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoMerge tag 'renesas-dt3-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git...
Olof Johansson [Thu, 2 Apr 2015 00:54:16 +0000 (17:54 -0700)]
Merge tag 'renesas-dt3-for-v4.1' of git://git./linux/kernel/git/horms/renesas into next/dt

Merge "Third Round of Renesas ARM Based SoC DT Updates for v4.1" from Simon
Horman:

* Add DMA sound support to r8a7791 and r8a7790 SoCs

* tag 'renesas-dt3-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7791: sound enables Audio DMAC entry on DTSI
  ARM: shmobile: r8a7790: sound enables Audio DMAC entry on DTSI
  ARM: shmobile: r8a7791: enable Audio DMAC peri peri via sound driver
  ARM: shmobile: r8a7790: enable Audio DMAC peri peri via sound driver
  ARM: shmobile: r8a7791: add reg-names for sound
  ARM: shmobile: r8a7790: add reg-names for sound

Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoMerge tag 'v4.1-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind...
Olof Johansson [Thu, 2 Apr 2015 00:52:46 +0000 (17:52 -0700)]
Merge tag 'v4.1-rockchip-dts1' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "ARM: rockchip: dts changes for 4.1" from Heiko Stuebner:

This adds and enables the usbphy nodes on the rk3288 boards and enables
the gmac on the firefly board. A new board the Popmetal-rk3288 is also
added. And finally the pmic supplies for act8846 based boards are added,
as the act8865/act8846 driver gained supply handling in the regulator tree.

* tag 'v4.1-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: complete rk3288-evb pmic supplies
  ARM: dts: rockchip: add input supplies for the act8846 on Radxa Rock
  ARM: dts: add rk3288 PopMetal board
  dt-bindings: add root compatible property for PopMetal board
  ARM: dts: rockchip: enable gmac on rk3288-firefly
  ARM: dts: rockchip: enable usbphy on rk3288-firefly
  ARM: dts: rockchip: Enable usb PHY on rk3288-evb board
  ARM: dts: rockchip: add rk3288 usb PHY

Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoARM: dts: fix typo in makefile for alpine-db
Olof Johansson [Thu, 2 Apr 2015 00:05:54 +0000 (17:05 -0700)]
ARM: dts: fix typo in makefile for alpine-db

File uses dash in the filename, not underscore.

Reported-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoARM: dts: Update Nanobone dts file
Mark Jackson [Thu, 19 Mar 2015 15:07:43 +0000 (15:07 +0000)]
ARM: dts: Update Nanobone dts file

Update dts file to reflect:-
* new flash memory layout
* add missing phy-mode property
* dual_emac now just a boolean
* rename mcp to microchip
* update gpio definition

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: n950, n9: Add primary camera support
Sakari Ailus [Wed, 18 Mar 2015 23:50:24 +0000 (01:50 +0200)]
ARM: dts: n950, n9: Add primary camera support

Add support for the primary camera of the Nokia N950 and N9.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3: Add DT entries for OMAP 3 ISP
Sakari Ailus [Wed, 18 Mar 2015 23:50:23 +0000 (01:50 +0200)]
ARM: dts: omap3: Add DT entries for OMAP 3 ISP

The resources the ISP needs are slightly different on 3[45]xx and 3[67]xx.
Especially the phy-type property is different.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
[tony@atomide.com: use omap3_scm_general instead of scm_conf for now]
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoDocumentation: DT: Add bindings for omap3isp
Sakari Ailus [Wed, 18 Mar 2015 23:50:22 +0000 (01:50 +0200)]
Documentation: DT: Add bindings for omap3isp

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: Remove files omap34xx-hs.dtsi and omap36xx-hs.dtsi
Pali Rohár [Thu, 26 Feb 2015 13:50:00 +0000 (14:50 +0100)]
ARM: dts: Remove files omap34xx-hs.dtsi and omap36xx-hs.dtsi

These files are not used by any DTS file anymore.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3-tao3530: Include directly omap34xx.dtsi
Pali Rohár [Thu, 26 Feb 2015 13:49:59 +0000 (14:49 +0100)]
ARM: dts: omap3-tao3530: Include directly omap34xx.dtsi

This patch just move content of file omap34xx-hs.dtsi into omap3-tao3530.dts.
There is no code change, patch is just preparation for removing -hs file.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: n900: Enable omap sham and include directly omap34xx.dtsi
Pali Rohár [Thu, 26 Feb 2015 13:49:58 +0000 (14:49 +0100)]
ARM: dts: n900: Enable omap sham and include directly omap34xx.dtsi

This patch moves content of file omap34xx-hs.dtsi into omap3-n900.dts and enable
omap sham support (omap HW support for SHA + MD5). After testing both omap hwmod
and omap-sham.ko drivers it looks like signed Nokia X-Loader enable L3 firewall
for omap sham. There is no kernel crash with both official bootloader and crypto
enable bootloader. So we can safely enable sham code.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: n9/n950: Enable omap crypto support
Pali Rohár [Thu, 26 Feb 2015 13:49:57 +0000 (14:49 +0100)]
ARM: dts: n9/n950: Enable omap crypto support

Harmattan system on Nokia N9 and N950 devices uses omap crypto support.
Bootloader on those devices is known that it enables HW crypto support.
This patch just include omap36xx.dtsi directly, so aes and sham is enabled.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: Remove PIN_INPUT for dm816x McSPI
Tony Lindgren [Thu, 19 Mar 2015 16:14:36 +0000 (09:14 -0700)]
ARM: dts: Remove PIN_INPUT for dm816x McSPI

On dm816x we have no PIN_INPUT vs PIN_OUTPUT configuration, there
are just pulls. Let's remove the bogus flags.

Cc: Brian Hutchinson <b.hutchman@gmail.com>
Cc: Matthijs van Duin <matthijsvanduin@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: Add cppi41 support for dm816x MUSB
Tony Lindgren [Thu, 19 Mar 2015 16:14:36 +0000 (09:14 -0700)]
ARM: dts: Add cppi41 support for dm816x MUSB

Looks like we have cppi41 on dm816x just like on am335x.

Cc: Bin Liu <binmlist@gmail.com>
Cc: Brian Hutchinson <b.hutchman@gmail.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Matthijs van Duin <matthijsvanduin@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: Fix typo for dm816x usb0_pins
Tony Lindgren [Thu, 19 Mar 2015 16:14:35 +0000 (09:14 -0700)]
ARM: dts: Fix typo for dm816x usb0_pins

Commit a54879a00859 ("ARM: dts: Fix USB dts configuration for dm816x")
attempted to fix the USB features introduced by commit 7800064ba507
("ARM: dts: Add basic dm816x device tree configuration") but obviously
I did not read the dmesg as more USB issues still keep trickling in.

It should be usb1_pins instead not usb0_pins for the second interface
to avoid warnings from pinctrl framework.

Cc: Brian Hutchinson <b.hutchman@gmail.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Matthijs van Duin <matthijsvanduin@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: dra7x-evm: beagle-x15: Fix USB Peripheral
Roger Quadros [Tue, 17 Mar 2015 09:43:51 +0000 (11:43 +0200)]
ARM: dts: dra7x-evm: beagle-x15: Fix USB Peripheral

Now that we have EXTCON_USB_GPIO queued for v4.1, revert
commit addfcde7c485 ("ARM: dts: dra7x-evm: beagle-x15: Fix USB Host")

On these EVMs, the USB cable state has to be determined via the
ID pin tied to a GPIO line. We use the gpio-usb-extcon driver
to read the ID pin and the extcon framework to forward
the USB cable state information to the USB driver so the
controller can be configured in the right mode (host/peripheral).

Gets USB peripheral mode to work on this EVM.

Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
9 years agoARM: dts: am57xx-beagle-x15: Do not include the atl header
Peter Ujfalusi [Thu, 26 Feb 2015 13:40:39 +0000 (15:40 +0200)]
ARM: dts: am57xx-beagle-x15: Do not include the atl header

AM57xx does not have ATL block integrated.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: DRA7: Remove ti,timer-dsp and ti,timer-pwm properties
Suman Anna [Mon, 16 Mar 2015 17:20:37 +0000 (12:20 -0500)]
ARM: dts: DRA7: Remove ti,timer-dsp and ti,timer-pwm properties

Remove the 'ti,timer-dsp' and 'ti,timer-pwm' properties from the timer
nodes that still have them. This seems to be copied from OMAP5, on
which only certain timers are capable of providing PWM functionality
or be able to interrupt the DSP. All the GPTimers On DRA7 are capable
of PWM and interrupting any core (due to the presence of Crossbar).

These properties were used by the driver to add capabilities to each
timer, and support requesting timers by capability. In the DT world,
we expect any users of timers to use phandles to the respective timer,
and use the omap_dm_timer_request_by_node() API. The API to request
using capabilities, omap_dm_timer_request_by_cap() API should be
deprecated eventually.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoDocumentation: omap-twl4030: Move ti,codec property to optional
Marek Belisko [Fri, 13 Mar 2015 20:40:37 +0000 (21:40 +0100)]
Documentation: omap-twl4030: Move ti,codec property to optional

ti,codec property is not used in omap-twl4030 driver in linux kernel but
we keep it as optional property, so that the existing dtbs do not
become noncompliant after the change on other OS.

Signed-off-by: Marek Belisko <marek@goldelico.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3: Remove all references to ti,codec property
Marek Belisko [Fri, 13 Mar 2015 20:40:36 +0000 (21:40 +0100)]
ARM: dts: omap3: Remove all references to ti,codec property

ti,codec property is not used (parsed) in omap-twl4030 driver. The ti,twl4030-audio
which ti,codec points by phandle is mfd driver and device for ASoC codec is created
w/o DT compatible string. Removing all references in DT files.

Signed-off-by: Marek Belisko <marek@goldelico.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3-beagle: Add NAND device
Roger Quadros [Fri, 6 Mar 2015 15:10:05 +0000 (17:10 +0200)]
ARM: dts: omap3-beagle: Add NAND device

The beagle board contains a 16-bit NAND device connected to
chip select 0 of the GPMC controller.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: AM4372: update hdq compatible property
Vignesh R [Mon, 2 Mar 2015 10:49:34 +0000 (16:19 +0530)]
ARM: dts: AM4372: update hdq compatible property

This patch updates hdq node compatible property to "ti,am4372-hdq".

Signed-off-by: Vignesh R <vigneshr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3-pandora: add DM3730 1 GHz version
H. Nikolaus Schaller [Fri, 27 Feb 2015 21:26:39 +0000 (22:26 +0100)]
ARM: dts: omap3-pandora: add DM3730 1 GHz version

Added Pandora 1 GHz model which is based on Classic/Rebirth
with following changes:
- upgraded cpu to dm3730 runs on 1GHz
- 512 MiB DDR-333 SDRAM @ 200 MHz

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3-pandora: add OMAP3530 600 MHz version
H. Nikolaus Schaller [Fri, 27 Feb 2015 21:26:38 +0000 (22:26 +0100)]
ARM: dts: omap3-pandora: add OMAP3530 600 MHz version

Added Pandora Rebirth model which is based on Pandora
Classic with 512 MiB DDR-333 SDRAM memory.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: omap3-pandora: add common device tree
H. Nikolaus Schaller [Fri, 27 Feb 2015 21:26:37 +0000 (22:26 +0100)]
ARM: dts: omap3-pandora: add common device tree

This device tree allows to boot, supports the panel,
framebuffer, touch screen, as well as some more peripherals.
Since there is a OMAP3530 based 600 MHz variant and a DM3730 based
1 GHz variant we must include this common device tree code
in one of two CPU specific device trees.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Marek Belisko <marek@goldelico.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: dra7xx-clocks: Add gate clock for CLKOUT2
Peter Ujfalusi [Thu, 26 Feb 2015 13:39:23 +0000 (15:39 +0200)]
ARM: dts: dra7xx-clocks: Add gate clock for CLKOUT2

To be able to control the gate for the clkout2 clock output.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoDocumentation: DT: omap_serial: document missing properties and add an example
Matt Porter [Thu, 26 Feb 2015 15:38:45 +0000 (10:38 -0500)]
Documentation: DT: omap_serial: document missing properties and add an example

The omap_serial.txt binding documentation lacks a number of properties
that are used in DTS files for platforms incorporating this peripheral.
Fix this by documenting the missing required and optional fields and
add an example.

Signed-off-by: Matt Porter <mporter@konsulko.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: am437x-idk: enable i2c2
Felipe Balbi [Thu, 19 Feb 2015 19:57:38 +0000 (13:57 -0600)]
ARM: dts: am437x-idk: enable i2c2

i2c2 goes to an expansion connector which we
want to use.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: am335x: Add Chiliboard DTS
Rostislav Lisovy [Mon, 9 Feb 2015 14:48:05 +0000 (15:48 +0100)]
ARM: dts: am335x: Add Chiliboard DTS

Chiliboard uses ChiliSOM as its base.

Hardware specification:
* ChiliSOM (am335x, PMIC, DRAM, NAND)
* Ethernet PHY (id 0)
* USB host (usb1)
* microSD slot
* 2x GPIO LED

Signed-off-by: Rostislav Lisovy <lisovy@jablotron.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: am335x: Add DTS for ChiliSOM module
Rostislav Lisovy [Mon, 9 Feb 2015 14:48:04 +0000 (15:48 +0100)]
ARM: dts: am335x: Add DTS for ChiliSOM module

Since this is a SOM (System on Module) that will be part
of another embedded board (and can't really exist on its own)
define it as a "dtsi" that will be included in the Device tree
describing the whole system later on.

Hardware specification:
* AM335x SoC
* up to 512 MB RAM
* NAND Flash (8x interface, cs0)
* UART0
* PMIC
* I2C0 (for PMIC)
* 1x Ethernet MAC

Signed-off-by: Rostislav Lisovy <lisovy@jablotron.cz>
[tony@atomide.com: updated nand io size to be just 4]
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoARM: dts: Add vendor prefix for Grinn
Rostislav Lisovy [Mon, 9 Feb 2015 14:48:03 +0000 (15:48 +0100)]
ARM: dts: Add vendor prefix for Grinn

Grinn is a company located in Poland, Europe producing
System on Modules.
Webpage: http://www.grinn-global.com/

Signed-off-by: Rostislav Lisovy <lisovy@jablotron.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
9 years agoMerge tag 'arm-soc/for-4.1/devicetree-part-2' of http://github.com/broadcom/stblinux...
Arnd Bergmann [Mon, 16 Mar 2015 14:35:25 +0000 (15:35 +0100)]
Merge tag 'arm-soc/for-4.1/devicetree-part-2' of github.com/broadcom/stblinux into next/dt

Pull "This pull request contains the following changes from Ray for Cygnus SoCs: from Florian Fainelli:

- enable IOMUX, required for pinmux/pinctrl
- enable GPIO, required for the GPIO driver
- enable GPIO hook detection for BCM911360-based phone designs
- enable PCIe controller for the bcm958300k designs

* tag 'arm-soc/for-4.1/devicetree-part-2' of http://github.com/broadcom/stblinux:
  ARM: dts: enable PCIe support for Cygnus
  ARM: dts: cygnus: enable GPIO based hook detection
  ARM: dts: enable GPIO for Broadcom Cygnus
  ARM: dts: enable IOMUX for Broadcom Cygnus

9 years agoARM: dts: Alpine platform devicetree
Tsahee Zidenberg [Thu, 12 Mar 2015 11:53:12 +0000 (13:53 +0200)]
ARM: dts: Alpine platform devicetree

This patch introduces devicetree for the Alpine platform, and
for a development board based on the same platform.

Signed-off-by: Barak Wasserstrom <barak@annapurnalabs.com>
Signed-off-by: Tsahee Zidenberg <tsahee@annapurnalabs.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
9 years agoARM: dts: enable PCIe support for Cygnus
Ray Jui [Wed, 11 Mar 2015 18:06:09 +0000 (11:06 -0700)]
ARM: dts: enable PCIe support for Cygnus

Add PCIe device nodes in bcm-cygnus.dtsi but keep them disabled there.
Only enable them for bcm958300k where PCIe interfaces are populated

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
9 years agoARM: dts: rockchip: complete rk3288-evb pmic supplies
Heiko Stuebner [Sat, 7 Mar 2015 22:18:12 +0000 (23:18 +0100)]
ARM: dts: rockchip: complete rk3288-evb pmic supplies

This adds the static vcc_sys regulator to the rk3288-evb, the missing
rk808 supplies from it and all the supplies of the act8846 evb-variant.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
9 years agoMerge tag 'renesas-dt2-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git...
Arnd Bergmann [Wed, 11 Mar 2015 21:54:57 +0000 (22:54 +0100)]
Merge tag 'renesas-dt2-for-v4.1' of git://git./linux/kernel/git/horms/renesas into next/dt

Pull "Second Round of Renesas ARM Based SoC DT Updates for v4.1" from Simon Horman:

* ape6evm board
  - Configure GPIO keys as wake-up source
  - Enable pull-up for GPIO switches
  - Correct polarity of LEDs
* r8a7791 SoC
  - Correct IPMMU-GP clock to device tree
* r8a7794 SoC
  - Correct ethernet controller PHY IRQ
* lager, koelsch and marzen boards
  - Add DU external pixel clock to DT
* lager board
  - Add HDMI output support to DT
* r8a7791 and r8a7790 SoCs
  - Tidy up SDHI register size in DT
  - Reference DMA channels for SDHI in DT

* tag 'renesas-dt2-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: ape6evm dts: Configure the custom switch as wake-up source
  ARM: shmobile: ape6evm dts: Enable pull-up for GPIO switches
  ARM: shmobile: r8a7791: Fix IPMMU-GP clock to device tree
  ARM: shmobile: r8a7794: alt: Fix ethernet controller PHY IRQ line
  ARM: shmobile: lager: Add DU external pixel clocks to DT
  ARM: shmobile: koelsch: Add DU external pixel clocks to DT
  ARM: shmobile: marzen: Add DU external pixel clock to DT
  ARM: shmobile: ape6evm dts: Fix polarity of LEDs
  ARM: shmobile: lager: Add DU HDMI output support
  ARM: shmobile: r8a7791: Fix HSUSB clock to hp_clk from mp_clk
  ARM: shmobile: r8a7790: Fix HSUSB clock to hp_clk from mp_clk
  ARM: shmobile: r8a7791: tidyup SDHI register size on DTSI
  ARM: shmobile: r8a7790: tidyup SDHI register size on DTSI
  ARM: shmobile: r8a7791: Reference DMA channels in SDHI DT nodes
  ARM: shmobile: r8a7790: Reference DMA channels in SDHI DT nodes

9 years agoMerge tag 'mvebu-dt-4.1' of git://git.infradead.org/linux-mvebu into next/dt
Arnd Bergmann [Wed, 11 Mar 2015 21:53:16 +0000 (22:53 +0100)]
Merge tag 'mvebu-dt-4.1' of git://git.infradead.org/linux-mvebu into next/dt

Pull "mvebu dt changes for v4.1 (part #1)" from Gregory CLEMENT:

- fix SDHCI nodes on Armada 38x
- add Linksys WRT1900AC (Mamba) support (including the Ethernet switch)
- add several fixes and improvement for dove
- enable GPIO fan alarm support for 2Big Network v2
- add several fixes about unit address
- add support for Armada 39x SoC and board

* tag 'mvebu-dt-4.1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add Device Tree files for Armada 39x SoC and board
  ARM: mvebu: fix unit address of MPIC nodes
  ARM: mvebu: use stdout-path in all armada-*.dts
  ARM: mvebu: add serial port aliases on Armada 370/375/38x/XP
  ARM: mvebu: remove aliases for Ethernet devices on Armada 370/375/38x/XP
  ARM: mvebu: add UART labels to Armada 375
  ARM: mvebu: add missing UART labels on Armada 38x
  ARM: mvebu: fix usb@ unit address on Armada 38x to match register address
  ARM: mvebu: a385-db-ap: Enable the NAND
  ARM: ARMADA XP: WRT1900AC: Add support for the Ethernet switch
  ARM: Kirkwood: enable GPIO fan alarm support for 2Big Network v2
  ARM: mvebu: Fix MPIC unit address
  ARM: dts: dove: Add some more common pinctrl settings
  ARM: dts: dove: Add node labels for PCIe ports 0 and 1
  ARM: dts: dove: Always include gpio and interrupt-controller headers
  ARM: dts: dove: Fix uart[23] reg property
  ARM: mvebu: add Linksys WRT1900AC (Mamba) support
  ARM: mvebu: Add Device Tree description of SDHCI for Armada 388 RD
  ARM: mvebu: Update the SDHCI node on Armada 38x
  ARM: mvebu: Use macros for interrupt flags on Armada 38x sdhci node

9 years agoMerge tag 'arm-soc/for-4.1/devicetree' of http://github.com/broadcom/stblinux into...
Arnd Bergmann [Wed, 11 Mar 2015 21:51:11 +0000 (22:51 +0100)]
Merge tag 'arm-soc/for-4.1/devicetree' of github.com/broadcom/stblinux into next/dt

Pull "Broadcom Device Tree changes for 4.1 #1" from Florian Fainelli:

This pull request contains the following Broadcom SoCs Device Tree changes:

- Jonathan adds support for the Broadcom Cygnus BCM958305K board

- Rafal adds support for Netgear R8000 and fixes the default for power LEDs
  on Netgear R6250

* tag 'arm-soc/for-4.1/devicetree' of http://github.com/broadcom/stblinux:
  ARM: BCM5301X: Fix default state of power LEDs on Netgear R6250
  ARM: BCM5301X: Add DT for Netgear R8000
  ARM: dts: Enable Broadcom Cygnus BCM958305K

9 years agoMerge tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux...
Arnd Bergmann [Wed, 11 Mar 2015 21:48:55 +0000 (22:48 +0100)]
Merge tag 'at91-dt' of git://git./linux/kernel/git/nferre/linux-at91 into next/dt

Pull "First batch of DT changes for 4.1" into next/dt:

- at91sam9x5 & EK board: ISI and camera sensors
- at91sam9n12 & EK board: USB gadget nodes
- sama5d3: typos, gpio-keys on Xplained board
- sama5d4: i2c, leds, audio, ISI, crypto, pwm missing nodes
- new sama5d4 xplained board

* tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: (31 commits)
  ARM: at91/dt: sama5d4: add ISI dt support
  ARM: at91/dt: sama5d4: add pwm0 device node
  ARM: at91/dt: sama5d4: add aes, sha and tdes nodes
  ARM: at91: dt: sama5d4ek: enable audio
  ARM: at91: dt: sama5d4ek: add and enable wm8904
  ARM: at91: dt: sama5d4ek: enable ssc0
  ARM: at91: dt: sama5d4: add ssc nodes
  ARM: at91/dt: sama5d4 xplained: add i2c0
  ARM: at91/dt: sama5d4: add dts for sama5d4 xplained board
  ARM: at91/dt: sama5d4: add #{address, size}_cells properties for macb0
  ARM: at91/dt: sama5d4ek: add leds in DT node
  ARM: at91/dt: add i2c1 declaration to sama5d4
  ARM: at91/dt: gpio-keys: address-cells and size-cells properties are not needed
  ARM: at91/dt: at91-sama5d3_xplained: add gpio-key pinctrl property
  ARM: at91/dt/trivial: correct file headers for SAMA5D3 SoC peripherals
  ARM: at91/dt: at91sam9n12ek: enable udp
  ARM: at91/dt: at91sam9n12: add udp device node
  ARM: at91: at91sam9g25ek/dts: enable ISI and ov2640
  ARM: at91: at91sam9x5ek/dts: add ov2640 support
  ARM: at91: at91sam9x5/dts: add ISI dt support, include isi node, pinctrls
  ...

9 years agoARM: shmobile: r8a7791: sound enables Audio DMAC entry on DTSI
Kuninori Morimoto [Tue, 10 Mar 2015 01:40:27 +0000 (01:40 +0000)]
ARM: shmobile: r8a7791: sound enables Audio DMAC entry on DTSI

This patch adds Audio DMAC (= rcar-dmac) entry for sound

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: sound enables Audio DMAC entry on DTSI
Kuninori Morimoto [Tue, 10 Mar 2015 01:40:13 +0000 (01:40 +0000)]
ARM: shmobile: r8a7790: sound enables Audio DMAC entry on DTSI

This patch adds Audio DMAC (= rcar-dmac) entry for sound

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: enable Audio DMAC peri peri via sound driver
Kuninori Morimoto [Tue, 10 Mar 2015 01:39:55 +0000 (01:39 +0000)]
ARM: shmobile: r8a7791: enable Audio DMAC peri peri via sound driver

Audio DMAC peri peri is no longer DMAEngine. it is supported by
sound driver. this patch enable it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: enable Audio DMAC peri peri via sound driver
Kuninori Morimoto [Tue, 10 Mar 2015 01:39:39 +0000 (01:39 +0000)]
ARM: shmobile: r8a7790: enable Audio DMAC peri peri via sound driver

Audio DMAC peri peri is no longer DMAEngine. it is supported by
sound driver. this patch enable it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7791: add reg-names for sound
Kuninori Morimoto [Tue, 10 Mar 2015 01:39:18 +0000 (01:39 +0000)]
ARM: shmobile: r8a7791: add reg-names for sound

Rensas R-Car sound driver supports reg-names.
Let's use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: r8a7790: add reg-names for sound
Kuninori Morimoto [Tue, 10 Mar 2015 01:39:01 +0000 (01:39 +0000)]
ARM: shmobile: r8a7790: add reg-names for sound

Rensas R-Car sound driver supports reg-names.
Let's use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: dts: cygnus: enable GPIO based hook detection
Ray Jui [Mon, 9 Mar 2015 20:45:02 +0000 (13:45 -0700)]
ARM: dts: cygnus: enable GPIO based hook detection

This enables GPIO based phone hook detection for Broadcom BCM911360
phone factor board (bcm911360_entphn)

Signed-off-by: Ray Jui <rjui@broadcom.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
9 years agoARM: dts: enable GPIO for Broadcom Cygnus
Ray Jui [Mon, 9 Mar 2015 20:45:01 +0000 (13:45 -0700)]
ARM: dts: enable GPIO for Broadcom Cygnus

This enables all 3 GPIO controllers including the ASIU GPIO, the
chipcommonG GPIO, and the ALWAYS-ON GPIO, for Broadcom Cygnus SoC

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
Tested-by: Dmitry Torokhov <dtor@chromium.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
9 years agoARM: dts: enable IOMUX for Broadcom Cygnus
Ray Jui [Mon, 9 Mar 2015 20:44:58 +0000 (13:44 -0700)]
ARM: dts: enable IOMUX for Broadcom Cygnus

This enables the IOMUX support for Broadcom Cygnus SoC

Signed-off-by: Ray Jui <rjui@broadcom.com>
Tested-by: Dmitry Torokhov <dtor@chromium.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
9 years agoARM: dts: rockchip: add input supplies for the act8846 on Radxa Rock
Heiko Stuebner [Sat, 7 Mar 2015 14:14:59 +0000 (15:14 +0100)]
ARM: dts: rockchip: add input supplies for the act8846 on Radxa Rock

On the Radxa Rock board most supplies come from the static 5v vsys supply, but
the inl1-supply comes from the REG4 of the act8846 itself. Model this dependency
using the added supply-handling to make sure the supplying regulator gets handled
correctly and not accidentially turned off.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
9 years agoARM: BCM5301X: Fix default state of power LEDs on Netgear R6250
Rafał Miłecki [Fri, 20 Feb 2015 10:22:05 +0000 (11:22 +0100)]
ARM: BCM5301X: Fix default state of power LEDs on Netgear R6250

We want green LED to be enabled by default.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
9 years agoARM: BCM5301X: Add DT for Netgear R8000
Rafał Miłecki [Wed, 18 Feb 2015 11:25:42 +0000 (12:25 +0100)]
ARM: BCM5301X: Add DT for Netgear R8000

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Reported-by: Ian Kent <raven@themaw.net>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
9 years agoARM: shmobile: ape6evm dts: Configure the custom switch as wake-up source
Geert Uytterhoeven [Fri, 27 Feb 2015 17:48:39 +0000 (18:48 +0100)]
ARM: shmobile: ape6evm dts: Configure the custom switch as wake-up source

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agoARM: shmobile: ape6evm dts: Enable pull-up for GPIO switches
Geert Uytterhoeven [Fri, 27 Feb 2015 17:48:38 +0000 (18:48 +0100)]
ARM: shmobile: ape6evm dts: Enable pull-up for GPIO switches

The switches on r8a73a4/ape6evm do not have pull-up registers.  The
schematics say: "Need to use APE6 internal PullUp", hence enable pull-up
using pinctrl.

Without this, the switches don't really work, as the GPIO inputs are
more likely to pick up ghost signals through capacitive coupling than
actual keypresses.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
9 years agodevicetree: Add TI-NSPIRE USB OTG support to device tree
Daniel Tang [Mon, 9 Feb 2015 08:41:57 +0000 (19:41 +1100)]
devicetree: Add TI-NSPIRE USB OTG support to device tree

Signed-off-by: Daniel Tang <dt.tangr@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
9 years agoMerge tag 'for-v4.0-rc/meson-dts' of https://github.com/carlocaione/linux-meson into...
Arnd Bergmann [Wed, 4 Mar 2015 22:02:49 +0000 (23:02 +0100)]
Merge tag 'for-v4.0-rc/meson-dts' of https://github.com/carlocaione/linux-meson into next/dt

Pull "meson DTS changes" from Carlo Caione:

- New DTS for MINIX NEO-X8
- Add DTS support for SPIFC, Ethernet controller and pinctrl

* tag 'for-v4.0-rc/meson-dts' of https://github.com/carlocaione/linux-meson:
  ARM: dts: meson: add DTS file for MINIX NEO-X8
  ARM: dts: meson8: add pinctrl node
  ARM: dts: meson: enable Ethernet controller
  ARM: dts: meson: add node for SPIFC

9 years agoMerge tag 'renesas-dt-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git...
Arnd Bergmann [Wed, 4 Mar 2015 21:59:23 +0000 (22:59 +0100)]
Merge tag 'renesas-dt-for-v4.1' of git://git./linux/kernel/git/horms/renesas into next/dt

Pull "Renesas ARM Based SoC DT Updates for v4.1" from Simon Horman:

* Increase hardware coverage of DT for various SoCs
* Add PFC information for emev2 SoC
* Remap entire APMU region for r8a7791 and r8a7790 SoCs
* Declare the full 512 MiB of RAM for kzm9g board
* Add selectable sources to DIV6 clocks to sh73a0 SoC
* Add missing INTCA0 clock for irqpin module on sh73a0 SoC
* Set control-parent for all irqpin node on sh73a0 SoC

* tag 'renesas-dt-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (32 commits)
  ARM: shmobile: r8a7794: add SDHI DT support
  ARM: shmobile: r8a7790: add ADSP clocks
  ARM: shmobile: r8a7791: add ADSP clocks
  ARM: shmobile: henninger: add CAN0 DT support
  ARM: shmobile: r8a7791: add CAN DT support
  ARM: shmobile: r8a7791: add CAN clocks
  ARM: shmobile: r8a7790: add CAN DT support
  ARM: shmobile: r8a7790: add CAN clocks
  ARM: shmobile: emev2-kzm9d dts: Add PFC information for uart1
  ARM: shmobile: emev2 dtsi: Add PFC information
  ARM: shmobile: r8a7791: smp: remap whole apmu region
  ARM: shmobile: r8a7790: smp: remap whole apmu region
  ARM: shmobile: koelsch: Add DU HDMI output support
  ARM: shmobile: r8a7791: Correct SDHI clock labels and output-names
  ARM: shmobile: r8a7794: Correct SDHI clock base address, labels and output-names
  ARM: shmobile: r8a7794: alt: Enable ethernet controller
  ARM: shmobile: r8a7794: Add ethernet controller to device tree
  ARM: shmobile: r8a7794: Add IPMMU DT nodes
  ARM: shmobile: r8a7791: Add IPMMU DT nodes
  ARM: shmobile: r8a7790: Add IPMMU DT nodes
  ...

9 years agoARM: dts: add rk3288 PopMetal board
Andy Yan [Sun, 1 Mar 2015 09:32:33 +0000 (17:32 +0800)]
ARM: dts: add rk3288 PopMetal board

PopMetal is a rockchip rk3288 based board made by ChipSpark,
which has many interface such as VGA,HDMI,usb,ir,sdcad and lots of
sensors such as gyroscope(L3G4200D),accelerometer(mma8452),
compass(AK8963C).

This patch add a basic support for this board, which make the board
boot into a initramfs shell with sdcard,hdmi and all sensors enabled

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
9 years agodt-bindings: add root compatible property for PopMetal board
Andy Yan [Sun, 1 Mar 2015 09:28:24 +0000 (17:28 +0800)]
dt-bindings: add root compatible property for PopMetal board

PopMetal board is a rk3288 based board made by ChipSpark, this
add root compatible property for it

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
9 years agoARM: at91/dt: sama5d4: add ISI dt support
Josh Wu [Fri, 23 Jan 2015 08:38:03 +0000 (16:38 +0800)]
ARM: at91/dt: sama5d4: add ISI dt support

Add ISI dt node and pinctrl settings in sama5d4.dtsi.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
[nicolas.ferre@atmel.com: sort nodes in order. remove useless comments]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: sama5d4: add pwm0 device node
Bo Shen [Fri, 9 Jan 2015 16:11:05 +0000 (17:11 +0100)]
ARM: at91/dt: sama5d4: add pwm0 device node

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: sama5d4: add aes, sha and tdes nodes
Leilei Zhao [Fri, 9 Jan 2015 15:58:57 +0000 (16:58 +0100)]
ARM: at91/dt: sama5d4: add aes, sha and tdes nodes

Signed-off-by: Leilei Zhao <leilei.zhao@atmel.com>
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91: dt: sama5d4ek: enable audio
Bo Shen [Mon, 2 Feb 2015 06:51:47 +0000 (14:51 +0800)]
ARM: at91: dt: sama5d4ek: enable audio

Enable audio support for sama5d4ek board.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91: dt: sama5d4ek: add and enable wm8904
Bo Shen [Mon, 2 Feb 2015 06:51:46 +0000 (14:51 +0800)]
ARM: at91: dt: sama5d4ek: add and enable wm8904

Add wm8904 codec node and enable it.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91: dt: sama5d4ek: enable ssc0
Bo Shen [Mon, 2 Feb 2015 06:51:45 +0000 (14:51 +0800)]
ARM: at91: dt: sama5d4ek: enable ssc0

Enable SSC0 node, which will be used for audio.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91: dt: sama5d4: add ssc nodes
Bo Shen [Mon, 2 Feb 2015 06:51:44 +0000 (14:51 +0800)]
ARM: at91: dt: sama5d4: add ssc nodes

Add SSC 0 and 1 nodes.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: sama5d4 xplained: add i2c0
Nicolas Ferre [Thu, 26 Feb 2015 15:05:14 +0000 (16:05 +0100)]
ARM: at91/dt: sama5d4 xplained: add i2c0

Add i2c0 aka twi0 on sama5d4 xplained board.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: sama5d4: add dts for sama5d4 xplained board
Josh Wu [Wed, 4 Mar 2015 02:51:48 +0000 (10:51 +0800)]
ARM: at91/dt: sama5d4: add dts for sama5d4 xplained board

Add at91 sama5d4 xplained board support.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: sama5d4: add #{address, size}_cells properties for macb0
Josh Wu [Wed, 4 Mar 2015 02:51:47 +0000 (10:51 +0800)]
ARM: at91/dt: sama5d4: add #{address, size}_cells properties for macb0

macb0 DT node can have phy child nodes, so add the #{address,
size}_cells for macb0 node.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: sama5d4ek: add leds in DT node
Josh Wu [Mon, 9 Feb 2015 09:40:20 +0000 (17:40 +0800)]
ARM: at91/dt: sama5d4ek: add leds in DT node

Add the leds DT node in the dts file.
In the leds, d10 is set as heartbeat led.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: add i2c1 declaration to sama5d4
Philip Attfield [Fri, 6 Feb 2015 13:52:56 +0000 (14:52 +0100)]
ARM: at91/dt: add i2c1 declaration to sama5d4

Add alias, node declaration and pinctrl for i2c1 (aka: twi1).

Signed-off-by: Philip Attfield <phil.attfield@seqlabs.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: gpio-keys: address-cells and size-cells properties are not needed
Nicolas Ferre [Wed, 4 Mar 2015 17:31:03 +0000 (18:31 +0100)]
ARM: at91/dt: gpio-keys: address-cells and size-cells properties are not needed

Gpio-keys nodes are not using the "reg" property in their sub nodes.
So, there is no need to define #address-cells and #size-cells properties
in gpio-keys nodes: we remove them in these new boards.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: at91-sama5d3_xplained: add gpio-key pinctrl property
Wenyou Yang [Wed, 13 Aug 2014 04:58:21 +0000 (12:58 +0800)]
ARM: at91/dt: at91-sama5d3_xplained: add gpio-key pinctrl property

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt/trivial: correct file headers for SAMA5D3 SoC peripherals
Nicolas Ferre [Wed, 4 Mar 2015 16:56:03 +0000 (17:56 +0100)]
ARM: at91/dt/trivial: correct file headers for SAMA5D3 SoC peripherals

File name had at91 prefix, which is not the case anymore for SAMA5D3.
AT91SAM9x5 was mentioned instead of SAMA5D3 SoC.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: at91sam9n12ek: enable udp
Bo Shen [Tue, 10 Feb 2015 01:55:35 +0000 (09:55 +0800)]
ARM: at91/dt: at91sam9n12ek: enable udp

Enable usb device port on at91sam9n12ek board.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: at91sam9n12: add udp device node
Bo Shen [Tue, 10 Feb 2015 01:55:34 +0000 (09:55 +0800)]
ARM: at91/dt: at91sam9n12: add udp device node

Add usb device node for at91sam9n12.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91: at91sam9g25ek/dts: enable ISI and ov2640
Josh Wu [Thu, 12 Feb 2015 08:06:25 +0000 (16:06 +0800)]
ARM: at91: at91sam9g25ek/dts: enable ISI and ov2640

Enable ISI and ov2640 for at91sam9g25ek board.
Meantime, we need to disable the mmc1 and spi0 as they have pin conflict
with ISI.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91: at91sam9x5ek/dts: add ov2640 support
Josh Wu [Thu, 12 Feb 2015 08:06:24 +0000 (16:06 +0800)]
ARM: at91: at91sam9x5ek/dts: add ov2640 support

Add the camera sensor ov2640 dt support. And connect sensor to isi node
as well.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91: at91sam9x5/dts: add ISI dt support, include isi node, pinctrls
Josh Wu [Thu, 12 Feb 2015 08:06:23 +0000 (16:06 +0800)]
ARM: at91: at91sam9x5/dts: add ISI dt support, include isi node, pinctrls

Add a new file: at91sam9x5_isi.dtsi, which includes ISI node and
pinctrls.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: mvebu: add Device Tree files for Armada 39x SoC and board
Thomas Petazzoni [Tue, 3 Mar 2015 14:41:12 +0000 (15:41 +0100)]
ARM: mvebu: add Device Tree files for Armada 39x SoC and board

This commit adds the Device Tree files for the Armada 39x family of
processors, as well as one Armada 398 Development Board.

Like for other Marvell EBU families, a common armada-39x.dtsi contains
the description of the common features of all Armada 39x SoCs, while
armada-390.dtsi and armada-398.dtsi respectively describe the
specificities of those SoCs.

Finally, an armada-398-db.dts file is added to describe the Armada 398
Development Board itself.

So far, the following features are supported:

 * SMP: dual Cortex-A9
 * Basic ARM IPs: SCU, timer, GIC, L2 cache
 * Basic Marvell IPs: pin-muxing, clocks, system controller, MBus
   controller, MPIC interrupt controller, timer, CPU reset for SMP,
   PMSU.
 * I2C
 * SPI
 * SDHCI
 * XOR
 * NAND
 * UART
 * PCIe

Additional features will be supported in the future.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoMerge tag 'at91-fixes' into at91-4.1-dt
Nicolas Ferre [Wed, 4 Mar 2015 14:17:23 +0000 (15:17 +0100)]
Merge tag 'at91-fixes' into at91-4.1-dt

First fixes batch for AT91 on 4.0:
- PM slowclock fixes for DDR and timeouts
- fix some DT entries
- little defconfig updates
- the removal of a harmful watchdog option + its detailed documentation

9 years agoARM: mvebu: fix unit address of MPIC nodes
Thomas Petazzoni [Tue, 3 Mar 2015 14:41:03 +0000 (15:41 +0100)]
ARM: mvebu: fix unit address of MPIC nodes

The Device Tree nodes describing the MPIC nodes on Armada 370, 375,
38x and XP had a unit address that did not match the first reg
property, as suggested by the ePAPR. This commit fixes that.

[gregory.clement@free-electrons.com: removed the armada-38x part, as it
was already applied by a previous patch]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoARM: mvebu: use stdout-path in all armada-*.dts
Thomas Petazzoni [Tue, 3 Mar 2015 14:41:02 +0000 (15:41 +0100)]
ARM: mvebu: use stdout-path in all armada-*.dts

This commit adds the stdout-path property in /chosen for all Armada
boards that were not yet carrying this property, and gets rid of
/chosen/bootargs which becomes unneeded: earlyprintk should not be
used by default, and the console= parameter is replaced by the
/chosen/stdout-path property.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoARM: mvebu: add serial port aliases on Armada 370/375/38x/XP
Thomas Petazzoni [Tue, 3 Mar 2015 14:41:01 +0000 (15:41 +0100)]
ARM: mvebu: add serial port aliases on Armada 370/375/38x/XP

This commit adds 'serialX' aliases for the various serial ports on
Armada 370, 375, 38x and XP platforms. It will allow the usage of the
stdout-path property.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoARM: mvebu: remove aliases for Ethernet devices on Armada 370/375/38x/XP
Thomas Petazzoni [Tue, 3 Mar 2015 14:41:00 +0000 (15:41 +0100)]
ARM: mvebu: remove aliases for Ethernet devices on Armada 370/375/38x/XP

Having aliases for Ethernet devices is useless, since the networking
subsystem unfortunately doesn't care about aliases to name network
interfaces.

Note that the 'aliases' nodes in armada-370-xp.dtsi and armada-xp.dtsi
become empty, but that we keep it as is since a followup patch will
re-add some aliases to it.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoARM: mvebu: add UART labels to Armada 375
Thomas Petazzoni [Tue, 3 Mar 2015 14:40:59 +0000 (15:40 +0100)]
ARM: mvebu: add UART labels to Armada 375

This commit adds the standard uart0 and uart1 DT labels to the Device
Tree description of the Marvell Armada 375 SoC.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoARM: mvebu: add missing UART labels on Armada 38x
Thomas Petazzoni [Tue, 3 Mar 2015 14:40:58 +0000 (15:40 +0100)]
ARM: mvebu: add missing UART labels on Armada 38x

The Armada 38x had a label for UART0, but not UART1. This commit fixes
that.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoARM: mvebu: fix usb@ unit address on Armada 38x to match register address
Thomas Petazzoni [Tue, 3 Mar 2015 14:40:57 +0000 (15:40 +0100)]
ARM: mvebu: fix usb@ unit address on Armada 38x to match register address

On Marvell Armada 38x, the USB2 controller registers are at 0x58000,
so the corresponding Device Tree node should have a unit address of
58000, and not 50000. We were using 50000 due to an incorrect
copy/pastebin of Armada 370/XP code.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoARM: mvebu: a385-db-ap: Enable the NAND
Maxime Ripard [Tue, 3 Mar 2015 10:16:45 +0000 (11:16 +0100)]
ARM: mvebu: a385-db-ap: Enable the NAND

The Armada 385 Access Point Development Board has a 1GB NAND SLC chip from
Micron as its main storage. Enable it.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoARM: ARMADA XP: WRT1900AC: Add support for the Ethernet switch
Andrew Lunn [Sat, 28 Feb 2015 20:20:48 +0000 (21:20 +0100)]
ARM: ARMADA XP: WRT1900AC: Add support for the Ethernet switch

Add a DSA section to the DT blob representing the Ethernet switch.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoARM: Kirkwood: enable GPIO fan alarm support for 2Big Network v2
Simon Guinot [Wed, 25 Feb 2015 18:00:19 +0000 (19:00 +0100)]
ARM: Kirkwood: enable GPIO fan alarm support for 2Big Network v2

On the LaCie 2Big Network v2 (net2big_v2) board, the fan alarm is not
wired to the I2C fan controller but to a separe GPIO. This GPIO can be
controlled by using the gpio-fan driver.

This patch adds the gpio-fan alarm description in the net2big_v2 DTS.

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoARM: mvebu: Fix MPIC unit address
Maxime Ripard [Thu, 26 Feb 2015 09:51:17 +0000 (10:51 +0100)]
ARM: mvebu: Fix MPIC unit address

The unit-address is supposed to be equal the first reg address, which is not
the case for the MPIC, that uses the mbus-controller one. Fix this.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoARM: dts: dove: Add some more common pinctrl settings
Sebastian Hesselbarth [Tue, 17 Feb 2015 18:52:07 +0000 (19:52 +0100)]
ARM: dts: dove: Add some more common pinctrl settings

This add common pinctrl settings for pcie[01]_clkreq, spi1, i2c[23],
and internal i2c mux. These settings have either one or two options
only, so put them into the SoC dtsi instead of repeating them on
board level.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
9 years agoARM: at91/dt: keep watchdog running in idle mode
Michel Marti [Tue, 23 Dec 2014 11:41:43 +0000 (12:41 +0100)]
ARM: at91/dt: keep watchdog running in idle mode

Since turning on idle-halt in commit fe46aa679f12 (ARM: at91/dt: add
sam9 watchdog default options to SoCs), SoCs compatible with at91sam9260-wdt
no longer reboot if the watchdog times out while the CPU is in idle state.
Removing the 'idle-halt' flag that was set by default fixes this.

Signed-off-by: Michel Marti <mma@objectxp.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
[nicolas.ferre@atmel.com: rework the commit message]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agodts: Documentation: AT91 Watchdog, explain what atmel,idle-halt property really do
Sylvain Rochet [Sun, 18 Jan 2015 13:26:50 +0000 (14:26 +0100)]
dts: Documentation: AT91 Watchdog, explain what atmel,idle-halt property really do

atmel,idle-halt property should be used with care, it actually makes the
watchdog not counting when the CPU is in idle state, therefore the
watchdog reset time depends on mean CPU usage and will not reset at all
of the CPU stop working while it is in idle state, which is probably not
what you want.

Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/defconfig: add at91rm9200 ethernet support
Alexandre Belloni [Mon, 5 Jan 2015 11:53:02 +0000 (12:53 +0100)]
ARM: at91/defconfig: add at91rm9200 ethernet support

There is now only one defconfig for the at91rm9200 and at91sam9. Add ethernet
support for the at91rm9200.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/defconfig: remove CONFIG_SYSFS_DEPRECATED
Anthony Harivel [Thu, 5 Feb 2015 21:59:36 +0000 (22:59 +0100)]
ARM: at91/defconfig: remove CONFIG_SYSFS_DEPRECATED

Recent distributions and userspace tools after 2009/2010 depend on
the existence of /sys/class/block/, and will not work with this option enabled.

Signed-off-by: Anthony Harivel <anthony.harivel@emtrion.de>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: at91sam9260: fix usart pinctrl
Jonas Andersson [Fri, 30 Jan 2015 11:25:10 +0000 (12:25 +0100)]
ARM: at91/dt: at91sam9260: fix usart pinctrl

Corrected pins used by usart3.

Signed-off-by: Jonas Andersson <jonas@microbit.se>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: sama5d4: add missing alias for i2c0
Nicolas Ferre [Fri, 6 Feb 2015 14:22:12 +0000 (15:22 +0100)]
ARM: at91/dt: sama5d4: add missing alias for i2c0

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91/dt: at91sam9263: Fixup sram1 device tree node
Alexander Stein [Wed, 25 Feb 2015 08:35:04 +0000 (09:35 +0100)]
ARM: at91/dt: at91sam9263: Fixup sram1 device tree node

Commit ff04660e48b20 ("ARM: at91/dt: add SRAM nodes") used the same base
address for sram0 and sram1 leading to the following warning:
WARNING: CPU: 0 PID: 1 at fs/sysfs/dir.c:31 sysfs_warn_dup+0x50/0x70()
sysfs: cannot create duplicate filename '/devices/platform/300000.sram'
Fix the base address for sram1.

Signed-off-by: Alexander Stein <alexanders83@web.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
9 years agoARM: at91: pm: fix SRAM allocation
Alexandre Belloni [Tue, 3 Mar 2015 07:38:07 +0000 (08:38 +0100)]
ARM: at91: pm: fix SRAM allocation

On some platforms, there are multiple SRAM nodes defined in the device tree but
some of them are disabled, leading to allocation failure. Try to find the first
enabled SRAM node and allocate from it.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Tested-by: Wenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>