diff options
| author |   Olof Johansson <olof@lixom.net> | 2014-03-09 11:40:13 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-09 11:40:26 -0700 |
| commit | 1809136044bde55f70198c97de86296682c85413 (patch) | |
| tree | 667087863431612a0dc0f28f55d7f856409d8384 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'exynos-clk' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt (diff) | |
| parent | ARM: sun6i: dt: Fix mod0 compatible (diff) | |
| download | linux-dev-1809136044bde55f70198c97de86296682c85413.tar.xz linux-dev-1809136044bde55f70198c97de86296682c85413.zip | |
Merge tag 'sunxi-dt-for-3.15' of https://github.com/mripard/linux into next/dt
Allwinner DT patches for 3.15, take 1 from Maxime Ripard:
- Add SPI controllers for all the SoCs
- Add various missing aliases
- Add USB clocks nodes
- Addition of the GMAC support
- Introduction of the pcDuino board
- A few DT cleanup patches: change of compatibles,
* tag 'sunxi-dt-for-3.15' of https://github.com/mripard/linux: (33 commits)
ARM: sun6i: dt: Fix mod0 compatible
ARM: dts: sun7i: Enable the SPI controllers of the A20-olinuxino-micro
ARM: dt: sun7i: Add SPI muxing options
ARM: dt: sun5i: Add A13 SPI controller nodes
ARM: dt: sun5i: Add A10s SPI controller nodes
ARM: dt: sun4i: Add A10 SPI controller nodes
ARM: dt: sun7i: Add A20 SPI controller nodes
ARM: sun4i: dt: Remove grouping + simple-bus compatible for regulators
ARM: sunxi: dt: Convert to the new clock compatibles
ARM: sun7i: add arch timer node
ARM: sun7i: dt: Add bindings for USB clocks
ARM: sun5i: dt: Add bindings for USB clocks
ARM: sun4i: dt: Add bindings for USB clocks
ARM: dts: sun7i: Add ethernet alias for GMAC
ARM: dts: sun7i: a20-olinuxino-micro: Enable GMAC instead of EMAC
ARM: dts: sun7i: cubieboard2: Enable GMAC instead of EMAC
ARM: dts: sun7i: cubietruck: Enable the GMAC
ARM: dts: sun7i: Add pin muxing options for the GMAC
ARM: dts: sun7i: Add GMAC controller node to sun7i DTSI
ARM: dts: sun7i: Add GMAC clock node to sun7i DTSI
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 0ae79496752c..a4d8b617e5bf 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -322,6 +322,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ sun4i-a10-cubieboard.dtb \ sun4i-a10-mini-xplus.dtb \ sun4i-a10-hackberry.dtb \ + sun4i-a10-pcduino.dtb \ sun5i-a10s-olinuxino-micro.dtb \ sun5i-a13-olinuxino.dtb \ sun5i-a13-olinuxino-micro.dtb \ |