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

Commit 22b7db80 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.19/w1-and-l3-noc' of... 

Merge tag 'omap-for-v3.19/w1-and-l3-noc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers

Pull "omap driver changes for v3.19" from Tony Lindgren:

Few omap driver changes to add minimal device tree support
for the omap 1w driver, and to fix resume and interrupt issues
on the l3-noc driver.

* tag 'omap-for-v3.19/w1-and-l3-noc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  bus: omap_l3_noc: Correct returning IRQ_HANDLED unconditionally in the irq handler
  bus: omap_l3_noc: Add resume hook to restore context
  w1: omap-hdq: support device probing with device-tree

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fe9b86fb c4cf0935

Documentation/devicetree/bindings/w1/omap-hdq.txt

0 → 100644
+17 −0
Original line number Original line Diff line number Diff line 
* OMAP HDQ One wire bus master controller



Required properties:

- compatible : should be "ti,omap3-1w"

- reg : Address and length of the register set for the device

- interrupts : interrupt line.

- ti,hwmods : "hdq1w"



Example:



- From omap3.dtsi

  hdqw1w: 1w@480b2000 {

	compatible = "ti,omap3-1w";

	reg = <0x480b2000 0x1000>;

	interrupts = <58>;

	ti,hwmods = "hdq1w";

  };

drivers/bus/omap_l3_noc.c

+61 −2
Original line number Original line Diff line number Diff line
@@ -222,10 +222,14 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3) 
			}

			}





			/* Error found so break the for loop */

			/* Error found so break the for loop */

			break;

			return IRQ_HANDLED;

		}

		}

	}

	}

	return IRQ_HANDLED;



	dev_err(l3->dev, "L3 %s IRQ not handled!!\n",

		inttype ? "debug" : "application");



	return IRQ_NONE;

}

}





static const struct of_device_id l3_noc_match[] = {

static const struct of_device_id l3_noc_match[] = {
@@ -296,11 +300,66 @@ static int omap_l3_probe(struct platform_device *pdev) 
	return ret;

	return ret;

}

}





#ifdef	CONFIG_PM



/**

 * l3_resume_noirq() - resume function for l3_noc

 * @dev:	pointer to l3_noc device structure

 *

 * We only have the resume handler only since we

 * have already maintained the delta register

 * configuration as part of configuring the system

 */

static int l3_resume_noirq(struct device *dev)

{

	struct omap_l3 *l3 = dev_get_drvdata(dev);

	int i;

	struct l3_flagmux_data *flag_mux;

	void __iomem *base, *mask_regx = NULL;

	u32 mask_val;



	for (i = 0; i < l3->num_modules; i++) {

		base = l3->l3_base[i];

		flag_mux = l3->l3_flagmux[i];

		if (!flag_mux->mask_app_bits && !flag_mux->mask_dbg_bits)

			continue;



		mask_regx = base + flag_mux->offset + L3_FLAGMUX_MASK0 +

			   (L3_APPLICATION_ERROR << 3);

		mask_val = readl_relaxed(mask_regx);

		mask_val &= ~(flag_mux->mask_app_bits);



		writel_relaxed(mask_val, mask_regx);

		mask_regx = base + flag_mux->offset + L3_FLAGMUX_MASK0 +

			   (L3_DEBUG_ERROR << 3);

		mask_val = readl_relaxed(mask_regx);

		mask_val &= ~(flag_mux->mask_dbg_bits);



		writel_relaxed(mask_val, mask_regx);

	}



	/* Dummy read to force OCP barrier */

	if (mask_regx)

		(void)readl(mask_regx);



	return 0;

}



static const struct dev_pm_ops l3_dev_pm_ops = {

	.resume_noirq		= l3_resume_noirq,

};



#define L3_DEV_PM_OPS (&l3_dev_pm_ops)

#else

#define L3_DEV_PM_OPS NULL

#endif



static struct platform_driver omap_l3_driver = {

static struct platform_driver omap_l3_driver = {

	.probe		= omap_l3_probe,

	.probe		= omap_l3_probe,

	.driver		= {

	.driver		= {

		.name		= "omap_l3_noc",

		.name		= "omap_l3_noc",

		.owner		= THIS_MODULE,

		.owner		= THIS_MODULE,

		.pm		= L3_DEV_PM_OPS,

		.of_match_table = of_match_ptr(l3_noc_match),

		.of_match_table = of_match_ptr(l3_noc_match),

	},

	},

};

};

drivers/w1/masters/omap_hdq.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -72,11 +72,18 @@ struct hdq_data { 
static int omap_hdq_probe(struct platform_device *pdev);

static int omap_hdq_probe(struct platform_device *pdev);

static int omap_hdq_remove(struct platform_device *pdev);

static int omap_hdq_remove(struct platform_device *pdev);





static struct of_device_id omap_hdq_dt_ids[] = {

	{ .compatible = "ti,omap3-1w" },

	{}

};

MODULE_DEVICE_TABLE(of, omap_hdq_dt_ids);



static struct platform_driver omap_hdq_driver = {

static struct platform_driver omap_hdq_driver = {

	.probe =	omap_hdq_probe,

	.probe =	omap_hdq_probe,

	.remove =	omap_hdq_remove,

	.remove =	omap_hdq_remove,

	.driver =	{

	.driver =	{

		.name =	"omap_hdq",

		.name =	"omap_hdq",

		.of_match_table = omap_hdq_dt_ids,

	},

	},

};

};