Commit Graph

322524 Commits

Author SHA1 Message Date
Olof Johansson
cecb9a1e4d Merge tag 'imx-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
- All imx53 board files are removed by the equal device tree support
- The efikamx board files are removed to ease device tree migration
- Remove dummy pinctrl state by setting up pinctrl in device tree

* tag 'imx-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6: (28 commits)
  ARM: imx6q-sabrelite: Rename 'pinctrl_gpio_hog'
  ARM: imx51: decouple device tree boot from board files
  ARM: imx51: build in pinctrl support
  ARM: dts: imx51-babbage: add pinctrl settings
  ARM: imx53: remove unneeded files and functions
  ARM: imx53: support device tree boot only
  ARM: imx53: decouple device tree boot from board files
  ARM: imx53: build in pinctrl support
  ARM: dts: imx53-smd: add pinctrl settings
  ARM: dts: imx53-evk: add pinctrl settings
  ARM: dts: imx53-ard: add pinctrl settings
  ARM: dts: imx53-qsb: add pinctrl settings
  ARM: imx6q: remove dummy pinctrl state
  ARM: dts: imx6q-sabresd: add pinctrl settings
  ARM: dts: imx6q-arm2: add pinctrl for uart and enet
  ARM: dts: imx6q-sabrelite: add pinctrl for usdhc and enet
  ARM: dts: imx6q: sort iomuxc sub-nodes in name
  ARM: dts: imx6q: name iomuxc sub-nodes following pin function
  ARM: dts: imx6q: improve indentation for fsl,pins
  ARM: efikamx: remove Genesi Efika MX platform files from the tree
  ...

Resolved trivial context conflict in arch/arm/boot/dts/imx51-babbage.dts
2012-09-12 23:17:11 -07:00
Olof Johansson
83ae0ffa50 Merge tag 'mxs-clk-dt-lookup' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
It replaces clk_register_clkdev in mxs clock driver with DT lookup.

* tag 'mxs-clk-dt-lookup' of git://git.linaro.org/people/shawnguo/linux-2.6:
  clk: mxs: replace imx23 clk_register_clkdev with clock DT lookup
  clk: mxs: replace imx28 clk_register_clkdev with clock DT lookup
2012-09-12 23:04:12 -07:00
Olof Johansson
77ea4a300d Merge branch 'clk-3.7' of git://git.linaro.org/people/mturquette/linux into next/dt
* 'clk-3.7' of git://git.linaro.org/people/mturquette/linux:
  clk: add of_clk_src_onecell_get() support
  clk: ux500: Define smp_twd clock for u8500
  mfd: dbx500: Provide a more accurate smp_twd clock
  clk: ux500: Support for prmcu_rate clock
  clk: Provide option for clk_get_rate to issue hw for new rate
  clock: max77686: Add driver for Maxim 77686 32Khz crystal oscillator.
  ARM: ux500: Switch to use common clock framework
  clk: ux500: Clock definitions for u8500
  clk: ux500: First version of clock definitions for ux500
  clk: ux500: Adapt PRCMU and PRCC clocks for common clk
  clk: versatile: make config option boolean
  clk: add Loongson1B clock support
  arm: mmp: make all SOCs use common clock by default
  clk: mmp: add clock definition for mmp2
  clk: mmp: add clock definition for pxa910
  clk: mmp: add clock definition for pxa168
  clk: mmp: add mmp specific clocks
  clk: convert ARM RealView to common clk
  clk: prima2: move from arch/arm/mach to drivers/clk
  ARM: PRIMA2: convert to common clk and finish full clk tree
2012-09-12 23:03:37 -07:00
Olof Johansson
839a8d77c9 Merge tag 'mxs-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
- Remove all board files and make mach-mxs a DT-only platform
- Some dts file formatting and style fixing
- DTS update for additional boards and devices

