06 Apr, 2014

4 commits

  • Pull clock framework changes from Mike Turquette:
    "The clock framework changes for 3.15 look similar to past pull
    requests. Mostly clock driver updates, more Device Tree support in
    the form of common functions useful across platforms and a handful of
    features and fixes to the framework core"

    * tag 'clk-for-linus-3.15' of git://git.linaro.org/people/mike.turquette/linux: (86 commits)
    clk: shmobile: fix setting paretn clock rate
    clk: shmobile: rcar-gen2: fix lb/sd0/sd1/sdh clock parent to pll1
    clk: Fix minor errors in of_clk_init() function comments
    clk: reverse default clk provider initialization order in of_clk_init()
    clk: sirf: update copyright years to 2014
    clk: mmp: try to use closer one when do round rate
    clk: mmp: fix the wrong calculation formula
    clk: mmp: fix wrong mask when calculate denominator
    clk: st: Adds quadfs clock binding
    clk: st: Adds clockgen-vcc and clockgen-mux clock binding
    clk: st: Adds clockgen clock binding
    clk: st: Adds divmux and prediv clock binding
    clk: st: Support for A9 MUX clocks
    clk: st: Support for ClockGenA9/DDR/GPU
    clk: st: Support for QUADFS inside ClockGenB/C/D/E/F
    clk: st: Support for VCC-mux and MUX clocks
    clk: st: Support for PLLs inside ClockGenA(s)
    clk: st: Support for DIVMUX and PreDiv Clocks
    clk: support hardware-specific debugfs entries
    clk: s2mps11: Use of_get_child_by_name
    ...

    Linus Torvalds
     
  • Pull ARM SoC late cleanups from Arnd Bergmann:
    "These could not be part of the first cleanup branch, because they
    either came too late in the cycle, or they have dependencies on other
    branches. Important changes are:

    - The integrator platform is almost multiplatform capable after some
    reorganization (Linus Walleij)
    - Minor cleanups on Zynq (Michal Simek)
    - Lots of changes for Exynos and other Samsung platforms, including
    further preparations for multiplatform support and the clocks
    bindings are rearranged"

    * tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
    devicetree: fix newly added exynos sata bindings
    ARM: EXYNOS: Fix compilation error in cpuidle.c
    ARM: S5P64X0: Explicitly include linux/serial_s3c.h in mach/pm-core.h
    ARM: EXYNOS: Remove hardware.h file
    ARM: SAMSUNG: Remove hardware.h inclusion
    ARM: S3C24XX: Remove invalid code from hardware.h
    dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock
    ARM: dts: Keep some essential LDOs enabled for arndale-octa board
    ARM: dts: Disable MDMA1 node for arndale-octa board
    ARM: S3C64XX: Fix build for implicit serial_s3c.h inclusion
    serial: s3c: Fix build of header without serial_core.h preinclusion
    ARM: EXYNOS: Allow wake-up using GIC interrupts
    ARM: EXYNOS: Stop using legacy Samsung PM code
    ARM: EXYNOS: Remove PM initcalls and useless indirection
    ARM: EXYNOS: Fix abuse of CONFIG_PM
    ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h
    ARM: SAMSUNG: Move common save/restore helpers to separate file
    ARM: SAMSUNG: Move Samsung PM debug code into separate file
    ARM: SAMSUNG: Consolidate PM debug functions
    ARM: SAMSUNG: Use debug_ll_addr() to get UART base address
    ...

    Linus Torvalds
     
  • Pull ARM SoC driver changes from Arnd Bergmann:
    "These changes are mostly for ARM specific device drivers that either
    don't have an upstream maintainer, or that had the maintainer ask us
    to pick up the changes to avoid conflicts.

    A large chunk of this are clock drivers (bcm281xx, exynos, versatile,
    shmobile), aside from that, reset controllers for STi as well as a
    large rework of the Marvell Orion/EBU watchdog driver are notable"

    * tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (99 commits)
    Revert "dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac."
    Revert "net: stmmac: Add SOCFPGA glue driver"
    ARM: shmobile: r8a7791: Fix SCIFA3-5 clocks
    ARM: STi: Add reset controller support to mach-sti Kconfig
    drivers: reset: stih416: add softreset controller
    drivers: reset: stih415: add softreset controller
    drivers: reset: Reset controller driver for STiH416
    drivers: reset: Reset controller driver for STiH415
    drivers: reset: STi SoC system configuration reset controller support
    dts: socfpga: Add sysmgr node so the gmac can use to reference
    dts: socfpga: Add support for SD/MMC on the SOCFPGA platform
    reset: Add optional resets and stubs
    ARM: shmobile: r7s72100: fix bus clock calculation
    Power: Reset: Generalize qnap-poweroff to work on Synology devices.
    dts: socfpga: Update clock entry to support multiple parents
    ARM: socfpga: Update socfpga_defconfig
    dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.
    net: stmmac: Add SOCFPGA glue driver
    watchdog: orion_wdt: Use %pa to print 'phys_addr_t'
    drivers: cci: Export CCI PMU revision
    ...

    Linus Torvalds
     
  • Pull ARM SoC device tree changes from Arnd Bergmann:
    "A large part of the arm-soc patches are nowadays DT changes, adding
    support for new SoCs, boards and devices without changing kernel
    source. The plan is still to move the devicetree files out of the
    kernel tree and reduce the amount of churn going on here, but we keep
    finding reasons to delay doing that.

    Changes are really all over the place, with little sticking out
    particularly. We have contributions from a total of 116 people in
    this branch.

    Unfortunately, the size of this branch also causes a significant
    number of conflicts at the moment, typically when subsystem
    maintainers merge patches that change the driver at the same time as
    the dts files. In most cases this could be avoided because the dts
    changes are supposed to be compatible in both ways, and we are asking
    everyone to send ARM dts changes through our tree only"

    * tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (541 commits)
    dts: stmmac: Document the clocks property in the stmmac base document
    dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.
    ARM: STi: stih41x: Add support for the FSM Serial Flash Controller
    ARM: STi: stih416: Add support for the FSM Serial Flash Controller
    ARM: tegra: fix Dalmore pinctrl configuration
    ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm
    ARM: dts: k2hk-evm: set ubifs partition size for 512M NAND
    ARM: dts: Build all keystone dt blobs
    ARM: dts: keystone: Fix control register range for clktsip
    ARM: dts: keystone: Fix domain register range for clkfftc1
    ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot
    ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap
    ARM: dts: bcm21664: Add device tree files.
    ARM: DT: bcm21664: Device tree bindings
    ARM: efm32: properly namespace i2c location property
    ARM: efm32: fix unit address part in USART2 device nodes' names
    ARM: mvebu: Enable NAND controller in Armada 385-DB
    ARM: mvebu: Add support for NAND controller in Armada 38x SoC
    ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
    ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs
    ...

    Linus Torvalds
     

