03 Jun, 2014

4 commits

  • Pull ARM SoC devicetree updates from Olof Johansson:
    "As with previous release, this continues to be among the largest
    branches we merge, with lots of new contents.

    New things for this release are among other things:

    - DTSI contents for the new SoCs supported in 3.16 (see SoC pull request)
    - Qualcomm APQ8064 and APQ8084 SoCs and eval boards
    - Nvidia Jetson TK1 development board (Tegra T124-based)

    Two new SoCs that didn't need enough new platform code to stand out
    enough for me to notice when writing the SoC tag, but that adds new DT
    contents are:

    - TI DRA72
    - Marvell Berlin 2Q"

    * tag 'dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (500 commits)
    ARM: dts: add secure firmware support for exynos5420-arndale-octa
    ARM: dts: add pmu sysreg node to exynos3250
    ARM: dts: correct the usb phy node in exynos5800-peach-pi
    ARM: dts: correct the usb phy node in exynos5420-peach-pit
    ARM: dts: add dts files for exynos5410 and exynos5410-smdk5410
    ARM: dts: add dts files for exynos3250 SoC
    ARM: dts: add mfc node for exynos5800
    ARM: dts: add Vbus regulator for USB 3.0 on exynos5800-peach-pi
    ARM: dts: enable fimd for exynos5800-peach-pi
    ARM: dts: enable display controller for exynos5800-peach-pi
    ARM: dts: enable hdmi for exynos5800-peach-pi
    ARM: dts: add dts file for exynos5800-peach-pi board
    ARM: dts: add dts file for exynos5800 SoC
    ARM: dts: add dts file for exynos5260-xyref5260 board
    ARM: dts: add dts files for exynos5260 SoC
    ARM: dts: update watchdog node name in exynos5440
    ARM: dts: use key code macros on Origen and Arndale boards
    ARM: dts: enable RTC and WDT nodes on Origen boards
    ARM: dts: qcom: Add APQ8084-MTP board support
    ARM: dts: qcom: Add APQ8084 SoC support
    ...

    Linus Torvalds
     
  • Pull ARM SoC board support updates from Olof Johansson:
    "The bulk of this branch is updates for Renesas Shmobile. They are
    still doing some enablement for classic boards first, and then come up
    with DT bindings when they've had a chance to learn more about the
    hardware. Not necessarily a bad way to go about it, and they're
    looking at moving some of the temporary board code resulting from it
    to drivers/staging instead to avoid the churn here.

    As a result of the shmobile clock cleanups, we end up merging quite a
    bit of SH code here as well. We ended up merging it here instead of
    in the cleanup branch due to the other board changes depending on it"

    * tag 'boards-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (130 commits)
    ARM: davinci: remove checks for CONFIG_USB_MUSB_PERIPHERAL
    ARM: add drivers for Colibri T30 to multi_v7_defconfig
    ARM: shmobile: Remove Genmai reference DTS
    ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB
    ARM: shmobile: Sync Genmai DTS with Genmai reference DTS
    ARM: shmobile: genmai-reference: Remove legacy clock support
    ARM: shmobile: Remove non-multiplatform Genmai reference support
    ARM: configs: enable XHCI mvebu support in multi_v7_defconfig
    ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP
    ARM: OMAP: AM3517EVM: remove check for CONFIG_PANEL_SHARP_LQ043T1DG01
    ARM: OMAP: SX1: remove check for CONFIG_SX1_OLD_FLASH
    ARM: OMAP: remove some dead code
    ARM: OMAP: omap3stalker: remove two Kconfig macros
    ARM: tegra: tegra_defconfig updates
    ARM: shmobile: r7s72100: use workaround for non DT-clocks
    ARM: shmobile: Add forward declaration of struct clk to silence warning
    ARM: shmobile: r7s72100: remove SPI DT clocks from legacy clock support
    ARM: shmobile: r7s72100: add spi clocks to dtsi
    ARM: shmobile: r7s72100: remove I2C DT clocks from legacy clock support
    ARM: shmobile: r7s72100: add i2c clocks to dtsi
    ...

    Linus Torvalds
     
  • Pull part one of ARM SoC updates from Olof Johansson:
    "A quite large set of SoC updates this cycle. In no particular order:

    - Multi-cluster power management for Samsung Exynos, adding support
    for big.LITTLE CPU switching on EXYNOS5

    - SMP support for Marvell Armada 375 and 38x

    - SMP rework on Allwinner A31

    - Xilinx Zynq support for SOC_BUS, big endian

    - Marvell orion5x platform cleanup, modernizing the implementation
    and moving to DT.

    - _Finally_ moving Samsung Exynos over to support MULTIPLATFORM, so
    that their platform can be enabled in the same kernel binary as
    most of the other v7 platforms in the tree. \o/

    The work isn't quite complete, there's some driver fixes still
    needed, but the basics now work.

    New SoC support added:

    - Freescale i.MX6SX

    - LSI Axxia AXM55xx SoCs

    - Samsung EXYNOS 3250, 5260, 5410, 5420 and 5800

    - STi STIH407

    plus a large set of various smaller updates for different platforms.
    I'm probably missing some important one here"

    * tag 'soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (281 commits)
    ARM: exynos: don't run exynos4 l2x0 setup on other platforms
    ARM: exynos: Fix "allmodconfig" build errors in mcpm and hotplug
    ARM: EXYNOS: mcpm rename the power_down_finish
    ARM: EXYNOS: Enable mcpm for dual-cluster exynos5800 SoC
    ARM: EXYNOS: Enable multi-platform build support
    ARM: EXYNOS: Consolidate Kconfig entries
    ARM: EXYNOS: Add support for EXYNOS5410 SoC
    ARM: EXYNOS: Support secondary CPU boot of Exynos3250
    ARM: EXYNOS: Add Exynos3250 SoC ID
    ARM: EXYNOS: Add 5800 SoC support
    ARM: EXYNOS: initial board support for exynos5260 SoC
    clk: exynos5410: register clocks using common clock framework
    ARM: debug: qcom: add UART addresses to Kconfig help for APQ8084
    ARM: sunxi: allow building without reset controller
    Documentation: devicetree: arm: sort enable-method entries
    ARM: rockchip: convert smp bringup to CPU_METHOD_OF_DECLARE
    clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks
    ARM: dts: axxia: Add reset controller
    power: reset: Add Axxia system reset driver
    ARM: axxia: Adding defconfig for AXM55xx
    ...

    Linus Torvalds
     
  • Pull ARM SoC cleanups from Olof Johansson:
    "Cleanups for 3.16. Among these are:

    - a bunch of misc cleanups for Broadcom platforms, mostly
    housekeeping
    - enabling Common Clock Framework on the older s3c24xx Samsung
    chipsets
    - cleanup of the Versatile Express system controller code, moving it
    to syscon
    - power management cleanups for OMAP platforms

    plus a handful of other cleanups across the place"

    * tag 'cleanup-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (87 commits)
    ARM: kconfig: allow PCI support to be selected with ARCH_MULTIPLATFORM
    clk: samsung: fix build error
    ARM: vexpress: refine dependencies for new code
    clk: samsung: clk-s3c2410-dlck: do not use PNAME macro as it declares __initdata
    cpufreq: exynos: Fix the compile error
    ARM: S3C24XX: move debug-macro.S into the common space
    ARM: S3C24XX: use generic DEBUG_UART_PHY/_VIRT in debug macro
    ARM: S3C24XX: trim down debug uart handling
    ARM: compressed/head.S: remove s3c24xx special case
    ARM: EXYNOS: Remove unnecessary inclusion of cpu.h
    ARM: EXYNOS: Migrate Exynos specific macros from plat to mach
    ARM: EXYNOS: Remove exynos_subsys registration
    ARM: EXYNOS: Remove duplicate lines in Makefile
    ARM: EXYNOS: use v7_exit_coherency_flush macro for cache disabling
    ARM: OMAP4: PRCM: remove references to cm-regbits-44xx.h from PRCM core files
    ARM: OMAP3/4: PRM: add support of late_init call to prm_ll_ops
    ARM: OMAP3/OMAP4: PRM: add prm_features flags and add IO wakeup under it
    ARM: OMAP3/4: PRM: provide io chain reconfig function through irq setup
    ARM: OMAP2+: PRM: remove unnecessary cpu_is_XXX calls from prm_init / exit
    ARM: OMAP2+: PRCM: cleanup some header includes
    ...

    Linus Torvalds
     