* tag 'mxs-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6: (28 commits)
  ARM: dts: cfa10049: Add the 74HC595 gpio expanders
  ARM: dts: m28evk: Fix MMC WP pin being inverted
  ARM: dts: cfa10049: Add SSP3 to the 10049 board
  ARM: dts: mxs: Add missing address and size cells in SSP nodes
  ARM: mx28evk: Add I2C EEPROM support
  ARM: dts: mxs: Enable USB1 Host on the CFA-10049 expansion board
  ARM: dts: mxs: Add the second I2C adapter to the CFA10049 expansion board
  ARM: dts: mxs: Add I2C1 muxing options for imx28
  ARM: mx28evk: Add LRADC support
  ARM: mx28evk: Add SPI flash support
  ARM: mxs: Update DENX M28 machine and dts file
  ARM: mx28: Add USB PHY overcurrent pinmux
  ARM: mx28: Add SPI 2 pinmux into imx28.dtsi
  ARM: dts: mxs: Add pwm4 muxing options for imx28
  ARM: dts: mxs: Add alternative I2C muxing options for imx28
  ARM: olinuxino: Add gpio-led support
  ARM: mxs: Let mmc0 pin detect be generic
  ARM: mxs: Rename 'hog-gpios'
  ARM: mxs: remove iomux driver
  ARM: mxs: remove platform device codes
  ...
2012-09-12 22:47:07 -07:00
Fabio Estevam
f8135a74df ARM: imx6q-sabrelite: Rename 'pinctrl_gpio_hog'
'pinctrl_gpio_hog' is used to setup the pin functions, and it is not
neccesarily used only for GPIO pins, so remove 'gpio' from its name
to describe a more generic term.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:27:00 +08:00
Shawn Guo
0782783182 ARM: imx51: decouple device tree boot from board files
Now, imx51 device tree kernel calls pinctrl to set up pins.  The
function used to hook up non-DT pin setup is not needed for DT boot
any more.  Remove it from DT image.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:59 +08:00
Shawn Guo
b6798f88bc ARM: imx51: build in pinctrl support
With the imx51 DT board having pinctrl setup define in device tree,
it's time to remove dummy pinctrl state and build in the real imx51
pinctrl support.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:58 +08:00
Shawn Guo
b72cf10578 ARM: dts: imx51-babbage: add pinctrl settings
Add pinctrl settings for the exsiting devices in imx51-babbage.dts.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:58 +08:00
Shawn Guo
0f9d4504a5 ARM: imx53: remove unneeded files and functions
Now imx53 is a device tree only platform, so the files and functions
used only by non-DT kernel can be removed.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:57 +08:00
Shawn Guo
442279da12 ARM: imx53: support device tree boot only
With device tree kernel provides the equal support as those imx53 board
files, it's time to remove the board files and get imx53 support device
tree only.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:55 +08:00
Shawn Guo
721a44145a ARM: imx53: decouple device tree boot from board files
Now, imx53 device tree kernel calls pinctrl to set up pins.  The
functions used to hook up non-DT pin setup is not needed for DT boot
any more.  Remove them from DT image.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:54 +08:00
Shawn Guo
1a60a4de8b ARM: imx53: build in pinctrl support
As all imx53 boards booting from device tree have pinctrl set up in dts,
it's time to remove the dummy pinctrl state and build in the real imx53
pinctrl support.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:53 +08:00
Shawn Guo
072480426b ARM: dts: imx53-smd: add pinctrl settings
Add pinctrl settings for the exsiting devices in imx53-smd.dts.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:52 +08:00
Shawn Guo
327a79c01e ARM: dts: imx53-evk: add pinctrl settings
Add pinctrl settings for the exsiting devices in imx53-evk.dts.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:52 +08:00
Shawn Guo
4bb6143cbe ARM: dts: imx53-ard: add pinctrl settings
Add pinctrl settings for the exsiting devices in imx53-ard.dts.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:51 +08:00
Shawn Guo
5be03a7bdb ARM: dts: imx53-qsb: add pinctrl settings
Add pinctrl settings for existing devices in imx53-qsb.dts.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:50 +08:00
Shawn Guo
d9d253a498 ARM: imx6q: remove dummy pinctrl state
As all imx6q boards have pinctrl set up in device tree, it's time to
remove the dummy pinctrl state.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:49 +08:00
Shawn Guo
497ae1747b ARM: dts: imx6q-sabresd: add pinctrl settings
Add pinctrl settings for existing devices in imx6q-sabresd.dts.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:48 +08:00
Shawn Guo
9e3c00665d ARM: dts: imx6q-arm2: add pinctrl for uart and enet
Add missing pinctrl of uart and enet for imx6q-arm2 board.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:47 +08:00
Shawn Guo
99d5f0cc17 ARM: dts: imx6q-sabrelite: add pinctrl for usdhc and enet
Add missing pinctrl of usdhc and enet for imx6q-sabrelite board.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:46 +08:00
Shawn Guo
52ccd49203 ARM: dts: imx6q: sort iomuxc sub-nodes in name
Sort iomuxc sub-nodes in name so that the node can be located a little
bit easier.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:45 +08:00
Shawn Guo
e30ba89fdf ARM: dts: imx6q: name iomuxc sub-nodes following pin function
Name iomuxc sub-nodes following pin function and hardware manual.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:44 +08:00
Shawn Guo
44a509fc47 ARM: dts: imx6q: improve indentation for fsl,pins
Change the indentation for property fsl,pins a little bit, so that
the first and the last line get the same indentation with all other
lines.  Then it will be easier to copy and past any of these lines.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 16:26:43 +08:00
Shawn Guo
53f9443da6 clk: mxs: replace imx23 clk_register_clkdev with clock DT lookup
It really becomes a maintenance issue that every time a device needs
to look up (clk_get) a clock we have to patch kernel clock file to call
clk_register_clkdev for that clock.

