]> Git Repo - linux.git/commitdiff
Merge tag 'pxa-dt-4.21' of https://github.com/rjarzmik/linux into next/dt
authorOlof Johansson <[email protected]>
Tue, 11 Dec 2018 15:43:46 +0000 (07:43 -0800)
committerOlof Johansson <[email protected]>
Tue, 11 Dec 2018 15:43:46 +0000 (07:43 -0800)
This device-tree pxa update brings :
 - various fixes from Daniel (W=12 issues mainly)
 - support for the first pxa3xx devicetree pxa board

* tag 'pxa-dt-4.21' of https://github.com/rjarzmik/linux:
  ARM: dts: pxa3xx: Add Raumfeld DTS files
  ARM: dts: pxa: clean up USB controller nodes
  ARM: dts: pxa3xx: clean up pxa3xx clock controller node name
  ARM: dts: pxa3xx: order timer and gcu nodes under /pxabus
  ARM: dts: pxa2xx: fix hwuart memory range
  ARM: dts: pxa3xx: drop #address-cells and #size-cells from pinctrl node
  ARM: dts: pxa2xx: drop #address-cells and #size-cells from /cpus
  ARM: dts: pxa3xx: add gcu node

Signed-off-by: Olof Johansson <[email protected]>
1  2 
arch/arm/boot/dts/Makefile

index 1ef2133a18c2769aa8101a1156c2450330153769,3fc3412ea55d57b650ac71d3e319b08e3ee128cb..6e843f3274fc585a889288a108344562959f23d3
@@@ -89,7 -89,6 +89,7 @@@ dtb-$(CONFIG_ARCH_BCM_5301X) += 
        bcm4708-asus-rt-ac68u.dtb \
        bcm4708-buffalo-wzr-1750dhp.dtb \
        bcm4708-linksys-ea6300-v1.dtb \
 +      bcm4708-linksys-ea6500-v2.dtb \
        bcm4708-luxul-xap-1510.dtb \
        bcm4708-luxul-xwc-1000.dtb \
        bcm4708-netgear-r6250.dtb \
@@@ -779,11 -778,19 +779,18 @@@ dtb-$(CONFIG_ARCH_ACTIONS) += 
        owl-s500-sparky.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += \
        prima2-evb.dtb
+ dtb-$(CONFIG_ARCH_PXA) += \
+       pxa300-raumfeld-connector.dtb \
+       pxa300-raumfeld-controller.dtb \
+       pxa300-raumfeld-speaker-l.dtb \
+       pxa300-raumfeld-speaker-m.dtb \
+       pxa300-raumfeld-speaker-one.dtb \
+       pxa300-raumfeld-speaker-s.dtb
  dtb-$(CONFIG_ARCH_OXNAS) += \
        ox810se-wd-mbwe.dtb \
        ox820-cloudengines-pogoplug-series-3.dtb
  dtb-$(CONFIG_ARCH_QCOM) += \
        qcom-apq8060-dragonboard.dtb \
 -      qcom-apq8064-arrow-sd-600eval.dtb \
        qcom-apq8064-cm-qs600.dtb \
        qcom-apq8064-ifc6410.dtb \
        qcom-apq8064-sony-xperia-yuga.dtb \
This page took 0.07209 seconds and 4 git commands to generate.