31 May, 2014

2 commits


30 May, 2014

2 commits

  • …e/linux-samsung into next/soc

    Merge "Samsung 2nd clock updates for 3.16" from Kukjin Kim:

    - Add missing sysmmu clocks for DISP and ISP blocks for exynos5250

    * tag 'samsung-clk-2' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
    clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • …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: Olof Johansson <olof@lixom.net>

    Olof Johansson
     

27 May, 2014

3 commits

  • Merge "ARM: berlin: DT changes for v3.16" from Sebastian Hesselbart:

    Quite a lot changes but it looks like DT approach is really paying off.
    BG2Q joins Berlin SoC family with corresponding development board, DW
    gpio nodes for all SoCs. Most notably, we have settled clock bindings
    to allow us to continue on drivers requiring clocks and pinctrl bindings.
    Last but not least, BG2Q gained SDHCI support and is able to properly
    boot into userspace.

    * tag 'berlin-dt-3.16' of https://github.com/shesselba/linux-berlin:
    ARM: dts: berlin: enable SD card reader and eMMC for the BG2Q DMP
    ARM: dts: berlin: add the SDHCI nodes for the BG2Q
    ARM: dts: berlin: add the pinctrl node and muxing setup for uarts
    dt-binding: ARM: add pinctrl binding docs for Marvell Berlin2 SoCs
    ARM: dts: berlin: convert BG2Q to DT clock nodes
    ARM: dts: berlin: convert BG2 to DT clock nodes
    ARM: dts: berlin: convert BG2CD to DT clock nodes
    clk: berlin: add binding include for Berlin SoC clock ids
    dt-binding: ARM: add clock binding docs for Marvell Berlin2 SoCs
    ARM: dts: berlin: add the BG2CD GPIO nodes
    ARM: dts: berlin: add the BG2 GPIO nodes
    ARM: dts: berlin: add the BG2Q GPIO nodes
    ARM: dts: berlin: add scu and chipctrl device nodes for BG2/BG2Q
    ARM: dts: berlin: add the Marvell BG2-Q DMP device tree
    ARM: dts: berlin: add the Marvell Armada 1500 pro

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • …l/git/tmlind/linux-omap into next/soc

    Merge "ARM: omap pm changes for v3.16 merge window, resend" from Tony Lindgren:

    PM related fixes for omap3 that were discovered during omap3
    conversion to device tree. This series sets up the PMIC signaling
    in a way where we can test for PM regressions easily by
    looking at state of the the sys_clkreq and sys_off_mode pins.

    Note that this series alone does not make omap3 PM to cut
    off core voltage during off-idle, changes to twl4030-power.c
    configurations are still needed. Those will be posted
    separately.

    * tag 'omap-for-v3.16/pm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: OMAP2+: Enable CPUidle in omap2plus_defconfig
    ARM: dts: Enable N900 keyboard sleep leds by default
    ARM: OMAP2+: Fix voltage scaling init for device tree
    ARM: dts: Configure omap3 twl4030 I2C4 pins by default
    ARM: OMAP3: Fix voltage control for deeper idle states
    ARM: OMAP3: Disable broken omap3_set_off_timings function
    ARM: OMAP3: Fix idle mode signaling for sys_clkreq and sys_off_mode
    ARM: dts: Fix omap serial wake-up when booted with device tree
    mfd: twl-core: Fix idle mode signaling for omaps when booted with device tree

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • …nel/git/tmlind/linux-omap into next/dt

    Merge "ARM: omap dt changes for v3.16 merge window, part 2" From Tony Lindgren:

    Device tree related changes for omaps.

    * tag 'omap-for-v3.16/dt-part2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (49 commits)
    ARM: dts: Enable mcpdm and mcbsp1 on DuoVero
    ARM: dts: Convert DuoVero Parlor to use IOPAD macro
    ARM: dts: am43xx: fix starting offset of NAND.filesystem MTD partition
    ARM: dts: dra7: add support for parallel NAND flash
    ARM: dts: am437x-gp-evm: Add ethernet support for GP EVM
    ARM: dts: am4372: Add cpsw phy sel dt node
    ARM: OMAP2+: Use pdata quirks for wl12xx on VAR-STK/DVK-OM44
    ARM: dts: Add VAR-SOM-OM44 WLAN nodes
    ARM: dts: Add support for OMAP4 VAR-DVK-OM44
    ARM: dts: Add support for OMAP4 Variscite OM44 family
    ARM: dts: Change IOPAD macro's for OMAP4/5
    ARM: dts: AM33XX: fix ethernet and mdio default state
    ARM: dts: am4372: Add hdq device tree data
    ARM: omap2+: skip device build from platform code for dt
    dts: dra7-evm: add USB support
    ARM: dts: dra7: Add USB related nodes
    ARM: dts: dra7-clock: Add "l3init_960m_gfclk" clock gate
    ARM: dts: omap4+: Add clocks to USB2 PHY node
    ARM: dts: dra7: add OCP2SCP3 and SATA nodes
    ARM: dts: omap5: add sata node
    ...

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     

