diff options
| author | Olof Johansson <olof@lixom.net> | 2017-04-19 06:33:14 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 06:33:14 -0700 |
| commit | b42f45558e77724cb53e8885b26596ffa4f71434 (patch) | |
| tree | 545d098bf5ca38d967c132506922c54d9810eff2 /fs/xfs/xfs_mru_cache.h | |
| parent | 13ed63b6cbdf3b99abf47fd92325a18dc6282152 (diff) | |
| parent | f006aaf7b11230e38a35f09d706e751fa77eb799 (diff) | |
Merge tag 'zte-dt64-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt64
ZTE arm64 device tree updates for 4.12:
- Add mmc devices for ZX296718 SoC and enable those available on
zx296718-evb board.
- Add VOU controller device, output devices HDMI and TVENC, and enable
display support for zx296718-evb board.
- Remove pll_vga clock from ZX296718 device tree, as it's not a fixed
rate clock.
* tag 'zte-dt64-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: dts: zte: add tvenc device for zx296718
arm64: dts: zte: add vou and hdmi devices for zx296718
arm64: dts: zte: add mmc devices for zx296718
arm64: dts: zte: remove zx296718 pll_vga clock
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/xfs/xfs_mru_cache.h')
0 files changed, 0 insertions, 0 deletions