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

Commit ecdf94da authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'v4.1-rc6' into next/dt 

Linux 4.1-rc6

 Conflicts:
	arch/arm/boot/dts/zynq-7000.dtsi

Resolution summary:

 Mainline had an earlier version of the commit, resolve in favor of the
 newer patch in next/dt branch.
parents e28f23d8 c65b99f0

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −1
Original line number Original line Diff line number Diff line
@@ -162,7 +162,7 @@ Description: Discover CPUs in the same CPU frequency coordination domain 
What:		/sys/devices/system/cpu/cpu*/cache/index3/cache_disable_{0,1}

What:		/sys/devices/system/cpu/cpu*/cache/index3/cache_disable_{0,1}

Date:		August 2008

Date:		August 2008

KernelVersion:	2.6.27

KernelVersion:	2.6.27

Contact:	discuss@x86-64.org

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Disable L3 cache indices

Description:	Disable L3 cache indices





		These files exist in every CPU's cache/index3 directory. Each

		These files exist in every CPU's cache/index3 directory. Each

Documentation/devicetree/bindings/clock/silabs,si5351.txt

+3 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,8 @@ Required properties: 
- #clock-cells: from common clock binding; shall be set to 1.

- #clock-cells: from common clock binding; shall be set to 1.

- clocks: from common clock binding; list of parent clock

- clocks: from common clock binding; list of parent clock

  handles, shall be xtal reference clock or xtal and clkin for

  handles, shall be xtal reference clock or xtal and clkin for

  si5351c only.

  si5351c only. Corresponding clock input names are "xtal" and

  "clkin" respectively.

- #address-cells: shall be set to 1.

- #address-cells: shall be set to 1.

- #size-cells: shall be set to 0.

- #size-cells: shall be set to 0.
@@ -71,6 +72,7 @@ i2c-master-node { 




		/* connect xtal input to 25MHz reference */

		/* connect xtal input to 25MHz reference */

		clocks = <&ref25>;

		clocks = <&ref25>;

		clock-names = "xtal";





		/* connect xtal input as source of pll0 and pll1 */

		/* connect xtal input as source of pll0 and pll1 */

		silabs,pll-source = <0 0>, <1 0>;

		silabs,pll-source = <0 0>, <1 0>;

Documentation/devicetree/bindings/mtd/m25p80.txt→Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -8,8 +8,8 @@ Required properties: 
               is not Linux-only, but in case of Linux, see the "m25p_ids"

               is not Linux-only, but in case of Linux, see the "m25p_ids"

               table in drivers/mtd/devices/m25p80.c for the list of supported

               table in drivers/mtd/devices/m25p80.c for the list of supported

               chips.

               chips.

               Must also include "nor-jedec" for any SPI NOR flash that can be

               Must also include "jedec,spi-nor" for any SPI NOR flash that can

               identified by the JEDEC READ ID opcode (0x9F).

               be identified by the JEDEC READ ID opcode (0x9F).

- reg : Chip-Select number

- reg : Chip-Select number

- spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at

- spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at
@@ -25,7 +25,7 @@ Example: 
	flash: m25p80@0 {

	flash: m25p80@0 {

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <1>;

		#size-cells = <1>;

		compatible = "spansion,m25p80", "nor-jedec";

		compatible = "spansion,m25p80", "jedec,spi-nor";

		reg = <0>;

		reg = <0>;

		spi-max-frequency = <40000000>;

		spi-max-frequency = <40000000>;

		m25p,fast-read;

		m25p,fast-read;

Documentation/devicetree/bindings/net/cdns-emac.txt

+2 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,8 @@ 
Required properties:

Required properties:

- compatible: Should be "cdns,[<chip>-]{emac}"

- compatible: Should be "cdns,[<chip>-]{emac}"

  Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.

  Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.

  or the generic form: "cdns,emac".

  Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

  Or the generic form: "cdns,emac".

- reg: Address and length of the register set for the device

- reg: Address and length of the register set for the device

- interrupts: Should contain macb interrupt

- interrupts: Should contain macb interrupt

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

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

Documentation/hwmon/tmp401

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ Supported chips: 
    Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp432.html

    Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp432.html

  * Texas Instruments TMP435

  * Texas Instruments TMP435

    Prefix: 'tmp435'

    Prefix: 'tmp435'

    Addresses scanned: I2C 0x37, 0x48 - 0x4f

    Addresses scanned: I2C 0x48 - 0x4f

    Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp435.html

    Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp435.html





Authors:

Authors: