1. 29 May, 2014 2 commits
    • Olof Johansson's avatar
      Merge tag 'samsung-clk' of... · f48d5be2
      Olof Johansson authored
      Merge tag 'samsung-clk' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
      
      Merge "Samsung clock updates for 3.16" from Kukjin Kim:
      
      In this time, it is having dependency with arch/arm/ for 3.16,
      I pulled them into samsung tree from Tomasz under agreement from Mike.
      
      - Pull for_3.16/exynos5260 from Tomasz Figa:
      
        "This pull request contains patches preparing Samsung Common Clock Framework
        helpers to support Exynos5260 by adding support for multiple clock providers
        and then adding clock driver for Exynos5260."
      
      - Pull for_3.16/clk_fixes_non_critical from Tomasz Figa:
      
        "This pull requests contains a number of non-critical fixes for Samsung clock
        framework and drivers, including:
        1) a series of fixes for Exynos5420 to correct clock definitions and make the
        driver closer to the documentation,
        2) several missing clocks and clock IDs added to Exynos4, Exynos5250 and
        Exynos5420 drivers,
        3) fix for incorrect initialization of clock table with NULL,
        4) compiler warning fix."
      
      - Pull for_3.16/clk_cleanup from Tomasz Figa:
      
        "This pull requests contains minor clean-up related to Samsung clock
        support, including:
        1) move Kconfig entries of Samsung clock drivers to drivers/clk,
        2) compile drivers/clk/samsung conditionally when COMMON_CLK_SAMSUNG is
        selected,
        3) remove obsolete Kconfig lines after moving s3c24xx to CCF."
      
      - Pull for_3.16/exynos3250 from Tomasz Figa:
      
        "This small pull request contains a patch adding clock driver for Exynos3250,
        which depends on previous pull requests in this series."
      
      - add dt bindings for exynos3250 clock
      - add exynos5800 specific clocks in current exynos5420 clock
      
      Note that this branch is based on s3c24xx ccf branch
      
      * tag 'samsung-clk' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (59 commits)
        clk: exynos5420: Add 5800 specific clocks
        dt-bindings: add documentation for Exynos3250 clock controller
        ARM: S3C24XX: fix merge conflict
        clk: samsung: exynos3250: Add clocks using common clock framework
        drivers: clk: use COMMON_CLK_SAMSUNG for Samsung clock support
        ARM: S3C24XX: move S3C24XX clock Kconfig options to Samsung clock Kconfig file
        ARM: select COMMON_CLK_SAMSUNG for ARCH_EXYNOS and ARCH_S3C64XX
        clk: samsung: add new Kconfig for Samsung common clock option
        ARM: S3C24XX: Remove omitted Kconfig selects and conditionals
        clk: samsung: exynos5420: add more registers to restore list
        clk: samsung: exynos5420: add misc clocks
        clk: samsung: exynos5420: update clocks for MAU Block
        clk: samsung: exynos5420: fix register offset for sclk_bpll
        clk: samsung: exynos5420: correct sysmmu-mfc parent clocks
        clk: samsung: exynos5420: update clocks for FSYS and FSYS2 blocks
        clk: samsung: exynos5420: update clocks for WCORE block
        clk: samsung: exynos5420: update clocks for PERIS and GEN blocks
        clk: samsung: exynos5420: update clocks for PERIC block
        clk: samsung: exynos5420: update clocks for DISP1 block
        clk: samsung: exynos5420: update clocks for G2D and G3D blocks
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      f48d5be2
    • Olof Johansson's avatar
      Merge tag 'exynos-mcpm' of... · dca092f6
      Olof Johansson authored
      Merge tag 'exynos-mcpm' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
      
      Merge "Exynos MCPM support for v3.16" from Kukjin Kim:
      
      - adding MCPM backend support for SMP secondary boot and core switching
      on Samsung's Exynos5420.
      
      Tested on exynos5420-smdk5420 and exynos5420 based chromebook (peach-pit)
      using the "/dev/b.L_switcher" user interface. Secondary core boot-up has
      also been tested on both the boards.
      
      * tag 'exynos-mcpm' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: EXYNOS: Add MCPM call-back functions
        ARM: dts: add CCI node for exynos5420
        ARM: EXYNOS: Add generic cluster power control functions
        ARM: EXYNOS: use generic exynos cpu power control functions
        ARM: EXYNOS: Add generic cpu power control functions for exynos SoCs
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      dca092f6
  2. 26 May, 2014 7 commits
  3. 23 May, 2014 13 commits
  4. 22 May, 2014 9 commits
  5. 21 May, 2014 3 commits
    • Olof Johansson's avatar
      Merge tag 'tegra-for-3.16-soc' of... · 9706c077
      Olof Johansson authored
      Merge tag 'tegra-for-3.16-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc
      
      Merge "ARM: tegra: core code changes for 3.16" from Stephen Warren:
      
      This branch contains just a single patch this time around. Thierry
      enhanced Tegra's restart code to allow programming PMC scratch registers
      to request specific behaviour after reboot. One of the most useful
      options for mainline software is the ability to reboot directly into USB
      recovery mode, which e.g. allows the bootloader to be reflashed.
      
      * tag 'tegra-for-3.16-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
        ARM: tegra: Support reboot modes
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      9706c077
    • Olof Johansson's avatar
      Merge tag 'imx-soc-3.16' of... · 0b3534be
      Olof Johansson authored
      Merge tag 'imx-soc-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
      
      Merge "ARM: imx: soc changes for 3.16" from Shawn Guo:
      
      i.MX SoC changes for 3.16:
       - A few cleanups on mx21ads board file, which should make the later
         conversion to DT a little bit easier.
       - Add some missing clocks and drop unused clk lookups for i.MX1 and
         i.MX27 clock drivers
       - Add initial i.MX SoloX (imx6sx) SoC support
       - Remove mx51_babbage and mach-cpuimx51sd board files, as the
         equivalent DT support is ready for the boards
       - Clean up device tree timer initialization a little bit
       - Add missing i2c4 clock for i.MX6 DualLite/Solo
       - Add missing CKO clock i.MX25
       - Add shared gate clock support for i.MX specific clk_gate2
       - Add low-level debug support for SoC VF610
       - Some random code cleanups and defconfig updates
      
      * tag 'imx-soc-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (33 commits)
        ARM: mx25: Add CLKO support
        ARM: i.MX1 clk: Remove clk_register_clkdev() for unused clocks
        ARM: i.MX1 clk: Add missing clocks
        ARM: imx: add basic imx6sx SoC support
        ARM: imx: add clock driver for imx6sx
        ARM: imx: add low-level debug support for imx6sx
        ARM: mx51: Remove mach-cpuimx51sd board file
        ARM: i.MX: Setup IRQ handler from IRQ driver
        ARM: i.MX27 pca100: remove deprecated IRQF_DISABLED
        ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
        ARM: i.MX: Fix eMMa PrP resource size
        ARM: imx_v4_v5_defconfig: drop CONFIG_COMMON_CLK_DEBUG option
        ARM: i.MX27 clk: Remove clk_register_clkdev() for unused clocks
        ARM: i.MX27 clk: Add missing clocks for MSHC and RTIC
        ARM: imx6q: add the missing esai_ahb clock
        ARM: imx: add shared gate clock support
        ARM: imx: lock is always valid for clk_gate2
        ARM: imx: define struct clk_gate2 on our own
        ARM: i.MX: Remove #ifdef CONFIG_OF
        ARM: imx_v6_v7_defconfig: enable option CONFIG_LOCALVERSION_AUTO
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      0b3534be
    • Olof Johansson's avatar
      Merge tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux into next/soc · 16ae66cc
      Olof Johansson authored
      Merge "Allwinner SoCs core additions for 3.16" from Maxime Ripard:
      
      Refactor the Kconfig options to have one Kconfig option per machine.
      
      * tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux:
        ARM: sunxi: select MFD_SUN6I_PRCM when sun6i arch support is enabled
        ARM: sunxi: Split the various SoCs support in Kconfig
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      16ae66cc
  6. 20 May, 2014 6 commits