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

Commit 13ccb93f authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'driver-core-linus' into driver-core-next 



a8b14744 ("sysfs: give different locking key to regular and bin
files") in driver-core-linus modifies sysfs_open_file() so that it
gives out different locking classes to sysfs_open_files depending on
whether the file is bin or not.  Due to the massive kernfs
reorganization in driver-core-next, this naturally causes merge
conflict in fs/sysfs/file.c.

Due to the way things are split between kernfs and sysfs in
driver-core-next, the same fix can't easily be applied to
driver-core-next.  This merge simply ignores the offending commit.  A
following patch will implement a separate fix for the issue.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents bbc780f8 a8b14744

Documentation/devicetree/bindings/arm/omap/mpu.txt

+8 −0
Original line number Diff line number Diff line
@@ -7,10 +7,18 @@ The MPU contain CPUs, GIC, L2 cache and a local PRCM. 
Required properties:

- compatible : Should be "ti,omap3-mpu" for OMAP3

               Should be "ti,omap4-mpu" for OMAP4

	       Should be "ti,omap5-mpu" for OMAP5

- ti,hwmods: "mpu"



Examples:



- For an OMAP5 SMP system:



mpu {

    compatible = "ti,omap5-mpu";

    ti,hwmods = "mpu"

};



- For an OMAP4 SMP system:



mpu {

Documentation/devicetree/bindings/arm/pmu.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ representation in the device tree should be done as under:- 
Required properties:



- compatible : should be one of

	"arm,armv8-pmuv3"

	"arm,cortex-a15-pmu"

	"arm,cortex-a9-pmu"

	"arm,cortex-a8-pmu"

Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ adc@12D10000 { 
	/* NTC thermistor is a hwmon device */

	ncp15wb473@0 {

		compatible = "ntc,ncp15wb473";

		pullup-uV = <1800000>;

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;

		io-channels = <&adc 4>;

Documentation/devicetree/bindings/clock/exynos4-clock.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ SoC's in the Exynos4 family. 


Required Properties:



- comptible: should be one of the following.

- compatible: should be one of the following.

  - "samsung,exynos4210-clock" - controller compatible with Exynos4210 SoC.

  - "samsung,exynos4412-clock" - controller compatible with Exynos4412 SoC.

Documentation/devicetree/bindings/clock/exynos5250-clock.txt

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ controllers within the Exynos5250 SoC. 


Required Properties:



- comptible: should be one of the following.

- compatible: should be one of the following.

  - "samsung,exynos5250-clock" - controller compatible with Exynos5250 SoC.



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