diff options
| author | Praneeth Bajjuri <praneeth@ti.com> | 2015-02-03 15:45:57 -0600 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2015-02-03 15:45:57 -0600 |
| commit | 95b851016f79c42a9e8a824c7c81e49015c17820 (patch) | |
| tree | 61e096ff6a654315c40a00eaff682be00c50f861 /arch/arm/boot/dts/dra72-evm.dts | |
| parent | c73470c1da26dc543452fbff16a02beb62fec938 (diff) | |
| parent | 94953719b7d459c72eede4a0164d49dfcfc76a94 (diff) | |
Merge branch 'p-ti-linux-3.14.y-android' of git://git.omapzoom.org/kernel/omap into p-ti-linux-3.14.y-android
* 'p-ti-linux-3.14.y-android' of git://git.omapzoom.org/kernel/omap: (216 commits)
usb: dwc3: debugfs: dual role switch through debugfs entries
ARM: DRA7: dts: Add coprocessor nodes for iva
remoteproc/pruss: fix shutdown for manually booted PRU cores
remoteproc/pruss: fix the cleanup path in pru_rproc_probe()
UAPI: Increasing the max FRAME number to 128.
gpio: mcp23s08: Set initial direction and value from DT
firmware: Load VPDMA firmware from kernel
iommu/omap: Fix a sleeping function invocation in atomic context bug
media: ti-vpe: vpe: Add RGB565 and RGB5551 support
media: ti-vpe: vpe: Post next descriptor only for list complete IRQ
media: ti-vpe: vpe: Setup srcdst parameters in streamON
omapdrm: Expose the OMAP pre-multiplied alpha property through DRM
omapdrm: Expose the OMAP global alpha property through DRM
ti_fragments: audio_display: enable BACKLIGHT_GPIO and PANEL_DPI
ti_fragments: audio_display: clean up
arm/dts: am57xx-evm: Add LCD support
backlight: gpio-backlight: Add DT support
arm/dts: dra7xx: fix display compatible strings
OMAPDSS: add missing 'omapdss' prefixes to display drivers
OMAPDSS: add dra7-dss to dt conversion list
...
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Diffstat (limited to 'arch/arm/boot/dts/dra72-evm.dts')
| -rw-r--r-- | arch/arm/boot/dts/dra72-evm.dts | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts index 1271fd92c82..c747dd63ebd 100644 --- a/arch/arm/boot/dts/dra72-evm.dts +++ b/arch/arm/boot/dts/dra72-evm.dts @@ -27,7 +27,7 @@ }; tpd12s015: encoder@0 { - compatible = "omapdss,ti,tpd12s015"; + compatible = "ti,tpd12s015"; pinctrl-names = "default"; pinctrl-0 = <&hpd_pin>; @@ -59,7 +59,7 @@ }; hdmi0: connector@0 { - compatible = "omapdss,hdmi-connector"; + compatible = "hdmi-connector"; label = "hdmi"; type = "a"; @@ -96,6 +96,13 @@ reusable; status = "okay"; }; + + /* Required by cmem driver used by radio */ + cmem_radio: cmem@95400000 { + reg = <0x95400000 0x400000>; + no-map; + status = "okay"; + }; }; extcon1: dra7x_usbid_extcon1 { |