Eric Lee / smarc-fsl-linux-kernel

09 May, 2009

1 commit

08 May, 2009

1 commit

  • cd1a6de7d   mtd: fix timeout in M25P80 driver ... Browse Code »

    Extend erase timeout in M25P80 SPI Flash driver.

    The M25P80 drivers fails erasing sectors on a M25P128 because the ready
    wait timeout is too short. Change the timeout from a simple loop count to a
    suitable number of seconds.

    Signed-off-by: Peter Horton
    Tested-by: Martin Michlmayr
    Signed-off-by: Andrew Morton
    Signed-off-by: David Woodhouse

    Peter Horton
     

29 Apr, 2009

1 commit

  • 3f33b0aaa   mtd: Bug in m25p80.c during whole-chip erase ... Browse Code »

    There is a logic error in "whole chip erase" for the m25p80 family. If
    the whole device is successfully erased, erase_chip() will return 0, and
    the code will fall through to the "else" clause, and do sector-by-sector
    erase in addition to the whole-chip erase. This patch corrects that.

    Also, the MAX_READY_WAIT_COUNT is insufficient for an m25p16 connected
    to a 400 MHz powerpc. Increasing it allows me to successfully program
    the device on my board.

    Signed-off-by: Steven A. Falco
    Signed-off-by: David Woodhouse

    Steven A. Falco
     

24 Apr, 2009

1 commit

19 Apr, 2009

2 commits

  • e76935489   mtd: expose subpage size via sysfs ... Browse Code »

    MTD has got sysfs support in 2.6.30-rc1. But subpage size is not
    exposed there - do this.

    UBI utilities badly need this parameter. At the moment there is
    no way to get subpage size - ioctls do not return it. And we
    just got sysfs support, so we can easilly extend it with this
    additional parameter.

    This can be merged late in the development cycle because:
    1. sysfs support has been just added - there are no users for
    it so far, even.
    2. UBI utilities really need this parameter, and it is better
    not to delay this.

    Signed-off-by: Artem Bityutskiy
    Signed-off-by: David Woodhouse

    Artem Bityutskiy
     
  • 2fdb11449   mtd: mtd in mtd_release is unused without CONFIG_MTD_CHAR ... Browse Code »

    drivers/mtd/mtdcore.c: In function 'mtd_release':
    drivers/mtd/mtdcore.c:51: warning: unused variable 'mtd'

    [akpm: make it actually build]
    Signed-off-by: Denis V. Lunev
    Signed-off-by: Andrew Morton
    Signed-off-by: David Woodhouse

    Denis V. Lunev
     

07 Apr, 2009