26 May, 2014

1 commit


24 May, 2014

6 commits

  • …lak/linux-qcom into for-next

    Merge "Qualcomm ARM Based Device Tree Updates for v3.16" from Kumar Gala:

    * Added device tree nodes for pinctrl and SDHC for msm8974 SoC/DB8074 board
    * Added binding spec for GSBI configuration node

    * tag 'qcom-dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
    soc: qcom: Add device tree binding for GSBI
    ARM: dts: msm: Add SDHC controller nodes for MSM8974 and DB8074 board
    ARM: dts: MSM8974: Add pinctrl node

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>

    Arnd Bergmann
     
  • 3.16 third DT series:
    - move of both at91sam9n12 and at91sam9x5 to CCF

    * tag 'at91-dt3' of git://github.com/at91linux/linux-at91:
    ARM: at91: move sam9n12 SoC to the CCF
    ARM: at91/dt: define sam9n12ek crystal frequencies
    ARM: at91/dt: define sam9n12 clocks
    ARM: at91: prepare common clk transition for sam9n12 SoC
    ARM: at91: move sam9x5 SoCs to the CCF
    ARM: at91/dt: define sam9x5ek's crystal frequencies
    ARM: at91/dt: define sam9x5 clocks
    ARM: at91: prepare common clk transition for sam9x5 SoCs
    dt-bindings: clock: Move at91.h to dt-bindigs/clock
    ARM: at91: fix spi cs on sama5d3 Xplained board

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • Merge "ARM: STi: DT changes for v3.16, v3" from Maxime Coquelin:

    Please consider these STi DT updates for v3.16.

    This 3rd version takes into account Olof's comments on the v2:
    - Fix upper-cases in labels and node names
    - Sort compatibles order from specific to generic
    - Sort dts entries in Makefile

    It also adds support for the B2020 revision E board for STiH416 SoC.

    Note that two reset patches are part of this pull request, in order to avoid
    compilation breakage.
    Adding these two patches in this pull request has been accepted by Philipp Zabel.

    * tag 'sti-dt-for-v3.16-1' of git://git.stlinux.com/devel/kernel/linux-sti: (23 commits)
    ARM: sti: stih41x: Provide a proper header for this DTSI file
    ARM: sti: stih416: Enable board LED support for B2020 RevE
    ARM: sti: stih416: Add support for B2020 RevE
    ARM: STi: DT: STiH41x Add clk_ignore_unused to bootargs
    ARM: STi: DT: STiH415: 415 DT Entry for clockgen A9
    ARM: STi: DT: STiH415: Remove unused CLK_S_GMAC0_PHY & CLK_S_ETH1_PHY fixed clocks
    ARM: STi: DT: STiH415: Remove unused CLK_S_ICN_REG_0 fixed clock
    ARM: STi: DT: STiH415: 415 DT Entry for clockgen A0/1/10/11/12
    ARM: STi: DT: STiH416: 416 DT Entry for clockgen A9/DDR/GPU
    ARM: STi: DT: STiH416: 416 DT Entry for clockgen B/C/D/E/F
    ARM: STi: DT: STiH416: Remove unused CLK_S_GMAC0_PHY & CLK_S_ETH1_PHY fixed clocks
    ARM: STi: DT: STiH416: Remove unused CLK_S_ICN_REG_0 fixed clock
    ARM: STi: DT: STiH416: 416 DT Entry for clockgen A0/1/10/11/12
    ARM: STi: DT: STiH41x: Rename CLK_SYSIN into clk_sysin
    ARM: STi: DT: add keyscan for stih41x-b2000
    ARM: STi: DT: add keyscan for stih416
    ARM: STi: DT: add keyscan for stih415
    driver: reset: sti: add keyscan for stih416
    driver: reset: sti: add keyscan for stih415
    ARM: dts: STiH407: Add B2120 board support
    ...

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • Patches from Anders Berg applied individually:

    Here is version 4 of platform support for AXM5516 SoC.

    The clk driver is now applied to clk-next. The rest should be ready for
    arm-soc. Haven't got any response from the power/reset maintainers... I hope
    this driver can be taken via arm-soc as well.

    The AXM55xx family consists of devices that may contain up to 16 ARM Cortex-A15
    cores (in a 4x4 cluster configuration). The cores within each cluster share an
    L2 cache, and the clusters are connected to each other via a CCN-504 cache
    coherent interconnect.

    This machine requires CONFIG_ARM_LPAE enabled as all peripherals are located
    above 4GB in the memory map.

    * axxia/soc:
    ARM: dts: axxia: Add reset controller
    power: reset: Add Axxia system reset driver
    ARM: axxia: Adding defconfig for AXM55xx
    ARM: dts: Device tree for AXM55xx.
    ARM: Add platform support for LSI AXM55xx SoC

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • Add device tree binding support for the QCOM GSBI driver.

    Signed-off-by: Andy Gross
    Signed-off-by: Kumar Gala

    Andy Gross
     
  • The AXM55xx family consists of devices that may contain up to 16 ARM Cortex-A15
    cores (in a 4x4 cluster configuration). The cores within each cluster share an
    L2 cache, and the clusters are connected to each other via a CCN-504 cache
    coherent interconnect.

    This machine requires CONFIG_ARM_LPAE enabled as all peripherals are located
    above 4GB in the memory map.

    Signed-off-by: Anders Berg
    Acked-by: Linus Walleij
    Signed-off-by: Arnd Bergmann

    Anders Berg
     

