Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d52c5bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull DeviceTree fixes from Rob Herring:

 - fix for stdout-path option parsing with added unittest

 - fix for stdout-path interaction with earlycon

 - several DT unittest fixes

 - fix Sparc allmodconfig build error on of_platform_register_reconfig_notifier

 - several DT overlay kconfig and build warning fixes

 - several DT binding documentation updates

* tag 'devicetree-fixes-for-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of/platform: Fix sparc:allmodconfig build
  of: unittest: Add options string testcase variants
  of: fix handling of '/' in options for of_find_node_by_path()
  of/unittest: Fix the wrong expected value in of_selftest_property_string
  of/unittest: remove the duplicate of_changeset_init
  dt: submitting-patches: clarify that DT maintainers are to be cced on bindings
  of: unittest: fix I2C dependency
  of/overlay: Remove unused variable
  Documentation: DT: Renamed of-serial.txt to 8250.txt
  of: Fix premature bootconsole disable with 'stdout-path'
  serial: add device tree binding documentation for ETRAX FS UART
  of/overlay: Directly include idr.h
  of: Drop superfluous dependance for OF_OVERLAY
  of: Add vendor prefix for Arasan
  of: Add prompt for OF_OVERLAY config
parents f788baad a697c2ef

Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt

0 → 100644
+19 −0
Original line number Original line Diff line number Diff line 
ETRAX FS UART



Required properties:

- compatible : "axis,etraxfs-uart"

- reg: offset and length of the register set for the device.

- interrupts: device interrupt



Optional properties:

- {dtr,dsr,ri,cd}-gpios: specify a GPIO for DTR/DSR/RI/CD

  line respectively.



Example:



serial@b00260000 {

	compatible = "axis,etraxfs-uart";

	reg = <0xb0026000 0x1000>;

	interrupts = <68>;

	status = "disabled";

};

Documentation/devicetree/bindings/submitting-patches.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,9 @@ I. For patch submitters 




       devicetree@vger.kernel.org

       devicetree@vger.kernel.org





     and Cc: the DT maintainers. Use scripts/get_maintainer.pl to identify

     all of the DT maintainers.



  3) The Documentation/ portion of the patch should come in the series before

  3) The Documentation/ portion of the patch should come in the series before

     the code implementing the binding.

     the code implementing the binding.

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ amlogic Amlogic, Inc. 
ams	AMS AG

ams	AMS AG

amstaos	AMS-Taos Inc.

amstaos	AMS-Taos Inc.

apm	Applied Micro Circuits Corporation (APM)

apm	Applied Micro Circuits Corporation (APM)

arasan	Arasan Chip Systems

arm	ARM Ltd.

arm	ARM Ltd.

armadeus	ARMadeus Systems SARL

armadeus	ARMadeus Systems SARL

asahi-kasei	Asahi Kasei Corp.

asahi-kasei	Asahi Kasei Corp.
@@ -27,6 +28,7 @@ atmel Atmel Corporation 
auo	AU Optronics Corporation

auo	AU Optronics Corporation

avago	Avago Technologies

avago	Avago Technologies

avic	Shanghai AVIC Optoelectronics Co., Ltd.

avic	Shanghai AVIC Optoelectronics Co., Ltd.

axis	Axis Communications AB

bosch	Bosch Sensortec GmbH

bosch	Bosch Sensortec GmbH

brcm	Broadcom Corporation

brcm	Broadcom Corporation

buffalo	Buffalo, Inc.

buffalo	Buffalo, Inc.

drivers/of/Kconfig

+1 −2
Original line number Original line Diff line number Diff line
@@ -84,8 +84,7 @@ config OF_RESOLVE 
	bool

	bool





config OF_OVERLAY

config OF_OVERLAY

	bool

	bool "Device Tree overlays"

	depends on OF

	select OF_DYNAMIC

	select OF_DYNAMIC

	select OF_RESOLVE

	select OF_RESOLVE