]> Pileus Git - ~andy/linux/log
~andy/linux
11 years agoMerge tag 'imx-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Olof Johansson [Thu, 18 Apr 2013 16:19:26 +0000 (09:19 -0700)]
Merge tag 'imx-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

From Shawn Guo:
The imx device tree changes for 3.10:

* The huge diff stat is introduced by the pinctrl changes.  With DTC
  macro support ready, we're moving those huge mount of data about pins
  out of pinctrl driver.
* Device tree source updates for GPI, LDB, SRC, cpufreq-cpu0.
* Initial imx6dl device tree support
* Board level DTS changes for some imx27 and imx51 platforms.

* tag 'imx-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6: (605 commits)
  ARM: dts: imx6dl-wandboard: Add USB Host support
  ARM: dts: imx51 cpu node
  ARM: dts: Add missing imx27-phytec-phycore dtb target
  ARM: dts: Add NFC support for i.MX27 Phytec PCM038 module
  ARM: i.MX51: Add PATA support
  ARM: dts: Add initial support for Wandboard Dual-Lite
  ARM: dts: imx: add initial imx6dl-sabreauto support
  ARM: dts: imx: add initial imx6dl-sabresd support
  ARM: dts: imx: make sabreauto and sabresd common
  pinctrl: add pinctrl driver for imx6sl
  pinctrl: add pinctrl driver for imx6dl
  ARM: dts: imx53: fix SD2_DATA1 pad AUDMUX_AUD4 configuration
  ARM: dts: MicroSys sbc6x support (i.MX6)
  ARM i.MX5: Add System Reset Controller (SRC) support for i.MX51 and i.MX53
  ARM i.MX5: Add system reset controller (SRC) to i.MX51 and i.MX53 device tree
  ARM i.MX6q: Link system reset controller (SRC) to IPU in DT
  ARM i.MX6q: Add LDB device to device tree
  ARM: imx5 DT init cpufreq-cpu0 device
  ARM: imx27 DT init cpufreq-cpu0 device
  ARM i.MX53: Add LDB device to device tree
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoMerge tag 'dt-3.10-3' of git://git.infradead.org/users/jcooper/linux into next/dt
Olof Johansson [Thu, 18 Apr 2013 06:24:18 +0000 (23:24 -0700)]
Merge tag 'dt-3.10-3' of git://git.infradead.org/users/jcooper/linux into next/dt

From Jason Cooper:
mvebu dt for v3.10 round 3

 - mvebu PCIe DT support

from round 2 (no pr was sent):
 - 64bit dts skeleton
 - mvebu devicebus additions
 - mvebu thermal nodes
 - mirabox gpio leds
 - orion5x xor and ehci
 - use mvsdio on guruplug dt

* tag 'dt-3.10-3' of git://git.infradead.org/users/jcooper/linux:
  arm: mvebu: PCIe Device Tree informations for Armada XP GP
  arm: mvebu: PCIe Device Tree informations for Armada 370 DB
  arm: mvebu: PCIe Device Tree informations for Armada 370 Mirabox
  arm: mvebu: PCIe Device Tree informations for Armada XP DB
  arm: mvebu: PCIe Device Tree informations for OpenBlocks AX3-4
  arm: mvebu: add PCIe Device Tree informations for Armada XP
  arm: mvebu: add PCIe Device Tree informations for Armada 370
  ARM: dts: Add a 64 bits version of the skeleton device tree
  ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig
  ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board
  ARM: mvebu: Add support for NOR flash device on Armada XP-GP board
  ARM: mvebu: Add Device Bus support for Armada 370/XP SoC
  ARM: configs: Update mvebu defconfig for thermal
  ARM: mvebu: Add thermal support to Armada 370 device tree
  ARM: mvebu: Add thermal support to Armada XP device tree
  arm: mvebu: Add GPIO LEDs to Mirabox board
  arm: orion5x: enable xor for orion5x platform
  arm: orion5x: add ehci bindings to dtsi
  ARM: kirkwood: make use of DT mvsdio on guruplug board
  ARM: mvebu: Add button on Armada 370 Reference Design board

11 years agoarm: mvebu: PCIe Device Tree informations for Armada XP GP
Thomas Petazzoni [Tue, 9 Apr 2013 21:06:39 +0000 (23:06 +0200)]
arm: mvebu: PCIe Device Tree informations for Armada XP GP

The Marvell Armada XP GP board has 3 physical full-size PCIe slots, so
we enable the corresponding PCIe interfaces in the Device Tree.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoarm: mvebu: PCIe Device Tree informations for Armada 370 DB
Thomas Petazzoni [Tue, 9 Apr 2013 21:06:38 +0000 (23:06 +0200)]
arm: mvebu: PCIe Device Tree informations for Armada 370 DB

The Marvell evaluation board (DB) for the Armada 370 SoC has 2
physical full-size PCIe slots, so we enable the corresponding PCIe
interfaces in the Device Tree.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoarm: mvebu: PCIe Device Tree informations for Armada 370 Mirabox
Thomas Petazzoni [Tue, 9 Apr 2013 21:06:37 +0000 (23:06 +0200)]
arm: mvebu: PCIe Device Tree informations for Armada 370 Mirabox

The Globalscale Mirabox platform uses one PCIe interface for an
available mini-PCIe slot, and the other PCIe interface for an internal
USB 3.0 controller. We add the necessary Device Tree informations to
enable those two interfaces.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoarm: mvebu: PCIe Device Tree informations for Armada XP DB
Thomas Petazzoni [Tue, 9 Apr 2013 21:06:36 +0000 (23:06 +0200)]
arm: mvebu: PCIe Device Tree informations for Armada XP DB

