Eric Lee / smarc-fsl-linux-kernel

15 Jan, 2012

1 commit

  • f5e4e20fa   Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    2nd round of GPIO changes for v3.3 merge window

    * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
    GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion
    gpio: pl061: remove combined interrupt
    gpio: pl061: convert to use generic irq chip
    GPIO: add bindings for managed devices
    ARM: realview: convert pl061 no irq to 0 instead of -1
    gpio: pl061: convert to use 0 for no irq
    gpio: pl061: use chained_irq_* functions in irq handler
    GPIO/pl061: Add suspend resume capability
    drivers/gpio/gpio-tegra.c: use devm_request_and_ioremap

    Linus Torvalds
     

11 Jan, 2012

1 commit

  • d52739c62   Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl ... Browse Code »

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (31 commits)
    pinctrl: remove unnecessary max pin number
    pinctrl: correct a offset while enumerating pins
    pinctrl: some typo fixes
    pinctrl: rename U300 and SIRF pin controllers
    pinctrl: pass name instead of device to pin_config_*
    pinctrl: add "struct seq_file;" to pinconf.h
    pinctrl: conjure names for unnamed pins
    pinctrl: add a group-specific hog macro
    pinctrl: don't create a device for each pin controller
    arm/u300: don't use PINMUX_MAP_PRIMARY*
    pinctrl: implement PINMUX_MAP_SYS_HOG
    pinctrl: add a pin config interface
    pinctrl/coh901: driver to request its pins
    pinctrl: u300-pinmux: register proper GPIO ranges
    pinctrl: move the U300 GPIO driver to pinctrl
    ARM: u300: localize GPIO assignments
    pinctrl: make it possible to add multiple maps
    pinctrl: make a copy of pinmux map
    pinctrl: GPIO direction support for muxing
    pinctrl: print pin range in GPIO range debugs
    ...

    Linus Torvalds
     

10 Jan, 2012

1 commit

  • 2ac9d7aac   Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Driver specific changes

    Again, a lot of platforms have changes in here: pxa, samsung, omap,
    at91, imx, ...

    * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
    ARM: sa1100: clean up of the clock support
    ARM: pxa: add dummy clock for sa1100-rtc
    RTC: sa1100: support sa1100, pxa and mmp soc families
    RTC: sa1100: remove redundant code of setting alarm
    RTC: sa1100: Clean out ost register
    Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
    pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
    ARM: EXYNOS: Modified files for SPI consolidation work
    ARM: S5P64X0: Enable SDHCI support
    ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names
    ARM: S5P64X0: Add HSMMC setup for host Controller
    ARM: EXYNOS: Add USB OHCI support to ORIGEN board
    USB: Add Samsung Exynos OHCI diver
    ARM: EXYNOS: Add USB OHCI support to SMDKV310 board
    ARM: EXYNOS: Add USB OHCI device
    net: macb: fix build break with !CONFIG_OF
    i2c: tegra: Support DVC controller in device tree
    i2c: tegra: Add __devinit/exit to probe/remove
    net/at91_ether: use gpio_is_valid for phy IRQ line
    ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT
    ...

    Linus Torvalds
     

09 Jan, 2012

