Commit 222e5cec authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for-tony' of... 

Merge branch 'for-tony' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/linux into fixes-omap4-dsp
parents d48b97b4 7548c09a

arch/arm/mach-omap2/hwspinlock.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static struct hwspinlock_pdata omap_hwspinlock_pdata __initdata = { 
	.base_id = 0,

};



int __init hwspinlocks_init(void)

static int __init hwspinlocks_init(void)

{

	int retval = 0;

	struct omap_hwmod *oh;

arch/arm/mach-omap2/mailbox.c

+0 −2
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ static int omap2_mbox_startup(struct omap_mbox *mbox) 
	l = mbox_read_reg(MAILBOX_REVISION);

	pr_debug("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4, (l & 0x0f));



	omap2_mbox_enable_irq(mbox, IRQ_RX);



	return 0;

}

arch/arm/mach-omap2/omap-iommu.c

+2 −4
Original line number Diff line number Diff line
@@ -73,19 +73,17 @@ static struct iommu_device omap4_devices[] = { 
			.da_end = 0xFFFFF000,

		},

	},

#if defined(CONFIG_MPU_TESLA_IOMMU)

	{

		.base = OMAP4_MMU2_BASE,

		.irq = INT_44XX_DSP_MMU,

		.irq = OMAP44XX_IRQ_TESLA_MMU,

		.pdata = {

			.name = "tesla",

			.nr_tlb_entries = 32,

			.clk_name = "tesla_ick",

			.clk_name = "dsp_fck",

			.da_start = 0x0,

			.da_end = 0xFFFFF000,

		},

	},

#endif

};

#define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)

static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];

arch/arm/plat-omap/mailbox.c

+9 −4
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ static int omap_mbox_startup(struct omap_mbox *mbox) 
		}

		mbox->rxq = mq;

		mq->mbox = mbox;



		omap_mbox_enable_irq(mbox, IRQ_RX);

	}

	mutex_unlock(&mbox_configured_lock);

	return 0;
@@ -305,6 +307,7 @@ static void omap_mbox_fini(struct omap_mbox *mbox) 
	mutex_lock(&mbox_configured_lock);



	if (!--mbox->use_count) {

		omap_mbox_disable_irq(mbox, IRQ_RX);

		free_irq(mbox->irq, mbox);

		tasklet_kill(&mbox->txq->tasklet);

		flush_work_sync(&mbox->rxq->work);
@@ -338,13 +341,15 @@ struct omap_mbox *omap_mbox_get(const char *name, struct notifier_block *nb) 
	if (!mbox)

		return ERR_PTR(-ENOENT);



	ret = omap_mbox_startup(mbox);

	if (ret)

		return ERR_PTR(-ENODEV);



	if (nb)

		blocking_notifier_chain_register(&mbox->notifier, nb);



	ret = omap_mbox_startup(mbox);

	if (ret) {

		blocking_notifier_chain_unregister(&mbox->notifier, nb);

		return ERR_PTR(-ENODEV);

	}



	return mbox;

}

EXPORT_SYMBOL(omap_mbox_get);