Skip to content

Commit

Permalink
Merge tag 'omap-for-v4.2/dt-pt2' of git://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history
…x/kernel/git/tmlind/linux-omap into next/dt

Few more omap device tree changes for v4.2 merge window:

- Add dm9000 Ethernet support to omap3-devkit8000

- Add Toby-Churchill SL50 board support

- Add vendor prefix for Toby Churchill Ltd

* tag 'omap-for-v4.2/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-sl50: Add Toby-Churchill SL50 board support.
  of: Add vendor prefix for Toby Churchill Ltd.
  ARM: dts: omap3-devkit8000: Add dm9000 support
  • Loading branch information
Kevin Hilman committed Jun 11, 2015
2 parents 7d5a0ff + 8584d4f commit 1647e3c
Show file tree
Hide file tree
Showing 4 changed files with 525 additions and 0 deletions.
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/vendor-prefixes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ ste ST-Ericsson
stericsson ST-Ericsson
synology Synology, Inc.
tbs TBS Technologies
tcl Toby Churchill Ltd.
thine THine Electronics, Inc.
ti Texas Instruments
tlm Trusted Logic Mobility
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \
am335x-base0033.dtb \
am335x-bone.dtb \
am335x-boneblack.dtb \
am335x-sl50.dtb \
am335x-evm.dtb \
am335x-evmsk.dtb \
am335x-nano.dtb \
Expand Down
Loading

0 comments on commit 1647e3c

Please sign in to comment.