From: Arnd Bergmann Date: Tue, 3 Sep 2019 13:05:36 +0000 (+0200) Subject: Merge tag 'v5.4-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v5.15~5559^2~29 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c70bcf72dc6b42720e6eff5a71ee82fe8ccd2c3;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'v5.4-rockchip-dts64-1' of git://git./linux/kernel/git/mmind/linux-rockchip into arm/dt PWM-Fan and nor-flash for the RockPro64, a better display mode for the Kevin Chromebook and a new board the Leez P710 SBC. * tag 'v5.4-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Add dts for Leez RK3399 P710 SBC arm64: dts: rockchip: enable internal SPI flash for RockPro64. arm64: dts: rockchip: Add PWM fan for RockPro64 arm64: dts: rockchip: Specify override mode for kevin panel Link: https://lore.kernel.org/r/20190819141659.26414-1-dinguyen@kernel.org Link: https://lore.kernel.org/r/2362486.gYoCZEsBuK@phil Signed-off-by: Arnd Bergmann --- 2c70bcf72dc6b42720e6eff5a71ee82fe8ccd2c3 diff --cc Documentation/devicetree/bindings/arm/rockchip.yaml index 4a1a28e,da9cd94..474f961 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@@ -359,11 -329,11 +359,16 @@@ properties - khadas,edge-v - const: rockchip,rk3399 + - description: Mecer Xtreme Mini S6 + items: + - const: mecer,xms6 + - const: rockchip,rk3229 + + - description: Leez RK3399 P710 + items: + - const: leez,p710 + - const: rockchip,rk3399 + - description: mqmaker MiQi items: - const: mqmaker,miqi