diff options
| author | David Brown <davidb@codeaurora.org> | 2010-12-20 16:11:10 -0500 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2010-12-20 16:11:10 -0500 |
| commit | ba119204ff6ff722dcec387b305d9c2d23380726 (patch) | |
| tree | ae608ce52cf4d47a4278bb9d5df9a8616bb7200c /drivers/serial | |
| parent | cf7d7e5a1980d1116ee152d25dac382b112b9c17 (diff) | |
| parent | 0c521ccbd0c9ad5623ff9b37b20b3ff9d4ad65a7 (diff) | |
Merge branches 'msm-core' and 'msm-mmc' into for-next
* msm-core: (28 commits)
msm: initial framebuffer support
msm: add handling for clocks tagged as CLK_MINMAX
msm: trout: change name of pmdh_clk to mddi_clk
msm: add CLK_MINMAX to pmdh_clk
msm: trout: add gpio_to_irq
msm: iommu: Use the correct memory allocation flag
msm_serial: Remove redundant unlikely()
msm: iommu: Miscellaneous code cleanup
msm: iommu: Support cache-coherent memory access
msm: iommu: Definitions for extended memory attributes
msm: iommu: Kconfig dependency for the IOMMU API
msm: iommu: Check if device is already attached
msm: iommu: Kconfig item for cacheable page tables
msm: iommu: Don't flush page tables if no devices attached
msm: iommu: Mark functions with the right section names
msm: iommu: Support for the 2nd GFX core's IOMMU
msm: iommu: Revise GFX2D0 IOMMU contexts and M2V mappings
msm: iommu: Revise GFX3D IOMMU contexts and M2V mappings
msm: iommu: Use more consistent naming in platform data
msm: iomap: Addresses and IRQs for 2nd GFX core IOMMU
...
* msm-mmc: (33 commits)
mmc: msm_sdcc: Check for only DATA_END interrupt to end a request
mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned
mmc: msm_sdcc: Reset SDCC in case of data transfer errors
mmc: msm_sdcc: Add prog done interrupt support
mmc: msm_sdcc: Fix possible circular locking dependency warning
msm: initial framebuffer support
msm: add handling for clocks tagged as CLK_MINMAX
msm: trout: change name of pmdh_clk to mddi_clk
msm: add CLK_MINMAX to pmdh_clk
msm: trout: add gpio_to_irq
msm: iommu: Use the correct memory allocation flag
msm_serial: Remove redundant unlikely()
msm: iommu: Miscellaneous code cleanup
msm: iommu: Support cache-coherent memory access
msm: iommu: Definitions for extended memory attributes
msm: iommu: Kconfig dependency for the IOMMU API
msm: iommu: Check if device is already attached
msm: iommu: Kconfig item for cacheable page tables
msm: iommu: Don't flush page tables if no devices attached
msm: iommu: Mark functions with the right section names
...
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/msm_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/msm_serial.c b/drivers/serial/msm_serial.c index f8c816e7725d..8e43a7b69e64 100644 --- a/drivers/serial/msm_serial.c +++ b/drivers/serial/msm_serial.c | |||
| @@ -686,7 +686,7 @@ static int __init msm_serial_probe(struct platform_device *pdev) | |||
| 686 | msm_port = UART_TO_MSM(port); | 686 | msm_port = UART_TO_MSM(port); |
| 687 | 687 | ||
| 688 | msm_port->clk = clk_get(&pdev->dev, "uart_clk"); | 688 | msm_port->clk = clk_get(&pdev->dev, "uart_clk"); |
| 689 | if (unlikely(IS_ERR(msm_port->clk))) | 689 | if (IS_ERR(msm_port->clk)) |
| 690 | return PTR_ERR(msm_port->clk); | 690 | return PTR_ERR(msm_port->clk); |
| 691 | port->uartclk = clk_get_rate(msm_port->clk); | 691 | port->uartclk = clk_get_rate(msm_port->clk); |
| 692 | printk(KERN_INFO "uartclk = %d\n", port->uartclk); | 692 | printk(KERN_INFO "uartclk = %d\n", port->uartclk); |