15 Jan, 2012

2 commits

  • Linus Torvalds
     
  • * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
    MIPS: Delete unused function add_temporary_entry.
    MIPS: Set default pci cache line size.
    MIPS: Flush huge TLB
    MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
    MIPS: Octeon: Add support for OCTEON II PCIe
    MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
    MIPS: Alchemy: Update cpu-feature-overrides
    MIPS: Alchemy: db1200: Improve PB1200 detection.
    MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
    MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
    MIPS: Alchemy: irq: register pm at irq init time
    MIPS: Alchemy: Touchscreen support on DB1100
    MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
    net/irda: convert au1k_ir to platform driver.
    MIPS: Alchemy: remove unused board headers
    MTD: nand: make au1550nd.c a platform_driver
    MIPS: Netlogic: Mark Netlogic chips as SMT capable
    MIPS: Netlogic: Add support for XLP 3XX cores
    MIPS: Netlogic: Merge some of XLR/XLP wakup code
    MIPS: Netlogic: Add default XLP config.
    ...

    Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
    traps.c} and drivers/tty/serial/Makefile

    Linus Torvalds
     

10 Jan, 2012

1 commit

  • Cleanups for the Samsung platforms

    Various cleanup changes that the device driver changes are built upon.
    Since the samsung cleanups depend on the device tree series, which
    depends on the first set of cleanups for tegra.

    * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: EXYNOS: Use gpio_request_one
    ARM: S5PV210: Use gpio_request_one
    ARM: S3C64XX: Modified according to SPI consolidation work
    ARM: S5PV210: Modified files for SPI consolidation work
    ARM: S5P64X0: Modified files for SPI consolidation work
    ARM: S5PC100: Modified files for SPI consolidation work
    ARM: S3C64XX: Modified files for SPI consolidation work
    ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung
    ARM: SAMSUNG: Remove SPI bus clocks from platform data
    ARM: S5PV210: Add SPI clkdev support
    ARM: S5P64X0: Add SPI clkdev support
    ARM: S5PC100: Add SPI clkdev support
    ARM: S3C64XX: Add SPI clkdev support
    spi/s3c64xx: Use bus clocks created using clkdev
    mmc: sdhci-s3c: Use generic clock names for sdhci bus clock options
    ARM: SAMSUNG: Add lookup of sdhci-s3c clocks using generic names
    ARM: SAMSUNG: Remove SDHCI bus clocks from platform data
    ARM: SAMSUNG: Use kmemdup rather than duplicating its implementation
    ARM: EXYNOS: remove exynos4_scu_enable()

    Linus Torvalds
     

09 Jan, 2012

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
    Kconfig: acpi: Fix typo in comment.
    misc latin1 to utf8 conversions
    devres: Fix a typo in devm_kfree comment
    btrfs: free-space-cache.c: remove extra semicolon.
    fat: Spelling s/obsolate/obsolete/g
    SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
    tools/power turbostat: update fields in manpage
    mac80211: drop spelling fix
    types.h: fix comment spelling for 'architectures'
    typo fixes: aera -> area, exntension -> extension
    devices.txt: Fix typo of 'VMware'.
    sis900: Fix enum typo 'sis900_rx_bufer_status'
    decompress_bunzip2: remove invalid vi modeline
    treewide: Fix comment and string typo 'bufer'
    hyper-v: Update MAINTAINERS
    treewide: Fix typos in various parts of the kernel, and fix some comments.
    clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
    gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
    leds: Kconfig: Fix typo 'D2NET_V2'
    sound: Kconfig: drop unknown symbol ARCH_CLPS7500
    ...

    Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
    kconfig additions, close to removed commented-out old ones)

    Linus Torvalds
     

08 Jan, 2012