The Marvell evaluation board (DB) for the Armada XP SoC has 6
physicals full-size PCIe slots, so we enable the corresponding PCIe
interfaces in the Device Tree.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoarm: mvebu: PCIe Device Tree informations for OpenBlocks AX3-4
Thomas Petazzoni [Tue, 9 Apr 2013 21:06:35 +0000 (23:06 +0200)]
arm: mvebu: PCIe Device Tree informations for OpenBlocks AX3-4

The PlatHome OpenBlocks AX3-4 has an internal mini-PCIe slot that can
be used to plug mini-PCIe devices. We therefore enable the PCIe
interface that corresponds to this slot.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoarm: mvebu: add PCIe Device Tree informations for Armada XP
Thomas Petazzoni [Tue, 9 Apr 2013 21:06:34 +0000 (23:06 +0200)]
arm: mvebu: add PCIe Device Tree informations for Armada XP

The Armada XP SoCs have multiple PCIe interfaces. The MV78230 has 2
PCIe units (one 4x or quad 1x, the other 1x only), the MV78260 has 3
PCIe units (two 4x or quad 1x and one 4x/1x), the MV78460 has 4 PCIe
units (two 4x or quad 1x and two 4x/1x). We therefore add the
necessary Device Tree informations to make those PCIe interfaces
usable.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoarm: mvebu: add PCIe Device Tree informations for Armada 370
Thomas Petazzoni [Tue, 9 Apr 2013 21:06:33 +0000 (23:06 +0200)]
arm: mvebu: add PCIe Device Tree informations for Armada 370

The Armada 370 SoC has two 1x PCIe 2.0 interfaces, so we add the
necessary Device Tree informations to make these interfaces availabel.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoarm: vt8500: Add SDHC support to WM8505 DT
Tony Prisk [Thu, 11 Apr 2013 19:00:29 +0000 (07:00 +1200)]
arm: vt8500: Add SDHC support to WM8505 DT

This patch adds the required node for the SDHC controller on WM8505 SoCs.

Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoARM: dts: Add a 64 bits version of the skeleton device tree
Lior Amsalem [Mon, 8 Apr 2013 22:52:13 +0000 (00:52 +0200)]
ARM: dts: Add a 64 bits version of the skeleton device tree

In order to be able to use more than 4GB address-cells and size-cells
have to be set to 2

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Lior Amsalem <alior@marvell.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoARM: mvebu: Add Device Bus and CFI flash memory support to defconfig
Ezequiel Garcia [Wed, 10 Apr 2013 19:04:04 +0000 (16:04 -0300)]
ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig

This patch selects the devbus driver as part of the mvebu default
config, along with the required options to detect and support
CFI flash memories.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoARM: mvebu: Add support for NOR flash device on Openblocks AX3 board
Ezequiel Garcia [Wed, 10 Apr 2013 19:04:03 +0000 (16:04 -0300)]
ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board

The Plat'home Openblocks AX3 has a 128 MiB NOR flash device connected
to the Device Bus. This commit adds the device tree node to support this device.

The SoC supports a flexible and dynamic decoding window allocation scheme;
but since this feature is still not implemented we need to specify the window
base address in the device tree node itself.
This base address has been selected in a completely arbitrary fashion.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoARM: mvebu: Add support for NOR flash device on Armada XP-GP board
Ezequiel Garcia [Wed, 10 Apr 2013 19:04:02 +0000 (16:04 -0300)]
ARM: mvebu: Add support for NOR flash device on Armada XP-GP board

The Armada XP Development Board DB-MV784MP-GP has a NOR flash device
connected to the Device Bus. This commit adds the device tree node
to support this device.

This SoC supports a flexible and dynamic decoding window allocation
scheme; but since this feature is still not implemented we need
to specify the window base address in the device tree node itself.

This base address has been selected in a completely arbitrary fashion.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoARM: mvebu: Add Device Bus support for Armada 370/XP SoC
Ezequiel Garcia [Wed, 10 Apr 2013 19:04:01 +0000 (16:04 -0300)]
ARM: mvebu: Add Device Bus support for Armada 370/XP SoC

Armada 370 and Armada XP SoC have a Device Bus controller to
handle NOR, NAND, SRAM and FPGA devices.
This patch adds the device tree node to enable the controller.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoMerge tag 'sunxi-dt-for-3.10-3' of git://github.com/mripard/linux into next/dt
Olof Johansson [Thu, 11 Apr 2013 10:48:25 +0000 (03:48 -0700)]
Merge tag 'sunxi-dt-for-3.10-3' of git://github.com/mripard/linux into next/dt

From Maxime Ripard:
SunXi dt additions for 3.10, take 3
  - Remove sunxi.dtsi and only use one dtsi for each SoC
  - Various compatible renamings to be consistent with the other platforms

* tag 'sunxi-dt-for-3.10-3' of git://github.com/mripard/linux:
  ARM: sunxi: dt: Update watchdog compatible string
  ARM: sunxi: dt: Update interrupt controller compatible string
  ARM: sunxi: dt: Update timer compatible string
  ARM: sunxi: dt: Reorganize the dtsi

Signed-off-by: Olof Johansson <olof@lixom.net>
11 years agoARM: dts: imx6dl-wandboard: Add USB Host support
Fabio Estevam [Sun, 7 Apr 2013 23:13:45 +0000 (20:13 -0300)]
ARM: dts: imx6dl-wandboard: Add USB Host support

Add USB Host1 port support.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: imx51 cpu node
Markus Pargmann [Sun, 7 Apr 2013 19:56:45 +0000 (21:56 +0200)]
ARM: dts: imx51 cpu node

This patch adds a cpus/cpu@0 node for imx51 with default operating
points for the cpufreq-cpu0 driver. There is currently no regulator
support, so the voltages are 0 here.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: Add missing imx27-phytec-phycore dtb target
Alexander Shiyan [Sun, 7 Apr 2013 15:29:14 +0000 (19:29 +0400)]
ARM: dts: Add missing imx27-phytec-phycore dtb target

