Eric Lee / smarc-fsl-linux-kernel

24 Nov, 2011

1 commit

15 Nov, 2011

1 commit

14 Nov, 2011

2 commits

08 Nov, 2011

1 commit

  • e0d65113a   Merge git://git.infradead.org/mtd-2.6 ... Browse Code »

    * git://git.infradead.org/mtd-2.6: (226 commits)
    mtd: tests: annotate as DANGEROUS in Kconfig
    mtd: tests: don't use mtd0 as a default
    mtd: clean up usage of MTD_DOCPROBE_ADDRESS
    jffs2: add compr=lzo and compr=zlib options
    jffs2: implement mount option parsing and compression overriding
    mtd: nand: initialize ops.mode
    mtd: provide an alias for the redboot module name
    mtd: m25p80: don't probe device which has status of 'disabled'
    mtd: nand_h1900 never worked
    mtd: Add DiskOnChip G3 support
    mtd: m25p80: add EON flash EN25Q32B into spi flash id table
    mtd: mark block device queue as non-rotational
    mtd: r852: make r852_pm_ops static
    mtd: m25p80: add support for at25df321a spi data flash
    mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
    mtd: nand: switch `check_pattern()' to standard `memcmp()'
    mtd: nand: invalidate cache on unaligned reads
    mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
    mtd: nand: wait to set BBT version
    mtd: nand: scrub BBT on ECC errors
    ...

    Fix up trivial conflicts:
    - arch/arm/mach-at91/board-usb-a9260.c
    Merged into board-usb-a926x.c
    - drivers/mtd/maps/lantiq-flash.c
    add_mtd_partitions -> mtd_device_register vs changed to use
    mtd_device_parse_register.

    Linus Torvalds
     

01 Nov, 2011

1 commit

08 Oct, 2011

1 commit

  • 97b09da4e   ARM: pxa: use correct __iomem annotations ... Browse Code »

    This tries to clear up the confusion between integers and iomem pointers
    in the marvell pxa platform. MMIO addresses are supposed to be __iomem*
    values, in order to let the Linux type checking work correctly. This
    patch moves the cast to __iomem as far back as possible, to the place
    where the MMIO virtual address windows are defined.

    Signed-off-by: Arnd Bergmann
    Signed-off-by: Eric Miao

    Arnd Bergmann
     

02 Oct, 2011

2 commits

11 Sep, 2011

1 commit

  • f3c8cfc23   mtd: pxa3xx_nand: enable multiple chip select support ... Browse Code »

    Current pxa3xx_nand controller has two chip select which
    both be workable. This patch enable this feature.

    Update platform driver to support this feature.

    Another notice should be taken that:
    When you want to use this feature, you should not enable the
    keep configuration feature, for two chip select could be
    attached with different nand chip. The different page size
    and timing requirement make the keep configuration impossible.

    Signed-off-by: Lei Wen

    Lei Wen
     

12 Aug, 2011

1 commit

  • 8f3c4537b   ARM: gpio: make trivial GPIOLIB implementation the default ... Browse Code »

    Rather than marking the mach/gpio.h header files which want to use the
    trivial GPIOLIB implementation, mark those which do not want to use it
    instead. This means that by default, you get the trivial implementation
    and only have to do something extra if you need to. This should
    encourage the use of the trivial default implementation.

    As an additional bonus, several gpio.h header files become empty.

    Acked-by: H Hartley Sweeten
    Tested-by: Jamie Iles
    Acked-by: Kukjin Kim
    Signed-off-by: Russell King

    Russell King
     

08 Aug, 2011

1 commit

21 Jul, 2011

2 commits

11 Jul, 2011

1 commit

  • a065685d2   ARM: pxa: fix gpio_to_chip() clash with gpiolib namespace ... Browse Code »

    The PXA platform code has a static inline helper called
    gpio_to_chip which clashes with the gpiolib namespace if we
    try to expose the function with the same name from gpiolib,
    and it's still confusing even if we don't do that. So rename
    it to gpio_to_pxachip().

    Reported-by: H Hartley Sweeten
    Cc: Eric Miao
    Signed-off-by: Linus Walleij
    Signed-off-by: Eric Miao

    Linus Walleij
     

25 Apr, 2011

