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

Commit 0ff66f0c authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'pxa-plat' into devel 



* pxa-plat: (53 commits)
  [ARM] 4762/1: Basic support for Toradex Colibri module
  [ARM] pxa: fix mci_init functions returning -1
  [ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix
  [ARM] 4747/1: pcm027: support for pcm990 baseboard for phyCORE-PXA270
  [ARM] 4746/1: pcm027: network support for phyCORE-PXA270
  [ARM] 4745/1: pcm027: default configuration
  [ARM] 4744/1: pcm027: add support for phyCORE-PXA270 CPU module
  [NET] smc91x: Make smc91x use IRQ resource trigger flags
  [ARM] pxa: add default config for littleton
  [ARM] pxa: add basic support for Littleton (PXA3xx Form Factor Platform)
  [ARM] 4664/1: Add basic support for HTC Magician PDA phones
  [ARM] 4649/1: Base support for pxa-based Toshiba e-series PDAs.
  [ARM] pxa: skip registers saving/restoring if entering standby mode
  [ARM] pxa: fix PXA27x resume
  [ARM] pxa: Avoid fiddling with CKEN register on suspend
  [ARM] pxa: Add PXA3 standby code hooked into the IRQ wake scheme
  [ARM] pxa: Add zylonite MFP wakeup configurations
  [ARM] pxa: program MFPs for low power mode when suspending
  [ARM] pxa: make MFP configuration processor independent
  [ARM] pxa: remove un-used pxa3xx_mfp_set_xxx() functions
  ...

Conflicts:

	arch/arm/mach-pxa/ssp.c

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parents c00d4ffd 4e4fc05a

Documentation/cpu-freq/user-guide.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ The following ARM processors are supported by cpufreq: 
ARM Integrator

ARM Integrator

ARM-SA1100

ARM-SA1100

ARM-SA1110

ARM-SA1110

Intel PXA









1.2 x86

1.2 x86

arch/arm/Kconfig

+8 −1
Original line number Original line Diff line number Diff line
@@ -356,6 +356,7 @@ config ARCH_PXA 
	select GENERIC_GPIO

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT

	help

	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
@@ -895,7 +896,7 @@ config KEXEC 




endmenu

endmenu





if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX )

if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)





menu "CPU Frequency scaling"

menu "CPU Frequency scaling"
@@ -931,6 +932,12 @@ config CPU_FREQ_IMX 




	  If in doubt, say N.

	  If in doubt, say N.





config CPU_FREQ_PXA

	bool

	depends on CPU_FREQ && ARCH_PXA && PXA25x

	default y

	select CPU_FREQ_DEFAULT_GOV_USERSPACE



endmenu

endmenu





endif

endif