summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ARM: SPEAr: conditionalize SMP codeArnd Bergmann2013-05-021-3/+3
| | | | | | | | | | | | | | Some constant definitions are only defined for spear13xx, so we must not attempt to build SPEAr SMP support when that SoC is not enabled. arch/arm/mach-spear/platsmp.c:25:35: error: 'VA_SCU_BASE' undeclared here (not in a function) arch/arm/mach-spear/platsmp.c: In function 'spear13xx_smp_prepare_cpus': arch/arm/mach-spear/platsmp.c:111:58: error: 'SYS_LOCATION' undeclared (first use in this function) Cc: Viresh Kumar <viresh.linux@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanupArnd Bergmann2013-04-295-3/+47
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Nicolas Ferre <nicolas.ferre@atmel.com>: DT modifications for generic slave DMA binding. Addition of MCI and I2C DMA bindings. A little DT machine compatibility removal for SAMA5. * tag 'at91-soc' of git://github.com/at91linux/linux-at91: ARM: at91/sama5d34ek.dts: remove not needed compatibility string ARM: at91: dts: add MCI DMA support ARM: at91: dts: add i2c dma support ARM: at91: dts: set #dma-cells to the correct value Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * ARM: at91/sama5d34ek.dts: remove not needed compatibility stringNicolas Ferre2013-04-191-1/+1
| | | | | | | | | | | | | | | | | | "atmel,sama5ek" compatibility sting does not correspond to a useful board configuration. This d34ek.dts is the only sama5d3 .dts file affected. Reported-by: Josh Wu <josh.wu@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * ARM: at91: dts: add MCI DMA supportLudovic Desroches2013-04-194-0/+16
| | | | | | | | | | | | | | | | Add DMA resources to MCI nodes. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> [nicolas.ferre@atmel.com: correct 9g45, 9n12 dma phandle name] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * ARM: at91: dts: add i2c dma supportLudovic Desroches2013-04-193-0/+24
| | | | | | | | | | | | | | | | Add DMA resources to i2c nodes. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> [nicolas.ferre@atmel.com: correct 9n12 dma phandle name] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * ARM: at91: dts: set #dma-cells to the correct valueLudovic Desroches2013-04-184-2/+6
| | | | | | | | | | | | | | Moving to generic DMA DT binding involves to set #dma-cells to 2. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
* | serial: amba-pl011: fix !CONFIG_DMA_ENGINE caseArnd Bergmann2013-04-201-1/+1
| | | | | | | | | | | | | | | | I changed the prototype of the function earlier but only in the section for CONFIG_DMA_ENGINE, not the alternative. This makes the driver build again, e.g. for vexpress_defconfig. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | Merge branch 'spear/dwdma' into late/cleanupArnd Bergmann2013-04-1916-302/+219
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a series originally prepared for inclusion in 3.9, which did not work out because of dependencies on the dmaengine driver. All the changes for the dmaengine code are merged in 3.9 now, so we can finally do the switchover and remove the now unnecessary dma definitions for spear13xx from the platform code. The dma platform_data actually made up the majority of the spear13xx platform code overall, so moving that into device tree files makes the code substantially smaller. * spear/dwdma: ata: arasan: remove the need for platform_data ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT serial: pl011: use generic DMA slave configuration if possible spi: pl022: use generic DMA slave configuration if possible Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | ata: arasan: remove the need for platform_dataArnd Bergmann2013-04-193-20/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a complete DT binding for the arasan device driver. There is currently only one user, which is the spear13xx platform, so we don't actually have to parse all the properties until another user comes in, but this does use the generic DMA binding to find the DMA channel. The patch is untested so far and is part of a series to convert the spear platform over to use the generic DMA binding, so it should stay with the rest of the series. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.linux@linaro.org> Cc: Vinod Koul <vinod.koul@intel.com> Cc: Jeff Garzik <jgarzik@redhat.com> Cc: devicetree-discuss@lists.ozlabs.org
| * | ARM: SPEAr13xx: Pass generic DW DMAC platform data from DTArnd Bergmann2013-03-128-254/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces an earlier patch from Viresh Kumar to move the spear platform over to the generic DMA binding. This version is now based on the merged multiplatform capable spear platform, rather than the separate spear13xx/3xx/6xx directories. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: Vinod Koul <vinod.koul@linux.intel.com> Cc: devicetree-discuss@lists.ozlabs.org Cc: Shiraz Hashim <shiraz.hashim@st.com> Cc: spear-devel@list.st.com
| * | Merge branch 'spear/multiplatform' into spear/dmaArnd Bergmann2013-03-1265-766/+431
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | The actual SPEAr conversion to the DMA binding depends on driver patches and the multiplatform work. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | | serial: pl011: use generic DMA slave configuration if possibleArnd Bergmann2013-03-123-26/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the new OF DMA binding, it is possible to completely avoid the need for platform_data for configuring a DMA channel. In cases where the platform has already been converted, calling dma_request_slave_channel should get all the necessary information from the device tree. This also adds a binding document specific to the pl011 controller, and extends the generic primecell binding to mention "dmas" and other common properties. Like the patch that converts the dw_dma controller, this is completely untested and is looking for someone to try it out. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Jiri Slaby <jslaby@suse.cz> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: devicetree-discuss@lists.ozlabs.org Cc: linux-arm-kernel@lists.infradead.org
| * | | spi: pl022: use generic DMA slave configuration if possibleArnd Bergmann2013-03-122-2/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the new OF DMA binding, it is possible to completely avoid the need for platform_data for configuring a DMA channel. In cases where the platform has already been converted, calling dma_request_slave_channel should get all the necessary information from the device tree. Like the patch that converts the dw_dma controller, this is completely untested and is looking for someone to try it out. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Cc: spi-devel-general@lists.sourceforge.net Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Vinod Koul <vinod.koul@linux.intel.com> Cc: devicetree-discuss@lists.ozlabs.org Cc: linux-arm-kernel@lists.infradead.org
* | | | Merge branch 'spear/multiplatform' into late/cleanupArnd Bergmann2013-04-1965-765/+430
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | This is a prerequisite for the spear/dwdma series. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | | ARM: spear: enable spear13xx in multi_v7_defconfigArnd Bergmann2013-03-121-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SPEAr13xx can now be part of the regular multiplatform defconfig, so let's enable it there. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | | ARM: spear: fix build error in restart.cArnd Bergmann2013-03-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can now enable mach-spear without selecting any of the machines in a multiplatform configuration. Doing so causes a build error that is trivial to fix by making both the spear13xx and the spear3xx/6xx portion of this file conditional rather than alternatives. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | | ARM: spear: use multiplatform configuration options.Arnd Bergmann2013-03-125-36/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spear platform is now multiplatform capable in principle, and everything still builds when enabled. This slightly rearranges the Kconfig options for spear to enable both single- and multiplatform support. As a side-effect, even building the single spear kernel can now enable spear3xx and spear6xx simultaneously, although not together with spear13xx, because they are a different archicture version (v7 instead of v5). Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | | ARM: spear: rename duplicate pl080_plat_dataArnd Bergmann2013-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both spear3xx and spear6xx have a global symbol named pl080_plat_data. Eventually, both should be removed, but for now, we can rename one to pl080_plat_data and declare it static, since that one does not actually need to be visible outside of spear6xx.c. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | | ARM: spear: make clock driver independent of headersArnd Bergmann2013-03-1212-142/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Device drivers should not access MMIO registers through hardcoded platform specific address constants. Instead, we can pass the MMIO token to the spear clock driver in the initialization routine to contain that knowledge in the platform code itself. Ideally, the clock driver would use of_iomap() or similar to get the address, and that can be used later, but for now, this is the minimal change. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | | ARM: spear: move generic.h and pl080.h into private dirArnd Bergmann2013-03-1214-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No file outside of mach-spear includes these files any more, so they don't have to be globally visible now. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | | ARM: spear: move all files to mach-spearArnd Bergmann2013-03-1235-51/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no conflicting files between the three mach-spear* directories and plat-spear any more, so we can now move all file to a common mach-spear directory. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | | ARM: spear: move spear.h and misc_regs.h into plat-spearArnd Bergmann2013-03-125-135/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spear13xx version of spear.h is completely different from the newly combined spear3xx/spear6xx version, but we can never build ARMv5 and ARMv7 platforms together, so there is no harm in putting all the contents into a single file and adding appropriate ifdefs. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | | ARM: spear: merge Kconfig filesArnd Bergmann2013-03-124-60/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a preparation to merging the spear platforms into one directory, this merges the four Kconfig files into one. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | | ARM: spear: make spear3xx/6xx mach/spear.h files identicalArnd Bergmann2013-03-129-63/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two files are almost identical already basically just differ in the identifier names. By changing the identifiers to be the same, we are able to merge the two as a preparation to building a combined kernel. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | | ARM: spear: move identical headers to plat-spear/include/machArnd Bergmann2013-03-1221-344/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As an intermediate step towards unification of the three spear platforms, this gets rid of the mach/* header files that are obviously not platform specific. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | | ARM: spear: unify mach/generic.h and mach/irqs.hArnd Bergmann2013-03-128-38/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are indeed easy to combine, as there are no conflicting definitions in generic.h, and irqs.h will be obsolete once we enable SPARSE_IRQ. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
| * | | ARM: spear13xx: make mach/dma.h localArnd Bergmann2013-03-123-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | There is no reason for this header file to be globally visible, so let's just move it into the mach directory. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
* | | Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanupOlof Johansson2013-04-195-16/+49
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | From Nicolas Ferre: Little modification in SoC presentation in kernel log. Removing of a long-standing warning in sam9263 PM code. * tag 'at91-soc' of git://github.com/at91linux/linux-at91: ARM: at91: suspend both memory controllers on at91sam9263 ARM: at91: change "Unknown" qualifier SoC subtype handling Signed-off-by: Olof Johansson <olof@lixom.net>
| * | ARM: at91: suspend both memory controllers on at91sam9263Arnd Bergmann2013-04-183-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the past three years, we have had a #warning in mach-at91 about the sdram_selfrefresh_enable or at91sam9_standby functions possibly not working on at91sam9263. In the meantime a function was added to do the right thing on at91sam9g45, which looks like it should also work on '9263. Signed-off-by: Arnd Bergmann <arnd@arndb.de> [nicolas.ferre@atmel.com: remove paragraph in commit message] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
| * | ARM: at91: change "Unknown" qualifier SoC subtype handlingNicolas Ferre2013-04-092-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | An AT91 SoC that doesn't have a subtype is shown as "Unknown" in the Linux log message which is not correct. This was leading to confusion so, add a "none" qualifier to the subtype property and set this one in the appropriate cases. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
* | | Merge branch 'at91/soc' into late/cleanupOlof Johansson2013-04-1936-443/+2891
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * at91/soc: ARM: at91: add defconfig for SAMA5 ARM: at91: dt: add device tree files for SAMA5D3 family ARM: at91: introduce SAMA5 support ARM: at91: introduce the core type choice to split ARMv4/5 and ARMv7 arch ARM: at91: add AT91_SAM9_TIME entry to select at91sam926x_time.c compilation ARM: at91: change name template in AT91_SOC_START macro ARM: at91: renamme rm9200 dt file ARM: at91: rename board-dt to more specific name board-dt-sam9 ARM: at91: move non DT Kconfig to Kconfig.non_dt
| * | ARM: at91: add defconfig for SAMA5Ludovic Desroches2013-03-261-0/+181
| | | | | | | | | | | | | | | | | | | | | Defconfig file for SAMA5 devices. It covers the SAMA5D3 family. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | ARM: at91: dt: add device tree files for SAMA5D3 familyLudovic Desroches2013-03-269-0/+1547
| | | | | | | | | | | | | | | | | | | | | | | | Add device tree files for the SAMA5D3 family (SAMA5D31, SAMA5D33, SAMA5D34 and SAMA5D35). Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | ARM: at91: introduce SAMA5 supportLudovic Desroches2013-03-2611-29/+725
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces the SAMA5 support and a generic board file for SAMA5 devices. It also updates the PMC driver to manage clock division which is a requirement since some peripherals can't work at the bus frequency on SAMA5. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | ARM: at91: introduce the core type choice to split ARMv4/5 and ARMv7 archLudovic Desroches2013-03-261-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we will introduce SAMA5, we need to distinguish the core architecture. It is useless to show ARMv4/5 entries if we are configuring a kernel for SAMA5 devices. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | ARM: at91: add AT91_SAM9_TIME entry to select at91sam926x_time.c compilationLudovic Desroches2013-03-262-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | No more associate at91sam926x_time.c compilation with SOC_AT91SAM9 entry since SAMA5D3 devices will use this driver too. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | ARM: at91: change name template in AT91_SOC_START macroLudovic Desroches2013-03-269-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | New devices are no more prefixed with at91 so remove the at91 and _name concatenation. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | ARM: at91: renamme rm9200 dt fileJean-Christophe PLAGNIOL-VILLARD2013-03-132-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the board-rm9200-dt.c file so that we follow the pattern for Device Tree board files: board-dt-<name of SoC sharing same core>.c Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> [nicolas.ferre@atmel.com: modify commit message] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | ARM: at91: rename board-dt to more specific name board-dt-sam9Jean-Christophe PLAGNIOL-VILLARD2013-03-137-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will produce a board-dt file per SoC core type. That will ease code readability and will prevent from including superfluous code for supporting machines that will never be compiled together (particularly the ARM9 and C-A5 upcoming SoCs). Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> [nicolas.ferre@atmel.com: modify commit message] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | ARM: at91: move non DT Kconfig to Kconfig.non_dtJean-Christophe PLAGNIOL-VILLARD2013-03-132-395/+400
| |/ | | | | | | | | | | | | This is the legacy platform support Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
* | Merge tag 'omap-for-v3.10/dss-signed' of ↵Olof Johansson2013-04-1927-622/+297
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into late/cleanup From Tony Lindgren: Display related clean-up from Tomi Valkeinen. These were separated from the DSS driver changes to leave out a dependency between the driver and arch/arm related code. * tag 'omap-for-v3.10/dss-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: arm: dss-common: don't use reset_gpio from omap4_panda_dvi_device arm: omap boards: Remove unnecessary platform_enable/disable callbacks for VENC devices arm: omap: dss-common: use picodlp panel's gpio handling arm: omap: board-omap3pandora: use tpo panel's gpio handling arm: omap: board-zoom: use NEC panel's gpio handling arm: omap: board-rx-51: use acx565akm panel's gpio handling arm: omap: board-sdp3430: use sharp panel's gpio handling arm: omap: board-omap3evm: use sharp panel's gpio handling arm: omap: board-overo: use lb035q02 dpi panel's gpio handling arm: omap: board-ldp: use generic dpi panel's gpio handling arm: omap: board-am3517: use generic dpi panel's gpio handling arm: omap: board-cm-t35: use generic dpi panel's gpio handling arm: omap: board-devkit8000: use generic dpi panel's gpio handling arm: omap: board-2430: use generic dpi panel's gpio handling ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight OMAPDSS: add fields to panels' platform data OMAPDSS: panels: keep platform data of all panels in a single header Conflicts: arch/arm/mach-omap2/board-2430sdp.c arch/arm/mach-omap2/board-zoom-display.c
| * \ Merge branch '3.10-lo/board-cleanup' of ↵Tony Lindgren2013-04-1728-679/+349
| |\ \ | | | | | | | | | | | | git://gitorious.org/linux-omap-dss2/linux into omap-for-v3.10/dss
| | * | arm: dss-common: don't use reset_gpio from omap4_panda_dvi_deviceArchit Taneja2013-04-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gpio reset info is passed to the tfp410 panel driver via the panel's platform data struct 'tfp410_platform_data'. The tfp driver doesn't use the reset_gpio field in the omap4_panda_dvi_device struct. Remove this field. Signed-off-by: Archit Taneja <archit@ti.com> Cc: Tony Lindgren <tony@atomide.com>
| | * | arm: omap boards: Remove unnecessary platform_enable/disable callbacks for ↵Archit Taneja2013-04-045-55/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VENC devices The omap_dss_device's platform_enable/disable callbacks don't do anything for any of the boards. The platform calls from the VENC driver will also be removed in the future. Remove these calls from the board which have a VENC device. Signed-off-by: Archit Taneja <archit@ti.com> Cc: Tony Lindgren <tony@atomide.com> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
| | * | arm: omap: dss-common: use picodlp panel's gpio handlingArchit Taneja2013-04-041-37/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dss-common file currently requests gpios required by the picodlp DPI panel on the 4430sdp/blaze board. It also requests DISPLAY_SEL_GPIO and DLP_POWER_ON_GPIO gpios which are board specific gpios to switch between lcd2 panel and picodlp, and setting intermediate power supplies for picodlp respectively. These gpios are toggled through platform_enable/disable functions called by the picodlp driver. Remove the gpio requests for the gpios which are already requested by the panel driver, and remove the platform callback functions and set the platform specific gpios in such a way that lcd2 panel is selected for the LCD2 overlay manager and the power supplies for picodlp are disabled. Note: We need to revisit this so that we can enable and switch to picodlp if that's the only panel driver available for the LCD2 overlay manager. Signed-off-by: Archit Taneja <archit@ti.com> Cc: Tony Lindgren <tony@atomide.com>
| | * | arm: omap: board-omap3pandora: use tpo panel's gpio handlingArchit Taneja2013-04-041-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The omap3pandora board file currently passes the reset gpio number to the tpo-td043mtea1 panel driver via the reset_gpio field in omap_dss_device. Platform related information should be passed via the panel driver's platform data struct. Add the reset gpio information to panel_tpo_td043_data so that it's passed to the panel driver. Signed-off-by: Archit Taneja <archit@ti.com> Cc: Tony Lindgren <tony@atomide.com>
| | * | arm: omap: board-zoom: use NEC panel's gpio handlingArchit Taneja2013-04-041-25/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The zoom board file currently requests gpios required by the nec-nl8048hl11-01 dpi panel, and provides dummy platform_enable/disable callbacks. gpio request and configuration have been moved to the nec-nl8048hl11-01 panel driver itself and shouldn't be done in the board files. Remove the gpio requests and the platform callbacks from the board file. Add the gpio information to panel_nec_nl8048_data so that it's passed to the panel driver. Signed-off-by: Archit Taneja <archit@ti.com> Cc: Tony Lindgren <tony@atomide.com>
| | * | arm: omap: board-rx-51: use acx565akm panel's gpio handlingArchit Taneja2013-04-041-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rx-51 board file currently requests gpios required by the acx565akm panel, and provides platform_enable/disable callbacks to configure them. These tasks have been moved to the acx565akm panel driver itself and shouldn't be done in the board files. Remove the gpio requests and the platform callbacks from the board file. Pass the panel_acx565akm_data instance 'lcd_data' to omap_dss_device instead of passing the gpio number in omap_dss_device's reset_gpio. Add the gpio information to panel_acx565akm_data so that it's passed to the panel driver. Signed-off-by: Archit Taneja <archit@ti.com> Cc: Tony Lindgren <tony@atomide.com>
| | * | arm: omap: board-sdp3430: use sharp panel's gpio handlingArchit Taneja2013-04-041-24/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The omap3430sdp board file currently requests gpios required by the sharp_ls dpi panel, and provides platform_enable/disable callbacks to configure them. These tasks have been moved to the sharp_ls panel driver itself and shouldn't be done in the board files. Remove the gpio requests and the platform callbacks from the board file. Add the gpio information to panel_sharp_ls037v7dw01_data so that it's passed to the panel driver. Out of sharp panel's configurable pins, all apart from resb_gpio are managed by a CPLD on the display and set to a default value. Only the configurable pin is passed to platform data. The backlight GPIO doesn't go directly to the sharp panel, it is used to set up a voltage supply which goes to the LED+ pin of the panel, hence it isn't passed to panel as platform data, and configured in the board file itself. The backlight used to previously toggle through the platform_enable/disable callbacks, but now it is always on. This needs to be revisited. Signed-off-by: Archit Taneja <archit@ti.com> Cc: Tony Lindgren <tony@atomide.com>
| | * | arm: omap: board-omap3evm: use sharp panel's gpio handlingArchit Taneja2013-04-041-39/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The omap3evm board file currently requests gpios required by the sharp_ls dpi panel, and provides platform_enable/disable callbacks to configure them. These tasks have been moved to the sharp_ls panel driver itself and shouldn't be done in the board files. Remove the gpio requests and the platform callbacks from the board file. Add the gpio information to panel_sharp_ls037v7dw01_data so that it's passed to the panel driver. Note: The GPIOs OMAP3EVM_LCD_PANEL_ENVDD and OMAP3EVM_LCD_PANEL_BKLIGHT_GPIO aren't directly connected to the sharp panel, hence they aren't passed to the panel driver as platform data. These are set to a default value such that LCD is enabled and backlight is on. These used to previously toggle through the platform_enable/disable callbacks, but now these are always on. This needs to be revisited. Signed-off-by: Archit Taneja <archit@ti.com> Cc: Tony Lindgren <tony@atomide.com>
OpenPOWER on IntegriCloud