Since clock DT support which is meant to resolve clock lookup in device
tree is in place, the patch moves imx23 client devices' clock lookup
over to device tree, so that any new lookup to be added at later time
can just get done in DT instead of kernel.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 14:45:46 +08:00
Shawn Guo
b598b9f311 clk: mxs: replace imx28 clk_register_clkdev with clock DT lookup
It really becomes a maintenance issue that every time a device needs
to look up (clk_get) a clock we have to patch kernel clock file to call
clk_register_clkdev for that clock.

Since clock DT support which is meant to resolve clock lookup in device
tree is in place, the patch moves imx28 client devices' clock lookup
over to device tree, so that any new lookup to be added at later time
can just get done in DT instead of kernel.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 14:45:46 +08:00
Shawn Guo
0a77398b5a Merge tag 'mxs-dt-3.7' into mxs/clk-dt-lookup
mxs-dt-3.7

- Remove all board files and make mach-mxs a DT-only platform
- Some dts file formatting and style fixing
- DTS update for additional boards and devices
2012-09-11 14:15:00 +08:00
Maxime Ripard
13b4569bbb ARM: dts: cfa10049: Add the 74HC595 gpio expanders
Add the two daisy-chains of 74hc595s shift registers available on the
CFA-10049.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-11 09:51:30 +08:00
Shawn Guo
494bfec999 clk: add of_clk_src_onecell_get() support
For those SoCs that have hundreds of clock outputs, their clock
DT bindings could reasonably define #clock-cells as 1 and require
the client device specify the index of the clock it consumes in the
cell of its "clocks" phandle.

Add a generic of_clk_src_onecell_get() function for this purpose.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2012-09-07 18:30:19 -07:00
Olof Johansson
fd6c9b75c7 Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dt
* 'lpc32xx/dts' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: Extend dts for EA3250 board
  ARM: LPC32xx: Adjust device tree node to new standard num-cs
2012-09-07 14:59:25 -07:00
Ulf Hansson
09b9b2b204 clk: ux500: Define smp_twd clock for u8500
The smp_twd clock is based upon a prcmu_rate clock type
for the PRCMU_ARMSS clock.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2012-09-06 18:00:42 -07:00
Michel Jaouen
20aee5b6d7 mfd: dbx500: Provide a more accurate smp_twd clock
The local timer clock is based on ARM subsystem clock. This patch
obtains a more exact value of that clock by reading PRCMU registers.
Using this increases the accuracy of the local timer events.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rickard Andersson <rickard.andersson@stericsson.com>
Signed-off-by: Michel Jaouen <michel.jaouen@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2012-09-06 17:57:21 -07:00
Ulf Hansson
70b1fce2ec clk: ux500: Support for prmcu_rate clock
The prmcu_rate clock is not gateable and has a rate which
only can be fetched.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2012-09-06 17:57:08 -07:00
Ulf Hansson
a093bde2b4 clk: Provide option for clk_get_rate to issue hw for new rate
By using CLK_GET_RATE_NOCACHE flag, we tell the clk_get_rate API to
issue the hw for an updated clock rate. This can be used for a clock
which rate may be updated without a client necessary modifying it.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2012-09-06 17:56:22 -07:00
Jonghwa Lee
73118e6188 clock: max77686: Add driver for Maxim 77686 32Khz crystal oscillator.
This patch supports max77686 mfd's clock driver using common clock frame work.
max77686 has 3 clock ouputs which all are generated from crystal oscillator and
SOC can enable/disable them via I2C bus. All clocks are fixed-rate clock sources
so that it doesn't supply interface for changing clock rate.
Driver uses regmap API to communicate with internal register.

Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2012-09-06 16:55:38 -07:00
Ulf Hansson
ebc96db763 ARM: ux500: Switch to use common clock framework
Remove machine specific clock implementation and switch to use
new common clock framework.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2012-09-06 15:58:20 -07:00
Ulf Hansson
0e6dcde728 clk: ux500: Clock definitions for u8500
First version of clock definitions of PRCMU and PRCC clocks
for the u8500 platform.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2012-09-06 15:58:12 -07:00
Ulf Hansson
bce5afd8d9 clk: ux500: First version of clock definitions for ux500
In this first version of the clock definitions, the structure for
ux500 are set. Support for u8500, u9540 and u8540 are prepared.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2012-09-06 15:58:04 -07:00
Ulf Hansson
3b01f87be2 clk: ux500: Adapt PRCMU and PRCC clocks for common clk
First version of common clock implementation of PRCMU clocks
and PRCC clocks for ux500 platforms.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2012-09-06 15:57:47 -07:00
Roland Stigge
25b3ab6c7e ARM: LPC32xx: Extend dts for EA3250 board
This patch adds keys and leds to the EA3250 board's dts device tree file.

