27 Oct, 2010

3 commits

  • * 'for_linus' of git://github.com/at91linux/linux-2.6-at91:
    AT91: rtc: enable built-in RTC in Kconfig for at91sam9g45 family
    at91/atmel-mci: inclusion of sd/mmc driver in at91sam9g45 chip and board
    AT91: pm: make sure that r0 is 0 when dealing with cache operations
    AT91: pm: use plain cpu_do_idle() for "wait for interrupt"
    AT91: reset: extend alternate reset procedure to several chips
    AT91: reset routine cleanup, remove not needed icache flush
    AT91: trivial: align comment of at91sam9g20_reset with one more tab
    AT91: Fix AT91SAM9G20 reset as per the errata in the data sheet
    AT91: add board support for Pcontrol_G20

    Linus Torvalds
     
  • * 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
    OMAP: DSS2: don't power off a panel twice
    OMAP: DSS2: OMAPFB: Allow usage of def_vrfb only for omap2,3
    OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3
    OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB
    arm/omap: simplify conditional
    OMAP: DSS2: DSI: Remove extra iounmap in error path
    OMAP: DSS2: Use dss_features framework on DSS2 code
    OMAP: DSS2: Introduce dss_features files
    video/omap: remove mux.h include
    ARM: omap/fb: move get_fbmem_region() to .init.text
    ARM: omap/fb: move omapfb_reserve_sram to .init.text
    ARM: omap/fb: move omap_init_fb to .init.text
    OMAP: DSS2: OMAPFB: swap front and back porches for both hsync and vsync
    OMAP: DSS2: make filter coefficient tables human readable
    OMAP: DSS2: Add SPI dependency to Kconfig of ACX565AKM panel

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
    [CPUFREQ]: x86, cpufreq: Mark longrun_get_policy with __cpuinit.
    [CPUFREQ] add sampling_down_factor tunable to improve ondemand performance
    [CPUFREQ] arch/x86/kernel/cpu/cpufreq: Fix unsigned return type
    [CPUFREQ] drivers/cpufreq: Adjust confusing if indentation

    Linus Torvalds
     

26 Oct, 2010

