From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Tudor.Ambarus@microchip.com
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
bbrezillon@kernel.org, richard@nod.at,
Nicolas.Ferre@microchip.com, linux-kernel@vger.kernel.org,
marek.vasut@gmail.com, Ludovic.Desroches@microchip.com,
robh+dt@kernel.org, linux-mtd@lists.infradead.org,
miquel.raynal@bootlin.com, lee.jones@linaro.org,
computersforpeace@gmail.com, dwmw2@infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 02/11] memory: atmel-ebi: add generic name for ebi regmap
Date: Wed, 13 Feb 2019 11:53:08 +0100 [thread overview]
Message-ID: <20190213105308.GJ10129@piout.net> (raw)
In-Reply-To: <20190213085930.31578-3-tudor.ambarus@microchip.com>
On 13/02/2019 08:59:48+0000, Tudor.Ambarus@microchip.com wrote:
> From: Tudor Ambarus <tudor.ambarus@microchip.com>
>
> The sam9x60 board defines the CCFG_EBICSA register under SFR,
> and not as a MATRIX register, as previous boards do. Add a
> more generic name for the EBI regmap as a prerequisite for
> sam9x60 ebi support.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
> drivers/memory/atmel-ebi.c | 23 ++++++++++++++++-------
> 1 file changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c
> index c3748b414c27..b45914cfa212 100644
> --- a/drivers/memory/atmel-ebi.c
> +++ b/drivers/memory/atmel-ebi.c
> @@ -36,6 +36,7 @@ struct atmel_ebi_dev {
> struct atmel_ebi_caps {
> unsigned int available_cs;
> unsigned int ebi_csa_offs;
> + const char *regmap_name;
> void (*get_config)(struct atmel_ebi_dev *ebid,
> struct atmel_ebi_dev_config *conf);
> int (*xlate_config)(struct atmel_ebi_dev *ebid,
> @@ -47,7 +48,7 @@ struct atmel_ebi_caps {
>
> struct atmel_ebi {
> struct clk *clk;
> - struct regmap *matrix;
> + struct regmap *regmap;
> struct {
> struct regmap *regmap;
> struct clk *clk;
> @@ -357,7 +358,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np,
> * one "atmel,smc-" property is present.
> */
> if (ebi->caps->ebi_csa_offs && apply)
> - regmap_update_bits(ebi->matrix,
> + regmap_update_bits(ebi->regmap,
> ebi->caps->ebi_csa_offs,
> BIT(cs), 0);
>
> @@ -372,6 +373,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np,
> static const struct atmel_ebi_caps at91sam9260_ebi_caps = {
> .available_cs = 0xff,
> .ebi_csa_offs = AT91SAM9260_MATRIX_EBICSA,
> + .regmap_name = "atmel,matrix",
> .get_config = at91sam9_ebi_get_config,
> .xlate_config = atmel_ebi_xslate_smc_config,
> .apply_config = at91sam9_ebi_apply_config,
> @@ -380,6 +382,7 @@ static const struct atmel_ebi_caps at91sam9260_ebi_caps = {
> static const struct atmel_ebi_caps at91sam9261_ebi_caps = {
> .available_cs = 0xff,
> .ebi_csa_offs = AT91SAM9261_MATRIX_EBICSA,
> + .regmap_name = "atmel,matrix",
> .get_config = at91sam9_ebi_get_config,
> .xlate_config = atmel_ebi_xslate_smc_config,
> .apply_config = at91sam9_ebi_apply_config,
> @@ -388,6 +391,7 @@ static const struct atmel_ebi_caps at91sam9261_ebi_caps = {
> static const struct atmel_ebi_caps at91sam9263_ebi0_caps = {
> .available_cs = 0x3f,
> .ebi_csa_offs = AT91SAM9263_MATRIX_EBI0CSA,
> + .regmap_name = "atmel,matrix",
> .get_config = at91sam9_ebi_get_config,
> .xlate_config = atmel_ebi_xslate_smc_config,
> .apply_config = at91sam9_ebi_apply_config,
> @@ -396,6 +400,7 @@ static const struct atmel_ebi_caps at91sam9263_ebi0_caps = {
> static const struct atmel_ebi_caps at91sam9263_ebi1_caps = {
> .available_cs = 0x7,
> .ebi_csa_offs = AT91SAM9263_MATRIX_EBI1CSA,
> + .regmap_name = "atmel,matrix",
> .get_config = at91sam9_ebi_get_config,
> .xlate_config = atmel_ebi_xslate_smc_config,
> .apply_config = at91sam9_ebi_apply_config,
> @@ -404,6 +409,7 @@ static const struct atmel_ebi_caps at91sam9263_ebi1_caps = {
> static const struct atmel_ebi_caps at91sam9rl_ebi_caps = {
> .available_cs = 0x3f,
> .ebi_csa_offs = AT91SAM9RL_MATRIX_EBICSA,
> + .regmap_name = "atmel,matrix",
> .get_config = at91sam9_ebi_get_config,
> .xlate_config = atmel_ebi_xslate_smc_config,
> .apply_config = at91sam9_ebi_apply_config,
> @@ -412,6 +418,7 @@ static const struct atmel_ebi_caps at91sam9rl_ebi_caps = {
> static const struct atmel_ebi_caps at91sam9g45_ebi_caps = {
> .available_cs = 0x3f,
> .ebi_csa_offs = AT91SAM9G45_MATRIX_EBICSA,
> + .regmap_name = "atmel,matrix",
> .get_config = at91sam9_ebi_get_config,
> .xlate_config = atmel_ebi_xslate_smc_config,
> .apply_config = at91sam9_ebi_apply_config,
> @@ -420,6 +427,7 @@ static const struct atmel_ebi_caps at91sam9g45_ebi_caps = {
> static const struct atmel_ebi_caps at91sam9x5_ebi_caps = {
> .available_cs = 0x3f,
> .ebi_csa_offs = AT91SAM9X5_MATRIX_EBICSA,
> + .regmap_name = "atmel,matrix",
> .get_config = at91sam9_ebi_get_config,
> .xlate_config = atmel_ebi_xslate_smc_config,
> .apply_config = at91sam9_ebi_apply_config,
> @@ -543,13 +551,14 @@ static int atmel_ebi_probe(struct platform_device *pdev)
>
> /*
> * The sama5d3 does not provide an EBICSA register and thus does need
> - * to access the matrix registers.
> + * to access it.
> */
> if (ebi->caps->ebi_csa_offs) {
> - ebi->matrix =
> - syscon_regmap_lookup_by_phandle(np, "atmel,matrix");
> - if (IS_ERR(ebi->matrix))
> - return PTR_ERR(ebi->matrix);
> + ebi->regmap =
> + syscon_regmap_lookup_by_phandle(np,
> + ebi->caps->regmap_name);
> + if (IS_ERR(ebi->regmap))
> + return PTR_ERR(ebi->regmap);
> }
>
> ret = of_property_read_u32(np, "#address-cells", &val);
> --
> 2.9.5
>
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-02-13 10:53 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 8:59 [PATCH 00/11] add support for sam9x60 nand controller Tudor.Ambarus
2019-02-13 8:59 ` [PATCH 01/11] ARM: at91: add sam9x60 SFR definitions Tudor.Ambarus
2019-02-13 10:52 ` Alexandre Belloni
2019-02-13 8:59 ` [PATCH 02/11] memory: atmel-ebi: add generic name for ebi regmap Tudor.Ambarus
2019-02-13 10:53 ` Alexandre Belloni [this message]
2019-02-13 8:59 ` [PATCH 03/11] dt-bindings: memory: atmel-ebi: add sam9x60 compatible Tudor.Ambarus
2019-02-13 10:53 ` Alexandre Belloni
2019-02-28 18:24 ` Rob Herring
2019-02-13 8:59 ` [PATCH 04/11] memory: atmel-ebi: add sam9x60 EBI support Tudor.Ambarus
2019-02-13 10:54 ` Alexandre Belloni
2019-02-13 8:59 ` [PATCH 05/11] mtd: rawnand: atmel: add generic name for EBICSA regmap Tudor.Ambarus
2019-02-13 9:00 ` [PATCH 06/11] dt-bindings: mtd: atmel-nand: add sam9x60 compatible Tudor.Ambarus
2019-02-28 18:24 ` Rob Herring
2019-02-13 9:00 ` [PATCH 07/11] mtd: rawnand: atmel: add sam9x60 nand controller support Tudor.Ambarus
2019-02-13 10:39 ` Alexandre Belloni
2019-02-13 10:54 ` Tudor.Ambarus
2019-02-13 9:00 ` [PATCH 08/11] memory: atmel-ebi: move NUM_CS definition inside atmel-ebi Tudor.Ambarus
2019-02-13 9:00 ` [PATCH 09/11] mfd: syscon: atmel: switch to SPDX license identifiers Tudor.Ambarus
2019-04-03 10:08 ` Lee Jones
2019-02-13 9:00 ` [PATCH 10/11] memory: atmel-ebi: " Tudor.Ambarus
2019-02-13 9:00 ` [PATCH 11/11] mtd: rawnand: atmel: " Tudor.Ambarus
2019-04-01 15:24 ` [PATCH 00/11] add support for sam9x60 nand controller Miquel Raynal
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=20190213105308.GJ10129@piout.net \
--to=alexandre.belloni@bootlin.com \
--cc=Ludovic.Desroches@microchip.com \
--cc=Nicolas.Ferre@microchip.com \
--cc=Tudor.Ambarus@microchip.com \
--cc=bbrezillon@kernel.org \
--cc=computersforpeace@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--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 \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).