1 commit

  • 2eaa03b5b   ARM / PXA: Use struct syscore_ops for "core" power management ... Browse Code »

    Replace sysdev classes and struct sys_device objects used for "core"
    power management by the PXA platform code with struct syscore_ops
    objects that are simpler.

    This reduces the code size and the kernel memory footprint. It also
    is necessary for removing sysdevs entirely from the kernel in the
    future.

    Signed-off-by: Rafael J. Wysocki
    Acked-by: Greg Kroah-Hartman

    Rafael J. Wysocki
     

31 Mar, 2011

1 commit

29 Mar, 2011

2 commits

25 Mar, 2011

1 commit

  • 7bf7e370d   Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/… ... Browse Code »

    …linux-2.6 into for-linus-1

    * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits)
    [media] rc: update for bitop name changes
    fs: simplify iget & friends
    fs: pull inode->i_lock up out of writeback_single_inode
    fs: rename inode_lock to inode_hash_lock
    fs: move i_wb_list out from under inode_lock
    fs: move i_sb_list out from under inode_lock
    fs: remove inode_lock from iput_final and prune_icache
    fs: Lock the inode LRU list separately
    fs: factor inode disposal
    fs: protect inode->i_state with inode->i_lock
    lib, arch: add filter argument to show_mem and fix private implementations
    SLUB: Write to per cpu data when allocating it
    slub: Fix debugobjects with lockless fastpath
    autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd()
    autofs4 - remove autofs4_lock
    autofs4 - fix d_manage() return on rcu-walk
    autofs4 - fix autofs4_expire_indirect() traversal
    autofs4 - fix dentry leak in autofs4_expire_direct()
    autofs4 - reinstate last used update on access
    vfs - check non-mountpoint dentry might block in __follow_mount_rcu()
    ...

    NOTE!

    This merge commit was created to fix compilation error. The block
    tree was merged upstream and removed the 'elv_queue_empty()'
    function which the new 'mtdswap' driver is using. So a simple
    merge of the mtd tree with upstream does not compile. And the
    mtd tree has already be published, so re-basing it is not an option.

    To fix this unfortunate situation, I had to merge upstream into the
    mtd-2.6.git tree without committing, put the fixup patch on top of
    this, and then commit this. The result is that we do not have commits
    which do not compile.

    In other words, this merge commit "merges" 3 things: the MTD tree, the
    upstream tree, and the fixup patch.

    Artem Bityutskiy
     

21 Mar, 2011

1 commit

  • b459396ee   ARM: pxa2xx: reorganize I2C files ... Browse Code »

    This patch moves the platform data definition from
    arch/arm/plat-pxa/include/plat/i2c.h to include/linux/i2c/pxa-i2c.h so
    it can be accessed from x86 the same way as on ARM.

    This change should make no functional change to the PXA code. The move
    is verified by building the following defconfigs:
    cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig
    imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig
    raumfeld_defconfig magician_defconfig mmp2_defconfig pxa168_defconfig
    pxa910_defconfig

    Signed-off-by: Sebastian Andrzej Siewior
    Signed-off-by: Dirk Brandewie
    Signed-off-by: Ben Dooks

    Sebastian Andrzej Siewior
     

11 Mar, 2011

1 commit

09 Feb, 2011

1 commit

14 Jan, 2011

1 commit

08 Jan, 2011

1 commit

  • 021db8e2b   Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
    spi/omap: Fix DMA API usage in OMAP MCSPI driver
    spi/imx: correct the test on platform_get_irq() return value
    spi/topcliff: Typo fix threhold to threshold
    spi/dw_spi Typo change diable to disable.
    spi/fsl_espi: change the read behaviour of the SPIRF
    spi/mpc52xx-psc-spi: move probe/remove to proper sections
    spi/dw_spi: add DMA support
    spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
    spi/dw_spi: Fix too short timeout in spi polling loop
    spi/pl022: convert running variable
    spi/pl022: convert busy flag to a bool
    spi/pl022: pass the returned sglen to the DMA engine
    spi/pl022: map the buffers on the DMA engine
    spi/topcliff_pch: Fix data transfer issue
    spi/imx: remove autodetection
    spi/pxa2xx: pass of_node to spi device and set a parent device
    spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
    spi/pxa2xx: Add chipselect support for Sodaville
    spi/pxa2xx: Consider CE4100's FIFO depth
    spi/pxa2xx: Add CE4100 support
    ...

    Linus Torvalds
     

