17 Apr, 2012

1 commit


29 Mar, 2012

1 commit

  • Pull MFD changes from Samuel Ortiz:
    - 4 new drivers: Freescale i.MX on-chip Anatop, Ricoh's RC5T583 and
    TI's TPS65090 and TPS65217.
    - New variants support (8420, 8520 ab9540), cleanups and bug fixes for
    the abx500 and db8500 ST-E chipsets.
    - Some minor fixes and update for the wm8994 from Mark.
    - The beginning of a long term TWL cleanup effort coming from the TI
    folks.
    - Various fixes and cleanups for the s5m, TPS659xx, pm860x, and MAX8997
    drivers.

    Fix up trivial conflicts due to duplicate patches and header file
    cleanups ( removal etc).

    * tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (97 commits)
    gpio/twl: Add DT support to gpio-twl4030 driver
    gpio/twl: Allocate irq_desc dynamically for SPARSE_IRQ support
    mfd: Detach twl6040 from the pmic mfd driver
    mfd: Replace twl-* pr_ macros by the dev_ equivalent and do various cleanups
    mfd: Micro-optimization on twl4030 IRQ handler
    mfd: Make twl4030 SIH SPARSE_IRQ capable
    mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files
    mfd: Remove references already defineid in header file from twl-core
    mfd: Remove unneeded header from twl-core
    mfd: Make twl-core not depend on pdata->irq_base/end
    ARM: OMAP2+: board-omap4-*: Do not use anymore TWL6030_IRQ_BASE in board files
    mfd: Return twl6030_mmc_card_detect IRQ for board setup
    Revert "mfd: Add platform data for MAX8997 haptic driver"
    mfd: Add support for TPS65090
    mfd: Add some da9052-i2c section annotations
    mfd: Build rtc5t583 only if I2C config is selected to y.
    mfd: Add anatop mfd driver
    mfd: Fix compilation error in tps65910.h
    mfd: Add 8420 variant to db8500-prcmu
    mfd: Add 8520 PRCMU variant to db8500-prcmu
    ...

    Linus Torvalds
     

28 Mar, 2012

2 commits

  • Pull "ARM: board specific updates" from Arnd Bergmann/Olof Johansson:
    "These changes are all specific to one board only. We're trying to
    keep the number of board files low, but generally board level updates
    are ok on platforms that are working on moving towards DT based
    probing, which will eventually lead to removing them.

    The board-ams-delta.c board file gets a conflict between the removal
    of ams_delta_config and the addition of a lot of other data. The
    Kconfig file has two changes in the same line, and in exynos, the
    power domain cleanup conflicts with the addition of the image sensor
    device.

    Signed-off-by: Arnd Bergmann
    [olof: Amended a fix for a mismerge to board-omap4panda.c]
    Signed-off-by: Olof Johansson "

    Fixed up some fairly trivial conflicts manually.

    * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (82 commits)
    i.MX35-PDK: Add Camera support
    ARM : mx35: 3ds-board: add framebuffer device
    pxa/hx4700: Remove pcmcia platform_device structure
    ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
    ARM: pxa/hx4700: Remove unwanted request for GPIO105
    ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board
    ARM: EXYNOS: Register JPEG on nuri
    ARM: EXYNOS: Register JPEG on universal_c210
    ARM: S5PV210: Enable JPEG on SMDKV210
    ARM: S5PV210: Add JPEG board definition
    ARM: EXYNOS: Enable JPEG on Origen
    ARM: EXYNOS: Enable JPEG on SMDKV310
    ARM: EXYNOS: Add __init attribute to universal_camera_init()
    ARM: EXYNOS: Add __init attribute to nuri_camera_init()
    ARM: S5PV210: Enable FIMC on SMDKC110
    ARM: S5PV210: Enable FIMC on SMDKV210
    ARM: S5PV210: Enable MFC on SMDKC110
    ARM: S5PV210: Enable MFC on SMDKV210
    ARM: EXYNOS: Enable G2D on SMDKV310
    ARM: tegra: update defconfig
    ...

    Linus Torvalds
     
  • Pull "ARM: global cleanups" from Arnd Bergmann:
    "Quite a bit of code gets removed, and some stuff moved around, mostly
    the old samsung s3c24xx stuff. There should be no functional changes
    in this series otherwise. Some cleanups have dependencies on other
    arm-soc branches and will be sent in the second round.

    Signed-off-by: Arnd Bergmann "

    Fixed up trivial conflicts mainly due to #include's being changes on
    both sides.

    * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits)
    ep93xx: Remove unnecessary includes of ep93xx-regs.h
    ep93xx: Move EP93XX_SYSCON defines to SoC private header
    ep93xx: Move crunch code to mach-ep93xx directory
    ep93xx: Make syscon access functions private to SoC
    ep93xx: Configure GPIO ports in core code
    ep93xx: Move peripheral defines to local SoC header
    ep93xx: Convert the watchdog driver into a platform device.
    ep93xx: Use ioremap for backlight driver
    ep93xx: Move GPIO defines to gpio-ep93xx.h
    ep93xx: Don't use system controller defines in audio drivers
    ep93xx: Move PHYS_BASE defines to local SoC header file
    ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver
    ARM: EXYNOS: add clock registers for exynos4x12-cpufreq
    PM / devfreq: update the name of EXYNOS clock registers that were omitted
    PM / devfreq: update the name of EXYNOS clock register
    ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock
    ARM: EXYNOS: use static declaration on regarding clock
    ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
    ARM: OMAP2+: Fix build error after merge
    ARM: S3C24XX: remove call to s3c24xx_setup_clocks
    ...

    Linus Torvalds
     

