Eric Lee / smarc-fsl-linux-kernel

14 Jun, 2011

1 commit

  • acb11bcdb   Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/… ... Browse Code »

    …git/kgene/linux-samsung

    * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
    ARM: S3C2410: remove the now empty mach-s3c2410/irq.c
    ARM: S3C24XX: Move s3c24xx_irq_syscore_ops to plat-s3c24xx/irq.c
    ARM: S3C24xx: Fix missing struct for s3c2410_dma_chan
    ARM: SAMSUNG: Remove unused onenand plat functions
    ARM: EXYNOS4: Remove compiler warning on exynos4_pwm4_resume
    ARM: S5P: Fix compilation error for exynos4_defconfig
    ARM: S5P: Should be S3C_VA_USB_HSPHY instead of S5P_VA_XX
    ARM: S5P64X0: Fix SPI platform device name
    ARM: S5PV210: Fix possible null pointer dereference

    Linus Torvalds
     

13 Jun, 2011

2 commits

  • 08d63aac4   Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    * 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
    gpio/basic_mmio: add missing include of spinlock_types.h
    gpio/nomadik: fix sleepmode for elder Nomadik

    Linus Torvalds
     
  • 152b92db7   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (55 commits)
    ISDN, hfcsusb: Don't leak in hfcsusb_ph_info()
    netpoll: call dev_put() on error in netpoll_setup()
    net: ep93xx_eth: fix DMA API violations
    net: ep93xx_eth: drop GFP_DMA from call to dma_alloc_coherent()
    net: ep93xx_eth: allocate buffers using kmalloc()
    net: ep93xx_eth: pass struct device to DMA API functions
    ep93xx: set DMA masks for the ep93xx_eth
    vlan: Fix the ingress VLAN_FLAG_REORDER_HDR check
    dl2k: EEPROM CRC calculation wrong endianess on bigendian machine
    NET: am79c961: fix assembler warnings
    NET: am79c961: ensure multicast filter is correctly set at open
    NET: am79c961: ensure asm() statements are marked volatile
    ethtool.h: fix typos
    ep93xx_eth: Update MAINTAINERS
    ipv4: Fix packet size calculation for raw IPsec packets in __ip_append_data
    netpoll: prevent netpoll setup on slave devices
    net: pmtu_expires fixes
    gianfar:localized filer table
    iwlegacy: fix channel switch locking
    mac80211: fix IBSS teardown race
    ...

    Linus Torvalds
     

12 Jun, 2011

1 commit

10 Jun, 2011

1 commit

  • 33d78647d   gpio/nomadik: fix sleepmode for elder Nomadik ... Browse Code »

    The mach-nomadik machine did not compile properly due to bad
    ux500-specific functions being called. Introduce new state
    variables to fix this up.

    Reported-by: Axel Lin
    Cc: Alessandro Rubini
    Cc: Prafulla Wadaskar
    Signed-off-by: Linus Walleij
    Signed-off-by: Grant Likely

    Linus Walleij
     

08 Jun, 2011

1 commit

  • 8ea656bdc   Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 ... Browse Code »

    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (21 commits)
    ARM: OMAP4: MMC: increase delay for pbias
    arm: omap2plus: move NAND_BLOCK_SIZE out of boards
    omap4: hwmod: Enable the keypad
    omap3: Free Beagle rev gpios when they are read, so others can read them later
    arm: omap3: beagle: Ensure msecure is mux'd to be able to set the RTC
    omap: rx51: Don't power up speaker amplifier at bootup
    omap: rx51: Set regulator V28_A always on
    ARM: OMAP4: MMC: no regulator off during probe for eMMC
    arm: omap2plus: fix ads7846 pendown gpio request
    ARM: OMAP2: Add missing iounmap in omap4430_phy_init
    ARM: omap4: Pass core and wakeup mux tables to omap4_mux_init
    ARM: omap2+: mux: Allow board mux settings to be NULL
    OMAP4: fix return value of omap4_l3_init
    OMAP: iovmm: fix SW flags passed by user
    arch/arm/mach-omap1/dma.c: Invert calls to platform_device_put and platform_device_del
    OMAP2+: mux: fix compilation warnings
    OMAP: SRAM: Fix warning: format '%08lx' expects type 'long unsigned int'
    arm: omap3: cm-t3517: fix section mismatch warning
    OMAP2+: Fix 9 section mismatch(es) warnings from mach-omap2/built-in.o
    ARM: OMAP2: Add missing include of linux/gpio.h
    ...

    Linus Torvalds
     

