]> git.openfabrics.org - ~shefty/rdma-dev.git/log
~shefty/rdma-dev.git
9 years agoMerge branch 'orion/dt' into next/dt
Olof Johansson [Mon, 26 Nov 2012 09:27:27 +0000 (01:27 -0800)]
Merge branch 'orion/dt' into next/dt

Merge in orion's cleanup branch together with the DT contents.  Ideally
the cleanup branch should have been the base for the DT branch to avoid
these, but that was missed when first merging. So we're doing it now to
reduce the amount of silly conflicts due to internal tree organization.

Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoMerge branch 'orion/cleanup' into orion/dt
Olof Johansson [Mon, 26 Nov 2012 09:26:14 +0000 (01:26 -0800)]
Merge branch 'orion/cleanup' into orion/dt

Merge in the cleanups that should have been used as the base of the DT
branch instead of letting the conflicts be exposed all the way up to
the toplevel merges.

All of these are caused by cleanups being done both in the cleanup branch
and the dt branch, resulting in remove/remove conflicts of header files.

By Andrew Lunn (3) and others
via Jason Cooper
* orion/cleanup:
  ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
  ARM: Kirkwood: checkpatch cleanups
  ARM: Kirkwood: Fix sparse warnings.
  ARM: Kirkwood: Remove unused includes
  ARM: kirkwood: cleanup lsxl board includes

Remove/remove conflicts in:
arch/arm/mach-kirkwood/board-dockstar.c
arch/arm/mach-kirkwood/board-goflexnet.c
arch/arm/mach-kirkwood/board-lsxl.c

Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoMerge tag 'orion_dt_for_3.8' of git://git.infradead.org/users/jcooper/linux into...
Olof Johansson [Mon, 26 Nov 2012 09:09:30 +0000 (01:09 -0800)]
Merge tag 'orion_dt_for_3.8' of git://git.infradead.org/users/jcooper/linux into next/dt

From Jason Cooper:
orion dt for v3.8

 - ehci-orion dt binding
 - gpio-poweroff
 - use dt regulators
 - move mpp to DT/pinctrl

Depends on:

 - orion/boards

    - merge conflicts
       - keep all 'select's in Kconfig
       - remove all #includes in board-*.c

 - pinctrl/devel up to:

    - 06763c7 pinctrl: mvebu: move to its own directory

* tag 'orion_dt_for_3.8' of git://git.infradead.org/users/jcooper/linux: (211 commits)
  ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
  ARM: Kirkwood: Add support LED of OpenBlocks A6
  ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
  ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
  ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
  ARM: kirkwood: Add support DT of second I2C bus
  ARM: kirkwood: Convert mplcec4 board to pinctrl
  ARM: Kirkwood: Convert km_kirkwood to pinctrl
  ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
  ARM: Kirkwood: Convert IX2-200 to pinctrl.
  ARM: Kirkwood: Convert lsxl boards to pinctrl.
  ARM: Kirkwood: Convert ib62x0 to pinctrl.
  ARM: Kirkwood: Convert GoFlex Net to pinctrl.
  ARM: Kirkwood: Convert dreamplug to pinctrl.
  ARM: Kirkwood: Convert dockstar to pinctrl.
  ARM: Kirkwood: Convert dnskw to pinctrl
  ARM: Kirkwood: Convert iConnect to pinctrl.
  ARM: Kirkwood: Convert TS219 to pinctrl.
  ARM: Kirkwood: Add DTSI files for pinctrl
  ARM: Kirkwood: Make use of mvebu pincltl and gpio drivers
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoMerge branch 'next/dt-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
Olof Johansson [Mon, 26 Nov 2012 08:06:23 +0000 (00:06 -0800)]
Merge branch 'next/dt-samsung-2' of git://git./linux/kernel/git/kgene/linux-samsung into next/dt

From Kukjin Kim:
Here is second Samsung DT stuff for v3.8.

This is including power domain DT support for exynos and Google ARM
Chromebook, Snow board and exynos4210-origen updates.

* 'next/dt-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Use drive strength 3 for SD pins for exynos4
  ARM: dts: Set up power domains for exynos4
  ARM: EXYNOS: Bind devices to power domains using DT
  ARM: EXYNOS: Fix power domain name initialization
  ARM: EXYNOS: Detect power domain state on registration from DT
  ARM: dts: Add vmmc fixed voltage regulator for exynos4210-origen
  ARM: dts: Update sdhci nodes for current bindings for exynos4210-origen
  ARM: dts: Update for pinctrl-samsung driver for exynos4210-origen
  ARM: dts: Split memory sections for exynos4210-origen
  ARM: EXYNOS: add all i2c busses to auxdata for DT
  ARM: dts: Add aliases for i2c controller for exynos4
  ARM: dts: Add board dts file for Snow board (ARM Chromebook)
  ARM: dts: Move the dwmmc aliases from smdk5250 dts to exynos

Add/add conflicts resolved in arch/arm/boot/dts/exynos5250-smdk5250.dts
and arch/arm/mach-exynos/mach-exynos5-dt.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoMerge tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Olof Johansson [Mon, 26 Nov 2012 07:26:53 +0000 (23:26 -0800)]
Merge tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

From Shawn Guo:
They are a few mxs dts updates coming a little bit late.  I'm sending
them as the second mxs/dt pull request for 3.8.  Please consider to
pull.

* tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: mxs: add oled support for the cfa-10036
  ARM: mxs: Add SchulerControl SPS1 DTS file
  ARM: imx23-olinuxino: Add spi support

9 years agoARM: Kirkwood: remove kirkwood_ehci_init() from new boards
Jason Cooper [Sat, 24 Nov 2012 03:58:12 +0000 (03:58 +0000)]
ARM: Kirkwood: remove kirkwood_ehci_init() from new boards

ehci-orion initialization moved to DT.  New boards don't need to call
kirkwood_ehci_init().

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Add support LED of OpenBlocks A6
Nobuhiro Iwamatsu [Fri, 23 Nov 2012 20:24:09 +0000 (05:24 +0900)]
ARM: Kirkwood: Add support LED of OpenBlocks A6

