Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 14 Jun 2009 10:00:16 +0000 (11:00 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 14 Jun 2009 10:00:16 +0000 (11:00 +0100)
1  2 
MAINTAINERS
arch/arm/common/Kconfig
arch/arm/mach-pxa/palmld.c
drivers/video/Kconfig

diff --combined MAINTAINERS
@@@ -680,6 -680,13 +680,13 @@@ M:       sakoman@gmail.co
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
+ ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
+ P:    Philipp Zabel
+ M:    philipp.zabel@gmail.com
+ S:    Maintained
+ F:    arch/arm/mach-pxa/hx4700.c
+ F:    arch/arm/mach-pxa/include/mach/hx4700.h
  ARM/HP JORNADA 7XX MACHINE SUPPORT
  P:    Kristoffer Ericson
  M:    kristoffer.ericson@gmail.com
@@@ -4136,69 -4143,6 +4143,69 @@@ S:    Maintaine
  F:    drivers/video/riva/
  F:    drivers/video/nvidia/
  
 +OMAP SUPPORT
 +P:    Tony Lindgren <tony@atomide.com>
 +M:    tony@atomide.com
 +L:    linux-omap@vger.kernel.org
 +W:    http://www.muru.com/linux/omap/
 +W:    http://linux.omap.com/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
 +S:    Maintained
 +F:    arch/arm/*omap*
 +
 +OMAP CLOCK FRAMEWORK SUPPORT
 +P:    Paul Walmsley
 +M:    paul@pwsan.com
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    arch/arm/*omap*/*clock*
 +
 +OMAP POWER MANAGEMENT SUPPORT
 +P:    Kevin Hilman
 +M:    khilman@deeprootsystems.com
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    arch/arm/*omap*/*pm*
 +
 +OMAP AUDIO SUPPORT
 +P:    Jarkko Nikula
 +M:    jhnikula@gmail.com
 +L:    alsa-devel@alsa-project.org (subscribers-only)
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    sound/soc/omap/
 +
 +OMAP FRAMEBUFFER SUPPORT
 +P:    Imre Deak
 +M:    imre.deak@nokia.com
 +L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    drivers/video/omap/
 +
 +OMAP MMC SUPPORT
 +P:    Jarkko Lavinen
 +M:    jarkko.lavinen@nokia.com
 +L:    linux-kernel@vger.kernel.org
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    drivers/mmc/host/*omap*
 +
 +OMAP RANDOM NUMBER GENERATOR SUPPORT
 +P:    Deepak Saxena
 +M:    dsaxena@plexity.net
 +S:    Maintained
 +F:    drivers/char/hw_random/omap-rng.c
 +
 +OMAP USB SUPPORT
 +P:    Felipe Balbi
 +M:    felipe.balbi@nokia.com
 +P:    David Brownell
 +M:    dbrownell@users.sourceforge.net
 +L:    linux-usb@vger.kernel.org
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +
  OMFS FILESYSTEM
  P:    Bob Copeland
  M:    me@bobcopeland.com
@@@ -4627,7 -4571,7 +4634,7 @@@ F:      drivers/media/video/pvrusb2
  
  PXA2xx/PXA3xx SUPPORT
  P:    Eric Miao
- M:    eric.miao@marvell.com
+ M:    eric.y.miao@gmail.com
  P:    Russell King
  M:    linux@arm.linux.org.uk
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
@@@ -4641,19 -4585,19 +4648,19 @@@ F:   sound/soc/pxa/pxa2xx
  
  PXA168 SUPPORT
  P:    Eric Miao
- M:    eric.miao@marvell.com
+ M:    eric.y.miao@gmail.com
  P:    Jason Chagas
  M:    jason.chagas@marvell.com
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
- S:    Supported
+ S:    Maintained
  
  PXA910 SUPPORT
  P:    Eric Miao
- M:    eric.miao@marvell.com
+ M:    eric.y.miao@gmail.com
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
- S:    Supported
+ S:    Maintained
  
  PXA MMCI DRIVER
  S:    Orphan
@@@ -5587,6 -5531,20 +5594,6 @@@ F:     drivers/misc/tifm
  F:    drivers/mmc/host/tifm_sd.c
  F:    include/linux/tifm.h
  
 -TI OMAP MMC INTERFACE DRIVER
 -P:    Carlos Aguiar, Anderson Briglia and Syed Khasim
 -M:    linux-omap@vger.kernel.org
 -W:    http://linux.omap.com
 -W:    http://www.muru.com/linux/omap/
 -S:    Maintained
 -F:    drivers/mmc/host/omap.c
 -
 -TI OMAP RANDOM NUMBER GENERATOR SUPPORT
 -P:    Deepak Saxena
 -M:    dsaxena@plexity.net
 -S:    Maintained
 -F:    drivers/char/hw_random/omap-rng.c
 -
  TIPC NETWORK LAYER
  P:    Per Liden
  M:    per.liden@ericsson.com
diff --combined arch/arm/common/Kconfig
@@@ -4,14 -4,6 +4,14 @@@ config ARM_GI
  config ARM_VIC
        bool
  
 +config ARM_VIC_NR
 +      int
 +      default 2
 +      depends on ARM_VIC
 +      help
 +        The maximum number of VICs available in the system, for
 +        power management.
 +
  config ICST525
        bool
  
@@@ -35,10 -27,6 +35,6 @@@ config SHARP_LOCOM
  config SHARP_PARAM
        bool
  
- config SHARPSL_PM
-       bool
-       select APM_EMULATION
  config SHARP_SCOOP
        bool
  
@@@ -129,7 -129,7 +129,7 @@@ static unsigned long palmld_pin_config[
        GPIO81_GPIO,    /* wifi reset */
  
        /* HDD */
 -      GPIO95_GPIO,    /* HDD irq */
 +      GPIO98_GPIO,    /* HDD reset */
        GPIO115_GPIO,   /* HDD power */
  
        /* MISC */
@@@ -496,14 -496,6 +496,14 @@@ static struct platform_device palmld_as
  };
  
  /******************************************************************************
 + * HDD
 + ******************************************************************************/
 +static struct platform_device palmld_hdd = {
 +      .name   = "pata_palmld",
 +      .id     = -1,
 +};
 +
 +/******************************************************************************
   * Framebuffer
   ******************************************************************************/
  static struct pxafb_mode_info palmld_lcd_modes[] = {
@@@ -532,30 -524,18 +532,18 @@@ static struct pxafb_mach_info palmld_lc
  /******************************************************************************
   * Power management - standby
   ******************************************************************************/
- #ifdef CONFIG_PM
- static u32 *addr __initdata;
- static u32 resume[3] __initdata = {
-       0xe3a00101,     /* mov  r0,     #0x40000000 */
-       0xe380060f,     /* orr  r0, r0, #0x00f00000 */
-       0xe590f008,     /* ldr  pc, [r0, #0x08] */
- };
- static int __init palmld_pm_init(void)
+ static void __init palmld_pm_init(void)
  {
-       int i;
-       /* this is where the bootloader jumps */
-       addr = phys_to_virt(PALMLD_STR_BASE);
-       for (i = 0; i < 3; i++)
-               addr[i] = resume[i];
-       return 0;
+       static u32 resume[] = {
+               0xe3a00101,     /* mov  r0,     #0x40000000 */
+               0xe380060f,     /* orr  r0, r0, #0x00f00000 */
+               0xe590f008,     /* ldr  pc, [r0, #0x08] */
+       };
+       /* copy the bootloader */
+       memcpy(phys_to_virt(PALMLD_STR_BASE), resume, sizeof(resume));
  }
  
- device_initcall(palmld_pm_init);
- #endif
  /******************************************************************************
   * Machine init
   ******************************************************************************/
@@@ -567,7 -547,6 +555,7 @@@ static struct platform_device *devices[
        &palmld_leds,
        &power_supply,
        &palmld_asoc,
 +      &palmld_hdd,
  };
  
  static struct map_desc palmld_io_desc[] __initdata = {
@@@ -595,6 -574,7 +583,7 @@@ static void __init palmld_init(void
  {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(palmld_pin_config));
  
+       palmld_pm_init();
        set_pxa_fb_info(&palmld_lcd_screen);
        pxa_set_mci_info(&palmld_mci_platform_data);
        pxa_set_ac97_info(&palmld_ac97_pdata);
diff --combined drivers/video/Kconfig
@@@ -397,7 -397,7 +397,7 @@@ config FB_SA110
  
  config FB_IMX
        tristate "Motorola i.MX LCD support"
 -      depends on FB && (ARCH_IMX || ARCH_MX2)
 +      depends on FB && (ARCH_MX1 || ARCH_MX2)
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -1759,6 -1759,16 +1759,16 @@@ config FB_6832
          Say Y here if you want to support the built-in frame buffer of
          the Motorola 68328 CPU family.
  
+ config FB_PXA168
+       tristate "PXA168/910 LCD framebuffer support"
+       depends on FB && (CPU_PXA168 || CPU_PXA910)
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       ---help---
+         Frame buffer driver for the built-in LCD controller in the Marvell
+         MMP processor.
  config FB_PXA
        tristate "PXA LCD framebuffer support"
        depends on FB && ARCH_PXA