aboutsummaryrefslogtreecommitdiff
path: root/include/linux/platform_data
AgeCommit message (Collapse)AuthorFilesLines
2012-10-01Merge tag 'hwmon-for-linus' of ↵Linus Torvalds2-0/+54
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull hwmon updates from Guenter Roeck: "New drivers for: MCP3221, ADT7410, MAX197 Chip support added to existing drivers: LM71, LM74, MAX1110, MAX1112, MAX1113, INA220, INA230, MCP3221 Cleanup: Use devm_ functions, fixed build warnings, removed deprecated sysfs attributes, code simplifications, dropped dependencies on EXPERIMENTAL" * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (64 commits) hwmon: (mcp3021) Add MCP3221 support hwmon: (mcp3021) Prepare MCP3021 driver to support other chips hwmon: (w83791d) Drop unnecessary compare statements hwmon: (lm93) Drop unnecessary compare statement hwmon: (lm70) Simplify show_name function hwmon: (adcxx) Simplify show_name function hwmon: Drop dependencies on EXPERIMENTAL hwmon: (it87) Fix Kconfig for IT87 driver hwmon: (sht15) move header to linux/platform_data/ hwmon: (asus_atk0110) Remove useless kfree hwmon: (ina2xx) Add support for INA220 and INA230 hwmon: (ina2xx) Use structure array to distinguish chip types hwmon: (max1111) Add support for MAX1110, MAX1112, and MAX1113 hwmon: (lm70) Add support for LM71 and LM74 hwmon: (Documentation) Update feature-removal-schedule.txt hwmon: (w83793) Remove legacy chassis intrusion detection sysfs attributes hwmon: (w83792d) Remove legacy chassis intrusion detection attributes hwmon: (adm9240) Remove legacy chassis intrusion detection sysfs attribute hwmon: (lm70) Allow 4wire SPI bus with LM70 hwmon: (sht15) remove multiple driver registration ...
2012-10-01Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/ttyLinus Torvalds2-0/+160
Pull TTY changes from Greg Kroah-Hartman: "As we skipped the merge window for 3.6-rc1 for the tty tree, everything is now settled down and working properly, so we are ready for 3.7-rc1. Here's the patchset, it's big, but the large changes are removing a firmware file and adding a staging tty driver (it depended on the tty core changes, so it's going through this tree instead of the staging tree.) All of these patches have been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <[email protected]>" Fix up more-or-less trivial conflicts in - drivers/char/pcmcia/synclink_cs.c: tty NULL dereference fix vs tty_port_cts_enabled() helper function - drivers/staging/{Kconfig,Makefile}: add-add conflict (dgrp driver added close to other staging drivers) - drivers/staging/ipack/devices/ipoctal.c: "split ipoctal_channel from iopctal" vs "TTY: use tty_port_register_device" * tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (235 commits) tty/serial: Add kgdb_nmi driver tty/serial/amba-pl011: Quiesce interrupts in poll_get_char tty/serial/amba-pl011: Implement poll_init callback tty/serial/core: Introduce poll_init callback kdb: Turn KGDB_KDB=n stubs into static inlines kdb: Implement disable_nmi command kernel/debug: Mask KGDB NMI upon entry serial: pl011: handle corruption at high clock speeds serial: sccnxp: Make 'default' choice in switch last serial: sccnxp: Remove mask termios caps for SW flow control serial: sccnxp: Report actual baudrate back to core serial: samsung: Add poll_get_char & poll_put_char Powerpc 8xx CPM_UART setting MAXIDL register proportionaly to baud rate Powerpc 8xx CPM_UART maxidl should not depend on fifo size Powerpc 8xx CPM_UART too many interrupts Powerpc 8xx CPM_UART desynchronisation serial: set correct baud_base for EXSYS EX-41092 Dual 16950 serial: omap: fix the reciever line error case 8250: blacklist Winbond CIR port 8250_pnp: do pnp probe before legacy probe ...
2012-10-01Merge tag 'staging-3.6' of ↵Linus Torvalds2-0/+120
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging tree update from Greg Kroah-Hartman: "Here is the big staging tree update for the 3.7-rc1 merge window. There are a few patches in here that are outside of the staging area, namely HID and IIO patches, but all of them have been acked by the relevant subsystem maintainers. The IIO stuff is still coming in through this tree as it hasn't entirely moved out of the staging tree, but is almost there. Other than that, there wa a ton of work on the comedi drivers to make them more readable and the correct style. Doing that removed a lot of code, but we added a new driver to the staging tree, so we didn't end up with a net reduction this time around: 662 files changed, 51649 insertions(+), 26582 deletions(-) All of these patches have been in the linux-next tree already. Signed-off-by: Greg Kroah-Hartman <[email protected]>" * tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1094 commits) staging: comedi: jr3_pci: fix iomem dereference staging: comedi: drivers: use comedi_fc.h cmdtest helpers Staging: winbond: usb_free_urb(NULL) is safe Staging: winbond: checkpatch cleanup Staging: winbond: Removed undesired spaces, lines and tabs Staging: winbond: Typo corrections in comments Staging: winbond: Changed c99 comments to c89 comments staging: r8712u: Do not queue cloned skb staging: comedi: ni_mio_common: always lock in ni_ai_poll() staging: comedi: s626: add FIXME comment staging: comedi: s626: don't dereference insn->data staging: comedi: s526: fix if() check in s526_gpct_winsn() staging: comedi: s626: cleanup comments in s626_initialize() staging: comedi: s626: remove clear of kzalloc'ed data staging: comedi: s626: remove 'WDInterval' from private data staging: comedi: s626: remove 'ChargeEnabled' from private data staging: comedi: s626: remove 'IsBoardRevA' comment staging: comedi: s626: #if 0 out the "SAA7146 BUG WORKAROUND" staging: comedi: s626: remove 'allocatedBuf' from private data staging: comedi: s626: add final attach message ...
2012-09-24leds: add output driver configuration for pca9633 led driverPeter Meerwald1-0/+35
the pca9633 leds driver can be used in open-drain or totem pole (a.k.a. push/pull) output driver mode; default is the later the patch allows to set the output driver mode using platform data (similar to configuration inferface provided by the tca6507 led driver) v2: move leds-pca9633.h to include/linux/platform_data/ (Bryan Wu) Signed-off-by: Peter Meerwald <[email protected]> Signed-off-by: Bryan Wu <[email protected]>
2012-09-24thermal: exynos: register the tmu sensor with the kernel thermal layerAmit Daniel Kachhap1-0/+22
This code added creates a link between temperature sensors, linux thermal framework and cooling devices for samsung exynos platform. This layer monitors the temperature from the sensor and informs the generic thermal layer to take the necessary cooling action. [[email protected]: fix comment layout] Signed-off-by: Amit Daniel Kachhap <[email protected]> Acked-by: Guenter Roeck <[email protected]> Cc: SangWook Ju <[email protected]> Cc: Durgadoss <[email protected]> Cc: Len Brown <[email protected]> Cc: Jean Delvare <[email protected]> Cc: Kyungmin Park <[email protected]> Cc: Kukjin Kim <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Amit Daniel Kachhap <[email protected]> Signed-off-by: Zhang Rui <[email protected]>
2012-09-24thermal: exynos5: add exynos5250 thermal sensor driver supportAmit Daniel Kachhap1-4/+15
Insert exynos5 TMU sensor changes into the thermal driver. Some exynos4 changes are made generic for exynos series. [[email protected]: fix comment layout] Signed-off-by: SangWook Ju <[email protected]> Signed-off-by: Amit Daniel Kachhap <[email protected]> Acked-by: Guenter Roeck <[email protected]> Cc: Durgadoss <[email protected]> Cc: Len Brown <[email protected]> Cc: Jean Delvare <[email protected]> Cc: Kyungmin Park <[email protected]> Cc: Kukjin Kim <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Amit Daniel Kachhap <[email protected]> Signed-off-by: Zhang Rui <[email protected]>
2012-09-24hwmon: exynos4: move thermal sensor driver to driver/thermal directoryAmit Daniel Kachhap1-4/+4
This movement is needed because the hwmon entries and corresponding sysfs interface is a duplicate of utilities already provided by driver/thermal/thermal_sys.c. The goal is to place it in thermal folder and add necessary functions to use the in-kernel thermal interfaces. Signed-off-by: Amit Daniel Kachhap <[email protected]> Acked-by: Guenter Roeck <[email protected]> Cc: SangWook Ju <[email protected]> Cc: Durgadoss <[email protected]> Cc: Len Brown <[email protected]> Cc: Jean Delvare <[email protected]> Cc: Kyungmin Park <[email protected]> Cc: Kukjin Kim <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Amit Daniel Kachhap <[email protected]> Signed-off-by: Zhang Rui <[email protected]>
2012-09-23hwmon: (sht15) move header to linux/platform_data/Vivien Didelot1-0/+33
This patch moves the sht15.h header from include/linux to include/linux/platform_data, and update existing support (stargate2 platform) accordingly. Signed-off-by: Vivien Didelot <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2012-09-23hwmon: add Maxim MAX197 supportVivien Didelot1-0/+21
The MAX197 is an A/D converter, made by Maxim. This driver currently supports the MAX197, and MAX199. They are both 8-Channel, Multi-Range, 5V, 12-Bit DAS with 8+4 Bus Interface and Fault Protection. The available ranges for the MAX197 are {0,-5V} to 5V, and {0,-10V} to 10V, while they are {0,-2V} to 2V, and {0,-4V} to 4V on the MAX199. Signed-off-by: Vivien Didelot <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2012-09-22Merge branch 'multiplatform/platform-data' into next/multiplatformOlof Johansson81-1/+3553
* multiplatform/platform-data: ARM: spear: move platform_data definitions ARM: samsung: move platform_data definitions ARM: orion: move platform_data definitions ARM: nomadik: move platform_data definitions ARM: w90x900: move platform_data definitions ARM: vt8500: move platform_data definitions ARM: tegra: move sdhci platform_data definition ARM: sa1100: move platform_data definitions ARM: pxa: move platform_data definitions ARM: netx: move platform_data definitions ARM: msm: move platform_data definitions ARM: imx: move platform_data definitions ARM: ep93xx: move platform_data definitions ARM: davinci: move platform_data definitions ARM: at91: move platform_data definitions Conflicts due to removed files: arch/arm/mach-tegra/board-harmony.c arch/arm/mach-tegra/board-trimslice.c Conflicts due to code removal: arch/arm/mach-tegra/board-paz00.c Context conflicts in: drivers/mmc/host/sdhci-tegra.c drivers/net/irda/pxaficp_ir.c Signed-off-by: Olof Johansson <[email protected]>
2012-09-20Merge branch 'next/dt' into next/multiplatformOlof Johansson2-0/+18
* next/dt: (182 commits) ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support ARM: tegra: Add Avionic Design Medcom-Wide support ARM: tegra: Add Avionic Design Plutux support ARM: tegra: Add Avionic Design Tamonten support ARM: tegra: dts: Add pwm label ARM: dt: tegra: whistler: configure power off ARM: mxs: m28evk: Disable OCOTP OUI loading ARM: imx6q: use pll2_pfd2_396m as the enfc_sel's parent ARM: dts: imx6q-sabrelite: add usbotg pinctrl support ARM: dts: imx23-olinuxino: Add USB host support ARM: dts: imx6q-sabrelite: add usbmisc device ARM: dts: mx23: Add USB resources ARM: dts: mxs: Add ethernetX to macX aliases ARM: msm: Remove non-DT targets from 8960 ARM: msm: Add DT support for 8960 ARM: msm: Move io mapping prototypes to common.h ARM: msm: Rename board-msm8x60 to signify its DT only status ARM: msm: Make 8660 a DT only target ARM: msm: Move 8660 to DT timer ARM: msm: Add DT support to msm_timer ...
2012-09-20lp8727_charger: More pure cosmetic improvementsKim, Milo1-4/+4
This is really minor, but it improves the readability. Signed-off-by: Milo(Woogyom) Kim <[email protected]> Signed-off-by: Anton Vorontsov <[email protected]>
2012-09-20lp8727_charger: Clean up lp8727 definitionsKim, Milo1-17/+17
All definitions should be unique, since they're in the gloabl namespace. So the prefix LP8727_ are added. Additionally, use BIT() macro for bit masks. Remove unnecessary definitions such as SW_DM1_U1 and SW_DP2_U2. Signed-off-by: Milo(Woogyom) Kim <[email protected]> Signed-off-by: Anton Vorontsov <[email protected]>
2012-09-20lp8727_charger: Add configurable debouce timerKim, Milo1-0/+2
Debounce time is configurable in the platform side. If it is not defined, the default value is 270ms. Platform data is msec unit, and this time is converted to jiffies internally. The workqueue uses this jiffies time in the interrupt handling. So debounce_jiffies is added in the private data. Signed-off-by: Milo(Woogyom) Kim <[email protected]> Signed-off-by: Anton Vorontsov <[email protected]>
2012-09-20lp8727_charger: Fix buggy code of NULL pdataKim, Milo1-3/+4
LP8727 platform data is optional, so the driver should work even the platform data is NULL. To check the platform data, charging parameter data should be changed to the pointer type. Fix NULL point access problem when getting the battery properties. When the data is NULL, just return as invalid value. Signed-off-by: Milo(Woogyom) Kim <[email protected]> Signed-off-by: Anton Vorontsov <[email protected]>
2012-09-20Merge tag 'omap-devel-dt-merged-for-v3.7' of ↵Olof Johansson4-0/+388
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Device tree related changes for omaps. Note that this branch is based on omap-cleanup-sparseirq-for-v3.7 to avoid merge conflicts with the sparseirq changes for gpio-twl4030 driver. * tag 'omap-devel-dt-merged-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: arm/dts: Mux uart pins for omap4-sdp ARM: OMAP2+: select PINCTRL in Kconfig arm/dts: Add pinctrl driver entries for omap2/3/4 arm/dts: Add omap36xx.dtsi file and rename omap3-beagle to omap3-beagle-xm ARM: dts: omap3-overo: Add support for the blue LED Documentation: dt: Update the OMAP documentation with Overo/Toby ARM: dts: OMAP3: Add support for Gumstix Overo with Tobi expansion board ARM: dts: OMAP4: Add reg and interrupts for every nodes ARM: dts: AM33XX: Specify reg and interrupt property for all nodes ARM: dts: AM33XX: Convert all hex numbers to lower-case ARM: dts: omap3-beagle: Enable audio support ARM: dts: omap5: Add McPDM and DMIC section to the dtsi file ARM: dts: omap5: Add McBSP entries ARM: dts: omap4: Add reg-names for McPDM and DMIC ARM: dts: omap4: Add McBSP entries ARM: dts: omap3: Add McBSP entries ARM: dts: omap2420-h4: Include omap2420.dtsi file instead the common omap2 ARM: dts: omap2: Add McBSP entries for OMAP2420 and OMAP2430 SoC ARM: dts: omap3-beagle: Add heartbeat and mmc LEDs support ARM: dts: omap3: Add gpio-twl4030 properties for BeagleBoard and omap3-EVM ...
2012-09-19ARM: spear: move platform_data definitionsArnd Bergmann1-0/+164
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the spear include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Cc: Viresh Kumar <[email protected]> Cc: Shiraz Hashim <[email protected]> Cc: [email protected] Cc: Dmitry Torokhov <[email protected]>
2012-09-19ARM: samsung: move platform_data definitionsArnd Bergmann15-0/+669
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the samsung include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Cc: Kukjin Kim <[email protected]> Cc: Kyungmin Park <[email protected]> Cc: Ben Dooks <[email protected]> Cc: Jeff Garzik <[email protected]> Cc: Guenter Roeck <[email protected]> Cc: "Wolfram Sang (embedded platforms)" <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Bryan Wu <[email protected]> Cc: Richard Purdie <[email protected]> Cc: Sylwester Nawrocki <[email protected]> Cc: Chris Ball <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Grant Likely <[email protected]> Cc: Felipe Balbi <[email protected]> Cc: Alan Stern <[email protected]> Cc: Sangbeom Kim <[email protected]> Cc: Liam Girdwood <[email protected]> Cc: [email protected]
2012-09-19ARM: orion: move platform_data definitionsArnd Bergmann7-0/+184
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the orion include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Cc: Jason Cooper <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Vinod Koul <[email protected]> Cc: Dan Williams <[email protected]> Cc: Bryan Wu <[email protected]> Cc: Richard Purdie <[email protected]> Cc: Chris Ball <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Alan Stern <[email protected]> Cc: Liam Girdwood <[email protected]> Cc: Jaroslav Kysela <[email protected]> Cc: Takashi Iwai <[email protected]>
2012-09-19ARM: omap: move platform_data definitionsArnd Bergmann9-0/+392
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the omap include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Tony Lindgren <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: "Benoît Cousson" <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Kyungmin Park <[email protected]> Cc: Ohad Ben-Cohen <[email protected]> Cc: Grant Likely <[email protected]> Cc: Omar Ramirez Luna <[email protected]> Cc: Tomi Valkeinen <[email protected]> Cc: Florian Tobias Schandinat <[email protected]> Cc: Peter Ujfalusi <[email protected]> Cc: Jarkko Nikula <[email protected]> Cc: Liam Girdwood <[email protected]> Cc: Artem Bityutskiy <[email protected]> Cc: Jean Pihet <[email protected]> Cc: J Keerthy <[email protected]> Cc: [email protected]
2012-09-19mmc: sdhci-pxav3: dt: Support "cd-gpios" propertyChris Ball1-0/+1
Tested on OLPC XO-4/MMP3, where the card detection pin for one of the controllers is a sideband GPIO. The third cell in the cd-gpios property controls whether the GPIO is active high/active low. (Also, pass host_caps2 through from platdata to the mmc host.) Acked-by: Haojian Zhuang <[email protected]> [[email protected]: Compile fix] Signed-off-by: Chris Ball <[email protected]>
2012-09-18drm: Renesas SH Mobile DRM driverLaurent Pinchart1-0/+99
The SH Mobile LCD controller (LCDC) DRM driver supports the main graphics plane in RGB and YUV formats, as well as the overlay planes (in alpha-blending mode only). Only flat panel outputs using the parallel interface are supported. Support for SYS panels, HDMI and DSI is currently not implemented. Signed-off-by: Laurent Pinchart <[email protected]> Reviewed-by: Sascha Hauer <[email protected]>
2012-09-17iio:dac: Add ad5755 driverLars-Peter Clausen1-0/+103
This patch adds support for the AD5755, AD5755-1, AD5757, AD5735, AD5737 16 and 14 bit quad-channel DACs. The AD5757/AD5737 only have current outputs, but for the AD5755/AD5757 each of the outputs can be configured to either be a voltage or a current output. We only allow to configure this at device probe time since usually this needs to match the external circuitry and should not be changed on the fly. A few trivial formatting changes on merge. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2012-09-17ASoC: mx27vis: retrieve gpio numbers from platform_dataShawn Guo1-0/+11
Rather than including mach/iomux-mx27.h to define gpio numbers and set up the pins, the patch moves all these into machine code and has the gpio numbers passed to driver via platform_data. As the result, we can remove the mach/iomux-mx27.h inclusion from driver. Signed-off-by: Shawn Guo <[email protected]> Acked-by: Javier Martin <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-16Merge tag 'omap-cleanup-sparseirq-for-v3.7' of ↵Olof Johansson1-0/+217
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup From Tony Lindgren: This branch contains changes needed to make omap2+ work properly with sparse IRQ. It also removes dependencies to mach/hardware.h. These help moving things towards ARM single zImage support. This branch is based on a commit in tty-next branch with omap-devel-gpmc-fixed-for-v3.7 and cleanup-omap-tags-for-v3.7 merged in to keep things compiling and sort out some merge conflicts. * tag 'omap-cleanup-sparseirq-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP1: Move SoC specific headers from plat to mach for omap1 ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2 ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+ ARM: OMAP: Remove unused old gpio-switch.h ARM: OMAP1: Move plat/irqs.h to mach/irqs.h ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ ARM: OMAP2+: Prepare for irqs.h removal W1: OMAP HDQ1W: Remove dependencies to mach/hardware.h Input: omap-keypad: Remove dependencies to mach includes ARM: OMAP: Move gpio.h to include/linux/platform_data ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end ARM: OMAP2+: Remove unused nand_irq for GPMC ARM: OMAP2+: Make INTCPS_NR_IRQS local for mach-omap2/irq.c ARM: OMAP1: Define OMAP1_INT_I2C locally ARM: OMAP1: Move define of OMAP_LCD_DMA to dma.h
2012-09-16Merge branch 'depends/tty-omap-serial' into next/cleanupOlof Johansson2-0/+160
This part of the tty tree (unfortunately with all the preceding patches as well) is a dependency for some of the OMAP cleanups, so we've pulled it in as a dependency based on agreement with Greg. Signed-off-by: Olof Johansson <[email protected]>
2012-09-16Merge tag 'cleanup-omap-tags-for-v3.7' of ↵Olof Johansson1-0/+11
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup From Tony Lindgren: Remove the ancient omap specific atags that are no longer needed. At some point we were planning to pass the bootloader information with custom atags that did not work out too well. There's no need for these any longer as the kernel has been booting fine without them for quite some time. And Now we have device tree support that can be used instead. * tag 'cleanup-omap-tags-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: remove plat/board.h file ARM: OMAP: move debug_card_init() function ARM: OMAP1: move lcd pdata out of arch/arm/* ARM: OMAP1: move omap1_bl pdata out of arch/arm/* ARM: OMAP: remove the omap custom tags ARM: OMAP1: remove the crystal type tag parsing ARM: OMAP: remove the sti console workaround ARM: OMAP: omap3evm: cleanup revision bits ARM: OMAP: cleanup struct omap_board_config_kernel + sync to 3.6-rc5
2012-09-14ARM: nomadik: move platform_data definitionsArnd Bergmann4-0/+113
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the nomadik include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Felipe Balbi <[email protected]> Acked-by: Alessandro Rubini <[email protected]> Acked-by: Linus Walleij <[email protected]> Cc: STEricsson <[email protected]> Cc: Srinidhi Kasagar <[email protected]> Cc: Herbert Xu <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Andreas Westin <[email protected]>
2012-09-14ARM: w90x900: move platform_data definitionsArnd Bergmann4-0/+142
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the w90x900 include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Cc: Wan ZongShun <[email protected]> Cc: "Ben Dooks (embedded platforms)" <[email protected]> Cc: "Wolfram Sang (embedded platforms)" <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Grant Likely <[email protected]> Cc: Florian Tobias Schandinat <[email protected]>
2012-09-14ARM: vt8500: move platform_data definitionsArnd Bergmann1-0/+31
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the vt8500 include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Tony Prisk <[email protected]> Cc: Florian Tobias Schandinat <[email protected]>
2012-09-14ARM: tegra: move sdhci platform_data definitionArnd Bergmann1-0/+28
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This the definitions for the tegra sdhci driver out of the tegra include directories, which is the last one for this platform. Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Stephen Warren <[email protected]> Acked-by: Chris Ball <[email protected]>
2012-09-14ARM: sa1100: move platform_data definitionsArnd Bergmann1-0/+22
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the sa1100 include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Cc: Samuel Ortiz <[email protected]> Cc: Jochen Friedrich <[email protected]>
2012-09-14ARM: pxa: move platform_data definitionsArnd Bergmann14-0/+612
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the pxa include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Acked-by: Igor Grinberg <[email protected]> Acked-by: Jeff Garzik <[email protected]> Acked-by: Marek Vasut <[email protected]> Acked-by: Robert Jarzmik <[email protected]> Acked-by: Paul Parsons <[email protected]> Acked-by: Vinod Koul <[email protected]> Acked-By: Stefan Schmidt <[email protected]> Cc: Eric Miao <[email protected]> Cc: Haojian Zhuang <[email protected]> Cc: Daniel Ribeiro <[email protected]> Cc: Harald Welte <[email protected]> Cc: Philipp Zabel <[email protected]> Cc: Tomas Cech <[email protected]> Cc: Sergey Lapin <[email protected]> Cc: Jonathan Cameron <[email protected]> Cc: Dan Williams <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Chris Ball <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Samuel Ortiz <[email protected]> Cc: Alan Stern <[email protected]> Cc: Florian Tobias Schandinat <[email protected]> Cc: Liam Girdwood <[email protected]> Cc: Jaroslav Kysela <[email protected]> Cc: Takashi Iwai <[email protected]> Cc: Guennadi Liakhovetski <[email protected]> Cc: Artem Bityutskiy <[email protected]> Cc: [email protected]
2012-09-14ARM: netx: move platform_data definitionsArnd Bergmann1-0/+27
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the netx include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Sascha Hauer <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: [email protected]
2012-09-14ARM: msm: move platform_data definitionsArnd Bergmann2-0/+177
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the msm include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: David Brown <[email protected]> Cc: Daniel Walker <[email protected]> Cc: Bryan Huntsman <[email protected]> Cc: Chris Ball <[email protected]> Cc: Florian Tobias Schandinat <[email protected]> Cc: [email protected]
2012-09-14ARM: imx: move platform_data definitionsArnd Bergmann17-0/+730
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the imx include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Acked-by: Sascha Hauer <[email protected]> Acked-by: Vinod Koul <[email protected]> Cc: Russell King <[email protected]> Cc: Dan Williams <[email protected]> Cc: "Ben Dooks (embedded platforms)" <[email protected]> Cc: "Wolfram Sang (embedded platforms)" <[email protected]> Cc: Chris Ball <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Grant Likely <[email protected]> Cc: Alan Cox <[email protected]> Cc: Felipe Balbi <[email protected]> Cc: Alan Stern <[email protected]> Cc: Florian Tobias Schandinat <[email protected]> Cc: Liam Girdwood <[email protected]> Cc: Javier Martin <[email protected]> Cc: Shawn Guo <[email protected]> Cc: Guennadi Liakhovetski <[email protected]>
2012-09-14ARM: ep93xx: move platform_data definitionsArnd Bergmann4-0/+213
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the ep93xx include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Hartley Sweeten <[email protected]> Acked-by: Ryan Mallon <[email protected]> Acked-by: Vinod Koul <[email protected]> Cc: Grant Likely <[email protected]> Cc: Jeff Garzik <[email protected]> Cc: Dan Williams <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Florian Tobias Schandinat <[email protected]> Cc: Liam Girdwood <[email protected]> Cc: Jaroslav Kysela <[email protected]> Cc: Takashi Iwai <[email protected]> Cc: Mika Westerberg <[email protected]> Cc: Axel Lin <[email protected]>
2012-09-14ARM: davinci: move platform_data definitionsArnd Bergmann7-0/+381
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the davinci include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Acked-by: Felipe Balbi <[email protected]> Cc: Sekhar Nori <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: "Ben Dooks" <[email protected]> Cc: "Wolfram Sang" <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Chris Ball <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Grant Likely <[email protected]> Cc: Alan Stern <[email protected]> Cc: Liam Girdwood <[email protected]> Cc: [email protected]
2012-09-14ARM: at91: move platform_data definitionsArnd Bergmann2-1/+62
Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the at91 include directories Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Nicolas Ferre <[email protected]> Acked-by: Vinod Koul <[email protected]> Cc: Jean-Christophe Plagniol-Villard <[email protected]> Cc: Dan Williams <[email protected]>
2012-09-14dmaengine: mmp-pdma supportZhangfei Gao1-0/+19
1. virtual channel vs. physical channel Virtual channel is managed by dmaengine Physical channel handling resource, such as irq Physical channel is alloced dynamically as descending priority, freed immediately when irq done. The availble highest priority physically channel will alwayes be alloced Issue pending list -> alloc highest dma physically channel available -> dma done -> free physically channel 2. list: running list & pending list submit: desc list -> pending list issue_pending_list: if (IDLE) pending list -> running list; free pending list (RUN) irq: free running list (IDLE) check pendlist -> pending list -> running list; free pending list (RUN) 3. irq: Each list generate one irq, calling callback One list may contain several desc chain, in such case, make sure only the last desc list generate irq. 4. async Submit will add desc chain to pending list, which can be multi-called If multi desc chain is submitted, only the last desc would generate irq -> call back If IDLE, issue_pending_list start pending_list, transforming pendlist to running list If RUN, irq will start pending list 5. test 5.1 pxa3xx_nand on pxa910 5.2 insmod dmatest.ko (threads_per_chan=y) By default drivers/dma/dmatest.c test every channel and test memcpy with 1 threads per channel Signed-off-by: Zhangfei Gao <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2012-09-13leds: Add new LED driver for lm3642 chipsG.Shark Jeong1-0/+38
This driver is a general version for LM642 led chip of TI. LM3642 : The LM3642 is a 4MHz fixed-frequency synchronous boost converter plus 1.5A constant current driver for a high-current white LED. The LM3642 is controlled via an I2C-compatible interface. Signed-off-by: G.Shark Jeong <[email protected]> Signed-off-by: Bryan Wu <[email protected]>
2012-09-12ARM: OMAP: Move gpio.h to include/linux/platform_dataTony Lindgren1-0/+217
This way we can remove includes of plat/gpio.h which won't work with the single zImage support. Note that we also remove the cpu_class_is_omap2() check in gpio-omap.c as the drivers should not call it as we need to make it local to arch/arm/mach-omap2 for single zImage support. While at it, arrange the related includes in the standard way. Cc: Grant Likely <[email protected]> Cc: [email protected] Cc: [email protected] Acked-by: Linus Walleij <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2012-09-12Merge tags 'omap-devel-gpmc-fixed-for-v3.7' and 'cleanup-omap-tags-for-v3.7' ↵Tony Lindgren1-0/+11
into cleanup-sparseirq Changes for GPMC (General Purpose Memory Controller) that take it closer for being just a regular device driver. Remove the ancient omap specific atags that are no longer needed. At some point we were planning to pass the bootloader information with custom atags that did not work out too well. There's no need for these any longer as the kernel has been booting fine without them for quite some time. And Now we have device tree support that can be used instead.
2012-09-11leds: Add new LED driver for lm355x chipsG.Shark Jeong2-50/+66
This driver is a general version for LM355x,lm3554 and lm3556,led chips of TI. LM3554 : The LM3554 is a 2 MHz fixed-frequency synchronous boost converter with 1.2A dual high side led drivers. Datasheet: www.ti.com/lit/ds/symlink/lm3554.pdf LM3556 : The LM3556 is a 4 MHz fixed-frequency synchronous boost converter plus 1.5A constant current driver for a high-current white LED. Datasheet: www.national.com/ds/LM/LM3556.pdf ([email protected]: use flush_work() to replace flush_work_sync() which is deprecated) Signed-off-by: G.Shark Jeong <[email protected]> Signed-off-by: Bryan Wu <[email protected]>
2012-09-10ARM: OMAP1: move omap1_bl pdata out of arch/arm/*Igor Grinberg1-0/+11
omap1 backlight platform data resides inside plat/board.h while it should be inside include/linux/... Move the omap1 backlight platform data to include/linux/platform_data/. Cc: Richard Purdie <[email protected]> Cc: Florian Tobias Schandinat <[email protected]> Cc: [email protected] Signed-off-by: Igor Grinberg <[email protected]> Acked-by: Tomi Valkeinen <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2012-09-08staging:iio:adc: Add AD7791 driverLars-Peter Clausen1-0/+17
This patch adds support for the Analog Devices AD7787, AD7788, AD7789, AD7790 and AD7791 Sigma Delta Analog-to-Digital converters. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2012-09-06clk: ux500: First version of clock definitions for ux500Ulf Hansson1-0/+17
In this first version of the clock definitions, the structure for ux500 are set. Support for u8500, u9540 and u8540 are prepared. Signed-off-by: Ulf Hansson <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Mike Turquette <[email protected]>
2012-09-06ASoC: Davinci: McASP: add support new McASP IP VariantHebbar, Gururaja1-0/+1
The OMAP2+ variant of McASP is different from Davinci variant w.r.to some register offset. Changes - Add new MCASP_VERSION_3 to identify new variant. New DT compatible "ti,omap2-mcasp-audio" to identify version 3 controller. - The register offsets are handled depending on the version. Note: DMA parameters (dma fifo offset) are not updated and will be done later. Signed-off-by: Hebbar, Gururaja <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2012-09-05serial: New serial driver SCCNXPAlexander Shiyan1-0/+93
This driver is a replacement for a SC26XX driver with a lot of improvements and new features. The main differences from the SC26XX driver: - Removed dependency on MIPS. Driver can be used on any platform. - Added support for SCC2681, SCC2691, SCC2692, SC28L91, SC28L92, SC28L202, SCC68681 and SCC68692 ICs. - Using devm_-related functions. - Improved error handling of serial port, improved FIFO handling. - Ability to load multiple instances of drivers. To avoid the possibility of regression, driver SC26XX left in the system to confirm the stability of the driver on platforms where it is being used. Signed-off-by: Alexander Shiyan <[email protected]> Acked-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2012-08-27ASoC/ARM: Davinci: McASP: split asp header into platform and audio specificHebbar, Gururaja1-0/+104
Davinci McASP header & driver are shared by few OMAP platforms (like TI81xx, AM335x). Splitting asp header into Davinci platform specific header and Audio specific header helps to share them across platforms. Audio specific defines is moved to to common <linux/platform_data/davinci_asp.h> so that the header can be accessed by all related platforms. While here, correct the header usage (remove multiple header re-definitions and unused headers) and remove platform names from structures comments and enum. Also some some coding style errors. Signed-off-by: Hebbar, Gururaja <[email protected]> Acked-by: Vaibhav Bedia <[email protected]> Signed-off-by: Mark Brown <[email protected]>