Merge tag 'sunxi-fixes-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 4 Aug 2017 11:04:42 +0000 (13:04 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 4 Aug 2017 11:04:42 +0000 (13:04 +0200)
commitae119859a1bf228231c9a8f25f6b69cc92d447b0
treeb00210817742de4badd6b653a79a9acf661a4da4
parent3d8db0a889a7f6a1f3a4f67bd4c598a7fd42141a
parentc50f9fb6c535edf4731eecb53d91ebc297e82e5b
Merge tag 'sunxi-fixes-for-4.13' of https://git./linux/kernel/git/sunxi/linux into fixes

Pull "Allwinner fixes for 4.13" from Chen-Yu Tsai:

Two fixes to correct the EMAC blocks memory region size to match the
datasheet. One that converts raw A83T clock indices to macros from the
clk dt-binding header, completing the A83T sunxi-ng clk driver.

* tag 'sunxi-fixes-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sun8i: a83t: Switch to CCU device tree binding macros
  arm64: allwinner: sun50i-a64: Correct emac register size
  ARM: dts: sunxi: h3/h5: Correct emac register size