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

Merge tag 'omap-for-v3.13/yet-more-dt-regressions-take2' of... 

Merge tag 'omap-for-v3.13/yet-more-dt-regressions-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

A rather big fix for a regression where we have dropped omap4 hwmod
data earlier but are not initializing it from device tree. In addition
to this fix we eventually also be fix the issues in the .dts files
and drivers, but that's too intrusive for the -rc cycle and must be
done later on.

Also a fix for a regression where we now are wrongly trying to initialize
devices on secure omaps like n900 and n9* when booted using device tree.
We need to set aes, sham and timer12 to disabled mode for secure
devices as they are claimed by the firmware running in the secure mode.

And two more legacy booting vs device tree based booting fixes for
am3517 that I did not notice earlier until Nishant Menon reported
these to me few days ago. With these we're good to go having v3.13
working both for legacy booting and device tree based booting, and we
can then go ahed and drop the legacy booting for mach-omap2 for v3.14.

* tag 'omap-for-v3.13/yet-more-dt-regressions-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (494 commits)
  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
parents 8ae19ec3 f2e2c9d9

Documentation/Changes

+0 −11
Original line number Original line Diff line number Diff line
@@ -196,13 +196,6 @@ chmod 0644 /dev/cpu/microcode 
as root before you can use this.  You'll probably also want to

as root before you can use this.  You'll probably also want to

get the user-space microcode_ctl utility to use with this.

get the user-space microcode_ctl utility to use with this.





Powertweak

----------



If you are running v0.1.17 or earlier, you should upgrade to

version v0.99.0 or higher. Running old versions may cause problems

with programs using shared memory.



udev

udev

----

----

udev is a userspace application for populating /dev dynamically with

udev is a userspace application for populating /dev dynamically with
@@ -366,10 +359,6 @@ Intel P6 microcode 
------------------

------------------

o  <http://www.urbanmyth.org/microcode/>

o  <http://www.urbanmyth.org/microcode/>





Powertweak

----------

o  <http://powertweak.sourceforge.net/>



udev

udev

----

----

o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html>

o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html>

Documentation/DocBook/device-drivers.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ 
     </sect1>

     </sect1>

     <sect1><title>Wait queues and Wake events</title>

     <sect1><title>Wait queues and Wake events</title>

!Iinclude/linux/wait.h

!Iinclude/linux/wait.h

!Ekernel/wait.c

!Ekernel/sched/wait.c

     </sect1>

     </sect1>

     <sect1><title>High-resolution timers</title>

     <sect1><title>High-resolution timers</title>

!Iinclude/linux/ktime.h

!Iinclude/linux/ktime.h

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE