Merge branch 'omap-fixes-urgent' of git://git.linaro.org/people/rmk/linux-arm (a269c2f5) · Commits · 戴 / test

arch/arm/mach-omap2/vp.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,11 @@ void __init omap_vp_init(struct voltagedomain *voltdm)
		u32 val, sys_clk_rate, timeout, waittime;
		u32 vddmin, vddmax, vstepmin, vstepmax;

		if (!voltdm->pmic \|\| !voltdm->pmic->uv_to_vsel) {
		pr_err("%s: No PMIC info for vdd_%s\n", __func__, voltdm->name);
		return;
		}

		if (!voltdm->read \|\| !voltdm->write) {
		pr_err("%s: No read/write API for accessing vdd_%s regs\n",
		__func__, voltdm->name);

+1 −1

Original line number	Diff line number	Diff line
		@@ -200,7 +200,7 @@ config MENELAUS

		config TWL4030_CORE
		bool "Texas Instruments TWL4030/TWL5030/TWL6030/TPS659x0 Support"
		depends on I2C=y && GENERIC_HARDIRQS && IRQ_DOMAIN
		depends on I2C=y && GENERIC_HARDIRQS
		help
		Say yes here if you have TWL4030 / TWL6030 family chip on your board.
		This core driver provides register access and IRQ handling

+4 −2

Original line number	Diff line number	Diff line
		@@ -263,7 +263,9 @@ struct twl_client {

		static struct twl_client twl_modules[TWL_NUM_SLAVES];

		#ifdef CONFIG_IRQ_DOMAIN
		static struct irq_domain domain;
		#endif

		/* mapping the module id to slave id and base address */
		struct twl_mapping {
		@@ -1226,13 +1228,13 @@ twl_probe(struct i2c_client client, const struct i2c_device_id id)
		pdata->irq_base = status;
		pdata->irq_end = pdata->irq_base + nr_irqs;

		#ifdef CONFIG_IRQ_DOMAIN
		domain.irq_base = pdata->irq_base;
		domain.nr_irq = nr_irqs;
		#ifdef CONFIG_OF_IRQ
		domain.of_node = of_node_get(node);
		domain.ops = &irq_domain_simple_ops;
		#endif
		irq_domain_add(&domain);
		#endif

		if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C) == 0) {
		dev_dbg(&client->dev, "can't talk I2C?\n");

+5 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,11 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
		{
		int r;

		if (cpu_is_omap34xx() && !dpi.vdds_dsi_reg) {
		DSSERR("no VDSS_DSI regulator\n");
		return -ENODEV;
		}

		if (dssdev->manager == NULL) {
		DSSERR("failed to enable display: no manager\n");
		return -ENODEV;