From: "Paweł Chmiel" <pawel.mikolaj.chmiel@gmail.com> To: kyungmin.park@samsung.com Cc: bbrezillon@kernel.org, miquel.raynal@bootlin.com, richard@nod.at, dwmw2@infradead.org, computersforpeace@gmail.com, marek.vasut@gmail.com, robh+dt@kernel.org, mark.rutland@arm.com, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, "Tomasz Figa" <tomasz.figa@gmail.com>, "Paweł Chmiel" <pawel.mikolaj.chmiel@gmail.com> Subject: [PATCH 3/5] mtd: onenand/samsung: Add device tree support Date: Fri, 26 Apr 2019 18:42:22 +0200 [thread overview] Message-ID: <20190426164224.11327-4-pawel.mikolaj.chmiel@gmail.com> (raw) In-Reply-To: <20190426164224.11327-1-pawel.mikolaj.chmiel@gmail.com> From: Tomasz Figa <tomasz.figa@gmail.com> This patch adds support for instantation using Device Tree. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Signed-off-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com> --- drivers/mtd/nand/onenand/samsung.c | 37 +++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/onenand/samsung.c b/drivers/mtd/nand/onenand/samsung.c index 9628bf5bc397..0f450604412f 100644 --- a/drivers/mtd/nand/onenand/samsung.c +++ b/drivers/mtd/nand/onenand/samsung.c @@ -25,6 +25,7 @@ #include <linux/dma-mapping.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/of.h> #include "samsung.h" @@ -835,8 +836,36 @@ static void s3c_onenand_setup(struct mtd_info *mtd) this->write_bufferram = onenand_write_bufferram; } +#ifdef CONFIG_OF +static const struct of_device_id s3c_onenand_of_match[] = { + { .compatible = "samsung,s3c6400-onenand", + .data = (void *)TYPE_S3C6400 }, + { .compatible = "samsung,s3c6410-onenand", + .data = (void *)TYPE_S3C6410 }, + { .compatible = "samsung,s5pv210-onenand", + .data = (void *)TYPE_S5PC110 }, + {}, +}; +MODULE_DEVICE_TABLE(of, onenand_s3c_dt_match); +#endif + +static enum soc_type s3c_onenand_get_device_id(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + + if (IS_ENABLED(CONFIG_OF) && np) { + const struct of_device_id *match; + + match = of_match_node(s3c_onenand_of_match, np); + return (enum soc_type)match->data; + } + + return platform_get_device_id(pdev)->driver_data; +} + static int s3c_onenand_probe(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; struct onenand_platform_data *pdata; struct onenand_chip *this; struct mtd_info *mtd; @@ -858,9 +887,10 @@ static int s3c_onenand_probe(struct platform_device *pdev) this = (struct onenand_chip *) &mtd[1]; mtd->priv = this; + mtd->dev.of_node = np; mtd->dev.parent = &pdev->dev; onenand->pdev = pdev; - onenand->type = platform_get_device_id(pdev)->driver_data; + onenand->type = s3c_onenand_get_device_id(pdev); s3c_onenand_setup(mtd); @@ -919,6 +949,10 @@ static int s3c_onenand_probe(struct platform_device *pdev) } onenand->clk_bus = devm_clk_get(&pdev->dev, "bus"); + if (np && IS_ERR(onenand->clk_bus)) { + dev_err(&pdev->dev, "failed to get bus clock\n"); + return PTR_ERR(onenand->clk_bus); + } if (!IS_ERR(onenand->clk_bus)) clk_prepare_enable(onenand->clk_bus); @@ -1000,6 +1034,7 @@ static struct platform_driver s3c_onenand_driver = { .driver = { .name = "samsung-onenand", .pm = &s3c_pm_ops, + .of_match_table = of_match_ptr(s3c_onenand_of_match), }, .id_table = s3c_onenand_driver_ids, .probe = s3c_onenand_probe, -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: "Paweł Chmiel" <pawel.mikolaj.chmiel@gmail.com> To: kyungmin.park@samsung.com Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, bbrezillon@kernel.org, richard@nod.at, linux-kernel@vger.kernel.org, "Tomasz Figa" <tomasz.figa@gmail.com>, marek.vasut@gmail.com, robh+dt@kernel.org, linux-mtd@lists.infradead.org, miquel.raynal@bootlin.com, computersforpeace@gmail.com, dwmw2@infradead.org, "Paweł Chmiel" <pawel.mikolaj.chmiel@gmail.com> Subject: [PATCH 3/5] mtd: onenand/samsung: Add device tree support Date: Fri, 26 Apr 2019 18:42:22 +0200 [thread overview] Message-ID: <20190426164224.11327-4-pawel.mikolaj.chmiel@gmail.com> (raw) In-Reply-To: <20190426164224.11327-1-pawel.mikolaj.chmiel@gmail.com> From: Tomasz Figa <tomasz.figa@gmail.com> This patch adds support for instantation using Device Tree. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Signed-off-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com> --- drivers/mtd/nand/onenand/samsung.c | 37 +++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/onenand/samsung.c b/drivers/mtd/nand/onenand/samsung.c index 9628bf5bc397..0f450604412f 100644 --- a/drivers/mtd/nand/onenand/samsung.c +++ b/drivers/mtd/nand/onenand/samsung.c @@ -25,6 +25,7 @@ #include <linux/dma-mapping.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/of.h> #include "samsung.h" @@ -835,8 +836,36 @@ static void s3c_onenand_setup(struct mtd_info *mtd) this->write_bufferram = onenand_write_bufferram; } +#ifdef CONFIG_OF +static const struct of_device_id s3c_onenand_of_match[] = { + { .compatible = "samsung,s3c6400-onenand", + .data = (void *)TYPE_S3C6400 }, + { .compatible = "samsung,s3c6410-onenand", + .data = (void *)TYPE_S3C6410 }, + { .compatible = "samsung,s5pv210-onenand", + .data = (void *)TYPE_S5PC110 }, + {}, +}; +MODULE_DEVICE_TABLE(of, onenand_s3c_dt_match); +#endif + +static enum soc_type s3c_onenand_get_device_id(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + + if (IS_ENABLED(CONFIG_OF) && np) { + const struct of_device_id *match; + + match = of_match_node(s3c_onenand_of_match, np); + return (enum soc_type)match->data; + } + + return platform_get_device_id(pdev)->driver_data; +} + static int s3c_onenand_probe(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; struct onenand_platform_data *pdata; struct onenand_chip *this; struct mtd_info *mtd; @@ -858,9 +887,10 @@ static int s3c_onenand_probe(struct platform_device *pdev) this = (struct onenand_chip *) &mtd[1]; mtd->priv = this; + mtd->dev.of_node = np; mtd->dev.parent = &pdev->dev; onenand->pdev = pdev; - onenand->type = platform_get_device_id(pdev)->driver_data; + onenand->type = s3c_onenand_get_device_id(pdev); s3c_onenand_setup(mtd); @@ -919,6 +949,10 @@ static int s3c_onenand_probe(struct platform_device *pdev) } onenand->clk_bus = devm_clk_get(&pdev->dev, "bus"); + if (np && IS_ERR(onenand->clk_bus)) { + dev_err(&pdev->dev, "failed to get bus clock\n"); + return PTR_ERR(onenand->clk_bus); + } if (!IS_ERR(onenand->clk_bus)) clk_prepare_enable(onenand->clk_bus); @@ -1000,6 +1034,7 @@ static struct platform_driver s3c_onenand_driver = { .driver = { .name = "samsung-onenand", .pm = &s3c_pm_ops, + .of_match_table = of_match_ptr(s3c_onenand_of_match), }, .id_table = s3c_onenand_driver_ids, .probe = s3c_onenand_probe, -- 2.20.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-04-26 16:42 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-26 16:42 [PATCH 0/5] mtd: onenand/samsung: Add device tree support Paweł Chmiel 2019-04-26 16:42 ` Paweł Chmiel 2019-04-26 16:42 ` [PATCH 1/5] mtd: onenand/samsung: Unify resource order for controller variants Paweł Chmiel 2019-04-26 16:42 ` Paweł Chmiel 2019-04-29 8:16 ` Miquel Raynal 2019-04-29 8:16 ` Miquel Raynal 2019-04-26 16:42 ` [PATCH 2/5] mtd: onenand/samsung: Make sure that bus clock is enabled Paweł Chmiel 2019-04-26 16:42 ` Paweł Chmiel 2019-04-29 8:18 ` Miquel Raynal 2019-04-29 8:18 ` Miquel Raynal 2019-04-26 16:42 ` Paweł Chmiel [this message] 2019-04-26 16:42 ` [PATCH 3/5] mtd: onenand/samsung: Add device tree support Paweł Chmiel 2019-04-29 8:21 ` Miquel Raynal 2019-04-29 8:21 ` Miquel Raynal 2019-04-26 16:42 ` [PATCH 4/5] dt-binding: " Paweł Chmiel 2019-04-26 16:42 ` Paweł Chmiel 2019-05-02 1:54 ` Rob Herring 2019-05-02 1:54 ` Rob Herring 2019-05-02 6:23 ` Tomasz Figa 2019-05-02 6:23 ` Tomasz Figa 2019-05-02 6:36 ` Boris Brezillon 2019-05-02 6:36 ` Boris Brezillon 2019-05-02 6:42 ` Tomasz Figa 2019-05-02 6:42 ` Tomasz Figa 2019-05-02 6:55 ` Boris Brezillon 2019-05-02 6:55 ` Boris Brezillon 2019-05-02 6:58 ` Tomasz Figa 2019-05-02 6:58 ` Tomasz Figa 2019-05-02 7:21 ` Boris Brezillon 2019-05-02 7:21 ` Boris Brezillon 2019-05-02 8:41 ` Tomasz Figa 2019-05-02 8:41 ` Tomasz Figa 2019-04-26 16:42 ` [PATCH 5/5] mtd: onenand/samsung: Set name field of mtd_info struct Paweł Chmiel 2019-04-26 16:42 ` Paweł Chmiel 2019-04-29 8:22 ` Miquel Raynal 2019-04-29 8:22 ` Miquel Raynal 2019-04-29 8:19 ` [PATCH 0/5] mtd: onenand/samsung: Add device tree support Miquel Raynal 2019-04-29 8:19 ` Miquel Raynal 2019-04-29 14:42 ` Paweł Chmiel 2019-04-29 14:42 ` Paweł Chmiel
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=20190426164224.11327-4-pawel.mikolaj.chmiel@gmail.com \ --to=pawel.mikolaj.chmiel@gmail.com \ --cc=bbrezillon@kernel.org \ --cc=computersforpeace@gmail.com \ --cc=devicetree@vger.kernel.org \ --cc=dwmw2@infradead.org \ --cc=kyungmin.park@samsung.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=marek.vasut@gmail.com \ --cc=mark.rutland@arm.com \ --cc=miquel.raynal@bootlin.com \ --cc=richard@nod.at \ --cc=robh+dt@kernel.org \ --cc=tomasz.figa@gmail.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.