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

Commit 0f66f96d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm: (37 commits)
  ARM: 5673/1: U300 fix initsection compile warning
  ARM: Fix broken highmem support
  mx31moboard: invert sdhc ro signal sense
  ARM: S3C24XX: Fix clkout mpx error
  ARM: S3C64XX: serial: Fix a typo in Kconfig
  IXP4xx: Fix IO_SPACE_LIMIT for 2.6.31-rc core PCI changes
  OMAP3: RX51: Updated rx51_defconfig
  OMAP2/3: mmc-twl4030: Free up MMC regulators while cleaning up
  OMAP3: RX51: Define TWL4030 USB transceiver in board file
  OMAP3: Overo: Fix smsc911x platform device resource value
  OMAP3: Fix omap3 sram virtual addres overlap vmalloc space after increasing vmalloc size
  OMAP2/3: DMA errata correction
  OMAP: Fix testing of cpu defines for mach-omap1
  OMAP3: Overo: add missing pen-down GPIO definition
  OMAP: GPIO: clear/restore level/edge detect settings on mask/unmask
  OMAP3: PM: Fix wrong sequence in suspend.
  OMAP: PM: CPUfreq: obey min/max settings of policy
  OMAP2/3/4: UART: allow in-order port traversal
  OMAP2/3/4: UART: Allow per-UART disabling wakeup for serial ports
  OMAP3: Fixed crash bug with serial + suspend
  ...
parents 894ef820 a2bb9f4d

arch/arm/configs/rx51_defconfig

+4 −3
Original line number Original line Diff line number Diff line
@@ -282,7 +282,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0"

CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0 console=ttyS2,115200n8"

# CONFIG_XIP_KERNEL is not set

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set

# CONFIG_KEXEC is not set
@@ -1354,7 +1354,7 @@ CONFIG_USB_OTG_UTILS=y 
# CONFIG_USB_GPIO_VBUS is not set

# CONFIG_USB_GPIO_VBUS is not set

# CONFIG_ISP1301_OMAP is not set

# CONFIG_ISP1301_OMAP is not set

CONFIG_TWL4030_USB=y

CONFIG_TWL4030_USB=y

CONFIG_MMC=m

CONFIG_MMC=y

# CONFIG_MMC_DEBUG is not set

# CONFIG_MMC_DEBUG is not set

# CONFIG_MMC_UNSAFE_RESUME is not set

# CONFIG_MMC_UNSAFE_RESUME is not set
@@ -1449,7 +1449,8 @@ CONFIG_RTC_DRV_TWL4030=m 
# on-CPU RTC drivers

# on-CPU RTC drivers

#

#

# CONFIG_DMADEVICES is not set

# CONFIG_DMADEVICES is not set

# CONFIG_REGULATOR is not set

CONFIG_REGULATOR=y

CONFIG_REGULATOR_TWL4030=y

# CONFIG_UIO is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set

# CONFIG_STAGING is not set

arch/arm/include/asm/setup.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -201,7 +201,8 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn } 
struct membank {

struct membank {

	unsigned long start;

	unsigned long start;

	unsigned long size;

	unsigned long size;

	int           node;

	unsigned short node;

	unsigned short highmem;

};

};





struct meminfo {

struct meminfo {

arch/arm/mach-ixp4xx/include/mach/io.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 




#include <mach/hardware.h>

#include <mach/hardware.h>





#define IO_SPACE_LIMIT 0xffff0000

#define IO_SPACE_LIMIT 0x0000ffff





extern int (*ixp4xx_pci_read)(u32 addr, u32 cmd, u32* data);

extern int (*ixp4xx_pci_read)(u32 addr, u32 cmd, u32* data);

extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data);

extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data);

arch/arm/mach-mx3/mx31moboard-devboard.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ static struct imxuart_platform_data uart_pdata = { 




static int devboard_sdhc2_get_ro(struct device *dev)

static int devboard_sdhc2_get_ro(struct device *dev)

{

{

	return gpio_get_value(SDHC2_WP);

	return !gpio_get_value(SDHC2_WP);

}

}





static int devboard_sdhc2_init(struct device *dev, irq_handler_t detect_irq,

static int devboard_sdhc2_init(struct device *dev, irq_handler_t detect_irq,

arch/arm/mach-mx3/mx31moboard-marxbot.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ static unsigned int marxbot_pins[] = { 




static int marxbot_sdhc2_get_ro(struct device *dev)

static int marxbot_sdhc2_get_ro(struct device *dev)

{

{

	return gpio_get_value(SDHC2_WP);

	return !gpio_get_value(SDHC2_WP);

}

}





static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq,

static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq,