From: Tomasz Figa <t.figa@samsung.com> To: linux-samsung-soc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kukjin Kim <kgene.kim@samsung.com>, Russell King - ARM Linux <linux@arm.linux.org.uk>, Pankaj Dubey <pankaj.dubey@samsung.com>, chow.kim@samsung.com, vikas.sajjan@samsung.com, joshi@samsung.com, Samuel Ortiz <sameo@linux.intel.com>, Lee Jones <lee.jones@linaro.org>, Tomasz Figa <t.figa@samsung.com> Subject: [PATCH RFC] mfd: syscon: Decouple syscon interface from syscon devices Date: Tue, 17 Jun 2014 17:32:44 +0200 [thread overview] Message-ID: <1403019164-12514-1-git-send-email-t.figa@samsung.com> (raw) In-Reply-To: <53A05E2D.6020702@samsung.com> Currently a syscon entity can be only registered directly through a platform device that binds to a dedicated driver. However in certain use cases it is desirable to make a device used with another driver a syscon interface provider. For example, certain SoCs (e.g. Exynos) contain system controller blocks which perform various functions such as power domain control, CPU power management, low power mode control, but in addition contain certain IP integration glue, such as various signal masks, coprocessor power control, etc. In such case, there is a need to have a dedicated driver for such system controller but also share registers with other drivers. The latter is where the syscon interface is helpful. This patch decouples syscon object from syscon driver, so that it can be registered from any driver in addition to the original "syscon" platform driver. Signed-off-by: Tomasz Figa <t.figa@samsung.com> --- drivers/mfd/syscon.c | 102 +++++++++++++++++++++++++++++---------------- include/linux/mfd/syscon.h | 9 ++++ 2 files changed, 75 insertions(+), 36 deletions(-) diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index ca15878..11baaae 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -14,6 +14,7 @@ #include <linux/err.h> #include <linux/io.h> +#include <linux/list.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_address.h> @@ -23,30 +24,28 @@ #include <linux/regmap.h> #include <linux/mfd/syscon.h> -static struct platform_driver syscon_driver; +static DEFINE_SPINLOCK(syscon_list_slock); +static LIST_HEAD(syscon_list); struct syscon { struct regmap *regmap; + struct device *dev; + struct list_head list; }; -static int syscon_match_node(struct device *dev, void *data) -{ - struct device_node *dn = data; - - return (dev->of_node == dn) ? 1 : 0; -} - struct regmap *syscon_node_to_regmap(struct device_node *np) { - struct syscon *syscon; - struct device *dev; + struct syscon *entry, *syscon = ERR_PTR(-EPROBE_DEFER); + + spin_lock(&syscon_list_slock); - dev = driver_find_device(&syscon_driver.driver, NULL, np, - syscon_match_node); - if (!dev) - return ERR_PTR(-EPROBE_DEFER); + list_for_each_entry(entry, &syscon_list, list) + if (entry->dev->of_node == np) { + syscon = entry; + break; + } - syscon = dev_get_drvdata(dev); + spin_unlock(&syscon_list_slock); return syscon->regmap; } @@ -68,22 +67,19 @@ struct regmap *syscon_regmap_lookup_by_compatible(const char *s) } EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_compatible); -static int syscon_match_pdevname(struct device *dev, void *data) -{ - return !strcmp(dev_name(dev), (const char *)data); -} - struct regmap *syscon_regmap_lookup_by_pdevname(const char *s) { - struct device *dev; - struct syscon *syscon; + struct syscon *entry, *syscon = ERR_PTR(-EPROBE_DEFER); + + spin_lock(&syscon_list_slock); - dev = driver_find_device(&syscon_driver.driver, NULL, (void *)s, - syscon_match_pdevname); - if (!dev) - return ERR_PTR(-EPROBE_DEFER); + list_for_each_entry(entry, &syscon_list, list) + if (!strcmp(dev_name(entry->dev), s)) { + syscon = entry; + break; + } - syscon = dev_get_drvdata(dev); + spin_unlock(&syscon_list_slock); return syscon->regmap; } @@ -121,17 +117,49 @@ static struct regmap_config syscon_regmap_config = { .reg_stride = 4, }; +static void devm_syscon_unregister(struct device *dev, void *res) +{ + struct syscon *syscon = *(struct syscon **)res; + + spin_lock(&syscon_list_slock); + list_del(&syscon->list); + spin_unlock(&syscon_list_slock); +} + +int devm_syscon_register(struct device *dev, struct regmap *regmap) +{ + struct syscon **ptr, *syscon; + + syscon = devm_kzalloc(dev, sizeof(*syscon), GFP_KERNEL); + if (!syscon) + return -ENOMEM; + + syscon->regmap = regmap; + syscon->dev = dev; + + ptr = devres_alloc(devm_syscon_unregister, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return -ENOMEM; + + spin_lock(&syscon_list_slock); + list_add_tail(&syscon->list, &syscon_list); + spin_unlock(&syscon_list_slock); + + *ptr = syscon; + devres_add(dev, ptr); + + return 0; +} +EXPORT_SYMBOL_GPL(devm_syscon_register); + static int syscon_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct syscon_platform_data *pdata = dev_get_platdata(dev); - struct syscon *syscon; + struct regmap *regmap; struct resource *res; void __iomem *base; - - syscon = devm_kzalloc(dev, sizeof(*syscon), GFP_KERNEL); - if (!syscon) - return -ENOMEM; + int ret; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) @@ -144,14 +172,16 @@ static int syscon_probe(struct platform_device *pdev) syscon_regmap_config.max_register = res->end - res->start - 3; if (pdata) syscon_regmap_config.name = pdata->label; - syscon->regmap = devm_regmap_init_mmio(dev, base, + regmap = devm_regmap_init_mmio(dev, base, &syscon_regmap_config); - if (IS_ERR(syscon->regmap)) { + if (IS_ERR(regmap)) { dev_err(dev, "regmap init failed\n"); - return PTR_ERR(syscon->regmap); + return PTR_ERR(regmap); } - platform_set_drvdata(pdev, syscon); + ret = devm_syscon_register(dev, regmap); + if (ret) + return ret; dev_dbg(dev, "regmap %pR registered\n", res); diff --git a/include/linux/mfd/syscon.h b/include/linux/mfd/syscon.h index 75e543b..6a1cadf 100644 --- a/include/linux/mfd/syscon.h +++ b/include/linux/mfd/syscon.h @@ -18,8 +18,11 @@ #include <linux/err.h> struct device_node; +struct regmap; #ifdef CONFIG_MFD_SYSCON +extern int devm_syscon_register(struct device *dev, struct regmap *regmap); + extern struct regmap *syscon_node_to_regmap(struct device_node *np); extern struct regmap *syscon_regmap_lookup_by_compatible(const char *s); extern struct regmap *syscon_regmap_lookup_by_pdevname(const char *s); @@ -27,6 +30,12 @@ extern struct regmap *syscon_regmap_lookup_by_phandle( struct device_node *np, const char *property); #else +static inline int devm_syscon_register(struct device *dev, + struct regmap *regmap) +{ + return -ENOSYS; +} + static inline struct regmap *syscon_node_to_regmap(struct device_node *np) { return ERR_PTR(-ENOSYS); -- 1.9.3
WARNING: multiple messages have this Message-ID (diff)
From: t.figa@samsung.com (Tomasz Figa) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH RFC] mfd: syscon: Decouple syscon interface from syscon devices Date: Tue, 17 Jun 2014 17:32:44 +0200 [thread overview] Message-ID: <1403019164-12514-1-git-send-email-t.figa@samsung.com> (raw) In-Reply-To: <53A05E2D.6020702@samsung.com> Currently a syscon entity can be only registered directly through a platform device that binds to a dedicated driver. However in certain use cases it is desirable to make a device used with another driver a syscon interface provider. For example, certain SoCs (e.g. Exynos) contain system controller blocks which perform various functions such as power domain control, CPU power management, low power mode control, but in addition contain certain IP integration glue, such as various signal masks, coprocessor power control, etc. In such case, there is a need to have a dedicated driver for such system controller but also share registers with other drivers. The latter is where the syscon interface is helpful. This patch decouples syscon object from syscon driver, so that it can be registered from any driver in addition to the original "syscon" platform driver. Signed-off-by: Tomasz Figa <t.figa@samsung.com> --- drivers/mfd/syscon.c | 102 +++++++++++++++++++++++++++++---------------- include/linux/mfd/syscon.h | 9 ++++ 2 files changed, 75 insertions(+), 36 deletions(-) diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index ca15878..11baaae 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -14,6 +14,7 @@ #include <linux/err.h> #include <linux/io.h> +#include <linux/list.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_address.h> @@ -23,30 +24,28 @@ #include <linux/regmap.h> #include <linux/mfd/syscon.h> -static struct platform_driver syscon_driver; +static DEFINE_SPINLOCK(syscon_list_slock); +static LIST_HEAD(syscon_list); struct syscon { struct regmap *regmap; + struct device *dev; + struct list_head list; }; -static int syscon_match_node(struct device *dev, void *data) -{ - struct device_node *dn = data; - - return (dev->of_node == dn) ? 1 : 0; -} - struct regmap *syscon_node_to_regmap(struct device_node *np) { - struct syscon *syscon; - struct device *dev; + struct syscon *entry, *syscon = ERR_PTR(-EPROBE_DEFER); + + spin_lock(&syscon_list_slock); - dev = driver_find_device(&syscon_driver.driver, NULL, np, - syscon_match_node); - if (!dev) - return ERR_PTR(-EPROBE_DEFER); + list_for_each_entry(entry, &syscon_list, list) + if (entry->dev->of_node == np) { + syscon = entry; + break; + } - syscon = dev_get_drvdata(dev); + spin_unlock(&syscon_list_slock); return syscon->regmap; } @@ -68,22 +67,19 @@ struct regmap *syscon_regmap_lookup_by_compatible(const char *s) } EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_compatible); -static int syscon_match_pdevname(struct device *dev, void *data) -{ - return !strcmp(dev_name(dev), (const char *)data); -} - struct regmap *syscon_regmap_lookup_by_pdevname(const char *s) { - struct device *dev; - struct syscon *syscon; + struct syscon *entry, *syscon = ERR_PTR(-EPROBE_DEFER); + + spin_lock(&syscon_list_slock); - dev = driver_find_device(&syscon_driver.driver, NULL, (void *)s, - syscon_match_pdevname); - if (!dev) - return ERR_PTR(-EPROBE_DEFER); + list_for_each_entry(entry, &syscon_list, list) + if (!strcmp(dev_name(entry->dev), s)) { + syscon = entry; + break; + } - syscon = dev_get_drvdata(dev); + spin_unlock(&syscon_list_slock); return syscon->regmap; } @@ -121,17 +117,49 @@ static struct regmap_config syscon_regmap_config = { .reg_stride = 4, }; +static void devm_syscon_unregister(struct device *dev, void *res) +{ + struct syscon *syscon = *(struct syscon **)res; + + spin_lock(&syscon_list_slock); + list_del(&syscon->list); + spin_unlock(&syscon_list_slock); +} + +int devm_syscon_register(struct device *dev, struct regmap *regmap) +{ + struct syscon **ptr, *syscon; + + syscon = devm_kzalloc(dev, sizeof(*syscon), GFP_KERNEL); + if (!syscon) + return -ENOMEM; + + syscon->regmap = regmap; + syscon->dev = dev; + + ptr = devres_alloc(devm_syscon_unregister, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return -ENOMEM; + + spin_lock(&syscon_list_slock); + list_add_tail(&syscon->list, &syscon_list); + spin_unlock(&syscon_list_slock); + + *ptr = syscon; + devres_add(dev, ptr); + + return 0; +} +EXPORT_SYMBOL_GPL(devm_syscon_register); + static int syscon_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct syscon_platform_data *pdata = dev_get_platdata(dev); - struct syscon *syscon; + struct regmap *regmap; struct resource *res; void __iomem *base; - - syscon = devm_kzalloc(dev, sizeof(*syscon), GFP_KERNEL); - if (!syscon) - return -ENOMEM; + int ret; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) @@ -144,14 +172,16 @@ static int syscon_probe(struct platform_device *pdev) syscon_regmap_config.max_register = res->end - res->start - 3; if (pdata) syscon_regmap_config.name = pdata->label; - syscon->regmap = devm_regmap_init_mmio(dev, base, + regmap = devm_regmap_init_mmio(dev, base, &syscon_regmap_config); - if (IS_ERR(syscon->regmap)) { + if (IS_ERR(regmap)) { dev_err(dev, "regmap init failed\n"); - return PTR_ERR(syscon->regmap); + return PTR_ERR(regmap); } - platform_set_drvdata(pdev, syscon); + ret = devm_syscon_register(dev, regmap); + if (ret) + return ret; dev_dbg(dev, "regmap %pR registered\n", res); diff --git a/include/linux/mfd/syscon.h b/include/linux/mfd/syscon.h index 75e543b..6a1cadf 100644 --- a/include/linux/mfd/syscon.h +++ b/include/linux/mfd/syscon.h @@ -18,8 +18,11 @@ #include <linux/err.h> struct device_node; +struct regmap; #ifdef CONFIG_MFD_SYSCON +extern int devm_syscon_register(struct device *dev, struct regmap *regmap); + extern struct regmap *syscon_node_to_regmap(struct device_node *np); extern struct regmap *syscon_regmap_lookup_by_compatible(const char *s); extern struct regmap *syscon_regmap_lookup_by_pdevname(const char *s); @@ -27,6 +30,12 @@ extern struct regmap *syscon_regmap_lookup_by_phandle( struct device_node *np, const char *property); #else +static inline int devm_syscon_register(struct device *dev, + struct regmap *regmap) +{ + return -ENOSYS; +} + static inline struct regmap *syscon_node_to_regmap(struct device_node *np) { return ERR_PTR(-ENOSYS); -- 1.9.3
next prev parent reply other threads:[~2014-06-17 15:33 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-05-10 6:56 [PATCH v4 00/11] ARM: Exynos: PMU cleanup and refactoring for using DT Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-05-10 6:56 ` [PATCH v4 01/11] ARM: EXYNOS: Make exynos machine_ops as static Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-06-10 11:43 ` Tomasz Figa 2014-06-10 11:43 ` Tomasz Figa 2014-05-10 6:56 ` [PATCH v4 02/11] ARM: EXYNOS: Move cpufreq and cpuidle device registration to init_machine Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-06-10 11:46 ` Tomasz Figa 2014-06-10 11:46 ` Tomasz Figa 2014-06-17 3:48 ` Pankaj Dubey 2014-06-17 3:48 ` Pankaj Dubey 2014-05-10 6:56 ` [PATCH v4 03/11] ARM: EXYNOS: Move SYSREG definition into sys-reg specific file Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-05-10 6:56 ` [PATCH v4 04/11] ARM: EXYNOS: Remove file path from comment section Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-05-10 6:56 ` [PATCH v4 05/11] ARM: EXYNOS: Remove regs-pmu.h header dependency from pm_domain Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-05-10 6:56 ` [PATCH v4 06/11] ARM: EXYNOS: Add support for mapping PMU base address via DT Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-06-10 17:10 ` Tomasz Figa 2014-06-10 17:10 ` Tomasz Figa 2014-06-17 6:43 ` Pankaj Dubey 2014-06-17 6:43 ` Pankaj Dubey 2014-06-17 15:26 ` Tomasz Figa 2014-06-17 15:26 ` Tomasz Figa 2014-06-17 15:32 ` Tomasz Figa [this message] 2014-06-17 15:32 ` [PATCH RFC] mfd: syscon: Decouple syscon interface from syscon devices Tomasz Figa 2014-06-17 15:42 ` Arnd Bergmann 2014-06-17 15:42 ` Arnd Bergmann 2014-06-17 21:26 ` Tomasz Figa 2014-06-17 21:26 ` Tomasz Figa 2014-06-18 8:26 ` Lee Jones 2014-06-18 8:26 ` Lee Jones 2014-06-24 11:03 ` Pankaj Dubey 2014-06-24 11:03 ` Pankaj Dubey 2014-06-18 12:57 ` Arnd Bergmann 2014-06-18 12:57 ` Arnd Bergmann 2014-06-19 0:06 ` Michal Simek 2014-06-19 0:06 ` Michal Simek 2014-07-28 4:15 ` Pankaj Dubey 2014-07-28 4:15 ` Pankaj Dubey 2014-05-10 6:56 ` [PATCH v4 07/11] ARM: EXYNOS: Remove "linux/bug.h" from pmu.c Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-05-10 6:56 ` [PATCH v4 08/11] ARM: EXYNOS: Refactored code for using PMU address via DT Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-06-17 16:02 ` Tomasz Figa 2014-06-17 16:02 ` Tomasz Figa 2014-05-10 6:56 ` [PATCH v4 09/11] ARM: EXYNOS: Move "mach/map.h" inclusion from regs-pmu.h to platsmp.c Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-06-17 16:04 ` Tomasz Figa 2014-06-17 16:04 ` Tomasz Figa 2014-05-10 6:56 ` [PATCH v4 10/11] ARM: EXYNOS: Add platform driver support for Exynos PMU Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-06-17 17:12 ` Tomasz Figa 2014-06-17 17:12 ` Tomasz Figa 2014-06-24 11:28 ` Pankaj Dubey 2014-06-24 11:28 ` Pankaj Dubey 2014-06-25 0:11 ` Tomasz Figa 2014-06-25 0:11 ` Tomasz Figa 2014-06-25 4:30 ` Pankaj Dubey 2014-06-25 4:30 ` Pankaj Dubey 2014-05-10 6:56 ` [PATCH v4 11/11] ARM: EXYNOS: Move PMU specific definitions from common.h Pankaj Dubey 2014-05-10 6:56 ` Pankaj Dubey 2014-05-27 11:26 ` [PATCH v4 00/11] ARM: Exynos: PMU cleanup and refactoring for using DT Vikas Sajjan 2014-05-27 11:26 ` Vikas Sajjan 2014-05-27 11:26 ` Vikas Sajjan 2014-05-30 11:58 ` Tomasz Figa 2014-05-30 11:58 ` Tomasz Figa 2014-05-30 11:58 ` Tomasz Figa
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1403019164-12514-1-git-send-email-t.figa@samsung.com \ --to=t.figa@samsung.com \ --cc=chow.kim@samsung.com \ --cc=joshi@samsung.com \ --cc=kgene.kim@samsung.com \ --cc=lee.jones@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=pankaj.dubey@samsung.com \ --cc=sameo@linux.intel.com \ --cc=vikas.sajjan@samsung.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.