From: Josh Wu <josh.wu@atmel.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/3] arm: at91: spl/atmel_sfr: move saic redirect to separate file
Date: Thu, 5 Nov 2015 10:58:35 +0800 [thread overview]
Message-ID: <563AC5DB.7010900@atmel.com> (raw)
In-Reply-To: <1446618486-10739-4-git-send-email-wenyou.yang@atmel.com>
Hi, Wenyou
On 11/4/2015 2:28 PM, Wenyou Yang wrote:
> To make saic redirect code sharing with other SoCs, move the
> saic redirect code from SAMA5D4 particular file,
> mach-at91/armv7/sama5d4_devices.c to a separate file,
> mach-at91/atmel_sfr.c
maybe move it as mach-at91/armv7/atmel_sfr.c?
Best Regards,
Josh Wu
>
> Move ATMEL_SFR_AICREDIR_KEY definition to sama5d4.h, because each
> SoC has its own value.
>
> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
> ---
>
> arch/arm/mach-at91/Makefile | 2 +-
> arch/arm/mach-at91/armv7/sama5d4_devices.c | 13 -------------
> arch/arm/mach-at91/atmel_sfr.c | 21 +++++++++++++++++++++
> arch/arm/mach-at91/include/mach/sama5_sfr.h | 1 -
> arch/arm/mach-at91/include/mach/sama5d4.h | 3 +++
> 5 files changed, 25 insertions(+), 15 deletions(-)
> create mode 100644 arch/arm/mach-at91/atmel_sfr.c
>
> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
> index 649aff2..ca60397 100644
> --- a/arch/arm/mach-at91/Makefile
> +++ b/arch/arm/mach-at91/Makefile
> @@ -6,7 +6,7 @@ obj-$(CONFIG_AT91SAM9M10G45) += mpddrc.o spl_at91.o
> obj-$(CONFIG_AT91SAM9N12) += mpddrc.o spl_at91.o
> obj-$(CONFIG_AT91SAM9X5) += mpddrc.o spl_at91.o
> obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o
> -obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o matrix.o
> +obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o matrix.o atmel_sfr.o
> obj-y += spl.o
> endif
>
> diff --git a/arch/arm/mach-at91/armv7/sama5d4_devices.c b/arch/arm/mach-at91/armv7/sama5d4_devices.c
> index 52f4862..ce33cd4 100644
> --- a/arch/arm/mach-at91/armv7/sama5d4_devices.c
> +++ b/arch/arm/mach-at91/armv7/sama5d4_devices.c
> @@ -45,16 +45,3 @@ void at91_udp_hw_init(void)
> at91_periph_clk_enable(ATMEL_ID_UDPHS);
> }
> #endif
> -
> -#ifdef CONFIG_SPL_BUILD
> -void redirect_int_from_saic_to_aic(void)
> -{
> - struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR;
> - u32 key32;
> -
> - if (!(readl(&sfr->aicredir) & ATMEL_SFR_AICREDIR_NSAIC)) {
> - key32 = readl(&sfr->sn1) ^ ATMEL_SFR_AICREDIR_KEY;
> - writel((key32 | ATMEL_SFR_AICREDIR_NSAIC), &sfr->aicredir);
> - }
> -}
> -#endif
> diff --git a/arch/arm/mach-at91/atmel_sfr.c b/arch/arm/mach-at91/atmel_sfr.c
> new file mode 100644
> index 0000000..2bccb84
> --- /dev/null
> +++ b/arch/arm/mach-at91/atmel_sfr.c
> @@ -0,0 +1,21 @@
> +/*
> + * Copyright (C) 2015 Atmel Corporation
> + * Wenyou Yang <wenyou.yang@atmel.com>
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include <asm/io.h>
> +#include <asm/arch/sama5_sfr.h>
> +
> +void redirect_int_from_saic_to_aic(void)
> +{
> + struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR;
> + u32 key32;
> +
> + if (!(readl(&sfr->aicredir) & ATMEL_SFR_AICREDIR_NSAIC)) {
> + key32 = readl(&sfr->sn1) ^ ATMEL_SFR_AICREDIR_KEY;
> + writel((key32 | ATMEL_SFR_AICREDIR_NSAIC), &sfr->aicredir);
> + }
> +}
> diff --git a/arch/arm/mach-at91/include/mach/sama5_sfr.h b/arch/arm/mach-at91/include/mach/sama5_sfr.h
> index 3081d37..7b19a20 100644
> --- a/arch/arm/mach-at91/include/mach/sama5_sfr.h
> +++ b/arch/arm/mach-at91/include/mach/sama5_sfr.h
> @@ -32,7 +32,6 @@ struct atmel_sfr {
> #define ATMEL_SFR_DDRCFG_FDQSIEN 0x00020000
>
> /* Bit field in AICREDIR */
> -#define ATMEL_SFR_AICREDIR_KEY 0x5F67B102
> #define ATMEL_SFR_AICREDIR_NSAIC 0x00000001
>
> #endif
> diff --git a/arch/arm/mach-at91/include/mach/sama5d4.h b/arch/arm/mach-at91/include/mach/sama5d4.h
> index 449cf0e..90085da 100644
> --- a/arch/arm/mach-at91/include/mach/sama5d4.h
> +++ b/arch/arm/mach-at91/include/mach/sama5d4.h
> @@ -204,6 +204,9 @@
> #define H32MX_SLAVE_USB 5 /* USB Device & Host */
> #define H32MX_SLAVE_SMD 6 /* Soft Modem (SMD) */
>
> +/* AICREDIR Unlock Key */
> +#define ATMEL_SFR_AICREDIR_KEY 0x5F67B102
> +
> /* sama5d4 series chip id definitions */
> #define ARCH_ID_SAMA5D4 0x8a5c07c0
> #define ARCH_EXID_SAMA5D41 0x00000001
next prev parent reply other threads:[~2015-11-05 2:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-04 6:28 [U-Boot] [PATCH 0/3] arm: at91/spl: make matrix and saic redirect sharing with others Wenyou Yang
2015-11-04 6:28 ` [U-Boot] [PATCH 1/3] arm: at91/spl: matrix: move matrix init to separate file Wenyou Yang
2015-11-05 2:52 ` Josh Wu
2015-11-05 7:54 ` Yang, Wenyou
2015-11-04 6:28 ` [U-Boot] [PATCH 2/3] arm: at91/spl: matrix: improve implementation of matrix Wenyou Yang
2015-11-05 2:54 ` Josh Wu
2015-11-05 7:57 ` Yang, Wenyou
2015-11-04 6:28 ` [U-Boot] [PATCH 3/3] arm: at91: spl/atmel_sfr: move saic redirect to separate file Wenyou Yang
2015-11-05 2:58 ` Josh Wu [this message]
2015-11-05 7:55 ` Yang, Wenyou
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=563AC5DB.7010900@atmel.com \
--to=josh.wu@atmel.com \
--cc=u-boot@lists.denx.de \
/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