24 Mar, 2012

19 commits

  • After moving some core functions to led-core.c, led-class.c can be built
    as module again.

    Signed-off-by: Bryan Wu
    Acked-by: Richard Purdie
    Acked-by: Linus Walleij
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Bryan Wu
     
  • Improve the readability by moving the code setting gen_config to one
    place.

    [akpm@linux-foundation.org: fix some patch skew]
    Signed-off-by: Axel Lin
    Cc: Shreshtha Kumar Sahu
    Cc: "Milo(Woogyom) Kim"
    Cc: Richard Purdie
    Acked-by: Linus Walleij
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • Signed-off-by: Axel Lin
    Cc: Peter Meerwald
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     
  • Use 'pdata' rather than 'pltfm' in lm3530_init_registers().

    Signed-off-by: Milo(Woogyom) Kim
    Cc: Linus Walleij
    Cc: Richard Purdie
    Cc: Axel Lin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • LM3530_ALS_ZONE_REG is read-only register.
    Writing this register is not necessary.

    Signed-off-by: Milo(Woogyom) Kim
    Cc: Linus Walleij
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • * add 'struct lm3530_pwm_data' in the platform data
    The pwm data is the platform specific functions which generate the pwm.
    The pwm data is only valid when brightness is pwm input mode.
    Functions should be implemented by the pwm driver.
    pwm_set_intensity() : set duty of pwm.
    pwm_get_intensity() : get current the brightness.

    * brightness control by pwm
    If the control mode is pwm, then brightness is changed by the duty of
    pwm=. So pwm platform function should be called in lm3530_brightness_set().

    * do not update brightness register when pwm input mode
    In pwm input mode, brightness register is not used.
    If any value is updated in this register, then the led will be off.

    * when input mode is changed, set duty of pwm to 0 if unnecessary.

    Signed-off-by: Milo(Woogyom) Kim
    Cc: Linus Walleij
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • To get members of lm3530_data, use 'struct led_classdev' rather than
    'struct i2c_client'.

    [akpm@linux-foundation.org: fix 80-column fixes more nicely]
    Signed-off-by: Milo(Woogyom) Kim
    Cc: Linus Walleij
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • Only 7 bits are used for updating the brightness. (register address :
    A0h) So the max_brightness property of lm3530 should be set to 127.

    On initializing registers, maximum initial brightness is limited to
    'max_brightness'.

    Division-by-two is removed on updating the brightness. This arithmetic is
    not necessary because the range of brightness is 0 ~ 127= .

    Signed-off-by: Milo(Woogyom) Kim
    Cc: Linus Walleij
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • Direct usage of the asm include has long been deprecated by the
    introduction of gpiolib.

    Signed-off-by: Mark Brown
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mark Brown
     
  • Driver for the PCA9633 I2C chip supporting four LEDs and 255 brightness
    levels.

    [akpm@linux-foundation.org: fix kcalloc() call]
    [axel.lin@gmail.com: fix kcalloc parameters swapped]
    Signed-off-by: Peter Meerwald
    Signed-off-by: Axel Lin
    Cc: Lars-Peter Clausen
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Peter Meerwald
     
  • Saves ~50 bytes text and speeds things up.

    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • Fix it by assigning the lp5521_read return value.

    Signed-off-by: srinidhi kasagar
    Cc: Milo(Woogyom) Kim
    Cc: Linus Walleij
    Cc: Arun MURTHY
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Srinidhi KASAGAR
     
  • For better readability, values of LP5521_REG_ENABLE register were
    redefined= . Additional definitions: LP5521_ENABLE_DEFAULT and
    LP5521_ENABLE_RUN_PROGRAM= .

    Use definition rather than hard code value.
    : 0x3F -> 'LP5521_CMD_DIRECT'

    Signed-off-by: Milo(Woogyom) Kim
    Acked-by: Linus Walleij
    Cc: Arun MURTHY
    Cc: Srinidhi Kasagar
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • The lp5521 has autonomous operation mode without external control.
    Using lp5521_platform_data, various led patterns can be configurable.
    For supporting this feature, new functions and device attribute are
    added.

    Structure of lp5521_led_pattern: 3 channels are supported - red, green
    and blue. Pattern(s) of each channel and numbers of pattern(s) are
    defined in the pla= tform data. Pattern data are hexa codes which
    include pattern commands such like set pwm, wait, ramp up/down, branch
    and so on.

    Pattern mode functions:
    * lp5521_clear_program_memory
    Before running new led pattern, program memory should be cleared.
    * lp5521_write_program_memory
    Pattern data updated in the program memory via the i2c.
    * lp5521_get_pattern
    Get pattern from predefined in the platform data.
    * lp5521_run_led_pattern
    Stop current pattern or run new pattern.
    Transition time is required between different operation mode.

    Device attribute - 'led_pattern': To load specific led pattern, new device
    attribute is added.

    When the lp5521 driver is unloaded, stop current led pattern mode.

    Documentation updated : description about how to define the led patterns
    and example.

    [akpm@linux-foundation.org: checkpatch fixes]
    Signed-off-by: Milo(Woogyom) Kim
    Acked-by: Linus Walleij
    Cc: Arun MURTHY
    Cc: Srinidhi Kasagar
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • The value of CONFIG register(Addr 08h) is configurable. For supporting
    this feature, update_config is added in the platform data. If
    'update_config' is not defined, the default value is 'LP5521_PWRSAVE_EN |
    LP5521_CP_MODE_AUTO | LP5521_R_TO_BATT'.

    To define CONFIG register in the platform data, the bit definitions were
    mo= ved to the header file.

    Documentation updated : description about 'update_config' and example.

    Signed-off-by: Milo(Woogyom) Kim
    Acked-by: Linus Walleij
    Cc: Arun MURTHY
    Cc: Srinidhi Kasagar
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • The name of each led channel can be configurable. For the compatibility,
    the name is set to default value(xx:channelN) when 'name' is not defined.

    Signed-off-by: Milo(Woogyom) Kim
    Acked-by: Linus Walleij
    Cc: Arun MURTHY
    Cc: Srinidhi Kasagar
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • A few new i2c-drivers came into the kernel which clear the
    clientdata-pointer on exit or error. This is obsolete meanwhile, the
    core will do it.

    Signed-off-by: Wolfram Sang
    Cc: NeilBrown
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wolfram Sang
     
  • Just a small tidy-up.

    1) There is a NULL dereference if the tca allocation fails.
    2) The call to cancel_work_sync() isn't needed because we haven't
    scheduled any work.
    3) The call to i2c_set_clientdata() isn't needed because the core
    handles that automatically if probe() fails.
    4) I added some curly braces for style reasons.

    Signed-off-by: Dan Carpenter
    Cc: Richard Purdie
    Acked-by: NeilBrown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Dan Carpenter
     
  • "reseting" -> "resetting"

    Signed-off-by: Masanari Iida
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Masanari Iida
     

