diff for duplicates of <20120528114225.GH3923@besouro> diff --git a/a/1.txt b/N1/1.txt index ca0f1f9..5c70de6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,52 +32,52 @@ On Mon, May 28, 2012 at 03:24:01PM +0530, Shilimkar, Santosh wrote: > > --- a/arch/arm/plat-omap/Kconfig > > +++ b/arch/arm/plat-omap/Kconfig > > @@ -5,6 +5,9 @@ menu "TI OMAP Common Features" -> > config ARCH_OMAP_OTG -> > bool +> > ?config ARCH_OMAP_OTG +> > ? ? ? ?bool > > > > +config ARCH_HAS_CONTROL_MODULE -> > + bool +> > + ? ? ? bool > > + > Thanks for getting rid of OMAP CONFIG here. OK. ARCH_HAS_CONTROL_MODULE is a bit too generic though.. > -> > choice -> > prompt "OMAP System Type" -> > default ARCH_OMAP2PLUS +> > ?choice +> > ? ? ? ?prompt "OMAP System Type" +> > ? ? ? ?default ARCH_OMAP2PLUS > > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > > index 11e4438..25a66d8 100644 > > --- a/drivers/mfd/Kconfig > > +++ b/drivers/mfd/Kconfig > > @@ -795,6 +795,15 @@ config MFD_WL1273_CORE -> > driver connects the radio-wl1273 V4L2 module and the wl1273 -> > audio codec. +> > ? ? ? ? ?driver connects the radio-wl1273 V4L2 module and the wl1273 +> > ? ? ? ? ?audio codec. > > > > +config MFD_OMAP_CONTROL -> > + bool "Texas Instruments OMAP System control module" -> > + depends on ARCH_HAS_CONTROL_MODULE -> > + help -> > + This is the core driver for system control module. This driver -> > + is responsible for creating the control module mfd child, -> > + like USB-pin control, pin muxing, MMC-pbias and DDR IO dynamic -> > + change for off mode. +> > + ? ? ? bool "Texas Instruments OMAP System control module" +> > + ? ? ? depends on ARCH_HAS_CONTROL_MODULE +> > + ? ? ? help +> > + ? ? ? ? This is the core driver for system control module. This driver +> > + ? ? ? ? is responsible for creating the control module mfd child, +> > + ? ? ? ? like USB-pin control, pin muxing, MMC-pbias and DDR IO dynamic +> > + ? ? ? ? change for off mode. > > + -> > config MFD_OMAP_USB_HOST -> > bool "Support OMAP USBHS core driver" -> > depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3 +> > ?config MFD_OMAP_USB_HOST +> > ? ? ? ?bool "Support OMAP USBHS core driver" +> > ? ? ? ?depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3 > > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > > index 05fa538..00f99d6 100644 > > --- a/drivers/mfd/Makefile > > +++ b/drivers/mfd/Makefile -> > @@ -106,6 +106,7 @@ obj-$(CONFIG_MFD_TPS6586X) += tps6586x.o -> > obj-$(CONFIG_MFD_VX855) += vx855.o -> > obj-$(CONFIG_MFD_WL1273_CORE) += wl1273-core.o -> > obj-$(CONFIG_MFD_CS5535) += cs5535-mfd.o +> > @@ -106,6 +106,7 @@ obj-$(CONFIG_MFD_TPS6586X) ?+= tps6586x.o +> > ?obj-$(CONFIG_MFD_VX855) ? ? ? ? ? ? ? ?+= vx855.o +> > ?obj-$(CONFIG_MFD_WL1273_CORE) ?+= wl1273-core.o +> > ?obj-$(CONFIG_MFD_CS5535) ? ? ? += cs5535-mfd.o > > +obj-$(CONFIG_MFD_OMAP_CONTROL) += omap-control-core.o -> > obj-$(CONFIG_MFD_OMAP_USB_HOST) += omap-usb-host.o -> > obj-$(CONFIG_MFD_PM8921_CORE) += pm8921-core.o -> > obj-$(CONFIG_MFD_PM8XXX_IRQ) += pm8xxx-irq.o +> > ?obj-$(CONFIG_MFD_OMAP_USB_HOST) ? ? ? ?+= omap-usb-host.o +> > ?obj-$(CONFIG_MFD_PM8921_CORE) ?+= pm8921-core.o +> > ?obj-$(CONFIG_MFD_PM8XXX_IRQ) ? += pm8xxx-irq.o > > diff --git a/drivers/mfd/omap-control-core.c b/drivers/mfd/omap-control-core.c > > new file mode 100644 > > index 0000000..7d8d408 @@ -90,10 +90,10 @@ OK. ARCH_HAS_CONTROL_MODULE is a bit too generic though.. > > + * Copyright (C) 2011-2012 Texas Instruments Incorporated - http://www.ti.com/ > > + * Contacts: > > + * Based on original code written by: -> > + * J Keerthy <j-keerthy@ti.com> -> > + * Moiz Sonasath <m-sonasath@ti.com> +> > + * ? ?J Keerthy <j-keerthy@ti.com> +> > + * ? ?Moiz Sonasath <m-sonasath@ti.com> > > + * MFD clean up and re-factoring: -> > + * Eduardo Valentin <eduardo.valentin@ti.com> +> > + * ? ?Eduardo Valentin <eduardo.valentin@ti.com> > > + * > > + * This program is free software; you can redistribute it and/or > > + * modify it under the terms of the GNU General Public License @@ -101,7 +101,7 @@ OK. ARCH_HAS_CONTROL_MODULE is a bit too generic though.. > > + * > > + * This program is distributed in the hope that it will be useful, but > > + * WITHOUT ANY WARRANTY; without even the implied warranty of -> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ?See the GNU > > + * General Public License for more details. > > + * > > + */ @@ -130,14 +130,14 @@ OK. ARCH_HAS_CONTROL_MODULE is a bit too generic though.. > > + */ > > +int omap_control_readl(struct device *dev, u32 reg, u32 *val) > > +{ -> > + struct omap_control *omap_control = dev_get_drvdata(dev); +> > + ? ? ? struct omap_control *omap_control = dev_get_drvdata(dev); > > + -> > + if (!omap_control) -> > + return -EINVAL; +> > + ? ? ? if (!omap_control) +> > + ? ? ? ? ? ? ? return -EINVAL; > > + -> > + *val = readl(omap_control->base + reg); +> > + ? ? ? *val = readl(omap_control->base + reg); > > + -> > + return 0; +> > + ? ? ? return 0; > > +} > > +EXPORT_SYMBOL_GPL(omap_control_readl); > > + @@ -166,17 +166,17 @@ values with error values. > > + */ > > +int omap_control_writel(struct device *dev, u32 val, u32 reg) > > +{ -> > + struct omap_control *omap_control = dev_get_drvdata(dev); -> > + unsigned long flags; +> > + ? ? ? struct omap_control *omap_control = dev_get_drvdata(dev); +> > + ? ? ? unsigned long flags; > > + -> > + if (!omap_control) -> > + return -EINVAL; +> > + ? ? ? if (!omap_control) +> > + ? ? ? ? ? ? ? return -EINVAL; > > + -> > + spin_lock_irqsave(&omap_control->reg_lock, flags); -> > + writel(val, omap_control->base + reg); -> > + spin_unlock_irqrestore(&omap_control->reg_lock, flags); +> > + ? ? ? spin_lock_irqsave(&omap_control->reg_lock, flags); +> > + ? ? ? writel(val, omap_control->base + reg); +> > + ? ? ? spin_unlock_irqrestore(&omap_control->reg_lock, flags); > > + -> > + return 0; +> > + ? ? ? return 0; > > +} > > +EXPORT_SYMBOL_GPL(omap_control_writel); > > + @@ -188,16 +188,16 @@ values with error values. > > + */ > > +struct device *omap_control_get(void) > > +{ -> > + unsigned long flags; +> > + ? ? ? unsigned long flags; > > + -> > + if (!omap_control_module) -> > + return ERR_PTR(-ENODEV); +> > + ? ? ? if (!omap_control_module) +> > + ? ? ? ? ? ? ? return ERR_PTR(-ENODEV); > > + -> > + spin_lock_irqsave(&omap_control_module->reg_lock, flags); -> > + omap_control_module->use_count++; -> > + spin_unlock_irqrestore(&omap_control_module->reg_lock, flags); +> > + ? ? ? spin_lock_irqsave(&omap_control_module->reg_lock, flags); +> > + ? ? ? omap_control_module->use_count++; +> > + ? ? ? spin_unlock_irqrestore(&omap_control_module->reg_lock, flags); > > + -> > + return omap_control_module->dev; +> > + ? ? ? return omap_control_module->dev; > > +} > > +EXPORT_SYMBOL_GPL(omap_control_get); > > + @@ -209,59 +209,59 @@ values with error values. > > + */ > > +void omap_control_put(struct device *dev) > > +{ -> > + struct omap_control *omap_control = dev_get_drvdata(dev); -> > + unsigned long flags; +> > + ? ? ? struct omap_control *omap_control = dev_get_drvdata(dev); +> > + ? ? ? unsigned long flags; > > + -> > + if (!omap_control) -> > + return; +> > + ? ? ? if (!omap_control) +> > + ? ? ? ? ? ? ? return; > > + -> > + spin_lock_irqsave(&omap_control->reg_lock, flags); -> > + omap_control->use_count--; -> > + spin_unlock_irqrestore(&omap_control_module->reg_lock, flags); +> > + ? ? ? spin_lock_irqsave(&omap_control->reg_lock, flags); +> > + ? ? ? omap_control->use_count--; +> > + ? ? ? spin_unlock_irqrestore(&omap_control_module->reg_lock, flags); > > +} > > +EXPORT_SYMBOL_GPL(omap_control_put); > > + > > +static const struct of_device_id of_omap_control_match[] = { -> > + { .compatible = "ti,omap3-control", }, -> > + { .compatible = "ti,omap4-control", }, -> > + { .compatible = "ti,omap5-control", }, -> > + { }, +> > + ? ? ? { .compatible = "ti,omap3-control", }, +> > + ? ? ? { .compatible = "ti,omap4-control", }, +> > + ? ? ? { .compatible = "ti,omap5-control", }, +> > + ? ? ? { }, > > +}; > > + > > +static int __devinit omap_control_probe(struct platform_device *pdev) > > +{ -> > + struct resource *res; -> > + void __iomem *base; -> > + struct device *dev = &pdev->dev; -> > + struct device_node *np = dev->of_node; -> > + struct omap_control *omap_control; +> > + ? ? ? struct resource *res; +> > + ? ? ? void __iomem *base; +> > + ? ? ? struct device *dev = &pdev->dev; +> > + ? ? ? struct device_node *np = dev->of_node; +> > + ? ? ? struct omap_control *omap_control; > > + -> > + omap_control = devm_kzalloc(dev, sizeof(*omap_control), GFP_KERNEL); -> > + if (!omap_control) { -> > + dev_err(dev, "not enough memory for omap_control\n"); -> > + return -ENOMEM; -> > + } +> > + ? ? ? omap_control = devm_kzalloc(dev, sizeof(*omap_control), GFP_KERNEL); +> > + ? ? ? if (!omap_control) { +> > + ? ? ? ? ? ? ? dev_err(dev, "not enough memory for omap_control\n"); +> > + ? ? ? ? ? ? ? return -ENOMEM; +> > + ? ? ? } > > + -> > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -> > + if (!res) { -> > + dev_err(dev, "missing memory base resource\n"); -> > + return -EINVAL; -> > + } +> > + ? ? ? res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +> > + ? ? ? if (!res) { +> > + ? ? ? ? ? ? ? dev_err(dev, "missing memory base resource\n"); +> > + ? ? ? ? ? ? ? return -EINVAL; +> > + ? ? ? } > > + -> > + base = devm_request_and_ioremap(dev, res); -> > + if (!base) { -> > + dev_err(dev, "ioremap failed\n"); -> > + return -EADDRNOTAVAIL; -> > + } +> > + ? ? ? base = devm_request_and_ioremap(dev, res); +> > + ? ? ? if (!base) { +> > + ? ? ? ? ? ? ? dev_err(dev, "ioremap failed\n"); +> > + ? ? ? ? ? ? ? return -EADDRNOTAVAIL; +> > + ? ? ? } > > + -> > + omap_control->base = base; -> > + omap_control->dev = dev; -> > + spin_lock_init(&omap_control->reg_lock); +> > + ? ? ? omap_control->base = base; +> > + ? ? ? omap_control->dev = dev; +> > + ? ? ? spin_lock_init(&omap_control->reg_lock); > > + -> > + platform_set_drvdata(pdev, omap_control); -> > + omap_control_module = omap_control; +> > + ? ? ? platform_set_drvdata(pdev, omap_control); +> > + ? ? ? omap_control_module = omap_control; > > + -> > + return of_platform_populate(np, of_omap_control_match, NULL, dev); +> > + ? ? ? return of_platform_populate(np, of_omap_control_match, NULL, dev); > > +} > > + > @@ -273,15 +273,15 @@ be called more than once. If not, then only once. > > > +static int __devexit omap_control_remove(struct platform_device *pdev) > > +{ -> > + struct omap_control *omap_control = platform_get_drvdata(pdev); +> > + ? ? ? struct omap_control *omap_control = platform_get_drvdata(pdev); > > + -> > + spin_lock(&omap_control->reg_lock); -> > + if (omap_control->use_count > 0) { -> > + spin_unlock(&omap_control->reg_lock); -> > + dev_err(&pdev->dev, "device removed while still being used\n"); -> > + return -EBUSY; -> > + } -> > + spin_unlock(&omap_control->reg_lock); +> > + ? ? ? spin_lock(&omap_control->reg_lock); +> > + ? ? ? if (omap_control->use_count > 0) { +> > + ? ? ? ? ? ? ? spin_unlock(&omap_control->reg_lock); +> > + ? ? ? ? ? ? ? dev_err(&pdev->dev, "device removed while still being used\n"); +> > + ? ? ? ? ? ? ? return -EBUSY; +> > + ? ? ? } +> > + ? ? ? spin_unlock(&omap_control->reg_lock); > > + > Do you really need above lock where you are just doing the > register read. smp_rmb(), should be enough, I guess. diff --git a/a/content_digest b/N1/content_digest index ababd43..101f870 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,10 @@ "ref\01337934361-1606-1-git-send-email-eduardo.valentin@ti.com\0" "ref\01337934361-1606-6-git-send-email-eduardo.valentin@ti.com\0" "ref\0CAMQu2gy_rgLidHWy7xxZBiVD4wfFuTvA+wC7joogrcFptwsx8w@mail.gmail.com\0" - "From\0Eduardo Valentin <eduardo.valentin@ti.com>\0" - "Subject\0Re: [RFC PATCH 05/11] mfd: omap: control: core system control driver\0" + "From\0eduardo.valentin@ti.com (Eduardo Valentin)\0" + "Subject\0[RFC PATCH 05/11] mfd: omap: control: core system control driver\0" "Date\0Mon, 28 May 2012 14:42:25 +0300\0" - "To\0Shilimkar" - " Santosh <santosh.shilimkar@ti.com>\0" - "Cc\0amit.kucheria@linaro.org" - kbaidarov@dev.rtsoft.ru - kishon@ti.com - balbi@ti.com - J Keerthy <j-keerthy@ti.com> - linux-pm@lists.linux-foundation.org - linux-omap@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hello,\n" @@ -50,52 +41,52 @@ "> > --- a/arch/arm/plat-omap/Kconfig\n" "> > +++ b/arch/arm/plat-omap/Kconfig\n" "> > @@ -5,6 +5,9 @@ menu \"TI OMAP Common Features\"\n" - "> > \302\240config ARCH_OMAP_OTG\n" - "> > \302\240 \302\240 \302\240 \302\240bool\n" + "> > ?config ARCH_OMAP_OTG\n" + "> > ? ? ? ?bool\n" "> >\n" "> > +config ARCH_HAS_CONTROL_MODULE\n" - "> > + \302\240 \302\240 \302\240 bool\n" + "> > + ? ? ? bool\n" "> > +\n" "> Thanks for getting rid of OMAP CONFIG here.\n" "\n" "OK. ARCH_HAS_CONTROL_MODULE is a bit too generic though..\n" "\n" "> \n" - "> > \302\240choice\n" - "> > \302\240 \302\240 \302\240 \302\240prompt \"OMAP System Type\"\n" - "> > \302\240 \302\240 \302\240 \302\240default ARCH_OMAP2PLUS\n" + "> > ?choice\n" + "> > ? ? ? ?prompt \"OMAP System Type\"\n" + "> > ? ? ? ?default ARCH_OMAP2PLUS\n" "> > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig\n" "> > index 11e4438..25a66d8 100644\n" "> > --- a/drivers/mfd/Kconfig\n" "> > +++ b/drivers/mfd/Kconfig\n" "> > @@ -795,6 +795,15 @@ config MFD_WL1273_CORE\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240driver connects the radio-wl1273 V4L2 module and the wl1273\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240audio codec.\n" + "> > ? ? ? ? ?driver connects the radio-wl1273 V4L2 module and the wl1273\n" + "> > ? ? ? ? ?audio codec.\n" "> >\n" "> > +config MFD_OMAP_CONTROL\n" - "> > + \302\240 \302\240 \302\240 bool \"Texas Instruments OMAP System control module\"\n" - "> > + \302\240 \302\240 \302\240 depends on ARCH_HAS_CONTROL_MODULE\n" - "> > + \302\240 \302\240 \302\240 help\n" - "> > + \302\240 \302\240 \302\240 \302\240 This is the core driver for system control module. This driver\n" - "> > + \302\240 \302\240 \302\240 \302\240 is responsible for creating the control module mfd child,\n" - "> > + \302\240 \302\240 \302\240 \302\240 like USB-pin control, pin muxing, MMC-pbias and DDR IO dynamic\n" - "> > + \302\240 \302\240 \302\240 \302\240 change for off mode.\n" + "> > + ? ? ? bool \"Texas Instruments OMAP System control module\"\n" + "> > + ? ? ? depends on ARCH_HAS_CONTROL_MODULE\n" + "> > + ? ? ? help\n" + "> > + ? ? ? ? This is the core driver for system control module. This driver\n" + "> > + ? ? ? ? is responsible for creating the control module mfd child,\n" + "> > + ? ? ? ? like USB-pin control, pin muxing, MMC-pbias and DDR IO dynamic\n" + "> > + ? ? ? ? change for off mode.\n" "> > +\n" - "> > \302\240config MFD_OMAP_USB_HOST\n" - "> > \302\240 \302\240 \302\240 \302\240bool \"Support OMAP USBHS core driver\"\n" - "> > \302\240 \302\240 \302\240 \302\240depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3\n" + "> > ?config MFD_OMAP_USB_HOST\n" + "> > ? ? ? ?bool \"Support OMAP USBHS core driver\"\n" + "> > ? ? ? ?depends on USB_EHCI_HCD_OMAP || USB_OHCI_HCD_OMAP3\n" "> > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile\n" "> > index 05fa538..00f99d6 100644\n" "> > --- a/drivers/mfd/Makefile\n" "> > +++ b/drivers/mfd/Makefile\n" - "> > @@ -106,6 +106,7 @@ obj-$(CONFIG_MFD_TPS6586X) \302\240+= tps6586x.o\n" - "> > \302\240obj-$(CONFIG_MFD_VX855) \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240+= vx855.o\n" - "> > \302\240obj-$(CONFIG_MFD_WL1273_CORE) \302\240+= wl1273-core.o\n" - "> > \302\240obj-$(CONFIG_MFD_CS5535) \302\240 \302\240 \302\240 += cs5535-mfd.o\n" + "> > @@ -106,6 +106,7 @@ obj-$(CONFIG_MFD_TPS6586X) ?+= tps6586x.o\n" + "> > ?obj-$(CONFIG_MFD_VX855) ? ? ? ? ? ? ? ?+= vx855.o\n" + "> > ?obj-$(CONFIG_MFD_WL1273_CORE) ?+= wl1273-core.o\n" + "> > ?obj-$(CONFIG_MFD_CS5535) ? ? ? += cs5535-mfd.o\n" "> > +obj-$(CONFIG_MFD_OMAP_CONTROL) += omap-control-core.o\n" - "> > \302\240obj-$(CONFIG_MFD_OMAP_USB_HOST) \302\240 \302\240 \302\240 \302\240+= omap-usb-host.o\n" - "> > \302\240obj-$(CONFIG_MFD_PM8921_CORE) \302\240+= pm8921-core.o\n" - "> > \302\240obj-$(CONFIG_MFD_PM8XXX_IRQ) \302\240 += pm8xxx-irq.o\n" + "> > ?obj-$(CONFIG_MFD_OMAP_USB_HOST) ? ? ? ?+= omap-usb-host.o\n" + "> > ?obj-$(CONFIG_MFD_PM8921_CORE) ?+= pm8921-core.o\n" + "> > ?obj-$(CONFIG_MFD_PM8XXX_IRQ) ? += pm8xxx-irq.o\n" "> > diff --git a/drivers/mfd/omap-control-core.c b/drivers/mfd/omap-control-core.c\n" "> > new file mode 100644\n" "> > index 0000000..7d8d408\n" @@ -108,10 +99,10 @@ "> > + * Copyright (C) 2011-2012 Texas Instruments Incorporated - http://www.ti.com/\n" "> > + * Contacts:\n" "> > + * Based on original code written by:\n" - "> > + * \302\240 \302\240J Keerthy <j-keerthy@ti.com>\n" - "> > + * \302\240 \302\240Moiz Sonasath <m-sonasath@ti.com>\n" + "> > + * ? ?J Keerthy <j-keerthy@ti.com>\n" + "> > + * ? ?Moiz Sonasath <m-sonasath@ti.com>\n" "> > + * MFD clean up and re-factoring:\n" - "> > + * \302\240 \302\240Eduardo Valentin <eduardo.valentin@ti.com>\n" + "> > + * ? ?Eduardo Valentin <eduardo.valentin@ti.com>\n" "> > + *\n" "> > + * This program is free software; you can redistribute it and/or\n" "> > + * modify it under the terms of the GNU General Public License\n" @@ -119,7 +110,7 @@ "> > + *\n" "> > + * This program is distributed in the hope that it will be useful, but\n" "> > + * WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. \302\240See the GNU\n" + "> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ?See the GNU\n" "> > + * General Public License for more details.\n" "> > + *\n" "> > + */\n" @@ -148,14 +139,14 @@ "> > + */\n" "> > +int omap_control_readl(struct device *dev, u32 reg, u32 *val)\n" "> > +{\n" - "> > + \302\240 \302\240 \302\240 struct omap_control *omap_control = dev_get_drvdata(dev);\n" + "> > + ? ? ? struct omap_control *omap_control = dev_get_drvdata(dev);\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 if (!omap_control)\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return -EINVAL;\n" + "> > + ? ? ? if (!omap_control)\n" + "> > + ? ? ? ? ? ? ? return -EINVAL;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 *val = readl(omap_control->base + reg);\n" + "> > + ? ? ? *val = readl(omap_control->base + reg);\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 return 0;\n" + "> > + ? ? ? return 0;\n" "> > +}\n" "> > +EXPORT_SYMBOL_GPL(omap_control_readl);\n" "> > +\n" @@ -184,17 +175,17 @@ "> > + */\n" "> > +int omap_control_writel(struct device *dev, u32 val, u32 reg)\n" "> > +{\n" - "> > + \302\240 \302\240 \302\240 struct omap_control *omap_control = dev_get_drvdata(dev);\n" - "> > + \302\240 \302\240 \302\240 unsigned long flags;\n" + "> > + ? ? ? struct omap_control *omap_control = dev_get_drvdata(dev);\n" + "> > + ? ? ? unsigned long flags;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 if (!omap_control)\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return -EINVAL;\n" + "> > + ? ? ? if (!omap_control)\n" + "> > + ? ? ? ? ? ? ? return -EINVAL;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 spin_lock_irqsave(&omap_control->reg_lock, flags);\n" - "> > + \302\240 \302\240 \302\240 writel(val, omap_control->base + reg);\n" - "> > + \302\240 \302\240 \302\240 spin_unlock_irqrestore(&omap_control->reg_lock, flags);\n" + "> > + ? ? ? spin_lock_irqsave(&omap_control->reg_lock, flags);\n" + "> > + ? ? ? writel(val, omap_control->base + reg);\n" + "> > + ? ? ? spin_unlock_irqrestore(&omap_control->reg_lock, flags);\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 return 0;\n" + "> > + ? ? ? return 0;\n" "> > +}\n" "> > +EXPORT_SYMBOL_GPL(omap_control_writel);\n" "> > +\n" @@ -206,16 +197,16 @@ "> > + */\n" "> > +struct device *omap_control_get(void)\n" "> > +{\n" - "> > + \302\240 \302\240 \302\240 unsigned long flags;\n" + "> > + ? ? ? unsigned long flags;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 if (!omap_control_module)\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return ERR_PTR(-ENODEV);\n" + "> > + ? ? ? if (!omap_control_module)\n" + "> > + ? ? ? ? ? ? ? return ERR_PTR(-ENODEV);\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 spin_lock_irqsave(&omap_control_module->reg_lock, flags);\n" - "> > + \302\240 \302\240 \302\240 omap_control_module->use_count++;\n" - "> > + \302\240 \302\240 \302\240 spin_unlock_irqrestore(&omap_control_module->reg_lock, flags);\n" + "> > + ? ? ? spin_lock_irqsave(&omap_control_module->reg_lock, flags);\n" + "> > + ? ? ? omap_control_module->use_count++;\n" + "> > + ? ? ? spin_unlock_irqrestore(&omap_control_module->reg_lock, flags);\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 return omap_control_module->dev;\n" + "> > + ? ? ? return omap_control_module->dev;\n" "> > +}\n" "> > +EXPORT_SYMBOL_GPL(omap_control_get);\n" "> > +\n" @@ -227,59 +218,59 @@ "> > + */\n" "> > +void omap_control_put(struct device *dev)\n" "> > +{\n" - "> > + \302\240 \302\240 \302\240 struct omap_control *omap_control = dev_get_drvdata(dev);\n" - "> > + \302\240 \302\240 \302\240 unsigned long flags;\n" + "> > + ? ? ? struct omap_control *omap_control = dev_get_drvdata(dev);\n" + "> > + ? ? ? unsigned long flags;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 if (!omap_control)\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return;\n" + "> > + ? ? ? if (!omap_control)\n" + "> > + ? ? ? ? ? ? ? return;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 spin_lock_irqsave(&omap_control->reg_lock, flags);\n" - "> > + \302\240 \302\240 \302\240 omap_control->use_count--;\n" - "> > + \302\240 \302\240 \302\240 spin_unlock_irqrestore(&omap_control_module->reg_lock, flags);\n" + "> > + ? ? ? spin_lock_irqsave(&omap_control->reg_lock, flags);\n" + "> > + ? ? ? omap_control->use_count--;\n" + "> > + ? ? ? spin_unlock_irqrestore(&omap_control_module->reg_lock, flags);\n" "> > +}\n" "> > +EXPORT_SYMBOL_GPL(omap_control_put);\n" "> > +\n" "> > +static const struct of_device_id of_omap_control_match[] = {\n" - "> > + \302\240 \302\240 \302\240 { .compatible = \"ti,omap3-control\", },\n" - "> > + \302\240 \302\240 \302\240 { .compatible = \"ti,omap4-control\", },\n" - "> > + \302\240 \302\240 \302\240 { .compatible = \"ti,omap5-control\", },\n" - "> > + \302\240 \302\240 \302\240 { },\n" + "> > + ? ? ? { .compatible = \"ti,omap3-control\", },\n" + "> > + ? ? ? { .compatible = \"ti,omap4-control\", },\n" + "> > + ? ? ? { .compatible = \"ti,omap5-control\", },\n" + "> > + ? ? ? { },\n" "> > +};\n" "> > +\n" "> > +static int __devinit omap_control_probe(struct platform_device *pdev)\n" "> > +{\n" - "> > + \302\240 \302\240 \302\240 struct resource *res;\n" - "> > + \302\240 \302\240 \302\240 void __iomem *base;\n" - "> > + \302\240 \302\240 \302\240 struct device *dev = &pdev->dev;\n" - "> > + \302\240 \302\240 \302\240 struct device_node *np = dev->of_node;\n" - "> > + \302\240 \302\240 \302\240 struct omap_control *omap_control;\n" + "> > + ? ? ? struct resource *res;\n" + "> > + ? ? ? void __iomem *base;\n" + "> > + ? ? ? struct device *dev = &pdev->dev;\n" + "> > + ? ? ? struct device_node *np = dev->of_node;\n" + "> > + ? ? ? struct omap_control *omap_control;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 omap_control = devm_kzalloc(dev, sizeof(*omap_control), GFP_KERNEL);\n" - "> > + \302\240 \302\240 \302\240 if (!omap_control) {\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 dev_err(dev, \"not enough memory for omap_control\\n\");\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return -ENOMEM;\n" - "> > + \302\240 \302\240 \302\240 }\n" + "> > + ? ? ? omap_control = devm_kzalloc(dev, sizeof(*omap_control), GFP_KERNEL);\n" + "> > + ? ? ? if (!omap_control) {\n" + "> > + ? ? ? ? ? ? ? dev_err(dev, \"not enough memory for omap_control\\n\");\n" + "> > + ? ? ? ? ? ? ? return -ENOMEM;\n" + "> > + ? ? ? }\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" - "> > + \302\240 \302\240 \302\240 if (!res) {\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 dev_err(dev, \"missing memory base resource\\n\");\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return -EINVAL;\n" - "> > + \302\240 \302\240 \302\240 }\n" + "> > + ? ? ? res = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" + "> > + ? ? ? if (!res) {\n" + "> > + ? ? ? ? ? ? ? dev_err(dev, \"missing memory base resource\\n\");\n" + "> > + ? ? ? ? ? ? ? return -EINVAL;\n" + "> > + ? ? ? }\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 base = devm_request_and_ioremap(dev, res);\n" - "> > + \302\240 \302\240 \302\240 if (!base) {\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 dev_err(dev, \"ioremap failed\\n\");\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return -EADDRNOTAVAIL;\n" - "> > + \302\240 \302\240 \302\240 }\n" + "> > + ? ? ? base = devm_request_and_ioremap(dev, res);\n" + "> > + ? ? ? if (!base) {\n" + "> > + ? ? ? ? ? ? ? dev_err(dev, \"ioremap failed\\n\");\n" + "> > + ? ? ? ? ? ? ? return -EADDRNOTAVAIL;\n" + "> > + ? ? ? }\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 omap_control->base = base;\n" - "> > + \302\240 \302\240 \302\240 omap_control->dev = dev;\n" - "> > + \302\240 \302\240 \302\240 spin_lock_init(&omap_control->reg_lock);\n" + "> > + ? ? ? omap_control->base = base;\n" + "> > + ? ? ? omap_control->dev = dev;\n" + "> > + ? ? ? spin_lock_init(&omap_control->reg_lock);\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 platform_set_drvdata(pdev, omap_control);\n" - "> > + \302\240 \302\240 \302\240 omap_control_module = omap_control;\n" + "> > + ? ? ? platform_set_drvdata(pdev, omap_control);\n" + "> > + ? ? ? omap_control_module = omap_control;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 return of_platform_populate(np, of_omap_control_match, NULL, dev);\n" + "> > + ? ? ? return of_platform_populate(np, of_omap_control_match, NULL, dev);\n" "> > +}\n" "> > +\n" "> \n" @@ -291,15 +282,15 @@ "> \n" "> > +static int __devexit omap_control_remove(struct platform_device *pdev)\n" "> > +{\n" - "> > + \302\240 \302\240 \302\240 struct omap_control *omap_control = platform_get_drvdata(pdev);\n" + "> > + ? ? ? struct omap_control *omap_control = platform_get_drvdata(pdev);\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 spin_lock(&omap_control->reg_lock);\n" - "> > + \302\240 \302\240 \302\240 if (omap_control->use_count > 0) {\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 spin_unlock(&omap_control->reg_lock);\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 dev_err(&pdev->dev, \"device removed while still being used\\n\");\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return -EBUSY;\n" - "> > + \302\240 \302\240 \302\240 }\n" - "> > + \302\240 \302\240 \302\240 spin_unlock(&omap_control->reg_lock);\n" + "> > + ? ? ? spin_lock(&omap_control->reg_lock);\n" + "> > + ? ? ? if (omap_control->use_count > 0) {\n" + "> > + ? ? ? ? ? ? ? spin_unlock(&omap_control->reg_lock);\n" + "> > + ? ? ? ? ? ? ? dev_err(&pdev->dev, \"device removed while still being used\\n\");\n" + "> > + ? ? ? ? ? ? ? return -EBUSY;\n" + "> > + ? ? ? }\n" + "> > + ? ? ? spin_unlock(&omap_control->reg_lock);\n" "> > +\n" "> Do you really need above lock where you are just doing the\n" "> register read. smp_rmb(), should be enough, I guess.\n" @@ -310,4 +301,4 @@ "> Regards\n" > Santosh -341180eda7bcf948b4230c2ac828bf989645afbf12af3345069a91d83795b6b5 +6a6ca49515019499aa3a4771f2aeed49020bdae91473e07fc1de5d80de3c288f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.