2 commits

  • b7d845f88   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: (36 commits)
    mfd: Clearing events requires event registers to be writable for da9052-core
    mfd: Fix annotations in da9052-core
    gpiolib: Mark da9052 driver broken
    mfd: Declare da9052_regmap_config for the bus drivers
    MFD: DA9052/53 MFD core module add SPI support v2
    MFD: DA9052/53 MFD core module
    regmap: Add irq_base accessor to regmap_irq
    regmap: Allow drivers to reinitialise the register cache at runtime
    regmap: Add trace event for successful cache reads
    regmap: Allow regmap_update_bits() users to detect changes
    regmap: Report if we actually handled an interrupt in regmap-irq
    regmap: Fix rbtreee build when not using debugfs
    regmap: Provide debugfs dump of the rbtree cache data
    regmap: Do debugfs init before cache init
    regmap: Suppress noop writes in regmap_update_bits()
    regmap: Remove indexed cache type
    regmap: Drop check whether a register is readable in regcache_read
    regmap: Properly round cache_word_size
    regmap: Add support for 10/14 register formating
    regmap: Try cached read before checking if a hardware read is possible
    ...

    Linus Torvalds
     
  • 98793265b   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: (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
     

06 Jan, 2012

1 commit

05 Jan, 2012

1 commit

  • 3ab524754   gpio: pl061: convert to use generic irq chip ... Browse Code »

    Convert the pl061 irq_chip code to use the generic irq chip code.

    This has the side effect of using 32-bit accesses rather than 8-bit
    accesses to interrupt registers. The h/w TRM and testing seem to indicate
    this is fine.

    Signed-off-by: Rob Herring
    Acked-by: Grant Likely
    Acked-by: Linus Walleij

    Rob Herring
     

03 Jan, 2012

1 commit

20 Dec, 2011

1 commit

13 Dec, 2011

1 commit

28 Nov, 2011

1 commit

15 Nov, 2011

1 commit

07 Nov, 2011

1 commit

  • 1197ab294   Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... Browse Code »

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
    powerpc/p3060qds: Add support for P3060QDS board
    powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX
    powerpc/85xx: Make kexec to interate over online cpus
    powerpc/fsl_booke: Fix comment in head_fsl_booke.S
    powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices
    powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver
    powerpc/85xx: Add 'fsl,pq3-gpio' compatiable for GPIO driver
    powerpc/86xx: Correct Gianfar support for GE boards
    powerpc/cpm: Clear muram before it is in use.
    drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager
    powerpc/fsl_msi: add support for "msi-address-64" property
    powerpc/85xx: Setup secondary cores PIR with hard SMP id
    powerpc/fsl-booke: Fix settlbcam for 64-bit
    powerpc/85xx: Adding DCSR node to dtsi device trees
    powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards
    powerpc/85xx: fix PHYS_64BIT selection for P1022DS
    powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map
    powerpc: respect mem= setting for early memory limit setup
    powerpc: Update corenet64_smp_defconfig
    powerpc: Update mpc85xx/corenet 32-bit defconfigs
    ...

    Fix up trivial conflicts in:
    - arch/powerpc/configs/40x/hcu4_defconfig
    removed stale file, edited elsewhere
    - arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:
    added opal and gelic drivers vs added ePAPR driver
    - drivers/tty/serial/8250.c
    moved UPIO_TSI to powerpc vs removed UPIO_DWAPB support

    Linus Torvalds
     

06 Nov, 2011

1 commit

  • 7abec10c6   Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc: (79 commits)
    ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung
    ARM: SAMSUNG: Cleanup resources by using macro
    ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h
    ARM: S5P: To merge devs.c files to one devs.c
    ARM: S3C64XX: To merge devs.c files to one devs.c
    ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c
    ARM: S5P64X0: Add Power Management support
    ARM: S5P: Make the sleep code common for S5P series SoCs
    ARM: S5P: Make the common S5P PM code conditionally compile
    ARM: SAMSUNG: Move S5P header files to plat-samsung
    ARM: SAMSUNG: Move S3C24XX header files to plat-samsung
    ARM: SAMSUNG: Moving each SoC support header files
    ARM: SAMSUNG: Consolidate plat/pll.h
    ARM: SAMSUNG: Consolidate plat/pwm-clock.h
    ARM: SAMSUNG: Cleanup mach/clkdev.h
    ARM: SAMSUNG: remove sdhci default configuration setup platform helper
    ARM: EXYNOS4: Add FIMC device on SMDKV310 board
    ARM: EXYNOS4: Add header file protection macros
    ARM: EXYNOS4: Add usb ehci device to the SMDKV310
    ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
    ...

    Fix up conflicts in
    - arch/arm/mach-exynos4/{Kconfig,clock.c}
    ARM_CPU_SUSPEND, various random device tables (gah!)
    - drivers/gpio/Makefile
    sa1100 gpio added, samsung gpio drivers merged

    Linus Torvalds
     

04 Nov, 2011

1 commit

  • a0a4194c9   Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 ... Browse Code »

    * 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
    mfd: Fix missing abx500 header file updates
    mfd: Add missing include to intel_msic
    x86, mrst: add platform support for MSIC MFD driver
    mfd: Expose TurnOnStatus in ab8500 sysfs
    mfd: Remove support for early drop ab8500 chip
    mfd: Add support for ab8500 v3.3
    mfd: Add ab8500 interrupt disable hook
    mfd: Convert db8500-prcmu panic() into pr_crit()
    mfd: Refactor db8500-prcmu request_clock() function
    mfd: Rename db8500-prcmu init function
    mfd: Fix db5500-prcmu defines
    mfd: db8500-prcmu voltage domain consumers additions
    mfd: db8500-prcmu reset code retrieval
    mfd: db8500-prcmu tweak for modem wakeup
    mfd: Add db8500-pcmu watchdog accessor functions for watchdog
    mfd: hwacc power state db8500-prcmu accessor
    mfd: Add db8500-prcmu accessors for PLL and SGA clock
    mfd: Move to the new db500 PRCMU API
    mfd: Create a common interface for dbx500 PRCMU drivers
    mfd: Initialize DB8500 PRCMU regs
    ...

    Fix up trivial conflicts in
    arch/arm/mach-imx/mach-mx31moboard.c
    arch/arm/mach-omap2/board-omap3beagle.c
    arch/arm/mach-u300/include/mach/irqs.h
    drivers/mfd/wm831x-spi.c

    Linus Torvalds
     

29 Oct, 2011

1 commit

  • 41684f67a   Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    * 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
    h8300: Move gpio.h to gpio-internal.h
    gpio: pl061: add DT binding support
    gpio: fix build error in include/asm-generic/gpio.h
    gpiolib: Ensure struct gpio is always defined
    irq: Add EXPORT_SYMBOL_GPL to function of irq generic-chip
    gpio-ml-ioh: Use NUMA_NO_NODE not GFP_KERNEL
    gpio-pch: Use NUMA_NO_NODE not GFP_KERNEL
    gpio: langwell: ensure alternate function is cleared
    gpio-pch: Support interrupt function
    gpio-pch: Save register value in suspend()
    gpio-pch: modify gpio_nums and mask
    gpio-pch: support ML7223 IOH n-Bus
    gpio-pch: add spinlock in suspend/resume processing
    gpio-pch: Delete invalid "restore" code in suspend()
    gpio-ml-ioh: Fix suspend/resume issue
    gpio-ml-ioh: Support interrupt function
    gpio-ml-ioh: Delete unnecessary code
    gpio/mxc: add chained_irq_enter/exit() to mx3_gpio_irq_handler()
    gpio/nomadik: use genirq core to track enablement
    gpio/nomadik: disable clocks when unused

    Linus Torvalds
     

24 Oct, 2011

1 commit

  • 8a0a8e8e4   mfd: remove CONFIG_MFD_SUPPORT ... Browse Code »

    We currently have two symbols to control compilation the MFD subsystem,
    MFD_SUPPORT and MFD_CORE. The MFD_SUPPORT is actually not required
    at all, it only hides the submenu when not set, with the effect that
    Kconfig warns about missing dependencies when another driver selects
    an MFD driver while MFD_SUPPORT is disabled. Turning the MFD submenu
    back from menuconfig into a plain menu simplifies the Kconfig syntax
    for those kinds of users and avoids the surprise when the menu
    suddenly appears because another driver was enabled that selects this
    symbol.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

06 Oct, 2011

2 commits

23 Sep, 2011

1 commit

  • c68308dd5   gpio: move mpc8xxx/512x gpio driver to drivers/gpio ... Browse Code »

    Move the driver to the place where it is expected to be nowadays. Also
    rename its CONFIG-name to match the rest and adapt the defconfigs.
    Finally, move selection of REQUIRE_GPIOLIB or WANTS_OPTIONAL_GPIOLIB to
    the platforms, because this option is per-platform and not per-driver.

    Signed-off-by: Wolfram Sang
    Cc: Anatolij Gustschin
    Cc: Grant Likely
    Cc: Benjamin Herrenschmidt
    Acked-by: Grant Likely
    Signed-off-by: Anatolij Gustschin

    Wolfram Sang
     

21 Sep, 2011

4 commits

08 Sep, 2011

1 commit

  • cc890cd78   ARM: 7083/1: rewrite U300 GPIO to use gpiolib ... Browse Code »

    This rewrites the U300 GPIO so as to use gpiolib and
    struct gpio_chip instead of just generic GPIO, hiding
    all the platform specifics and passing in GPIO chip
    variant as platform data at runtime instead of the
    compiletime kludges.

    As a result is now empty for U300 and
    using just defaults.

    Cc: Grant Likely
    Cc: Debian kernel maintainers
    Cc: Arnaud Patard
    Reported-by: Ben Hutchings
    Signed-off-by: Linus Walleij
    Signed-off-by: Russell King

    Linus Walleij
     

02 Aug, 2011

1 commit

  • 4a2d732f5   Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    * 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
    gpio_msm: Move Qualcomm MSM v2 gpio driver into drivers
    gpio_msm: Move Qualcomm v6 MSM driver into drivers
    msm: gpio: Fold register defs into C file
    msm: gpiomux: Move public API to public header
    msm: gpio: Remove ifdefs on gpio chip registers
    msm: gpio: Remove chip-specific register definitions
    msm: Remove chip-ifdefs for GPIO io mappings
    msm: gpio: Remove unsupported devices
    gpio: ab8500: fix MODULE_ALIAS for ab8500
    of/gpio: export of_gpio_simple_xlate

    Linus Torvalds
     

01 Aug, 2011

4 commits

16 Jul, 2011

1 commit

  • 752ad5e82   mcp23s08: add i2c support ... Browse Code »

    Add i2c bindings for the mcp230xx devices. This is quite a lot simpler
    than the spi one as there's no funky sub addressing done (one struct
    i2c_client per struct gpio_chip).

    The mcp23s08_platform_data structure is reused for i2c, even though
    only a single mcp23s08_chip_info structure is needed.

    To use, simply fill out a platform_data structure and pass it in
    i2c_board_info, E.G.:

    static const struct mcp23s08_platform_data mcp23017_data = {
    .chip[0] = {
    .pullups = 0x00ff,
    },
    .base = 240,
    };

    static struct i2c_board_info __initdata i2c_devs[] = {
    { I2C_BOARD_INFO("mcp23017", 0x20),
    .platform_data = &smartview_mcp23017_data, },
    ...
    };

    Signed-off-by: Peter Korsgaard
    Signed-off-by: Grant Likely

    Peter Korsgaard
     

07 Jul, 2011

2 commits

09 Jun, 2011

1 commit

08 Jun, 2011

1 commit

07 Jun, 2011

5 commits