The patch adds missing imx27-phytec-phycore dtb target into Makefile.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: Add NFC support for i.MX27 Phytec PCM038 module
Alexander Shiyan [Sun, 7 Apr 2013 15:29:12 +0000 (19:29 +0400)]
ARM: dts: Add NFC support for i.MX27 Phytec PCM038 module

Added NFC node to imx27-phytec-phycore DT file.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: i.MX51: Add PATA support
Sascha Hauer [Thu, 4 Apr 2013 09:25:09 +0000 (11:25 +0200)]
ARM: i.MX51: Add PATA support

This adds the PATA device and the pinctrl group for to the i.MX51 dts.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: Add initial support for Wandboard Dual-Lite
Fabio Estevam [Wed, 3 Apr 2013 12:29:16 +0000 (09:29 -0300)]
ARM: dts: Add initial support for Wandboard Dual-Lite

Wandboard is a development board that has two variants: one version based
on mx6 dual lite and another one based on mx6 solo.

For more details about Wandboard, please refer to: http://www.wandboard.org/

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: imx: add initial imx6dl-sabreauto support
Shawn Guo [Tue, 2 Apr 2013 06:38:11 +0000 (14:38 +0800)]
ARM: dts: imx: add initial imx6dl-sabreauto support

Add initial imx6dl-sabreauto support based on the common stuff already
in imx6qdl-sabreauto.dtsi.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: imx: add initial imx6dl-sabresd support
Shawn Guo [Tue, 2 Apr 2013 06:04:45 +0000 (14:04 +0800)]
ARM: dts: imx: add initial imx6dl-sabresd support

Add initial imx6dl-sabresd support based on the common stuff already in
imx6qdl-sabresd.dtsi.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: imx: make sabreauto and sabresd common
Shawn Guo [Tue, 2 Apr 2013 05:15:16 +0000 (13:15 +0800)]
ARM: dts: imx: make sabreauto and sabresd common

The sabreauto and sabresd boards are common for imx6q and imx6dl.
Create imx6qdl-sabreauto.dtsi and imx6qdl-sabresd.dtsi for those
common parts.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agopinctrl: add pinctrl driver for imx6sl
Shawn Guo [Thu, 21 Mar 2013 14:10:36 +0000 (22:10 +0800)]
pinctrl: add pinctrl driver for imx6sl

Add a pinctrl driver for i.MX6 SoloLite based on pinctrl-imx core
driver.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
11 years agopinctrl: add pinctrl driver for imx6dl
Shawn Guo [Thu, 21 Mar 2013 13:55:41 +0000 (21:55 +0800)]
pinctrl: add pinctrl driver for imx6dl

The imx6dl is a derivative of imx6q with very limited difference.  These
two SoCs are so compatible that they can be handled as one platform in
software.  That said, we will not have target SOC_IMX6DL but just
reusing SOC_IMX6Q.   That's why the pinctrl-imx6dl driver is added here
with symbol PINCTRL_IMX6Q controlling the build of it.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: dts: imx53: fix SD2_DATA1 pad AUDMUX_AUD4 configuration
Marek Vasut [Wed, 3 Apr 2013 00:20:25 +0000 (02:20 +0200)]
ARM: dts: imx53: fix SD2_DATA1 pad AUDMUX_AUD4 configuration

The IOMUXC_AUDMUX_P4_INPUT_TXCLK_AMX_SELECT_INPUT must be configured as 1
instead of 0 to have AUD4 muxed on SD2 pins working.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: MicroSys sbc6x support (i.MX6)
Pavel Machek [Mon, 1 Apr 2013 12:24:22 +0000 (14:24 +0200)]
ARM: dts: MicroSys sbc6x support (i.MX6)

Add support for MicroSys sbc6x board.

Signed-off-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM i.MX5: Add System Reset Controller (SRC) support for i.MX51 and i.MX53
Philipp Zabel [Thu, 28 Mar 2013 16:35:22 +0000 (17:35 +0100)]
ARM i.MX5: Add System Reset Controller (SRC) support for i.MX51 and i.MX53

The SRC in i.MX51 and i.MX53 is similar to the one in i.MX6q minus
the IPU2 reset line and multi core CPU reset/enable bits.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM i.MX5: Add system reset controller (SRC) to i.MX51 and i.MX53 device tree
Philipp Zabel [Thu, 28 Mar 2013 16:35:23 +0000 (17:35 +0100)]
ARM i.MX5: Add system reset controller (SRC) to i.MX51 and i.MX53 device tree

Also, link SRC to IPU via phandle.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM i.MX6q: Link system reset controller (SRC) to IPU in DT
Philipp Zabel [Thu, 28 Mar 2013 16:35:20 +0000 (17:35 +0100)]
ARM i.MX6q: Link system reset controller (SRC) to IPU in DT

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM i.MX6q: Add LDB device to device tree
Steffen Trumtrar [Thu, 28 Mar 2013 15:23:35 +0000 (16:23 +0100)]
ARM i.MX6q: Add LDB device to device tree

Add ldb device tree node and clock lookups.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx5 DT init cpufreq-cpu0 device
Markus Pargmann [Wed, 27 Mar 2013 13:01:33 +0000 (14:01 +0100)]
ARM: imx5 DT init cpufreq-cpu0 device

Add cpufreq-cpu0 platform device for imx5 DT init and register the clock
for imx5.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx27 DT init cpufreq-cpu0 device
Markus Pargmann [Wed, 27 Mar 2013 13:01:32 +0000 (14:01 +0100)]
ARM: imx27 DT init cpufreq-cpu0 device

