1. 30 Nov, 2012 4 commits
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.8/devel-prcm-signed' of... · 9121dfca
      Olof Johansson authored
      Merge tag 'omap-for-v3.8/devel-prcm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm2
      
      From Tony Lindgren:
      
      omap prcm changes via Paul Walmsley <paul@pwsan.com>:
      
      Some miscellaneous OMAP hwmod changes for 3.8, along with a PRM
      change needed for one of the hwmod patches to function.
      
      Basic test logs for this branch on top of Tony's
      omap-for-v3.8/clock branch at commit
      558a0780 are here:
      
      http://www.pwsan.com/omap/testlogs/hwmod_devel_a_3.8/20121121161522/
      
      However, omap-for-v3.8/clock at 558a0780 does not include some fixes
      that are needed for a successful test.  With several reverts,
      fixes, and workarounds applied, the following test logs were
      obtained:
      
      http://www.pwsan.com/omap/testlogs/TEST_hwmod_devel_a_3.8/20121121162719/
      
      which indicate that the series tests cleanly.
      
      * tag 'omap-for-v3.8/devel-prcm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (49 commits)
        ARM: OMAP2+: omap_device: Correct resource handling for DT boot
        ARM: OMAP2+: hwmod: Add possibility to count hwmod resources based on type
        ARM: OMAP2+: hwmod: Add support for per hwmod/module context lost count
        ARM: OMAP2+: PRM: initialize some PRM functions early
        ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts
        ARM: OMAP2xxx: clock: drop obsolete clock data
        ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts
        ARM: OMAP3+: DPLL: drop !CONFIG_COMMON_CLK sections
        ARM: AM33xx: clock: drop obsolete clock data
        ARM: OMAP3xxx: clk: drop obsolete clock data
        ARM: OMAP3: clock: Cleanup !CONFIG_COMMON_CLK parts
        ARM: OMAP44xx: clock: drop obsolete clock data
        ARM: OMAP4: clock: Cleanup !CONFIG_COMMON_CLK parts
        ARM: OMAP: hwmod: Cleanup !CONFIG_COMMON_CLK parts
        ARM: OMAP: clock: Switch to COMMON clk
        ARM: OMAP2: clock: Add 24xx data using common struct clk
        ARM: OMAP3: clock: Add 3xxx data using common struct clk
        ARM: AM33XX: clock: add clock data in common clock format
        ARM: OMAP4: clock: Add 44xx data using common struct clk
        ARM: OMAP2+: clock: add OMAP CCF convenience macros to mach-omap2/clock.h
        ...
      
      Some context conflicts due to nearby changes resolved in
      arch/arm/mach-omap2/io.c.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      9121dfca
    • Olof Johansson's avatar
      Merge branch 'next/dt' into next/pm2 · 77f9db89
      Olof Johansson authored
      By Lee Jones (42) and others
      via Olof Johansson (13) and others
      * next/dt: (249 commits)
        ARM: ux500: Rename dbx500 cpufreq code to be more generic
        ARM: dts: add missing ux500 device trees
        ARM: ux500: Stop registering the PCM driver from platform code
        ARM: ux500: Move board specific GPIO info out to subordinate DTS files
        ARM: ux500: Disable the MMCI gpio-regulator by default
        ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
        ARM: Kirkwood: Add support LED of OpenBlocks A6
        ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
        ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
        ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
        ARM: kirkwood: Add support DT of second I2C bus
        ARM: kirkwood: Convert mplcec4 board to pinctrl
        ARM: Kirkwood: Convert km_kirkwood to pinctrl
        ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
        ARM: Kirkwood: Convert IX2-200 to pinctrl.
        ARM: Kirkwood: Convert lsxl boards to pinctrl.
        ARM: Kirkwood: Convert ib62x0 to pinctrl.
        ARM: Kirkwood: Convert GoFlex Net to pinctrl.
        ARM: Kirkwood: Convert dreamplug to pinctrl.
        ARM: Kirkwood: Convert dockstar to pinctrl.
        ...
      77f9db89
    • Olof Johansson's avatar
      Merge branch 'next/cleanup' into next/pm2 · 68fb3170
      Olof Johansson authored
      By Tony Lindgren (36) and others
      via Tony Lindgren (22) and others
      * next/cleanup: (303 commits)
        ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
        ARM: OMAP3: cm-t3517: use GPTIMER for system clock
        ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
        ARM: SAMSUNG: use devm_ functions for ADC driver
        ARM: EXYNOS: no duplicate mask/unmask in eint0_15
        ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443
        ARM: EXYNOS: Remove i2c0 resource information and setting of device names
        ARM: Kirkwood: checkpatch cleanups
        ARM: Kirkwood: Fix sparse warnings.
        ARM: Kirkwood: Remove unused includes
        ARM: kirkwood: cleanup lsxl board includes
        ARM: integrator: use BUG_ON where possible
        ARM: integrator: push down SC dependencies
        ARM: integrator: delete static UART1 mapping
        ARM: integrator: delete SC mapping on the CP
        ARM: integrator: remove static CP syscon mapping
        ARM: integrator: remove static AP syscon mapping
        ARM: integrator: hook the CP into the SoC bus
        ARM: integrator: hook the AP into the SoC bus
        ARM: OMAP2+: Fix compiler warning for 32k timer
        ...
      68fb3170
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.8/cleanup-timer-signed' of... · c8a1cecc
      Olof Johansson authored
      Merge tag 'omap-for-v3.8/cleanup-timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
      
      Timer clean-up to get us closer to moving timer code to drivers,
      and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board
      or devicetree provided timer configuration.
      
      Note that these changes are on top of the recent timer fixes.
      
      By Jon Hunter (32) and others
      via Tony Lindgren
      * tag 'omap-for-v3.8/cleanup-timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (71 commits)
        ARM: OMAP3: cm-t3517: use GPTIMER for system clock
        ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
        ARM: OMAP2+: Fix compiler warning for 32k timer
        ARM: OMAP: Remove unnecessary inclusion of dmtimer.h
        ARM: OMAP: Add platform data header for DMTIMERs
        ARM: OMAP: Remove unnecessary omap_dm_timer structure declaration
        ARM: OMAP2+: Remove unnecessary local variable in timer code
        ARM: OMAP: Don't store timers physical address
        ARM: OMAP: Define omap_dm_timer_prepare function as static
        ARM: OMAP: Clean-up dmtimer reset code
        ARM: OMAP: Remove __omap_dm_timer_set_source function
        ARM: OMAP: Remove unnecessary call to clk_get()
        ARM: OMAP: Add dmtimer interrupt disable function
        ARM: OMAP: Fix spurious interrupts when using timer match feature
        ARM: OMAP: Don't restore DMTIMER interrupt status register
        ARM: OMAP: Don't restore of DMTIMER TISTAT register
        ARM: OMAP: Fix dmtimer reset for timer1
        ARM: OMAP2+: Don't use __omap_dm_timer_reset()
        ARM: OMAP2/3: Define HWMOD software reset status for DMTIMERs
        ARM: OMAP3: Correct HWMOD DMTIMER SYSC register declarations
        ...
      
      Change/change conflict in arch/arm/mach-omap2/board-cm-t3517.c.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      c8a1cecc
  2. 27 Nov, 2012 6 commits
  3. 26 Nov, 2012 12 commits
    • Arnd Bergmann's avatar
      Merge tag 'integrator-for-arm-soc' of... · 4c929c8a
      Arnd Bergmann authored
      Merge tag 'integrator-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup
      
      From Linus Walleij <linus.walleij@linaro.org>:
      
      This series will do the following:
      - Switch the Integrator/AP and /CP to use the SoC bus
        when booting from device tree.
      - Group all devices on the SoC below this bus so as to
        set a good example of how to do this. The bus was
        invented by Lee Jones, let's show how it's to be used
        on a DT:ed SoC.
      - Fetch the special system controller offsets from two
        special device tree nodes for each case and replace
        the static mappings with these at boot.
      - Move some static remaps to the ATAG-only code path
        and delete some static maps that aren't used.
      - Push dependencies on system controller remaps down
        to the Integrator/AP board file and the PCIv3 driver
        respectively and use only dynamic remappings.
      - Fix up conditional BUG() usage in the PCIv3 driver
        to be simpler and more to the point.
      
      * tag 'integrator-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
        ARM: integrator: use BUG_ON where possible
        ARM: integrator: push down SC dependencies
        ARM: integrator: delete static UART1 mapping
        ARM: integrator: delete SC mapping on the CP
        ARM: integrator: remove static CP syscon mapping
        ARM: integrator: remove static AP syscon mapping
        ARM: integrator: hook the CP into the SoC bus
        ARM: integrator: hook the AP into the SoC bus
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      4c929c8a
    • Tony Lindgren's avatar
      Merge tag 'omap-devel-a-for-3.8' of... · 8b9c1ac2
      Tony Lindgren authored
      Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/devel-pcrm
      
      Some miscellaneous OMAP hwmod changes for 3.8, along with a PRM
      change needed for one of the hwmod patches to function.
      
      Basic test logs for this branch on top of Tony's
      omap-for-v3.8/clock branch at commit
      558a0780 are here:
      
      http://www.pwsan.com/omap/testlogs/hwmod_devel_a_3.8/20121121161522/
      
      However, omap-for-v3.8/clock at 558a0780 does not include some fixes
      that are needed for a successful test.  With several reverts,
      fixes, and workarounds applied, the following test logs were
      obtained:
      
      http://www.pwsan.com/omap/testlogs/TEST_hwmod_devel_a_3.8/20121121162719/
      
      which indicate that the series tests cleanly.
      8b9c1ac2
    • Olof Johansson's avatar
      Merge branch 'orion/dt' into next/dt · 61da823a
      Olof Johansson authored
      Merge in orion's cleanup branch together with the DT contents.  Ideally
      the cleanup branch should have been the base for the DT branch to avoid
      these, but that was missed when first merging. So we're doing it now to
      reduce the amount of silly conflicts due to internal tree organization.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      61da823a
    • Olof Johansson's avatar
      Merge branch 'orion/cleanup' into orion/dt · 52cfa7e5
      Olof Johansson authored
      Merge in the cleanups that should have been used as the base of the DT
      branch instead of letting the conflicts be exposed all the way up to
      the toplevel merges.
      
      All of these are caused by cleanups being done both in the cleanup branch
      and the dt branch, resulting in remove/remove conflicts of header files.
      
      By Andrew Lunn (3) and others
      via Jason Cooper
      * orion/cleanup:
        ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
        ARM: Kirkwood: checkpatch cleanups
        ARM: Kirkwood: Fix sparse warnings.
        ARM: Kirkwood: Remove unused includes
        ARM: kirkwood: cleanup lsxl board includes
      
      Remove/remove conflicts in:
      	arch/arm/mach-kirkwood/board-dockstar.c
      	arch/arm/mach-kirkwood/board-goflexnet.c
      	arch/arm/mach-kirkwood/board-lsxl.c
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      52cfa7e5
    • Olof Johansson's avatar
      Merge tag 'orion_dt_for_3.8' of git://git.infradead.org/users/jcooper/linux into next/dt · 0dfeada9
      Olof Johansson authored
      From Jason Cooper:
      orion dt for v3.8
      
       - ehci-orion dt binding
       - gpio-poweroff
       - use dt regulators
       - move mpp to DT/pinctrl
      
      Depends on:
      
       - orion/boards
      
          - merge conflicts
             - keep all 'select's in Kconfig
             - remove all #includes in board-*.c
      
       - pinctrl/devel up to:
      
          - 06763c74 pinctrl: mvebu: move to its own directory
      
      * tag 'orion_dt_for_3.8' of git://git.infradead.org/users/jcooper/linux: (211 commits)
        ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
        ARM: Kirkwood: Add support LED of OpenBlocks A6
        ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
        ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
        ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
        ARM: kirkwood: Add support DT of second I2C bus
        ARM: kirkwood: Convert mplcec4 board to pinctrl
        ARM: Kirkwood: Convert km_kirkwood to pinctrl
        ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
        ARM: Kirkwood: Convert IX2-200 to pinctrl.
        ARM: Kirkwood: Convert lsxl boards to pinctrl.
        ARM: Kirkwood: Convert ib62x0 to pinctrl.
        ARM: Kirkwood: Convert GoFlex Net to pinctrl.
        ARM: Kirkwood: Convert dreamplug to pinctrl.
        ARM: Kirkwood: Convert dockstar to pinctrl.
        ARM: Kirkwood: Convert dnskw to pinctrl
        ARM: Kirkwood: Convert iConnect to pinctrl.
        ARM: Kirkwood: Convert TS219 to pinctrl.
        ARM: Kirkwood: Add DTSI files for pinctrl
        ARM: Kirkwood: Make use of mvebu pincltl and gpio drivers
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      0dfeada9
    • Olof Johansson's avatar
      Merge tag 'orion_cleanup_for_3.8' of git://git.infradead.org/users/jcooper/linux into next/cleanup · d98eb5cf
      Olof Johansson authored
      From Jason Cooper:
      orion cleanup for v3.8
      
       - remove unused includes in kirkwood
       - fix sparse warnings in kirkwood
       - checkpatch cleanup in kirkwood
       - use common code in pcie on kirkwood
      
      * tag 'orion_cleanup_for_3.8' of git://git.infradead.org/users/jcooper/linux:
        ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
        ARM: Kirkwood: checkpatch cleanups
        ARM: Kirkwood: Fix sparse warnings.
        ARM: Kirkwood: Remove unused includes
        ARM: kirkwood: cleanup lsxl board includes
      d98eb5cf
    • Olof Johansson's avatar
      Merge branch 'next/dt-samsung-2' of... · d408c5dc
      Olof Johansson authored
      Merge branch 'next/dt-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
      
      From Kukjin Kim:
      Here is second Samsung DT stuff for v3.8.
      
      This is including power domain DT support for exynos and Google ARM
      Chromebook, Snow board and exynos4210-origen updates.
      
      * 'next/dt-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: dts: Use drive strength 3 for SD pins for exynos4
        ARM: dts: Set up power domains for exynos4
        ARM: EXYNOS: Bind devices to power domains using DT
        ARM: EXYNOS: Fix power domain name initialization
        ARM: EXYNOS: Detect power domain state on registration from DT
        ARM: dts: Add vmmc fixed voltage regulator for exynos4210-origen
        ARM: dts: Update sdhci nodes for current bindings for exynos4210-origen
        ARM: dts: Update for pinctrl-samsung driver for exynos4210-origen
        ARM: dts: Split memory sections for exynos4210-origen
        ARM: EXYNOS: add all i2c busses to auxdata for DT
        ARM: dts: Add aliases for i2c controller for exynos4
        ARM: dts: Add board dts file for Snow board (ARM Chromebook)
        ARM: dts: Move the dwmmc aliases from smdk5250 dts to exynos
      
      Add/add conflicts resolved in arch/arm/boot/dts/exynos5250-smdk5250.dts
      and arch/arm/mach-exynos/mach-exynos5-dt.c.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      d408c5dc
    • Olof Johansson's avatar
      Merge tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt · 8d2282a7
      Olof Johansson authored
      From Shawn Guo:
      They are a few mxs dts updates coming a little bit late.  I'm sending
      them as the second mxs/dt pull request for 3.8.  Please consider to
      pull.
      
      * tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: dts: mxs: add oled support for the cfa-10036
        ARM: mxs: Add SchulerControl SPS1 DTS file
        ARM: imx23-olinuxino: Add spi support
      8d2282a7
    • Olof Johansson's avatar
      Merge tag 'v3.7-rc7' into next/cleanup · 0f9cb211
      Olof Johansson authored
      Merging in mainline back to next/cleanup since it has collected a few
      conflicts between fixes going upstream and some of the cleanup patches.
      Git doesn't auto-resolve some of them, and they're mostly noise so let's
      take care of it locally.
      
      Conflicts are in:
      	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
      	arch/arm/plat-omap/i2c.c
      	drivers/video/omap2/dss/dss.c
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      0f9cb211
    • Linus Torvalds's avatar
      Linux 3.7-rc7 · 9489e9dc
      Linus Torvalds authored
      9489e9dc
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 08e627b5
      Linus Torvalds authored
      Pull powerpc EEH bugfixes from Benjamin Herrenschmidt.
      
      Two one-liner fixes for the new EEH code.
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/eeh: Do not invalidate PE properly
        powerpc/pseries: Fix oops with MSIs when missing EEH PEs
      08e627b5
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · c2a65d3d
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "Three issues fixed accross the field:
      
         - Some functions that were recently outlined as part of a preemption
           fix were causing problems with function tracing.
         - The recently merged in-kernel MPI library uses very outdated
           headers that contain MIPS-specific code which won't build on with
           gcc 4.4 or newer.
         - The MIPS non-NUMA memory initialization was making only a very
           half-baked attempt at merging adjacent memory ranges.  This kept
           the code simple enough but is now causing issues with kexec."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MPI: Fix compilation on MIPS with GCC 4.4 and newer
        MIPS: Fix crash that occurs when function tracing is enabled
        MIPS: Merge overlapping bootmem ranges
      c2a65d3d
  4. 25 Nov, 2012 1 commit
  5. 24 Nov, 2012 17 commits