02 Apr, 2014

1 commit

  • Pull char/misc driver patches from Greg KH:
    "Here's the big char/misc driver updates for 3.15-rc1.

    Lots of various things here, including the new mcb driver subsystem.

    All of these have been in linux-next for a while"

    * tag 'char-misc-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (118 commits)
    extcon: Move OF helper function to extcon core and change function name
    extcon: of: Remove unnecessary function call by using the name of device_node
    extcon: gpio: Use SIMPLE_DEV_PM_OPS macro
    extcon: palmas: Use SIMPLE_DEV_PM_OPS macro
    mei: don't use deprecated DEFINE_PCI_DEVICE_TABLE macro
    mei: amthif: fix checkpatch error
    mei: client.h fix checkpatch errors
    mei: use cl_dbg where appropriate
    mei: fix Unnecessary space after function pointer name
    mei: report consistently copy_from/to_user failures
    mei: drop pr_fmt macros
    mei: make me hw headers private to me hw.
    mei: fix memory leak of pending write cb objects
    mei: me: do not reset when less than expected data is received
    drivers: mcb: Fix build error discovered by 0-day bot
    cs5535-mfgpt: Simplify dependencies
    spmi: pm: drop bus-level PM suspend/resume routines
    spmi: pmic_arb: make selectable on ARCH_QCOM
    Drivers: hv: vmbus: Increase the limit on the number of pfns we can handle
    pch_phub: Report error writing MAC back to user
    ...

    Linus Torvalds
     

21 Mar, 2014

1 commit


20 Mar, 2014

1 commit


19 Mar, 2014

1 commit


18 Mar, 2014

