Olof Johansson [Thu, 31 Oct 2013 17:34:01 +0000 (10:34 -0700)]
Merge tag 'dt-3.13-5' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper:
- add the Openblocks A7 board
- add Netgear ReadyNAS 104 board
* tag 'dt-3.13-5' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Add Netgear ReadyNAS 104 board
ARM: kirkwood: add support for OpenBlocks A7 platform
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Thu, 31 Oct 2013 17:32:55 +0000 (10:32 -0700)]
Merge branch 'bcm/dt' into next/dt
A handful of DT updates from Christian Daudt for the broadcom mobile
platforms, including their rename of the platform to BCM_MOBILE to keep
BCM for the vendor-level options.
* bcm/dt:
ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts
ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx)
ARM: dts: bcm281xx: Add card detect GPIO
ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt)
ARM: bcm281xx: Add device node for the GPIO controller
Signed-off-by: Olof Johansson <olof@lixom.net>
Matt Porter [Thu, 19 Sep 2013 17:18:26 +0000 (13:18 -0400)]
ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts
Trivial patch to make use of GIC/IRQ defines on the bcm11351 sdio
interrupt properties.
Signed-off-by: Matt Porter <matt.porter@linaro.org>
Signed-off-by: Christian Daudt <bcm@fixthebug.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Tim Kryger [Mon, 23 Sep 2013 17:49:57 +0000 (10:49 -0700)]
ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx)
This adds in three more UARTs that were not declared earlier.
Signed-off-by: Tim Kryger <tim.kryger@linaro.org>
Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
Reviewed-by: Matt Porter <matt.porter@linaro.org>
Signed-off-by: Christian Daudt <bcm@fixthebug.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Markus Mayer [Wed, 2 Oct 2013 18:00:16 +0000 (11:00 -0700)]
ARM: dts: bcm281xx: Add card detect GPIO
Register GPIO 14 as card detect interrupt for the SD card slot.
Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Signed-off-by: Christian Daudt <bcm@fixthebug.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Christian Daudt [Mon, 23 Sep 2013 17:20:36 +0000 (10:20 -0700)]
ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt)
Currently ARCH_BCM has been used for Broadcom
Mobile V7 based SoCs. In order to allow other Broadcom
SoCs to also use mach-bcm directory and files, this patch
renames the original ARCH_BCM to ARCH_BCM_MOBILE, and
uses ARCH_BCM to define any Broadcom chip residing
in mach-bcm directory.
Signed-off-by: Christian Daudt <bcm@fixthebug.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Markus Mayer [Tue, 10 Sep 2013 18:07:03 +0000 (11:07 -0700)]
ARM: bcm281xx: Add device node for the GPIO controller
Add the GPIO controller device node for the Broadcom bcm281xx family of
mobile SoCs.
Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Reviewed-by: Tim Kryger <tim.kryger@linaro.org>
Reviewed-by: Matt Porter <matt.porter@linaro.org>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Christian Daudt <bcm@fixthebug.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Arnaud Ebalard [Tue, 22 Oct 2013 18:56:13 +0000 (20:56 +0200)]
ARM: mvebu: Add Netgear ReadyNAS 104 board
Main hardware parts of the (Armada 370 based) NETGEAR ReadyNAS 104 are
supported by mainline kernel (USB 3.0 rear ports, USB 2.0 front port,
Gigabit controller and PHYs, serial port, LEDs, buttons, SATA ports,
G762 fan controller) and referenced in provided .dts file. Some additonal
work remains for:
- Intersil ISL12057 I2C RTC and Alarm chip: working driver but needs
to be splitted for submission of RTC part first;
- Front LCD (Winstar 1602G): driver needs to be written
- Armada NAND controller (to access onboard 128MB of NAND): support
being pushed by @free-electrons people
- 4 front SATA LEDs controlled via GPIO brought by NXP PCA9554:
driver is available upstream. Not referenced/tested yet.
but the device is usable w/o those.
Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Hiroshi Doyu [Wed, 30 Oct 2013 23:17:48 +0000 (17:17 -0600)]
ARM: tegra: fix Tegra114 IOMMU register address
The IOMMU node's reg property contains completely bogus values! Somehow,
this had no practical effect, despite the fact the IOMMU driver appears
to be writing to those registers. I suppose that since no HW modules is
actually at that address, the writes simply had no effect.
Note that I'm not CCing stable here, even though the problem exists as
far back as v3.9, simply because this patch doesn't fix any observed
issue, and I don't want to run the risk of suddenly writing to some
registers and causing a regression.
Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
[swarren, wrote commit description]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Thomas Petazzoni [Wed, 30 Oct 2013 16:55:09 +0000 (17:55 +0100)]
ARM: kirkwood: add support for OpenBlocks A7 platform
The OpenBlocks A7 board is designed and sold by PlatHome, and based on
a Kirkwood 6283 Marvell SoC. It is quite similar to the OpenBlocks A6
already supported in the kernel, with the following main differences:
- The A6 uses a RTC on I2C, while the A7 uses the internal SoC RTC.
- The A6 has one Ethernet port, while the A7 has two Ethernet ports
- The A6 has only one USB port, while the A7 integrates a USB hub,
which provides two front-side USB port, and an internal USB port as
well.
- The A6 has 512 MB of RAM, while the A7 has 1 GB of RAM.
- Slightly different GPIOs for some functions.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Olof Johansson [Tue, 29 Oct 2013 23:11:03 +0000 (16:11 -0700)]
Merge tag 'omap-for-v3.13/dt-fixes-for-merge-window' of git://git./linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren:
Few device tree changes that fix boot time warnings and
make panda display work with recent u-boot.
* tag 'omap-for-v3.13/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: omap4-panda: add DPI pinmuxing
ARM: dts: AM33xx: Add RNG node
ARM: dts: AM33XX: Add hwspinlock node
ARM: dts: OMAP5: Add hwspinlock node
ARM: dts: OMAP4: Add hwspinlock node
Signed-off-by: Olof Johansson <olof@lixom.net>
Tomi Valkeinen [Fri, 25 Oct 2013 10:07:36 +0000 (13:07 +0300)]
ARM: dts: omap4-panda: add DPI pinmuxing
New u-boot versions no longer set the pinmuxing for Panda's DPI output,
and the muxing has to be done in the .dts file.
Add pinmuxing for DPI and TFP410. Without these, the DVI output on Panda
does not work with recent u-boot.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Lokesh Vutla [Thu, 29 Aug 2013 12:52:09 +0000 (18:22 +0530)]
ARM: dts: AM33xx: Add RNG node
Add the AM33xx RNG module's device tree data.
Also add Documentation file describing the data
for the RNG module.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Suman Anna [Thu, 10 Oct 2013 21:15:35 +0000 (16:15 -0500)]
ARM: dts: AM33XX: Add hwspinlock node
Add the hwspinlock device tree node for AM33xx family
of SoCs.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Suman Anna [Thu, 10 Oct 2013 21:15:34 +0000 (16:15 -0500)]
ARM: dts: OMAP5: Add hwspinlock node
Add the hwspinlock device tree node for OMAP5 SoCs.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Suman Anna [Thu, 10 Oct 2013 21:15:33 +0000 (16:15 -0500)]
ARM: dts: OMAP4: Add hwspinlock node
Add the hwspinlock device tree node for OMAP4 family
of SoCs.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Jingoo Han [Tue, 29 Oct 2013 06:12:34 +0000 (15:12 +0900)]
ARM: dts: use 'status' property for PCIe nodes
Set the default status for PCIe to disabled in the exynos5440.dtsi
file and let the board dts files such as exynos5440-ssdk5440.dts
enable the PCIe. However, keep the PCIe for SD5v1 board disabled,
because there is no PCIe slot on SD5v1 board.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Tue, 29 Oct 2013 19:41:43 +0000 (12:41 -0700)]
Merge branch 'sirf/dt' into next/dt
From Barry Song:
Some missed dt nodes for sirf dts for 3.13. Among them:
- add missed chhifbg node in prima2 and atlas6 dts
- add missed cell, cs and dma channel for SPI nodes
- add missed graphics2d iobg in atlas6 dts
- add missed address-cells and size-cells for prima2 I2C
- add missed memcontrol-monitor node in prima2 and atlas6 dts
* sirf/dt:
ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C
ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes
ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts
ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts
ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts
Signed-off-by: Olof Johansson <olof@lixom.net>
Renwei Wu [Mon, 23 Sep 2013 15:37:42 +0000 (23:37 +0800)]
ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C
here prima2 i2c node is lacking of address-cells and size-cells.
Signed-off-by: Renwei Wu <Renwei.Wu@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Barry Song [Mon, 23 Sep 2013 15:29:56 +0000 (23:29 +0800)]
ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes
here we need to add missed cell, cs and dma channels prop in SPI nodes
to match with drivers.
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Jiansong Chen [Thu, 5 Sep 2013 10:33:17 +0000 (18:33 +0800)]
ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts
there is a bus bridge for graphics 2D module lost in current dts, this patch takes it
back.
Signed-off-by: Jiansong Chen <jiansong.chen@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Barry Song [Sun, 22 Sep 2013 10:21:03 +0000 (18:21 +0800)]
ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts
CPHIF(Cell phone interface) is behind sys bridge, this patch adds the
missed node.
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Ye He [Sun, 22 Sep 2013 09:00:51 +0000 (17:00 +0800)]
ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts
memcontrol-monitor provides the ability of monitoring the memory bandwidth.
Signed-off-by: Ye He <ye.he@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Mon, 28 Oct 2013 21:47:50 +0000 (14:47 -0700)]
Merge tag 'omap-for-v3.13/dt-late' of git://git./linux/kernel/git/tmlind/linux-omap into next/dt
Some more dts changes from Benoit Cousson <bcousson@baylibre.com> via
Tony Lindgren:
- Add a lot of N900 nodes
- Add OPP table to OMAP5/DRA7
- Add support for Newflow NanoBone board
- Add i2c aliases
- Add McASP and audio support
- Add reset/idle on init bindings for OMAP
- Add more nodes for AM4272
* tag 'omap-for-v3.13/dt-late' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (42 commits)
ARM: dts: omap5-uevm: Remove pinmux for dmic pins
ARM: dts: omap5-uevm: Correct twl6040 reset GPIO pinmux
ARM: dts: TWL4030: Add power button support
ARM: dts: omap3-n900: Add LP5523 support
ARM: dts: omap3-n900: Add TLV320AIC3X support
ARM: dts: omap3-n900:: Mux RX51_LCD_RESET_GPIO in DTS
ARM: dts: omap3-n900: Add NAND support
ARM: dts: omap3-n900: Specify regulator info
ARM: dts: TWL4030: Add missing regulators
ARM: dts: omap3-n900: Add LP5523 support
ARM: dts: omap3-n900: Add vibrator device
ARM: dts: omap3-n900: GPIO key definitions
ARM: dts: omap3-n900: Add support for SD cards
ARM: dts: omap3-n900: Add UART support
ARM: dts: omap3-n900: Fix i2c bus speed
ARM: dts: omap3-n900: Add pinctrl for i2c devices
ARM: dts: DRA7: Add CPU OPP table
ARM: dts: OMAP5: Add CPU OPP table
ARM: dts: dra7-evm: add smps123 supply for CPU
ARM: dts: omap5-uevm: add smps123 supply for CPU
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Mon, 28 Oct 2013 21:43:09 +0000 (14:43 -0700)]
Merge tag 'omap-for-v3.13/cpufreq-late' of git://git./linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren:
Few patches to make cpufreq work for omap3 with device tree.
Note that this branch has a dependency to the patches merged
with omap-for-v3.13/board-removal-signed-take2.
* tag 'omap-for-v3.13/cpufreq-late' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP3+: use cpu0-cpufreq driver in device tree supported boot
ARM: OMAP2+: add missing lateinit hook for calling pm late init
ARM: OMAP3+: do not register non-dt OPP tables for device tree boot
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Mon, 28 Oct 2013 20:42:02 +0000 (13:42 -0700)]
Merge tag 'dt-3.13-4' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper, mvebu dt changes for v3.13 (round 4):
- mvebu
- core divider clock driver dt binding and nodes
* tag 'dt-3.13-4' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Add the core-divider clock to Armada 370/XP
ARM: mvebu: Add a 2 GHz fixed-clock Armada 370/XP
ARM: mvebu: Add Core Divider clock device-tree binding
Olof Johansson [Mon, 28 Oct 2013 20:21:42 +0000 (13:21 -0700)]
Merge tag 'imx-dt-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo:
The imx/mxs device tree changes for 3.13:
- Use macros for mxs pinctrl settings
- New board support: VF610 Cosmic/Cosmic+, imx6q-udoo, MSR M28CU3
- Support DSPI device for vf610
- Add PCIe device for imx6qdl
- Add UHS pinctrl states for imx6sl and imx6qdl
- Display support for APF and imx51-babbage boards
- Enable SPI NOR and USB for imx6sl-evk board
- Enable LVDS for imx6q-sabrelite and SPDIF for imx6qdl-wandboard
- Misc updates on boards: TX28, imx6qdl-wandboard, imx53-qsb etc.
- Some random updates on imx51 device tree
* tag 'imx-dt-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6: (44 commits)
ARM: imx: imx6sl iomuxc syscon is compatible to imx6q
ARM: dts: imx6sl-evk: enable the SPI NOR
ARM: dts: imx6sl: add a pinctrl for ECSPI1
ARM: imx27: add missing #pwm-cells property
ARM: dts: imx6sl: add pinctrl uhs states for usdhc
ARM: dts: imx6qdl-sabresd: Add backlight support for lvds
ARM: dts: imx51-babbage: Make DVI and WVGA panel functional
ARM: imx27-apf27dev: Add framebuffer support
ARM: imx51-apf51dev: Add parallel display support
ARM: dts: imx53-qsb: Do not use GPIO1_8 as wakeup source
ARM: dts: imx53-qsb: SDHC1 does not have cd-gpios
ARM: dts: imx53-qsb: SDHC3 is connected in 8-bit mode
ARM: dts: mxs: Add MSR M28CU3 board
ARM: dts: imx6qdl-wandboard: Provide phy-reset-gpios
ARM: dts: imx6qdl-sabresd: Provide phy-reset-gpios
ARM: dts: imx6q-sabrelite: Add ethernet phy reset pin into hog
ARM: dts: imx6qdl: add pcie device node
ARM: dts: imx6q-udoo: Add initial board support
ARM: dts: mxs: Add muxing options for the SSP2 MMC
ARM: dts: add initial VF610 Cosmic/Cosmic+ board support
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Mon, 28 Oct 2013 04:54:02 +0000 (21:54 -0700)]
Merge most of tag 'tags/exynos-dt' of git://git./linux/kernel/git/kgene/linux-samsung.git into next/dt
From Kukjin Kim, these are device-tree updates for Exynos. Among the changes:
- add MIPI PHY node for exynos4
- update regulator for origen and exynos5250-arndale
- add support HDMI for exynos5250, exynos5420
* commit '
93457b9cb980ffeeef020c3bcd99065c3807619b':
ARM: dts: Add HDMI related I2C nodes for Arndale board
ARM: dts: enable hdmi subsystem for exynos5420 smdk board
ARM: dts: add dt nodes for hdmi subsystem for exynos5420
ARM: dts: add i2c device nodes for Exynos5420
ARM: dts: add clocks to hdmi dt node for exynos5250
ARM: dts: add mixer clocks to mixer node for Exynos5250
of/documentation: update with clock information for exynos hdmi subsystem
ARM: dts: Disable Exynos5250 I2S controllers by default
ARM: dts: Add reg property to regulator nodes in exynos5250-arndale
ARM: dts: Add fixed voltage regulator to simple bus for origen
ARM: dts: Add MIPI PHY node to exynos4.dtsi
Olof Johansson [Mon, 28 Oct 2013 04:19:54 +0000 (21:19 -0700)]
Merge tag 'ux500-dt-for-v3.13-3' of git://git./linux/kernel/git/linusw/linux-stericsson into next/dt
From Linus Walleij:
Five incremental device tree patches around the clock handling,
and adding SSP/SPI devices to the device tree.
* tag 'ux500-dt-for-v3.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: register all SSP and SPI blocks
ARM: ux500: fix I2C4 clock bit
ARM: ux500: fix clock for GPIO blocks 6 and 7
clk: ux500: fix erroneous bit assignment
ARM: ux500: fix clock for GPIO block 8
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Mon, 28 Oct 2013 04:15:45 +0000 (21:15 -0700)]
Merge tag 'sunxi-fixes-for-3.13' of https://github.com/mripard/linux into next/dt
From Maxime Ripard:
Allwinner sunXi SoCs minor fixes for 3.13
* tag 'sunxi-fixes-for-3.13' of https://github.com/mripard/linux:
ARM: sun6i: Fix the APB2 clock gates register size
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Mon, 28 Oct 2013 04:14:40 +0000 (21:14 -0700)]
Merge tag 'sunxi-dt-for-3.13' of https://github.com/mripard/linux into next/dt
From Maxime Ripard:
Allwinner sunXi SoCs device tree changes for 3.13
This DT series sees the introduction of the cubietruck DT, plus the addition of
the i2c controller for the A20 based boards, and of the Security ID found in
all the Allwinner SoCs but the A31.
* tag 'sunxi-dt-for-3.13' of https://github.com/mripard/linux:
ARM: sunxi: dts: Add support for the cubieboard3, the CubieTruck
ARM: sun7i: olinuxino-micro: Enable the I2C controllers
ARM: sun7i: cubieboard2: Enable the I2C controllers
ARM: sun7i: Add the pin muxing options for the I2C controllers
ARM: sun7i: Enable the I2C controllers
ARM: sunxi: dt: Add sunxi-sid to dts for sun4i, sun5i and sun7i
Signed-off-by: Olof Johansson <olof@lixom.net>
Ezequiel Garcia [Fri, 18 Oct 2013 23:02:31 +0000 (20:02 -0300)]
ARM: mvebu: Add the core-divider clock to Armada 370/XP
The Armada 370/XP SoC has a clock provider called "Core Divider",
that is derived from a fixed 2 GHz PLL clock.
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Ezequiel Garcia [Fri, 18 Oct 2013 23:02:30 +0000 (20:02 -0300)]
ARM: mvebu: Add a 2 GHz fixed-clock Armada 370/XP
Armada 370/XP SoCs have a 2 GHz fixed PLL that is used to feed
other clocks. This commit adds a DT representation of this clock
through a fixed-clock compatible node.
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Ezequiel Garcia [Fri, 18 Oct 2013 23:02:29 +0000 (20:02 -0300)]
ARM: mvebu: Add Core Divider clock device-tree binding
The Armada 370/XP SoCs have a Core Divider clock providing
several clocks. For now, only the NAND clock is supported.
Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Tony Lindgren [Wed, 23 Oct 2013 10:12:45 +0000 (03:12 -0700)]
Merge tag 'for_3.13_super_late/dts_signed' of git://git./linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.13/dt
Add a lot of N900 nodes
Add OPP table to OMAP5/DRA7
Add support for Newflow NanoBone board
Peter Ujfalusi [Wed, 23 Oct 2013 09:32:20 +0000 (12:32 +0300)]
ARM: dts: omap5-uevm: Remove pinmux for dmic pins
When the omap5-evm.dts file has been renamed to omap5-uevm.dts and the sEVM
support got deprecated in favor of uEVM (or Panda5) the content was not
validated.
Panda5 does not have support for digital microphones so remove the pinmux
section for it.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Peter Ujfalusi [Wed, 23 Oct 2013 09:32:19 +0000 (12:32 +0300)]
ARM: dts: omap5-uevm: Correct twl6040 reset GPIO pinmux
When the omap5-evm.dts file has been renamed to omap5-uevm.dts and the sEVM
support got deprecated in favor of uEVM (or Panda5) the content was not
validated.
On uEVM the twl6040 reset GPIO is from gpio5_141 and not via gpio5_145, which
was the case in sEVM.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:43 +0000 (00:49 +0200)]
ARM: dts: TWL4030: Add power button support
Enable support for the power button.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:42 +0000 (00:49 +0200)]
ARM: dts: omap3-n900: Add LP5523 support
Add support for LP5523 device.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:41 +0000 (00:49 +0200)]
ARM: dts: omap3-n900: Add TLV320AIC3X support
This patch adds support for Nokia N900 TLV320AIC3X chips.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:40 +0000 (00:49 +0200)]
ARM: dts: omap3-n900:: Mux RX51_LCD_RESET_GPIO in DTS
Add RX51_LCD_RESET_GPIO pin mux information to
display.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:39 +0000 (00:49 +0200)]
ARM: dts: omap3-n900: Add NAND support
This patch adds supports for Nokia N900 NAND memory.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:38 +0000 (00:49 +0200)]
ARM: dts: omap3-n900: Specify regulator info
Add regulator names and voltage information to
the Nokia N900 DTS file.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:37 +0000 (00:49 +0200)]
ARM: dts: TWL4030: Add missing regulators
The twl4030.dtsi is missing some regulators. This patch adds
the missing ones and orders the regulators alphabetically.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:36 +0000 (00:49 +0200)]
ARM: dts: omap3-n900: Add LP5523 support
Add support for LP5523 device.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:35 +0000 (00:49 +0200)]
ARM: dts: omap3-n900: Add vibrator device
Add support for Nokia N900's vibrator.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:34 +0000 (00:49 +0200)]
ARM: dts: omap3-n900: GPIO key definitions
Add device tree node for the GPIO keys provided by the
N900 board. This is a simple conversion of the existing
board code.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:33 +0000 (00:49 +0200)]
ARM: dts: omap3-n900: Add support for SD cards
Add support for external SD card slot.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:32 +0000 (00:49 +0200)]
ARM: dts: omap3-n900: Add UART support
Add UART support to Nokia N900.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:31 +0000 (00:49 +0200)]
ARM: dts: omap3-n900: Fix i2c bus speed
Fix the bus speed of i2c bus 2 and 3.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Tue, 22 Oct 2013 22:49:30 +0000 (00:49 +0200)]
ARM: dts: omap3-n900: Add pinctrl for i2c devices
Add pin muxing support for the Nokia N900 i2c controllers.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
J Keerthy [Wed, 16 Oct 2013 15:39:07 +0000 (10:39 -0500)]
ARM: dts: DRA7: Add CPU OPP table
Add DT OPP table for DRA7xx family of devices. This data is decoded by
OF with of_init_opp_table() helper function.
The data is based on DRA75x, DRA74x Data Manual revision F (Sept 2013).
TODO: add OPP_HIGH after AVS-Class0 is functional
NOTE: The voltage and frequency values work well only on NOM samples
and it is mandatory to use ABB/AVS Class 0 support for all OPPs.
Clock nodes are pending clock node alignment.
[nm@ti.com: cleanups and rebase to latest]
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: J Keerthy <j-keerthy@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
J Keerthy [Wed, 16 Oct 2013 15:39:06 +0000 (10:39 -0500)]
ARM: dts: OMAP5: Add CPU OPP table
Add DT OPP table for OMAP54xx family of devices. This data is
decoded by OF with of_init_opp_table() helper function.
The data is based on OMAP543x ES2.0 DM Operating Condition Addendum
Version 0.6(April 2013)
NOTE: The voltage and frequency values work well only on NOM samples
and are supposed to work properly only with ABB/AVS for ALL OPPs.
TODO: Add SPEED BIN OPP after ABB and AVS support so the cpufreq works
on all samples seamlessly. Clock node is pending alignment for clock
dts conversion
[nm@ti.com: sync to latest and fixes]
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: J Keerthy <j-keerthy@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
J Keerthy [Wed, 16 Oct 2013 15:39:05 +0000 (10:39 -0500)]
ARM: dts: dra7-evm: add smps123 supply for CPU
regulator smps123 supply from Palmas PMIC powers CPU0 on DRA7 EVM.
[nm@ti.com: rebase to latest]
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: J Keerthy <j-keerthy@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Nishanth Menon [Wed, 16 Oct 2013 15:39:04 +0000 (10:39 -0500)]
ARM: dts: omap5-uevm: add smps123 supply for CPU
regulator smps123 supply from Palmas PMIC powers CPU0 on OMAP5uEVM.
Based on a patch by J Keerthy <j-keerthy@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Nishanth Menon [Wed, 16 Oct 2013 15:39:03 +0000 (10:39 -0500)]
ARM: OMAP3+: use cpu0-cpufreq driver in device tree supported boot
With OMAP3+ and AM33xx supported SoC having defined CPU device tree
entries with operating-points and clock nodes defined, we can now use
the SoC generic cpufreq-cpu0 driver by registering appropriate device.
Cc: Benoit Cousson <bcousson@baylibre.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Nishanth Menon [Wed, 16 Oct 2013 15:39:02 +0000 (10:39 -0500)]
ARM: OMAP2+: add missing lateinit hook for calling pm late init
AM335x, AM43xx, OMAP5 and DRA7 have missing late init hook. Introduce
SoC specific hook with a call to OMAP2+ generic lateinit hook. This
allows the generic late initializations such as cpufreq hooks to be
active.
Based on out-of-tree patches that need to be introduced in
mainline, this introduction allows us to provide the foundation for
further SoC specific features as they are developed.
Cc: Benoit Cousson <bcousson@baylibre.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Nishanth Menon [Wed, 16 Oct 2013 15:39:01 +0000 (10:39 -0500)]
ARM: OMAP3+: do not register non-dt OPP tables for device tree boot
OMAP3+ supports both device tree and non-device tree boot.
Device tree bindings for OMAP3+ is supposed to be added via dts following:
Documentation/devicetree/bindings/power/opp.txt
Since we now have device tree entries for OMAP3+ cpu OPPs,
The current code wrongly adds duplicate OPPs. So, dont register OPPs
when booting using device tree.
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Eric Witcher [Fri, 18 Oct 2013 06:42:34 +0000 (02:42 -0400)]
ARM: dts: omap5-uevm: fix mcspi node pin descriptions
Correct mcspi pin descriptions to match corresponding node name and
add chip select number to be consistent with OMAP5 TRM.
Signed-off-by: Eric Witcher <ewitcher@mindspring.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Markus Pargmann [Mon, 14 Oct 2013 12:49:21 +0000 (14:49 +0200)]
ARM: dts: am33xx, change usb ctrl module label
Control module is not usb specific.
Changes the label to usb_ctrl_mod.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Mark Jackson [Fri, 4 Oct 2013 08:15:01 +0000 (09:15 +0100)]
ARM: dts: Add support for Newflow NanoBone board
NanoBone Specification:
-----------------------
CPU:
TI AM335x
Memory:
256MB DDR3
128MB NOR flash
128KB FRAM
Ethernet:
2 x 10/100 connected to SMSC LAN8710 PHY
USB:
1 x USB2.0 Type A
I2C:
2Kbit EEPROM (Microchip 24AA02)
RTC (Maxim DS1338)
GPIO Expander (Microchip MCP23017)
Expansion connector:
6 x UART
1 x MMC/SD
1 x USB2.0
Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Tony Lindgren [Thu, 17 Oct 2013 22:15:22 +0000 (15:15 -0700)]
ARM: dts: Add missing reg, interrupt and dma entries for omap3
Looks like omap3 is still relying on hwmod data for some basic
device tree information. Let's add the information to omap3.dtsi
so we can remove the related hwmod data once omap3 is DT only.
Acked-by: Benoit Cousson <bcousson@baylibre.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Tue, 22 Oct 2013 12:29:12 +0000 (05:29 -0700)]
Merge tag 'for_3.13_late/dts_signed' of git://git./linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.13/dt
Add i2c aliases
Add McASP and audio support
Add reset/idle on init bindings for OMAP
Add more nodes for AM4272
Nishanth Menon [Wed, 16 Oct 2013 20:21:04 +0000 (15:21 -0500)]
ARM: dts: AM33xx+: Add i2c aliases
Provide alias to allow ordering the i2c devices correctly.
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Nishanth Menon [Wed, 16 Oct 2013 20:21:03 +0000 (15:21 -0500)]
ARM: dts: OMAP3+: Add i2c aliases
Currently, on OMAP5, i2c1 and i2c5 defer probe due to pinctrl
dependencies. This changes the i2c ID each bus is registered with in
i2c-dev interface. As a result of this, many userspace tools break and
there is no consistent manner to fix the same if the i2c dev interface
have no consistent numbering.
Since this could happen for other OMAP derivatives, provide i2c alias
for all OMAP3+ SoCs to allow ordering the i2c devices correctly.
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Enric Balletbo i Serra [Sat, 19 Oct 2013 20:55:19 +0000 (22:55 +0200)]
ARM: dts: igep0033: Add mmc1 node for SDCARD support.
Add mmc1 dt node to IGEP COM AQUILA board.
Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Peter Ujfalusi [Mon, 21 Oct 2013 09:45:58 +0000 (12:45 +0300)]
ARM: dts: AM4372: Add McASP nodes
Add nodes for McASP0 and McASP1 for AM43xx.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Roger Quadros [Mon, 7 Oct 2013 10:46:50 +0000 (13:46 +0300)]
ARM: dts: omap3-beagle: Adapt USB OTG to generic PHY framework
The generic PHY framewrok expects different properties than the
old USB PHY framework. Supply those properties.
Fixes USB OTG port on beagle after the Generic PHY framework was
merged in greg/usb-next. [1]
[1] - https://lkml.org/lkml/2013/9/27/581
Signed-off-by: Roger Quadros <rogerq@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Peter Ujfalusi [Sun, 20 Oct 2013 17:04:11 +0000 (20:04 +0300)]
ARM: dts: am335x-evmsk: Audio support
AM335x EVM-SK have only support for audio playback (stereo jack on the
board) via tlv320aic3106 codec connected to McASP1.
Enable the support for audio playback on the board:
- McASP1 configuration
- tlv320aic3106 configuration
- Machine driver.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Darren Etheridge [Sun, 20 Oct 2013 17:04:10 +0000 (20:04 +0300)]
ARM: dts: am335x-evm: Add audio support for am335x-evm.dts
Adds sound, tlv320aic3106, mcasp1, and am335x_evm_audio_pin nodes.
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Jyri Sarha [Sun, 20 Oct 2013 17:04:09 +0000 (20:04 +0300)]
ARM: dts: AM33XX: mcasp: Add location for data port registers to reg-property
This patch adds a second tuple to reg property. The new property tuple
describes the memory location for data port registers mapped trough
L3 bus on am33xx. The both property tuples are named accordingly in
the reg-names property.
Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Pantelis Antoniou [Sun, 20 Oct 2013 17:04:08 +0000 (20:04 +0300)]
ARM: dts: AM33XX: Add mcasp0 and mcasp1 device tree entries
Add missing mcasp entries in the am33xx.dtsi include file.
Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Mugunthan V N [Thu, 10 Oct 2013 19:14:54 +0000 (00:44 +0530)]
ARM: dts: AM4372: Update Support for EPOS EVM
-> Adding pinmux for cpsw, i2c0.
-> Enabling the modules that are present in AM4372 EPOS EVM
These modules are tested on AM4372 EPOS EVM.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Lokesh Vutla [Thu, 10 Oct 2013 19:14:53 +0000 (00:44 +0530)]
ARM: dts: AM4372: Add L2, EDMA, mailbox, MMC and SHAM nodes
Populate nodes for l2-cache-controller, EDMA, mailbox,
mmc, sham.
Update as well DT properties for epwmss, aes, des.
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
George Cherian [Thu, 10 Oct 2013 10:49:54 +0000 (16:19 +0530)]
ARM: dts: OMAP5: Add dr_mode for dwc3
Added dr_mode property in dwc3 and set its default mode to device.
Signed-off-by: George Cherian <george.cherian@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Kishon Vijay Abraham I [Thu, 10 Oct 2013 10:49:53 +0000 (16:19 +0530)]
ARM: dts: omap5-uevm: remove always_on, boot_on from smps10_out1
smps10 should be enabled only in the case of host mode. So stop
doing always_on, boot_on from smps10_out1. The driver will enable
it in host mode.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Nishanth Menon [Thu, 10 Oct 2013 16:44:41 +0000 (11:44 -0500)]
ARM: dts: omap4-panda-es: Do not reset gpio1
Do not reset GPIO1 at boot-up because GPIO 7 in GPIO1 block is used on
OMAP4460 PandaBoard-ES to select voltage register in TPS62361 which
supplies VDD_MPU.
Without this, OMAP4460 PandaBoard-ES boards fail to boot-up because
MPU voltage switches over to VSET0 voltage value (boot voltage) which
is not sufficient to operate the device at OPP100.
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Rajendra Nayak [Wed, 9 Oct 2013 10:12:01 +0000 (15:42 +0530)]
ARM: dts: am335x-evmsk: Do not reset gpio0
Do not reset GPIO0 at boot-up because GPIO0 is used
on AM335x EVM-SK to control VTT regulators on DDR3.
Without this EVM-SK boards fail to boot-up because
of DDR3 corruption.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Rajendra Nayak [Tue, 15 Oct 2013 07:07:50 +0000 (12:37 +0530)]
ARM: dts: omap: Add reset/idle on init bindings for OMAP
On OMAP we have co-processor IPs, memory controllers,
GPIOs which control regulators and power switches to
PMIC, and SoC internal Bus IPs, some or most of which
should either not be reset or idled or both at init.
(In some cases there are erratas which prevent an IP
from being reset)
Have a way to pass this information from DT.
Update the am33xx/omap4 and omap5 dtsi files with the
new bindings for modules which either should not be
idled. reset or both. A later patch would cleanup the
same information that exists today as part of the hwmod
data files.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Roger Quadros [Mon, 7 Oct 2013 13:28:13 +0000 (16:28 +0300)]
ARM: dts: omap3: Adapt USB OTG to generic PHY framework
The generic PHY framewrok expects different properties than the
old USB PHY framework. Supply those properties.
Fixes USB OTG port on GAT04 and N900 after the Generic PHY framework was
merged in greg/usb-next. [1]
[1] - https://lkml.org/lkml/2013/9/27/581
Signed-off-by: Roger Quadros <rogerq@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sricharan R [Thu, 10 Oct 2013 07:50:13 +0000 (13:20 +0530)]
ARM: dts: OMAP5: Remove clock-frequency field for cpu timers
The arm arch timers frequency are now programmed in the CNTFREQ
per-cpu register by the timer code using the secure API [1].
So remove the redundant entry from the dts.
[1] http://marc.info/?l=linux-omap&m=
138139106312786&w=2
Signed-off-by: Sricharan R <r.sricharan@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Olof Johansson [Sat, 19 Oct 2013 00:30:19 +0000 (17:30 -0700)]
Merge tag 'omap-for-v3.13/pinctrl-fix' of git://git./linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren:
Looks like I managed to break the x86 build for some
configs. Here's a fix for that on top of the pinctrl
changes already merged with the signed tag
omap-for-v3.13/quirk-signed.
* tag 'omap-for-v3.13/pinctrl-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
pinctrl: single: Fix build when not built on ARM
Signed-off-by: Olof Johansson <olof@lixom.net>
Tony Lindgren [Fri, 18 Oct 2013 23:20:05 +0000 (16:20 -0700)]
pinctrl: single: Fix build when not built on ARM
Looks like we need a little bit of arch specific handling
with the generic IRQ. Fix the issue with an ifdef the
same way as other drivers do.
ARM needs things set to IRQF_VALID, which also then sets
noprobe. Others seem to use just irq_set_noprobe().
Otherwise we can get:
drivers/pinctrl/pinctrl-single.c: In function 'pcs_irqdomain_map':
drivers/pinctrl/pinctrl-single.c:1750:2: error: implicit declaration of function 'set_irq_flags' [-Werror=implicit-function-declaration]
drivers/pinctrl/pinctrl-single.c:1750:21: error: 'IRQF_VALID' undeclared (first use in this function)
drivers/pinctrl/pinctrl-single.c:1750:34: error: 'IRQF_PROBE' undeclared (first use in this function)
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kevin Hilman [Fri, 18 Oct 2013 18:30:16 +0000 (11:30 -0700)]
Merge tag 'omap-for-v3.13/board-removal-signed-take2' of git://git./linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren:
Changes needed to drop legacy booting support for some
omap3 boards.
Note that that these are based on a merge of the
following for the dependencies:
- v3.12-rc5 for fixes to pinctrl mask
- omap-for-v3.13/dt-signed to avoid pointless merge conflicts
- omap-for-v3.13/quirk-signed for legacy pdata handling
* tag 'omap-for-v3.13/board-removal-signed-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (125 commits)
ARM: OMAP2+: remove legacy support for IGEP boards
ARM: OMAP2+: Remove legacy support for zoom platforms
ARM: OMAP2+: Remove legacy booting support for omap3 EVM
ARM: OMAP2: delete board-rm680
ARM: dts: add minimal DT support for Nokia N950 & N9 phones
ARM: dts: Add basic support for zoom3
ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
ARM: dts: Add common support for omap3-evm
ARM: dts: Shared file for omap GPMC connected smsc911x
+Linux 3.12-rc5
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Javier Martinez Canillas [Fri, 18 Oct 2013 15:37:53 +0000 (17:37 +0200)]
ARM: OMAP2+: remove legacy support for IGEP boards
Device Tree support for IGEP boards in mainline is almost
finished. The only remaining bits are support for the
Marvell SD8686 wifi + BT and TFP410 DVI chips.
Adding support for these should be straightforward so let's
not block OMAP3 moving to Device Tree only boot and remove
the board file for IGEP boards.
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Mon, 14 Oct 2013 18:31:44 +0000 (11:31 -0700)]
ARM: OMAP2+: Remove legacy support for zoom platforms
We now have pretty decent device tree based support for
zoom platforms. It's not complete, but basics work for
me so adding more features should be quite trivial.
Looks like also 3630 sdp is zoom based, and looking
at it's board file should also be trivial to support
with the device tree based booting.
Patches are welcome if people are still using these.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Mon, 14 Oct 2013 18:31:43 +0000 (11:31 -0700)]
ARM: OMAP2+: Remove legacy booting support for omap3 EVM
We now have pretty decent support with the device tree
based booting. Patches to add more features are welcome.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Aaro Koskinen [Mon, 14 Oct 2013 18:30:45 +0000 (11:30 -0700)]
ARM: OMAP2: delete board-rm680
Delete board file for Nokia RM-680/RM-696 (N950/N9). DT-based booting
should be used for further development on this HW.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Aaro Koskinen [Tue, 15 Oct 2013 20:36:09 +0000 (23:36 +0300)]
ARM: dts: add minimal DT support for Nokia N950 & N9 phones
Add minimal DT support for Nokia N950 & N9 phones. The same functionality
that is provided by the current board file should work: serial console,
USB, OneNAND and MMC.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tony Lindgren [Mon, 14 Oct 2013 18:31:43 +0000 (11:31 -0700)]
ARM: dts: Add basic support for zoom3
I've tested serial, MMC, smsc911x and wl12xx on zoom3. As my
omap is an early ES revision, I have not been able to test
off-idle on this one. But anyways, I'd say we have enough
device tree support for the zoom to be able to drop the
board-zoom files. Patches are welcome to add further features
to this .dts file.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Shawn Guo [Fri, 18 Oct 2013 15:27:37 +0000 (23:27 +0800)]
ARM: imx: imx6sl iomuxc syscon is compatible to imx6q
The imx6sl iomuxc syscon is compatible to imx6q, so let's add
compatible string 'fsl,imx6q-iomuxc-gpr' for imx6sl iomuxc syscon node.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Kevin Hilman [Fri, 18 Oct 2013 15:21:17 +0000 (08:21 -0700)]
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
From Nicolas Ferre:
First DT series for 3.13
- addition of sound for at91sam9n12
- a little fix for MMC vs. SPI on at91sam9g20ek
* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
ARM: at91: remove pinctrl conflict between mmc and SPI for at91sam9g20ek
ARM: at91: add sound support on at91sam9n12ek board
ARM: at91: enable ssc on at91sam9n12ek board
ARM: at91: enable wm8904 on at91sam9n12ek board
ARM: at91: add ssc dma parameter for at91sam9n12
ARM: at91: add at91sam9n12 ssc clock in look up table
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Jean-Christophe PLAGNIOL-VILLARD [Fri, 18 Oct 2013 14:23:23 +0000 (16:23 +0200)]
ARM: at91: remove pinctrl conflict between mmc and SPI for at91sam9g20ek
These MMC and SPI buses can't be configured at the same time because they
share the same traces on the EK board.
Reported-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Linus Walleij [Fri, 18 Oct 2013 08:25:52 +0000 (10:25 +0200)]
ARM: ux500: register all SSP and SPI blocks
This adds the SSP and SPI blocks to the device tree and makes
them active. Only this way can their clocks be properly gated
off at boot.
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij [Fri, 18 Oct 2013 08:39:58 +0000 (10:39 +0200)]
ARM: ux500: fix I2C4 clock bit
The PCLK for I2C4 is controlled by bit 10 in the PCKEN registers
while the KCLK is controlled by bit 9 on the KCKEN, it's
one of these odd assymetric things. Correct the PCLK bit to 10.
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij [Fri, 18 Oct 2013 07:49:21 +0000 (09:49 +0200)]
ARM: ux500: fix clock for GPIO blocks 6 and 7
The clock assignment in the device tree for GPIO blocks 6
and 7 was incorrect, indicating this was managed by bit 1 on
PRCC 2 while it was in fact bit 11 on PRCC 2.
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij [Fri, 18 Oct 2013 08:56:14 +0000 (10:56 +0200)]
clk: ux500: fix erroneous bit assignment
Due to a typo or similar, the peripheral group 2 clock 11
gate was set to bit 1 instead of bit 11. We need to fix this
to be able to set the correct enable bit in the device tree:
when trying to correct the bit assignment in the device tree,
the system would hang.
Cc: Mike Turquette <mturquette@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij [Fri, 18 Oct 2013 07:45:07 +0000 (09:45 +0200)]
ARM: ux500: fix clock for GPIO block 8
The clock assignment in the device tree for GPIO block 8 was
incorrect, indicating this was managed by bit 1 on PRCC 6
while it was in fact bit 1 on PRCC 5.
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Huang Shijie [Fri, 18 Oct 2013 02:32:53 +0000 (10:32 +0800)]
ARM: dts: imx6sl-evk: enable the SPI NOR
enable the spi nor for imx6sl-evk boards.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Huang Shijie [Fri, 18 Oct 2013 02:32:52 +0000 (10:32 +0800)]
ARM: dts: imx6sl: add a pinctrl for ECSPI1
add a pinctrl for ECSPI1. This pinctrl can be used in the imx6sl-evk board.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>