2 commits

  • spi changes queued up for v3.3 merge window

    * tag 'spi-for-linus-20120104' of git://git.secretlab.ca/git/linux-2.6:
    spi: Fix device unregistration when unregistering the bus master
    spi-topcliff-pch: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
    spi-topcliff-pch: Support new device LAPIS Semiconductor ML7831 IOH
    spi/omap: Correct the error path
    spi/omap: call pm_runtime_disable in error path and remove
    spi/omap: Use a workqueue per omap2_mcspi controller

    Linus Torvalds
     
  • Changes queued in gpio/next for the start of the 3.3 merge window

    * tag 'gpio-for-linus-20120104' of git://git.secretlab.ca/git/linux-2.6:
    gpio: Add decode of WM8994 GPIO configuration
    gpio: Convert GPIO drivers to module_platform_driver
    gpio: Fix typo in comment in Samsung driver
    gpio: Explicitly index samsung_gpio_cfgs
    gpio: Add Linus Walleij as gpio co-maintainer
    of: Add device tree selftests
    of: create of_phandle_args to simplify return of phandle parsing data
    gpio/powerpc: Eliminate duplication of of_get_named_gpio_flags()
    gpio/microblaze: Eliminate duplication of of_get_named_gpio_flags()
    gpiolib: output basic details and consolidate gpio device drivers
    pch_gpio: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
    pch_gpio: Support new device LAPIS Semiconductor ML7831 IOH
    spi/pl022: make the chip deselect handling thread safe
    spi/pl022: add support for pm_runtime autosuspend
    spi/pl022: disable the PL022 block when unused
    spi/pl022: move device disable to workqueue thread
    spi/pl022: skip default configuration before suspending
    spi/pl022: fix build warnings
    spi/pl022: only enable RX interrupts when TX is complete

    Linus Torvalds
     

07 Jan, 2012

1 commit

  • …git-cur/linux-2.6-arm

    * 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
    sound: aaci: Enable module alias autogeneration for AMBA drivers
    watchdog: sp805: Enable module alias autogeneration for AMBA drivers
    fbdev: amba: Enable module alias autogeneration for AMBA drivers
    serial: pl011: Enable module alias autogeneration for AMBA drivers
    serial: pl010: Enable module alias autogeneration for AMBA drivers
    spi: pl022: Enable module alias autogeneration for AMBA drivers
    rtc: pl031: Enable module alias autogeneration for AMBA drivers
    rtc: pl030: Enable module alias autogeneration for AMBA drivers
    mmc: mmci: Enable module alias autogeneration for AMBA drivers
    input: ambakmi: Enable module alias autogeneration for AMBA drivers
    gpio: pl061: Enable module alias autogeneration for AMBA drivers
    dmaengine: pl330: Enable module alias autogeneration for AMBA drivers
    dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers
    hwrng: nomadik: Enable module alias autogeneration for AMBA drivers
    ARM: amba: Auto-generate AMBA driver module aliases during modpost
    ARM: amba: Move definition of struct amba_id to mod_devicetable.h

    Linus Torvalds
     

05 Jan, 2012

1 commit


02 Jan, 2012

1 commit


23 Dec, 2011

1 commit


14 Dec, 2011

2 commits


08 Dec, 2011

