diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-22 16:25:04 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-22 16:25:04 -0700 |
| commit | 9e3cffd8772adf8e22f7d92b260708ed5add751f (patch) | |
| tree | 3816af0853d1b7c6238ced461da93c7849acc8ab /arch/arm/boot/dts/Makefile | |
| parent | 7d132de8b0caece3b23098aee97df07e82e27fc0 (diff) | |
| parent | f9d50fef4b6447527c2be1ad07499221c2511391 (diff) | |
Merge tag 'omap-for-v4.3/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Merge "omap dts changes for v4.3, part2" from Tony Lindgren:
More omap dts changes for v4.3 merge window:
- Add missing devices for pandora. Note that we're adding wl1251
WLAN and LCD backlight support for now using legacy pdata as that
allows us to drop the legacy board file for pandora in another
series of patches
- Enable power button support for omap5-uevm
- Add aliases for am437x UARTs
- Add support for phyCORE phyBOARD-WEGA-AM335x rdk and
phyCORE-AM335x SoM
- Use u16 values for tsc2046 on omap3-lilly
* tag 'omap-for-v4.3/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: omap3-pandora: add wifi support
ARM: OMAP2+: omap3-pandora: add backlight support
ARM: dts: omap3-pandora: add support for usb host and 32k buffer
ARM: dts: omap3-pandora: miscellaneous corrections
ARM: dts: omap5-uevm: Add Palmas power button support
ARM: dts: am437x: add aliases for all UART instances
ARM: dts: Add phyBOARD-WEGA-AM335x rdk
ARM: dts: Add support for phyCORE-AM335x SoM
ARM: dts: omap3: correct the format of u16 values for tsc2046 node
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 2304076de542..65f8433c35c2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -445,7 +445,8 @@ dtb-$(CONFIG_SOC_AM33XX) += \ am335x-nano.dtb \ am335x-pepper.dtb \ am335x-lxm.dtb \ - am335x-chiliboard.dtb + am335x-chiliboard.dtb \ + am335x-wega-rdk.dtb dtb-$(CONFIG_ARCH_OMAP4) += \ omap4-duovero-parlor.dtb \ omap4-panda.dtb \ |