From: Pavel Fedin <p.fedin@samsung.com> To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>, Mark Rutland <mark.rutland@arm.com>, Ian Campbell <ijc+devicetree@hellion.org.uk>, Kumar Gala <galak@codeaurora.org>, Kukjin Kim <kgene@kernel.org>, Krzysztof Kozlowski <k.kozlowski@samsung.com> Subject: [PATCH v4 3/4] drivers: exynos-srom: Add support for bank configuration Date: Thu, 29 Oct 2015 15:42:19 +0300 [thread overview] Message-ID: <4312ee676afb81377610ae05d0373ebd3b51ddde.1446122247.git.p.fedin@samsung.com> (raw) In-Reply-To: <cover.1446122247.git.p.fedin@samsung.com> In-Reply-To: <cover.1446122247.git.p.fedin@samsung.com> Implement handling properties in subnodes and adding child devices to the system. Child devices will not be added if configuration fails. Since the driver now does more than suspend-resume support, dependency on CONFIG_PM is removed. Signed-off-by: Pavel Fedin <p.fedin@samsung.com> --- arch/arm/mach-exynos/Kconfig | 2 +- drivers/soc/samsung/Kconfig | 2 +- drivers/soc/samsung/exynos-srom.c | 58 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 83c85f5..c22dc42 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -16,7 +16,7 @@ menuconfig ARCH_EXYNOS select ARM_GIC select COMMON_CLK_SAMSUNG select EXYNOS_THERMAL - select EXYNOS_SROM if PM + select EXYNOS_SROM select HAVE_ARM_SCU if SMP select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_WATCHDOG if WATCHDOG diff --git a/drivers/soc/samsung/Kconfig b/drivers/soc/samsung/Kconfig index 2833b5b..ea4bc2a 100644 --- a/drivers/soc/samsung/Kconfig +++ b/drivers/soc/samsung/Kconfig @@ -8,6 +8,6 @@ config SOC_SAMSUNG config EXYNOS_SROM bool - depends on ARM && ARCH_EXYNOS && PM + depends on ARM && ARCH_EXYNOS endmenu diff --git a/drivers/soc/samsung/exynos-srom.c b/drivers/soc/samsung/exynos-srom.c index 57a232d..68e894f 100644 --- a/drivers/soc/samsung/exynos-srom.c +++ b/drivers/soc/samsung/exynos-srom.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/slab.h> @@ -67,11 +68,48 @@ static struct exynos_srom_reg_dump *exynos_srom_alloc_reg_dump( return rd; } +static int decode_sromc(struct exynos_srom *srom, struct device_node *np) +{ + u32 bank, width; + u32 timing[7]; + u32 cs, bw; + + if (of_property_read_u32(np, "samsung,srom-bank", &bank)) + return -EINVAL; + if (of_property_read_u32(np, "samsung,srom-data-width", &width)) + width = 1; + if (of_property_read_u32_array(np, "samsung,srom-timing", timing, + ARRAY_SIZE(timing))) + return -EINVAL; + + bank *= 4; /* Convert bank into shift/offset */ + + cs = 1 << EXYNOS_SROM_BW__BYTEENABLE__SHIFT; + if (width == 2) + cs |= 1 << EXYNOS_SROM_BW__DATAWIDTH__SHIFT; + + bw = __raw_readl(srom->reg_base + EXYNOS_SROM_BW); + bw = (bw & ~(EXYNOS_SROM_BW__CS_MASK << bank)) | (cs << bank); + __raw_writel(bw, srom->reg_base + EXYNOS_SROM_BW); + + __raw_writel((timing[0] << EXYNOS_SROM_BCX__PMC__SHIFT) | + (timing[1] << EXYNOS_SROM_BCX__TACP__SHIFT) | + (timing[2] << EXYNOS_SROM_BCX__TCAH__SHIFT) | + (timing[3] << EXYNOS_SROM_BCX__TCOH__SHIFT) | + (timing[4] << EXYNOS_SROM_BCX__TACC__SHIFT) | + (timing[5] << EXYNOS_SROM_BCX__TCOS__SHIFT) | + (timing[6] << EXYNOS_SROM_BCX__TACS__SHIFT), + srom->reg_base + EXYNOS_SROM_BC0 + bank); + + return 0; +} + static int exynos_srom_probe(struct platform_device *pdev) { - struct device_node *np; + struct device_node *np, *child; struct exynos_srom *srom; struct device *dev = &pdev->dev; + bool error = false; np = dev->of_node; if (!np) { @@ -100,7 +138,23 @@ static int exynos_srom_probe(struct platform_device *pdev) return -ENOMEM; } - return 0; + for_each_child_of_node(np, child) { + if (decode_sromc(srom, child)) { + dev_err(dev, + "Could not decode bank configuration for %s\n", + child->name); + error = true; + } + } + + /* + * If any bank failed to configure, we still provide suspend/resume, + * but do not probe child devices + */ + if (error) + return 0; + + return of_platform_populate(np, NULL, NULL, dev); } static int exynos_srom_remove(struct platform_device *pdev) -- 2.4.4
WARNING: multiple messages have this Message-ID (diff)
From: p.fedin@samsung.com (Pavel Fedin) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 3/4] drivers: exynos-srom: Add support for bank configuration Date: Thu, 29 Oct 2015 15:42:19 +0300 [thread overview] Message-ID: <4312ee676afb81377610ae05d0373ebd3b51ddde.1446122247.git.p.fedin@samsung.com> (raw) In-Reply-To: <cover.1446122247.git.p.fedin@samsung.com> Implement handling properties in subnodes and adding child devices to the system. Child devices will not be added if configuration fails. Since the driver now does more than suspend-resume support, dependency on CONFIG_PM is removed. Signed-off-by: Pavel Fedin <p.fedin@samsung.com> --- arch/arm/mach-exynos/Kconfig | 2 +- drivers/soc/samsung/Kconfig | 2 +- drivers/soc/samsung/exynos-srom.c | 58 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 83c85f5..c22dc42 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -16,7 +16,7 @@ menuconfig ARCH_EXYNOS select ARM_GIC select COMMON_CLK_SAMSUNG select EXYNOS_THERMAL - select EXYNOS_SROM if PM + select EXYNOS_SROM select HAVE_ARM_SCU if SMP select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_WATCHDOG if WATCHDOG diff --git a/drivers/soc/samsung/Kconfig b/drivers/soc/samsung/Kconfig index 2833b5b..ea4bc2a 100644 --- a/drivers/soc/samsung/Kconfig +++ b/drivers/soc/samsung/Kconfig @@ -8,6 +8,6 @@ config SOC_SAMSUNG config EXYNOS_SROM bool - depends on ARM && ARCH_EXYNOS && PM + depends on ARM && ARCH_EXYNOS endmenu diff --git a/drivers/soc/samsung/exynos-srom.c b/drivers/soc/samsung/exynos-srom.c index 57a232d..68e894f 100644 --- a/drivers/soc/samsung/exynos-srom.c +++ b/drivers/soc/samsung/exynos-srom.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/slab.h> @@ -67,11 +68,48 @@ static struct exynos_srom_reg_dump *exynos_srom_alloc_reg_dump( return rd; } +static int decode_sromc(struct exynos_srom *srom, struct device_node *np) +{ + u32 bank, width; + u32 timing[7]; + u32 cs, bw; + + if (of_property_read_u32(np, "samsung,srom-bank", &bank)) + return -EINVAL; + if (of_property_read_u32(np, "samsung,srom-data-width", &width)) + width = 1; + if (of_property_read_u32_array(np, "samsung,srom-timing", timing, + ARRAY_SIZE(timing))) + return -EINVAL; + + bank *= 4; /* Convert bank into shift/offset */ + + cs = 1 << EXYNOS_SROM_BW__BYTEENABLE__SHIFT; + if (width == 2) + cs |= 1 << EXYNOS_SROM_BW__DATAWIDTH__SHIFT; + + bw = __raw_readl(srom->reg_base + EXYNOS_SROM_BW); + bw = (bw & ~(EXYNOS_SROM_BW__CS_MASK << bank)) | (cs << bank); + __raw_writel(bw, srom->reg_base + EXYNOS_SROM_BW); + + __raw_writel((timing[0] << EXYNOS_SROM_BCX__PMC__SHIFT) | + (timing[1] << EXYNOS_SROM_BCX__TACP__SHIFT) | + (timing[2] << EXYNOS_SROM_BCX__TCAH__SHIFT) | + (timing[3] << EXYNOS_SROM_BCX__TCOH__SHIFT) | + (timing[4] << EXYNOS_SROM_BCX__TACC__SHIFT) | + (timing[5] << EXYNOS_SROM_BCX__TCOS__SHIFT) | + (timing[6] << EXYNOS_SROM_BCX__TACS__SHIFT), + srom->reg_base + EXYNOS_SROM_BC0 + bank); + + return 0; +} + static int exynos_srom_probe(struct platform_device *pdev) { - struct device_node *np; + struct device_node *np, *child; struct exynos_srom *srom; struct device *dev = &pdev->dev; + bool error = false; np = dev->of_node; if (!np) { @@ -100,7 +138,23 @@ static int exynos_srom_probe(struct platform_device *pdev) return -ENOMEM; } - return 0; + for_each_child_of_node(np, child) { + if (decode_sromc(srom, child)) { + dev_err(dev, + "Could not decode bank configuration for %s\n", + child->name); + error = true; + } + } + + /* + * If any bank failed to configure, we still provide suspend/resume, + * but do not probe child devices + */ + if (error) + return 0; + + return of_platform_populate(np, NULL, NULL, dev); } static int exynos_srom_remove(struct platform_device *pdev) -- 2.4.4
next prev parent reply other threads:[~2015-10-29 12:43 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-10-29 12:42 [PATCH v4 0/4] [PATCH v4 0/4] Exynos SROMc configuration and Ethernet support for SMDK5410 Pavel Fedin 2015-10-29 12:42 ` Pavel Fedin 2015-10-29 12:42 ` [PATCH v4 1/4] Documentation: dt-bindings: Describe SROMc configuration Pavel Fedin 2015-10-29 12:42 ` Pavel Fedin 2015-10-30 6:30 ` Krzysztof Kozlowski 2015-10-30 6:30 ` Krzysztof Kozlowski 2015-10-30 6:30 ` Krzysztof Kozlowski 2015-10-30 6:58 ` Pavel Fedin 2015-10-30 6:58 ` Pavel Fedin 2015-10-30 7:23 ` Krzysztof Kozlowski 2015-10-30 7:23 ` Krzysztof Kozlowski 2015-10-30 17:15 ` Rob Herring 2015-10-30 17:15 ` Rob Herring 2015-10-30 17:15 ` Rob Herring 2015-11-01 8:15 ` Krzysztof Kozlowski 2015-11-01 8:15 ` Krzysztof Kozlowski 2015-11-01 8:15 ` Krzysztof Kozlowski 2015-10-30 10:43 ` Pavel Fedin 2015-10-30 10:43 ` Pavel Fedin 2015-11-01 8:48 ` Krzysztof Kozlowski 2015-11-01 8:48 ` Krzysztof Kozlowski 2015-11-02 7:31 ` Pavel Fedin 2015-11-02 7:31 ` Pavel Fedin 2015-11-03 0:16 ` Krzysztof Kozlowski 2015-11-03 0:16 ` Krzysztof Kozlowski 2015-11-03 6:58 ` Pavel Fedin 2015-11-03 6:58 ` Pavel Fedin 2015-11-03 6:58 ` Pavel Fedin 2015-11-03 7:18 ` Krzysztof Kozlowski 2015-11-03 7:18 ` Krzysztof Kozlowski 2015-11-03 7:18 ` Krzysztof Kozlowski 2015-10-29 12:42 ` [PATCH v4 2/4] ARM: dts: Add SROMc to Exynos 5410 Pavel Fedin 2015-10-29 12:42 ` Pavel Fedin 2015-10-29 17:28 ` Pankaj Dubey 2015-10-29 17:28 ` Pankaj Dubey 2015-10-29 17:28 ` Pankaj Dubey 2015-10-30 6:41 ` Pavel Fedin 2015-10-30 6:41 ` Pavel Fedin 2015-10-30 9:24 ` Pankaj Dubey 2015-10-30 9:24 ` Pankaj Dubey 2015-10-30 10:51 ` Pavel Fedin 2015-10-30 10:51 ` Pavel Fedin 2015-10-29 12:42 ` Pavel Fedin [this message] 2015-10-29 12:42 ` [PATCH v4 3/4] drivers: exynos-srom: Add support for bank configuration Pavel Fedin 2015-10-29 12:42 ` [PATCH v4 4/4] ARM: dts: Add Ethernet chip to SMDK5410 Pavel Fedin 2015-10-29 12:42 ` Pavel Fedin 2015-10-29 17:40 ` Pankaj Dubey 2015-10-29 17:40 ` Pankaj Dubey 2015-10-29 17:40 ` Pankaj Dubey 2015-10-29 17:46 ` [PATCH v4 0/4] [PATCH v4 0/4] Exynos SROMc configuration and Ethernet support for SMDK5410 Pankaj Dubey 2015-10-29 17:46 ` Pankaj Dubey 2015-10-29 17:46 ` Pankaj Dubey 2015-10-30 6:43 ` Pavel Fedin 2015-10-30 6:43 ` Pavel Fedin
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=4312ee676afb81377610ae05d0373ebd3b51ddde.1446122247.git.p.fedin@samsung.com \ --to=p.fedin@samsung.com \ --cc=devicetree@vger.kernel.org \ --cc=galak@codeaurora.org \ --cc=ijc+devicetree@hellion.org.uk \ --cc=k.kozlowski@samsung.com \ --cc=kgene@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=pawel.moll@arm.com \ --cc=robh+dt@kernel.org \ /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.