2 commits

  • 38d9aefb5   Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 ... Browse Code »

    * 'linux-next' of git://git.infradead.org/ubi-2.6:
    UBI: add fsync capability

    Linus Torvalds
     
  • 22ae77bc7   Merge git://git.infradead.org/mtd-2.6 ... Browse Code »

    * git://git.infradead.org/mtd-2.6: (53 commits)
    [MTD] struct device - replace bus_id with dev_name(), dev_set_name()
    [MTD] [NOR] Fixup for Numonyx M29W128 chips
    [MTD] mtdpart: Make ecc_stats more realistic.
    powerpc/85xx: TQM8548: Update DTS file for multi-chip support
    powerpc: NAND: FSL UPM: document new bindings
    [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays
    [MTD] [NAND] FSL-UPM: add multi chip support
    [MTD] [NOR] Add device parent info to physmap_of
    [MTD] [NAND] Add support for NAND on the Socrates board
    [MTD] [NAND] Add support for 4KiB pages.
    [MTD] sysfs support should not depend on CONFIG_PROC_FS
    [MTD] [NAND] Add parent info for CAFÉ controller
    [MTD] support driver model updates
    [MTD] driver model updates (part 2)
    [MTD] driver model updates
    [MTD] [NAND] move gen_nand's probe function to .devinit.text
    [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text
    [MTD] fix use after free in register_mtd_blktrans
    [MTD] [MAPS] Drop now unused sharpsl-flash map
    [MTD] ofpart: Check name property to determine partition nodes.
    ...

    Manually fix trivial conflict in drivers/mtd/maps/Makefile

    Linus Torvalds
     

06 Apr, 2009

9 commits

05 Apr, 2009

1 commit

04 Apr, 2009

5 commits

  • c451c7c4c   [MTD] [NAND] Add parent info for CAFÉ controller ... Browse Code »

    Signed-off-by: David Woodhouse

    David Woodhouse
     
  • 87f39f049   [MTD] support driver model updates ... Browse Code »

    Follow-on patch to the previous driver model patch for the MTD
    framework. This one makes various MTD drivers connect to the
    driver model tree, so /sys/devices/virtual/mtd/* nodes are no
    longer present ... mostly drivers used on boards I have handy.

    Based on a patch from Kay Sievers.

    Signed-off-by: David Brownell
    Signed-off-by: David Woodhouse

    David Brownell
     
  • 694bb7fc1   [MTD] driver model updates (part 2) ... Browse Code »

    1) Add more sysfs attributes: flags, size, erasesize, writesize,
    oobsize, numeraseregions, name

    2) Move core_initcall() code into init_mtd(). The original approach
    does not work if CONFIG_MTD=m .

    3) Add device_unregister() in del_mtd_device() so that devices get
    removed from sysfs as each driver is unloaded.

    Signed-off-by: Kevin Cernekee
    Signed-off-by: David Woodhouse

    Kevin Cernekee
     
  • 1f24b5a8e   [MTD] driver model updates ... Browse Code »

    Update driver model support in the MTD framework, so it fits
    better into the current udev-based hotplug framework:

    - Each mtd_info now has a device node. MTD drivers should set
    the dev.parent field to point to the physical device, before
    setting up partitions or otherwise declaring MTDs.

    - Those device nodes always map to /sys/class/mtdX device nodes,
    which no longer depend on MTD_CHARDEV.

    - Those mtdX sysfs nodes have a "starter set" of attributes;
    it's not yet sufficient to replace /proc/mtd.

    - Enabling MTD_CHARDEV provides /sys/class/mtdXro/ nodes and the
    /sys/class/mtd*/dev attributes (for udev, mdev, etc).

    - Include a MODULE_ALIAS_CHARDEV_MAJOR macro. It'll work with
    udev creating the /dev/mtd* nodes, not just a static rootfs.

    So the sysfs structure is pretty much what you'd expect, except
    that readonly chardev nodes are a bit quirky.

    Signed-off-by: David Brownell
    Signed-off-by: David Woodhouse

    David Brownell
     
  • 811158b14   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
    trivial: Update my email address
    trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
    trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
    trivial: Fix misspelling of "Celsius".
    trivial: remove unused variable 'path' in alloc_file()
    trivial: fix a pdlfush -> pdflush typo in comment
    trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
    trivial: wusb: Storage class should be before const qualifier
    trivial: drivers/char/bsr.c: Storage class should be before const qualifier
    trivial: h8300: Storage class should be before const qualifier
    trivial: fix where cgroup documentation is not correctly referred to
    trivial: Give the right path in Documentation example
    trivial: MTD: remove EOL from MODULE_DESCRIPTION
    trivial: Fix typo in bio_split()'s documentation
    trivial: PWM: fix of #endif comment
    trivial: fix typos/grammar errors in Kconfig texts
    trivial: Fix misspelling of firmware
    trivial: cgroups: documentation typo and spelling corrections
    trivial: Update contact info for Jochen Hein
    trivial: fix typo "resgister" -> "register"
    ...

    Linus Torvalds
     

03 Apr, 2009

4 commits

  • 9d63287a4   [MTD] [NAND] move gen_nand's probe function to .devinit.text ... Browse Code »

    A pointer to plat_nand_probe is passed to the core via
    platform_driver_register and so the function must not disappear when the
    .init sections are discarded. Otherwise (if also having HOTPLUG=y)
    unbinding and binding a device to the driver via sysfs will result in an
    oops as does a device being registered late.

    An alternative to this patch is using platform_driver_probe instead of
    platform_driver_register plus removing the pointer to the probe function
    from the struct platform_driver.

    Signed-off-by: Uwe Kleine-König
    Cc: Kay Sievers
    Cc: Hamish Moffatt
    Cc: David Brownell
    Cc: Andrew Morton
    Cc: Li Zefan
    Cc: Vitaly Wool
    Cc: Thomas Gleixner
    Signed-off-by: David Woodhouse

    Uwe Kleine-König
     
  • f0b1e5892   [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text ... Browse Code »

    A pointer to sa1100_mtd_probe is passed to the core via
    platform_driver_register and so the function must not disappear when the
    .init sections are discarded. Otherwise (if also having HOTPLUG=y)
    unbinding and binding a device to the driver via sysfs will result in an
    oops as does a device being registered late.

    An alternative to this patch is using platform_driver_probe instead of
    platform_driver_register plus removing the pointer to the probe function
    from the struct platform_driver.

    Signed-off-by: Uwe Kleine-König
    Cc: Nicolas Pitre
    Cc: Russell King
    Cc: Andrew Morton
    Signed-off-by: David Woodhouse

    Uwe Kleine-König
     
  • 2cf3a1149   [MTD] fix use after free in register_mtd_blktrans ... Browse Code »

    Reported-by: Dan Carpenter
    Cc: Christoph Hellwig
    Signed-off-by: Marcin Slusarz
    Signed-off-by: David Woodhouse

    Marcin Slusarz
     
  • 67a52bb90   [ARM] fix build-breaking 7a192ec commit ... Browse Code »

    The commit:

    platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

    contains this:

    -static int __exit pxa2xx_flash_remove(struct device *dev)
    +static int __exit pxa2xx_flash_remove(struct platform_device *dev)
    ...
    - .remove = __exit_p(pxa2xx_flash_remove),
    + .remove = __devexit_p(pxa2xx_flash_remove),

    which leads to the following build error:

    `pxa2xx_flash_remove' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o

    This is not the only instance of it in this patch - all __exit_p's
    touched by this patch have been converted to __devexit_p's without
    regard to the original function.

    Let's revert this change and, if we are going to convert functions
    to be __devexit/__devinit, lets have that as a _separate_ patch doing
    just that change.

    Signed-off-by: Russell King

    Russell King
     

31 Mar, 2009

1 commit

  • a6e6abd57   module: remove module_text_address() ... Browse Code »

    Impact: Replace and remove risky (non-EXPORTed) API

    module_text_address() returns a pointer to the module, which given locking
    improvements in module.c, is useless except to test for NULL:

    1) If the module can't go away, use __module_text_address.
    2) Otherwise, just use is_module_text_address().

    Cc: linux-mtd@lists.infradead.org
    Signed-off-by: Rusty Russell

    Rusty Russell
     

30 Mar, 2009

2 commits

  • 23d424949   trivial: NULL noise: drivers/mtd/tests/mtd_*test.c ... Browse Code »

    Fix this sparse warnings:
    drivers/mtd/tests/mtd_oobtest.c:139:33: warning: Using plain integer as NULL pointer
    drivers/mtd/tests/mtd_oobtest.c:192:33: warning: Using plain integer as NULL pointer
    drivers/mtd/tests/mtd_oobtest.c:219:41: warning: Using plain integer as NULL pointer
    drivers/mtd/tests/mtd_oobtest.c:284:25: warning: Using plain integer as NULL pointer
    drivers/mtd/tests/mtd_oobtest.c:525:25: warning: Using plain integer as NULL pointer
    drivers/mtd/tests/mtd_oobtest.c:545:25: warning: Using plain integer as NULL pointer
    drivers/mtd/tests/mtd_oobtest.c:569:33: warning: Using plain integer as NULL pointer
    drivers/mtd/tests/mtd_oobtest.c:589:33: warning: Using plain integer as NULL pointer
    drivers/mtd/tests/mtd_oobtest.c:613:33: warning: Using plain integer as NULL pointer
    drivers/mtd/tests/mtd_oobtest.c:633:33: warning: Using plain integer as NULL pointer
    drivers/mtd/tests/mtd_oobtest.c:673:41: warning: Using plain integer as NULL pointer
    drivers/mtd/tests/mtd_oobtest.c:701:33: warning: Using plain integer as NULL pointer
    drivers/mtd/tests/mtd_readtest.c:74:41: warning: Using plain integer as NULL pointer

    Signed-off-by: Hannes Eder
    Acked-by: Artem Bityutskiy
    Signed-off-by: Jiri Kosina

    Hannes Eder
     
  • 2a7af8ca8   trivial: MTD: remove EOL from MODULE_DESCRIPTION ... Browse Code »

    There is no need to have a "\n" on a MODULE_DESCRIPTION, remove it.

    Signed-off-by: Niels de Vos
    Signed-off-by: Jiri Kosina

    Niels de Vos
     

29 Mar, 2009

2 commits

  • 0fe41b898   Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
    [ARM] 5435/1: fix compile warning in sanity_check_meminfo()
    [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
    [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
    [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
    imxfb: Fix TFT mode
    i.MX21/27: remove ifdef CONFIG_FB_IMX
    imxfb: add clock support
    mxc: add arch_reset() function
    clkdev: add possibility to get a clock based on the device name
    i.MX1: remove fb support from mach-imx
    [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
    Gemini: Add support for Teltonika RUT100
    Gemini: gpiolib based GPIO support v2
    MAINTAINERS: add myself as Gemini architecture maintainer
    ARM: Add Gemini architecture v3
    [ARM] OMAP: Fix compile for omap2_init_common_hw()
    MAINTAINERS: Add myself as Faraday ARM core variant maintainer
    ARM: Add support for FA526 v2
    [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
    [ARM] collie: fix two minor formatting nits
    ...

    Linus Torvalds
     
  • ed40d0c47   Merge branch 'origin' into devel ... Browse Code »

    Conflicts:
    sound/soc/pxa/pxa2xx-i2s.c

    Russell King
     

28 Mar, 2009

4 commits

  • 82268da1b   Merge branch 'linus' into percpu-cpumask-x86-for-linus-2 ... Browse Code »

    Conflicts:
    arch/sparc/kernel/time_64.c
    drivers/gpu/drm/drm_proc.c

    Manual merge to resolve build warning due to phys_addr_t type change
    on x86:

    drivers/gpu/drm/drm_info.c

    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • 3ae5080f4   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (37 commits)
    fs: avoid I_NEW inodes
    Merge code for single and multiple-instance mounts
    Remove get_init_pts_sb()
    Move common mknod_ptmx() calls into caller
    Parse mount options just once and copy them to super block
    Unroll essentials of do_remount_sb() into devpts
    vfs: simple_set_mnt() should return void
    fs: move bdev code out of buffer.c
    constify dentry_operations: rest
    constify dentry_operations: configfs
    constify dentry_operations: sysfs
    constify dentry_operations: JFS
    constify dentry_operations: OCFS2
    constify dentry_operations: GFS2
    constify dentry_operations: FAT
    constify dentry_operations: FUSE
    constify dentry_operations: procfs
    constify dentry_operations: ecryptfs
    constify dentry_operations: CIFS
    constify dentry_operations: AFS
    ...

    Linus Torvalds
     
  • a3ec947c8   vfs: simple_set_mnt() should return void ... Browse Code »

    simple_set_mnt() is defined as returning 'int' but always returns 0.
    Callers assume simple_set_mnt() never fails and don't properly cleanup if
    it were to _ever_ fail. For instance, get_sb_single() and get_sb_nodev()
    should:

    up_write(sb->s_unmount);
    deactivate_super(sb);

    if simple_set_mnt() fails.

    Since simple_set_mnt() never fails, would be cleaner if it did not
    return anything.

    [akpm@linux-foundation.org: fix build]
    Signed-off-by: Sukadev Bhattiprolu
    Acked-by: Serge Hallyn
    Cc: Al Viro
    Cc: Christoph Hellwig
    Signed-off-by: Andrew Morton
    Signed-off-by: Al Viro

    Sukadev Bhattiprolu
     
  • 6e15cf048   Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 ... Browse Code »

    Conflicts:
    arch/parisc/kernel/irq.c
    arch/x86/include/asm/fixmap_64.h
    arch/x86/include/asm/setup.h
    kernel/irq/handle.c

    Semantic merge:
    arch/x86/include/asm/fixmap.h

    Signed-off-by: Ingo Molnar

    Ingo Molnar
     

27 Mar, 2009

2 commits

  • 0c93ea406   Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits)
    Dynamic debug: fix pr_fmt() build error
    Dynamic debug: allow simple quoting of words
    dynamic debug: update docs
    dynamic debug: combine dprintk and dynamic printk
    sysfs: fix some bin_vm_ops errors
    kobject: don't block for each kobject_uevent
    sysfs: only allow one scheduled removal callback per kobj
    Driver core: Fix device_move() vs. dpm list ordering, v2
    Driver core: some cleanup on drivers/base/sys.c
    Driver core: implement uevent suppress in kobject
    vcs: hook sysfs devices into object lifetime instead of "binding"
    driver core: fix passing platform_data
    driver core: move platform_data into platform_device
    sysfs: don't block indefinitely for unmapped files.
    driver core: move knode_bus into private structure
    driver core: move knode_driver into private structure
    driver core: move klist_children into private structure
    driver core: create a private portion of struct device
    driver core: remove polling for driver_probe_done(v5)
    sysfs: reference sysfs_dirent from sysfs inodes
    ...

    Fixed conflicts in drivers/sh/maple/maple.c manually

    Linus Torvalds
     
  • 928a726b0   Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (96 commits)
    sh: add support for SMSC Polaris platform
    sh: fix the HD64461 level-triggered interrupts handling
    sh: sh-rtc wakeup support
    sh: sh-rtc invalid time rework
    sh: sh-rtc carry interrupt rework
    sh: disallow kexec virtual entry
    sh: kexec jump: fix for ftrace.
    sh: kexec: Drop SR.BL bit toggling.
    sh: add kexec jump support
    sh: rework kexec segment code
    sh: simplify kexec vbr code
    sh: Flush only the needed range when unmapping a VMA.
    sh: Update debugfs ASID dumping for 16-bit ASID support.
    sh: tlb-pteaex: Kill off legacy PTEA updates.
    sh: Support for extended ASIDs on PTEAEX-capable SH-X3 cores.
    sh: sh7763rdp: Change IRQ number for sh_eth of sh7763rdp
    sh: espt-giga board support
    sh: dma: Make G2 DMA configurable.
    sh: dma: Make PVR2 DMA configurable.
    sh: Move IRQ multi definition of DMAC to defconfig
    ...

    Linus Torvalds
     

26 Mar, 2009

1 commit

25 Mar, 2009

1 commit