5 commits

  • Add basic support for the Au1300 variant(s):
    - New GPIO/Interrupt controller
    - DBDMA ids
    - USB setup
    - MMC support
    - enable various PSC drivers
    - detection code.

    Signed-off-by: Manuel Lauss
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2866/
    Signed-off-by: Ralf Baechle

    Manuel Lauss
     
  • Fixes:
    The function __devinit spi_gpio_probe() references
    a function __init spi_gpio_alloc.isra.4().
    If spi_gpio_alloc.isra.4 is only used by spi_gpio_probe then
    annotate spi_gpio_alloc.isra.4 with a matching annotation.

    [wsa: fix spi_gpio_request(), too]

    Signed-off-by: Manuel Lauss
    Signed-off-by: Wolfram Sang

    Manuel Lauss
     
  • When spi_fsl_espi is chosen to be built as a module, there is a build
    error because we test only CONFIG_SPI_FSL_ESPI in declaration of
    struct mpc8xxx_spi in drivers/spi/spi_fsl_lib.h. Also some called
    functions are not exported.

    So we forbid CONFIG_SPI_FSL_ESPI to be tristate here.

    The error looks like:
    drivers/spi/spi_fsl_espi.c: In function 'fsl_espi_bufs':
    drivers/spi/spi_fsl_espi.c:232: error: 'struct mpc8xxx_spi' has no member named 'len'
    ...

    Signed-off-by: Jiri Slaby
    Acked-by: Kumar Gala
    Cc: Grant Likely
    Signed-off-by: Wolfram Sang

    Jiri Slaby
     
  • Include linux/module.h to fix below build error:

    CC drivers/spi/spi-nuc900.o
    drivers/spi/spi-nuc900.c:484: error: 'THIS_MODULE' undeclared here (not in a function)
    drivers/spi/spi-nuc900.c:489: error: expected declaration specifiers or '...' before string constant
    drivers/spi/spi-nuc900.c:489: warning: data definition has no type or storage class
    drivers/spi/spi-nuc900.c:489: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
    drivers/spi/spi-nuc900.c:489: warning: function declaration isn't a prototype
    drivers/spi/spi-nuc900.c:490: error: expected declaration specifiers or '...' before string constant
    drivers/spi/spi-nuc900.c:490: warning: data definition has no type or storage class
    drivers/spi/spi-nuc900.c:490: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
    drivers/spi/spi-nuc900.c:490: warning: function declaration isn't a prototype
    drivers/spi/spi-nuc900.c:491: error: expected declaration specifiers or '...' before string constant
    drivers/spi/spi-nuc900.c:491: warning: data definition has no type or storage class
    drivers/spi/spi-nuc900.c:491: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
    drivers/spi/spi-nuc900.c:491: warning: function declaration isn't a prototype
    drivers/spi/spi-nuc900.c:492: error: expected declaration specifiers or '...' before string constant
    drivers/spi/spi-nuc900.c:492: warning: data definition has no type or storage class
    drivers/spi/spi-nuc900.c:492: warning: type defaults to 'int' in declaration of 'MODULE_ALIAS'
    drivers/spi/spi-nuc900.c:492: warning: function declaration isn't a prototype
    make[2]: *** [drivers/spi/spi-nuc900.o] Error 1
    make[1]: *** [drivers/spi] Error 2
    make: *** [drivers] Error 2

    Signed-off-by: Axel Lin
    Acked-by: Paul Gortmaker
    Signed-off-by: Wolfram Sang

    Axel Lin
     
  • Whithout including 'linux/module.h' spi-ath79 driver fails to compile
    with the these errors:

    drivers/spi/spi-ath79.c:273:12: error: 'THIS_MODULE' undeclared here (not in a function)
    drivers/spi/spi-ath79.c:278:20: error: expected declaration specifiers or '...' before string constant
    drivers/spi/spi-ath79.c:278:1: warning: data definition has no type or storage class
    drivers/spi/spi-ath79.c:278:1: warning: type defaults to 'int' in declaration of 'MODULE_DESCRIPTION'
    drivers/spi/spi-ath79.c:278:20: warning: function declaration isn't a prototype
    drivers/spi/spi-ath79.c:279:15: error: expected declaration specifiers or '...' before string constant
    drivers/spi/spi-ath79.c:279:1: warning: data definition has no type or storage class
    drivers/spi/spi-ath79.c:279:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
    drivers/spi/spi-ath79.c:279:15: warning: function declaration isn't a prototype
    drivers/spi/spi-ath79.c:280:16: error: expected declaration specifiers or '...' before string constant
    drivers/spi/spi-ath79.c:280:1: warning: data definition has no type or storage class
    drivers/spi/spi-ath79.c:280:1: warning: type defaults to 'int' in declaration of 'MODULE_LICENSE'
    drivers/spi/spi-ath79.c:280:16: warning: function declaration isn't a prototype
    drivers/spi/spi-ath79.c:281:14: error: expected declaration specifiers or '...' before string constant
    drivers/spi/spi-ath79.c:281:1: warning: data definition has no type or storage class
    drivers/spi/spi-ath79.c:281:1: warning: type defaults to 'int' in declaration of 'MODULE_ALIAS'
    drivers/spi/spi-ath79.c:281:14: warning: function declaration isn't a prototype

    Signed-off-by: Gabor Juhos
    Signed-off-by: Wolfram Sang

    Gabor Juhos
     

02 Dec, 2011