2 commits

  • This is apparently a dependency for the STi reset controller driver.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • Merge "STi DT changes part 1 v2" from Srinivas Kandagatla:

    Patches : 01-02 are DT patches, adding interrupt support to pin
    controller driver, Driver changes are already going via Linus W's
    pinctrl tree.

    Patches: 03 - 06 are DT patches for reset/softreset controller. Reset
    controller driver is Acked by Philipp Zabel.

    Patches: 07, 08 are DT patches, adding Ethernet controller support
    patches, actual driver changes are already in v3.14-rc4 via Dave Millers
    net tree.

    Patches: 09, 10 are DT patches for IR driver support, actual IR driver
    is already available since v3.12. Reason for the delay is due to
    dependency on reset controller driver/headers.

    * tag 'DT-for-v3.15-part-1-v2' of git://git.stlinux.com/devel/kernel/linux-sti:
    ARM: STi: STIH416: Add IR support.
    ARM: STi: STIH415: Add IR support.
    ARM: STi: STiH416: Add ethernet support.
    ARM: STi: STiH415: Add ethernet support.
    ARM: STi: STiH416: Add soft reset controller support.
    ARM: STi: STiH416: Add reset controller support.
    ARM: STi: STiH415: Add soft reset controller support.
    ARM: STi: STiH415: Add reset controller support.
    ARM: STi: STiH415: Add interrupt support for pin controller
    ARM: STi: STiH416: Add interrupt support for pin controller

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

17 Mar, 2014

1 commit

  • …/git/horms/renesas into next/drivers

    Merge "Renesas ARM Based SoC Clock Updates for v3.15" from Simon Horman:

    * r7s72100 SoC (RZ/A1H)
    - Add clock for SH Ethernet
    - Add RSPI clocks

    * r8a7791 (R-Car M2)
    - Add QSPI and SDHI clocks

    * r8a7790 (R-Car H2)
    - Add audio clock
    - Remove legacy DT clocks
    - Correct SYS DMAC clock defines

    * tag 'renesas-clock-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
    ARM: shmobile: Remove legacy r8a7790 DT clocks
    ARM: shmobile: Add r8a7791 legacy SDHI clocks
    ARM: shmobile: r8a7790: Correct SYS DMAC clock defines
    ARM: shmobile: r7s72100: Add clock for r7s72100-ether
    ARM: shmobile: r8a7791 clock: add QSPI clocks
    ARM: shmobile: r7s72100 clock: Add RSPI clocks for DT
    ARM: shmobile: r7s72100 clock: Add RSPI clocks
    ARM: shmobile: r8a7790: add audio clock
    ARM: shmobile: r8a7778: add audio clock in new style

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

    Olof Johansson
     

13 Mar, 2014

2 commits

  • Mark Brown
     
  • This commit adds a bare bones driver support for TLV320AIC31XX family
    audio codecs. The driver adds basic stereo playback trough headphone
    and speaker outputs and mono capture trough microphone inputs.

    The driver is currently missing support at least for mini DSP features
    and jack detection. I have tested the driver only on TLV320AIC3111,
    but based on the data sheets TLV320AIC3100, TLV320AIC3110, and
    TLV320AIC3120 should work Ok too.

    The base for the implementation was taken from:
    git@gitorious.org:ti-codecs/ti-codecs.git ajitk/topics/k3.10.1-aic31xx
    -branch at commit 77504eba0294764e9e63b4a0c696b44db187cd13.

    Signed-off-by: Jyri Sarha
    Signed-off-by: Mark Brown

    Jyri Sarha
     

11 Mar, 2014

4 commits


03 Mar, 2014

1 commit


27 Feb, 2014

1 commit

  • Suggest by Arnd: abstract mmc tuning as clock behavior,
    also because different soc have different tuning method and registers.
    hi3620_mmc_clks is added to handle mmc clock specifically on hi3620.

    Signed-off-by: Zhangfei Gao
    Acked-by: Arnd Bergmann
    Acked-by: Jaehoon Chung
    Signed-off-by: Mike Turquette

    Zhangfei Gao
     

25 Feb, 2014

