---

yaml
---
r: 201335
b: refs/heads/master
c: a0dff78
h: refs/heads/master
i:
  201333: 53e6b48
  201331: d01f877
  201327: 1ccd7d5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2a97a4e99ff0ffdccd1fc46f22fb34270ef1e56
+refs/heads/master: a0dff78dab0ff8d78bd5c9e33c105cf1292f2282

trunk/Documentation/feature-removal-schedule.txt

@@ -647,10 +647,3 @@ Who:	Stefan Richter <stefanr@s5r6.in-berlin.de>
 
 ----------------------------
 
-What:	The acpi_sleep=s4_nonvs command line option
-When:	2.6.37
-Files:	arch/x86/kernel/acpi/sleep.c
-Why:	superseded by acpi_sleep=nonvs
-Who:	Rafael J. Wysocki <rjw@sisk.pl>
-
-----------------------------

trunk/Documentation/kernel-parameters.txt

@@ -254,8 +254,8 @@ and is between 256 and 4096 characters. It is defined in the file
 			control method, with respect to putting devices into
 			low power states, to be enforced (the ACPI 2.0 ordering
 			of _PTS is used by default).
-			nonvs prevents the kernel from saving/restoring the
-			ACPI NVS memory during suspend/hibernation and resume.
+			s4_nonvs prevents the kernel from saving/restoring the
+			ACPI NVS memory during hibernation.
 			sci_force_enable causes the kernel to set SCI_EN directly
 			on resume from S1/S3 (which is against the ACPI spec,
 			but some broken systems don't work without it).

trunk/arch/arm/mach-clps711x/include/mach/debug-macro.S

@@ -11,7 +11,6 @@
  *
 */
 
-#include <mach/hardware.h>
 #include <asm/hardware/clps7111.h>
 
 		.macro	addruart, rx, tmp

trunk/arch/arm/mach-footbridge/common.c

@@ -232,7 +232,7 @@ EXPORT_SYMBOL(__bus_to_virt);
 
 unsigned long __pfn_to_bus(unsigned long pfn)
 {
-	return __pfn_to_phys(pfn) + (fb_bus_sdram_offset() - PHYS_OFFSET);
+	return __pfn_to_phys(pfn) + (fb_bus_sdram_offset() - PHYS_OFFSET));
 }
 EXPORT_SYMBOL(__pfn_to_bus);
 

trunk/arch/arm/mach-h720x/include/mach/debug-macro.S

@@ -11,10 +11,8 @@
  *
 */
 
-#include <mach/hardware.h>
-
-		.equ    io_virt, IO_VIRT
-		.equ    io_phys, IO_PHYS
+		.equ    io_virt, IO_BASE
+		.equ    io_phys, IO_START
 
 		.macro  addruart, rx, tmp
 		mrc     p15, 0, \rx, c1, c0

trunk/arch/arm/mach-kirkwood/tsx1x-common.c

@@ -77,7 +77,7 @@ struct spi_board_info __initdata qnap_tsx1x_spi_slave_info[] = {
 	},
 };
 
-void __init qnap_tsx1x_register_flash(void)
+void qnap_tsx1x_register_flash(void)
 {
 	spi_register_board_info(qnap_tsx1x_spi_slave_info,
 				ARRAY_SIZE(qnap_tsx1x_spi_slave_info));

trunk/arch/arm/mach-kirkwood/tsx1x-common.h

@@ -1,7 +1,7 @@
 #ifndef __ARCH_KIRKWOOD_TSX1X_COMMON_H
 #define __ARCH_KIRKWOOD_TSX1X_COMMON_H
 
-extern void __init qnap_tsx1x_register_flash(void);
+extern void qnap_tsx1x_register_flash(void);
 extern void qnap_tsx1x_power_off(void);
 
 #endif

trunk/arch/arm/mach-ns9xxx/include/mach/debug-macro.S

@@ -8,7 +8,6 @@
  * the Free Software Foundation.
  */
 #include <mach/hardware.h>
-#include <asm/memory.h>
 
 #include <mach/regs-board-a9m9750dev.h>
 

trunk/arch/arm/mach-ns9xxx/include/mach/uncompress.h

@@ -20,49 +20,50 @@ static void putc_dummy(char c, void __iomem *base)
 	/* nothing */
 }
 
-static int timeout;
-
 static void putc_ns9360(char c, void __iomem *base)
 {
+	static int t = 0x10000;
 	do {
-		if (timeout)
-			--timeout;
+		if (t)
+			--t;
 
 		if (__raw_readl(base + 8) & (1 << 3)) {
 			__raw_writeb(c, base + 16);
-			timeout = 0x10000;
+			t = 0x10000;
 			break;
 		}
-	} while (timeout);
+	} while (t);
 }
 
 static void putc_a9m9750dev(char c, void __iomem *base)
 {
+	static int t = 0x10000;
 	do {
-		if (timeout)
-			--timeout;
+		if (t)
+			--t;
 
 		if (__raw_readb(base + 5) & (1 << 5)) {
 			__raw_writeb(c, base);
-			timeout = 0x10000;
+			t = 0x10000;
 			break;
 		}
-	} while (timeout);
+	} while (t);
 
 }
 
 static void putc_ns921x(char c, void __iomem *base)
 {
+	static int t = 0x10000;
 	do {
-		if (timeout)
-			--timeout;
+		if (t)
+			--t;
 
 		if (!(__raw_readl(base) & (1 << 11))) {
 			__raw_writeb(c, base + 0x0028);
-			timeout = 0x10000;
+			t = 0x10000;
 			break;
 		}
-	} while (timeout);
+	} while (t);
 }
 
 #define MSCS __REG(0xA0900184)
