Merge tag 'actions-arm-dt-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel...

Actions Semi ARM DT for v5.10:

- Add devicetree support for Caninos Loucos Labrador SBC manufactured
  by Laboratory of Integrated Technological Systems (LSI-TEC), Brazil.
  This board is based on Actions Semi S500 SoC. More information about
  this board can be found in their website: https://caninosloucos.org/en/

- Fix PPI interrupt specifiers for peripherals attached to Cortex-A9 CPU

- Add devicetree support for RoseapplePi SBC manufactured by Roseapple Pi
  team in Taiwan. This board is based on Actions Semi S500 SoC.
  More information about this board can be found in their website:
  http://roseapplepi.org/

* tag 'actions-arm-dt-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions:
  ARM: dts: owl-s500: Add RoseapplePi
  ARM: dts: owl-s500: Fix incorrect PPI interrupt specifiers
  ARM: dts: Add Caninos Loucos Labrador v2

Link: https://lore.kernel.org/r/20200922113712.GB11251@Mani-XPS-13-9360
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/boot/dts/Makefile
index 1ea4cea,b785485..89e6243
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -873,10 -868,9 +873,12 @@@ dtb-$(CONFIG_ARCH_ORION5X) += 
  dtb-$(CONFIG_ARCH_ACTIONS) += \
        owl-s500-cubieboard6.dtb \
        owl-s500-guitar-bb-rev-b.dtb \
+       owl-s500-labrador-base-m.dtb \
+       owl-s500-roseapplepi.dtb \
        owl-s500-sparky.dtb
 +dtb-$(CONFIG_ARCH_PICOXCELL) += \
 +      picoxcell-pc7302-pc3x2.dtb \
 +      picoxcell-pc7302-pc3x3.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += \
        prima2-evb.dtb
  dtb-$(CONFIG_ARCH_PXA) += \