Commit 1f16f116 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of... 

Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull in fixes from Daniel Lezcano:

 - Fix the vt8500 timer leading to a system lock up when dealing with too
   small delta (Roman Volkov)

 - Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled with COMPILE_TEST
   (Daniel Lezcano)

 - Prevent to compile timers using the 'iomem' API when the architecture has
   not HAS_IOMEM set (Richard Weinberger)
parents 03724ac3 f9eccf24

Documentation/arm/keystone/Overview.txt

+0 −18
Original line number Original line Diff line number Diff line
@@ -49,24 +49,6 @@ specified through DTS. Following are the DTS used:- 
The device tree documentation for the keystone machines are located at

The device tree documentation for the keystone machines are located at

        Documentation/devicetree/bindings/arm/keystone/keystone.txt

        Documentation/devicetree/bindings/arm/keystone/keystone.txt





Known issues & workaround

-------------------------



Some of the device drivers used on keystone are re-used from that from

DaVinci and other TI SoCs. These device drivers may use clock APIs directly.

Some of the keystone specific drivers such as netcp uses run time power

management API instead to enable clock. As this API has limitations on

keystone, following workaround is needed to boot Linux.



   Add 'clk_ignore_unused' to the bootargs env variable in u-boot. Otherwise

   clock frameworks will try to disable clocks that are unused and disable

   the hardware. This is because netcp related power domain and clock

   domains are enabled in u-boot as run time power management API currently

   doesn't enable clocks for netcp due to a limitation. This workaround is

   expected to be removed in the future when proper API support becomes

   available. Until then, this work around is needed.





Document Author

Document Author

---------------

---------------

Murali Karicheri <m-karicheri2@ti.com>

Murali Karicheri <m-karicheri2@ti.com>

Documentation/block/null_blk.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -70,3 +70,6 @@ use_per_node_hctx=[0/1]: Default: 0 
     parameter.

     parameter.

  1: The multi-queue block layer is instantiated with a hardware dispatch

  1: The multi-queue block layer is instantiated with a hardware dispatch

     queue for each CPU node in the system.

     queue for each CPU node in the system.



use_lightnvm=[0/1]: Default: 0

  Register device with LightNVM. Requires blk-mq to be used.

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/gpio/gpio-mpc8xxx.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,10 @@ Required properties: 
      0 = active high

      0 = active high

      1 = active low

      1 = active low





Optional properties:

- little-endian : GPIO registers are used as little endian. If not

                  present registers are used as big endian by default.



Example:

Example:





gpio0: gpio@1100 {

gpio0: gpio@1100 {

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:

CRA Git | Maintained and supported by SUSTech CRA and CCSE