Adds cpufreq-cpu0 platform device for imx27 DT init and adds a clock
registration for cpufreq-cpu0 device.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM i.MX53: Add LDB device to device tree
Philipp Zabel [Wed, 27 Mar 2013 17:30:44 +0000 (18:30 +0100)]
ARM i.MX53: Add LDB device to device tree

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM i.MX53: Add IOMUXC GPR to device tree
Philipp Zabel [Wed, 27 Mar 2013 17:30:43 +0000 (18:30 +0100)]
ARM i.MX53: Add IOMUXC GPR to device tree

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM i.MX5: Move IPU clock lookups into device tree
Philipp Zabel [Wed, 27 Mar 2013 17:30:36 +0000 (18:30 +0100)]
ARM i.MX5: Move IPU clock lookups into device tree

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx: Add support for the Armadeus Systems APF27Dev docking board
Gwenhael Goavec-Merou [Wed, 27 Mar 2013 13:41:58 +0000 (14:41 +0100)]
ARM: imx: Add support for the Armadeus Systems APF27Dev docking board

The APF27Dev is a docking board for an APF27 SOM

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx: apf51dev: add ecspi1, ecspi2 and i2c2 support
Gwenhael Goavec-Merou [Sat, 16 Mar 2013 15:53:54 +0000 (16:53 +0100)]
ARM: imx: apf51dev: add ecspi1, ecspi2 and i2c2 support

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: i.MX27: Add clocks to GPT devicetree nodes
Sascha Hauer [Thu, 14 Mar 2013 12:09:02 +0000 (13:09 +0100)]
ARM: i.MX27: Add clocks to GPT devicetree nodes

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: i.MX6: Add clocks to GPT devicetree node
Sascha Hauer [Thu, 14 Mar 2013 12:09:01 +0000 (13:09 +0100)]
ARM: i.MX6: Add clocks to GPT devicetree node

The i.MX6 already has a devicetree node for the GPT, but not yet
has the clocks. Add them.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: i.MX53: Add GPT devicetree node
Sascha Hauer [Thu, 14 Mar 2013 12:09:00 +0000 (13:09 +0100)]
ARM: i.MX53: Add GPT devicetree node

The GPT is the GPT timer found on i.MX SoCs. This patch adds the
devicetree node for it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: i.MX51: Add GPT devicetree node
Sascha Hauer [Thu, 14 Mar 2013 12:08:59 +0000 (13:08 +0100)]
ARM: i.MX51: Add GPT devicetree node

The GPT is the GPT timer found on i.MX SoCs. This patch adds the
devicetree node for it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: i.MX31: Add GPT devicetree node
Sascha Hauer [Thu, 14 Mar 2013 12:08:58 +0000 (13:08 +0100)]
ARM: i.MX31: Add GPT devicetree node

The GPT is the GPT timer found on i.MX SoCs.

Since this is the first user of the AIPS2 this patch also adds it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: i.MX27: Add GPT devicetree nodes
Sascha Hauer [Thu, 14 Mar 2013 12:08:57 +0000 (13:08 +0100)]
ARM: i.MX27: Add GPT devicetree nodes

The GPT is the GPT timer found on i.MX SoCs.

This adds the missing GPT devicetree nodes. Also fixup the watchdog
register map size along the way. it's 0x1000, not 0x4000. This didn't
hurt before as the region was not occupied by another device, but now
overlaps with the GPT.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: i.MX: Add GPT devicetree Documentation
Sascha Hauer [Thu, 14 Mar 2013 12:08:56 +0000 (13:08 +0100)]
ARM: i.MX: Add GPT devicetree Documentation

The GPT binding is already used on i.MX6 and i.MX25, but not yet
documented. Add a binding document for it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: mx27: Replace clk_register_clkdev with clock DT lookup
Fabio Estevam [Wed, 28 Nov 2012 17:55:30 +0000 (15:55 -0200)]
ARM: mx27: Replace clk_register_clkdev with clock DT lookup

Similarly as it was done for mx6q, use a DT lookup in order to make maintainance
task for the clock devices easier.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx51: Add a second pinctrl group for i2c2
Gwenhael Goavec-Merou [Sat, 9 Mar 2013 14:04:19 +0000 (15:04 +0100)]
ARM: imx51: Add a second pinctrl group for i2c2

Add a second pinctrl group of pins for i2c2.

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx51: Add pinctrl for ecspi2
Gwenhael Goavec-Merou [Sat, 9 Mar 2013 13:59:08 +0000 (14:59 +0100)]
ARM: imx51: Add pinctrl for ecspi2

Add ecspi2 group of pins for imx51.

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx: Add support for the Armadeus Systems APF51Dev docking board
Gwenhael Goavec-Merou [Fri, 8 Mar 2013 07:41:38 +0000 (08:41 +0100)]
ARM: imx: Add support for the Armadeus Systems APF51Dev docking board

The APF51Dev is a docking board for an APF51 SOM

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: imx6q: Add pinctrl for audmix on AUD3
Sean Cross [Thu, 7 Mar 2013 06:00:10 +0000 (06:00 +0000)]
ARM: dts: imx6q: Add pinctrl for audmix on AUD3

Allow AUD3 to be used as audio output from the audmux block.

Signed-off-by: Sean Cross <xobs@kosagi.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: imx6q: Add pinctrl for i2c2 and i2c3
Sean Cross [Thu, 7 Mar 2013 06:00:09 +0000 (06:00 +0000)]
ARM: dts: imx6q: Add pinctrl for i2c2 and i2c3

Add groups to allow i2c2 and i2c3 to be used on imx6q.

Signed-off-by: Sean Cross <xobs@kosagi.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: imx6q: Add pinctrl for ecspi3
Sean Cross [Thu, 7 Mar 2013 06:00:08 +0000 (06:00 +0000)]
ARM: dts: imx6q: Add pinctrl for ecspi3

Add a group of pins to allow ecspi3 to be used on imx6q.

