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

Commit 44d84d72 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 de7b5b3d bdec4196

Documentation/devicetree/bindings/input/gpio-keys.txt

+7 −3
Original line number Diff line number Diff line
@@ -10,12 +10,13 @@ Optional properties: 
Each button (key) is represented as a sub-node of "gpio-keys":

Subnode properties:



	- gpios: OF device-tree gpio specification.

	- interrupts: the interrupt line for that input.

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.



Required mutual exclusive subnode-properties:

	- gpios: OF device-tree gpio specification.

	- interrupts: the interrupt line for that input

Note that either "interrupts" or "gpios" properties can be omitted, but not

both at the same time. Specifying both properties is allowed.



Optional subnode-properties:

	- linux,input-type: Specify event type this button/key generates.
@@ -23,6 +24,9 @@ Optional subnode-properties: 
	- debounce-interval: Debouncing interval time in milliseconds.

	  If not specified defaults to 5.

	- gpio-key,wakeup: Boolean, button can wake-up the system.

	- linux,can-disable: Boolean, indicates that button is connected

	  to dedicated (not shared) interrupt which can be disabled to

	  suppress events from the button.



Example nodes:

Documentation/devicetree/bindings/input/stmpe-keypad.txt

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ Optional properties: 
 - debounce-interval        : Debouncing interval time in milliseconds

 - st,scan-count            : Scanning cycles elapsed before key data is updated

 - st,no-autorepeat         : If specified device will not autorepeat

 - keypad,num-rows          : See ./matrix-keymap.txt

 - keypad,num-columns       : See ./matrix-keymap.txt



Example:

Makefile

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

PATCHLEVEL = 19

SUBLEVEL = 0

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Diseased Newt



# *DOCUMENTATION*

arch/arm/boot/dts/armada-370-db.dts

+0 −24
Original line number Diff line number Diff line
@@ -203,27 +203,3 @@ 
		compatible = "linux,spdif-dir";

	};

};
 


&pinctrl {

	/*

	 * These pins might be muxed as I2S by

	 * the bootloader, but it conflicts

	 * with the real I2S pins that are

	 * muxed using i2s_pins. We must mux

	 * those pins to a function other than

	 * I2S.

	 */

	pinctrl-0 = <&hog_pins1 &hog_pins2>;

	pinctrl-names = "default";



	hog_pins1: hog-pins1 {

		marvell,pins = "mpp6",  "mpp8", "mpp10",

			       "mpp12", "mpp13";

		marvell,function = "gpio";

	};



	hog_pins2: hog-pins2 {

		marvell,pins = "mpp5", "mpp7", "mpp9";

		marvell,function = "gpo";

	};

};

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ CONFIG_USB=y 
CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_MVEBU=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_EXYNOS=y

CONFIG_USB_EHCI_TEGRA=y

CONFIG_USB_EHCI_HCD_STI=y

CONFIG_USB_EHCI_HCD_PLATFORM=y