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

Commit 25f4a81e authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'omap-fixes' into fixes

parents 487194a1 e3318fb4

arch/arm/mach-omap1/board-h2.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static struct omap_lcd_config h2_lcd_config __initdata = { 
	.ctrl_name	= "internal",

};



static struct omap_board_config_kernel h2_config[] = {

static struct omap_board_config_kernel h2_config[] __initdata = {

	{ OMAP_TAG_USB,           &h2_usb_config },

	{ OMAP_TAG_MMC,           &h2_mmc_config },

	{ OMAP_TAG_UART,	&h2_uart_config },

arch/arm/mach-omap1/pm.c

+1 −10
Original line number Diff line number Diff line 
//kernel/linux-omap-fsample/arch/arm/mach-omap1/pm.c#3 - integrate change 4545 (text)

/*

 * linux/arch/arm/mach-omap1/pm.c

 *
@@ -631,10 +630,6 @@ static int omap_pm_prepare(suspend_state_t state) 
	case PM_SUSPEND_STANDBY:

	case PM_SUSPEND_MEM:

		break;



	case PM_SUSPEND_DISK:

		return -ENOTSUPP;



	default:

		return -EINVAL;

	}
@@ -657,10 +652,6 @@ static int omap_pm_enter(suspend_state_t state) 
	case PM_SUSPEND_MEM:

		omap_pm_suspend();

		break;



	case PM_SUSPEND_DISK:

		return -ENOTSUPP;



	default:

		return -EINVAL;

	}

arch/arm/mach-omap2/mux.c

+31 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct pin_config __initdata_or_module omap24xx_pins[] = { 
/* 24xx I2C */

MUX_CFG_24XX("M19_24XX_I2C1_SCL",	0x111,	0,	0,	0,	1)

MUX_CFG_24XX("L15_24XX_I2C1_SDA",	0x112,	0,	0,	0,	1)

MUX_CFG_24XX("J15_24XX_I2C2_SCL",	0x113,	0,	0,	0,	1)

MUX_CFG_24XX("J15_24XX_I2C2_SCL",	0x113,	0,	0,	1,	1)

MUX_CFG_24XX("H19_24XX_I2C2_SDA",	0x114,	0,	0,	0,	1)



/* Menelaus interrupt */
@@ -52,7 +52,9 @@ MUX_CFG_24XX("W19_24XX_SYS_NIRQ", 0x12c, 0, 1, 1, 1) 
/* 24xx clocks */

MUX_CFG_24XX("W14_24XX_SYS_CLKOUT",	0x137,	0,	1,	1,	1)



/* 24xx GPMC wait pin monitoring */

/* 24xx GPMC chipselects, wait pin monitoring */

MUX_CFG_24XX("E2_GPMC_NCS2",	0x08e,	0,	1,	1,	1)

MUX_CFG_24XX("L2_GPMC_NCS7",	0x093,	0,	1,	1,	1)

MUX_CFG_24XX("L3_GPMC_WAIT0",		0x09a,	0,	1,	1,	1)

MUX_CFG_24XX("N7_GPMC_WAIT1",		0x09b,	0,	1,	1,	1)

MUX_CFG_24XX("M1_GPMC_WAIT2",		0x09c,	0,	1,	1,	1)
@@ -66,6 +68,7 @@ MUX_CFG_24XX("V15_24XX_MCBSP2_DX", 0x127, 1, 1, 0, 1) 


/* 24xx GPIO */

MUX_CFG_24XX("M21_242X_GPIO11",		0x0c9,  3,      1,      1,      1)

MUX_CFG_24XX("P21_242X_GPIO12",	0x0ca,	3,	0,	0,	1)

MUX_CFG_24XX("AA10_242X_GPIO13",	0x0e5,  3,      0,      0,      1)

MUX_CFG_24XX("AA6_242X_GPIO14",		0x0e6,  3,      0,      0,      1)

MUX_CFG_24XX("AA4_242X_GPIO15",		0x0e7,  3,      0,      0,      1)
@@ -75,7 +78,9 @@ MUX_CFG_24XX("AA8_242X_GPIO58", 0x0ea, 3, 0, 0, 1) 
MUX_CFG_24XX("Y20_24XX_GPIO60",		0x12c,	3,	0,	0,	1)

MUX_CFG_24XX("W4__24XX_GPIO74",		0x0f2,  3,      0,      0,      1)

MUX_CFG_24XX("M15_24XX_GPIO92",		0x10a,	3,	0,	0,	1)

MUX_CFG_24XX("J15_24XX_GPIO99",	0x113,	3,	1,	1,	1)

MUX_CFG_24XX("V14_24XX_GPIO117",	0x128,	3,	1,	0,	1)

MUX_CFG_24XX("P14_24XX_GPIO125",	0x140,	3,	1,	1,	1)



/* 242x DBG GPIO */

MUX_CFG_24XX("V4_242X_GPIO49",		0xd3,	3,	0,	0,	1)
@@ -118,6 +123,30 @@ MUX_CFG_24XX("E18_24XX_MMC_DAT_DIR3", 0x0fc, 0, 0, 0, 1) 
MUX_CFG_24XX("G18_24XX_MMC_CMD_DIR",	0x0fd,	0,	0,	0,	1)

MUX_CFG_24XX("H15_24XX_MMC_CLKI",	0x0fe,	0,	0,	0,	1)



/* Full speed USB */

MUX_CFG_24XX("J20_24XX_USB0_PUEN",	0x11d,	0,	0,	0,	1)

MUX_CFG_24XX("J19_24XX_USB0_VP",	0x11e,	0,	0,	0,	1)

MUX_CFG_24XX("K20_24XX_USB0_VM",	0x11f,	0,	0,	0,	1)

MUX_CFG_24XX("J18_24XX_USB0_RCV",	0x120,	0,	0,	0,	1)

MUX_CFG_24XX("K19_24XX_USB0_TXEN",	0x121,	0,	0,	0,	1)

MUX_CFG_24XX("J14_24XX_USB0_SE0",	0x122,	0,	0,	0,	1)

MUX_CFG_24XX("K18_24XX_USB0_DAT",	0x123,	0,	0,	0,	1)



MUX_CFG_24XX("N14_24XX_USB1_SE0",	0x0ed,	2,	0,	0,	1)

MUX_CFG_24XX("W12_24XX_USB1_SE0",	0x0dd,	3,	0,	0,	1)

MUX_CFG_24XX("P15_24XX_USB1_DAT",	0x0ee,	2,	0,	0,	1)

MUX_CFG_24XX("R13_24XX_USB1_DAT",	0x0e0,	3,	0,	0,	1)

MUX_CFG_24XX("W20_24XX_USB1_TXEN",	0x0ec,	2,	0,	0,	1)

MUX_CFG_24XX("P13_24XX_USB1_TXEN",	0x0df,	3,	0,	0,	1)

MUX_CFG_24XX("V19_24XX_USB1_RCV",	0x0eb,	2,	0,	0,	1)

MUX_CFG_24XX("V12_24XX_USB1_RCV",	0x0de,	3,	0,	0,	1)



MUX_CFG_24XX("AA10_24XX_USB2_SE0",	0x0e5,	2,	0,	0,	1)

MUX_CFG_24XX("Y11_24XX_USB2_DAT",	0x0e8,	2,	0,	0,	1)

MUX_CFG_24XX("AA12_24XX_USB2_TXEN",	0x0e9,	2,	0,	0,	1)

MUX_CFG_24XX("AA6_24XX_USB2_RCV",	0x0e6,	2,	0,	0,	1)

MUX_CFG_24XX("AA4_24XX_USB2_TLLSE0",	0x0e7,	2,	0,	0,	1)



/* Keypad GPIO*/

MUX_CFG_24XX("T19_24XX_KBR0",		0x106,	3,	1,	1,	1)

MUX_CFG_24XX("R19_24XX_KBR1",		0x107,	3,	1,	1,	1)

arch/arm/plat-omap/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ int omap_set_dma_callback(int lch, 
 */

dma_addr_t omap_get_dma_src_pos(int lch)

{

	dma_addr_t offset;

	dma_addr_t offset = 0;



	if (cpu_class_is_omap1())

		offset = (dma_addr_t) (OMAP1_DMA_CSSA_L_REG(lch) |
@@ -769,7 +769,7 @@ dma_addr_t omap_get_dma_src_pos(int lch) 
 */

dma_addr_t omap_get_dma_dst_pos(int lch)

{

	dma_addr_t offset;

	dma_addr_t offset = 0;



	if (cpu_class_is_omap1())

		offset = (dma_addr_t) (OMAP1_DMA_CDSA_L_REG(lch) |

arch/arm/plat-omap/mux.c

+15 −4
Original line number Diff line number Diff line
@@ -83,10 +83,21 @@ int __init_or_module omap_cfg_reg(const unsigned long index) 
			reg |= OMAP24XX_PULL_ENA;

		if(cfg->pu_pd_val)

			reg |= OMAP24XX_PULL_UP;

#if defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS)

		{

			u8 orig = omap_readb(OMAP24XX_L4_BASE + cfg->mux_reg);

			u8 debug = 0;



#ifdef	CONFIG_OMAP_MUX_DEBUG

		printk("Muxing %s (0x%08x): 0x%02x -> 0x%02x\n",

		       cfg->name, OMAP24XX_L4_BASE + cfg->mux_reg,

		       omap_readb(OMAP24XX_L4_BASE + cfg->mux_reg), reg);

			debug = cfg->debug;

#endif

			warn = (orig != reg);

			if (debug || warn)

				printk("MUX: setup %s (0x%08x): 0x%02x -> 0x%02x\n",

						cfg->name,

						OMAP24XX_L4_BASE + cfg->mux_reg,

						orig, reg);

		}

#endif

		omap_writeb(reg, OMAP24XX_L4_BASE + cfg->mux_reg);