1 commit

  • Add code for device tree support of clocks in the BCM281xx family of
    SoCs. Machines in this family use peripheral clocks implemented by
    "Kona" clock control units (CCUs). (Other Broadcom SoC families use
    Kona style CCUs as well, but support for them is not yet upstream.)

    A BCM281xx SoC has multiple CCUs, each of which manages a set of
    clocks on the SoC. A Kona peripheral clock is composite clock that
    may include a gate, a parent clock multiplexor, and zero, one
    or two dividers. There is a variety of gate types, and many gates
    implement hardware-managed gating (often called "auto-gating").
    Most dividers divide their input clock signal by an integer value
    (one or more). There are also "fractional" dividers which allow
    division by non-integer values. To accomodate such dividers,
    clock rates and dividers are generally maintained by the code in
    "scaled" form, which allows integer and fractional dividers to
    be handled in a uniform way.

    If present, the gate for a Kona peripheral clock must be enabled
    when a change is made to its multiplexor or one of its dividers.
    Additionally, dividers and multiplexors have trigger registers which
    must be used whenever the divider value or selected parent clock is
    changed. The same trigger is often used for a divider and
    multiplexor, and a BCM281xx peripheral clock occasionally has two
    triggers.

    The gate, dividers, and parent clock selector are treated in this
    code as "components" of a peripheral clock. Their functionality is
    implemented directly--e.g. the common clock framework gate
    implementation is not used for a Kona peripheral clock gate. (This
    has being considered though, and the intention is to evolve this
    code to leverage common code as much as possible.)

    The source code is divided into three general portions:

    drivers/clk/bcm/clk-kona.h
    drivers/clk/bcm/clk-kona.c
    These implement the basic Kona clock functionality,
    including the clk_ops methods and various routines to
    manipulate registers and interpret their values. This
    includes some functions used to set clocks to a desired
    initial state (though this feature is only partially
    implemented here).

    drivers/clk/bcm/clk-kona-setup.c
    This contains generic run-time initialization code for
    data structures representing Kona CCUs and clocks. This
    encapsulates the clock structure initialization that can't
    be done statically. Note that there is a great deal of
    validity-checking code here, making explicit certain
    assumptions in the code. This is mostly useful for adding
    new clock definitions and could possibly be disabled for
    production use.

    drivers/clk/bcm/clk-bcm281xx.c
    This file defines the specific CCUs used by BCM281XX family
    SoCs, as well as the specific clocks implemented by each.
    It declares a device tree clock match entry for each CCU
    defined.

    include/dt-bindings/clock/bcm281xx.h
    This file defines the selector (index) values used to
    identify a particular clock provided by a CCU. It consists
    entirely of C preprocessor constants, to be used by both the
    C source and device tree source files.

    Signed-off-by: Alex Elder
    Reviewed-by: Tim Kryger
    Reviewed-by: Matt Porter
    Acked-by: Mike Turquette
    Signed-off-by: Matt Porter

    Alex Elder
     

24 Feb, 2014

1 commit

  • This brings the implementation into line with the documentation.

    This problem was introduced when SYS DMAC clock defines were added by
    ac991dce6498b5fc ("ARM: shmobile: r8a7790: Add clock index macros for DT
    sources") in v3.13-rc2. I do not believe this results in any problems as
    these defines do not appear to be used anywhere yet.

    Acked-by: Laurent Pinchart
    Signed-off-by: Simon Horman

    Simon Horman
     

21 Feb, 2014

1 commit


16 Feb, 2014

1 commit

  • System Power Management Interface (SPMI) is a specification
    developed by the MIPI (Mobile Industry Process Interface) Alliance
    optimized for the real time control of Power Management ICs (PMIC).

    SPMI is a two-wire serial interface that supports up to 4 master
    devices and up to 16 logical slaves.

    The framework supports message APIs, multiple busses (1 controller
    per bus) and multiple clients/slave devices per controller.

    Signed-off-by: Kenneth Heitke
    Signed-off-by: Michael Bohan
    Signed-off-by: Josh Cartwright
    Signed-off-by: Greg Kroah-Hartman

    Kenneth Heitke
     

31 Jan, 2014

1 commit

  • Pull more powerpc bits from Ben Herrenschmidt:
    "Here are a few more powerpc bits for this merge window. The bulk is
    made of two pull requests from Scott and Anatolij that I had missed
    previously (they arrived while I was away). Since both their branches
    are in -next independently, and the content has been around for a
    little while, they can still go in.

    The rest is mostly bug and regression fixes, a small series of
    cleanups to our pseries cpuidle code (including moving it to the right
    place), and one new cpuidle bakend for the powernv platform. I also
    wired up the new sched_attr syscalls"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (37 commits)
    powerpc: Wire up sched_setattr and sched_getattr syscalls
    powerpc/hugetlb: Replace __get_cpu_var with get_cpu_var
    powerpc: Make sure "cache" directory is removed when offlining cpu
    powerpc/mm: Fix mmap errno when MAP_FIXED is set and mapping exceeds the allowed address space
    powerpc/powernv/cpuidle: Back-end cpuidle driver for powernv platform.
    powerpc/pseries/cpuidle: smt-snooze-delay cleanup.
    powerpc/pseries/cpuidle: Remove MAX_IDLE_STATE macro.
    powerpc/pseries/cpuidle: Make cpuidle-pseries backend driver a non-module.
    powerpc/pseries/cpuidle: Use cpuidle_register() for initialisation.
    powerpc/pseries/cpuidle: Move processor_idle.c to drivers/cpuidle.
    powerpc: Fix 32-bit frames for signals delivered when transactional
    powerpc/iommu: Fix initialisation of DART iommu table
    powerpc/numa: Fix decimal permissions
    powerpc/mm: Fix compile error of pgtable-ppc64.h
    powerpc: Fix hw breakpoints on !HAVE_HW_BREAKPOINT configurations
    clk: corenet: Adds the clock binding
    powerpc/booke64: Guard e6500 tlb handler with CONFIG_PPC_FSL_BOOK3E
    powerpc/512x: dts: add MPC5125 clock specs
    powerpc/512x: clk: support MPC5121/5123/5125 SoC variants
    powerpc/512x: clk: enforce even SDHC divider values
    ...

    Linus Torvalds
     

29 Jan, 2014

2 commits

  • <<
    Switch mpc512x to the common clock framework and adapt mpc512x
    drivers to use the new clock driver. Old PPC_CLOCK code is
    removed entirely since there are no users any more.
    >>

    Benjamin Herrenschmidt
     
  • Pull more clock framework changes from Mike Turquette:
    "The second half of the clock framework pull requeust for 3.14 is
    dominated by platform support for Qualcomm's MSM SoCs, DT binding
    updates for TI's OMAP-ish processors and additional support for
    Samsung chips.

    Additionally there are other smaller clock driver changes and several
    last minute fixes. This pull request also includes the HiSilicon
    support that depends on the already-merged arm-soc pull request"

    [ Fix up stupid compile error in the source tree with evil merge - Grumpy Linus ]

    * tag 'clk-for-linus-3.14-part2' of git://git.linaro.org/people/mike.turquette/linux: (49 commits)
    clk: sort Makefile
    clk: sunxi: fix overflow when setting up divided factors
    clk: Export more clk-provider functions
    dt-bindings: qcom: Fix warning with duplicate dt define
    clk: si5351: remove variant from platform_data
    clk: samsung: Remove unneeded semicolon
    clk: qcom: Fix modular build
    ARM: OMAP3: use DT clock init if DT data is available
    ARM: AM33xx: remove old clock data and link in new clock init code
    ARM: AM43xx: Enable clock init
    ARM: OMAP: DRA7: Enable clock init
    ARM: OMAP4: remove old clock data and link in new clock init code
    ARM: OMAP2+: io: use new clock init API
    ARM: OMAP2+: PRM: add support for initializing PRCM clock modules from DT
    ARM: OMAP3: hwmod: initialize clkdm from clkdm_name
    ARM: OMAP: hwmod: fix an incorrect clk type cast with _get_clkdm
    ARM: OMAP2+: clock: use driver API instead of direct memory read/write
    ARM: OMAP2+: clock: add support for indexed memmaps
    ARM: dts: am43xx clock data
    ARM: dts: AM35xx: use DT clock data
    ...

    Linus Torvalds
     

28 Jan, 2014

1 commit


25 Jan, 2014

1 commit

  • Pull thermal management updates from Zhang Rui:
    "This time, the biggest change is the work of representing hardware
    thermal properties in device tree infrastructure.

    This work includes the introduction of a device tree bindings for
    describing the hardware thermal behavior and limits, and also a parser
    to read and interpret the data, and build thermal zones and thermal
    binding parameters. It also contains three examples on how to use the
    new representation on sensor devices, using three different drivers to
    accomplish it. One driver is in thermal subsystem, the TI SoC
    thermal, and the other two drivers are in hwmon subsystem.

    Actually, this would be the first step of the complete work because we
    still need to check other potential drivers to be converted and then
    validate the proposed API. But the reason why I include it in this
    pull request is that, first, this change does not hurt any others
    without using this approach, second, the principle and concept of this
    change would not break after converting the remaining drivers. BTW,
    as you can see, there are several points in this change that do not
    belong to thermal subsystem. Because it has been suggested by Guenter
    R that in such cases, it is recommended to send the complete series
    via one single subsystem.

    Specifics:

    - representing hardware thermal properties in device tree
    infrastructure

    - fix a regression that the imx thermal driver breaks system suspend.

    - introduce ACPI INT3403 thermal driver to retrieve temperature data
    from the INT3403 ACPI device object present on some systems.

    - introduce debug statement for thermal core and step_wise governor.

    - assorted fixes and cleanups for thermal core, cpu cooling, exynos
    thrmal, intel powerclamp and imx thermal driver"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (34 commits)
    thermal: remove const flag from .ops of imx thermal
    Thermal: update thermal zone device after setting emul_temp
    intel_powerclamp: Fix cstate counter detection.
    thermal: imx: add necessary clk operation
    Thermal cpu cooling: return error if no valid cpu frequency entry
    thermal: fix cpu_cooling max_level behavior
    thermal: rcar-thermal: Enable driver compilation with COMPILE_TEST
    thermal: debug: add debug statement for core and step_wise
    thermal: imx_thermal: add module device table
    drivers: thermal: Mark function as static in x86_pkg_temp_thermal.c
    thermal:samsung: fix compilation warning
    thermal: imx: correct suspend/resume flow
    thermal: exynos: fix error return code
    Thermal: ACPI INT3403 thermal driver
    MAINTAINERS: add thermal bindings entry in thermal domain
    arm: dts: make OMAP4460 bandgap node to belong to OCP
    arm: dts: make OMAP443x bandgap node to belong to OCP
    arm: dts: add cooling properties on omap5 cpu node
    arm: dts: add omap5 thermal data
    arm: dts: add omap5 CORE thermal data
    ...

    Linus Torvalds
     

24 Jan, 2014

5 commits

  • Pull clk framework changes from Mike Turquette:
    "The first half of the clk framework pull request is made up almost
    entirely of new platform/driver support. There are some conversions
    of existing drivers to the common-clock Device Tree binding, and a few
    non-critical fixes to the framework.

    Due to an entirely unnecessary cyclical dependency with the arm-soc
    tree this pull request is broken into two pieces. The second piece
    will be sent out after arm-soc sends you the pull request that merged
    in core support for the HiSilicon 3620 platform. That same pull
    request from arm-soc depends on this pull request to merge in those
    HiSilicon bits without causing build failures"

    [ Just did the ARM SoC merges, so getting ready for the second clk tree
    pull request - Linus ]

    * tag 'clk-for-linus-3.14-part1' of git://git.linaro.org/people/mike.turquette/linux: (97 commits)
    devicetree: bindings: Document qcom,mmcc
    devicetree: bindings: Document qcom,gcc
    clk: qcom: Add support for MSM8660's global clock controller (GCC)
    clk: qcom: Add support for MSM8974's multimedia clock controller (MMCC)
    clk: qcom: Add support for MSM8974's global clock controller (GCC)
    clk: qcom: Add support for MSM8960's multimedia clock controller (MMCC)
    clk: qcom: Add support for MSM8960's global clock controller (GCC)
    clk: qcom: Add reset controller support
    clk: qcom: Add support for branches/gate clocks
    clk: qcom: Add support for root clock generators (RCGs)
    clk: qcom: Add support for phase locked loops (PLLs)
    clk: qcom: Add a regmap type clock struct
    clk: Add set_rate_and_parent() op
    reset: Silence warning in reset-controller.h
    clk: sirf: re-arch to make the codes support both prima2 and atlas6
    clk: composite: pass mux_hw into determine_rate
    clk: shmobile: Fix MSTP clock array initialization
    clk: shmobile: Fix MSTP clock index
    ARM: dts: Add clock provider specific properties to max77686 node
    clk: max77686: Register OF clock provider
    ...

    Linus Torvalds
     
  • Pull ARM SoC board updates from Olof Johansson:
    "This branch is reducing in size for every release since most
    board-related changes have started happening in devicetrees now.
    Still, we have some things going on here.

    * Renesas platforms are still adding a bit more legacy device
    support, something that should trail off shortly as they move to
    full DT
    * We group most defconfig updates into this branch out of old habits
    * Removal of legacy OMAP2 platforms over to DT continues, and a
    handful of old code is being removed here"

    * tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
    ARM: dts: OMAP2: fix interrupt number for rng
    ARM: dts: Split omap3 pinmux core device
    ARM: dts: Add omap specific pinctrl defines to use padconf addresses
    ARM: bcm2835: bcm2835_defconfig updates
    ARM: msm_defconfig: Enable restart driver
    defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
    ARM: msm: Add support for APQ8074 Dragonboard
    ARM: exynos_defconfig: Enable S2MPS11 voltage regulator
    ARM: tegra: Enable DRM panel support
    ARM: shmobile: mackerel: Fix USBHS pinconf entry
    ARM: shmobile: Let Koelsch multiplatform boot with Koelsch DTB
    ARM: shmobile: Let Lager multiplatform boot with Lager DTB
    ARM: shmobile: Remove non-multiplatform Koelsch reference support
    ARM: shmobile: Remove non-multiplatform Lager reference support
    ARM: shmobile: koelsch-reference: Instantiate clkdevs for SCIF and CMT
    ARM: shmobile: lager-reference: Instantiate clkdevs for SCIF and CMT
    ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
    ARM: shmobile: lager-reference: Enable multiplaform kernel support
    ARM: shmobile: armadillo: Set backlight enable GPIO
    ARM: shmobile: Koelsch: add Ether support
    ...

    Conflicts:
    arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

    Linus Torvalds
     
  • Pull ARM SoC DT updates from Olof Johansson:
    "DT and DT-conversion-related changes for various ARM platforms. Most
    of these are to enable various devices on various boards, etc, and not
    necessarily worth enumerating.

    New boards and systems continue to come in as new devicetree files
    that don't require corresponding C changes any more, which is
    indicating that the system is starting to work fairly well.

    A few things worth pointing out:

    * ST Ericsson ux500 platforms have made the major push to move over
    to fully support the platform with DT
    * Renesas platforms continue their conversion over from legacy
    platform devices to DT-based for hardware description"

    * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (327 commits)
    ARM: dts: SiRF: add pin group for USP0 with only RX or TX frame sync
    ARM: dts: SiRF: add lost usp1_uart_nostreamctrl pin group for atlas6
    ARM: dts: sirf: add lost minigpsrtc device node
    ARM: dts: sirf: add clock, frequence-voltage table for CPU0
    ARM: dts: sirf: add lost bus_width, clock and status for sdhci
    ARM: dts: sirf: add lost clocks for cphifbg
    ARM: dts: socfpga: add pl330 clock
    ARM: dts: socfpga: update L2 tag and data latency
    arm: sun7i: cubietruck: Enable the i2c controllers
    ARM: dts: add support for EXYNOS4412 based TINY4412 board
    ARM: dts: Add initial support for Arndale Octa board
    ARM: bcm2835: add USB controller to device tree
    ARM: dts: MSM8974: Add MMIO architected timer node
    ARM: dts: MSM8974: Add restart node
    ARM: dts: sun7i: external clock outputs
    ARM: dts: sun7i: Change 32768 Hz oscillator node name to clk@N style
    ARM: dts: sun7i: Add pin muxing options for clock outputs
    ARM: dts: sun7i: Add rtp controller node
    ARM: dts: sun5i: Add rtp controller node
    ARM: dts: sun4i: Add rtp controller node
    ...

    Linus Torvalds
     
  • Pull ARM SoC platform changes from Olof Johansson:
    "New core SoC-specific changes.

    New platforms:
    * Introduction of a vendor, Hisilicon, and one of their SoCs with
    some random numerical product name.
    * Introduction of EFM32, embedded platform from Silicon Labs (ARMv7m,
    i.e. !MMU).
    * Marvell Berlin series of SoCs, which include the one in Chromecast.
    * MOXA platform support, ARM9-based platform used mostly in
    industrial products
    * Support for Freescale's i.MX50 SoC.

    Other work:
    * Renesas work for new platforms and drivers, and conversion over to
    more multiplatform-friendly device registration schemes.
    * SMP support for Allwinner sunxi platforms.
    * ... plus a bunch of other stuff across various platforms"

    * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (201 commits)
    ARM: tegra: fix tegra_powergate_sequence_power_up() inline
    ARM: msm_defconfig: Update for multi-platform
    ARM: msm: Move MSM's DT based hardware to multi-platform support
    ARM: msm: Only build timer.c if required
    ARM: msm: Only build clock.c on proc_comm based platforms
    ARM: ux500: Enable system suspend with WFI support
    ARM: ux500: turn on PRINTK_TIME in u8500_defconfig
    ARM: shmobile: r8a7790: Fix I2C controller names
    ARM: msm: Simplify ARCH_MSM_DT config
    ARM: msm: Add support for MSM8974 SoC
    ARM: sunxi: select ARM_PSCI
    MAINTAINERS: Update Allwinner sunXi maintainer files
    ARM: sunxi: Select RESET_CONTROLLER
    ARM: imx: improve the comment of CCM lpm SW workaround
    ARM: imx: improve status check of clock gate
    ARM: imx: add necessary interface for pfd
    ARM: imx_v6_v7_defconfig: Select CONFIG_REGULATOR_PFUZE100
    ARM: imx_v6_v7_defconfig: Select MX35 and MX50 device tree support
    ARM: imx: Add cpu frequency scaling support
    ARM i.MX35: Add devicetree support.
    ...

    Linus Torvalds
     
  • …l/git/tmlind/linux-omap into next/boards

    Split omap3 core padconf area into two as some of the registers in
    the padconf area are not accessible and used for other devices.
    Also fix the interrupt number for omap2 RNG, and add basic support
    for sbc-3xxx with cm-t3730.

    Note that the minor merge conflicts for omap_hwmod_2xxx_ipblock_data.c
    can be solved by just dropping the legacy hwmod data for interrupts
    for v3.14.

    * tag 'omap-for-v3.14/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: dts: OMAP2: fix interrupt number for rng
    ARM: dts: Split omap3 pinmux core device
    ARM: dts: Add omap specific pinctrl defines to use padconf addresses
    ARM: dts: Add support for sbc-3xxx with cm-t3730

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

    Olof Johansson
     

17 Jan, 2014

5 commits


13 Jan, 2014

2 commits

  • improve the common clock support code for MPC512x

    - expand the CCM register set declaration with MPC5125 related registers
    (which reside in the previously "reserved" area)
    - tell the MPC5121, MPC5123, and MPC5125 SoC variants apart, and derive
    the availability of components and their clocks from the detected SoC
    (MBX, AXE, VIU, SPDIF, PATA, SATA, PCI, second FEC, second SDHC,
    number of PSC components, type of NAND flash controller,
    interpretation of the CPMF bitfield, PSC/CAN mux0 stage input clocks,
    output clocks on SoC pins)
    - add backwards compatibility (allow operation against a device tree
    which lacks clock related specs) for MPC5125 FECs, too

    telling SoC variants apart and adjusting the clock tree's generation
    occurs at runtime, a common generic binary supports all of the chips

    the MPC5125 approach to the NFC clock (one register with two counters
    for the high and low periods of the clock) is not implemented, as there
    are no users and there is no common implementation which supports this
    kind of clock -- the new implementation would be unused and could not
    get verified, so it shall wait until there is demand

    Signed-off-by: Gerhard Sittig
    Acked-by: Mike Turquette
    Signed-off-by: Anatolij Gustschin

    Gerhard Sittig
     
  • introduce a dt-bindings/ header file for MPC512x clocks,
    providing symbolic identifiers for those SoC clocks which
    clients will reference from their device tree nodes

    Cc: Rob Herring
    Cc: Pawel Moll
    Cc: Mark Rutland
    Cc: Stephen Warren
    Cc: Ian Campbell
    Cc: devicetree@vger.kernel.org
    Reviewed-by: Mike Turquette
    Signed-off-by: Gerhard Sittig
    Signed-off-by: Anatolij Gustschin

    Gerhard Sittig