Signed-off-by: Roland Stigge <stigge@antcom.de>
2012-09-06 11:40:48 +02:00
Roland Stigge
067c182fb5 ARM: LPC32xx: Adjust device tree node to new standard num-cs
In spi-pl022.c, the new device tree binding is now "num-cs" for the number of
chip selects. Further, pl022,hierarchy and pl022,slave-tx-disable isn't
supported in favour of reasonable defaults in the driver.

Adjusting phy3250.dts to it.

Signed-off-by: Roland Stigge <stigge@antcom.de>
2012-09-06 11:40:42 +02:00
Olof Johansson
402efdb48d Merge branch 'pinmux-dt' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/dt
This branch enables device tree bindings for the CSR Prima pin control
subsystem. All patches acked by Linus W (pinctrl maintainer).

* 'pinmux-dt' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel:
  pinctrl: sirf: add DT-binding pinmux mapping support
  ARM: PRIMA2: rename prima2-cb.dts to prima2.dtsi as it only has SoC features
  ARM: PRIMA2: add missing interrupts property for pinctrl node
  + sync to Linux 3.6-rc4
2012-09-05 16:27:00 -07:00
Olof Johansson
1875962377 Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
* 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: mach-shmobile: Add compilation support for dtbs using 'make dtbs'
  + sync to 3.6-rc3
2012-09-05 15:35:48 -07:00
Barry Song
056876f6c7 pinctrl: sirf: add DT-binding pinmux mapping support
This makes us possible to define pinmux mapping in board-specific DTS.
prima2.dtsi provides all possible (groups,functions) configuration, and
device in .dts select configurations from dtsi files.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
2012-09-05 14:48:10 +08:00
Barry Song
434e1c574c ARM: PRIMA2: rename prima2-cb.dts to prima2.dtsi as it only has SoC features
The current prima2-cb.dts only includes prima2 SoC feature without board-
specific descriptions. This patches rename it to dtsi and clean some useless
content.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
2012-09-05 14:46:44 +08:00
Barry Song
500b6ae3c1 ARM: PRIMA2: add missing interrupts property for pinctrl node
commit 5130216265 missed the interrupts property

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
2012-09-05 14:45:34 +08:00
Marek Vasut
acd3b69f30 ARM: dts: m28evk: Fix MMC WP pin being inverted
The MMC WP is active high on the m28evk, fix this.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-05 11:53:11 +08:00
Maxime Ripard
223d1f9213 ARM: dts: cfa10049: Add SSP3 to the 10049 board
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-05 10:44:11 +08:00
Maxime Ripard
41bf5706f4 ARM: dts: mxs: Add missing address and size cells in SSP nodes
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-05 10:43:17 +08:00
Fabio Estevam
fa876ceff9 ARM: mx28evk: Add I2C EEPROM support
mx28evk has a free slot U50 that can be used to populate an I2C EEPROM.

Add support for it.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-09-05 09:17:15 +08:00
Linus Walleij
672575e1de clk: versatile: make config option boolean
There is no choice to have the RealView clocks as module for sure,
so turn this config option into a boolean.

Reported-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2012-09-04 15:28:42 -07:00