From: Olof Johansson Date: Mon, 26 May 2014 20:35:57 +0000 (-0700) Subject: Merge tag 'berlin-dt-3.16' of https://github.com/shesselba/linux-berlin into next/dt X-Git-Tag: v3.16-rc1~30^2~41^2~7 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=84cc8a7114012b0e2a2195b9c53cf9aac9860960;p=linux.git Merge tag 'berlin-dt-3.16' of https://github.com/shesselba/linux-berlin into next/dt Merge "ARM: berlin: DT changes for v3.16" from Sebastian Hesselbart: Quite a lot changes but it looks like DT approach is really paying off. BG2Q joins Berlin SoC family with corresponding development board, DW gpio nodes for all SoCs. Most notably, we have settled clock bindings to allow us to continue on drivers requiring clocks and pinctrl bindings. Last but not least, BG2Q gained SDHCI support and is able to properly boot into userspace. * tag 'berlin-dt-3.16' of https://github.com/shesselba/linux-berlin: ARM: dts: berlin: enable SD card reader and eMMC for the BG2Q DMP ARM: dts: berlin: add the SDHCI nodes for the BG2Q ARM: dts: berlin: add the pinctrl node and muxing setup for uarts dt-binding: ARM: add pinctrl binding docs for Marvell Berlin2 SoCs ARM: dts: berlin: convert BG2Q to DT clock nodes ARM: dts: berlin: convert BG2 to DT clock nodes ARM: dts: berlin: convert BG2CD to DT clock nodes clk: berlin: add binding include for Berlin SoC clock ids dt-binding: ARM: add clock binding docs for Marvell Berlin2 SoCs ARM: dts: berlin: add the BG2CD GPIO nodes ARM: dts: berlin: add the BG2 GPIO nodes ARM: dts: berlin: add the BG2Q GPIO nodes ARM: dts: berlin: add scu and chipctrl device nodes for BG2/BG2Q ARM: dts: berlin: add the Marvell BG2-Q DMP device tree ARM: dts: berlin: add the Marvell Armada 1500 pro Signed-off-by: Olof Johansson --- 84cc8a7114012b0e2a2195b9c53cf9aac9860960 diff --cc arch/arm/boot/dts/Makefile index e063234b806d,076cc309b73f..b350409d5829 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@ -51,12 -51,14 +51,13 @@@ dtb-$(CONFIG_ARCH_AT91) += sama5d36ek.d dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb +dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ bcm21664-garnet.dtb -dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb -dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb dtb-$(CONFIG_ARCH_BERLIN) += \ berlin2-sony-nsz-gs7.dtb \ - berlin2cd-google-chromecast.dtb + berlin2cd-google-chromecast.dtb \ + berlin2q-marvell-dmp.dtb dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ da850-evm.dtb dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb