summaryrefslogtreecommitdiff
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | ARM: mach-sa1100: retire custom LED codeBryan Wu2012-08-0113-615/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
| | * | | | | | ARM: mach-omap1: retire custom LED codeBryan Wu2012-08-0113-687/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan Wu <bryan.wu@canonical.com> Acked-by: Tony Lindgren <tony@atomide.com>
| | * | | | | | ARM: mach-pnx4008: remove including old leds event API header fileBryan Wu2012-08-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
| | * | | | | | ARM: plat-samsung: remove including old leds event API header fileBryan Wu2012-08-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
| | * | | | | | ARM: mach-pxa: retire custom LED codeBryan Wu2012-08-019-411/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
| | * | | | | | ARM: mach-footbridge: retire custom LED codeBryan Wu2012-08-015-294/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
| | * | | | | | ARM: mach-ebsa110: retire custom LED codeBryan Wu2012-08-012-34/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
| | * | | | | | ARM: mach-clps711x: retire custom LED code of P720T machineBryan Wu2012-08-014-66/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tigger based LED driver into board file of P720T. Remove old LED driver file. Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
| | * | | | | | ARM: mach-integrator: retire custom LED codeBryan Wu2012-08-013-66/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the LED in core module for CPU activity and also enable 4 debugging LEDs in baseboard. The CPU activity LED is now handled by the trigger in the leds subsystem, retire this old CONFIG_LEDS-based code. Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
| | * | | | | | ARM: mach-integrator: move CM_CTRL to header file for accessing by other ↵Bryan Wu2012-08-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
| | * | | | | | ARM: mach-orion5x: convert custom LED code to gpio_led and LED CPU triggerBryan Wu2012-08-014-53/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan Wu <bryan.wu@canonical.com> Acked-by: Nicolas Pitre <nico@fluxnic.net>
| | * | | | | | ARM: mach-shark: retire custom LED codeBryan Wu2012-08-013-138/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CPU activity LED is now handled by the trigger in the leds subsystem, retire this old CONFIG_LEDS-based code. Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
| | * | | | | | ARM: mach-ks8695: remove leds driver, since nobody use itBryan Wu2012-08-014-121/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bryan Wu <bryan.wu@canonical.com> Acked-by: Andrew Victor <linux@maxim.org.za>
| | * | | | | | ARM: mach-realview and mach-versatile: retire custom LED codeBryan Wu2012-08-0110-76/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the custom LED trigger code in mach-realview with some overarching platform code for the plat-versatile family that will lock down LEDs 2 thru 5 for CPU activity indication. The day we have 8 core ARM systems the plat-versatile code will have to become more elaborate. Tested on RealView PB11MPCore by invoking four different CPU hogs (yes > /dev/null&) and see the LEDs go on one at a time. They all go off as the hogs are killed. Tested on the PB1176 as well - just one activity led (led 2) goes on and off with CPU activity. (bryan.wu@canonical.com: use ledtrig-cpu instead of ledtrig-arm-cpu) Cc: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Bryan Wu <bryan.wu@canonical.com> Acked-by: Pawel Moll <pawel.moll@arm.com>
| | * | | | | | ARM: at91: convert old leds drivers to gpio_led and led_trigger driversBryan Wu2012-07-3113-137/+89
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build with at91 defconfigs successfully Signed-off-by: Bryan Wu <bryan.wu@canonical.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
* | | | | | | Merge branch 'next/soc2' into HEADOlof Johansson2012-10-019-117/+80
|\ \ \ \ \ \ \
| * | | | | | | ARM: mxs: remove mach/irqs.hShawn Guo2012-09-031-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With SPARSE_IRQ adopted for mach-mxs, header mach/irqs.h is needed nowhere now, so remove it. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * | | | | | | ARM: mxs: select SPARSE_IRQShawn Guo2012-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With icoll and gpio interrupt controllers adopt irqdomain support and all interrupt nubmers are retrieved from device tree, it's safe to select SPARSE_IRQ for mxs now. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * | | | | | | ARM: mxs: adopt irq_domain support for icoll driverShawn Guo2012-09-034-33/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove irq_domain_add_legacy call from mach-mxs.c and have icoll adopt irq_domain support in the driver. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * | | | | | | ARM: mxs: select MULTI_IRQ_HANDLERShawn Guo2012-09-035-36/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of multi-platform effort, let's enable MULTI_IRQ_HANDLER for mach-mxs and remove entry-macro.S. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * | | | | | | ARM: mxs: retrieve timer irq from device treeShawn Guo2012-09-034-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than using the static timer irq definition, we should retrieve timer irq from device tree for better. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * | | | | | | gpio/mxs: adopt irq_domain support for mxs gpio driverShawn Guo2012-09-031-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove irq_domain_add_legacy call from mach-mxs.c and have the gpio driver adopt irqdomain support, so that we can have the mapping between gpio and irq number available without using virtual_irq_start and MXS_GPIO_IRQ_START. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
* | | | | | | | Merge branch 'next/cleanup2' into HEADOlof Johansson2012-10-0179-16671/+115
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/Kconfig arch/arm/Makefile arch/arm/mach-bcmring/arch.c arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/dma.c
| * \ \ \ \ \ \ \ Merge branch 'cleanup/__iomem' into next/cleanup2Arnd Bergmann2012-09-2863-397/+401
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cleanup/__iomem: ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses. ARM: ux500: use __iomem pointers for MMIO Two new cleanup patches that were not already part of the first cleanup branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | | | | ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses.Andrew Lunn2012-09-281-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also convert logical or to + for register offsets from base addresses. This fixes a number of warnings currently seen in linux-next: warning: passing argument 2 of '__raw_writeb' makes pointer from interger without cast. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | | | | ARM: ux500: use __iomem pointers for MMIOArnd Bergmann2012-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the earlier sweeping changes, the ux500 uncompress.h file was missed because other problems were hiding this one. Without this patch, building u8500_defconfig results in: In file included from arch/arm/boot/compressed/misc.c:33:0: arch/arm/mach-ux500/include/mach/uncompress.h: In function 'putc': arch/arm/mach-ux500/include/mach/uncompress.h:32:2: warning: passing argument 1 of '__raw_readb' makes pointer from integer without a cast [enabled by default] arch/arm/include/asm/io.h:95:89: note: expected 'const volatile void *' but argument is of type 'u32' Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Linus Walleij <linus.walleij@linaro.org>
| * | | | | | | | | Merge branch 'bcmring/removal' into next/cleanup2Arnd Bergmann2012-09-2865-15761/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From "Christian Daudt" <csd@broadcom.com>: Remove mach-bcmring as this is no longer maintained or used. Updated the removal with: - drop the edit to mach-types requested by Russell King - eliminate defconfig mod from patch 1 requested Olof Johansson Also switched to using git send-email to avoid word-wrapping problems * bcmring/removal: ARM: Remove mach-bcmring Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * \ \ \ \ \ \ \ \ Merge branch 'bcmring/cleanup' into bcmring/removalArnd Bergmann2012-09-289-317/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing a large-scale cleaning and removing the platform in another branch don't mix well, so do the trivial merge here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | | | | | | ARM: Remove mach-bcmringArnd Bergmann2012-09-2856-15444/+0
| | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove mach-bcmring as this is no longer maintained or used. Signed-off-by: Christian Daudt <csd@broadcom.com> Reviewed-by: Jiandong Zheng <jdzheng@broadcom.com> Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | | | | | | | | | Merge branch 'clps711x/cleanup' into next/cleanup2Arnd Bergmann2012-09-2810-170/+81
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various cleanups for the clps711x platform from Alexander Shiyan <shc_work@mail.ru> via email: * clps711x/cleanup: ARM: clps711x: Remove board support for CEIVA ARM: clps711x: Fix register definitions ARM: clps711x: Fix lowlevel debug-macro ARM: clps711x: Added simple clock framework Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * | | | | | | | | | ARM: clps711x: Remove board support for CEIVAAlexander Shiyan2012-09-285-120/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current kernel does not fit in the CEIVA ROM. Also, some functional has already been removed due migrate from 2.6 to 3.0, and it seems that no one uses this platform. So, remove support for this board and modules specific only to this board. Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
| | * | | | | | | | | | ARM: clps711x: Fix register definitionsAlexander Shiyan2012-09-281-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contain some fixes: - Fixes the address of register PORTE. - Corrects name for DAIDR0 register. - Removes unused definition for SYNCIO_CFGLEN. - Fixes definition SYNCIO_FRMLEN. Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
| | * | | | | | | | | | ARM: clps711x: Fix lowlevel debug-macroAlexander Shiyan2012-09-281-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CTS signal can not be used for the port and tied to any logic state. In this case we have an infinite loop waiting for the signal. For fix this problem, checking CTS removed, waiting for the signal "busy" was postponed after the byte write to the port. Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
| | * | | | | | | | | | ARM: clps711x: Added simple clock frameworkAlexander Shiyan2012-09-283-38/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modern CPUs from CLPS711X-line can operate at frequencies other than 73 MHz. This patch adds simple clock framework for handling all possible CPU rates. Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
| * | | | | | | | | | | Merge tag 'tegra-for-3.7-cleanup2' of ↵Olof Johansson2012-09-2039-7115/+5340
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup2 ARM: tegra: second round of cleanups This branch mainly removes dead code following the removal of all board files. The removals depend on various changes in other branches, so they are all merged together and form the basis of this branch, as enumerated below. Finally, there are no remaining users of pinconf-tegra.h outside the pinctrl subsystem, so that header is incorporated into an existing file there. This reduces the number of headers in mach-tegra/include, and so helps move towards single zImage. This branch is based on tegra-for-3.7-cleanup, followed by a merge of tegra-for-3.7-board-removal, followed by a merge of tegra-for-3.7-common-clk, followed by a merge of: git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git xceiv-for-v3.7 By Stephen Warren (16) and others via Stephen Warren * tag 'tegra-for-3.7-cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: (29 commits) pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrl ARM: tegra: delete unused headers ARM: tegra: remove useless includes of <mach/*.h> ARM: tegra: remove dead code ARM: dt: tegra: harmony: configure power off ARM: dt: tegra: harmony: add regulators ARM: tegra: remove board (but not DT) support for Harmony ARM: tegra: remove board (but not DT) support for Paz00 ARM: tegra: remove board (but not DT) support for TrimSlice ARM: Tegra: Add smp_twd clock for Tegra20 ARM: tegra: cpu-tegra: explicitly manage re-parenting ARM: tegra: fix overflow in tegra20_pll_clk_round_rate() ARM: tegra: Fix data type for io address ARM: tegra: remove tegra_timer from tegra_list_clks ARM: tegra30: clocks: fix the wrong tegra_audio_sync_clk_ops name ARM: tegra: clocks: separate tegra_clk_32k_ops from Tegra20 and Tegra30 ARM: tegra: Remove duplicate code ARM: tegra: Port tegra to generic clock framework ARM: tegra: Add clk_tegra structure and helper functions ARM: tegra: Rename tegra20 clock file ...
| | * | | | | | | | | | | pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrlStephen Warren2012-09-141-63/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Tegra's pinmux is configured solely from device tree, there's no need for the pinconf types to be defined in arch/arm/mach-tegra/. Move it into the pinctrl directory to clean up mach-tegra, as a pre- requisite for single-zImage. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
| | * | | | | | | | | | | ARM: tegra: delete unused headersStephen Warren2012-09-142-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing includes these headers any more; remove them. Signed-off-by: Stephen Warren <swarren@nvidia.com>
| | * | | | | | | | | | | ARM: tegra: remove useless includes of <mach/*.h>Stephen Warren2012-09-144-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing from these files is needed, so remove the includes. This helps single zImage work by reducing use of the mach-tegra/include/mach/ directory. Signed-off-by: Stephen Warren <swarren@nvidia.com>
| | * | | | | | | | | | | ARM: tegra: remove dead codeStephen Warren2012-09-146-906/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that all boards are converted to device tree, devices.[ch] and board-pinmux.[ch] are no longer used. So, remove them. The only exception is the EHCI platform data in devices.h. Move that data to board-dt-tegra20.c - the only places it's used. Signed-off-by: Stephen Warren <swarren@nvidia.com>
| | * | | | | | | | | | | Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2Stephen Warren2012-09-149-1052/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'for-3.7/common-clk' into for-3.7/cleanup2Stephen Warren2012-09-1415-4733/+5055
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'for-3.7/board-removal' into for-3.7/cleanup2Stephen Warren2012-09-1415-1340/+257
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'xceiv-for-v3.7' of ↵Olof Johansson2012-09-209-1052/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into next/cleanup2 usb: xceiv: patches for v3.7 merge window nop xceiv got its own header to avoid polluting otg.h. It has also learned to work as USB2 and USB3 phys so we can use it on USB3 controllers. Together with those two changes to nop xceiv, we're adding basic PHY support to dwc3 driver, this is to allow platforms which actually have a SW-controllable PHY talk to them through dwc3 driver. We're adding a new phy driver for the OMAP architecture. This driver is for the PHY found in OMAP4 SoCs, and a new phy driver for the marvell architecture. An extra phy driver - for Tegra SoCs - is now moving from arch/arm/mach-tegra* to drivers/usb/phy. Also here, there's the creation of <linux/usb/phy.h> which should be used from now on for PHY drivers, even those which don't support OTG. * tag 'xceiv-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: usb: otg: mxs-phy: Fix mx23 operation usb: dwc3: add basic PHY support usb: dwc3: exynos: add nop transceiver support usb: dwc3: omap: add nop transceiver support usb: dwc3: pci: add nop transceiver support usb: otg: move the dereference below the NULL test arm: omap: phy: remove unused functions from omap-phy-internal.c usb: twl4030: Add device tree support for twl4030 usb usb: twl6030: Add dt support for twl6030 usb usb: otg: make twl6030_usb as a comparator driver to omap_usb2 usb: phy: add a new driver for omap usb2 phy usb: phy: fix build break usb: move phy driver from mach-tegra to drivers/usb usb: otg: Move phy interface to separate file. usb: phy: isp1301: Remove unused static array and define usb: phy: mv_u3d: Add usb phy driver for mv_u3d usb: otg: Remove the unneeded NULL check usb: xceiv: nop: let it work as USB2 and USB3 phy usb: xceiv: create nop-usb-xceiv.h and avoid pollution on otg.h Signed-off-by: Olof Johansson <olof@lixom.net>
* | | | | | | | | | | | | | | Merge branch 'next/dt' into HEADOlof Johansson2012-10-01210-10897/+7932
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Documentation/devicetree/bindings/usb/platform-uhci.txt arch/arm/mach-vt8500/bv07.c arch/arm/mach-vt8500/devices-vt8500.c arch/arm/mach-vt8500/devices-wm8505.c arch/arm/mach-vt8500/devices.c arch/arm/mach-vt8500/devices.h arch/arm/mach-vt8500/wm8505_7in.c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lpc32xx/dts' of git://git.antcom.de/linux-2.6 into next/dtOlof Johansson2012-09-291-7/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Roland Stigge. Pulling in one bugfix to the lpc32xx DT conversion. * 'lpc32xx/dts' of git://git.antcom.de/linux-2.6: ARM: LPC32xx: LED fix in PHY3250 DTS file
| | * | | | | | | | | | | | | | | ARM: LPC32xx: LED fix in PHY3250 DTS fileRoland Stigge2012-09-251-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adjusts the PHY3250 board file to the actual LED configuration (active high, default-state and trigger configuration). Signed-off-by: Roland Stigge <stigge@antcom.de>
| * | | | | | | | | | | | | | | | Merge branch 'vt8500/devel' into next/dtOlof Johansson2012-09-291-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Picked up one more bugfix by Tony Prisk: * vt8500/devel: arm: vt8500: Fixup for missing gpio.h
| | * | | | | | | | | | | | | | | | arm: vt8500: Fixup for missing gpio.hTony Prisk2012-09-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mach/include/gpio.h was removed as part of the multiplatform-3.7 update. This patch removes the include from arch-vt8500/vt8500.c Signed-off-by: Tony Prisk <linux@prisktech.co.nz> Signed-off-by: Olof Johansson <olof@lixom.net>
| * | | | | | | | | | | | | | | | | Merge tag 'devel-dt-arch-timer-for-v3.7' of ↵Olof Johansson2012-09-293-1/+113
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt From Tony Lindgren: Few late patches to enable arch timer for omap5 using device tree. * tag 'devel-dt-arch-timer-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP5: Enable arch timer support ARM: OMAP: Add initialisation for the real-time counter.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'for_3.7/omap5_arch_timer' of ↵Tony Lindgren2012-09-2130-91/+363
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer Conflicts: arch/arm/mach-omap2/timer.c
View Lorry Controller Status