14 Mar, 2012

1 commit


09 Mar, 2012

1 commit

  • …/git/kgene/linux-samsung into next/cleanup

    * 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (24 commits)
    ARM: S3C24XX: remove call to s3c24xx_setup_clocks
    ARM: S3C24XX: add get_rate for clk_p on S3C2416/2443
    ARM: S3C24XX: add get_rate for clk_h on S3C2416/2443
    ARM: S3C24XX: remove XXX_setup_clocks method from S3C2443
    ARM: S3C24XX: remove obsolete S3C2416_DMA option
    ARM: S3C24XX: Reuse S3C2443 dma for S3C2416
    ARM: S3C24XX: Fix indentation of dma-s3c2443
    ARM: S3C24XX: Move device setup files to mach directory
    ARM: S3C24XX: Consolidate Simtec extensions
    ARM: S3C24XX: move simtec-specific code to mach directory
    ARM: S3C24XX: Move common-smdk code to mach directory
    ARM: S3C24XX: Move s3c2443-clock.c to mach-s3c24xx
    ARM: s3c2410_defconfig: update s3c2410_defconfig
    ARM: S3C2443: move mach-s3c2443/* into mach-s3c24xx/
    ARM: S3C2440: move mach-s3c2440/* into mach-s3c24xx/
    ARM: S3C2416: move mach-s3c2416/* into mach-s3c24xx/
    ARM: S3C2412: move mach-s3c2412/* into mach-s3c24xx/
    ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/
    ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX
    ARM: S3C2410: move s3c2410_baseclk_add to clock.h
    ...

    Olof Johansson
     

07 Mar, 2012

2 commits


06 Mar, 2012

1 commit

  • Add platform driver for the Soekris Engineering net5501 single-board
    computer. Probes well-known locations in ROM for BIOS signature
    to confirm correct platform. Registers 1 LED and 1 GPIO-based
    button (typically used for soft reset).

    Signed-off-by: Philip Prindeville
    Acked-by: Alessandro Zummo
    Cc: Richard Purdie
    Cc: Andres Salomon
    Cc: Matthew Garrett
    [ Removed Kconfig and Makefile detritus from drivers/leds/]
    Signed-off-by: Andrew Morton
    Link: http://lkml.kernel.org/n/tip-jv5uf34996juqh5syes8mn4h@git.kernel.org
    Signed-off-by: Ingo Molnar

    Philip Prindeville
     

03 Mar, 2012

1 commit

  • This patch changes the ARCH name to "ARCH_S3C24XX" for Samsung
    S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443,
    and S3C2450 SoCs so that we can merge the mach-xxx directories
    and plat-s3c24xx dir. to just one mach-s3c24xx for them.

    I think this should be sent to upstream via samsung tree because
    this touches many samsung stuff.

    Cc: Dmitry Torokhov
    Cc: Richard Purdie
    Cc: Chris Ball
    Cc: David Woodhouse
    Cc: Alessandro Zummo
    Cc: Grant Likely
    Cc: Greg Kroah-Hartman
    [for the gadget part:]
    Acked-by: Felipe Balbi
    [for the framebuffer (video) part:]
    Acked-by: Florian Tobias Schandinat
    [For the watchdog-part:]
    Acked-by: Wim Van Sebroeck
    Cc: Sangbeom Kim
    Cc: Liam Girdwood
    Cc: Mark Brown
    Cc: Russell King
    Signed-off-by: Kukjin Kim

    Kukjin Kim
     

01 Mar, 2012

1 commit

  • …ux-omap into next/boards

    * 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    input: serio: ams-delta: toggle keyboard power over GPIO
    omapfb: lcd_ams_delta: drive control lines over GPIO
    MTD: NAND: ams-delta: use GPIO instead of custom I/O
    LED: drop leds-ams-delta driver
    ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio
    ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio
    ARM: OMAP1: ams-delta: register latch dependent devices later

    Arnd Bergmann
     

09 Feb, 2012

1 commit

  • In current code, pltfm->als_vmin is set to LM3530_ALS_WINDOW_mV and
    pltfm->als_vmax is 0. This does not make sense. I think what we want
    here is setting pltfm->als_vmax to LM3530_ALS_WINDOW_mV.

    Both als_vmin and als_vmax local variables will be set to
    pltfm->als_vmin and pltfm->als_vmax by a few lines latter. Thus also
    remove a redundant assignment for als_vmin and als_vmax in this patch.

    Signed-off-by: Axel Lin
    Cc: Shreshtha Kumar Sahu
    Acked-by: Milo(Woogyom) Kim
    Tested-by: Milo(Woogyom) Kim
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Axel Lin
     

24 Jan, 2012

1 commit

  • Add support for leds on Bachmann's ot200 visualisation device. The
    device has three leds on the back panel (led_err, led_init and led_run)
    and can handle up to seven leds on the front panel.

    The driver was written by Linutronix on behalf of Bachmann electronic
    GmbH. It incorporates feedback from Lars-Peter Clausen

    [akpm@linux-foundation.org: add dependency on HAS_IOMEM]
    Signed-off-by: Sebastian Andrzej Siewior
    Signed-off-by: Christian Gmeiner
    Cc: Lars-Peter Clausen
    Cc: Richard Purdie
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Sebastian Andrzej Siewior
     

20 Jan, 2012

1 commit


15 Jan, 2012

1 commit

  • Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1

    * tag 'for-linus' of git://github.com/rustyrussell/linux:
    module_param: check that bool parameters really are bool.
    intelfbdrv.c: bailearly is an int module_param
    paride/pcd: fix bool verbose module parameter.
    module_param: make bool parameters really bool (drivers & misc)
    module_param: make bool parameters really bool (arch)
    module_param: make bool parameters really bool (core code)
    kernel/async: remove redundant declaration.
    printk: fix unnecessary module_param_name.
    lirc_parallel: fix module parameter description.
    module_param: avoid bool abuse, add bint for special cases.
    module_param: check type correctness for module_param_array
    modpost: use linker section to generate table.
    modpost: use a table rather than a giant if/else statement.
    modules: sysfs - export: taint, coresize, initsize
    kernel/params: replace DEBUGP with pr_debug
    module: replace DEBUGP with pr_debug
    module: struct module_ref should contains long fields
    module: Fix performance regression on modules with large symbol tables
    module: Add comments describing how the "strmap" logic works

    Fix up conflicts in scripts/mod/file2alias.c due to the new linker-
    generated table approach to adding __mod_*_device_table entries. The
    ARM sa11x0 mcp bus needed to be converted to that too.

    Linus Torvalds
     

14 Jan, 2012

1 commit

  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (59 commits)
    rtc: max8925: Add function to work as wakeup source
    mfd: Add pm ops to max8925
    mfd: Convert aat2870 to dev_pm_ops
    mfd: Still check other interrupts if we get a wm831x touchscreen IRQ
    mfd: Introduce missing kfree in 88pm860x probe routine
    mfd: Add S5M series configuration
    mfd: Add s5m series irq driver
    mfd: Add S5M core driver
    mfd: Improve mc13xxx dt binding document
    mfd: Fix stmpe section mismatch
    mfd: Fix stmpe build warning
    mfd: Fix STMPE I2c build failure
    mfd: Constify aat2870-core i2c_device_id table
    gpio: Add support for stmpe variant 801
    mfd: Add support for stmpe variant 801
    mfd: Add support for stmpe variant 610
    mfd: Add support for STMPE SPI interface
    mfd: Separate out STMPE controller and interface specific code
    misc: Remove max8997-muic sysfs attributes
    mfd: Remove unused wm831x_irq_data_to_mask_reg()
    ...

    Fix up trivial conflict in drivers/leds/Kconfig due to addition of
    LEDS_MAX8997 and LEDS_TCA6507 next to each other.

    Linus Torvalds
     

13 Jan, 2012

1 commit


11 Jan, 2012

4 commits