OpenBlocks A6 has three leds via GPIO. This supports them.
And this fix typo about led, because hardware manual has typo.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
Nobuhiro Iwamatsu [Thu, 22 Nov 2012 21:30:12 +0000 (06:30 +0900)]
ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6

EHCI driver enables by default in kirkwood.dtsi.
This removes kirkwood_ehci_init function.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: kirkwood: Add NAND partiton map for OpenBlocks A6
Nobuhiro Iwamatsu [Thu, 22 Nov 2012 21:30:11 +0000 (06:30 +0900)]
ARM: kirkwood: Add NAND partiton map for OpenBlocks A6

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
Nobuhiro Iwamatsu [Thu, 22 Nov 2012 21:30:10 +0000 (06:30 +0900)]
ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6

OpenBlocks A6 uses second I2C with RTC of s35390a.
This supports them.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: kirkwood: Add support DT of second I2C bus
Nobuhiro Iwamatsu [Thu, 22 Nov 2012 21:58:34 +0000 (06:58 +0900)]
ARM: kirkwood: Add support DT of second I2C bus

Second I2C bus is supported by 88f6282 and 88f6283.
This creates kirkwood-6282.dtsi, and defines DT table
of second I2C bus.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: kirkwood: Convert mplcec4 board to pinctrl
Stefan Peter [Mon, 19 Nov 2012 15:00:02 +0000 (16:00 +0100)]
ARM: kirkwood: Convert mplcec4 board to pinctrl

Signed-off-by: Stefan Peter <s.peter@mpl.ch>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert km_kirkwood to pinctrl
Valentin Longchamp [Sat, 17 Nov 2012 16:00:56 +0000 (17:00 +0100)]
ARM: Kirkwood: Convert km_kirkwood to pinctrl

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
Valentin Longchamp [Sat, 17 Nov 2012 16:00:55 +0000 (17:00 +0100)]
ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl

The Marvell 98DX412x SoC embed a kirkwood variant that does not have
pinctrl support yet. Even though this kirkwood is very similar to the
88f6281, on the MPP front a lot of pins are not available. That's why a
new kirkwood pinctrl variant is needed.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert IX2-200 to pinctrl.
Andrew Lunn [Sat, 17 Nov 2012 16:00:54 +0000 (17:00 +0100)]
ARM: Kirkwood: Convert IX2-200 to pinctrl.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert lsxl boards to pinctrl.
Andrew Lunn [Sat, 17 Nov 2012 16:00:53 +0000 (17:00 +0100)]
ARM: Kirkwood: Convert lsxl boards to pinctrl.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert ib62x0 to pinctrl.
Andrew Lunn [Sat, 17 Nov 2012 16:00:52 +0000 (17:00 +0100)]
ARM: Kirkwood: Convert ib62x0 to pinctrl.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Simon Baatz <gmbnomis@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert GoFlex Net to pinctrl.
Andrew Lunn [Sat, 17 Nov 2012 16:00:51 +0000 (17:00 +0100)]
ARM: Kirkwood: Convert GoFlex Net to pinctrl.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Joshua Coombs <josh.coombs@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert dreamplug to pinctrl.
Andrew Lunn [Sat, 17 Nov 2012 16:00:50 +0000 (17:00 +0100)]
ARM: Kirkwood: Convert dreamplug to pinctrl.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert dockstar to pinctrl.
Andrew Lunn [Sat, 17 Nov 2012 16:00:49 +0000 (17:00 +0100)]
ARM: Kirkwood: Convert dockstar to pinctrl.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert dnskw to pinctrl
Andrew Lunn [Sat, 17 Nov 2012 16:00:48 +0000 (17:00 +0100)]
ARM: Kirkwood: Convert dnskw to pinctrl

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jamie Lentin <jm@lentin.co.uk>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert iConnect to pinctrl.
Andrew Lunn [Sat, 17 Nov 2012 16:00:47 +0000 (17:00 +0100)]
ARM: Kirkwood: Convert iConnect to pinctrl.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert TS219 to pinctrl.
Andrew Lunn [Sat, 17 Nov 2012 16:00:46 +0000 (17:00 +0100)]
ARM: Kirkwood: Convert TS219 to pinctrl.

Make use of the pinctrl driver for configuring all the pins, instead
of using the Orion mpp code.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Add DTSI files for pinctrl
Andrew Lunn [Sat, 17 Nov 2012 16:00:45 +0000 (17:00 +0100)]
ARM: Kirkwood: Add DTSI files for pinctrl

There are a couple of different variants of Kirkwood, which differ in
the pin muxing. These DTSI files set the correct compatibility and
define commonly used groups of pins, which board dbs files can
reference.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Make use of mvebu pincltl and gpio drivers
Andrew Lunn [Sat, 17 Nov 2012 16:00:44 +0000 (17:00 +0100)]
ARM: Kirkwood: Make use of mvebu pincltl and gpio drivers

Select the generic mvebu kirkwood pincltr driver and generic mvebu
gpio driver. This requires minor changes to the DT, and the calls to
configure plat-orion gpio driver are removed.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Michael Walle <michael@walle.cc>
Tested-by: Simon Baatz <gmbnomis@gmail.com>
Tested-by: Jamie Lentin <jm@lentin.co.uk>
Tested-by: Joshua Coombs <josh.coombs@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoGPIO: mvebu: Allow all plat-orion platforms.
Andrew Lunn [Sat, 17 Nov 2012 16:00:43 +0000 (17:00 +0100)]
GPIO: mvebu: Allow all plat-orion platforms.

Kirkwood & Dove can also use this driver, so expand the scope to
include all platform orion devices.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Dove: Add CuBox pinhog for led
Sebastian Hesselbarth [Mon, 19 Nov 2012 09:39:56 +0000 (10:39 +0100)]
ARM: Dove: Add CuBox pinhog for led

