Commit 52cdce8a authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'rotary-encoder' into next 

Bring in updates to roraty encoder driver switching it away from legacy
platform data and over to generic device properties and adding support
for encoders using more than 2 GPIOs.
parents 3cd47869 7dde4e74

Documentation/devicetree/bindings/dma/ti-edma.txt

+4 −6
Original line number Original line Diff line number Diff line
@@ -22,8 +22,7 @@ Required properties: 
Optional properties:

Optional properties:

- ti,hwmods:	Name of the hwmods associated to the eDMA CC

- ti,hwmods:	Name of the hwmods associated to the eDMA CC

- ti,edma-memcpy-channels: List of channels allocated to be used for memcpy, iow

- ti,edma-memcpy-channels: List of channels allocated to be used for memcpy, iow

		these channels will be SW triggered channels. The list must

		these channels will be SW triggered channels. See example.

		contain 16 bits numbers, see example.

- ti,edma-reserved-slot-ranges: PaRAM slot ranges which should not be used by

- ti,edma-reserved-slot-ranges: PaRAM slot ranges which should not be used by

		the driver, they are allocated to be used by for example the

		the driver, they are allocated to be used by for example the

		DSP. See example.

		DSP. See example.
@@ -56,10 +55,9 @@ edma: edma@49000000 { 
	ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 7>, <&edma_tptc2 0>;

	ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 7>, <&edma_tptc2 0>;





	/* Channel 20 and 21 is allocated for memcpy */

	/* Channel 20 and 21 is allocated for memcpy */

	ti,edma-memcpy-channels = /bits/ 16 <20 21>;

	ti,edma-memcpy-channels = <20 21>;

	/* The following PaRAM slots are reserved: 35-45 and 100-110 */

	/* The following PaRAM slots are reserved: 35-44 and 100-109 */

	ti,edma-reserved-slot-ranges = /bits/ 16 <35 10>,

	ti,edma-reserved-slot-ranges = <35 10>, <100 10>;

				       /bits/ 16 <100 10>;

};

};





edma_tptc0: tptc@49800000 {

edma_tptc0: tptc@49800000 {

Documentation/devicetree/bindings/input/rotary-encoder.txt

+1 −1
Original line number Original line Diff line number Diff line 
Rotary encoder DT bindings

Rotary encoder DT bindings





Required properties:

Required properties:

- gpios: a spec for two GPIOs to be used

- gpios: a spec for at least two GPIOs to be used, most significant first





Optional properties:

Optional properties:

- linux,axis: the input subsystem axis to map to this rotary encoder.

- linux,axis: the input subsystem axis to map to this rotary encoder.

Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ Each key is represented as a sub-node of "allwinner,sun4i-a10-lradc-keys": 
Required subnode-properties:

Required subnode-properties:

	- label: Descriptive name of the key.

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.

	- linux,code: Keycode to emit.

	- channel: Channel this key is attached to, mut be 0 or 1.

	- channel: Channel this key is attached to, must be 0 or 1.

	- voltage: Voltage in µV at lradc input when this key is pressed.

	- voltage: Voltage in µV at lradc input when this key is pressed.





Example:

Example:

Documentation/devicetree/bindings/mtd/partition.txt

+6 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,9 @@ used for what purposes, but which don't use an on-flash partition table such 
as RedBoot.

as RedBoot.





The partition table should be a subnode of the mtd node and should be named

The partition table should be a subnode of the mtd node and should be named

'partitions'. Partitions are defined in subnodes of the partitions node.

'partitions'. This node should have the following property:

- compatible : (required) must be "fixed-partitions"

Partitions are then defined in subnodes of the partitions node.





For backwards compatibility partitions as direct subnodes of the mtd device are

For backwards compatibility partitions as direct subnodes of the mtd device are

supported. This use is discouraged.

supported. This use is discouraged.
@@ -36,6 +38,7 @@ Examples: 




flash@0 {

flash@0 {

	partitions {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <1>;

		#size-cells = <1>;
@@ -53,6 +56,7 @@ flash@0 { 




flash@1 {

flash@1 {

	partitions {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <2>;

		#size-cells = <2>;
@@ -66,6 +70,7 @@ flash@1 { 




flash@2 {

flash@2 {

	partitions {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <2>;

		#address-cells = <2>;

		#size-cells = <2>;

		#size-cells = <2>;

Documentation/devicetree/bindings/net/cpsw.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -40,18 +40,18 @@ Optional properties: 




Slave Properties:

Slave Properties:

Required properties:

Required properties:

- phy_id		: Specifies slave phy id

- phy-mode		: See ethernet.txt file in the same directory

- phy-mode		: See ethernet.txt file in the same directory





Optional properties:

Optional properties:

- dual_emac_res_vlan	: Specifies VID to be used to segregate the ports

- dual_emac_res_vlan	: Specifies VID to be used to segregate the ports

- mac-address		: See ethernet.txt file in the same directory

- mac-address		: See ethernet.txt file in the same directory

- phy_id		: Specifies slave phy id

- phy-handle		: See ethernet.txt file in the same directory

- phy-handle		: See ethernet.txt file in the same directory





Slave sub-nodes:

Slave sub-nodes:

- fixed-link		: See fixed-link.txt file in the same directory

- fixed-link		: See fixed-link.txt file in the same directory

			  Either the properties phy_id and phy-mode,

			  Either the property phy_id, or the sub-node

			  or the sub-node fixed-link can be specified

			  fixed-link can be specified





Note: "ti,hwmods" field is used to fetch the base address and irq

Note: "ti,hwmods" field is used to fetch the base address and irq

resources from TI, omap hwmod data base during device registration.

resources from TI, omap hwmod data base during device registration.