aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-11-26Merge branch 'orion/dt' into next/dtOlof Johansson23-120/+39
Merge in orion's cleanup branch together with the DT contents. Ideally the cleanup branch should have been the base for the DT branch to avoid these, but that was missed when first merging. So we're doing it now to reduce the amount of silly conflicts due to internal tree organization. Signed-off-by: Olof Johansson <[email protected]>
2012-11-26Merge branch 'orion/cleanup' into orion/dtOlof Johansson23-120/+39
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 <[email protected]>
2012-11-26Merge tag 'orion_dt_for_3.8' of git://git.infradead.org/users/jcooper/linux ↵Olof Johansson271-1952/+5821
into next/dt From Jason Cooper: orion dt for v3.8 - ehci-orion dt binding - gpio-poweroff - use dt regulators - move mpp to DT/pinctrl Depends on: - orion/boards - merge conflicts - keep all 'select's in Kconfig - remove all #includes in board-*.c - pinctrl/devel up to: - 06763c7 pinctrl: mvebu: move to its own directory * tag 'orion_dt_for_3.8' of git://git.infradead.org/users/jcooper/linux: (211 commits) ARM: Kirkwood: remove kirkwood_ehci_init() from new boards ARM: Kirkwood: Add support LED of OpenBlocks A6 ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6 ARM: kirkwood: Add NAND partiton map for OpenBlocks A6 ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6 ARM: kirkwood: Add support DT of second I2C bus ARM: kirkwood: Convert mplcec4 board to pinctrl ARM: Kirkwood: Convert km_kirkwood to pinctrl ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl ARM: Kirkwood: Convert IX2-200 to pinctrl. ARM: Kirkwood: Convert lsxl boards to pinctrl. ARM: Kirkwood: Convert ib62x0 to pinctrl. ARM: Kirkwood: Convert GoFlex Net to pinctrl. ARM: Kirkwood: Convert dreamplug to pinctrl. ARM: Kirkwood: Convert dockstar to pinctrl. ARM: Kirkwood: Convert dnskw to pinctrl ARM: Kirkwood: Convert iConnect to pinctrl. ARM: Kirkwood: Convert TS219 to pinctrl. ARM: Kirkwood: Add DTSI files for pinctrl ARM: Kirkwood: Make use of mvebu pincltl and gpio drivers ... Signed-off-by: Olof Johansson <[email protected]>
2012-11-26Merge branch 'next/dt-samsung-2' of ↵Olof Johansson13-112/+485
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt From Kukjin Kim: Here is second Samsung DT stuff for v3.8. This is including power domain DT support for exynos and Google ARM Chromebook, Snow board and exynos4210-origen updates. * 'next/dt-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Use drive strength 3 for SD pins for exynos4 ARM: dts: Set up power domains for exynos4 ARM: EXYNOS: Bind devices to power domains using DT ARM: EXYNOS: Fix power domain name initialization ARM: EXYNOS: Detect power domain state on registration from DT ARM: dts: Add vmmc fixed voltage regulator for exynos4210-origen ARM: dts: Update sdhci nodes for current bindings for exynos4210-origen ARM: dts: Update for pinctrl-samsung driver for exynos4210-origen ARM: dts: Split memory sections for exynos4210-origen ARM: EXYNOS: add all i2c busses to auxdata for DT ARM: dts: Add aliases for i2c controller for exynos4 ARM: dts: Add board dts file for Snow board (ARM Chromebook) ARM: dts: Move the dwmmc aliases from smdk5250 dts to exynos Add/add conflicts resolved in arch/arm/boot/dts/exynos5250-smdk5250.dts and arch/arm/mach-exynos/mach-exynos5-dt.c. Signed-off-by: Olof Johansson <[email protected]>
2012-11-25Merge tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 ↵Olof Johansson6-0/+218
into next/dt From Shawn Guo: They are a few mxs dts updates coming a little bit late. I'm sending them as the second mxs/dt pull request for 3.8. Please consider to pull. * tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: dts: mxs: add oled support for the cfa-10036 ARM: mxs: Add SchulerControl SPS1 DTS file ARM: imx23-olinuxino: Add spi support
2012-11-24ARM: Kirkwood: remove kirkwood_ehci_init() from new boardsJason Cooper4-7/+0
ehci-orion initialization moved to DT. New boards don't need to call kirkwood_ehci_init(). Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Add support LED of OpenBlocks A6Nobuhiro Iwamatsu2-2/+21
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 <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6Nobuhiro Iwamatsu1-1/+0
EHCI driver enables by default in kirkwood.dtsi. This removes kirkwood_ehci_init function. Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: kirkwood: Add NAND partiton map for OpenBlocks A6Nobuhiro Iwamatsu1-0/+30
Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6Nobuhiro Iwamatsu1-0/+10
OpenBlocks A6 uses second I2C with RTC of s35390a. This supports them. Signed-off-by: Nobuhiro Iwamatsu <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: kirkwood: Add support DT of second I2C busNobuhiro Iwamatsu1-1/+11
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 <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: kirkwood: Convert mplcec4 board to pinctrlStefan Peter3-36/+65
Signed-off-by: Stefan Peter <[email protected]> Acked-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert km_kirkwood to pinctrlValentin Longchamp2-12/+17
Signed-off-by: Valentin Longchamp <[email protected]> Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: support 98DX412x kirkwoods with pinctrlValentin Longchamp3-278/+360
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 <[email protected]> Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert IX2-200 to pinctrl.Andrew Lunn2-24/+89
Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert lsxl boards to pinctrl.Andrew Lunn2-19/+66
Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Michael Walle <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert ib62x0 to pinctrl.Andrew Lunn2-21/+34
Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Simon Baatz <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert GoFlex Net to pinctrl.Andrew Lunn2-18/+56
Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Joshua Coombs <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert dreamplug to pinctrl.Andrew Lunn2-14/+21
Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert dockstar to pinctrl.Andrew Lunn2-10/+20
Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert dnskw to pinctrlAndrew Lunn2-37/+105
Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jamie Lentin <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert iConnect to pinctrl.Andrew Lunn2-17/+51
Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert TS219 to pinctrl.Andrew Lunn3-25/+62
Make use of the pinctrl driver for configuring all the pins, instead of using the Orion mpp code. Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Add DTSI files for pinctrlAndrew Lunn2-0/+74
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 <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Make use of mvebu pincltl and gpio driversAndrew Lunn3-7/+11
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 <[email protected]> Tested-by: Michael Walle <[email protected]> Tested-by: Simon Baatz <[email protected]> Tested-by: Jamie Lentin <[email protected]> Tested-by: Joshua Coombs <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24GPIO: mvebu: Allow all plat-orion platforms.Andrew Lunn1-1/+1
Kirkwood & Dove can also use this driver, so expand the scope to include all platform orion devices. Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Dove: Add CuBox pinhog for ledSebastian Hesselbarth1-0/+10
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 <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Dove: Convert to DT GPIO and pinctrlSebastian Hesselbarth2-3/+18
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 <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24pinctrl: mvebu: Fix dove_audio1_ctrl_set functionAxel Lin1-0/+8
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 <[email protected]> Signed-off-by: Sebastian Hesselbarth <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24pinctrl: mvebu: fix iomem pointer for dove pinctrlSebastian Hesselbarth1-7/+7
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 <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert LSXL to use regulatorsAndrew Lunn2-8/+29
Control the power to USB and HDD using a fixed regulator. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Michael Walle <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert GoFlexNet to use regulatorsAndrew Lunn2-5/+17
Control the power to USB using a fixed regulator. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Josh Coombs <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert Dockstar to use regulatorsAndrew Lunn2-5/+17
Control the power to USB using a fixed regulator. Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert DNSKW to use regulatorsAndrew Lunn2-4/+29
Control the power to SATA0 and SATA1 using a fixed regulator. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Jamie Lentin <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Enable regulator and fixed regulators.Andrew Lunn1-0/+2
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 <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert IB62x0 to use gpio-poweroff.Andrew Lunn2-13/+6
Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Simon Baatz <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert DNSKW to use gpio-poweroff.Andrew Lunn3-12/+8
Also enable the gpio-poweroff driver when DT is used. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Jamie Lentin <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24power: Add simple poweroff-gpio driverJamie Lentin6-0/+171
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 <[email protected]> Signed-off-by: Andrew Lunn <[email protected]> Tested-by:Simon Baatz <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: kirkwood: Increase NAND chip-delay for DNS-32[05]Jamie Lentin1-0/+1
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 <[email protected]> Acked-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: Convert all DT boards to EHCI via DT.Andrew Lunn11-11/+7
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 <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24ARM: Kirkwood: ehci-orion: Add device tree bindingAndrew Lunn2-3/+50
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 <[email protected]> Tested-by: Sebastian Hesselbarth <[email protected]> Acked-by: Alan Stern <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-24Merge commit '06763c7' into orion/dt2Jason Cooper14-73/+60
merge pinctrl/devel up to: 06763c7 pinctrl: mvebu: move to its own directory
2012-11-22ARM: kirkwood: Add Plat'Home OpenBlocks A6 supportNobuhiro Iwamatsu8-1/+131
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 <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-22ARM: dts: mxs: add oled support for the cfa-10036Maxime Ripard1-0/+19
Signed-off-by: Maxime Ripard <[email protected]> Cc: Brian Lilly <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
2012-11-21ARM: Dove: update defconfigSebastian Hesselbarth1-0/+24
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 <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-21ARM: Kirkwood: update defconfig for new boardsJason Cooper1-1/+2
MPLCEC4_DT is relocated because it had been added manually. Signed-off-by: Jason Cooper <[email protected]>
2012-11-21arm: orion5x: add DT related options in defconfigThomas Petazzoni1-1/+3
Signed-off-by: Thomas Petazzoni <[email protected]> Tested by: Maxime Hadjinlian <[email protected]> Acked-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-21arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device TreeThomas Petazzoni7-91/+72
This commit converts the 'LaCie Ethernet Disk mini v2' board to the Device Tree. All devices that have existing Device Tree bindings are converted over to the Device Tree, the other devices remain instantiated in the old way, until the respective drivers get the needed Device Tree bindings. Signed-off-by: Thomas Petazzoni <[email protected]> Tested by: Maxime Hadjinlian <[email protected]> Acked-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-21arm: orion5x: basic Device Tree supportThomas Petazzoni6-2/+187
This commit adds basic DT support for the Orion5x SoC family. It adds an orion5x.dtsi description of the Orion5x SoC as well as the needed DT_MACHINE structure to support boards converted to DT in the future. So far, the Device Tree contains the interrupt controller, the GPIO bank, the UART controllers, the SPI controller, the watchdog, the SATA controller, the I2C controller and the cryptographic engine. Signed-off-by: Thomas Petazzoni <[email protected]> Tested by: Maxime Hadjinlian <[email protected]> Acked-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
2012-11-21arm: orion5x: mechanical defconfig updateThomas Petazzoni1-24/+8
This commit is a simple mechanical update of the orion5x_defconfig file to the current kernel (i.e, just 'make orion5x_defconfig; make savedefconfig'). Doing this update allows to more easily separate DT-related configuration changes in the following patches. Signed-off-by: Thomas Petazzoni <[email protected]> Tested by: Maxime Hadjinlian <[email protected]> Acked-by: Andrew Lunn <[email protected]> Signed-off-by: Jason Cooper <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.