7 commits

  • There is a possibility that the pump_message and giveback
    run in parallel on a SMP system. Both the pump_message and
    giveback threads work on the same SPI message queue.
    Results will be in correct if the pump_message gets to
    work on the queue first.

    when the pump_message works with the queue, it reads the
    head of the queue and removes it from the queue. pump_message
    activates the chip select depending on this message read.

    This leads to giveback working on the modified queue or a
    emptied queue. If the queue is empty or if the next message on
    the queue (which is not the actual next message, as the pump
    message has removed the next message from the queue) is not for
    the same SPI device as that Of the previous one, giveback will
    de-activate the chip select activated by pump_message(),
    which is wrong.

    To solve this problem pump_message is made not to run and
    access the queue until the giveback is done handling the queue.
    I.e. by making the cur_msg NULL after the giveback has read the
    queue.

    Also a state variable has been introduced to keep track of when
    the CS for next message is already activated and avoid to
    double-activate it.

    Reviewed-by: Viresh Kumar
    Signed-off-by: Virupax Sadashivpetimath
    Signed-off-by: Linus Walleij

    Virupax Sadashivpetimath
     
  • Adds support for configuring the spi bus to use autosuspend for
    runtime power management. This can reduce the latency in starting an
    spi transfer by not suspending the device immediately following
    completion of a transfer. If another transfer then takes place before
    the autosuspend timeout, the call to resume the device can return
    immediately rather than needing to risk sleeping in order to resume
    the device.

    Reviewed-by: Viresh Kumar
    Signed-off-by: Chris Blair
    Signed-off-by: Linus Walleij

    Chris Blair
     
  • Make sure we clear the enable bit when the block is not used.
    This will save some energy in certain hardware versions.

    Reviewed-by: Viresh Kumar
    Signed-off-by: Virupax Sadashivpetimath
    Signed-off-by: Linus Walleij

    Virupax Sadashivpetimath
     
  • Moves the disabling of the device and clocks to the same thread in
    which the device and clocks are enabled. This avoids SMP issues where
    the device can be enabled for a transfer by one thread and then
    disabled by the completion of the previous transfer in another thread.

    Reviewed-by: Viresh Kumar
    Signed-off-by: Chris Blair
    Signed-off-by: Linus Walleij

    Chris Blair
     
  • The loading of the default configuration before suspending has
    been in the driver since its inception, but it is not really
    needed. Especially so since we take to all the trouble of
    enabling and disabling power and clock just to do this. Let's
    scrap this now.

    Reviewed-by: Viresh Kumar
    Signed-off-by: Virupax Sadashivpetimath
    Signed-off-by: Linus Walleij

    Virupax Sadashivpetimath
     
  • The driver build complains with newer compilers unless you
    initialize this struct properly.

    Reviewed-by: Viresh Kumar
    Signed-off-by: Jonas Aaberg
    Signed-off-by: Linus Walleij

    Jonas Aaberg
     
  • For interrupt mode transfers, start with only TX interrupts enabled
    to reduce the overall number of interrupts received. Once TX is
    complete, enable RX interrupts to complete the transfer.

    Reviewed-by: Viresh Kumar
    Signed-off-by: Chris Blair
    Signed-off-by: Linus Walleij

    Chris Blair
     

27 Nov, 2011

1 commit


22 Nov, 2011

1 commit


21 Nov, 2011

1 commit

  • * 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
    ARM: wire up process_vm_writev and process_vm_readv syscalls
    ARM: 7160/1: setup: avoid overflowing {elf,arch}_name from proc_info_list
    ARM: 7158/1: add new MFP implement for NUC900
    ARM: 7157/1: fix a building WARNING for nuc900
    ARM: 7156/1: l2x0: fix compile error on !CONFIG_USE_OF
    ARM: 7155/1: arch.h: Declare 'pt_regs' locally
    ARM: 7154/1: mach-bcmring: fix build error in dma.c
    ARM: 7153/1: mach-bcmring: fix build error in core.c
    ARM: 7152/1: distclean: Remove generated .dtb files
    ARM: 7150/1: Allow kernel unaligned accesses on ARMv6+ processors
    ARM: 7149/1: spi/pl022: Enable clock in probe
    Revert "ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage"

    Linus Torvalds
     

14 Nov, 2011

1 commit

  • There is no Kconfig symbol named SPI_MASTER_OF. The select statement for
    that symbol is a nop. Drop it.

    While we're touching that Kconfig entry also drop a superfluous
    dependency on SPI (this entry is wrapped in "if SPI" / "endif").

    Signed-off-by: Paul Bolle
    Signed-off-by: Jiri Kosina

    Paul Bolle
     

09 Nov, 2011

2 commits

  • Commit 940ab889 "drivercore: Add helper macro for platform_driver boilerplate"
    converted this driver to use module_platform_driver, but due to the use
    of platform_driver_probe(), this resulted in the call to atmel_spi_probe being
    lost. Place the call to this function into the driver structure.

    fix section missmatch

    atmel_spi_probe is marked __init where it's supposed to be __devinit
    atmel_spi_remove is marked __exit where it's supposed to be __devexit

    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
    Cc: Greg Kroah-Hartman
    Cc: Grant Likely
    Cc: Russell King - ARM Linux
    Acked-by: Nicolas Ferre

    Jean-Christophe PLAGNIOL-VILLARD
     
  • Make sure we enable the clock before leaving probe.

    Signed-off-by: Ulf Hansson
    Acked-by: Linus Walleij
    Signed-off-by: Russell King

    Ulf Hansson
     