Signed-off-by: Sean Cross <xobs@kosagi.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agopinctrl: imx: move hard-coding data into device tree
Shawn Guo [Wed, 20 Feb 2013 02:32:52 +0000 (10:32 +0800)]
pinctrl: imx: move hard-coding data into device tree

Currently, all imx pinctrl drivers maintain a big array of struct
imx_pin_reg which hard-codes data like register offset and mux mode
setting for each pin function.  Every time a new imx SoC support is
added, we need to add such a big mount of data.  With moving to single
kernel build, it's only matter of time to be blamed on memory consuming.

With DTC pre-processor support in place, the patch moves all these data
into device tree by redefining the PIN_FUNC_ID in imxXX-pinfunc.h and
changing the PIN_FUNC_ID parsing code a little bit.

The pin id gets re-numbered based on mux register offset, or config
register offset if the pin has no mux register, so that kernel can
identify the pin id from register offsets provided by device tree.

As a bonus point of the change, those arbitrary magic numbers standing
for particular PIN_FUNC_ID in device tree sources are now replaced by
macros to improve the readability of dts files.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
11 years agoARM: imx: use #include for all device trees
Shawn Guo [Sun, 7 Apr 2013 02:49:34 +0000 (10:49 +0800)]
ARM: imx: use #include for all device trees

Replace /include/ (dtc) with #include (C pre-processor) for all imx DT
files, so that gcc -E handles the entire include tree, and hence any of
those files can #include some other file e.g. for constant definitions.

This allows future use of #defines and header files in order to define
names for various constants, such as pinctrl settings. Use of those
features will increase the readability of the device tree files.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: imx6q-sabresd: Add USB support
Peter Chen [Mon, 18 Feb 2013 02:06:44 +0000 (10:06 +0800)]
ARM: dts: imx6q-sabresd: Add USB support

Add USB support for imx6q sabresd board

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: dts: imx6q: add PMU
Dirk Behme [Fri, 15 Feb 2013 14:10:01 +0000 (15:10 +0100)]
ARM: dts: imx6q: add PMU

Add ARM Cortex A9 Performance Monitor Unit (PMU) support.
On i.MX6 a combined interrupt on hardware line #126 is used
(i.MX6 TRM: Performance Unit interrupt).

For more details see Documentation/devicetree/bindings/arm/pmu.txt

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoMerge remote-tracking branch 'swarren/for-3.10/dtc-cpp-chroot-std-headers' into imx/dt
Shawn Guo [Tue, 9 Apr 2013 14:52:42 +0000 (22:52 +0800)]
Merge remote-tracking branch 'swarren/for-3.10/dtc-cpp-chroot-std-headers' into imx/dt

11 years agoMerge tag 'imx-cleanup-3.10' into imx/dt
Shawn Guo [Tue, 9 Apr 2013 14:52:11 +0000 (22:52 +0800)]
Merge tag 'imx-cleanup-3.10' into imx/dt

The imx cleanup for 3.10:

* Clean up a couple of unneeded function declarations
* Remove imx specific cpufreq driver as generic cpufreq-cpu0 works well
  as the replacement
* Remove platform ahci support
* Clean up unused ARCH/MACH Kconfig symbols
* Remove a couple of unused files

11 years agoARM: i.MX: remove unused ARCH_* configs
Paul Bolle [Tue, 9 Apr 2013 06:58:23 +0000 (08:58 +0200)]
ARM: i.MX: remove unused ARCH_* configs

This removes the unused Kconfig options ARCH_MX5, ARCH_MX51,
ARCH_MX53 and MACH_MX21.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM i.MX53: remove platform ahci support
Sascha Hauer [Tue, 9 Apr 2013 06:58:22 +0000 (08:58 +0200)]
ARM i.MX53: remove platform ahci support

The i.MX53 ahci platform support is unused in mainline. To demotivate
people using it just remove it from the tree.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoMerge tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/scm/linux/kernel...
Arnd Bergmann [Tue, 9 Apr 2013 11:00:09 +0000 (13:00 +0200)]
Merge tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt

From Stephen Warren <swarren@wwwdotorg.org>:

ARM: tegra: DT-related fixes needed by the MMC tree

In order to convert the Tegra MMC driver to using mmc_of_parse(), some
bugs in the Tegra device-tree content need to be fixed first; it's
currently wrong but unused, and mmc_of_parse() causes that data to be
used for the first time.

* tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc host

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
11 years agoMerge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
Arnd Bergmann [Tue, 9 Apr 2013 10:46:29 +0000 (12:46 +0200)]
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

From Nicolas Ferre <nicolas.ferre@atmel.com>:

One macb DT node move for 9x5 family: 9g15 doesn't
have an Ethernet interface.
Little fixes mainly related to at91sam9x5 DT, IIO ADC bindings,
pinctrl for at91sam9260/g20 DT and the RTC addition.
Addition of the Acme Systems Aria G25 board.

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91/at91sam9260.dtsi: fix u(s)art pinctrl encoding
  ARM: at91: dts: add adc resolution stuff
  ARM: at91: add Acme Systems Aria G25 board
  ARM: at91/dt: fix macb node declaration
  ARM: at91: remove partial parameter in bootargs for at91sam9x5ek.dtsi
  ARM: at91/trivial: fix model name for SAM9G15-EK
  ARM: at91/trivial: typos in compatible property
  ARM: at91/at91sam9x5: add RTC node

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
11 years agoARM: sunxi: dt: Update watchdog compatible string
Maxime Ripard [Sun, 24 Mar 2013 18:32:34 +0000 (19:32 +0100)]
ARM: sunxi: dt: Update watchdog compatible string

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
11 years agoARM: sunxi: dt: Update interrupt controller compatible string
Maxime Ripard [Sun, 24 Mar 2013 18:20:52 +0000 (19:20 +0100)]
ARM: sunxi: dt: Update interrupt controller compatible string

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
11 years agoARM: sunxi: dt: Update timer compatible string
Maxime Ripard [Sun, 24 Mar 2013 18:00:17 +0000 (19:00 +0100)]
ARM: sunxi: dt: Update timer compatible string

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
11 years agoARM: sunxi: dt: Reorganize the dtsi
Maxime Ripard [Wed, 13 Mar 2013 19:07:37 +0000 (20:07 +0100)]
ARM: sunxi: dt: Reorganize the dtsi

