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

Commit 941742f4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

parents ac7ba51c 5879ae5f

Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ Example: 
		touchscreen-fuzz-x = <4>;

		touchscreen-fuzz-y = <7>;

		touchscreen-fuzz-pressure = <2>;

		touchscreen-max-x = <4096>;

		touchscreen-max-y = <4096>;

		touchscreen-size-x = <4096>;

		touchscreen-size-y = <4096>;

		touchscreen-max-pressure = <2048>;



		ti,x-plate-ohms = <280>;

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+2 −4
Original line number Diff line number Diff line
@@ -15,10 +15,8 @@ Optional properties: 
  - phys: phandle + phy specifier pair

  - phy-names: must be "usb"

  - dmas: Must contain a list of references to DMA specifiers.

  - dma-names : Must contain a list of DMA names:

   - tx0 ... tx<n>

   - rx0 ... rx<n>

    - This <n> means DnFIFO in USBHS module.

  - dma-names : named "ch%d", where %d is the channel number ranging from zero

                to the number of channels (DnFIFOs) minus one.



Example:

	usbhs: usb@e6590000 {

MAINTAINERS

+6 −4
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ trivial patch so apply some common sense. 
	or does something very odd once a month document it.



	PLEASE remember that submissions must be made under the terms

	of the OSDL certificate of contribution and should include a

	Signed-off-by: line.  The current version of this "Developer's

	Certificate of Origin" (DCO) is listed in the file

	of the Linux Foundation certificate of contribution and should

	include a Signed-off-by: line.  The current version of this

	"Developer's Certificate of Origin" (DCO) is listed in the file

	Documentation/SubmittingPatches.



6.	Make sure you have the right to send any changes you make. If you
@@ -7587,6 +7587,7 @@ F: drivers/pci/host/pci-exynos.c 


PCI DRIVER FOR SYNOPSIS DESIGNWARE

M:	Jingoo Han <jingoohan1@gmail.com>

M:	Pratyush Anand <pratyush.anand@gmail.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	drivers/pci/host/*designware*
@@ -7600,8 +7601,9 @@ F: Documentation/devicetree/bindings/pci/host-generic-pci.txt 
F:	drivers/pci/host/pci-host-generic.c



PCIE DRIVER FOR ST SPEAR13XX

M:	Pratyush Anand <pratyush.anand@gmail.com>

L:	linux-pci@vger.kernel.org

S:	Orphan

S:	Maintained

F:	drivers/pci/host/*spear*



PCMCIA SUBSYSTEM

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 1

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

arch/arm/boot/dts/am335x-bone-common.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -223,6 +223,25 @@ 
/include/ "tps65217.dtsi"



&tps {

	/*

	 * Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only

	 * mode") at poweroff.  Most BeagleBone versions do not support RTC-only

	 * mode and risk hardware damage if this mode is entered.

	 *

	 * For details, see linux-omap mailing list May 2015 thread

	 *	[PATCH] ARM: dts: am335x-bone* enable pmic-shutdown-controller

	 * In particular, messages:

	 *	http://www.spinics.net/lists/linux-omap/msg118585.html

	 *	http://www.spinics.net/lists/linux-omap/msg118615.html

	 *

	 * You can override this later with

	 *	&tps {  /delete-property/ ti,pmic-shutdown-controller;  }

	 * if you want to use RTC-only mode and made sure you are not affected

	 * by the hardware problems. (Tip: double-check by performing a current

	 * measurement after shutdown: it should be less than 1 mA.)

	 */

	ti,pmic-shutdown-controller;



	regulators {

		dcdc1_reg: regulator@0 {

			regulator-name = "vdds_dpr";