@@ -88,7 +89,6 @@ static void putc_ns921x(char c, void __iomem *base)
 
 static void autodetect(void (**putc)(char, void __iomem *), void __iomem **base)
 {
-	timeout = 0x10000;
 	if (((__raw_readl(MSCS) >> 16) & 0xfe) == 0x00) {
 		/* ns9360 or ns9750 */
 		if (NS9360_UART_ENABLED(NS9360_UARTA)) {

trunk/arch/arm/mach-omap2/board-rx51-peripherals.c

@@ -220,10 +220,10 @@ static int board_keymap[] = {
 	KEY(4, 4, KEY_LEFTCTRL),
 	KEY(4, 5, KEY_RIGHTALT),
 	KEY(4, 6, KEY_LEFTSHIFT),
-	KEY(4, 8, KEY_F10),
+	KEY(4, 8, KEY_10),
 
 	KEY(5, 0, KEY_Y),
-	KEY(5, 8, KEY_F11),
+	KEY(5, 8, KEY_11),
 
 	KEY(6, 0, KEY_U),
 

trunk/arch/arm/mach-pxa/colibri-pxa300.c

@@ -26,7 +26,6 @@
 #include <mach/colibri.h>
 #include <mach/ohci.h>
 #include <mach/pxafb.h>
-#include <mach/audio.h>
 
 #include "generic.h"
 #include "devices.h"
@@ -146,7 +145,7 @@ static void __init colibri_pxa300_init_lcd(void)
 static inline void colibri_pxa300_init_lcd(void) {}
 #endif /* CONFIG_FB_PXA || CONFIG_FB_PXA_MODULE */
 
-#if defined(CONFIG_SND_AC97_CODEC) || defined(CONFIG_SND_AC97_CODEC_MODULE)
+#if defined(SND_AC97_CODEC) || defined(SND_AC97_CODEC_MODULE)
 static mfp_cfg_t colibri_pxa310_ac97_pin_config[] __initdata = {
 	GPIO24_AC97_SYSCLK,
 	GPIO23_AC97_nACRESET,

trunk/arch/arm/mach-pxa/corgi.c

@@ -446,7 +446,7 @@ static struct platform_device corgiled_device = {
 static struct pxamci_platform_data corgi_mci_platform_data = {
 	.detect_delay_ms	= 250,
 	.ocr_mask		= MMC_VDD_32_33|MMC_VDD_33_34,
-	.gpio_card_detect	= CORGI_GPIO_nSD_DETECT,
+	.gpio_card_detect	= -1,
 	.gpio_card_ro		= CORGI_GPIO_nSD_WP,
 	.gpio_power		= CORGI_GPIO_SD_PWR,
 };

trunk/arch/arm/mach-pxa/cpufreq-pxa2xx.c

@@ -256,9 +256,13 @@ static void init_sdram_rows(void)
 
 static u32 mdrefr_dri(unsigned int freq)
 {
-	u32 interval = freq * SDRAM_TREF / sdram_rows;
+	u32 dri = 0;
 
-	return (interval - (cpu_is_pxa27x() ? 31 : 0)) / 32;
+	if (cpu_is_pxa25x())
+		dri = ((freq * SDRAM_TREF) / (sdram_rows * 32));
+	if (cpu_is_pxa27x())
+		dri = ((freq * SDRAM_TREF) / (sdram_rows - 31)) / 32;
+	return dri;
 }
 
 /* find a valid frequency point */

trunk/arch/arm/mach-pxa/pxa27x.c

@@ -41,10 +41,10 @@ void pxa27x_clear_otgph(void)
 EXPORT_SYMBOL(pxa27x_clear_otgph);
 
 static unsigned long ac97_reset_config[] = {
-	GPIO113_GPIO,
-	GPIO113_AC97_nRESET,
-	GPIO95_GPIO,
 	GPIO95_AC97_nRESET,
+	GPIO95_GPIO,
+	GPIO113_AC97_nRESET,
+	GPIO113_GPIO,
 };
 
 void pxa27x_assert_ac97reset(int reset_gpio, int on)

trunk/arch/arm/mach-shark/include/mach/debug-macro.S

@@ -20,9 +20,6 @@
 		strb	\rd, [\rx]
 		.endm
 
-		.macro waituart,rd,rx
-		.endm
-
 		.macro	busyuart,rd,rx
 		mov	\rd, #0
 1001:		add	\rd, \rd, #1

trunk/arch/arm/mach-w90x900/cpu.c

@@ -93,7 +93,7 @@ static struct clk_lookup nuc900_clkregs[] = {
 	DEF_CLKLOOK(&clk_kpi, "nuc900-kpi", NULL),
 	DEF_CLKLOOK(&clk_wdt, "nuc900-wdt", NULL),
 	DEF_CLKLOOK(&clk_gdma, "nuc900-gdma", NULL),
-	DEF_CLKLOOK(&clk_adc, "nuc900-ts", NULL),
+	DEF_CLKLOOK(&clk_adc, "nuc900-adc", NULL),
 	DEF_CLKLOOK(&clk_usi, "nuc900-spi", NULL),
 	DEF_CLKLOOK(&clk_ext, NULL, "ext"),
 	DEF_CLKLOOK(&clk_timer0, NULL, "timer0"),

trunk/arch/arm/plat-spear/include/plat/debug-macro.S

@@ -17,8 +17,8 @@
 		.macro	addruart, rx
 		mrc	p15, 0, \rx, c1, c0
 		tst	\rx, #1					@ MMU enabled?
-		moveq	\rx, #SPEAR_DBG_UART_BASE		@ Physical base
-		movne	\rx, #VA_SPEAR_DBG_UART_BASE		@ Virtual base
+		moveq	\rx, =SPEAR_DBG_UART_BASE		@ Physical base
+		movne	\rx, =VA_SPEAR_DBG_UART_BASE		@ Virtual base
 		.endm
 
 		.macro	senduart, rd, rx

trunk/arch/avr32/include/asm/ioctls.h

@@ -54,9 +54,6 @@
 #define TIOCGPTN	_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 #define TIOCSPTLCK	_IOW('T',0x31, int)  /* Lock/unlock Pty */
 
-#define TIOCGRS485      0x542E
-#define TIOCSRS485      0x542F
-
 #define FIONCLEX	0x5450
 #define FIOCLEX		0x5451
 #define FIOASYNC	0x5452

trunk/arch/avr32/mach-at32ap/include/mach/board.h

@@ -5,7 +5,6 @@
 #define __ASM_ARCH_BOARD_H
 
 #include <linux/types.h>
-#include <linux/serial.h>
 
 #define GPIO_PIN_NONE	(-1)
 
@@ -36,7 +35,6 @@ struct atmel_uart_data {
 	short		use_dma_tx;	/* use transmit DMA? */
 	short		use_dma_rx;	/* use receive DMA? */
 	void __iomem	*regs;		/* virtual base address, if any */
-	struct serial_rs485	rs485;		/* rs485 settings */
 };
 void at32_map_usart(unsigned int hw_id, unsigned int line, int flags);
 struct platform_device *at32_add_device_usart(unsigned int id);

trunk/arch/mips/alchemy/common/platform.c

@@ -435,21 +435,20 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = {
 static int __init au1xxx_platform_init(void)
 {
 	unsigned int uartclk = get_au1x00_uart_baud_base() * 16;
-	int err, i;
+	int i;
 
 	/* Fill up uartclk. */
 	for (i = 0; au1x00_uart_data[i].flags; i++)
 		au1x00_uart_data[i].uartclk = uartclk;
 
-	err = platform_add_devices(au1xxx_platform_devices,
-				   ARRAY_SIZE(au1xxx_platform_devices));
 #ifndef CONFIG_SOC_AU1100
 	/* Register second MAC if enabled in pinfunc */
-	if (!err && !(au_readl(SYS_PINFUNC) & (u32)SYS_PF_NI2))
+	if (!(au_readl(SYS_PINFUNC) & (u32)SYS_PF_NI2))
 		platform_device_register(&au1xxx_eth1_device);
 #endif
 
-	return err;
+	return platform_add_devices(au1xxx_platform_devices,
+				    ARRAY_SIZE(au1xxx_platform_devices));
 }
 
 arch_initcall(au1xxx_platform_init);

trunk/arch/mips/alchemy/mtx-1/board_setup.c

@@ -67,6 +67,8 @@ static void mtx1_power_off(void)
 
 void __init board_setup(void)
 {
+	alchemy_gpio2_enable();
+
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
 	/* Enable USB power switch */
 	alchemy_gpio_direction_output(204, 0);
@@ -115,11 +117,11 @@ mtx1_pci_idsel(unsigned int devsel, int assert)
 
 	if (assert && devsel != 0)
 		/* Suppress signal to Cardbus */
-		alchemy_gpio_set_value(1, 0);	/* set EXT_IO3 OFF */
+		gpio_set_value(1, 0);	/* set EXT_IO3 OFF */
 	else
-		alchemy_gpio_set_value(1, 1);	/* set EXT_IO3 ON */
+		gpio_set_value(1, 1);	/* set EXT_IO3 ON */
 
-	udelay(1);
+	au_sync_udelay(1);
 	return 1;
 }
 

trunk/arch/mips/bcm63xx/dev-enet.c

@@ -104,9 +104,6 @@ int __init bcm63xx_enet_register(int unit,
 	if (unit > 1)
 		return -ENODEV;
 
-	if (unit == 1 && BCMCPU_IS_6338())
-		return -ENODEV;
-
 	if (!shared_device_registered) {
 		shared_res[0].start = bcm63xx_regset_address(RSET_ENETDMA);
 		shared_res[0].end = shared_res[0].start;