Unverified Commit 197da801 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v7.1/soc-signed' of... 

Merge tag 'omap-for-v7.1/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/arm

ARM: soc/omap updates for v7.1

* tag 'omap-for-v7.1/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap

:
  ARM: omap2: dead code cleanup in kconfig for ARCH_OMAP4
  ARM: OMAP1: Fix DEBUG_LL and earlyprintk on OMAP16XX
  ARM: omap: fix all kernel-doc warnings
  ARM: omap2: Replace scnprintf with strscpy in omap3_cpuinfo

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 13c4068f 2c4059f5

Documentation/devicetree/bindings/arm/ti/omap.yaml

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ properties: 
              - motorola,droid-bionic   # Motorola Droid Bionic XT875

              - motorola,xyboard-mz609

              - motorola,xyboard-mz617

              - samsung,espresso7

              - samsung,espresso10

              - ti,omap4-panda

              - ti,omap4-sdp

          - const: ti,omap4430

Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ properties: 
    oneOf:

      - items:

          - enum:

              - doestek,dtc34lm85am # For the Doestek DTC34LM85AM Flat Panel Display (FPD) Transmitter

              - onnn,fin3385  # OnSemi FIN3385

              - ti,ds90c185   # For the TI DS90C185 FPD-Link Serializer

              - ti,ds90c187   # For the TI DS90C187 FPD-Link Serializer

Documentation/devicetree/bindings/display/panel/panel-lvds.yaml

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ properties: 
          - hydis,hv070wx2-1e0

          # Jenson Display BL-JT60050-01A 7" WSVGA (1024x600) color TFT LCD LVDS panel

          - jenson,bl-jt60050-01a

          # Samsung LTN070NL01 7.0" WSVGA (1024x600) TFT LCD LVDS panel

          - samsung,ltn070nl01

          # Samsung LTN101AL03 10.1" WXGA (800x1280) TFT LCD LVDS panel

          - samsung,ltn101al03

          - tbs,a711-panel

          # Winstar WF70A8SYJHLNGA 7" WSVGA (1024x600) color TFT LCD LVDS panel

          - winstar,wf70a8syjhlnga

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -441,6 +441,8 @@ patternProperties: 
    description: D-Link Corporation

  "^dmo,.*":

    description: Data Modul AG

  "^doestek,.*":

    description: Doestek Co., Ltd.

  "^domintech,.*":

    description: Domintech Co., Ltd.

  "^dongwoon,.*":

arch/arm/boot/dts/ti/omap/Makefile

+15 −0
Original line number Diff line number Diff line
@@ -80,8 +80,14 @@ dtb-$(CONFIG_ARCH_OMAP4) += \ 
	omap4-sdp-es23plus.dtb \

	omap4-var-dvk-om44.dtb \

	omap4-var-stk-om44.dtb \

	omap4-samsung-espresso7.dtb \

	omap4-samsung-espresso10.dtb \

	omap4-xyboard-mz609.dtb \

	omap4-xyboard-mz617.dtb



am335x-bonegreen-hdmi-00a0-dtbs := am335x-bonegreen-eco.dtb \

	am335x-bone-hdmi-00a0.dtbo



dtb-$(CONFIG_SOC_AM33XX) += \

	am335x-baltos-ir2110.dtb \

	am335x-baltos-ir3220.dtb \
@@ -93,6 +99,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ 
	am335x-bonegreen.dtb \

	am335x-bonegreen-wireless.dtb \

	am335x-bonegreen-eco.dtb \

	am335x-bonegreen-hdmi-00a0.dtb \

	am335x-chiliboard.dtb \

	am335x-cm-t335.dtb \

	am335x-evm.dtb \
@@ -174,3 +181,11 @@ dtb-$(CONFIG_SOC_TI81XX) += \ 
	dm8148-t410.dtb \

	dm8168-evm.dtb \

	dra62x-j5eco-evm.dtb



# Enable support for device-tree overlays

DTC_FLAGS_am335x-bone += -@

DTC_FLAGS_am335x-boneblack += -@

DTC_FLAGS_am335x-boneblack-wireless += -@

DTC_FLAGS_am335x-bonegreen += -@

DTC_FLAGS_am335x-bonegreen-wireless += -@

DTC_FLAGS_am335x-bonegreen-eco += -@