In the early days, the A10 and A13 shared quite some code. Nowadays it
shares less and less code, the A31 diverging even more, so it doesn't
make much sense to continue to maintain this structure, just use one
DTSI for every SoC, and that's it.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
11 years agoMerge tag 'sunxi-dt-for-3.10-2' of git://github.com/mripard/linux into next/dt
Arnd Bergmann [Mon, 8 Apr 2013 18:35:11 +0000 (20:35 +0200)]
Merge tag 'sunxi-dt-for-3.10-2' of git://github.com/mripard/linux into next/dt

From Maxime Ripard <maxime.ripard@free-electrons.com>:

ARM: sunxi: dt additions for 3.10, take 2

  - Rename the clock compatible introduced in the first pull request for 3.10
  - Complete the UART support for A13 and A10
  - Adds clock gates support

* tag 'sunxi-dt-for-3.10-2' of git://github.com/mripard/linux:
  arm: sunxi: Add clock to pinctrl node
  arm: sunxi: use the right clock phandles for UARTs
  arm: sunxi: Add clock definitions for AXI, AHB, APB0, APB1 gates
  ARM: sunxi: cubieboard: Add UART muxing
  ARM: sunxi: hackberry: Add UART muxing
  ARM: sunxi: dt: Add A10 UARTs to the dtsi.
  ARM: sunxi: dt: Add uart3 dt node
  ARM: sunxi: dt: Move uart0 to sun4i-a10.dtsi
  ARM: sunxi: Rename uart nodes to serial
  ARM: sunxi: dt: Use clocks property instead of clock-frequency for the UARTs
  arm: sunxi: rename clock compatible strings

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
11 years agoMerge tag 'bcm2835-for-3.10-dt' of git://git.kernel.org/pub/scm/linux/kernel/git...
Arnd Bergmann [Mon, 8 Apr 2013 18:07:07 +0000 (20:07 +0200)]
Merge tag 'bcm2835-for-3.10-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/dt

From Stephen Warren <swarren@wwwdotorg.org>:

ARM: bcm2835: device tree updates

This branch adds two devices to the BCM2835 SoC device tree: the SPI
controller and the HW random number generator.

The SPI controller isn't actually instantiated in the Raspberry Pi
device tree, since there are no on-board SPI devices; it's up to the
end-user to modify their own device-tree to describe whatever they
have attached.

* tag 'bcm2835-for-3.10-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
  ARM: bcm2835: add Broadcom BCM2835 RNG to the device tree
  ARM: bcm2835: add SPI device to DT

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
11 years agoMerge branch 'zynq/core' of git://git.xilinx.com/linux-xlnx into next/dt
Arnd Bergmann [Mon, 8 Apr 2013 16:38:51 +0000 (18:38 +0200)]
Merge branch 'zynq/core' of git://git.xilinx.com/linux-xlnx into next/dt

From Michal Simek <michal.simek@xilinx.com>:

It enables pmu support for zynq.
* 'zynq/core' of git://git.xilinx.com/linux-xlnx:
  arm: zynq: Add support for pmu

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
11 years agoARM: dt: create a DT header for the GIC
Stephen Warren [Wed, 13 Feb 2013 19:50:48 +0000 (12:50 -0700)]
ARM: dt: create a DT header for the GIC

The ARM GIC binding defines a few custom cells and flags for its IRQ
specifier. Provide names for those.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
11 years agoARM: dt: add header to define IRQ flags
Stephen Warren [Wed, 13 Feb 2013 19:50:11 +0000 (12:50 -0700)]
ARM: dt: add header to define IRQ flags

Many IRQ device tree bindings use the same flags. Create a header to
define those.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
11 years agoARM: dt: add header to define GPIO flags
Stephen Warren [Wed, 13 Feb 2013 00:22:36 +0000 (17:22 -0700)]
ARM: dt: add header to define GPIO flags

Many GPIO device tree bindings use the same flags. Create a header to
define those.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
11 years agokbuild: always run gcc -E on *.dts, remove cmd_dtc_cpp
Stephen Warren [Wed, 6 Mar 2013 17:58:37 +0000 (10:58 -0700)]
kbuild: always run gcc -E on *.dts, remove cmd_dtc_cpp

Replace cmd_dtc with cmd_dtc_cpp, and delete the latter.

Previously, a special file extension (.dtsp) was required to trigger
the C pre-processor to run on device tree files. This was ugly. Now that
previous changes have enhanced cmd_dtc_cpp to collect dependency
information from both gcc -E and dtc, we can transparently run the pre-
processor on all device tree files, irrespective of whether they
use /include/ or #include syntax to include *.dtsi.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
11 years agokbuild: cmd_dtc_cpp: extract deps from both gcc -E and dtc
Stephen Warren [Wed, 6 Mar 2013 17:28:02 +0000 (10:28 -0700)]
kbuild: cmd_dtc_cpp: extract deps from both gcc -E and dtc

Prior to this change, when compiling *.dts to *.dtb, the dependency
output from dtc would be used, and when compiling *.dtsp to *.dtb, the
dependency output from gcc -E alone would be used, despite dtc also
being invoked (on a temporary file that was guaranteed to have no
dependencies).

