• Arnd Bergmann's avatar
    Merge branch 'boards' of... · 63cd201e
    Arnd Bergmann authored
    Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2
    
    * This pull request is based on a merge of
      a) The renesas/boards branch of the arm-soc tree
      b) The soc branch of the renesas tree,
         which I have sent a separate pull requst for
    
    * "sh: clkfwk: add sh_clk_fsidiv_register()" is a driver patch
      which is a dependency of
      - ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks
      - ARM: shmobile: r8a7740: add FSI-DVI clocks
      I have spoken to the driver maintainer, Paul Mundt, and he has indicated
      that he thinks it is best to merge all in one go and acked the patch for
      inclusion in this pull-request.
    
    * The following patches
      - ARM: shmobile: use FSI driver's audio clock on ap4evb
      - ARM: shmobile: use FSI driver's audio clock on mackerel
      - ARM: shmobile: use FSI driver's audio clock on armadillo800eva
      Have a compile-time dependency on the following patch which is present in
      the for-next branch of Mark Brown's sound tree on kernel.org
      - ASoC: fsi: add master clock control functions
        (ab6f6d85)
    
    * 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
      ARM: shmobile: use FSI driver's audio clock on ap4evb
      ARM: shmobile: use FSI driver's audio clock on mackerel
      ARM: shmobile: use FSI driver's audio clock on armadillo800eva
      ARM: shmobile: mackerel: enable DMAEngine on USB Host
      ARM: shmobile: marzen: add USB OHCI driver support
      ARM: shmobile: marzen: add USB EHCI driver support
      ARM: shmobile: marzen: add USB phy support
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    63cd201e
board-armadillo800eva.c 29.2 KB