• Arnd Bergmann's avatar
    Merge tag 'zynq-cleanup-for-3.15-v2' of git://git.xilinx.com/linux-xlnx into next/cleanup2 · 32adc19d
    Arnd Bergmann authored
    Merge "arm: Xilinx Zynq cleanup patches for v3.15" from Michal Simek:
    
    - Redesign SLCR initialization to enable
      driver developing which targets SLCR space
    
    * tag 'zynq-cleanup-for-3.15-v2' of git://git.xilinx.com/linux-xlnx:
      ARM: zynq: Add waituart implementation
      ARM: zynq: Move of_clk_init from clock driver
      ARM: zynq: Introduce zynq_slcr_unlock()
      ARM: zynq: Add and use zynq_slcr_read/write() helper functions
      ARM: zynq: Make zynq_slcr_base static
      ARM: zynq: Map I/O memory on clkc init
      ARM: zynq: Hang iomapped slcr address on device_node
      ARM: zynq: Split slcr in two parts
      ARM: zynq: Move clock_init from slcr to common
      arm: dt: zynq: Add fclk-enable property to clkc node
    
    [Arnd: remove SOC_BUS support from pull request]
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    32adc19d
common.c 3.4 KB