With this change, when compiling *.dtsp to *.dtb, the dependency files
from both gcc -E and dtc are used. This will allow cmd_dtc_cpp to
replace cmd_dtc in a future change. In turn, that will allow the C pre-
processor to be run transparently on *.dts, without the need to a
separate rule or file extension to trigger it.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
11 years agokbuild: fixdep: support concatenated dep files
Stephen Warren [Wed, 6 Mar 2013 17:27:45 +0000 (10:27 -0700)]
kbuild: fixdep: support concatenated dep files

The current use-case for fixdep is: a source file is run through a single
processing step, which creates a single dependency file as a side-effect,
which fixdep transforms into the file used by the kernel build process.

In order to transparently run the C pre-processor on device-tree files,
we wish to run both gcc -E and dtc on a source file in a single rule.
This generates two dependency files, which must be transformed together
into the file used by the kernel build process. This change modifies
fixdep so it can process the concatenation of multiple separate input
dependency files, and produce a correct unified output.

The code changes have the slight benefit of transforming the loop in
parse_dep_file() into more of a lexer/tokenizer, with the loop body being
more of a parser. Previously, some of this logic was mixed together
before the loop. I also added some comments, which I hope are useful.

Benchmarking shows that on a cross-compiled ARM tegra_defconfig build,
there is less than 0.5 seconds speed decrease with this change, on top
of a build time of ~2m24s. This is probably within the noise.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
11 years agokbuild: create an "include chroot" for DT bindings
Stephen Warren [Wed, 20 Feb 2013 20:39:41 +0000 (13:39 -0700)]
kbuild: create an "include chroot" for DT bindings

The recent dtc+cpp support allows header files and C pre-processor
defines/macros to be used when compiling device tree files. These
headers will typically define various constants that are part of the
device tree bindings.

The original patch which set up the dtc+cpp include path only considered
using those headers from device tree files. However, most are also
useful for kernel code which needs to interpret the device tree.

In both the DT files and the kernel, I'd like to include the DT-related
headers in the same way, for example, <dt-bindings/gpio/tegra-gpio.h>.
That will simplify any text which discusses the DT header locations.

Creating a <dt-bindings/> for kernel source to use is as simple as
placing files into include/dt-bindings/.

However, when compiling DT files, the include path should be restricted
so that only the dt-bindings path is available; arbitrary kernel headers
shouldn't be exposed. For this reason, create a specific include
directory for use by dtc+cpp, and symlink dt-bindings from there to the
actual location of include/dt-bindings/. For want of a better location,
place this "include chroot" into the existing dts/ directory.

arch/*/boot/dts/include/dt-bindings -> ../../../../../include/dt-bindings

Some headers used by device tree files may not be useful to the kernel;
they may be used simply to aid in constructing the DT file (e.g. macros
to create a node), but not define any information that the kernel needs
to share. These may be placed directly into arch/*/boot/dts/ along with
the DT files themselves.

Acked-by: Michal Marek <mmarek@suse.cz>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
11 years agoarm: sunxi: Add clock to pinctrl node
Emilio López [Wed, 27 Mar 2013 21:20:41 +0000 (18:20 -0300)]
arm: sunxi: Add clock to pinctrl node

The port controller needs the apb0_pio clock enabled to be able to
work. This commit declares that on the device tree.

Signed-off-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
11 years agoarm: sunxi: use the right clock phandles for UARTs
Emilio López [Wed, 27 Mar 2013 21:20:39 +0000 (18:20 -0300)]
arm: sunxi: use the right clock phandles for UARTs

All the UARTs are connected to clock gates; now that our clock driver
is able to handle them, make the switch.

Signed-off-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
11 years agoarm: sunxi: Add clock definitions for AXI, AHB, APB0, APB1 gates
Emilio López [Wed, 27 Mar 2013 21:20:38 +0000 (18:20 -0300)]
arm: sunxi: Add clock definitions for AXI, AHB, APB0, APB1 gates

This commit adds the corresponding DT bindings for all the AXI,
AHB, APB0 and APB1 gates.

Signed-off-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
11 years agoARM: at91/at91sam9260.dtsi: fix u(s)art pinctrl encoding
Douglas Gilbert [Thu, 4 Apr 2013 16:19:55 +0000 (18:19 +0200)]
ARM: at91/at91sam9260.dtsi: fix u(s)art pinctrl encoding

Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
[nicolas.ferre@atmel.com: fix rts/cts for usart3]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: stable <stable@vger.kernel.org> [3.8+]
11 years agoARM: at91: dts: add adc resolution stuff
Ludovic Desroches [Fri, 29 Mar 2013 09:13:19 +0000 (10:13 +0100)]
ARM: at91: dts: add adc resolution stuff

Add the ADC low and high resolution configuration and which one to use.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
11 years agoARM: at91: add Acme Systems Aria G25 board
Douglas Gilbert [Thu, 4 Apr 2013 15:36:49 +0000 (17:36 +0200)]
ARM: at91: add Acme Systems Aria G25 board

Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
11 years agoARM: at91/dt: fix macb node declaration
Nicolas Ferre [Fri, 22 Mar 2013 13:47:54 +0000 (14:47 +0100)]
ARM: at91/dt: fix macb node declaration

Macb0 node cannot be activated in generic sam9x5ek.dtsi file
as the sam9g15 does not have one.
Move the macb0 & macb1 activation in board .dts file that
support them.

Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
11 years agoarm: zynq: Add support for pmu
Michal Simek [Wed, 20 Mar 2013 12:37:01 +0000 (13:37 +0100)]
arm: zynq: Add support for pmu

Zynq is standard PMU with 2 interrupt per core.
There is also access via register which is not used right now.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11 years agoARM: bcm2835: add Broadcom BCM2835 RNG to the device tree
Lubomir Rintel [Thu, 28 Mar 2013 06:12:04 +0000 (07:12 +0100)]
ARM: bcm2835: add Broadcom BCM2835 RNG to the device tree

