10 May, 2013

3 commits

  • Pull MIPS updates from Ralf Baechle:

    - More work on DT support for various platforms

    - Various fixes that were to late to make it straight into 3.9

    - Improved platform support, in particular the Netlogic XLR and
    BCM63xx, and the SEAD3 and Malta eval boards.

    - Support for several Ralink SOC families.

    - Complete support for the microMIPS ASE which basically reencodes the
    existing MIPS32/MIPS64 ISA to use non-constant size instructions.

    - Some fallout from LTO work which remove old cruft and will generally
    make the MIPS kernel easier to maintain and resistant to compiler
    optimization, even in absence of LTO.

    - KVM support. While MIPS has announced hardware virtualization
    extensions this KVM extension uses trap and emulate mode for
    virtualization of MIPS32. More KVM work to add support for VZ
    hardware virtualizaiton extensions and MIPS64 will probably already
    be merged for 3.11.

    Most of this has been sitting in -next for a long time. All defconfigs
    have been build or run time tested except three for which fixes are being
    sent by other maintainers.

    Semantic conflict with kvm updates done as per Ralf

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (118 commits)
    MIPS: Add new GIC clockevent driver.
    MIPS: Formatting clean-ups for clocksources.
    MIPS: Refactor GIC clocksource code.
    MIPS: Move 'gic_frequency' to common location.
    MIPS: Move 'gic_present' to common location.
    MIPS: MIPS16e: Add unaligned access support.
    MIPS: MIPS16e: Support handling of delay slots.
    MIPS: MIPS16e: Add instruction formats.
    MIPS: microMIPS: Optimise 'strnlen' core library function.
    MIPS: microMIPS: Optimise 'strlen' core library function.
    MIPS: microMIPS: Optimise 'strncpy' core library function.
    MIPS: microMIPS: Optimise 'memset' core library function.
    MIPS: microMIPS: Add configuration option for microMIPS kernel.
    MIPS: microMIPS: Disable LL/SC and fix linker bug.
    MIPS: microMIPS: Add vdso support.
    MIPS: microMIPS: Add unaligned access support.
    MIPS: microMIPS: Support handling of delay slots.
    MIPS: microMIPS: Add support for exception handling.
    MIPS: microMIPS: Floating point support.
    MIPS: microMIPS: Fix macro naming in micro-assembler.
    ...

    Linus Torvalds
     
  • commit 6cd2c7db4 (videomode: videomode_from_timing work) changed the name of
    the function from videomode_from_timing() to videomode_from_timings().

    commit 32ed6ef1 (videomode: create enum for videomode's display flags) changed
    the 'data_flags' field in videomode structure to 'flags'

    Adapt to these changes in order to fix the following errors:

    drivers/video/mxsfb.c:761:3: error: too many arguments to function 'videomode_from_timing'
    drivers/video/mxsfb.c:761:7: error: void value not ignored as it ought to be
    drivers/video/mxsfb.c:768:9: error: 'struct videomode' has no member named 'data_flags'
    drivers/video/mxsfb.c:770:9: error: 'struct videomode' has no member named 'data_flags'

    Also, select VIDEOMODE_HELPER instead of OF_VIDEOMODE, as this one is
    deprecated.

    Signed-off-by: Fabio Estevam
    Acked-by: Tomi Valkeinen
    Signed-off-by: Shawn Guo
    Signed-off-by: Olof Johansson

    Fabio Estevam
     
  • Pull removal of GENERIC_GPIO from Grant Likely:
    "GENERIC_GPIO now synonymous with GPIOLIB. There are no longer any
    valid cases for enableing GENERIC_GPIO without GPIOLIB, even though it
    is possible to do so which has been causing confusion and breakage.
    This branch does the work to completely eliminate GENERIC_GPIO."

    * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux:
    gpio: update gpio Chinese documentation
    Remove GENERIC_GPIO config option
    Convert selectors of GENERIC_GPIO to GPIOLIB
    blackfin: force use of gpiolib
    m68k: coldfire: use gpiolib
    mips: pnx833x: remove requirement for GENERIC_GPIO
    openrisc: default GENERIC_GPIO to false
    avr32: default GENERIC_GPIO to false
    xtensa: remove explicit selection of GENERIC_GPIO
    sh: replace CONFIG_GENERIC_GPIO by CONFIG_GPIOLIB
    powerpc: remove redundant GENERIC_GPIO selection
    unicore32: default GENERIC_GPIO to false
    unicore32: remove unneeded select GENERIC_GPIO
    arm: plat-orion: use GPIO driver on CONFIG_GPIOLIB
    arm: remove redundant GENERIC_GPIO selection
    mips: alchemy: require gpiolib
    mips: txx9: change GENERIC_GPIO to GPIOLIB
    mips: loongson: use GPIO driver on CONFIG_GPIOLIB
    mips: remove redundant GENERIC_GPIO select

    Linus Torvalds
     

08 May, 2013

2 commits

  • The support for PB1100, PB1500, and PB1550 got merged into the code for
    DB1000 and DB1550 code in v3.7. When that was done the three related
    Kconfig symbols were dropped. But not all related Kconfig macros were
    removed. Do so now.

    Note that the PB1100 code in the Au1100 LCD driver is removed entirely
    and not converted to use its current Kconfig macro. That is done because
    the macros it uses (PB1100_G_CONTROL, PB1100_G_CONTROL_BL, and
    PB1100_G_CONTROL_VDD) are never defined. Actually only one of these was
    ever defined (PB1100_G_CONTROL) but that define was removed in v2.6.34.
    So, as far as I can tell, this code could have never compiled.

    Signed-off-by: Paul Bolle
    Patchwork: http://patchwork.linux-mips.org/patch/5040/
    Acked-by: John Crispin

    Paul Bolle
     
  • Pull ARM SoC device tree updates (part 2) from Arnd Bergmann:
    "These are mostly new device tree bindings for existing drivers, as
    well as changes to the device tree source files to add support for
    those devices, and a couple of new boards, most notably Samsung's
    Exynos5 based Chromebook.

    The changes depend on earlier platform specific updates and touch the
    usual platforms: omap, exynos, tegra, mxs, mvebu and davinci."

    * tag 'dt-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (169 commits)
    ARM: exynos: dts: cros5250: add EC device
    ARM: dts: Add sbs-battery for exynos5250-snow
    ARM: dts: Add i2c-arbitrator bus for exynos5250-snow
    ARM: dts: add mshc controller node for Exynos4x12 SoCs
    ARM: dts: Add chip-id controller node on Exynos4/5 SoC
    ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree
    ARM: davinci: da850-evm: add SPI flash support
    ARM: davinci: da850: override SPI DT node device name
    ARM: davinci: da850: add SPI1 DT node
    spi/davinci: add DT binding documentation
    spi/davinci: no wildcards in DT compatible property
    ARM: dts: mvebu: Convert mvebu device tree files to 64 bits
    ARM: dts: mvebu: introduce internal-regs node
    ARM: dts: mvebu: Convert all the mvebu files to use the range property
    ARM: dts: mvebu: move all peripherals inside soc
    ARM: dts: mvebu: fix cpus section indentation
    ARM: davinci: da850: add EHRPWM & ECAP DT node
    ARM/dts: OMAP3: fix pinctrl-single configuration
    ARM: dts: Add OMAP3430 SDP NOR flash memory binding
    ARM: dts: Add NOR flash bindings for OMAP2420 H4
    ...

    Linus Torvalds
     

07 May, 2013

2 commits

  • Pull pwm changes from Thierry Reding:
    "Nothing very exciting this time around. A couple of bug fixes and a
    lot of cleanup across the board. The DaVinci 8xx family of SoCs now
    use the same driver as the AM33xx family.

    Many thanks to Axel Lin and Jingoo Han who have done a great job
    fixing various bugs and inconsistencies."

    * tag 'for-3.10-rc1' of git://gitorious.org/linux-pwm/linux-pwm: (27 commits)
    pwm: lpc32xx: Don't change PWM_ENABLE bit in lpc32xx_pwm_config
    pwm: lpc32xx: Properly set PWM_ENABLE bit in lpc32xx_pwm_[enable|disable]
    pwm: Constify OF match tables
    pwm: pwm-tiehrpwm: Update device-tree binding document
    pwm: pwm-tiecap: Update device-tree binding document
    pwm: puv3: Remove unused enabled filed from struct puv3_pwm_chip
    pwm: pxa: Remove PWM_ID_BASE macro
    pwm: spear: Remove unused *dev from struct spear_pwm_chip
    pwm: mxs: Remove unused *dev from struct mxs_pwm_chip
    pwm: twl: Return proper error if twl6030_pwm_enable() fails
    pwm: pxa: Remove clk_enabled field from struct pxa_pwm_chip
    pwm: imx: Remove enabled field from struct imx_chip
    pwm: twl: Add .owner to struct pwm_ops
    pwm: twl-led: Add .owner to struct pwm_ops
    pwm: atmel-tcb: Add .owner to struct pwm_ops
    pwm: ab8500: Add .owner to struct pwm_ops
    pwm: spear: Fix checking return value of clk_enable() and clk_prepare()
    pwm: tiehrpwm: Staticize non-exported symbols
    pwm: tiecap: Staticize non-exported symbols
    pwm: ab8500: Fix trivial typo in dev_err message
    ...

    Linus Torvalds
     
  • This is support for the ARM Chromebook, originally scheduled
    as a "late" pull request. Since it's already late now, we
    can combine this into the existing next/dt2 branch.

    * late/dt:
    ARM: exynos: dts: cros5250: add EC device
    ARM: dts: Add sbs-battery for exynos5250-snow
    ARM: dts: Add i2c-arbitrator bus for exynos5250-snow
    ARM: dts: Add chip-id controller node on Exynos4/5 SoC
    ARM: EXYNOS: Create virtual I/O mapping for Chip-ID controller using device tree

    Arnd Bergmann
     

05 May, 2013

1 commit

  • Pull ARM SoC driver changes from Olof Johansson:
    "This is a rather large set of patches for device drivers that for one
    reason or another the subsystem maintainer preferred to get merged
    through the arm-soc tree. There are both new drivers as well as
    existing drivers that are getting converted from platform-specific
    code into standalone drivers using the appropriate subsystem specific
    interfaces.

    In particular, we can now have pinctrl, clk, clksource and irqchip
    drivers in one file per driver, without the need to call into platform
    specific interface, or to get called from platform specific code, as
    long as all information about the hardware is provided through a
    device tree.

    Most of the drivers we touch this time are for clocksource. Since now
    most of them are part of drivers/clocksource, I expect that we won't
    have to touch these again from arm-soc and can let the clocksource
    maintainers take care of these in the future.

    Another larger part of this series is specific to the exynos platform,
    which is seeing some significant effort in upstreaming and
    modernization of its device drivers this time around, which
    unfortunately is also the cause for the churn and a lot of the merge
    conflicts.

    There is one new subsystem that gets merged as part of this series:
    the reset controller interface, which is a very simple interface for
    taking devices on the SoC out of reset or back into reset. Patches to
    use this interface on i.MX follow later in this merge window, and we
    are going to have other platforms (at least tegra and sirf) get
    converted in 3.11. This will let us get rid of platform specific
    callbacks in a number of platform independent device drivers."

    * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (256 commits)
    irqchip: s3c24xx: add missing __init annotations
    ARM: dts: Disable the RTC by default on exynos5
    clk: exynos5250: Fix parent clock for sclk_mmc{0,1,2,3}
    ARM: exynos: restore mach/regs-clock.h for exynos5
    clocksource: exynos_mct: fix build error on non-DT
    pinctrl: vt8500: wmt: Fix checking return value of pinctrl_register()
    irqchip: vt8500: Convert arch-vt8500 to new irqchip infrastructure
    reset: NULL deref on allocation failure
    reset: Add reset controller API
    dt: describe base reset signal binding
    ARM: EXYNOS: Add arm-pmu DT binding for exynos421x
    ARM: EXYNOS: Add arm-pmu DT binding for exynos5250
    ARM: EXYNOS: Enable PMUs for exynos4
    irqchip: exynos-combiner: Correct combined IRQs for exynos4
    irqchip: exynos-combiner: Add set_irq_affinity function for combiner_irq
    ARM: EXYNOS: fix compilation error introduced due to common clock migration
    clk: exynos5250: Fix divider values for sclk_mmc{0,1,2,3}
    clk: exynos4: export clocks required for fimc-is
    clk: samsung: Fix compilation error
    clk: tegra: fix enum tegra114_clk to match binding
    ...

    Linus Torvalds
     

03 May, 2013

3 commits

  • Pull drm updates from Dave Airlie:
    "This is the main drm pull request for 3.10.

    Wierd bits:
    - OMAP drm changes required OMAP dss changes, in drivers/video, so I
    took them in here.
    - one more fbcon fix for font handover
    - VT switch avoidance in pm code
    - scatterlist helpers for gpu drivers - have acks from akpm

    Highlights:
    - qxl kms driver - driver for the spice qxl virtual GPU

    Nouveau:
    - fermi/kepler VRAM compression
    - GK110/nvf0 modesetting support.

    Tegra:
    - host1x core merged with 2D engine support

    i915:
    - vt switchless resume
    - more valleyview support
    - vblank fixes
    - modesetting pipe config rework

    radeon:
    - UVD engine support
    - SI chip tiling support
    - GPU registers initialisation from golden values.

    exynos:
    - device tree changes
    - fimc block support

    Otherwise:
    - bunches of fixes all over the place."

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (513 commits)
    qxl: update to new idr interfaces.
    drm/nouveau: fix build with nv50->nvc0
    drm/radeon: fix handling of v6 power tables
    drm/radeon: clarify family checks in pm table parsing
    drm/radeon: consolidate UVD clock programming
    drm/radeon: fix UPLL_REF_DIV_MASK definition
    radeon: add bo tracking debugfs
    drm/radeon: add new richland pci ids
    drm/radeon: add some new SI PCI ids
    drm/radeon: fix scratch reg handling for UVD fence
    drm/radeon: allocate SA bo in the requested domain
    drm/radeon: fix possible segfault when parsing pm tables
    drm/radeon: fix endian bugs in atom_allocate_fb_scratch()
    OMAPDSS: TFP410: return EPROBE_DEFER if the i2c adapter not found
    OMAPDSS: VENC: Add error handling for venc_probe_pdata
    OMAPDSS: HDMI: Add error handling for hdmi_probe_pdata
    OMAPDSS: RFBI: Add error handling for rfbi_probe_pdata
    OMAPDSS: DSI: Add error handling for dsi_probe_pdata
    OMAPDSS: SDI: Add error handling for sdi_probe_pdata
    OMAPDSS: DPI: Add error handling for dpi_probe_pdata
    ...

    Linus Torvalds
     
  • OMAPDSS fixes for 3.10:

    * Compilation fix when DSI is disabled in Kconfig
    * Basic deferred probe support to fix DT boot

    * tag 'omapdss-for-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux:
    OMAPDSS: TFP410: return EPROBE_DEFER if the i2c adapter not found
    OMAPDSS: VENC: Add error handling for venc_probe_pdata
    OMAPDSS: HDMI: Add error handling for hdmi_probe_pdata
    OMAPDSS: RFBI: Add error handling for rfbi_probe_pdata
    OMAPDSS: DSI: Add error handling for dsi_probe_pdata
    OMAPDSS: SDI: Add error handling for sdi_probe_pdata
    OMAPDSS: DPI: Add error handling for dpi_probe_pdata
    OMAPDSS: VENC: use platform_driver_register()
    OMAPDSS: HDMI: use platform_driver_register()
    OMAPDSS: RFBI: use platform_driver_register()
    OMAPDSS: DSI: use platform_driver_register()
    OMAPDSS: SDI: use platform_driver_register()
    OMAPDSS: DPI: use platform_driver_register()
    OMAPFB: defer probe if no displays
    OMAPFB: use module_platform_driver()
    OMAPDSS: Makefile: move omapfb after panels
    OMAPDSS: DPI: fix compilation if DSI not compiled in

    Dave Airlie
     
  • Pull powerpc update from Benjamin Herrenschmidt:
    "The main highlights this time around are:

    - A pile of addition POWER8 bits and nits, such as updated
    performance counter support (Michael Ellerman), new branch history
    buffer support (Anshuman Khandual), base support for the new PCI
    host bridge when not using the hypervisor (Gavin Shan) and other
    random related bits and fixes from various contributors.

    - Some rework of our page table format by Aneesh Kumar which fixes a
    thing or two and paves the way for THP support. THP itself will
    not make it this time around however.

    - More Freescale updates, including Altivec support on the new e6500
    cores, new PCI controller support, and a pile of new boards support
    and updates.

    - The usual batch of trivial cleanups & fixes"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)
    powerpc: Fix build error for book3e
    powerpc: Context switch the new EBB SPRs
    powerpc: Turn on the EBB H/FSCR bits
    powerpc: Replace CPU_FTR_BCTAR with CPU_FTR_ARCH_207S
    powerpc: Setup BHRB instructions facility in HFSCR for POWER8
    powerpc: Fix interrupt range check on debug exception
    powerpc: Update tlbie/tlbiel as per ISA doc
    powerpc: Print page size info during boot
    powerpc: print both base and actual page size on hash failure
    powerpc: Fix hpte_decode to use the correct decoding for page sizes
    powerpc: Decode the pte-lp-encoding bits correctly.
    powerpc: Use encode avpn where we need only avpn values
    powerpc: Reduce PTE table memory wastage
    powerpc: Move the pte free routines from common header
    powerpc: Reduce the PTE_INDEX_SIZE
    powerpc: Switch 16GB and 16MB explicit hugepages to a different page table format
    powerpc: New hugepage directory format
    powerpc: Don't truncate pgd_index wrongly
    powerpc: Don't hard code the size of pte page
    powerpc: Save DAR and DSISR in pt_regs on MCE
    ...

    Linus Torvalds
     

02 May, 2013

18 commits


01 May, 2013

1 commit

  • Pull trivial tree updates from Jiri Kosina:
    "Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
    code cleanups"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
    mm: Convert print_symbol to %pSR
    gfs2: Convert print_symbol to %pSR
    m32r: Convert print_symbol to %pSR
    iostats.txt: add easy-to-find description for field 6
    x86 cmpxchg.h: fix wrong comment
    treewide: Fix typo in printk and comments
    doc: devicetree: Fix various typos
    docbook: fix 8250 naming in device-drivers
    pata_pdc2027x: Fix compiler warning
    treewide: Fix typo in printks
    mei: Fix comments in drivers/misc/mei
    treewide: Fix typos in kernel messages
    pm44xx: Fix comment for "CONFIG_CPU_IDLE"
    doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
    mmzone: correct "pags" to "pages" in comment.
    kernel-parameters: remove outdated 'noresidual' parameter
    Remove spurious _H suffixes from ifdef comments
    sound: Remove stray pluses from Kconfig file
    radio-shark: Fix printk "CONFIG_LED_CLASS"
    doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
    ...

    Linus Torvalds
     

30 Apr, 2013

10 commits

  • Use preferable function name which implies using a pseudo-random
    number generator.

    Signed-off-by: Akinobu Mita
    Cc: Michal Januszewski
    Cc: Florian Tobias Schandinat
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita
     
  • Signed-off-by: Matus Ujhelyi
    Cc: Grant Likely
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Matus Ujhelyi
     
  • Enable supporting the DT structure of LP855x family devices. If the
    platform data is NULL, the driver tries to parse a DT structure. Then,
    the platform data is copied from the DT. Documentation is added as well.

    Signed-off-by: Milo(Woogyom) Kim
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • The 'load_new_rom_data' was used for checking whether new ROM data should
    be updated or not.

    However, we can decide it with 'size_program' data. If the size is
    greater than 0, it means updating ROM area is required. Otherwise, the
    default ROM data will be used. Therefore, this duplicate platform data
    can be removed.

    Signed-off-by: Milo(Woogyom) Kim
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • The brightness of LP855x devices is controlled by I2C register or PWM
    input . This mode was selected through the platform data, but it can be
    chosen by the driver internally without platform data configuration.

    How to decide the control mode:
    If the PWM period has specific value, the mode is PWM input.
    On the other hand, the mode is register-based.
    This mode selection is done on the _probe().

    Move 'mode' from a header file to the driver private data structure,
    'lp855 x'. And correlated code was replaced.

    Signed-off-by: Milo(Woogyom) Kim
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • Configurable data, backlight device name is set to constant character type.

    Signed-off-by: Milo(Woogyom) Kim
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • Instead of using legacy suspend/resume methods, using newer dev_pm_ops
    structure allows better control over power management. Also, use of
    pm_message_t is deprecated. Thus, it is removed.

    Signed-off-by: Jingoo Han
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jingoo Han
     
  • Instead of using legacy suspend/resume methods, using newer dev_pm_ops
    structure allows better control over power management.

    Signed-off-by: Jingoo Han
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jingoo Han
     
  • Instead of using legacy suspend/resume methods, using newer dev_pm_ops
    structure allows better control over power management.

    Signed-off-by: Jingoo Han
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jingoo Han
     
  • Platform LCD devices may need to do some device-specific initialization
    before they can be used (regulator or GPIO setup, for example), but
    currently the driver does not support any way of doing this. This patch
    adds a probe() callback to plat_lcd_data which platform LCD devices can
    set to indicate that device-specific initialization is needed.

    Signed-off-by: Andrew Bresticker
    Cc: Richard Purdie
    Cc: Florian Tobias Schandinat
    Reviewed-by: Doug Anderson
    Acked-by: Jingoo Han
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Bresticker