31 commits

  • Enable built-in RTC IP in Kconfig and modify comments and help messages.
    RTT as RTC is still available but should not be selected in common case.

    Reported-by: Yegor Yefremov
    Signed-off-by: Nicolas Ferre

    Nicolas Ferre
     
  • This adds the support of atmel-mci sd/mmc driver in at91sam9g45 devices and
    board files. This also configures the DMA controller slave interface for
    at_hdmac dmaengine driver.

    Signed-off-by: Nicolas Ferre

    Nicolas Ferre
     
  • * 'for-next' of git://android.git.kernel.org/kernel/tegra:
    spi: tegra: fix error setting on timeout
    spi: add spi_tegra driver
    tegra: harmony: enable PCI Express
    tegra: add PCI Express support
    tegra: add PCI Express clocks
    [ARM] tegra: Add APB DMA support
    [ARM] tegra: Add cpufreq support
    [ARM] tegra: common: Update common clock init table
    [ARM] tegra: clock: Add dvfs support, bug fixes, and cleanups
    [ARM] tegra: Add support for reading fuses
    [ARM] tegra: gpio: Add suspend and wake support
    [ARM] tegra: pinmux: add safe values, move tegra2, add suspend
    [ARM] tegra: add suspend and mirror irqs to legacy controller
    [ARM] tegra: Add legacy irq support
    [ARM] tegra: update iomap

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
    Blackfin: fix inverted anomaly 05000481 logic
    Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK
    Blackfin: ppi/spi/twi headers: add missing __BFP undef
    Blackfin: update defconfigs
    Blackfin: bfin_twi.h: start a common TWI header
    netdev: bfin_mac: push settings to platform resources

    Linus Torvalds
     
  • avoids derefencing an uninitialized pointer

    Change-Id: Icf528441ae481e9f6f5ddc0be32c7c217fa49701
    Signed-off-by: Erik Gilling

    Erik Gilling
     
  • * 'next' of git://git.monstr.eu/linux-2.6-microblaze: (42 commits)
    microblaze: Fix build with make 3.82
    fbdev/xilinxfb: Microblaze driver support
    microblaze: Support C optimized lib functions for little-endian
    microblaze: Separate library optimized functions
    microblaze: Support timer on AXI lite
    microblaze: Add support for little-endian Microblaze
    microblaze: KGDB little endian support
    microblaze: Add PVR for endians plus detection
    net: emaclite: Add support for little-endian platforms
    microblaze: trivial: Add comment for AXI pvr
    microblaze: pci-common cleanup
    microblaze: Support early console on uart16550
    microblaze: Do not compile early console support for uartlite if is disabled
    microblaze: Setup early console dynamically
    microblaze: Rename all uartlite early printk functions
    microblaze: remove early printk uarlite console dependency from header
    microblaze: Remove additional compatible properties
    microblaze: Remove hardcoded asm instraction for PVR loading
    microblaze: Use static const char * const where possible
    microblaze: Define VMALLOC_START/END
    ...

    Linus Torvalds
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (24 commits)
    hwmon: lis3: Release resources in case of failure
    hwmon: lis3: Short explanations of platform data fields
    hwmon: lis3: Enhance lis3 selftest with IRQ line test
    hwmon: lis3: use block read to access data registers
    hwmon: lis3: Adjust fuzziness for 8 bit device
    hwmon: lis3: New parameters to platform data
    hwmon: lis3: restore axis enabled bits
    hwmon: lis3: Power on corrections
    hwmon: lis3: Update coordinates at polled device open
    hwmon: lis3: Cleanup interrupt handling
    hwmon: lis3: regulator control
    hwmon: lis3: pm_runtime support
    Kirkwood: add fan support for Network Space Max v2
    hwmon: add generic GPIO fan driver
    hwmon: (coretemp) fix reading of microcode revision (v2)
    hwmon: ({core, pkg, via-cpu}temp) remove unnecessary CONFIG_HOTPLUG_CPU ifdefs
    hwmon: (pkgtemp) align driver initialization style with coretemp
    hwmon: LTC4261 Hardware monitoring driver
    hwmon: (lis3) add axes module parameter for custom axis-mapping
    hwmon: (hp_accel) Add HP Mini 510x family support
    ...

    Linus Torvalds
     
  • If lis3lv02d_init_device fails, HW resources were not released
    properly. In case of failure call release_resources if available.

    Signed-off-by: Samu Onkalo
    Acked-by: Eric Piel
    Signed-off-by: Guenter Roeck

    Samu Onkalo
     
  • Configure chip to data ready mode in selftest and count received
    interrupts to see that interrupt line(s) are working.

    Signed-off-by: Samu Onkalo
    Acked-by: Eric Piel
    Signed-off-by: Guenter Roeck

    Samu Onkalo
     
  • Add optional blockread function to interface driver. If available
    the chip driver uses it for data register access. For 12 bit device
    it reads 6 bytes to get 3*16bit data. For 8 bit device it reads out
    5 bytes since every second byte is dummy.
    This optimizes bus usage and reduces number of operations and
    interrupts needed for one data update.

    Signed-off-by: Samu Onkalo
    Acked-by: Jonathan Cameron
    Acked-by: Eric Piel
    Signed-off-by: Guenter Roeck

    Samu Onkalo
     
  • Default fuziness is set smaller for 8 device.
    In 12 bit device LSB is quite close to 1 mg
    (mg = 1 / 1000 of earth gravity).
    In 8bit device LSB is about 18 mg.
    Set fuziness to 1 for 8 bit device.

    Signed-off-by: Samu Onkalo
    Acked-by: Eric Piel
    Signed-off-by: Guenter Roeck

    Samu Onkalo
     
  • Added default output data rate setting to platform data.
    If default rate is 0, reset default value is used.
    Added control for duration via platform data.
    Added possibility to configure interrupts to trig on
    both rising and falling edge. The lis3 WU unit can be
    configured quite many ways and with some configurations it
    is quite handy to get coordinate refresh when some
    event trigs and when it reason goes away.

    Signed-off-by: Samu Onkalo
    Acked-by: Jonathan Cameron
    Acked-by: Eric Piel
    Signed-off-by: Guenter Roeck

    Samu Onkalo
     
  • All axis enable bits are set to 0 at module remove.
    Restore reset default value at init.

    Signed-off-by: Samu Onkalo
    Acked-by: Eric Piel
    Signed-off-by: Guenter Roeck

    Samu Onkalo
     
  • Sometimes lis3 chip seems to fail to setup factory tuning at boot up.
    This probably happens if there is some odd power ramp down ramp up sequence
    for example in device restart. Set boot bit in control2 register to
    trig boot sequence manually and wait until it is finished.

    Signed-off-by: Samu Onkalo
    Acked-by: Jonathan Cameron
    Acked-by: Eric Piel
    Signed-off-by: Guenter Roeck

    Samu Onkalo
     
  • Call input device poll function at device open to refresh coordinates
    immediately. This is needed for the case where poll interval is set to
    zero and coordinate updates happens purely under interrupt control.

    Signed-off-by: Samu Onkalo
    Acked-by: Eric Piel
    Signed-off-by: Guenter Roeck

    Samu Onkalo
     
  • Irqcfg moved to chip data instead of platform data.
    This simplifies access in interrupt handler little bit.

    Input device open and close functions set status for
    interrupt threaded handler once.

    Unnecessary check for interrupt source removed since
    it is enough that active interrupt line indicates that
    there was an interrupt.

    Signed-off-by: Samu Onkalo
    Acked-by: Eric Piel
    Signed-off-by: Guenter Roeck

    Samu Onkalo
     
  • Based on pm_runtime control, turn lis3 regulators on and off.
    Perform context save and restore on transitions.

    Feature is optional and must be enabled in platform data.

    Signed-off-by: Samu Onkalo
    Acked-by: Jonathan Cameron
    Acked-by: Eric Piel
    Signed-off-by: Guenter Roeck

    Samu Onkalo
     
  • Add pm_runtime support to lis3 core driver.
    Add pm_runtime support to lis3 i2c driver.

    spi and hp_accel drivers are not yet supported. Old always
    on functionality remains for those.

    For sysfs there is 5 second delay before turning off the
    chip to avoid long ramp up delay.

    Signed-off-by: Samu Onkalo
    Acked-by: Jonathan Cameron
    Acked-by: Eric Piel
    Signed-off-by: Guenter Roeck

    Samu Onkalo
     
  • This patch adds hwmon support for fans connected to GPIO lines.

    Platform specific information such as GPIO pinout and speed conversion array
    (rpm from/to GPIO value) are passed to the driver via platform_data.

    Signed-off-by: Simon Guinot
    Signed-off-by: Guenter Roeck

    Simon Guinot
     
  • According to the documentation, simply reading the respective MSR
    isn't sufficient: It should be written with zeros, cpuid(1) be
    executed, and then read (see arch/x86/kernel/cpu/intel.c for an
    example).

    v2: Fail probe when microcode revision cannot be determined, but is
    needed to check for proper operation.

    Signed-off-by: Jan Beulich
    Cc: Fenghua Yu
    Cc: Chen Gong
    Cc: Jean Delvare
    Acked-by: Fenghua Yu
    Signed-off-by: Guenter Roeck

    Jan Beulich
     
  • CONFIG_HOTPLUG_CPU is used too much in some drivers.
    This patch clean them up.

    Signed-off-by: Chen Gong
    Signed-off-by: Guenter Roeck

    Chen Gong
     
  • pkgtemp is derived from coretemp, so some reasonable
    logics should be applied onto pkgtemp, too. Such as
    the init logic here.

    Signed-off-by: Chen Gong
    Signed-off-by: Guenter Roeck

    Chen Gong
     
  • This driver adds support for Linear Technology LTC4261 I2C Negative
    Voltage Hot Swap Controller.

    Reviewed-by: Ira W. Snyder
    Reviewed-by: Tom Grennan
    Signed-off-by: Guenter Roeck

    Guenter Roeck
     
  • The axis-mapping of lis3dev device on many (rather most) HP machines
    doesn't follow the standard. When each new model appears, users need to
    adjust again. Testing this requires the rebuild of kernel, thus it's not
    trivial for end-users.

    This patch adds a module parameter "axes" to allow a custom axis-mapping
    without patching and recompiling the kernel driver. User can pass the
    parameter such as axes=3,2,1. Also it can be changed via sysfs.

    Signed-off-by: Takashi Iwai
    Acked-by: Eric Piel
    Cc: Jean Delvare
    Cc: Guenter Roeck
    Signed-off-by: Andrew Morton
    Signed-off-by: Guenter Roeck

    Takashi Iwai
     
  • This patch is an enhanced version of Takashi Iwai's
    [PATCH] hp_accel: Add quirks for HP ProBook 532x and HP Mini 5102
    My HP Mini 5101 works fine with this patch.
    Confirmed with Tux Racer.

    Signed-off by: Masanari Iida
    Acked-by: Takashi Iwai
    Cc: Eric Piel

    Signed-off-by: Guenter Roeck

    Masanari Iida
     
  • A new version of LIS3 chip has slight incompatibilities from former
    versions. This patch adds the minimal support for it.

    Signed-off-by: Takashi Iwai
    Signed-off-by: Guenter Roeck

    Takashi Iwai
     
  • These likely originate from these drivers being clones of one another
    and/or other drivers which actually needed these includes.

    Signed-off-by: Jan Beulich
    Signed-off-by: Guenter Roeck

    Jan Beulich
     
  • "break" after "return" is at best bogus (good compilers even warn about
    the "break" being unreachable).

    Signed-off-by: Jan Beulich
    Cc: Rudolf Marek
    Signed-off-by: Guenter Roeck

    Jan Beulich
     
  • ... as they're being called only from a __cpuinit function.

    Signed-off-by: Jan Beulich
    Signed-off-by: Guenter Roeck

    Jan Beulich
     
  • * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (163 commits)
    omap: complete removal of machine_desc.io_pg_offst and .phys_io
    omap: UART: fix wakeup registers for OMAP24xx UART2
    omap: Fix spotty MMC voltages
    ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h
    serial: omap-serial: fix signess error
    OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
    omap: dma: Fix buffering disable bit setting for omap24xx
    omap: serial: Fix the boot-up crash/reboot without CONFIG_PM
    OMAP3: PM: fix scratchpad memory accesses for off-mode
    omap4: pandaboard: enable the ehci port on pandaboard
    omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
    omap4: pandaboard: remove unused hsmmc definition
    OMAP: McBSP: Remove null omap44xx ops comment
    OMAP: McBSP: Swap CLKS source definition
    OMAP: McBSP: Fix CLKR and FSR signal muxing
    OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks
    OMAP: control: move plat-omap/control.h to mach-omap2/control.h
    OMAP: split plat-omap/common.c
    OMAP: McBSP: implement functional clock switching via clock framework
    OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
    ...

    Fixed up trivial conflicts in arch/arm/mach-omap2/
    {board-zoom-peripherals.c,devices.c} as per Tony

    Linus Torvalds
     
  • …t/khilman/linux-davinci

    * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (50 commits)
    davinci: fix remaining board support after io_pgoffst removal
    davinci: mityomapl138: make file local data static
    arm/davinci: remove duplicated include
    davinci: Initial support for Omapl138-Hawkboard
    davinci: MityDSP-L138/MityARM-1808 read MAC address from I2C Prom
    davinci: add tnetv107x touchscreen platform device
    input: add driver for tnetv107x touchscreen controller
    davinci: add keypad config for tnetv107x evm board
    davinci: add tnetv107x keypad platform device
    input: add driver for tnetv107x on-chip keypad controller
    net: davinci_emac: cleanup unused cpdma code
    net: davinci_emac: switch to new cpdma layer
    net: davinci_emac: separate out cpdma code
    net: davinci_emac: cleanup unused mdio emac code
    omap: cleanup unused davinci mdio arch code
    davinci: cleanup mdio arch code and switch to phy_id
    net: davinci_emac: switch to new mdio
    omap: add mdio platform devices
    davinci: add mdio platform devices
    net: davinci_emac: separate out davinci mdio
    ...

    Fix up trivial conflict in drivers/input/keyboard/Kconfig (two entries
    added next to each other - one from the davinci merge, one from the
    input merge)

    Linus Torvalds
     

