aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge branch 'orion/cleanup' into orion/dtOlof Johansson2012-11-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge in the cleanups that should have been used as the base of the DT branch instead of letting the conflicts be exposed all the way up to the toplevel merges. All of these are caused by cleanups being done both in the cleanup branch and the dt branch, resulting in remove/remove conflicts of header files. By Andrew Lunn (3) and others via Jason Cooper * orion/cleanup: ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan ARM: Kirkwood: checkpatch cleanups ARM: Kirkwood: Fix sparse warnings. ARM: Kirkwood: Remove unused includes ARM: kirkwood: cleanup lsxl board includes Remove/remove conflicts in: arch/arm/mach-kirkwood/board-dockstar.c arch/arm/mach-kirkwood/board-goflexnet.c arch/arm/mach-kirkwood/board-lsxl.c Signed-off-by: Olof Johansson <olof@lixom.net>
| * ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scanJason Gunthorpe2012-11-21
| | | | | | | | | | | | | | | | | | The kirkwood_pcie_scan_bus function duplicates the common code in bios32.c, passing ops in will use the common code.. Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| * ARM: Kirkwood: checkpatch cleanupsAndrew Lunn2012-11-18
| | | | | | | | | | | | | | | | Mostly printk to pr_{err|info} changes and a few strings split over multiple lines are combined. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| * ARM: Kirkwood: Fix sparse warnings.Andrew Lunn2012-11-18
| | | | | | | | | | | | | | | | Mostly missing statics, but also missing include files and void parameters. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| * ARM: Kirkwood: Remove unused includesAndrew Lunn2012-11-18
| | | | | | | | | | | | | | | | With the gradual conversion of C code to DT, there are a number of include files which are no longer needed. Remove them. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| * ARM: kirkwood: cleanup lsxl board includesMichael Walle2012-11-18
| | | | | | | | | | | | | | | | Remove unneeded includes. These are leftovers from platform device registrations. Signed-off-by: Michael Walle <michael@walle.cc> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: remove kirkwood_ehci_init() from new boardsJason Cooper2012-11-23
| | | | | | | | | | | | | | ehci-orion initialization moved to DT. New boards don't need to call kirkwood_ehci_init(). Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Add support LED of OpenBlocks A6Nobuhiro Iwamatsu2012-11-23
| | | | | | | | | | | | | | | | OpenBlocks A6 has three leds via GPIO. This supports them. And this fix typo about led, because hardware manual has typo. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6Nobuhiro Iwamatsu2012-11-23
| | | | | | | | | | | | | | | | EHCI driver enables by default in kirkwood.dtsi. This removes kirkwood_ehci_init function. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: kirkwood: Add NAND partiton map for OpenBlocks A6Nobuhiro Iwamatsu2012-11-23
| | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6Nobuhiro Iwamatsu2012-11-23
| | | | | | | | | | | | | | | | OpenBlocks A6 uses second I2C with RTC of s35390a. This supports them. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: kirkwood: Add support DT of second I2C busNobuhiro Iwamatsu2012-11-23
| | | | | | | | | | | | | | | | | | Second I2C bus is supported by 88f6282 and 88f6283. This creates kirkwood-6282.dtsi, and defines DT table of second I2C bus. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: kirkwood: Convert mplcec4 board to pinctrlStefan Peter2012-11-23
| | | | | | | | | | | | Signed-off-by: Stefan Peter <s.peter@mpl.ch> Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert km_kirkwood to pinctrlValentin Longchamp2012-11-23
| | | | | | | | | | | | Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: support 98DX412x kirkwoods with pinctrlValentin Longchamp2012-11-23
| | | | | | | | | | | | | | | | | | | | | | The Marvell 98DX412x SoC embed a kirkwood variant that does not have pinctrl support yet. Even though this kirkwood is very similar to the 88f6281, on the MPP front a lot of pins are not available. That's why a new kirkwood pinctrl variant is needed. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert IX2-200 to pinctrl.Andrew Lunn2012-11-23
| | | | | | | | | | Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert lsxl boards to pinctrl.Andrew Lunn2012-11-23
| | | | | | | | | | | | Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Michael Walle <michael@walle.cc> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert ib62x0 to pinctrl.Andrew Lunn2012-11-23
| | | | | | | | | | | | Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Simon Baatz <gmbnomis@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert GoFlex Net to pinctrl.Andrew Lunn2012-11-23
| | | | | | | | | | | | Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Joshua Coombs <josh.coombs@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert dreamplug to pinctrl.Andrew Lunn2012-11-23
| | | | | | | | | | Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert dockstar to pinctrl.Andrew Lunn2012-11-23
| | | | | | | | | | | | Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert dnskw to pinctrlAndrew Lunn2012-11-23
| | | | | | | | | | | | Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jamie Lentin <jm@lentin.co.uk> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert iConnect to pinctrl.Andrew Lunn2012-11-23
| | | | | | | | | | Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert TS219 to pinctrl.Andrew Lunn2012-11-23
| | | | | | | | | | | | | | | | Make use of the pinctrl driver for configuring all the pins, instead of using the Orion mpp code. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Add DTSI files for pinctrlAndrew Lunn2012-11-23
| | | | | | | | | | | | | | | | | | | | There are a couple of different variants of Kirkwood, which differ in the pin muxing. These DTSI files set the correct compatibility and define commonly used groups of pins, which board dbs files can reference. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Make use of mvebu pincltl and gpio driversAndrew Lunn2012-11-23
| | | | | | | | | | | | | | | | | | | | | | | | | | Select the generic mvebu kirkwood pincltr driver and generic mvebu gpio driver. This requires minor changes to the DT, and the calls to configure plat-orion gpio driver are removed. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Michael Walle <michael@walle.cc> Tested-by: Simon Baatz <gmbnomis@gmail.com> Tested-by: Jamie Lentin <jm@lentin.co.uk> Tested-by: Joshua Coombs <josh.coombs@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | GPIO: mvebu: Allow all plat-orion platforms.Andrew Lunn2012-11-23
| | | | | | | | | | | | | | | | Kirkwood & Dove can also use this driver, so expand the scope to include all platform orion devices. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Dove: Add CuBox pinhog for ledSebastian Hesselbarth2012-11-23
| | | | | | | | | | | | | | | | | | SolidRun CuBox has a led on a gpio pin. As there is now DT pinctrl support for Dove, make use of a pinhog to ensure the pin is set to gpio. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Dove: Convert to DT GPIO and pinctrlSebastian Hesselbarth2012-11-23
| | | | | | | | | | | | | | | | | | Following the ongoing conversion of Orion SoCs to DT, make use of gpio and pinctrl drivers through DT. The main dtsi for Dove is prepared to allow board specific descriptors to make use of pinctrl muxing. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | pinctrl: mvebu: Fix dove_audio1_ctrl_set functionAxel Lin2012-11-23
| | | | | | | | | | | | | | | | | | | | | | When setting audio1 pinmux the bits in the corresponding registers are not cleared. This fix first clears all bits and then sets the required bits according to the selected function. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | pinctrl: mvebu: fix iomem pointer for dove pinctrlSebastian Hesselbarth2012-11-23
| | | | | | | | | | | | | | | | | | | | | | There has been a change in readl/writel to require registers addresses marked as IOMEM(). This patch takes care of this and also replaces ORing address offsets with adding them. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert LSXL to use regulatorsAndrew Lunn2012-11-23
| | | | | | | | | | | | | | | | Control the power to USB and HDD using a fixed regulator. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Michael Walle <michael@walle.cc> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert GoFlexNet to use regulatorsAndrew Lunn2012-11-23
| | | | | | | | | | | | | | | | Control the power to USB using a fixed regulator. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Josh Coombs <josh.coombs@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert Dockstar to use regulatorsAndrew Lunn2012-11-23
| | | | | | | | | | | | | | Control the power to USB using a fixed regulator. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert DNSKW to use regulatorsAndrew Lunn2012-11-23
| | | | | | | | | | | | | | | | Control the power to SATA0 and SATA1 using a fixed regulator. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Jamie Lentin <jm@lentin.co.uk> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Enable regulator and fixed regulators.Andrew Lunn2012-11-23
| | | | | | | | | | | | | | | | | | A few boards use a GPIO line to enable power to subsystems, eg USB or SATA devices. Pull in the regulator framework as the first step to controlling these GPIO lines are regulators. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert IB62x0 to use gpio-poweroff.Andrew Lunn2012-11-23
| | | | | | | | | | | | Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Simon Baatz <gmbnomis@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert DNSKW to use gpio-poweroff.Andrew Lunn2012-11-23
| | | | | | | | | | | | | | | | Also enable the gpio-poweroff driver when DT is used. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Jamie Lentin <jm@lentin.co.uk> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | power: Add simple poweroff-gpio driverJamie Lentin2012-11-23
| | | | | | | | | | | | | | | | | | | | | | Given appropriate devicetree bindings, this driver registers a pm_power_off function to set a GPIO line high/low to power down your board. Signed-off-by: Jamie Lentin <jm@lentin.co.uk> Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by:Simon Baatz <gmbnomis@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: kirkwood: Increase NAND chip-delay for DNS-32[05]Jamie Lentin2012-11-23
| | | | | | | | | | | | | | | | | | | | The default chip-delay of 25us is a bit too tight for some DNS-320's, and D-Link seem to specify 30us in their kernels for both devices. Increase to 35us to make sure the NAND is stable. Signed-off-by: Jamie Lentin <jm@lentin.co.uk> Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: Convert all DT boards to EHCI via DT.Andrew Lunn2012-11-23
| | | | | | | | | | | | | | | | | | | | Now that the EHCI driver has DT support, drop old style configuration of it and add DT in its place. Since all the boards enable the EHCI, enable it by default in kirkwood.dtsi. Any new boards which don't have USB can specifically disable it. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | ARM: Kirkwood: ehci-orion: Add device tree bindingAndrew Lunn2012-11-23
| | | | | | | | | | | | | | | | | | | | | | | | | | Based on previous work by Michael Walle and Jason Cooper. Made their work actually work, which required added interrupt from DT and auxdata, along with setting the dma_mask, which DT does not currently do. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | Merge commit '06763c7' into orion/dt2Jason Cooper2012-11-23
|\ \ | | | | | | | | | | | | | | | merge pinctrl/devel up to: 06763c7 pinctrl: mvebu: move to its own directory
| * | pinctrl: mvebu: move to its own directoryThomas Petazzoni2012-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like the spear platform, the mvebu platform has multiple files: one core file, and then one file per SoC family. More files will be added later, as support for mach-orion5x and mach-mv78xx0 SoCs is added to pinctrl-mvebu. For those reasons, having a separate subdirectory, drivers/pinctrl/mvebu/ makes sense, and it had already been suggested by Linus Wallej when the driver was originally submitted. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| * | pinctrl: mvebu: remove useless includeThomas Petazzoni2012-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Including the core.h header for the pinctrl subsystem is not necessary, and it is actually causing problems when moving the pinctrl-mvebu drivers into a separate subdirectory. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| * | pinctrl: mvebu: allow plat-orion architectures to use pinctrl-mvebuThomas Petazzoni2012-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mach-kirkwood and mach-dove architectures have not yet been integrated into the mach-mvebu directory, which should ultimately contain the support for all Marvell SoCs from the Engineering Business Unit. However, before this can happen, we need to let mach-kirkwood and mach-dove use the pinctrl-mvebu driver, which supports the kirkwood and dove SoC families. In order to do that, we make this driver available as soon as PLAT_ORION is selected, instead of using ARCH_MVEBU as a condition. In the long term, PLAT_ORION should disappear and be fully replaced by ARCH_MVEBU, but the plan is to make the migration step by step, by first having the existing mach-* directories for Marvell SoCs converge on several infrastructures, including the pinctrl one. Also, like the spear pinctrl driver, we put all pinctrl-mvebu Kconfig options under a if, in order to avoid having certain options (PINCTRL_DOVE, PINCTRL_KIRKWOOD, etc.) selecting an option (PINCTLR_MVEBU) which itself has a dependency (on ARCH_MVEBU). In this a construct, the dependency is in fact ignored due to the selects. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| * | pinctrl: reserve pins when states are activatedLinus Walleij2012-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This switches the way that pins are reserved for multiplexing: We used to do this when the map was parsed, at the creation of the settings inside the pinctrl handle, in pinmux_map_to_setting(). However this does not work for us, because we want to use the same set of pins with different devices at different times: the current code assumes that the pin groups in a pinmux state will only be used with one single device, albeit different groups can be active at different times. For example if a single I2C driver block is used to drive two different busses located on two pin groups A and B, then the pins for all possible states of a function are reserved when fetching the pinctrl handle: the I2C bus can choose either set A or set B by a mux state at runtime, but all pins in both group A and B (the superset) are effectively reserved for that I2C function and mapped to the device. Another device can never get in and use the pins in group A, even if the device/function is using group B at the moment. Instead: let use reserve the pins when the state is activated and drop them when the state is disabled, i.e. when we move to another state. This way different devices/functions can use the same pins at different times. We know that this is an odd way of doing things, but we really need to switch e.g. an SD-card slot to become a tracing output sink at runtime: we plug in a special "tracing card" then mux the pins that used to be an SD slot around to the tracing unit and push out tracing data there instead of SD-card traffic. As a side effect pinmux_free_setting() is unused but the stubs are kept for future additions of code. Cc: Patrice Chotard <patrice.chotard@st.com> Cc: Loic Pallardy <loic.pallardy@st.com> Acked-by: Stephen Warren <swarren@nvidia.com> Tested-by: Jean Nicolas Graux <jean-nicolas.graux@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* | | ARM: kirkwood: Add Plat'Home OpenBlocks A6 supportNobuhiro Iwamatsu2012-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Plat'Home OpenBlocks A6 using the device tree where possible. This commit supports SATA, USB, ether and serial console. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | | ARM: Dove: update defconfigSebastian Hesselbarth2012-11-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been a while since dove_defconfig was updated to recent development. This patch adds all currently available Dove boards, including a DT-enabled machine. DT support requires to allow ATAGS passed by boot loader as most of them are not yet capable of passing DT blobs. Also OF_SERIAL is enabled to actually see the bootlog. Finally, sdhci driver for Dove, mv_cesa, GPIO LEDs, and highmem support is added. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
* | | ARM: Kirkwood: update defconfig for new boardsJason Cooper2012-11-21
| | | | | | | | | | | | | | | | | | MPLCEC4_DT is relocated because it had been added manually. Signed-off-by: Jason Cooper <jason@lakedaemon.net>