1. 29 May, 2012 12 commits
  2. 28 May, 2012 13 commits
  3. 27 May, 2012 5 commits
  4. 26 May, 2012 10 commits
    • Linus Torvalds's avatar
      Merge branch 'generic-string-functions' · 1e2aec87
      Linus Torvalds authored
      This makes <asm/word-at-a-time.h> actually live up to its promise of
      allowing architectures to help tune the string functions that do their
      work a word at a time.
      
      David had already taken the x86 strncpy_from_user() function, modified
      it to work on sparc, and then done the extra work to make it generically
      useful.  This then expands on that work by making x86 use that generic
      version, completing the circle.
      
      But more importantly, it fixes up the word-at-a-time interfaces so that
      it's now easy to also support things like strnlen_user(), and pretty
      much most random string functions.
      
      David reports that it all works fine on sparc, and Jonas Bonn reported
      that an earlier version of this worked on OpenRISC too.  It's pretty
      easy for architectures to add support for this and just replace their
      private versions with the generic code.
      
      * generic-string-functions:
        sparc: use the new generic strnlen_user() function
        x86: use the new generic strnlen_user() function
        lib: add generic strnlen_user() function
        word-at-a-time: make the interfaces truly generic
        x86: use generic strncpy_from_user routine
      1e2aec87
    • Lekensteyn's avatar
      builddeb: include autogenerated header files · 19a4b988
      Lekensteyn authored
      After 303395ac
      
      , some headers are
      autogenerated. Include these autogenerated headers (mainly
      unistd_32_ia32.h) in out-of-tree builds to allow DKMS modules to be
      built succesfully.
      Signed-off-by: default avatarPeter Lekensteyn <lekensteyn@gmail.com>
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      19a4b988
    • Linus Torvalds's avatar
      Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux · ae32adc1
      Linus Torvalds authored
      Pull i2c-embedded changes from Wolfram Sang:
       "Major changes:
      
         - lots of devicetree additions for existing drivers.  I tried hard to
           make sure the bindings are proper.  In more complicated cases, I
           requested acks from people having more experience with them than
           me.  That took a bit of extra time and also some time went into
           discussions with developers about what bindings are and what not.
           I have the feeling that the workflow with bindings should be
           improved to scale better.  I will spend some more thought on
           this...
      
         - i2c-muxes are succesfully used meanwhile, so we dropped
           EXPERIMENTAL for them and renamed the drivers to a standard pattern
           to match the rest of the subsystem.  They can also be used with
           devicetree now.
      
         - ixp2000 was removed since the whole platform goes away.
      
         - cleanups (strlcpy instead of strcpy, NULL instead of 0)
      
         - The rest is typical driver fixes I assume.
      
        All patches have been in linux-next at least since v3.4-rc6."
      
      Fixed up trivial conflict in arch/arm/mach-lpc32xx/common.c due to the
      same patch already having come in through the arm/soc trees, with
      additional patches on top of it.
      
      * 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (35 commits)
        i2c: davinci: Free requested IRQ in remove
        i2c: ocores: register OF i2c devices
        i2c: tegra: notify transfer-complete after clearing status.
        I2C: xiic: Add OF binding support
        i2c: Rename last mux driver to standard pattern
        i2c: tegra: fix 10bit address configuration
        i2c: muxes: rename first set of drivers to a standard pattern
        of/i2c: implement of_find_i2c_adapter_by_node
        i2c: implement i2c_verify_adapter
        i2c-s3c2410: Add HDMIPHY quirk for S3C2440
        i2c-s3c2410: Rework device type handling
        i2c: muxes are not EXPERIMENTAL anymore
        i2c/of: Automatically populate i2c mux busses from device tree data.
        i2c: Add a struct device * parameter to i2c_add_mux_adapter()
        of/i2c: call i2c_verify_client from of_find_i2c_device_by_node
        i2c: designware: Add clk_{un}prepare() support
        i2c: designware: add PM support
        i2c: ixp2000: remove driver
        i2c: pnx: add device tree support
        i2c: imx: don't use strcpy but strlcpy
        ...
      ae32adc1
    • Linus Torvalds's avatar
      Merge tag 'cleanup-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f465d145
      Linus Torvalds authored
      Pull sweeping late_initcall cleanup for arm-soc from Olof Johansson:
       "This is a patch series from Shawn Guo that moves from individual
        late_initcalls() to using a member in the machine structure to invoke
        a platform's late initcalls.
      
        This cleanup is a step in the move towards multiplatform kernels since
        it would reduce the need to check for compatible platforms in each and
        every initcall."
      
      Fix up trivial conflicts in arch/arm/mach-{exynos/mach-universal_c210.c,
      imx/mach-cpuimx51.c, omap2/board-generic.c} due to changes nearby (and,
      in the case of cpuimx51.c the board support being deleted)
      
      * tag 'cleanup-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: ux500: use machine specific hook for late init
        ARM: tegra: use machine specific hook for late init
        ARM: shmobile: use machine specific hook for late init
        ARM: sa1100: use machine specific hook for late init
        ARM: s3c64xx: use machine specific hook for late init
        ARM: prima2: use machine specific hook for late init
        ARM: pnx4008: use machine specific hook for late init
        ARM: omap2: use machine specific hook for late init
        ARM: omap1: use machine specific hook for late init
        ARM: msm: use machine specific hook for late init
        ARM: imx: use machine specific hook for late init
        ARM: exynos: use machine specific hook for late init
        ARM: ep93xx: use machine specific hook for late init
        ARM: davinci: use machine specific hook for late init
        ARM: provide a late_initcall hook for platform initialization
      f465d145
    • Linus Torvalds's avatar
      Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 30b84288
      Linus Torvalds authored
      Pull arm-soc: soc specific changes (part 2) from Olof Johansson:
       "This adds support for the spear13xx platform, which has first been
        under review a long time ago and finally been completed after generic
        spear work has gone into the clock, dt and pinctrl branches.
      
        Also a number of updates for the samsung socs are part of this branch."
      
      Fix up trivial conflicts in drivers/gpio/gpio-samsung.c that look much
      worse than they are: the exonys5 init code was refactored in commit
      fd454997 ("gpio: samsung: refactor gpiolib init for exynos4/5"), and
      then commit f10590c9 ("ARM: EXYNOS: add GPC4 bank instance") added a
      new gpio chip define and did tiny updates to the init code.
      
      So the conflict diff looks like hell, but it's actually a fairly simple
      change.
      
      * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
        ARM: exynos: fix building with CONFIG_OF disabled
        ARM: EXYNOS: Add AUXDATA for i2c controllers
        ARM: dts: Update device tree source files for EXYNOS5250
        ARM: EXYNOS: Add device tree support for interrupt combiner
        ARM: EXYNOS: Add irq_domain support for interrupt combiner
        ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5
        ARM: EXYNOS: update irqs for EXYNOS5250 SoC
        ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll
        ARM: EXYNOS: add GPC4 bank instance
        ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition
        ARM: EXYNOS: Modify the GIC physical address for static io-mapping
        ARM: EXYNOS: Add watchdog timer clock instance
        pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res
        SPEAr: Update MAINTAINERS and Documentation
        SPEAr13xx: Add defconfig
        SPEAr13xx: Add compilation support
        SPEAr13xx: Add dts and dtsi files
        pinctrl: Add SPEAr13xx pinctrl drivers
        pinctrl: SPEAr: Create macro for declaring GPIO PINS
        SPEAr13xx: Add common clock framework support
        ...
      30b84288
    • Linus Torvalds's avatar
      Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 84a442b9
      Linus Torvalds authored
      Pull arm-soc device tree conversions (part 2) from Olof Johansson:
       "These continue the device tree work from part 1, this set is for the
        tegra, mxs and imx platforms, all of which have dependencies on clock
        or pinctrl changes submitted earlier."
      
      Fix up trivial conflicts due to nearby changes in
      drivers/{gpio/gpio,i2c/busses/i2c}-mxs.c
      
      * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
        ARM: dt: tegra: invert status=disable vs status=okay
        ARM: dt: tegra: consistent basic property ordering
        ARM: dt: tegra: sort nodes based on bus order
        ARM: dt: tegra: remove duplicate device_type property
        ARM: dt: tegra: consistenly use lower-case for hex constants
        ARM: dt: tegra: format regs properties consistently
        ARM: dt: tegra: gpio comment cleanup
        ARM: dt: tegra: remove unnecessary unit addresses
        ARM: dt: tegra: whitespace cleanup
        ARM: dt: tegra cardhu: fix typo in SDHCI node name
        ARM: dt: tegra: cardhu: register core regulator tps62361
        ARM: dt: tegra30.dtsi: Add SMMU node
        ARM: dt: tegra20.dtsi: Add GART node
        ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes
        ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes
        ARM: dt: tegra: Add device tree support for AHB
        ARM: dts: enable audio support for imx28-evk
        ARM: dts: enable i2c device for imx28-evk
        i2c: mxs: add device tree probe support
        ARM: dts: enable mmc for imx28-evk
        ...
      84a442b9
    • Linus Torvalds's avatar
      Merge tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 39b6cc66
      Linus Torvalds authored
      Pull arm-soc stmp-dev library code from Olof Johansson:
       "A number of devices are using a common register layout, this adds
        support code for it in lib/stmp_device.c so we do not need to
        duplicate it in each driver."
      
      Fix up trivial conflicts in drivers/i2c/busses/i2c-mxs.c and
      lib/Makefile
      
      * tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        i2c: mxs: use global reset function
        lib: add support for stmp-style devices
      39b6cc66
    • Linus Torvalds's avatar
      Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 27953437
      Linus Torvalds authored
      Pull arm-soc clock driver changes from Olof Johansson:
       "The new clock subsystem was merged in linux-3.4 without any users,
        this now moves the first three platforms over to it: imx, mxs and
        spear.
      
        The series also contains the changes for the clock subsystem itself,
        since Mike preferred to have it together with the platforms that
        require these changes, in order to avoid interdependencies and
        conflicts."
      
      Fix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code
      removed in one branch, added OF support in another) and
      drivers/dma/imx-sdma.c (independent changes next to each other).
      
      * tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)
        clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().
        clk: Provide dummy clk_unregister()
        SPEAr: Update defconfigs
        SPEAr: Add SMI NOR partition info in dts files
        SPEAr: Switch to common clock framework
        SPEAr: Call clk_prepare() before calling clk_enable
        SPEAr: clk: Add General Purpose Timer Synthesizer clock
        SPEAr: clk: Add Fractional Synthesizer clock
        SPEAr: clk: Add Auxiliary Synthesizer clock
        SPEAr: clk: Add VCO-PLL Synthesizer clock
        SPEAr: Add DT bindings for SPEAr's timer
        ARM i.MX: remove now unused clock files
        ARM: i.MX6: implement clocks using common clock framework
        ARM i.MX35: implement clocks using common clock framework
        ARM i.MX5: implement clocks using common clock framework
        ARM: Kirkwood: Replace clock gating
        ARM: Orion: Audio: Add clk/clkdev support
        ARM: Orion: PCIE: Add support for clk
        ARM: Orion: XOR: Add support for clk
        ARM: Orion: CESA: Add support for clk
        ...
      27953437
    • Linus Torvalds's avatar
      Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 2c757fd5
      Linus Torvalds authored
      Pull arm-soc cleanups (part 2) from Olof Johansson:
       "More cleanups, continuing an earlier set with omap and samsung
        specific cleanups.  These could not go into the first set because they
        have dependencies on various other series that in turn depend on the
        first cleanups."
      
      Fixed up conflicts in arch/arm/plat-omap/counter_32k.c due to commit
      bd0493ea: "move read_{boot,persistent}_clock to the architecture
      level" that changed how the persistent clocks were handled.  And trivial
      conflicts in arch/arm/mach-omap1/common.h due to just independent
      changes close to each other.
      
      * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (35 commits)
        ARM: SAMSUNG: merge plat-s5p into plat-samsung
        ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig
        ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into plat-samsung
        ARM: SAMSUNG: move platform device for s5p uart into plat-samsung
        ARM: SAMSUNG: move hr timer for common s5p into plat-samsung
        ARM: SAMSUNG: move pm part for common s5p into plat-samsung
        ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung
        ARM: SAMSUNG: move clock part for common s5p into plat-samsung
        ARM: S3C24XX: Use common macro to define resources on dev-uart.c
        ARM: S3C24XX: move common clock init into common.c
        ARM: S3C24XX: move common power-management code to mach-s3c24xx
        ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c
        ARM: S3C24XX: move plat-s3c24xx/cpu.c
        ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX
        ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX
        GPMC: add ECC control definitions
        ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore
        ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx
        ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505
        ARM: OMAP1: Pass dma request lines in platform data to MMC driver
        ...
      2c757fd5
    • Linus Torvalds's avatar
      Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · ce53044c
      Linus Torvalds authored
      Pull arm-soc driver specific updates from Olof Johansson:
       "These changes are specific to some driver that may be used by multiple
        boards or socs.  The most significant change in here is the move of
        the samsung iommu code from a platform specific in-kernel interface to
        the generic iommu subsystem."
      
      Fix up trivial conflicts in arch/arm/mach-exynos/Kconfig
      
      * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
        mmc: dt: Consolidate DT bindings
        iommu/exynos: Add iommu driver for EXYNOS Platforms
        ARM: davinci: optimize the DMA ISR
        ARM: davinci: implement DEBUG_LL port choice
        ARM: tegra: Add SMMU enabler in AHB
        ARM: tegra: Add Tegra AHB driver
        Input: pxa27x_keypad add choice to set direct_key_mask
        Input: pxa27x_keypad direct key may be low active
        Input: pxa27x_keypad bug fix for direct_key_mask
        Input: pxa27x_keypad keep clock on as wakeup source
        ARM: dt: tegra: pinmux changes for USB ULPI
        ARM: tegra: add USB ULPI PHY reset GPIO to device tree
        ARM: tegra: don't hard-code USB ULPI PHY reset_gpio
        ARM: tegra: change pll_p_out4's rate to 24MHz
        ARM: tegra: fix pclk rate
        ARM: tegra: reparent sclk to pll_c_out1
        ARM: tegra: Add pllc clock init table
        ARM: dt: tegra cardhu: basic audio support
        ARM: dt: tegra30.dtsi: Add audio-related nodes
        ARM: tegra: add AUXDATA required for audio
        ...
      ce53044c