29 Dec, 2010

1 commit

  • 94a544a4e   Merge branch 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next ... Browse Code »

    * 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next
    spi/pxa2xx: register driver properly
    spi/pxa2xx: add support for shared IRQ handler
    spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers
    arm/pxa2xx: reorgazine SSP and SPI header files
    spi/pxa2xx: Add CE4100 support
    spi/pxa2xx: Consider CE4100's FIFO depth
    spi/pxa2xx: Add chipselect support for Sodaville
    spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
    spi/pxa2xx: pass of_node to spi device and set a parent device

    Grant Likely
     

18 Dec, 2010

1 commit

01 Dec, 2010

2 commits

23 Nov, 2010

1 commit

  • 15ec44611   mmc: sdhci: 8-bit bus width changes ... Browse Code »

    We now:
    * check for a v3 controller before setting 8-bit bus width
    * offer a callback for platform code to switch to 8-bit mode, which
    allows non-v3 controllers to support it
    * rely on mmc->caps |= MMC_CAP_8_BIT_DATA; in platform code to specify
    that the board designers have indeed brought out all the pins for
    8-bit to the slot.

    We were previously relying only on whether the *controller* supported
    8-bit, which doesn't tell us anything about the pin configuration in
    the board design.

    This fixes the MMC card regression reported by Maxim Levitsky here:
    http://thread.gmane.org/gmane.linux.kernel.mmc/4336
    by no longer assuming that 8-bit works by default.

    Signed-off-by: Philip Rakity
    Tested-by: Giuseppe Cavallaro
    Signed-off-by: Chris Ball

    Philip Rakity
     

30 Oct, 2010

2 commits

  • 79346507a   Merge git://git.infradead.org/mtd-2.6 ... Browse Code »

    * git://git.infradead.org/mtd-2.6: (82 commits)
    mtd: fix build error in m25p80.c
    mtd: Remove redundant mutex from mtd_blkdevs.c
    MTD: Fix wrong check register_blkdev return value
    Revert "mtd: cleanup Kconfig dependencies"
    mtd: cfi_cmdset_0002: make sector erase command variable
    mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips
    mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode
    mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one
    block2mtd: dubious assignment
    P4080/mtd: Fix the freescale lbc issue with 36bit mode
    P4080/eLBC: Make Freescale elbc interrupt common to elbc devices
    mtd: phram: use KBUILD_MODNAME
    mtd: OneNAND: S5PC110: Fix double call suspend & resume function
    mtd: nand: fix MTD_MODE_RAW writes
    jffs2: use kmemdup
    mtd: sm_ftl: cosmetic, use bool when possible
    mtd: r852: remove useless pci powerup/down from suspend/resume routines
    mtd: blktrans: fix a race vs kthread_stop
    mtd: blktrans: kill BKL
    mtd: allow to unload the mtdtrans module if its block devices aren't open
    ...

    Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c

    Linus Torvalds
     
  • 67577927e   Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ... Browse Code »

    Conflicts:
    drivers/mtd/mtd_blkdevs.c

    Merge Grant's device-tree bits so that we can apply the subsequent fixes.

    Signed-off-by: David Woodhouse

    David Woodhouse
     

25 Oct, 2010

2 commits

  • 536ac998f   mmc: add new sdhci-pxa driver for Marvell SoCs ... Browse Code »

    Support Marvell PXA168/PXA910/MMP2 SD Host Controller.

    Signed-off-by: Zhangfei Gao
    Acked-by: Haojian Zhuang
    Signed-off-by: Chris Ball

    Zhangfei Gao
     
  • c1f82478c   mtd: pxa3xx_nand: condense the flash definition ... Browse Code »

    Adding a new flash definition would need less code.
    Keep the platform passing flash definition method.
    If one flash is both defined in platform data and builtin table,
    driver would select the one from platform data first.

    By this way, platform could select the timing most suit for itself,
    not need to follow the common settings.

    Signed-off-by: Lei Wen
    Signed-off-by: Haojian Zhuang
    Acked-by: Eric Miao
    Signed-off-by: Artem Bityutskiy
    Signed-off-by: David Woodhouse

    Lei Wen
     

09 Oct, 2010

2 commits

30 Aug, 2010

1 commit

05 Aug, 2010

1 commit

14 Jun, 2010

1 commit

18 May, 2010

1 commit