SolidRun CuBox has a led on a gpio pin. As there is now DT pinctrl
support for Dove, make use of a pinhog to ensure the pin is set to
gpio.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Dove: Convert to DT GPIO and pinctrl
Sebastian Hesselbarth [Mon, 19 Nov 2012 09:39:55 +0000 (10:39 +0100)]
ARM: Dove: Convert to DT GPIO and pinctrl

Following the ongoing conversion of Orion SoCs to DT, make use of
gpio and pinctrl drivers through DT. The main dtsi for Dove is prepared
to allow board specific descriptors to make use of pinctrl muxing.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agopinctrl: mvebu: Fix dove_audio1_ctrl_set function
Axel Lin [Mon, 19 Nov 2012 09:39:54 +0000 (10:39 +0100)]
pinctrl: mvebu: Fix dove_audio1_ctrl_set function

When setting audio1 pinmux the bits in the corresponding registers
are not cleared. This fix first clears all bits and then sets the
required bits according to the selected function.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agopinctrl: mvebu: fix iomem pointer for dove pinctrl
Sebastian Hesselbarth [Mon, 19 Nov 2012 09:39:53 +0000 (10:39 +0100)]
pinctrl: mvebu: fix iomem pointer for dove pinctrl

There has been a change in readl/writel to require registers
addresses marked as IOMEM(). This patch takes care of this and
also replaces ORing address offsets with adding them.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert LSXL to use regulators
Andrew Lunn [Sat, 17 Nov 2012 14:46:14 +0000 (15:46 +0100)]
ARM: Kirkwood: Convert LSXL to use regulators

Control the power to USB and HDD using a fixed regulator.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert GoFlexNet to use regulators
Andrew Lunn [Sat, 17 Nov 2012 14:46:13 +0000 (15:46 +0100)]
ARM: Kirkwood: Convert GoFlexNet to use regulators

Control the power to USB using a fixed regulator.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Josh Coombs <josh.coombs@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert Dockstar to use regulators
Andrew Lunn [Sat, 17 Nov 2012 14:46:12 +0000 (15:46 +0100)]
ARM: Kirkwood: Convert Dockstar to use regulators

Control the power to USB using a fixed regulator.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert DNSKW to use regulators
Andrew Lunn [Sat, 17 Nov 2012 14:46:11 +0000 (15:46 +0100)]
ARM: Kirkwood: Convert DNSKW to use regulators

Control the power to SATA0 and SATA1 using a fixed regulator.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Jamie Lentin <jm@lentin.co.uk>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Enable regulator and fixed regulators.
Andrew Lunn [Sat, 17 Nov 2012 14:46:10 +0000 (15:46 +0100)]
ARM: Kirkwood: Enable regulator and fixed regulators.

A few boards use a GPIO line to enable power to subsystems, eg USB or
SATA devices. Pull in the regulator framework as the first step to
controlling these GPIO lines are regulators.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert IB62x0 to use gpio-poweroff.
Andrew Lunn [Sat, 17 Nov 2012 08:51:06 +0000 (09:51 +0100)]
ARM: Kirkwood: Convert IB62x0 to use gpio-poweroff.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Simon Baatz <gmbnomis@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert DNSKW to use gpio-poweroff.
Andrew Lunn [Sat, 17 Nov 2012 08:51:05 +0000 (09:51 +0100)]
ARM: Kirkwood: Convert DNSKW to use gpio-poweroff.

Also enable the gpio-poweroff driver when DT is used.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Jamie Lentin <jm@lentin.co.uk>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agopower: Add simple poweroff-gpio driver
Jamie Lentin [Sat, 17 Nov 2012 08:51:04 +0000 (09:51 +0100)]
power: Add simple poweroff-gpio driver

Given appropriate devicetree bindings, this driver registers a
pm_power_off function to set a GPIO line high/low to power down
your board.

Signed-off-by: Jamie Lentin <jm@lentin.co.uk>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by:Simon Baatz <gmbnomis@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: kirkwood: Increase NAND chip-delay for DNS-32[05]
Jamie Lentin [Thu, 1 Nov 2012 21:57:01 +0000 (21:57 +0000)]
ARM: kirkwood: Increase NAND chip-delay for DNS-32[05]

The default chip-delay of 25us is a bit too tight for some DNS-320's,
and D-Link seem to specify 30us in their kernels for both devices.
Increase to 35us to make sure the NAND is stable.

Signed-off-by: Jamie Lentin <jm@lentin.co.uk>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Convert all DT boards to EHCI via DT.
Andrew Lunn [Sat, 20 Oct 2012 11:10:01 +0000 (13:10 +0200)]
ARM: Kirkwood: Convert all DT boards to EHCI via DT.

Now that the EHCI driver has DT support, drop old style configuration
of it and add DT in its place. Since all the boards enable the EHCI,
enable it by default in kirkwood.dtsi. Any new boards which don't have
USB can specifically disable it.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: ehci-orion: Add device tree binding
Andrew Lunn [Sat, 20 Oct 2012 11:10:00 +0000 (13:10 +0200)]
ARM: Kirkwood: ehci-orion: Add device tree binding

Based on previous work by Michael Walle and Jason Cooper.

Made their work actually work, which required added interrupt from DT
and auxdata, along with setting the dma_mask, which DT does not
currently do.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoMerge commit '06763c7' into orion/dt2
Jason Cooper [Sat, 24 Nov 2012 02:50:25 +0000 (02:50 +0000)]
Merge commit '06763c7' into orion/dt2

merge pinctrl/devel up to:

06763c7 pinctrl: mvebu: move to its own directory

9 years agoARM: kirkwood: Add Plat'Home OpenBlocks A6 support
Nobuhiro Iwamatsu [Tue, 13 Nov 2012 07:43:09 +0000 (16:43 +0900)]
ARM: kirkwood: Add Plat'Home OpenBlocks A6 support

