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

Commit 05f68940 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branches 'devel-mux' and 'devel-misc' into omap-for-linus

parents 17fe12c5 02b7b94e

arch/arm/mach-omap2/board-h4.c

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ static void __init omap_h4_init_early(void) 
static void __init omap_h4_init_irq(void)

{

	omap_init_irq();

	h4_init_flash();

}



static struct at24_platform_data m24c01 = {
@@ -372,6 +371,7 @@ static void __init omap_h4_init(void) 
	platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));

	omap2_usbfs_init(&h4_usb_config);

	omap_serial_init();

	h4_init_flash();

}



static void __init omap_h4_map_io(void)

arch/arm/mach-omap2/board-zoom.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static void __init omap_zoom_init_early(void) 
#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	/* WLAN IRQ - GPIO 162 */

	OMAP3_MUX(MCBSP1_CLKX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP),

	OMAP3_MUX(MCBSP1_CLKX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),

	/* WLAN POWER ENABLE - GPIO 101 */

	OMAP3_MUX(CAM_D2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),

	/* WLAN SDIO: MMC3 CMD */

arch/arm/mach-omap2/id.c

+13 −0
Original line number Diff line number Diff line
@@ -84,6 +84,11 @@ EXPORT_SYMBOL(omap_type); 
#define OMAP_TAP_DIE_ID_2	0x0220

#define OMAP_TAP_DIE_ID_3	0x0224



#define OMAP_TAP_DIE_ID_44XX_0	0x0200

#define OMAP_TAP_DIE_ID_44XX_1	0x0208

#define OMAP_TAP_DIE_ID_44XX_2	0x020c

#define OMAP_TAP_DIE_ID_44XX_3	0x0210



#define read_tap_reg(reg)	__raw_readl(tap_base  + (reg))



struct omap_id {
@@ -107,6 +112,14 @@ static u16 tap_prod_id; 


void omap_get_die_id(struct omap_die_id *odi)

{

	if (cpu_is_omap44xx()) {

		odi->id_0 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_0);

		odi->id_1 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_1);

		odi->id_2 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_2);

		odi->id_3 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_3);



		return;

	}

	odi->id_0 = read_tap_reg(OMAP_TAP_DIE_ID_0);

	odi->id_1 = read_tap_reg(OMAP_TAP_DIE_ID_1);

	odi->id_2 = read_tap_reg(OMAP_TAP_DIE_ID_2);

arch/arm/plat-omap/include/plat/iovmm.h

+0 −2
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ struct iovm_struct { 
#define IOVMF_LINEAR_MASK	(3 << (2 + IOVMF_SW_SHIFT))



#define IOVMF_DA_FIXED		(1 << (4 + IOVMF_SW_SHIFT))

#define IOVMF_DA_ANON		(2 << (4 + IOVMF_SW_SHIFT))

#define IOVMF_DA_MASK		(3 << (4 + IOVMF_SW_SHIFT))





extern struct iovm_struct *find_iovm_area(struct iommu *obj, u32 da);

arch/arm/plat-omap/iommu.c

+8 −6
Original line number Diff line number Diff line
@@ -982,11 +982,6 @@ static int __devinit omap_iommu_probe(struct platform_device *pdev) 
		err = -ENODEV;

		goto err_mem;

	}

	obj->regbase = ioremap(res->start, resource_size(res));

	if (!obj->regbase) {

		err = -ENOMEM;

		goto err_mem;

	}



	res = request_mem_region(res->start, resource_size(res),

				 dev_name(&pdev->dev));
@@ -995,6 +990,12 @@ static int __devinit omap_iommu_probe(struct platform_device *pdev) 
		goto err_mem;

	}



	obj->regbase = ioremap(res->start, resource_size(res));

	if (!obj->regbase) {

		err = -ENOMEM;

		goto err_ioremap;

	}



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		err = -ENODEV;
@@ -1023,8 +1024,9 @@ static int __devinit omap_iommu_probe(struct platform_device *pdev) 
err_pgd:

	free_irq(irq, obj);

err_irq:

	release_mem_region(res->start, resource_size(res));

	iounmap(obj->regbase);

err_ioremap:

	release_mem_region(res->start, resource_size(res));

err_mem:

	clk_put(obj->clk);

err_clk: