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

Commit 2f5bb02f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.8-rc5 into driver-core-next 



We want the sysfs and kernfs in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 2c507e46 c6935931

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu> 
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>

Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>

Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/ABI/stable/sysfs-devices

+1 −1
Original line number Diff line number Diff line 
# Note: This documents additional properties of any device beyond what

# is documented in Documentation/sysfs-rules.txt



What:		/sys/devices/*/of_path

What:		/sys/devices/*/of_node

Date:		February 2015

Contact:	Device Tree mailing list <devicetree@vger.kernel.org>

Description:

Documentation/PCI/pci.txt

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ initialization with a pointer to a structure describing the driver 


The ID table is an array of struct pci_device_id entries ending with an

all-zero entry.  Definitions with static const are generally preferred.

Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.



Each entry consists of:

Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ Required properties: 
- vref-supply: The regulator supply ADC reference voltage.

- #io-channel-cells: Should be 1, see ../iio-bindings.txt



Optional properties:

- resets: Must contain an entry for each entry in reset-names if need support

	  this option. See ../reset/reset.txt for details.

- reset-names: Must include the name "saradc-apb".



Example:

	saradc: saradc@2006c000 {

		compatible = "rockchip,saradc";
@@ -23,6 +28,8 @@ Example: 
		interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;

		clock-names = "saradc", "apb_pclk";

		resets = <&cru SRST_SARADC>;

		reset-names = "saradc-apb";

		#io-channel-cells = <1>;

		vref-supply = <&vcc18>;

	};

Documentation/devicetree/bindings/serial/8250.txt

+0 −19
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ Optional properties: 
- auto-flow-control: one way to enable automatic flow control support. The

  driver is allowed to detect support for the capability even without this

  property.

- {rts,cts,dtr,dsr,rng,dcd}-gpios: specify a GPIO for RTS/CTS/DTR/DSR/RI/DCD

  line respectively. It will use specified GPIO instead of the peripheral

  function pin for the UART feature. If unsure, don't specify this property.



Note:

* fsl,ns16550:
@@ -66,19 +63,3 @@ Example: 
		interrupts = <10>;

		reg-shift = <2>;

	};
 


Example for OMAP UART using GPIO-based modem control signals:



	uart4: serial@49042000 {

		compatible = "ti,omap3-uart";

		reg = <0x49042000 0x400>;

		interrupts = <80>;

		ti,hwmods = "uart4";

		clock-frequency = <48000000>;

		cts-gpios = <&gpio3 5 GPIO_ACTIVE_LOW>;

		rts-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;

		dtr-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;

		dsr-gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;

		dcd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;

		rng-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;

	};