05 Jun, 2011

2 commits

04 Jun, 2011

7 commits

02 Jun, 2011

4 commits

01 Jun, 2011

16 commits

  • 1fcecf281   ARM: OMAP4: MMC: increase delay for pbias ... Browse Code »

    4 micro seconds is not enough for PBIAS if MMC regulator is
    enabled from MMC regulator OFF.
    Increase the delay for PBIAS to stabilize.
    Wait for PBIAS and timeout if not.

    Resolves MMC/SD failure on OMAP4
    "Pbias Voltage is not same as LDO"

    Signed-off-by: Balaji T K
    Acked-by: Kishore Kadiyala
    Signed-off-by: Tony Lindgren

    Balaji T K
     
  • 1704bf15d   arm: omap2plus: move NAND_BLOCK_SIZE out of boards ... Browse Code »

    Several boards defining mtd partitions also defined NAND_BLOCK_SIZE as
    SZ_128K. Move the define to common-board-devices.h

    This removes multiple defines of NAND_BLOCK_SIZE.

    Signed-off-by: Igor Grinberg
    [tony@atomide.com: updated comments]
    Signed-off-by: Tony Lindgren

    Igor Grinberg
     
  • 4998b2457   omap4: hwmod: Enable the keypad ... Browse Code »

    Commit 407a6888f7362cb3dabe69ea6d9dcf3c750dc56a (OMAP4: hwmod data:
    Add AESS, McPDM, bandgap, counter_32k, MMC, KBD, ISS & IPU) added the
    entry for keypad, but did not enable it.

    Enable the keypad in the hwmod database so it works.

    Signed-off-by: Shubhrajyoti D
    Acked-by: Benoit Cousson
    [tony@atomide.com: updated comments]
    Signed-off-by: Tony Lindgren

    Shubhrajyoti D
     
  • 5e2ffc308   omap3: Free Beagle rev gpios when they are read, so others can read them later ... Browse Code »

    Free Beagle rev gpios when they are read, so others can read them later

    Signed-off-by: Tasslehoff Kjappfot
    [tony@atomide.com: updated comments]
    Signed-off-by: Tony Lindgren

    Tasslehoff Kjappfot
     
  • e2a346a2a   arm: omap3: beagle: Ensure msecure is mux'd to be able to set the RTC ... Browse Code »

    Without msecure beeing high it isn't possible to set (or start)
    the RTC.

    Tested with a BeagleBoard C4.

    Signed-off-by: Alexander Holler
    Signed-off-by: Tony Lindgren

    Alexander Holler
     
  • c0ad4fac5   omap: rx51: Don't power up speaker amplifier at bootup ... Browse Code »

    Speaker amplifier is accidentally powered up in early TWL gpio setup. This
    causes a few mA of needless battery current consumption. Without this patch
    the amplifier can be shutdown only by having one active audio playback and
    shutdown cycle to speaker output.

    Thanks to Kalle Jokiniemi for noticing the issue.

    Signed-off-by: Jarkko Nikula
    Cc: Kalle Jokiniemi
    Signed-off-by: Tony Lindgren

    Jarkko Nikula
     
  • 2827411e2   omap: rx51: Set regulator V28_A always on ... Browse Code »

    The V28_A domain in Nokia N900 that supplies VDD voltages to TLV320AIC34 and
    TPA6130A2 should not be shutdown. This is because otherwise there will be
    leak from VIO to VDD in TLV320AIC34 and this leak consumes more battery
    current that is saved from keeping V28_A off. With this patch the battery
    current consumption is approximately 1.5 mA lower.

    Thanks to Kalle Jokiniemi for noticing the issue.

    Signed-off-by: Jarkko Nikula
    Cc: Kalle Jokiniemi
    Signed-off-by: Tony Lindgren

    Jarkko Nikula
     
  • b1c1df7a7   ARM: OMAP4: MMC: no regulator off during probe for eMMC ... Browse Code »

    eMMC does not handle power off when not in sleep state,
    Skip regulator disable during probe when eMMC is
    not in known state - state left by bootloader.

    Resolves eMMC failure on OMAP4
    mmc0: error -110 whilst initialising MMC card

    Signed-off-by: Balaji T K
    Tested-by: Kishore Kadiyala
    Acked-by: Kishore Kadiyala
    Signed-off-by: Tony Lindgren

    Balaji T K
     
  • e68273baf   arm: omap2plus: fix ads7846 pendown gpio request ... Browse Code »

    introduced by: 96974a24
    (omap: consolidate touch screen initialization among different boards)

    ads7846 driver can use either gpio_pendown or get_pendown_state()
    callback. In case of gpio_pendown, it requests the provided gpio_pendown
    thus resulting in double requesting that gpio:

    ads7846 spi1.0: failed to request pendown GPIO57
    ads7846: probe of spi1.0 failed with error -16

    Fix this by restricting the gpio request to the case of
    get_pendown_state() callback is used.

    Signed-off-by: Igor Grinberg
    Tested-by: Thomas Weber
    Signed-off-by: Tony Lindgren

    Igor Grinberg
     
  • 03b562d78   ARM: OMAP2: Add missing iounmap in omap4430_phy_init ... Browse Code »

    !dev case needs iounmap before return.

    Signed-off-by: Todd Poynor
    Signed-off-by: Tony Lindgren

    Todd Poynor
     
  • 21a42c927   ARM: omap4: Pass core and wakeup mux tables to omap4_mux_init ... Browse Code »

    OMAP4 contains two separate instances of the padconf registers,
    one in the core system config and one in the wakeup system config.
    Pass in two tables to apply the correct values to each instance.

    Signed-off-by: Colin Cross
    Signed-off-by: Tony Lindgren

    Colin Cross
     
  • d4ff6121b   ARM: omap2+: mux: Allow board mux settings to be NULL ... Browse Code »

    OMAP4 has two mux instances, and the board may not have settings
    for one of them. Allow the board file to pass NULL for an
    instance's mux settings, which will initialize the mux instance
    but skip writing board settings.

    Signed-off-by: Colin Cross
    Signed-off-by: Tony Lindgren

    Colin Cross
     
  • 1499f2dba   OMAP4: fix return value of omap4_l3_init ... Browse Code »

    Don't PTR_ERR() a non-error pointer:

    initcall omap4_l3_init+0x0/0xdc returned -544980480 after 0 usecs
    initcall omap4_l3_init+0x0/0xdc returned with error code -544980480

    Signed-off-by: Rabin Vincent
    Signed-off-by: Tony Lindgren

    Rabin Vincent
     
  • 50b4860d5   OMAP: iovmm: fix SW flags passed by user ... Browse Code »

    Commit d038aee24dcd5a2a0d8547f5396f67ae9698ac8e
    "omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag",
    changes iovmm to receive flags specified by user, however
    the upper 16 bits of the flags are wiped by iovmm itself.

    This fixes IOVMF_DA_FIXED flags from being lost, and lets the user
    map its desired "device addresses".

    Signed-off-by: Omar Ramirez Luna
    Acked-by: Hiroshi DOYU
    Signed-off-by: Tony Lindgren

    Omar Ramirez Luna
     
  • 77f7059a3   arch/arm/mach-omap1/dma.c: Invert calls to platform_device_put and platform_device_del ... Browse Code »

    Platform_device_del should be called before platform_device_put, as
    platform_device_put can delete the structure.

    Additionally, improve the error handling code for the call to ioremap, so
    that it calls platform_device_put.

    The semantic match that finds this problem is:
    (http://coccinelle.lip6.fr/)

    //
    @@
    expression e1,e2;
    @@

    *platform_device_put(e1);
    ... when != e1 = e2
    *platform_device_del(e1);
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Tony Lindgren

    Julia Lawall
     
  • 30ebad9d7   OMAP2+: mux: fix compilation warnings ... Browse Code »

    Fix below compilation warnings.

    arch/arm/mach-omap2/omap_hwmod.c: In function 'omap_hwmod_for_each':
    arch/arm/mach-omap2/omap_hwmod.c:1631: warning: 'ret' may be used uninitialized in this function

    arch/arm/mach-omap2/mux.c: In function 'omap_mux_get_gpio':
    arch/arm/mach-omap2/mux.c:917: warning: 'm' may be used uninitialized in this function

    Signed-off-by: Govindraj.R
    Signed-off-by: Tony Lindgren

    Govindraj.R
     

31 May, 2011

5 commits

  • 26a510ba1   OMAP: SRAM: Fix warning: format '%08lx' expects type 'long unsigned int' ... Browse Code »

    Fix below build warning.

    CC arch/arm/plat-omap/sram.o
    arch/arm/plat-omap/sram.c: In function 'omap_map_sram':
    arch/arm/plat-omap/sram.c:224: warning: format '%08lx' expects
    type 'long unsigned int', but argument 2 has type 'unsigned int'

    While at this, convert SRAM printk(* "") to pr_*("").

    Signed-off-by: Santosh Shilimkar
    Acked-by: Russell King
    Signed-off-by: Tony Lindgren

    Santosh Shilimkar
     
  • 026fe79d7   arm: omap3: cm-t3517: fix section mismatch warning ... Browse Code »

    WARNING: arch/arm/mach-omap2/built-in.o(.text+0x11014): Section mismatch
    in reference from the function cm_t3517_init_usbh() to the (unknown
    reference) .init.data:(unknown)
    The function cm_t3517_init_usbh() references
    the (unknown reference) __initdata (unknown).
    This is often because cm_t3517_init_usbh lacks a __initdata
    annotation or the annotation of (unknown) is wrong.

    Signed-off-by: Igor Grinberg
    Signed-off-by: Tony Lindgren

    Igor Grinberg
     
  • 89c4705ed   OMAP2+: Fix 9 section mismatch(es) warnings from mach-omap2/built-in.o ... Browse Code »

    The serial*_data should have been marked as __initdata as per
    it's usage in the board files. Fix the same to remove the
    section mismatch warnings caused by it.

    Signed-off-by: Santosh Shilimkar
    Signed-off-by: Silesh C V
    [tony@atomide.com: updated with additional fixes from Silesh]
    Signed-off-by: Tony Lindgren

    Santosh Shilimkar
     
  • f9fa1bb9d   ARM: OMAP2: Add missing include of linux/gpio.h ... Browse Code »

    I got some build error like below while executing "make omap2plus_defconfig".

    CC arch/arm/mach-omap2/board-2430sdp.o
    arch/arm/mach-omap2/board-2430sdp.c: In function 'omap_2430sdp_init':
    arch/arm/mach-omap2/board-2430sdp.c:247: error: 'GPIOF_OUT_INIT_LOW' undeclared (first use in this function)
    arch/arm/mach-omap2/board-2430sdp.c:247: error: (Each undeclared identifier is reported only once
    arch/arm/mach-omap2/board-2430sdp.c:247: error: for each function it appears in.)

    This patch fixes the build error by include linux/gpio.h instead of mach/gpio.h.

    Signed-off-by: Axel Lin
    Cc: Syed Mohammed Khasim
    Cc: Grazvydas Ignotas
    Cc: Steve Sakoman
    Signed-off-by: Tony Lindgren

    Axel Lin
     
  • 046d886db   OMAP: fix compilation error ... Browse Code »

    Forward-declare platform_device structure in
    arch/arm/plat-omap/include/plat/flash.h, otherwise compilation may break
    with:

    In file included from arch/arm/mach-omap1/flash.c:15:
    arch/arm/plat-omap/include/plat/flash.h:14: warning: 'struct platform_device' declared inside parameter list
    arch/arm/plat-omap/include/plat/flash.h:14: warning: its scope is only this definition or declaration, which is probably not what you want
    arch/arm/mach-omap1/flash.c:16: warning: 'struct platform_device' declared inside parameter list
    arch/arm/mach-omap1/flash.c:17: error: conflicting types for 'omap1_set_vpp'
    arch/arm/plat-omap/include/plat/flash.h:14: error: previous declaration of 'omap1_set_vpp' was here

    Detected and corrected while building for Amstrad Delta, confirmed with
    omap1_defconfig.

    Signed-off-by: Janusz Krzysztofik
    Signed-off-by: Tony Lindgren

    Janusz Krzysztofik