25 Oct, 2010

6 commits

  • * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (48 commits)
    [S390] topology: export cpu topology via proc/sysinfo
    [S390] topology: move topology sysinfo code
    [S390] topology: clean up facility detection
    [S390] cleanup facility list handling
    [S390] enable ARCH_DMA_ADDR_T_64BIT with 64BIT
    [S390] dasd: ignore unsolicited interrupts for DIAG
    [S390] kvm: Enable z196 instruction facilities
    [S390] dasd: fix unsolicited interrupt recognition
    [S390] dasd: fix use after free in dbf
    [S390] kvm: Fix badness at include/asm/mmu_context.h:83
    [S390] cio: fix I/O cancel function
    [S390] topology: change default
    [S390] smp: use correct cpu address in print_cpu_info()
    [S390] remove ieee_instruction_pointer from thread_struct
    [S390] cleanup system call parameter setup
    [S390] correct alignment of cpuid structure
    [S390] cleanup lowcore access from external interrupts
    [S390] cleanup lowcore access from program checks
    [S390] pgtable: move pte_mkhuge() from hugetlb.h to pgtable.h
    [S390] fix SIGBUS handling
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (365 commits)
    ALSA: hda - Disable sticky PCM stream assignment for AD codecs
    ALSA: usb - Creative USB X-Fi volume knob support
    ALSA: ca0106: Use card specific dac id for mute controls.
    ALSA: ca0106: Allow different sound cards to use different SPI channel mappings.
    ALSA: ca0106: Create a nice spot for mapping channels to dacs.
    ALSA: ca0106: Move enabling of front dac out of hardcoded setup sequence.
    ALSA: ca0106: Pull out dac powering routine into separate function.
    ALSA: ca0106 - add Sound Blaster 5.1vx info.
    ASoC: tlv320dac33: Use usleep_range for delays
    ALSA: usb-audio: add Novation Launchpad support
    ALSA: hda - Add workarounds for CT-IBG controllers
    ALSA: hda - Fix wrong TLV mute bit for STAC/IDT codecs
    ASoC: tpa6130a2: Error handling for broken chip
    ASoC: max98088: Staticise m98088_eq_band
    ASoC: soc-core: Fix codec->name memory leak
    ALSA: hda - Apply ideapad quirk to Acer laptops with Cxt5066
    ALSA: hda - Add some workarounds for Creative IBG
    ALSA: hda - Fix wrong SPDIF NID assignment for CA0110
    ALSA: hda - Fix codec rename rules for ALC662-compatible codecs
    ALSA: hda - Add alc_init_jacks() call to other codecs
    ...

    Linus Torvalds
     
  • * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
    uwb: Orphan the UWB and WUSB subsystems
    uwb: Remove the WLP subsystem and drivers

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (44 commits)
    eeepc-wmi: Add cpufv sysfs interface
    eeepc-wmi: add additional hotkeys
    panasonic-laptop: Simplify calls to acpi_pcc_retrieve_biosdata
    panasonic-laptop: Handle errors properly if they happen
    intel_pmic_gpio: fix off-by-one value range checking
    IBM Real-Time "SMI Free" mode driver -v7
    Add OLPC XO-1 rfkill driver
    Move hdaps driver to platform/x86
    ideapad-laptop: Fix Makefile
    intel_pmic_gpio: swap the bits and mask args for intel_scu_ipc_update_register
    ideapad: Add param: no_bt_rfkill
    ideapad: Change the driver name to ideapad-laptop
    ideapad: rewrite the sw rfkill set
    ideapad: rewrite the hw rfkill notify
    ideapad: use EC command to control camera
    ideapad: use return value of _CFG to tell if device exist or not
    ideapad: make sure we bind on the correct device
    ideapad: check VPC bit before sync rfkill hw status
    ideapad: add ACPI helpers
    dell-laptop: Add debugfs support
    ...

    Linus Torvalds
     
  • * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
    mtd/m25p80: add support to parse the partitions by OF node
    of/irq: of_irq.c needs to include linux/irq.h
    of/mips: Cleanup some include directives/files.
    of/mips: Add device tree support to MIPS
    of/flattree: Eliminate need to provide early_init_dt_scan_chosen_arch
    of/device: Rework to use common platform_device_alloc() for allocating devices
    of/xsysace: Fix OF probing on little-endian systems
    of: use __be32 types for big-endian device tree data
    of/irq: remove references to NO_IRQ in drivers/of/platform.c
    of/promtree: add package-to-path support to pdt
    of/promtree: add of_pdt namespace to pdt code
    of/promtree: no longer call prom_ functions directly; use an ops structure
    of/promtree: make drivers/of/pdt.c no longer sparc-only
    sparc: break out some PROM device-tree building code out into drivers/of
    of/sparc: convert various prom_* functions to use phandle
    sparc: stop exporting openprom.h header
    powerpc, of_serial: Endianness issues setting up the serial ports
    of: MTD: Fix OF probing on little-endian systems
    of: GPIO: Fix OF probing on little-endian systems

    Linus Torvalds
     
  • …/ieee1394/linux1394-2.6

    * 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
    ieee1394: remove the old IEEE 1394 driver stack
    ieee1394: move init_ohci1394_dma to drivers/firewire/

    Fix trivial change/delete conflict: drivers/ieee1394/eth1394.c is
    getting removed, but was modified by the networking merge.

    Linus Torvalds