07 Nov, 2011

1 commit

  • * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
    Revert "tracing: Include module.h in define_trace.h"
    irq: don't put module.h into irq.h for tracking irqgen modules.
    bluetooth: macroize two small inlines to avoid module.h
    ip_vs.h: fix implicit use of module_get/module_put from module.h
    nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
    include: replace linux/module.h with "struct module" wherever possible
    include: convert various register fcns to macros to avoid include chaining
    crypto.h: remove unused crypto_tfm_alg_modname() inline
    uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
    pm_runtime.h: explicitly requires notifier.h
    linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
    miscdevice.h: fix up implicit use of lists and types
    stop_machine.h: fix implicit use of smp.h for smp_processor_id
    of: fix implicit use of errno.h in include/linux/of.h
    of_platform.h: delete needless include
    acpi: remove module.h include from platform/aclinux.h
    miscdevice.h: delete unnecessary inclusion of module.h
    device_cgroup.h: delete needless include
    net: sch_generic remove redundant use of
    net: inet_timewait_sock doesnt need
    ...

    Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
    - drivers/media/dvb/frontends/dibx000_common.c
    - drivers/media/video/{mt9m111.c,ov6650.c}
    - drivers/mfd/ab3550-core.c
    - include/linux/dmaengine.h

    Linus Torvalds
     

05 Nov, 2011

1 commit

  • * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (63 commits)
    dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle
    dmaengine/ep93xx_dma: add module.h include
    pch_dma: Reduce wasting memory
    pch_dma: Fix suspend issue
    dma/timberdale: free_irq() on an error path
    dma: shdma: transfer based runtime PM
    dmaengine: shdma: protect against the IRQ handler
    dmaengine i.MX DMA/SDMA: add missing include of linux/module.h
    dmaengine: delete redundant chan_id and chancnt initialization in dma drivers
    dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool
    dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers
    serial: sh-sci: don't filter on DMA device, use only channel ID
    ARM: SAMSUNG: Remove Samsung specific enum type for dma direction
    ASoC: Samsung: Update DMA interface
    spi/s3c64xx: Merge dma control code
    spi/s3c64xx: Add support DMA engine API
    ARM: SAMSUNG: Remove S3C-PL330-DMA driver
    ARM: S5P64X0: Use generic DMA PL330 driver
    ARM: S5PC100: Use generic DMA PL330 driver
    ARM: S5PV210: Use generic DMA PL330 driver
    ...

    Fix up fairly trivial conflicts in
    - arch/arm/mach-exynos4/{Kconfig,clock.c}
    - arch/arm/mach-s5p64x0/dma.c

    Linus Torvalds
     

04 Nov, 2011

1 commit

  • * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits)
    MIPS: O32: Provide definition of registers ta0 .. ta3.
    MIPS: perf: Add Octeon support for hardware perf.
    MIPS: perf: Add support for 64-bit perf counters.
    MIPS: perf: Reorganize contents of perf support files.
    MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c
    MIPS: Add accessor macros for 64-bit performance counter registers.
    MIPS: Add probes for more Octeon II CPUs.
    MIPS: Add more CPU identifiers for Octeon II CPUs.
    MIPS: XLR, XLS: Add comment for smp setup
    MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
    MIPS: JZ4740: GPIO: Simplify IRQ demuxer
    MIPS: JZ4740: Use generic irq chip
    MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines
    MIPS: Alchemy: kill au1xxx.h header
    MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines
    MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep
    MIPS: Alchemy: Redo PCI as platform driver
    MIPS: Alchemy: more base address cleanup
    MIPS: Alchemy: rewrite USB platform setup.
    MIPS: Alchemy: abstract USB block control register access
    ...

    Fix up trivial conflicts in:
    arch/mips/alchemy/devboards/db1x00/platform.c
    drivers/ide/Kconfig
    drivers/mmc/host/au1xmmc.c
    drivers/video/Kconfig
    sound/mips/Kconfig

    Linus Torvalds
     

01 Nov, 2011

2 commits


29 Oct, 2011

5 commits