aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-03-26dmaengine: imx-dma: remove internal structure.Javier Martin1-46/+18
This structure was created to allow an smoothless merge but was meant to be removed. Remaining members 'hw_chaining' and 'watchdog' are moved to the channel structure. Signed-off-by: Javier Martin <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2012-03-26dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure.Javier Martin1-8/+3
Use per-descriptor 'len' field to keep track of the remaining bytes instead. This goes on the direction of eventually removing the 'internal' structure. Signed-off-by: Javier Martin <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2012-03-26dmaengine: imx-dma: remove 'in_use' field of 'internal' structure.Javier Martin1-9/+0
It makes no sense keeping an 'in_use' flag when the multiple descriptor mechanism already prevents a new DMA transfer to be issued when another one is in course. Signed-off-by: Javier Martin <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2012-03-26dmaengine: imx-dma: remove sg member from internal structure.Javier Martin1-24/+18
This member is redundant, because it is already present in descriptor structure. Removing it will make further removing of 'internal' structure easier. Signed-off-by: Javier Martin <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2012-03-26dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function.Javier Martin1-63/+35
Removing this function allows moving 'ccr_to_device' and 'ccr_from_device' from internal struct to channel struct. This repesents a step forward towards removing auxiliary 'internal' structure. Signed-off-by: Javier Martin <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2012-03-26dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function.Javier Martin1-33/+13
This function is only used once in the driver and uses some intermediary variables that are not needed anymore. For this reason it's been merged with 'imxdma_control'. Signed-off-by: Javier Martin <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2012-03-26dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function.Javier Martin1-43/+14
This function is only used once in the driver and has a lot of checks that are not needed anymore. For this reason it's been merged with 'imxdma_enable_hw'. Signed-off-by: Javier Martin <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2012-03-26dmaengine: imx-dma: remove dma_mode member of internal structure.Javier Martin1-58/+45
dmaengine now provides 'enum dma_transfer_direction' to properly specify DMA transfer direction. For this reason, DMA_MODE_* defines are replaced by this new type and therefore dma_mode member becomes redundant. Signed-off-by: Javier Martin <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2012-03-26dmaengine: imx-dma: remove data member from internal structure.Javier Martin1-1/+0
Internal structure is just an auxiliary structure used for the initial merge which is meant to be gone. As data member is not use anywhere we can simply remove it. Signed-off-by: Javier Martin <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2012-03-26dmaengine: imx-dma: merge old dma-v1.c with imx-dma.cJavier Martin6-1010/+552
It is mainly a simple merge changing the prefix of some functions to fit the imx-dma namings. As there are no users of the old dma-v1.c api we can safely remove this file. Signed-off-by: Javier Martin <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2012-03-25gpio/ep93xx: Remove unused inline function and useless pr_err messageH Hartley Sweeten1-8/+0
Minor removal of an unused inline function and a useless pr_err message. Signed-off-by: H Hartley Sweeten <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2012-03-26module: Remove module size limitSasha Levin1-2/+1
Module size was limited to 64MB, this was legacy limitation due to vmalloc() which was removed a while ago. Limiting module size to 64MB is both pointless and affects real world use cases. Cc: Tim Abbott <[email protected]> Cc: [email protected] Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2012-03-26module: move __module_get and try_module_get() out of line.Steven Rostedt2-28/+34
With the preempt, tracepoint and everything, it's getting a bit chubby. For an Ubuntu-based config: Before: $ size -t `find * -name '*.ko'` | grep TOTAL 56199906 3870760 1606616 61677282 3ad1ee2 (TOTALS) $ size vmlinux text data bss dec hex filename 8509342 850368 3358720 12718430 c2115e vmlinux After: $ size -t `find * -name '*.ko'` | grep TOTAL 56183760 3867892 1606616 61658268 3acd49c (TOTALS) $ size vmlinux text data bss dec hex filename 8501842 849088 3358720 12709650 c1ef12 vmlinux Signed-off-by: Steven Rostedt <[email protected]> Acked-by: Ingo Molnar <[email protected]> Signed-off-by: Rusty Russell <[email protected]> (made all out-of-line)
2012-03-26params: <level>_initcall-like kernel parametersPawel Moll6-41/+132
This patch adds a set of macros that can be used to declare kernel parameters to be parsed _before_ initcalls at a chosen level are executed. We rename the now-unused "flags" field of struct kernel_param as the level. It's signed, for when we use this for early params as well, in future. Linker macro collating init calls had to be modified in order to add additional symbols between levels that are later used by the init code to split the calls into blocks. Signed-off-by: Pawel Moll <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2012-03-26module_param: remove support for bool parameters which are really int.Rusty Russell2-34/+8
module_param(bool) used to counter-intuitively take an int. In fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy trick. This eliminates that code (though leaves the flags field in the struct, for impending use). Signed-off-by: Rusty Russell <[email protected]>
2012-03-26module: add kernel param to force disable module loadDave Young2-0/+3
Sometimes we need to test a kernel of same version with code or config option changes. We already have sysctl to disable module load, but add a kernel parameter will be more convenient. Since modules_disabled is int, so here use bint type in core_param. TODO: make sysctl accept bool and change modules_disabled to bool Signed-off-by: Dave Young <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2012-03-26x86: Merge the x86_32 and x86_64 cpu_idle() functionsRichard Weinberger4-165/+115
Both functions are mostly identical. The differences are: - x86_32's cpu_idle() makes use of check_pgt_cache(), which is a nop on both x86_32 and x86_64. - x86_64's cpu_idle() uses enter/__exit_idle/(), on x86_32 these function are a nop. - In contrast to x86_32, x86_64 calls rcu_idle_enter/exit() in the innermost loop because idle notifications need RCU. Calling these function on x86_32 also in the innermost loop does not hurt. So we can merge both functions. Signed-off-by: Richard Weinberger <[email protected]> Acked-by: Frederic Weisbecker <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
2012-03-25Input: sentelic - improve packet debugging informationOskari Saarenmaa1-9/+34
Signed-off-by: Oskari Saarenmaa <[email protected]> Signed-off-by: Tai-hwa Liang <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-25Input: sentelic - minor code cleanupTai-hwa Liang1-1/+1
Improve code readability by converting yet another magic number into a pre-defined constant. Signed-off-by: Tai-hwa Liang <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-25Input: sentelic - enabling absolute coordinates output for newer hardwareTai-hwa Liang2-4/+132
- Hooking multi-finger coordinates output with kernel multitouch library; - Enabling absolute coordinates output for Cx+ hardware. The older hardware performs much better in relative mode; thus relative mode related code are preserved. Part of the code is based on the work done by Oskari Saarenmaa <[email protected]>, which was used to support the clickpad found on ASUS UX21/31 Ultrabook. On the other hand, the FSP found on UX21/31 doesn't have hardware capability register other than PnP ID, which means that we'll have to figure out an alternative approach to identify such pad correctly; otherwise, blindly adding INPUT_PROP_BUTTONPAD property may compatability issues amongst existing FSPs. Signed-off-by: Tai-hwa Liang <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-25Input: sentelic - refactor code for upcoming new hardware supportTai-hwa Liang2-62/+94
- Move event bits setup code into a separate function, fsp_set_input_params(), so that we can perform hardware-specific settings in the future; - Take hardware version information into account when activating protocol; - Remove button information from boot message as it's somewhat confusing and is only for internal processing. While there, also move button retrieval code to be a part of protocol activation process. Signed-off-by: Tai-hwa Liang <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-03-25mmc: dw_mmc: shift with slot-id for CLKENA registerJaehoon Chung1-2/+2
In CLKENA register, can support 16-SD card clocks. If support correctly, must shift with slot-id. Signed-off-by: Jaehoon Chung <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Acked-by: Will Newton <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2012-03-25mmc: esdhc: Workaround for data crc error on p1010rdbJerry Huang1-2/+17
SD card read was failing (data crc error) on some cards at maximum possible frequency on P1010 (CCB frequency set to 400MHz). Some clock deviations are also observed at this frequency. Hence reduced the mmc clock freq. Signed-off-by: Priyanka Jain <[email protected]> Singed-off-by: Jerry Huang <[email protected]> Acked-by: Anton Vorontsov <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2012-03-25mmc: core: add a debug message for SET_BLOCK_COUNTJaehoon Chung1-0/+6
This patch is added just debug message. Almost features need to use the CMD23. But we didn't see the debug message for sbc. If sbc's message can see, should be help for debugging. (We can check whether use the cmd23 or not.) Signed-off-by: Jaehoon Chung <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2012-03-25mmc: dw_mmc: Add support for pre_req and post_reqSeungwon Jeon1-27/+102
This patch implements pre_req and post_req in dw_mmc to support asynchronous mmc request. Signed-off-by: Seungwon Jeon <[email protected]> Acked-by: Jaehoon Chung <[email protected]> Acked-by: Will Newton <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2012-03-25mmc: sdhci-tegra: Explicitly support Tegra30Stephen Warren1-13/+87
Tegra30 differs from Tegra20 in a number of ways. This patch implements a minimal set of differences in order to get the Cardhu board's SD slot and eMMC working. Given the diffs between the mainline sdhci-tegra.c and our downstream versions, I expect we'll eventually need to add many more differences, hence the seemingly heavy-weight addition of the soc_data structure. * Tegra30 doesn't need to override register access to SDHCI_HOST_VERSION or SDHCI_INT_ENABLE. * Tegra30 needs quirk SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK. Signed-off-by: Stephen Warren <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2012-03-25mmc: esdhc: Implement power management for ESDHCJerry Huang1-0/+18
For FSL ESDHC controllers, when entering sleep the controller will power off, therefore the registers will lose their values, and the driver should save the value of registers during suspend and write them back during resume. Signed-off-by: Jerry Huang <[email protected]> Signed-off-by: Jiang Yutang <[email protected]> Acked-by: Anton Vorontsov <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2012-03-25mmc: sdhci: Add platform suspend/resume hooks.Chris Ball2-0/+8
Some platforms require saving/restoring registers across suspend/resume; this hook allows them to do that inside their driver. Signed-off-by: Chris Ball <[email protected]>
2012-03-25mmc: dw_mmc: Override blk_settings with platdata on IDMACJaehoon Chung1-8/+8
When use the IDMAC, we can also want to use the pdata->blk-setting. So if pdata->blk-setting is unset, use the default value. if not, use the pdata->blk-setting. Signed-off-by: Jaehoon Chung <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Acked-by: Will Newton <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2012-03-25mmc: Support of PCI mode in the dw_mmc driverShashidhar Hiremath7-104/+385
Support of PCI mode for the dw_mmc driver. This Patch adds the support for the scenario where the Synopsys Designware IP is present on the PCI bus. The patch adds the minimal modifications necessary for the driver to work on PCI platform. Also added separate files for PCI and PLATFORM modes of operation. Signed-off-by: Shashidhar Hiremath <[email protected]> Acked-by: James Hogan <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2012-03-25mmc: dw_mmc: add support for eMMC Power Off Notify featureJaehoon Chung1-0/+5
This patch adds the capability of power off notify for dw-mmc controller. In order to use Girish's patch: mmc: core: Add Power Off Notify Feature eMMC 4.5 Signed-off-by: Jaehoon Chung <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Acked-by: Will Newton <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2012-03-25mmc: MMC-4.5 Data Tag SupportSaugata Das4-5/+35
MMC-4.5 data tag feature will be used to store the file system meta-data in the tagged region of eMMC. This will improve the write and subsequent read transfer time for the meta data. Signed-off-by: Saugata Das <[email protected]> Tested-by: Venkatraman S <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2012-03-25Merge branches 'acorn', 'ebsa110' and 'sa11x0' into platformsRussell King67-3080/+3716
2012-03-25ARM: 7343/1: sa11x0: convert to sparse IRQRussell King5-12/+13
Now that Neponset, UCB1x00 and SA1111 are all converted to use the IRQ allocation interfaces, we can enable sparse IRQ support for SA11x0 platforms.
2012-03-25ARM: 7342/2: sa1100: prepare for sparse irq conversionRob Herring21-11/+40
In preparation to convert SA1100 to sparse irq, set .nr_irqs for each machine and explicitly include mach/irqs.h as needed. Signed-off-by: Rob Herring <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-03-25ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irqRob Herring2-0/+2
In preparation for sa11x0 sparse irq conversion, explicitly include mach/irqs.h as it will not be included for sparse irq. Signed-off-by: Rob Herring <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-03-25ARM: 7340/1: rtc: sa1100: include mach/irqs.h instead of asm/irq.hRob Herring1-1/+1
Since asm/irq.h may not include mach/irqs.h, include mach/irqs.h directly. Signed-off-by: Rob Herring <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-03-25Merge branch 'sa11x0-mcp' into sa11x0Russell King17-357/+518
Conflicts: arch/arm/mach-sa1100/assabet.c arch/arm/mach-sa1100/collie.c arch/arm/mach-sa1100/generic.c arch/arm/mach-sa1100/lart.c arch/arm/mach-sa1100/shannon.c
2012-03-25Merge branch 'sa11x0-lcd' into sa11x0Russell King13-470/+492
Conflicts: arch/arm/mach-sa1100/assabet.c
2012-03-25Merge branch 'sa11x0-mtd' into sa11x0Russell King1-112/+0
2012-03-25ARM: sa11x0: remove unused DMA controller definitionsRussell King2-218/+3
Remove the new unused DMA controller definitions from mach/SA-1100.h. These are now private to the SA-11x0 DMA engine driver and contained within the driver. Signed-off-by: Russell King <[email protected]>
2012-03-25ARM: sa11x0: remove old SoC private DMA driverRussell King3-466/+1
Now that all users are converted over to using the DMA engine API, we can get rid of the old platform dependent DMA driver. Signed-off-by: Russell King <[email protected]>
2012-03-25Merge branch 'sa11x0-ir' into sa11x0Russell King7-423/+1700
2012-03-25Merge branch 'sa1111' into sa11x0Russell King10-445/+459
Conflicts: arch/arm/common/sa1111.c arch/arm/mach-sa1100/neponset.c Fixed: arch/arm/mach-sa1100/assabet.c for the neponset changes
2012-03-25ARM: pxa: use common IOMEM definitionRob Herring14-2/+13
pxa was missed in the moving of IOMEM to a common definition, so lots of IOMEM redefined warnings were introduced. So remove pxa IOMEM definition and fix all the fallout. Reported-by: Paul Gortmaker <[email protected]> Signed-off-by: Rob Herring <[email protected]> Cc: Eric Miao <[email protected]> Cc: Russell King <[email protected]> Cc: Haojian Zhuang <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Jaroslav Kysela <[email protected]> Cc: Takashi Iwai <[email protected]> Cc: [email protected] Cc: [email protected]
2012-03-25ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbolRob Herring5-7/+6
The only users of ARCH_HAS_DMA_SET_COHERENT_MASK are 2 ARM platforms: ixp4xx and pxa cm_x2xx. We've been getting lucky that the define is implicitly included before dma-mapping.h, but the removal of io.h broke things (c334bc1 ARM: make mach/io.h include optional). Since memory.h is the correct place, but no longer exists, convert the define to a kconfig entry. Reported-by: Paul Gortmaker <[email protected]> Signed-off-by: Rob Herring <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Cc: Russell King <[email protected]> Cc: Imre Kaloz <[email protected]> Cc: Krzysztof Halasa <[email protected]> Cc: Eric Miao <[email protected]> Acked-by: Haojian Zhuang <[email protected]> Cc: Vinod Koul <[email protected]> Cc: Dan Williams <[email protected]>
2012-03-25net: add a truesize parameter to skb_add_rx_frag()Eric Dumazet7-9/+13
skb_add_rx_frag() API is misleading. Network skbs built with this helper can use uncharged kernel memory and eventually stress/crash machine in OOM. Add a 'truesize' parameter and then fix drivers in followup patches. Signed-off-by: Eric Dumazet <[email protected]> Cc: Wey-Yi Guy <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-25gianfar: Fix possible overrun and simplify interrupt name field creationJoe Perches2-33/+8
Space allocated for int_name_<foo> is insufficient for maximal device name, expand it. Code to create int_name_<foo> is obscure, simplify it by using sprintf. Found by looking for unnecessary \ line continuations. Signed-off-by: Joe Perches <[email protected]> Tested-by: Paul Gortmaker <[email protected]> Signed-off-by: Paul Gortmaker <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-25USB: qmi_wwan: Add ZTE (Vodafone) K3570-Z and K3571-Z net interfacesAndrew Bird (Sphere Systems)1-0/+18
Now that we have the beginnings of an OSS method to use the network interfaces on these USB broadband modems, add the ZTE manufactured Vodafone items to the whitelist Signed-off-by: Andrew Bird <[email protected]> Acked-by: Bjørn Mork <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-03-25USB: option: Ignore ZTE (Vodafone) K3570/71 net interfacesAndrew Bird (Sphere Systems)1-2/+4
These interfaces need to be handled by QMI/WWAN driver Signed-off-by: Andrew Bird <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.