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

Commit 0529357f authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'v4.4-rc6' into devel

Linux 4.4-rc6
parents a9f1a3e4 4ef76753
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ used to control it:

  modprobe ipmi_watchdog timeout=<t> pretimeout=<t> action=<action type>
      preaction=<preaction type> preop=<preop type> start_now=x
      nowayout=x ifnum_to_use=n
      nowayout=x ifnum_to_use=n panic_wdt_timeout=<t>

ifnum_to_use specifies which interface the watchdog timer should use.
The default is -1, which means to pick the first one registered.
@@ -597,7 +597,9 @@ is the amount of seconds before the reset that the pre-timeout panic will
occur (if pretimeout is zero, then pretimeout will not be enabled).  Note
that the pretimeout is the time before the final timeout.  So if the
timeout is 50 seconds and the pretimeout is 10 seconds, then the pretimeout
will occur in 40 second (10 seconds before the timeout).
will occur in 40 second (10 seconds before the timeout). The panic_wdt_timeout
is the value of timeout which is set on kernel panic, in order to let actions
such as kdump to occur during panic.

The action may be "reset", "power_cycle", or "power_off", and
specifies what to do when the timer times out, and defaults to
@@ -634,6 +636,7 @@ for configuring the watchdog:
	ipmi_watchdog.preop=<preop type>
	ipmi_watchdog.start_now=x
	ipmi_watchdog.nowayout=x
	ipmi_watchdog.panic_wdt_timeout=<t>

The options are the same as the module parameter options.

+0 −18
Original line number 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
        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
---------------
Murali Karicheri <m-karicheri2@ti.com>
+3 −0
Original line number Diff line number Diff line
@@ -70,3 +70,6 @@ use_per_node_hctx=[0/1]: Default: 0
     parameter.
  1: The multi-queue block layer is instantiated with a hardware dispatch
     queue for each CPU node in the system.

use_lightnvm=[0/1]: Default: 0
  Register device with LightNVM. Requires blk-mq to be used.
+4 −6
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ Required properties:
Optional properties:
- 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
		these channels will be SW triggered channels. The list must
		contain 16 bits numbers, see example.
		these channels will be SW triggered channels. See example.
- 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
		DSP. See example.
@@ -56,10 +55,9 @@ edma: edma@49000000 {
	ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 7>, <&edma_tptc2 0>;

	/* Channel 20 and 21 is allocated for memcpy */
	ti,edma-memcpy-channels = /bits/ 16 <20 21>;
	/* The following PaRAM slots are reserved: 35-45 and 100-110 */
	ti,edma-reserved-slot-ranges = /bits/ 16 <35 10>,
				       /bits/ 16 <100 10>;
	ti,edma-memcpy-channels = <20 21>;
	/* The following PaRAM slots are reserved: 35-44 and 100-109 */
	ti,edma-reserved-slot-ranges = <35 10>, <100 10>;
};

edma_tptc0: tptc@49800000 {
+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ Required properties:
      0 = active high
      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:

gpio0: gpio@1100 {
Loading