diff options
author | Arnd Bergmann <arnd@arndb.de> | 2020-05-21 23:16:36 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2020-05-21 23:16:37 +0200 |
commit | 9440d8acb5acf991d1e0c5ba3d1594cdcf6a17d8 (patch) | |
tree | 606129a1b36ec10fe8d0d283d5b3982836c57756 /arch/arm/mach-lpc32xx/serial.c | |
parent | f0c59fd97c6e45d04fe8ac258e6cbccc5480d316 (diff) | |
parent | 54b1a4e070330c3fba5becfb0b619bf360bc2657 (diff) |
Merge tag 'v5.8-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt
RGA node for rk322x, wifi node for rk3229-xms6 and some cleanups.
* tag 'v5.8-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: add rga node for rk322x
ARM: dts: remove disable-wp from rk3229-xms6 emmc
ARM: dts: enable WLAN for Mecer Xtreme Mini S6
ARM: dts: rockchip: remove identical #include from rk3288.dtsi
ARM: dts: rockchip: rename and label gpio-led subnodes
Link: https://lore.kernel.org/r/3735080.6Cexqc3t0Y@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-lpc32xx/serial.c')
0 files changed, 0 insertions, 0 deletions