From: Pavel Machek <pavel@denx.de>
To: Sasha Levin <sashal@kernel.org>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
John Watts <contact@jookia.org>,
Marc Kleine-Budde <mkl@pengutronix.de>,
wg@grandegger.com, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, wens@csie.org,
jernej.skrabec@gmail.com, samuel@sholland.org,
linux-can@vger.kernel.org, netdev@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev
Subject: Re: [PATCH AUTOSEL 6.1 10/26] can: sun4i_can: Add support for the Allwinner D1
Date: Mon, 11 Sep 2023 11:47:29 +0200 [thread overview]
Message-ID: <ZP7iMa8xv7RhxWU7@duo.ucw.cz> (raw)
In-Reply-To: <20230908181806.3460164-10-sashal@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 2879 bytes --]
Hi!
> From: John Watts <contact@jookia.org>
>
> [ Upstream commit 8abb95250ae6af2d51993da8fcae18da2ce24cc4 ]
>
> The controllers present in the D1 are extremely similar to the R40
> and require the same reset quirks, but An extra quirk is needed to support
> receiving packets.
Well, we are not adding the rest of support to 6.1, so we don't need
this, either. It will be unused.
BR,
Pavel
> +++ b/drivers/net/can/Kconfig
> @@ -174,10 +174,10 @@ config CAN_SLCAN
>
> config CAN_SUN4I
> tristate "Allwinner A10 CAN controller"
> - depends on MACH_SUN4I || MACH_SUN7I || COMPILE_TEST
> + depends on MACH_SUN4I || MACH_SUN7I || RISCV || COMPILE_TEST
> help
> Say Y here if you want to use CAN controller found on Allwinner
> - A10/A20 SoCs.
> + A10/A20/D1 SoCs.
>
> To compile this driver as a module, choose M here: the module will
> be called sun4i_can.
> diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c
> index dd0c6cd76c5f5..c3a6b028ea4d6 100644
> --- a/drivers/net/can/sun4i_can.c
> +++ b/drivers/net/can/sun4i_can.c
> @@ -91,6 +91,8 @@
> #define SUN4I_REG_BUF12_ADDR 0x0070 /* CAN Tx/Rx Buffer 12 */
> #define SUN4I_REG_ACPC_ADDR 0x0040 /* CAN Acceptance Code 0 */
> #define SUN4I_REG_ACPM_ADDR 0x0044 /* CAN Acceptance Mask 0 */
> +#define SUN4I_REG_ACPC_ADDR_D1 0x0028 /* CAN Acceptance Code 0 on the D1 */
> +#define SUN4I_REG_ACPM_ADDR_D1 0x002C /* CAN Acceptance Mask 0 on the D1 */
> #define SUN4I_REG_RBUF_RBACK_START_ADDR 0x0180 /* CAN transmit buffer start */
> #define SUN4I_REG_RBUF_RBACK_END_ADDR 0x01b0 /* CAN transmit buffer end */
>
> @@ -779,6 +781,11 @@ static const struct sun4ican_quirks sun4ican_quirks_r40 = {
> .acp_offset = 0,
> };
>
> +static const struct sun4ican_quirks sun4ican_quirks_d1 = {
> + .has_reset = true,
> + .acp_offset = (SUN4I_REG_ACPC_ADDR_D1 - SUN4I_REG_ACPC_ADDR),
> +};
> +
> static const struct of_device_id sun4ican_of_match[] = {
> {
> .compatible = "allwinner,sun4i-a10-can",
> @@ -789,6 +796,9 @@ static const struct of_device_id sun4ican_of_match[] = {
> }, {
> .compatible = "allwinner,sun8i-r40-can",
> .data = &sun4ican_quirks_r40
> + }, {
> + .compatible = "allwinner,sun20i-d1-can",
> + .data = &sun4ican_quirks_d1
> }, {
> /* sentinel */
> },
> @@ -915,4 +925,4 @@ module_platform_driver(sun4i_can_driver);
> MODULE_AUTHOR("Peter Chen <xingkongcp@gmail.com>");
> MODULE_AUTHOR("Gerhard Bertelsmann <info@gerhard-bertelsmann.de>");
> MODULE_LICENSE("Dual BSD/GPL");
> -MODULE_DESCRIPTION("CAN driver for Allwinner SoCs (A10/A20)");
> +MODULE_DESCRIPTION("CAN driver for Allwinner SoCs (A10/A20/D1)");
--
DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
prev parent reply other threads:[~2023-09-11 21:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230908181806.3460164-1-sashal@kernel.org>
2023-09-08 18:17 ` [PATCH AUTOSEL 6.1 09/26] can: sun4i_can: Add acceptance register quirk Sasha Levin
2023-09-08 18:17 ` [PATCH AUTOSEL 6.1 10/26] can: sun4i_can: Add support for the Allwinner D1 Sasha Levin
2023-09-11 9:47 ` Pavel Machek [this message]
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=ZP7iMa8xv7RhxWU7@duo.ucw.cz \
--to=pavel@denx.de \
--cc=contact@jookia.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jernej.skrabec@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=samuel@sholland.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=wens@csie.org \
--cc=wg@grandegger.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: 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 read-only IMAP folder(s) and NNTP newsgroup(s).