22 May, 2014

4 commits

  • Nicolas Ferre
     
  • …linux-samsung into next/cleanup

    Merge "Samsung S3C24XX updates for 3.16" from Kukjin Kim:

    Samsung S3C24XX to use the common clock framework
    - S3C2412, S3C2413, S3C2416 and S3C2443 to use CCF
    - S3C2410, S3C2440, S3C2442 to use CCF
    - Remove legacy samsung clock from mach-s3c24xx/

    - Some of them are missed from previous pull-request
    - Clock related sutff got ack from Mike and Tomasz
    - Created the last commit due to missing changes
    during re-sorting because this branch is provided
    as a base to samsung clk tree.

    * tag 's3c24xx-clk' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (23 commits)
    ARM: S3C24XX: fix merge conflict
    ARM: S3C24XX: remove SAMSUNG_CLOCK remnants after ccf conversion
    ARM: S3C24XX: remove legacy clock code
    ARM: S3C24XX: convert s3c2410 to common clock framework
    ARM: S3C24XX: convert s3c2440 and s3c2442 to common clock framework
    ARM: S3C24XX: add platform code for conversion to the common clock framework
    clk: samsung: add clock controller driver for s3c2410, s3c2440 and s3c2442
    dt-bindings: add documentation for s3c2410 clock controller
    ARM: S3C24XX: enable usage of common dclk if common clock framework is enabled
    clk: samsung: add clock driver for external clock outputs
    ARM: S3C24XX: cpufreq-utils: don't write raw values to MPLLCON when using ccf
    ARM: S3C24XX: convert s3c2412 to common clock framework
    clk: samsung: add clock controller driver for s3c2412
    dt-bindings: add documentation for s3c2412 clock controller
    clk: samsung: add plls used by the early s3c24xx cpus
    ARM: S3C24XX: only store clock registers when old clock code is active
    ARM: S3C24XX: Convert s3c2416 and s3c2443 to common clock framework
    ARM: dts: add clock data for s3c2416
    ARM: S3C24XX: prevent conflicts between ccf and non-ccf s3c24xx-socs
    clk: samsung: add clock-driver for s3c2416, s3c2443 and s3c2450
    ...

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • …uo/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: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • …/kernel/git/horms/renesas into next/boards

    Merge "Renesas ARM Based r7s72100 SoC CCF Updates for v3.16" from Simon Horman:

    r7s72100 (RZ/A1H) SoC and its Genmai board
    * Add and use CCF support
    * Initislise SCIF, I2C and SPI via DT

    * tag 'renesas-r7s72100-ccf-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
    ARM: shmobile: r7s72100: use workaround for non DT-clocks
    ARM: shmobile: Add forward declaration of struct clk to silence warning
    ARM: shmobile: r7s72100: remove SPI DT clocks from legacy clock support
    ARM: shmobile: r7s72100: add spi clocks to dtsi
    ARM: shmobile: r7s72100: remove I2C DT clocks from legacy clock support
    ARM: shmobile: r7s72100: add i2c clocks to dtsi
    ARM: shmobile: r7s72100: genmai: platform scif devices only for legacy support
    ARM: shmobile: r7s72100: genmai: add uart alias and activate scif2 as console
    ARM: shmobile: r7s72100: add scif nodes to dtsi
    ARM: shmobile: r7s72100: genmai: populate nodes for external clocks
    ARM: shmobile: r7s72100: add essential clock nodes to dtsi
    ARM: shmobile: r7s72100: document MSTP clock support

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     

