Commit 93c222c0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.4-rc5 into staging-next 



We want those fixes in here for testing.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents f89c2b39 9f9499ae

Documentation/arm/keystone/Overview.txt

+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>

Documentation/block/null_blk.txt

+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.

Documentation/devicetree/bindings/gpio/gpio-mpc8xxx.txt

+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 {

Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ Required properties: 
- phy-mode: See ethernet.txt file in the same directory

- clocks: a pointer to the reference clock for this device.



Optional properties:

- tx-csum-limit: maximum mtu supported by port that allow TX checksum.

  Value is presented in bytes. If not used, by default 1600B is set for

  "marvell,armada-370-neta" and 9800B for others.



Example:



ethernet@d0070000 {
@@ -15,6 +20,7 @@ ethernet@d0070000 { 
	reg = <0xd0070000 0x2500>;

	interrupts = <8>;

	clocks = <&gate_clk 4>;

	tx-csum-limit = <9800>

	status = "okay";

	phy = <&phy0>;

	phy-mode = "rgmii-id";

Documentation/devicetree/bindings/thermal/rockchip-thermal.txt

+3 −1
Original line number Diff line number Diff line 
* Temperature Sensor ADC (TSADC) on rockchip SoCs



Required properties:

- compatible : "rockchip,rk3288-tsadc"

- compatible : should be "rockchip,<name>-tsadc"

   "rockchip,rk3288-tsadc": found on RK3288 SoCs

   "rockchip,rk3368-tsadc": found on RK3368 SoCs

- reg : physical base address of the controller and length of memory mapped

	region.

- interrupts : The interrupt number to the cpu. The interrupt specifier format