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

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

Merge tag 'omap-for-v3.14/board-removal-safe' of... 

Merge tag 'omap-for-v3.14/board-removal-safe' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards

From Tony Lindgren:
Make omap2420 and 2430 boot in device tree only mode and prepare things
for removing omap3 legacy booting support.

We can make omap2420 and 2430 boot in device tree only mode by keeping
board-n8x0.c around until Menelaus has device tree and regulator support
so devices still work. For the omap2430-sdp we have omap2430-sdp.dts,
and there's also a minimal support for H4 in omap2420-h4.dts.

For omap3, let's not drop the legacy platform booting quite yet so
people have a little time to update their booting system.

With the fixes going into v3.13, thing should behave pretty much the
same way for legacy booting and device tree based booting for omap3.

So people using omap3 based boards, please update your systems to
boot in device tree mode as omap3 is the last SoC in mach-omap2
that boots in the legacy mode.

* tag 'omap-for-v3.14/board-removal-safe' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (299 commits)
  ARM: dts: Add basic devices on am3517-evm
  ARM: OMAP2+: Use pdata quirks for emac on am3517
  ARM: OMAP2+: Add support for legacy auxdata for twl
  ARM: dts: Fix booting for secure omaps
  ARM: OMAP2+: Fix the machine entry for am3517
  ARM: dts: Fix missing entries for am3517
  ARM: OMAP2+: Fix overwriting hwmod data with data from device tree
  +Linux 3.13-rc3

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 4b7c0f41 adfe9361

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

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

Required properties:

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

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

               Should be "ti,omap4-mpu" for OMAP4

               Should be "ti,omap4-mpu" for OMAP4

	       Should be "ti,omap5-mpu" for OMAP5

- ti,hwmods: "mpu"

- ti,hwmods: "mpu"





Examples:

Examples:





- For an OMAP5 SMP system:



mpu {

    compatible = "ti,omap5-mpu";

    ti,hwmods = "mpu"

};



- For an OMAP4 SMP system:

- For an OMAP4 SMP system:





mpu {

mpu {

Documentation/devicetree/bindings/arm/pmu.txt

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

Required properties:





- compatible : should be one of

- compatible : should be one of

	"arm,armv8-pmuv3"

	"arm,cortex-a15-pmu"

	"arm,cortex-a15-pmu"

	"arm,cortex-a9-pmu"

	"arm,cortex-a9-pmu"

	"arm,cortex-a8-pmu"

	"arm,cortex-a8-pmu"

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

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

	/* NTC thermistor is a hwmon device */

	ncp15wb473@0 {

	ncp15wb473@0 {

		compatible = "ntc,ncp15wb473";

		compatible = "ntc,ncp15wb473";

		pullup-uV = <1800000>;

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;

		pulldown-ohm = <0>;

		io-channels = <&adc 4>;

		io-channels = <&adc 4>;

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

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




Required Properties:

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,exynos4210-clock" - controller compatible with Exynos4210 SoC.

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

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

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

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




Required Properties:

Required Properties:





- comptible: should be one of the following.

- compatible: should be one of the following.

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

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





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

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