Add support for Plat'Home OpenBlocks A6 using the device tree
where possible.
This commit supports SATA, USB, ether and serial console.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: dts: mxs: add oled support for the cfa-10036
Maxime Ripard [Wed, 31 Oct 2012 09:12:54 +0000 (10:12 +0100)]
ARM: dts: mxs: add oled support for the cfa-10036

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Brian Lilly <brian@crystalfontz.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
9 years agoARM: Dove: update defconfig
Sebastian Hesselbarth [Tue, 30 Oct 2012 01:11:45 +0000 (02:11 +0100)]
ARM: Dove: update defconfig

It has been a while since dove_defconfig was updated to recent development.
This patch adds all currently available Dove boards, including a DT-enabled
machine.

DT support requires to allow ATAGS passed by boot loader as most of them are
not yet capable of passing DT blobs. Also OF_SERIAL is enabled to actually
see the bootlog.

Finally, sdhci driver for Dove, mv_cesa, GPIO LEDs, and highmem support is
added.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: update defconfig for new boards
Jason Cooper [Mon, 19 Nov 2012 07:42:49 +0000 (07:42 +0000)]
ARM: Kirkwood: update defconfig for new boards

MPLCEC4_DT is relocated because it had been added manually.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoarm: orion5x: add DT related options in defconfig
Thomas Petazzoni [Fri, 16 Nov 2012 15:39:47 +0000 (16:39 +0100)]
arm: orion5x: add DT related options in defconfig

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested by: Maxime Hadjinlian <mhadjinlian@lacie.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoarm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree
Thomas Petazzoni [Fri, 16 Nov 2012 15:39:46 +0000 (16:39 +0100)]
arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree

This commit converts the 'LaCie Ethernet Disk mini v2' board to the
Device Tree. All devices that have existing Device Tree bindings are
converted over to the Device Tree, the other devices remain
instantiated in the old way, until the respective drivers get the
needed Device Tree bindings.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested by: Maxime Hadjinlian <mhadjinlian@lacie.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoarm: orion5x: basic Device Tree support
Thomas Petazzoni [Fri, 16 Nov 2012 15:39:45 +0000 (16:39 +0100)]
arm: orion5x: basic Device Tree support

This commit adds basic DT support for the Orion5x SoC family. It adds
an orion5x.dtsi description of the Orion5x SoC as well as the needed
DT_MACHINE structure to support boards converted to DT in the future.

So far, the Device Tree contains the interrupt controller, the GPIO
bank, the UART controllers, the SPI controller, the watchdog, the SATA
controller, the I2C controller and the cryptographic engine.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested by: Maxime Hadjinlian <mhadjinlian@lacie.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoarm: orion5x: mechanical defconfig update
Thomas Petazzoni [Fri, 16 Nov 2012 15:39:44 +0000 (16:39 +0100)]
arm: orion5x: mechanical defconfig update

This commit is a simple mechanical update of the orion5x_defconfig
file to the current kernel (i.e, just 'make orion5x_defconfig; make
savedefconfig'). Doing this update allows to more easily separate
DT-related configuration changes in the following patches.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested by: Maxime Hadjinlian <mhadjinlian@lacie.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: kirkwood: Add support for the MPL CEC4
Stefan Peter [Sun, 18 Nov 2012 15:46:16 +0000 (16:46 +0100)]
ARM: kirkwood: Add support for the MPL CEC4

Signed-off-by: Stefan Peter <s.peter@mpl.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoarm: kirkwood: add support for ZyXEL NSA310
Tero Jaasko [Fri, 26 Oct 2012 15:56:16 +0000 (18:56 +0300)]
arm: kirkwood: add support for ZyXEL NSA310

Hello, Andrew

> > +#define NSA310_GPIO_LED_ESATA_GREEN 12
> > <..>
> > +#define NSA310_GPIO_POWER_OFF 48
>
> It looks like most of these are not used. Please remove them.

True. Fixed.

> > +static struct mtd_partition nsa310_mtd_parts[] = {
> > + {
> > + .name = "uboot",
> > + .offset = 0,
> > + .size = 0x100000,
> > + .mask_flags = MTD_WRITEABLE,
> > + }, {
> > <..>
> You should be able to put all that into DT. Take a look at

Correct. I did the conversion and tested that the partitions
can be read with dd and produce exactly the same data before and
after conversion. So, the partition offsets at least should be fine.

> > +static struct i2c_board_info __initdata nsa310_i2c_info[] = {
> > + { I2C_BOARD_INFO("adt7476", 0x2e) },
> > +};
>
> You can also do this in DT as well. kirkwood-ts219.dtsi has
>
>                 i2c@11000 {
>                         status = "okay";
>                         clock-frequency = <400000>;

Ok, I did convert the i2c definition to use the devicetree.
The adt7476 device itself is not at reach of device tree,
AFAIK and requires more work at there?

Thanks for your valuable comments. Following is a new patch that
should address the problems and mistakes you pointed and also
some of the pointed by Jason Cooper. The nand and i2c are now
defined at DT and I also removed the pointless defines and
ARM_APPENDED_DTB. It is based against the Linus' official
3.6 version.

Best regards,
Tero

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: new board USI Topkick
Jason Cooper [Mon, 22 Oct 2012 02:15:35 +0000 (02:15 +0000)]
ARM: Kirkwood: new board USI Topkick

This is a new kirkwood box made by Universal Scientific Industrial, Inc.
The product description is here:

http://www.usish.com/english/products_topkick1281p2.php

It is very similar to the dreamplug and other plug devices, with the
exception that it has room for a 2.5" SATA HDD internally.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
9 years agoARM: kirkwood: use gpio-fan DT binding on lsxl
Michael Walle [Sat, 20 Oct 2012 23:34:54 +0000 (01:34 +0200)]
ARM: kirkwood: use gpio-fan DT binding on lsxl

Remove board specific gpio-fan driver registration. Moved into device tree.

Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: add Netspace boards to defconfig
Jason Cooper [Sun, 21 Oct 2012 00:57:16 +0000 (00:57 +0000)]
ARM: Kirkwood: add Netspace boards to defconfig

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: kirkwood: DT board setup for Network Space Mini v2
Simon Guinot [Wed, 17 Oct 2012 10:09:06 +0000 (12:09 +0200)]
ARM: kirkwood: DT board setup for Network Space Mini v2

This patch adds DT board setup for the LaCie NAS Network Space Mini v2
(aka SafeBox). The hardware characteristics are very close to those of
the Network Space Lite v2. The main difference are:
- A GPIO fan which is only available on the NS2 Mini.
- A single USB host port is wired on the NS2 Mini. The NS2 Lite provides
  an additional dual-mode USB port (host/device).

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: kirkwood: DT board setup for Network Space Lite v2
Simon Guinot [Wed, 17 Oct 2012 10:09:05 +0000 (12:09 +0200)]
ARM: kirkwood: DT board setup for Network Space Lite v2

This patch adds DT board setup for the LaCie NAS Network Space Lite v2.
This board is derived from the Network Space v2 and a lot of hardware
characteristics are shared.

- CPU: Marvell 88F6192 800Mhz
- SDRAM memory: 128MB DDR2 200Mhz
- 1 SATA port: internal
- Gigabit ethernet: PHY Marvell 88E1318
- Flash memory: SPI NOR 512KB (Macronix MX25L4005A)
- i2c EEPROM: 512 bytes (24C04 type)
- 2 USB2 ports: host and host/device
- 1 push button
- 1 SATA LED (bi-color, blue and red)

Note that the SATA LED is not compatible with the driver leds-ns2. The
LED behaviour ("on", "off" or "SATA activity blink") is controlled via
a single MPP (21).

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: kirkwood: DT board setup for Network Space v2 and parents
Simon Guinot [Wed, 17 Oct 2012 10:09:04 +0000 (12:09 +0200)]
ARM: kirkwood: DT board setup for Network Space v2 and parents

This patch adds DT board setup for LaCie Network Space v2 and parents,
based on the Marvell Kirkwood 6281 SoC. This includes Network Space v2
(Max) and Internet Space v2.

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoleds: leds-ns2: add device tree binding
Simon Guinot [Wed, 17 Oct 2012 10:09:03 +0000 (12:09 +0200)]
leds: leds-ns2: add device tree binding

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Enable the second I2C bus
Jason Gunthorpe [Mon, 1 Oct 2012 23:59:32 +0000 (17:59 -0600)]
ARM: Kirkwood: Enable the second I2C bus

mv64xxx_of_config requires that the tclk frequency be found
through the clk stuff rather than through device tree, so add
another override for the 2nd controller.

Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
Jason Gunthorpe [Wed, 21 Nov 2012 07:15:11 +0000 (00:15 -0700)]
ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan

The kirkwood_pcie_scan_bus function duplicates the common code in
bios32.c, passing ops in will use the common code..

Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
9 years agoMerge branch 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...
Olof Johansson [Wed, 21 Nov 2012 19:30:32 +0000 (11:30 -0800)]
Merge branch 'next/dt-samsung' of git://git./linux/kernel/git/kgene/linux-samsung into next/dt

From Kukjin Kim:

Here is Samsung DT for v3.8 and this is including DT for EXYNOS4X12
SoC, SMDK4412 board, pinctrl for exynos4x12, TMU, MFC, SATA and SATA
PHY.

As I commented on [4/7], this branch merged pinctrl/samsung to support
pinctrl for exynos4x12 without useless merge conflicts.

* 'next/dt-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (32 commits)
  ARM: EXYNOS: DT Support for SATA and SATA PHY
  ARM: dts: Remove broken-voltage property from sdhci node for exynos4210-trats
  ARM: dts: Add node for touchscreen for exynos4210-trats
  ARM: dts: Add node for touchscreen voltage regulator for exynos4210-trats
  ARM: dts: Add node for i2c3 bus for exynos4210-trats
  ARM: dts: Add nodes for GPIO keys available on Trats
  ARM: dts: Update for pinctrl-samsung driver for exynos4210-trats
  ARM: dts: Add nodes for pin controllers for exynos4x12
  pinctrl: samsung: Add support for EXYNOS4X12
  gpio: samsung: Skip registration if pinctrl driver is present on EXYNOS4X12
  ARM: EXYNOS: Skip wakeup-int setup if pinctrl driver is used on EXYNOS4X12
  ARM: dts: add board dts file for EXYNOS4412 based SMDK board
  ARM: dts: Add support for EXYNOS4X12 SoCs
  ARM: EXYNOS: Add devicetree node for TMU driver for exynos5
  ARM: EXYNOS: Add devicetree node for TMU driver for exynos4
  ARM: EXYNOS: Add MFC device tree support
  ARM: dts: Enable serial controllers on Origen and SMDKV310
  Documentation: Update samsung-pinctrl device tree bindings documentation
  pinctrl: samsung: Add GPIO to IRQ translation
  pinctrl: exynos: Set pin function to EINT in irq_set_type of wake-up EINT
  ...

Add/add conflicts in:
arch/arm/boot/dts/exynos5250-smdk5250.dts
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/mach-exynos/mach-exynos5-dt.c

Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoMerge branch 'next/hdmi-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git...
Olof Johansson [Wed, 21 Nov 2012 18:11:58 +0000 (10:11 -0800)]
Merge branch 'next/hdmi-samsung' of git://git./linux/kernel/git/kgene/linux-samsung into next/dt

From Kukjin Kim:
This is for adding support for DT based exynos5250 hdmi and it adds
device node for hdmi, mixer, hdmiphy and hdmiddc.

* 'next/hdmi-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: removing exynos-drm device registration from non-dt platforms
  ARM: EXYNOS: add clocks for exynos5 hdmi
  ARM: dts: add device tree support for exynos5 hdmiddc
  ARM: dts: add device tree support for exynos5 hdmiphy
  ARM: dts: add device tree support for exynos5 mixer
  ARM: dts: add device tree support for exynos5 hdmi

9 years agoARM: dts: Use drive strength 3 for SD pins for exynos4
Tomasz Figa [Wed, 21 Nov 2012 15:29:47 +0000 (00:29 +0900)]
ARM: dts: Use drive strength 3 for SD pins for exynos4

This patch modifies pin control groups of SD pins on EXYNOS4210
and EXYNOS4X12 to use drive strength 3 as a default value which
corresponds to S5P_GPIO_DRVSTR_LV4 in legacy non-DT code.

This is needed at least on Origen board for sdhci2 to work and
if any other drive strength is required on each board, we can
overide it.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[kgene.kim@samsung.com: edited commit message]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Set up power domains for exynos4
Tomasz Figa [Wed, 21 Nov 2012 15:22:09 +0000 (00:22 +0900)]
ARM: dts: Set up power domains for exynos4

This patch adds device tree nodes for power domains available
on EXYNOS4 SoCs.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: EXYNOS: Bind devices to power domains using DT
Tomasz Figa [Wed, 21 Nov 2012 15:21:17 +0000 (00:21 +0900)]
ARM: EXYNOS: Bind devices to power domains using DT

This patch adds a way to specify bindings between devices and power
domains using device tree.

A device can be bound to particular power domain by adding a
power-domain property containing a phandle to the domain. The device
will be bound to the domain before binding a driver to it and unbound
after unbinding a driver from it.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: EXYNOS: Fix power domain name initialization
Tomasz Figa [Wed, 21 Nov 2012 15:21:12 +0000 (00:21 +0900)]
ARM: EXYNOS: Fix power domain name initialization

This patch adds initialization of name field in generic power domain
struct.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: EXYNOS: Detect power domain state on registration from DT
Tomasz Figa [Wed, 21 Nov 2012 15:21:08 +0000 (00:21 +0900)]
ARM: EXYNOS: Detect power domain state on registration from DT

Initial state of power domains might vary on different boards and with
different bootloaders.

This patch adds detection of initial state of power domains when being
registered from DT.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Add vmmc fixed voltage regulator for exynos4210-origen
Tomasz Figa [Wed, 21 Nov 2012 15:15:40 +0000 (00:15 +0900)]
ARM: dts: Add vmmc fixed voltage regulator for exynos4210-origen

This patch adds fixed voltage vmmc regulator to dts file of Origen
board.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Update sdhci nodes for current bindings for exynos4210-origen
Tomasz Figa [Wed, 21 Nov 2012 15:15:40 +0000 (00:15 +0900)]
ARM: dts: Update sdhci nodes for current bindings for exynos4210-origen

This patch modifies sdhci nodes present in Origen device tree source
to use current generic mmc bindings.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Update for pinctrl-samsung driver for exynos4210-origen
Tomasz Figa [Wed, 21 Nov 2012 15:15:40 +0000 (00:15 +0900)]
ARM: dts: Update for pinctrl-samsung driver for exynos4210-origen

This patch updates all parts of Origen dts related to pin configuration
to use new GPIO and pinctrl bindings, instead of (now unsupported on
Exynos4) legacy gpio-samsung bindings.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Split memory sections for exynos4210-origen
Tomasz Figa [Wed, 21 Nov 2012 15:15:40 +0000 (00:15 +0900)]
ARM: dts: Split memory sections for exynos4210-origen

This patch changes memory configuration defined in dts file of Origen
board from single 1 GiB section into four 256 MiB sections to match
section size limit.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: EXYNOS: add all i2c busses to auxdata for DT
Olof Johansson [Wed, 21 Nov 2012 04:45:52 +0000 (13:45 +0900)]
ARM: EXYNOS: add all i2c busses to auxdata for DT

Needed to match device ids for clocks, etc.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Add aliases for i2c controller for exynos4
Doug Anderson [Wed, 21 Nov 2012 04:35:46 +0000 (13:35 +0900)]
ARM: dts: Add aliases for i2c controller for exynos4

This is similar to a recent commit for exynos5250 titled:
  ARM: EXYNOS: Add aliases for i2c controller

Adding aliases will be useful to prevent warnings in a future
change. See:
  i2c: s3c2410: Get the i2c bus number from alias id

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoMerge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500...
Olof Johansson [Wed, 21 Nov 2012 09:18:33 +0000 (01:18 -0800)]
Merge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt

From Lee Jones. It's an update of the previous ux500/dt branch with a few more
patches:

* 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500:
  ARM: ux500: Describe UART platform registering issues more accurately
  ARM: ux500: Enable all MMC devices on the u9540 when booting with DT
  ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree
  ARM: ux500: Add UART support to the u9540 Device Tree
  ARM: ux500: Add skeleton DTS file for the u9540
  ARM: ux500: Add SDI (MMC) support to the HREF Device Tree
  ARM: ux500: Move regulator-name properties out to board DTS files

Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoMerge tag 'lpc32xx-dts-for-3.7' of git://git.antcom.de/linux-2.6 into next/dt
Olof Johansson [Wed, 21 Nov 2012 08:51:49 +0000 (00:51 -0800)]
Merge tag 'lpc32xx-dts-for-3.7' of git://git.antcom.de/linux-2.6 into next/dt

From Roland Stigge:
DTS updates for the LPC32xx Soc for 3.7

This time, only one patch: Adding the motor PWM to lpc32xx.dtsi

* tag 'lpc32xx-dts-for-3.7' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: Add the motor PWM to base dts file

Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoMerge tag 'tegra-for-3.8-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren...
Olof Johansson [Wed, 21 Nov 2012 08:29:21 +0000 (00:29 -0800)]
Merge tag 'tegra-for-3.8-dt' of git://git./linux/kernel/git/swarren/linux-tegra into next/dt

From Stephen Warren:
ARM: tegra: device tree changes

A wide variety of device tree additions are made across many Tegra
boards:

* WiFi is supported on Seaboard, Ventana, and Cardhu.
* An I2C mux is added for Ventana, and Tamonten.
* SPI flash is added to Cardhu, and TrimSlice.
* Temperature sensors are added to Harmony, Tamonten, and Ventana.
* host1x (graphics/display controller) is added to the SoC include files.
* HDMI displays are enabled on Harmony, TrimSlice, Tamonten, Plutux, Tec,
  and Whistler.

This pull request is based on tegra-for-3.8-soc.

* tag 'tegra-for-3.8-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (47 commits)
  ARM: tegra: whistler: enable HDMI port
  ARM: tegra: tec: Enable HDMI output
  ARM: tegra: plutux: Enable HDMI output
  ARM: tegra: tamonten: Add host1x support
  ARM: tegra: trimslice: enable HDMI port
  ARM: tegra: harmony: enable HDMI port
  ARM: tegra: Add Tegra30 host1x support
  ARM: tegra: Add Tegra20 host1x support
  ARM: tegra: trimslice: enable SPI flash
  ARM: tegra: dts: add sflash controller dt entry
  ARM: tegra: ventana: Add NCT1008 temperature sensor
  ARM: tegra: tamonten: Add NCT1008 temperature sensor
  ARM: tegra: harmony: Add ADT7641 temperature sensor
  ARM: tegra: tec: Remove redundant DT properties
  ARM: tegra: tamonten: Add DDC/PTA pinmux
  ARM: tegra: dts: cardhu: enable SLINK4
  ARM: tegra: dts: add slink controller dt entry
  ARM: dt: tegra: ventana: define pinmux for ddc
  ARM: dt: t30 cardhu: set pinmux and power for wlan
  ARM: dt: t20 ventana: set pinmux and power for wlan
  ...

9 years agoMerge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt
Olof Johansson [Wed, 21 Nov 2012 07:11:45 +0000 (23:11 -0800)]
Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt

From Nicolas Ferre:
More DT material for AT91:

- conversion of watchdog to DT
- usart definition for evk-pro3 board

* tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91/dts: evk-pro3: enable watchdog
  ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45
  watchdog: at91sam9_wdt: add device tree support
  ARM: at91: dt: evk-pro3: enable uart0 and uart2

9 years agoARM: dts: Add board dts file for Snow board (ARM Chromebook)
Doug Anderson [Wed, 21 Nov 2012 04:32:21 +0000 (13:32 +0900)]
ARM: dts: Add board dts file for Snow board (ARM Chromebook)

This dts file is based on the Snow dts file in the Chromium OS kernel
tree with the following changes:
* Some details have been updated to match the exynos5250-smdk5250.dts
  file from linux-next (as of c11068538994430547722dc9fb515a0ceefd5cb9).
* This file doesn't include references to hardware whose upstream
  support isn't quite there yet.  That includes most i2c devices.
  Note that most i2c busses have been included with no devices.

The Snow dts file is mostly just an include of the "cros5250" dts file
which describes a class of similar boards. Support for other boards has
not yet been send upstream.

With this file and a change to use UART3 for serial output I can:
* Boot to a command line using either SD or EMMC as a root filesystem
* See the power button and lid switch using evtest.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Move the dwmmc aliases from smdk5250 dts to exynos
Doug Anderson [Wed, 21 Nov 2012 04:31:32 +0000 (13:31 +0900)]
ARM: dts: Move the dwmmc aliases from smdk5250 dts to exynos

The aliases for dwmmc were placed in the SMDK5250 dts file but really
should be common for all exynos5250 boards.  Move it to the common CPU
file.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: ux500: Describe UART platform registering issues more accurately
Lee Jones [Sat, 3 Nov 2012 12:37:15 +0000 (13:37 +0100)]
ARM: ux500: Describe UART platform registering issues more accurately

UARTs no longer require call-back information, since the reset
call-back was removed in 43b5f0d69291374f602ad8e1817f329573a59010.
The only AUXDATA dependencies remaining for UARTs are DMA settings.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
9 years agoARM: ux500: Enable all MMC devices on the u9540 when booting with DT
Lee Jones [Wed, 10 Oct 2012 08:38:26 +0000 (09:38 +0100)]
ARM: ux500: Enable all MMC devices on the u9540 when booting with DT

The u9540 supports 3 MMC devices. This patch enables two of them
and updates the configuration of the already enabled SDI4 port.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
9 years agoARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree
Lee Jones [Mon, 8 Oct 2012 13:09:05 +0000 (14:09 +0100)]
ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree

Here we add the device node for the SDI4 (MMC) port to the u9540
Device Tree source file. This will allow successful probing of
the internal MMC storage device when booting with DT enabled.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
9 years agoARM: ux500: Add UART support to the u9540 Device Tree
Lee Jones [Mon, 8 Oct 2012 08:19:31 +0000 (09:19 +0100)]
ARM: ux500: Add UART support to the u9540 Device Tree

Add the 3 UART nodes required to enable serial ports on the u9540.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
9 years agoARM: ux500: Add skeleton DTS file for the u9540
Lee Jones [Mon, 8 Oct 2012 08:14:13 +0000 (09:14 +0100)]
ARM: ux500: Add skeleton DTS file for the u9540

This patch sees the creation of a sparse Device Tree file for
ST-Ericsson's latest development board supporting the latest
dual-core Cortex-a9 u9540 SoC.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
9 years agoARM: ux500: Add SDI (MMC) support to the HREF Device Tree
Lee Jones [Fri, 14 Sep 2012 14:27:41 +0000 (15:27 +0100)]
ARM: ux500: Add SDI (MMC) support to the HREF Device Tree

Here we add the Device Tree nodes which are required to successfully
probe the MMCI driver which will enable the four cards available on
ST-Ericsson's HREF hardware development platform.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
9 years agoARM: ux500: Move regulator-name properties out to board DTS files
Lee Jones [Tue, 25 Sep 2012 11:04:51 +0000 (12:04 +0100)]
ARM: ux500: Move regulator-name properties out to board DTS files

Regulator supply names should be allocated by board rather than
per SoC, as the same SoC could be wired differently on varying
hardware. Here we push all regulator-name allocation out to the
dbx5x0 subordinate board files; HREF and Snowball.

Requested-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
9 years agoARM: mxs: Add SchulerControl SPS1 DTS file
Marek Vasut [Sun, 18 Nov 2012 21:08:29 +0000 (22:08 +0100)]
ARM: mxs: Add SchulerControl SPS1 DTS file

Add DTS file for this custom board.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
9 years agoARM: imx23-olinuxino: Add spi support
Fadil Berisha [Sat, 17 Nov 2012 21:52:32 +0000 (16:52 -0500)]
ARM: imx23-olinuxino: Add spi support

imx23-olinuxino board has spi pins exposed on external connector.
This patch add spi support.

Signed-off-by: Fadil Berisha <f.koliqi@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
9 years agoARM: EXYNOS: DT Support for SATA and SATA PHY
Vasanth Ananthan [Tue, 20 Nov 2012 12:02:11 +0000 (21:02 +0900)]
ARM: EXYNOS: DT Support for SATA and SATA PHY

This patch adds Device Nodes for SATA and SATA PHY device.

Signed-off-by: Vasanth Ananthan <vasanth.a@samsung.com>
[kgene.kim@samsung.com: removed address definitions as per comments]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Remove broken-voltage property from sdhci node for exynos4210-trats
Tomasz Figa [Tue, 20 Nov 2012 11:17:20 +0000 (20:17 +0900)]
ARM: dts: Remove broken-voltage property from sdhci node for exynos4210-trats

The broken voltage property has been replaced with auto detection based
on voltages available on vmmc voltage regulator, so there is no use for
it now.

This patch removes the now unused property from Trats Device Tree
sources.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Add node for touchscreen for exynos4210-trats
Tomasz Figa [Tue, 20 Nov 2012 07:26:18 +0000 (16:26 +0900)]
ARM: dts: Add node for touchscreen for exynos4210-trats

This patch adds a device tree node for the Melfas MMS114-controlled
touchscreen present on Samsung Trats board.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Add node for touchscreen voltage regulator for exynos4210-trats
Tomasz Figa [Tue, 20 Nov 2012 07:26:18 +0000 (16:26 +0900)]
ARM: dts: Add node for touchscreen voltage regulator for exynos4210-trats

This patch adds device tree node for a fixed voltage regulator used for
touchscreen on Samsung Trats board.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Add node for i2c3 bus for exynos4210-trats
Tomasz Figa [Tue, 20 Nov 2012 07:26:17 +0000 (16:26 +0900)]
ARM: dts: Add node for i2c3 bus for exynos4210-trats

This patch adds device tree node for i2c3 bus to device tree source
of Samsung Trats board. This bus is used by mms114 touchscreen
controller, for which support will be added in separate patch.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Add nodes for GPIO keys available on Trats
Tomasz Figa [Tue, 20 Nov 2012 07:26:17 +0000 (16:26 +0900)]
ARM: dts: Add nodes for GPIO keys available on Trats

This patch extends dts file of Samsung Trats board to add support for
available GPIO keys using gpio-keys driver.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: dts: Update for pinctrl-samsung driver for exynos4210-trats
Tomasz Figa [Tue, 20 Nov 2012 07:26:17 +0000 (16:26 +0900)]
ARM: dts: Update for pinctrl-samsung driver for exynos4210-trats

This patch updates all parts of Trats dts related to pin configuration
to use new GPIO and pinctrl bindings, instead of (now unsupported on
Exynos4) legacy gpio-samsung bindings.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
9 years agoARM: davinci: move dtb targets to common location
Olof Johansson [Tue, 20 Nov 2012 06:25:59 +0000 (22:25 -0800)]
ARM: davinci: move dtb targets to common location

The dtb targets belong in arch/arm/boot/dts/Makefile now, so move the
newly added davinci targets there.

Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoMerge tag 'davinci-for-v3.8/dt' of git://gitorious.org/linux-davinci/linux-davinci...
Olof Johansson [Tue, 20 Nov 2012 06:24:44 +0000 (22:24 -0800)]
Merge tag 'davinci-for-v3.8/dt' of git://gitorious.org/linux-davinci/linux-davinci into next/dt

From Sekhar Nori:

These changes add DT boot support to DaVinci DA850
SoC.

* tag 'davinci-for-v3.8/dt' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: da850: generate dtbs for da850 boards
  ARM: davinci: add support for am1808 based EnBW CMC board
  ARM: davinci: da850 evm: add DT data
  ARM: davinci: da850: add SoC DT data
  ARM: davinci: da850: add DT boot support
  ARM: davinci: da8xx: add DA850 PRUSS support
  ARM: davinci: add platform hook to fetch the SRAM pool
  ARM: davinci: da850: changed SRAM allocator to shared ram.
  ARM: davinci: sram: switch from iotable to ioremapped regions
  uio: uio_pruss: replace private SRAM API with genalloc
  ARM: davinci: serial: provide API to initialze UART clocks
  ARM: davinci: convert platform code to use clk_prepare/clk_unprepare

Signed-off-by: Olof Johansson <olof@lixom.net>
9 years agoMerge branch 'next/dt-exynos4x12' into next/dt-samsung
Kukjin Kim [Mon, 19 Nov 2012 04:18:47 +0000 (13:18 +0900)]
Merge branch 'next/dt-exynos4x12' into next/dt-samsung

Conflicts:
arch/arm/boot/dts/exynos4210.dtsi

9 years agoARM: Kirkwood: checkpatch cleanups
Andrew Lunn [Sat, 20 Oct 2012 11:23:16 +0000 (13:23 +0200)]
ARM: Kirkwood: checkpatch cleanups

Mostly printk to pr_{err|info} changes and a few strings split over
multiple lines are combined.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>