This adds a device tree binding for random number generator present on
Broadcom BCM2835 SoC, used in Raspberry Pi and Roku 2 devices.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Tested-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
11 years agoARM: configs: Update mvebu defconfig for thermal
Ezequiel Garcia [Tue, 26 Mar 2013 10:16:28 +0000 (07:16 -0300)]
ARM: configs: Update mvebu defconfig for thermal

The thermal management driver for Armada XP/370 has been added
so we update the defconfig to reflect this.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoARM: mvebu: Add thermal support to Armada 370 device tree
Ezequiel Garcia [Tue, 26 Mar 2013 10:16:27 +0000 (07:16 -0300)]
ARM: mvebu: Add thermal support to Armada 370 device tree

This patch adds support for the thermal controller available in
all Armada 370 boards. This controller has two 4-byte registers:
one to read the thermal sensor, the other for sensor initialization.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoARM: mvebu: Add thermal support to Armada XP device tree
Ezequiel Garcia [Tue, 26 Mar 2013 10:16:26 +0000 (07:16 -0300)]
ARM: mvebu: Add thermal support to Armada XP device tree

This patch adds support for the thermal controller available in
all Armada XP boards. This controller has two 4-byte registers:
one to read the thermal sensor, the other for sensor initialization.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
11 years agoARM: imx: remove mx6q.h
Shawn Guo [Tue, 2 Apr 2013 14:06:01 +0000 (22:06 +0800)]
ARM: imx: remove mx6q.h

Those stuff defined in mx6q.h is used nowhere now.  Remove the header.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx: remove Makefile.boot
Shawn Guo [Tue, 2 Apr 2013 13:51:27 +0000 (21:51 +0800)]
ARM: imx: remove Makefile.boot

Since we have converted IMX to multiplatform build, Makefile.boot is not
used anyway.  Remove it.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx: clk-imx27: Do not register peripheral clock for SSI
Fabio Estevam [Tue, 29 Jan 2013 12:17:35 +0000 (10:17 -0200)]
ARM: imx: clk-imx27: Do not register peripheral clock for SSI

imx ssi block has two types of clocks:

- ipg: bus clock, the clock needed for accessing registers.
- per: peripheral clock, the clock needed for generating the bit rate.

Currently ssi driver only supports slave mode and thus need only to handle
the ipg clock, because the peripheral clock comes from the master codec.

Only register the ipg clock and do not register the peripheral clock for ssi

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx: avic: Move avic_saved_mask_reg under CONFIG_PM
Fabio Estevam [Tue, 5 Feb 2013 17:36:16 +0000 (15:36 -0200)]
ARM: imx: avic: Move avic_saved_mask_reg under CONFIG_PM

When building a kernel with CONFIG_PM undefined, the following warning happens:

arch/arm/mach-imx/avic.c:57:12: warning: 'avic_saved_mask_reg' defined but not used [-Wunused-variable]

Move avic_saved_mask_reg definition inside the '#ifdef CONFIG_PM' block to
avoid the warning.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx: Remove cpufreq driver
Markus Pargmann [Wed, 27 Mar 2013 13:01:34 +0000 (14:01 +0100)]
ARM: imx: Remove cpufreq driver

The old cpufreq driver is not necessary anymore with DT and
cpufreq-cpu0.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx: remove pl310_get_save_ptr() declaration
Shawn Guo [Wed, 13 Mar 2013 05:29:35 +0000 (13:29 +0800)]
ARM: imx: remove pl310_get_save_ptr() declaration

Commit a1f1c7e (arm/imx6q: add suspend/resume support) added
declaration for a non-existing function pl310_get_save_ptr() by
mistake.  Remove it.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoARM: imx: remove duplicated function declaration
Shawn Guo [Wed, 13 Mar 2013 05:25:43 +0000 (13:25 +0800)]
ARM: imx: remove duplicated function declaration

Commit 13eed98 (arm/imx6q: add device tree machine support) added
duplicated function declaration for imx_enable_cpu() and
imx_set_cpu_jump().  Remove them.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
11 years agoLinux 3.9-rc5 v3.9-rc5
Linus Torvalds [Sun, 31 Mar 2013 22:12:43 +0000 (15:12 -0700)]
Linux 3.9-rc5

11 years agoMerge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Linus Torvalds [Sun, 31 Mar 2013 18:41:47 +0000 (11:41 -0700)]
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine fixes from Vinod Koul:
 "Two fixes for slave-dmaengine.

  The first one is for making slave_id value correct for dw_dmac and
  the other one fixes the endieness in DT parsing"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dw_dmac: adjust slave_id accordingly to request line base
  dmaengine: dw_dma: fix endianess for DT xlate function

11 years agoMerge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
Linus Torvalds [Sun, 31 Mar 2013 18:40:33 +0000 (11:40 -0700)]
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
 "For a some fixes for Kernel 3.9:
   - subsystem build fix when VIDEO_DEV=y, VIDEO_V4L2=m and I2C=m
   - compilation fix for arm multiarch preventing IR_RX51 to be selected
   - regression fix at bttv crop logic
   - s5p-mfc/m5mols/exynos: a few fixes for cameras on exynos hardware"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] [REGRESSION] bt8xx: Fix too large height in cropcap
  [media] fix compilation with both V4L2 and I2C as 'm'
  [media] m5mols: Fix bug in stream on handler
  [media] s5p-fimc: Do not attempt to disable not enabled media pipeline
  [media] s5p-mfc: Fix encoder control 15 issue
  [media] s5p-mfc: Fix frame skip bug
  [media] s5p-fimc: send valid m2m ctx to fimc_m2m_job_finish
  [media] exynos-gsc: send valid m2m ctx to gsc_m2m_job_finish
  [media] fimc-lite: Fix the variable type to avoid possible crash
  [media] fimc-lite: Initialize 'step' field in fimc_lite_ctrl structure
  [media] ir: IR_RX51 only works on OMAP2