summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-03-08ARM: OMAP2+: Fix build issues with missing include of linux/bug.hTony Lindgren4-0/+4
Otherwise we can get the following if bug.h is not included from kernel.h: arch/arm/mach-omap2/powerdomain-common.c: In function 'omap2_pwrdm_get_mem_bank_onstate_mask': arch/arm/mach-omap2/powerdomain-common.c:64:3: error: implicit declaration of function 'WARN_ON' [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2012-03-08Merge branch 'fixes-non-critical-part2' of ↵Olof Johansson21-56/+90
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical * 'fixes-non-critical-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP3+: PM: VP: fix integer truncation error ARM: OMAP2+: PM: fix wakeupgen warning when hotplug disabled ARM: OMAP2+: PM: fix section mismatch with omap2_init_processor_devices() ARM: OMAP2: Fix section warning for n8x0 when CONFIG_MMC_OMAP is not set ARM: OMAP2+: Fix omap24xx_io_desc warning if SoC subtypes are not selected ARM: OMAP1: Fix section mismatch for omap1_init_early() ARM: OMAP1: Fix typo in lcd_dma.c ARM: OMAP: mailbox: trivial whitespace fix ARM: OMAP: Remove definition cpu_is_omap4430() ARM: OMAP2+: included some headers twice ARM: OMAP: clock.c: included linux/debugfs.h twice ARM: OMAP: don't build hwspinlock in vain ARM: OMAP2+: ads7846_init: put gpio_pendown into pdata if it's provided ARM: omap: pandora: fix usbhs platform data ARM: OMAP: sram: Add am33xx SRAM support (minimal) ARM: OMAP2+: id: Add am33xx SoC type detection ARM: OMAP2+: GPMC: Export gpmc_enable_hwecc and gpmc_calculate_ecc ARM: OMAP: dmtimer: fix missing content/correction in low-power mode support
2012-03-08Merge branch 'fixes-non-critical' of ↵Olof Johansson2-35/+20
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical * 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: Revert "ARM: OMAP2+: Fix multiple randconfig errors with SOC_OMAP and SOC_OMAP_NOOP"
2012-03-07ARM: OMAP3+: PM: VP: fix integer truncation errorYuan Jiangli1-2/+2
commit 2f34ce81b8c05c900e45bd88595cc154f7bb5957 (OMAP3: PM: Adding voltage driver support.) introduced runtime computation of waittime to handle all potential sys clocks available. In the voltage processor, the SPMSUpdateWait is calculated based on the slew rate and the voltage step (SMPSUpdateWait = slew rate * Voltage Step). After the voltage processor receives the SMPS_Ack signal, the Voltage Controller will wait for SMPSUpdateWait clock cycles for the voltage to settle to the new value. For all practical purposes, the waittime parameter is the OMAP hardware translation of what the slew rate on the PMIC is. As an example, with TPS62361 on OMAP4460, step_size = 10000 slew_rate = 32000 sys_clk_rate = 38400 Our current computation results in the following: = ((step_size / slew_rate) * sys_clk_rate) / 1000 = ((10000 / 32000) * 38400 / 1000 = 0 Fix the same using DIV_ROUND_UP as an extra wait clock cycle is better than lesser clock cycle. For the above example, this translates to: = (10000 * 38400) / (1000 * 32000) = 12 Acked-by: Jon Hunter <jon-hunter@ti.com> [nm@ti.com: slightly better implementation] Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Yuan Jiangli <jlyuan@motorola.com> Acked-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-07ARM: OMAP2+: PM: fix wakeupgen warning when hotplug disabledKevin Hilman1-25/+28
When CONFIG_HOTPLUG_CPU=n, there are unused functions in wakeupgen: arch/arm/mach-omap2/omap-wakeupgen.c:181: warning: 'wakeupgen_irqmask_all' defined but not used Fix this by moving all the functions only used when CONFIG_HOTPLUG_CPU=y together and wrapping in an #ifdef. No functional changes. Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP2+: PM: fix section mismatch with omap2_init_processor_devices()Kevin Hilman1-1/+1
Fix the below warning by making omap2_init_processor_devices() __init. It is called by an __init function and calls only __init functions, so it should also be init. WARNING: arch/arm/mach-omap2/built-in.o(.text+0x183c): Section mismatch in reference from the function omap2_init_processor_devices() to the function .init.text:_init_omap_device() The function omap2_init_processor_devices() references the function __init _init_omap_device(). This is often because omap2_init_processor_devices lacks a __init annotation or the annotation of _init_omap_device is wrong. Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP2: Fix section warning for n8x0 when CONFIG_MMC_OMAP is not setTony Lindgren1-4/+4
Otherwise we get: arch/arm/mach-omap2/board-n8x0.c:39:12: warning: 'slot1_cover_open' defined but not used [-Wunused-variable] arch/arm/mach-omap2/board-n8x0.c:40:12: warning: 'slot2_cover_open' defined but not used [-Wunused-variable] arch/arm/mach-omap2/board-n8x0.c:41:23: warning: 'mmc_device' defined but not used [-Wunused-variable] Reported-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP2+: Fix omap24xx_io_desc warning if SoC subtypes are not selectedTony Lindgren1-1/+1
Otherwise we get the following warning: arch/arm/mach-omap2/io.c:53:24: warning: 'omap24xx_io_desc' defined but not used [-Wunused-variable] Reported-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06Merge branch 'ux500-fixes-20120301' of ↵Arnd Bergmann12-24/+76
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/fixes-non-critical * 'ux500-fixes-20120301' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: solve some Kconfig mess ARM: ux500: delete TPS6105X selection ARM: ux500: select CPU_FREQ_TABLE where needed ARM: ux500: select L2X0 cache on ux500 ARM: ux500: add board autoselection ARM: ux500: U8500 depends on MMU ARM: ux500: included linux/gpio.h twice ARM: ux500: fix around AB8500 GPIO macro name ARM: ux500: set ARCH_NR_GPIO to 355 on U8500 platforms ARM: ux500: Add audio-regulators ARM: ux500: Add DMA-channels for MSP ARM: ux500: Add placeholder for clk_set_parent
2012-03-06ARM: OMAP1: Fix section mismatch for omap1_init_early()Tony Lindgren1-1/+1
Fix the following warning: WARNING: vmlinux.o(.text+0x1286c): Section mismatch in reference from the function omap1_init_early() to the function .init.text:omap1_clk_init() The function omap1_init_early() references the function __init omap1_clk_init(). This is often because omap1_init_early lacks a __init annotation or the annotation of omap1_clk_init is wrong. Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP1: Fix typo in lcd_dma.cMasanari Iida1-1/+1
Correct spelling "resulotion" to "resolution" in arch/arm/mach-omap1/lcd_dma.c Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP: mailbox: trivial whitespace fixFelipe Contreras1-1/+1
Trivial whitespace fix Signed-off-by: Felipe Contreras <felipe.contreras@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP: Remove definition cpu_is_omap4430()Jon Hunter1-2/+0
The definition cpu_is_omap4430() always returns 0 even when CONFIG_ARCH_OMAP4 is enabled. This macro should be removed and the macro cpu_is_omap443x() should be used where needed for OMAP4430 devices. Signed-off-by: Jon Hunter <jon-hunter@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP2+: included some headers twiceDanny Kukawka3-3/+0
arch/arm/mach-omap2/: included some headers tiwce: - arch/arm/mach-omap2/board-ldp.c: 'linux/gpio.h' - arch/arm/mach-omap2/io.c: 'common.h' - arch/arm/mach-omap2/omap_hwmod_44xx_data.c: 'plat/i2c.h' Remove the duplicates. Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP: clock.c: included linux/debugfs.h twiceDanny Kukawka1-1/+0
arch/arm/plat-omap/clock.c: included 'linux/debugfs.h' twice, remove the duplicate. Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP: don't build hwspinlock in vainOhad Ben-Cohen1-1/+3
Cleanup: don't build mach-omap2/hwspinlock.c if the OMAP hwspinlock driver isn't configured. This will both shorten build time and avoid registering a device which isn't needed. Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP2+: ads7846_init: put gpio_pendown into pdata if it's providedIlya Yanok1-3/+5
If platform data is provided by the caller gpio_pendown is put into unused static ads7846_config structure and effectively has no effect. Of course caller can set gpio_pendown field in platform data himself but it seems natural to do this in ads7846_init to remove duplication. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: omap: pandora: fix usbhs platform dataGrazvydas Ignotas1-5/+5
It turned out wrong OMAP HSUSB port was configured on pandora, but still managed to work somehow. This was noticed after enabling in-kernel mux, where USB muxing was causing other devices not to work, because hsusb1 pins (instead of hsusb2) were wrongly remuxed, which are used for other things on pandora. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP: sram: Add am33xx SRAM support (minimal)Vaibhav Bedia2-2/+13
Update SRAM start & size for am33xx SoC's. Note: cpu_is_34xx() is true for am33xx also. Doing cpu_is_am33xx() check after cpu_is_34xx() will not achieve what we want due to the above reason. Hence cpu_is_am33xx() is done before cpu_is_34xx() Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com> Signed-off-by: Afzal Mohammed <afzal@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP2+: id: Add am33xx SoC type detectionAfzal Mohammed2-0/+7
Determine SoC type, i.e. whether GP or HS Note: cpu_is_34xx() is true for am33xx also. Doing cpu_is_am33xx() check after cpu_is_34xx() will not achieve what we want due to the above reason. Hence cpu_is_am33xx() is done before cpu_is_34xx() Signed-off-by: Afzal Mohammed <afzal@ti.com> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP2+: GPMC: Export gpmc_enable_hwecc and gpmc_calculate_eccBernhard Walle1-0/+2
To be able to compile kernel/drivers/mtd/nand/omap2.ko as module, that two symbols need to be exported. Otherwise, I get following error message ERROR: "gpmc_calculate_ecc" [drivers/mtd/nand/omap2.ko] undefined! ERROR: "gpmc_enable_hwecc" [drivers/mtd/nand/omap2.ko] undefined! Signed-off-by: Bernhard Walle <walle@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06ARM: OMAP: dmtimer: fix missing content/correction in low-power mode supportTarun Kanti DebBarma1-3/+16
Since omap_dm_timer_write_reg/__omap_dm_timer_write is now modified to use timer->func_base OCP_CFG should not use this wrapper anymore. Instead use __raw_writel() directly and use timer->io_base instead to write to OCP_CFG. The timer->sys_stat is valid only if timer->revision is 1. In the context restore function make this correction. Save the contexts and loss count when timer is stopped. Also, disable the clock. Else, clock usecount would become imbalanced. Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com> Tested-by: Omar Ramirez Luna <omar.ramirez@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-06Revert "ARM: OMAP2+: Fix multiple randconfig errors with SOC_OMAP and ↵Tony Lindgren2-35/+20
SOC_OMAP_NOOP" This reverts commit c295fb633e321a7df3b8846c4eaddc5da3e0aaed. This makes existing .config files bloated by selecting in all omaps as noted by Russell King - ARM Linux <linux@arm.linux.org.uk>. Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-03-01Merge branch 'fixes-non-critical' of ↵Arnd Bergmann42-138/+264
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical * 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: OMAP4: dma: Correct CPU version check for dma_common_ch_end ARM: OMAP: Fix section mismatch warning for platform_cpu_die() ARM: OMAP: fix section mismatch warning for omap4_hotplug_cpu() ARM: OMAP: convert omap_device_build() and callers to __init ARM: OMAP2+: Mark omap_hsmmc_init and omap_mux related functions as __init ARM: OMAP2+: Fix multiple randconfig errors with SOC_OMAP and SOC_OMAP_NOOP ARM: OMAP: Fix devexit for dma when CONFIG_HOTPLUG is not set ARM: OMAP2+: Fix devexit for smartreflex when CONFIG_HOTPLUG is not set ARM: OMAP2+: Fix zoom LCD backlight if TWL_CORE is not selected ARM: OMAP2+: Fix board_mux section type conflict when OMAP_MUX is not set ARM: OMAP2+: Fix OMAP_HDQ_BASE build error ARM: OMAP2+: Fix Kconfig dependencies for USB_ARCH_HAS_EHCI ARM: OMAP2+: I2C: always compile I2C reset code, even if I2C driver is not built ARM: OMAP2+: Split omap2_hsmmc_init() to properly support I2C GPIO pins ARM: OMAP: omap_device: Expose omap_device_{alloc, delete, register} ARM: OMAP: Fix build error when mmc_omap is built as module ARM: OMAP: Fix kernel panic with HSMMC when twl4030_gpio is a module
2012-02-29ARM: ux500: solve some Kconfig messLinus Walleij3-12/+15
First rename the config option MACH_U8500 to MACH_MOP500 because that is what it's obviously all about, this has confused me for the last time. Fix some whitespace in the process. Since the machine descriptors for HREFv60 and snowball are clearly in the file board-mop500.c which only compiles if MACH_MOP500 (former MACH_U8500) is set, select this for the board variants and nothing else. For the MOP500 variants the UIB (user interface board) is probed using I2C so select I2C and I2C_NOMADIK so we know that this probe will always be successful. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-02-29ARM: ux500: delete TPS6105X selectionLinus Walleij1-1/+0
Having this driver selected here only cause problems, get it out of there and selected it from menuconfig or wherever instead. Mea culpa. Cc: Mathieu Poirer <mathieu.poirier@linaro.org> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-02-29ARM: ux500: select CPU_FREQ_TABLE where neededArnd Bergmann1-0/+1
The ux500 platform requires CPU_FREQ_TABLE support to be enabled for its CPU_FREQ implementations, so automatically select that when CPU_FREQ is enabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> [Rebased due to missing other patches in the stack] Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-02-29ARM: ux500: select L2X0 cache on ux500Arnd Bergmann1-0/+1
The cache controller needs to be enabled for the cortex-a9 specific errata that are also selected to work. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-02-29ARM: ux500: add board autoselectionArnd Bergmann1-10/+14
At least one platform needs to be selected, so pick the u8500 development board if nothing else is selected. The first menu to choose the actual platform is meaningless and can be made invisible. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-02-29ARM: ux500: U8500 depends on MMUArnd Bergmann1-0/+1
There is no way to build U8500 kernels without an MMU at this point because of dependencies on MMU-only functions. As long as nobody is interested in fixing this, let's just disable the platforms for nommu kernels. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-02-29ARM: ux500: included linux/gpio.h twiceDanny Kukawka1-1/+0
arch/arm/mach-ux500/board-mop500-u8500uib.c included 'linux/gpio.h' remove the duplicate. Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-02-29ARM: ux500: fix around AB8500 GPIO macro namePhilippe Langlais2-2/+2
AB8500 GPIO1 is the base of AB8500 gpio number too. Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-02-29ARM: ux500: set ARCH_NR_GPIO to 355 on U8500 platformsPhilippe Langlais1-1/+1
This is due to the increased number of AB8500 GPIOs. Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-02-29ARM: ux500: Add audio-regulatorsOla Lilja1-0/+28
Add regulators Vaud, Vamic1, Vamic2 and Vdmic used by audio. Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-02-29ARM: ux500: Add DMA-channels for MSPOla Lilja2-0/+8
Add DMA-channels for MSP0, MSP1, MSP2 and MSP3. Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-02-29ARM: ux500: Add placeholder for clk_set_parentOla Lilja2-0/+8
Calling clk_set_parent (e.g. from Ux500 ASoC-driver) generates build-errors. Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-02-29Merge branch 'hsmmc' into fixes-non-criticalTony Lindgren32-103/+212
2012-02-29Merge branch 'randconfig' into fixes-non-criticalTony Lindgren8-32/+49
2012-02-29OMAP4: dma: Correct CPU version check for dma_common_ch_endPeter Ujfalusi1-1/+1
CCDN is the last common channel register in all OMAP4 versions. Use cpu_is_omap44xx() instead of the cpu_is_omap4430(). cpu_is_omap4430() returns 0 unconditionally. This causes that the dma_common_ch_end register variable is not configured correctly on OMAP4, not even for OMAP4430. Because of this, registers between CCFN - CCDN will be not cleard in the omap2_clear_dma function in OMAP4. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-02-29ARM: OMAP: Fix section mismatch warning for platform_cpu_die()Santosh Shilimkar1-1/+1
WARNING: vmlinux.o(.text+0x226d0): Section mismatch in reference from the function platform_cpu_die() to the function .cpuinit.text:omap4_hotplug_cpu() The function platform_cpu_die() references the function __cpuinit omap4_hotplug_cpu(). This is often because platform_cpu_die lacks a __cpuinit annotation or the annotation of omap4_hotplug_cpu is wrong. Thanks to Russell King for suggesting to use __ref instead of the initial (and wrong) approach to use __cpuinit. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-02-29ARM: OMAP: fix section mismatch warning for omap4_hotplug_cpu()Santosh Shilimkar1-1/+1
WARNING: arch/arm/mach-omap2/built-in.o(.text+0x8b80): Section mismatch in reference from the function omap4_hotplug_cpu() to the function .cpuinit.text:omap_secondary_startup() The function omap4_hotplug_cpu() references the function __cpuinit omap_secondary_startup(). This is often because omap4_hotplug_cpu lacks a __cpuinit annotation or the annotation of omap_secondary_startup is wrong. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-02-27Merge branch 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6 ↵Arnd Bergmann681-44041/+5247
into next/fixes-non-critical * 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6: (1 commit) ARM: LPC32xx: Fix missing and bad LPC32XX macros Update to Linux 3.3-rc5 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-02-27ARM: LPC32xx: Fix missing and bad LPC32XX macrosRoland Stigge3-49/+52
Some of the LPC32XX_* macros were typed ("LCP32XX_*"), which is fixed by this patch. (Besides another LCP doc typo.) Further, the LPC32XX_GPIO_P2_MUX_SET/CLR/STATE macros were missing. Signed-off-by: Roland Stigge <stigge@antcom.de>
2012-02-27Merge branch 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci ↵Arnd Bergmann2-5/+6
into next/fixes-non-critical * 'v3.4/fixes' of git://gitorious.org/linux-davinci/linux-davinci: ARM: davinci: map default_queue to edma channels
2012-02-27Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Arnd Bergmann253-2275/+1967
next/fixes-non-critical * 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6: (247 commits) ARM: mach-imx: mx3: Fix section mismatch in imx3_init_l2x0() ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct Also includes an update to v3.3-rc3 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-02-27ARM: mach-imx: mx3: Fix section mismatch in imx3_init_l2x0()Fabio Estevam1-1/+1
Fix the following section mismatch: WARNING: vmlinux.o(.text+0x11be8): Section mismatch in reference from the function imx3_init_l2x0() to the function .init.text:l2x0_init() The function imx3_init_l2x0() references the function __init l2x0_init(). This is often because imx3_init_l2x0 lacks a __init annotation or the annotation of l2x0_init is wrong. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-02-27ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for ↵Fabio Estevam1-0/+1
iMX21ADS board commit 1a96571d (Enable 32 bit flash support for iMX21ADS board) aimed to enable 32 bit flash support, but all it did was to delete an unset option. Fix this by enabling CONFIG_MTD_MAP_BANK_WIDTH_4 option. Cc: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-02-27ARM: mach-pcm038: Fix field name of regulator_consumer_supply structFabio Estevam1-1/+1
Building imx_v4_v5_defconfig generates the following error: arch/arm/mach-imx/mach-pcm038.c:236: error: unknown field 'dev' specified in initializer make[1]: *** [arch/arm/mach-imx/mach-pcm038.o] Error 1 Fix it by providing the correct "dev_name" field name. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-02-26Linux 3.3-rc5v3.3-rc5Linus Torvalds1-1/+1
2012-02-26Merge tag 'hwmon-for-linus' of ↵Linus Torvalds4-17/+17
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Couple of minor driver fixes. * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (max34440) Fix resetting temperature history hwmon: (f75375s) Fix register write order when setting fans to full speed hwmon: (ads1015) Fix file leak in probe function hwmon: (max6639) Fix PPR register initialization to set both channels hwmon: (max6639) Fix FAN_FROM_REG calculation
generated by cgit v1.2.3 (git 2.39.0) at 2025-02-15 21:47:28 +0300