Commit c10abbb2 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus

parents 4931445b da1f026b

Documentation/arm/OMAP/omap_pm

+25 −0
Original line number Original line Diff line number Diff line
@@ -127,3 +127,28 @@ implementation needs: 
10. (*pdata->cpu_set_freq)(unsigned long f)

10. (*pdata->cpu_set_freq)(unsigned long f)





11. (*pdata->cpu_get_freq)(void)

11. (*pdata->cpu_get_freq)(void)



Customizing OPP for platform

============================

Defining CONFIG_PM should enable OPP layer for the silicon

and the registration of OPP table should take place automatically.

However, in special cases, the default OPP table may need to be

tweaked, for e.g.:

 * enable default OPPs which are disabled by default, but which

   could be enabled on a platform

 * Disable an unsupported OPP on the platform

 * Define and add a custom opp table entry

in these cases, the board file needs to do additional steps as follows:

arch/arm/mach-omapx/board-xyz.c

	#include "pm.h"

	....

	static void __init omap_xyz_init_irq(void)

	{

		....

		/* Initialize the default table */

		omapx_opp_init();

		/* Do customization to the defaults */

		....

	}

NOTE: omapx_opp_init will be omap3_opp_init or as required

based on the omap family.

Documentation/kernel-parameters.txt

+0 −5
Original line number Original line Diff line number Diff line
@@ -2175,11 +2175,6 @@ and is between 256 and 4096 characters. It is defined in the file 
	reset_devices	[KNL] Force drivers to reset the underlying device

	reset_devices	[KNL] Force drivers to reset the underlying device

			during initialization.

			during initialization.





	resource_alloc_from_bottom

			Allocate new resources from the beginning of available

			space, not the end.  If you need to use this, please

			report a bug.



	resume=		[SWSUSP]

	resume=		[SWSUSP]

			Specify the partition device for software suspend

			Specify the partition device for software suspend

Documentation/power/runtime_pm.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -379,8 +379,8 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: 
      zero)

      zero)





  bool pm_runtime_suspended(struct device *dev);

  bool pm_runtime_suspended(struct device *dev);

    - return true if the device's runtime PM status is 'suspended', or false

    - return true if the device's runtime PM status is 'suspended' and its

      otherwise

      'power.disable_depth' field is equal to zero, or false otherwise





  void pm_runtime_allow(struct device *dev);

  void pm_runtime_allow(struct device *dev);

    - set the power.runtime_auto flag for the device and decrease its usage

    - set the power.runtime_auto flag for the device and decrease its usage

Makefile

+1 −1
Original line number Original line Diff line number Diff line 
VERSION = 2

VERSION = 2

PATCHLEVEL = 6

PATCHLEVEL = 6

SUBLEVEL = 37

SUBLEVEL = 37

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Flesh-Eating Bats with Fangs

NAME = Flesh-Eating Bats with Fangs





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/arm/mach-at91/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o 
obj-$(CONFIG_MACH_CPU9G20)	+= board-cpu9krea.o

obj-$(CONFIG_MACH_CPU9G20)	+= board-cpu9krea.o

obj-$(CONFIG_MACH_STAMP9G20)	+= board-stamp9g20.o

obj-$(CONFIG_MACH_STAMP9G20)	+= board-stamp9g20.o

obj-$(CONFIG_MACH_PORTUXG20)	+= board-stamp9g20.o

obj-$(CONFIG_MACH_PORTUXG20)	+= board-stamp9g20.o

obj-$(CONFIG_MACH_PCONTROL_G20)	+= board-pcontrol-g20.o

obj-$(CONFIG_MACH_PCONTROL_G20)	+= board-pcontrol-g20.o board-stamp9g20.o





# AT91SAM9260/AT91SAM9G20 board-specific support

# AT91SAM9260/AT91SAM9G20 board-specific support

obj-$(CONFIG_MACH_SNAPPER_9260)	+= board-snapper9260.o

obj-$(CONFIG_MACH_SNAPPER_9260)	+= board-snapper9260.o