• Olof Johansson's avatar
    Merge branch 'zynq/multiplatform' of git://git.monstr.eu/linux-2.6-microblaze... · 3f54db78
    Olof Johansson authored
    Merge branch 'zynq/multiplatform' of git://git.monstr.eu/linux-2.6-microblaze into next/multiplatform
    
    From Michal Simek:
    
    This branch depends on arm-soc devel/debug_ll_init branch because
    we needed Rob's "ARM: implement debug_ll_io_init()"
    (sha1: afaee03511ba8002b26a9c6b1fe7d6baf33eac86)
    patch.
    
    This branch also depends on zynq/dt branch because of previous major
    zynq changes.
    zynq/cleanup branch is subset of zynq/dt.
    
    * 'zynq/multiplatform' of git://git.monstr.eu/linux-2.6-microblaze:
      ARM: zynq: Remove all unused mach headers
      ARM: zynq: add support for ARCH_MULTIPLATFORM
      ARM: zynq: make use of debug_ll_io_init()
      ARM: zynq: remove TTC early mapping
      ARM: zynq: add clk binding support to the ttc
      ARM: zynq: use zynq clk bindings
      clk: Add support for fundamental zynq clks
      ARM: zynq: dts: split up device tree
      ARM: zynq: Allow UART1 to be used as DEBUG_LL console.
      ARM: zynq: dts: add description of the second uart
      ARM: zynq: move arm-specific sys_timer out of ttc
      zynq: move static peripheral mappings
      zynq: remove use of CLKDEV_LOOKUP
      zynq: use pl310 device tree bindings
      zynq: use GIC device tree bindings
    
    Add/add conflict in arch/arm/Kconfig.debug.
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    3f54db78
Kconfig 65.2 KB