21 May, 2014

4 commits


20 May, 2014

3 commits

  • …l/git/horms/renesas into next/soc

    Merge "Second Round of Renesas ARM Based SoC Clock Updates for v3.16" from
    Simon Horman:

    r8a7791 (R-Car M2) SoC
    * Correct SYS-DMAC clock defines

    r8a7740 (R-Mobile A1) SoC
    * Correct name of DT Ethernet clock

    * tag 'renesas-clock2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
    ARM: shmobile: r8a7791: Correct SYS-DMAC clock defines
    ARM: shmobile: r8a7740: Correct name of DT Ethernet clock

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • The OMAP4/5 TRMs primarily list address offsets from the padconf
    physical address (which is not driver base address) and not
    always the absolute physical address for padconf registers like
    some other OMAP TRMs. So create a new macro to use this offset
    and to avoid confusion between different OMAP parts.

    For more information, see the tables in TRM for named something like
    "Device Core Control Module Pad Configuration Register Fields"
    and "Device Wake-Up Control Module Pad Configuration Register Fields"

    Note that we now also have to update cm-t54 for the fixed up
    offsets.

    Signed-off-by: Joachim Eastwood
    [tony@atomide.com: updated comments, updated cm-t54]
    Signed-off-by: Tony Lindgren

    Joachim Eastwood
     
  • This adds a dt-binding include for Marvell Berlin BG2/BG2CD and BG2Q
    core clock IDs.

    Signed-off-by: Sebastian Hesselbarth
    Signed-off-by: Alexandre Belloni

    Sebastian Hesselbarth
     

