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 01/11] ARM: at91: add sam9x60 SFR definitions
Date: Wed, 13 Feb 2019 11:52:38 +0100 [thread overview]
Message-ID: <20190213105238.GI10129@piout.net> (raw)
In-Reply-To: <20190213085930.31578-2-tudor.ambarus@microchip.com>
On 13/02/2019 08:59:44+0000, Tudor.Ambarus@microchip.com wrote:
> From: Tudor Ambarus <tudor.ambarus@microchip.com>
>
> Keep generic names, as there are no conflicts with previous
> SFR definitions.
>
> While touching bits, update AT91_OHCIICR_USB_SUSPEND to use
> GENMASK, replace unused AT91_OHCIICR_SUSPEND_A/B/C with a more
> generic macro, align values on tab-width.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
> include/soc/at91/atmel-sfr.h | 34 +++++++++++++++++++++++++++-------
> 1 file changed, 27 insertions(+), 7 deletions(-)
>
> diff --git a/include/soc/at91/atmel-sfr.h b/include/soc/at91/atmel-sfr.h
> index 482337af06b8..532fd784e86c 100644
> --- a/include/soc/at91/atmel-sfr.h
> +++ b/include/soc/at91/atmel-sfr.h
> @@ -14,21 +14,41 @@
> #define _LINUX_MFD_SYSCON_ATMEL_SFR_H
>
> #define AT91_SFR_DDRCFG 0x04 /* DDR Configuration Register */
> +#define AT91_SFR_CCFG_EBICSA 0x04 /* EBI Chip Select Register */
> /* 0x08 ~ 0x0c: Reserved */
> #define AT91_SFR_OHCIICR 0x10 /* OHCI INT Configuration Register */
> #define AT91_SFR_OHCIISR 0x14 /* OHCI INT Status Register */
> #define AT91_SFR_UTMICKTRIM 0x30 /* UTMI Clock Trimming Register */
> +#define AT91_SFR_UTMISWAP 0x3c /* UTMI DP/DM Pin Swapping Register */
> +#define AT91_SFR_LS 0x7c /* Light Sleep Register */
> #define AT91_SFR_I2SCLKSEL 0x90 /* I2SC Register */
> +#define AT91_SFR_WPMR 0xe4 /* Write Protection Mode Register */
>
> /* Field definitions */
> -#define AT91_OHCIICR_SUSPEND_A BIT(8)
> -#define AT91_OHCIICR_SUSPEND_B BIT(9)
> -#define AT91_OHCIICR_SUSPEND_C BIT(10)
> +#define AT91_SFR_CCFG_EBI_CSA(cs, val) ((val) << (cs))
> +#define AT91_SFR_CCFG_EBI_DBPUC BIT(8)
> +#define AT91_SFR_CCFG_EBI_DBPDC BIT(9)
> +#define AT91_SFR_CCFG_EBI_DRIVE BIT(17)
> +#define AT91_SFR_CCFG_NFD0_ON_D16 BIT(24)
> +#define AT91_SFR_CCFG_DDR_MP_EN BIT(25)
>
> -#define AT91_OHCIICR_USB_SUSPEND (AT91_OHCIICR_SUSPEND_A | \
> - AT91_OHCIICR_SUSPEND_B | \
> - AT91_OHCIICR_SUSPEND_C)
> +#define AT91_SFR_OHCIICR_RES(x) BIT(x)
> +#define AT91_SFR_OHCIICR_ARIE BIT(4)
> +#define AT91_SFR_OHCIICR_APPSTART BIT(5)
> +#define AT91_SFR_OHCIICR_USB_SUSP(x) BIT(8 + (x))
> +#define AT91_SFR_OHCIICR_UDPPUDIS BIT(23)
> +#define AT91_OHCIICR_USB_SUSPEND GENMASK(10, 8)
>
> -#define AT91_UTMICKTRIM_FREQ GENMASK(1, 0)
> +#define AT91_SFR_OHCIISR_RIS(x) BIT(x)
> +
> +#define AT91_UTMICKTRIM_FREQ GENMASK(1, 0)
> +
> +#define AT91_SFR_UTMISWAP_PORT(x) BIT(x)
> +
> +#define AT91_SFR_LS_VALUE(x) BIT(x)
> +#define AT91_SFR_LS_MEM_POWER_GATING_ULP1_EN BIT(16)
> +
> +#define AT91_SFR_WPMR_WPEN BIT(0)
> +#define AT91_SFR_WPMR_WPKEY_MASK GENMASK(31, 8)
>
> #endif /* _LINUX_MFD_SYSCON_ATMEL_SFR_H */
> --
> 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 [this message]
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
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=20190213105238.GI10129@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).