19 May, 2014

1 commit

  • Exynos5800 clock structure is mostly similar to 5420 with only
    a small delta changes. So the 5420 clock file is re-used for
    5800 also. The common clocks for both are seggreagated and few
    clocks which are different for both are separately initialized.

    Signed-off-by: Alim Akhtar
    Signed-off-by: Arun Kumar K
    Acked-by: Tomasz Figa
    Signed-off-by: Kukjin Kim

    Alim Akhtar
     

17 May, 2014

1 commit

  • …ocfpga-next into next/dt

    Merge "dts: socfpga: general updates for the socfpga platform" from Dinh
    Nguyen:

    Mostly DTS additions to the SOCFPGA platform from Steffan Trumtrar, and a
    couple of device tree documentation updates/typo fix.

    This one does not the GPIO binding patch, as that is pending further
    discussion. Also, v3 fixes a rebase artifact and compile tested.

    * tag 'socfpga-dt-updates-for-3.16_v3' of git://git.rocketboards.org/linux-socfpga-next:
    ARM: socfpga: dts: Add div-reg to the main_pll clocks
    ARM: socfpga: dts: add reset-controller
    Documentation: dt: reset: move socfpga-reset
    Documentation: dt: socfpga: add reset-cells property
    ARM: socfpga: dts: Add DTS entries for USB
    ARM: socfpga: dts: Remove hard coded clock-frequency property
    ARM: socfpga: dts: add eeprom and rtc on i2c0
    ARM: socfpga: dts: convert to preprocessor includes
    ARM: socfpga: dts: add rtc on i2c0 to socrates
    ARM: socfpga: dts: add support for EBV SOCrates
    ARM: socfpga: dts: add can0+1
    ARM: socfpga: dts: add i2c busses
    ARM: socfpga: dts: add remaining interrupts for pdma
    ARM: socfpga: dts: fix pdma interrupt

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     

16 May, 2014

1 commit


15 May, 2014

8 commits