From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/7] tegra: Rename NV_PA_PMC_BASE to TEGRA2_PMC_BASE
Date: Mon, 26 Dec 2011 20:12:55 +0100 [thread overview]
Message-ID: <201112262012.55865.marek.vasut@gmail.com> (raw)
In-Reply-To: <1324923111-340-2-git-send-email-sjg@chromium.org>
> Change this name to fit with the current convention in the Tegra
> header file.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
> arch/arm/cpu/armv7/tegra2/ap20.c | 10 +++++-----
> arch/arm/cpu/armv7/tegra2/board.c | 2 +-
> arch/arm/include/asm/arch-tegra2/tegra2.h | 4 ++--
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/tegra2/ap20.c
> b/arch/arm/cpu/armv7/tegra2/ap20.c index 4c44bb3..3ea2e26 100644
> --- a/arch/arm/cpu/armv7/tegra2/ap20.c
> +++ b/arch/arm/cpu/armv7/tegra2/ap20.c
> @@ -105,14 +105,14 @@ static void enable_cpu_clock(int enable)
>
> static int is_cpu_powered(void)
> {
> - struct pmc_ctlr *pmc = (struct pmc_ctlr *)NV_PA_PMC_BASE;
> + struct pmc_ctlr *pmc = (struct pmc_ctlr *)TEGRA2_PMC_BASE;
>
> return (readl(&pmc->pmc_pwrgate_status) & CPU_PWRED) ? 1 : 0;
> }
>
> static void remove_cpu_io_clamps(void)
> {
> - struct pmc_ctlr *pmc = (struct pmc_ctlr *)NV_PA_PMC_BASE;
> + struct pmc_ctlr *pmc = (struct pmc_ctlr *)TEGRA2_PMC_BASE;
> u32 reg;
>
> /* Remove the clamps on the CPU I/O signals */
> @@ -126,7 +126,7 @@ static void remove_cpu_io_clamps(void)
>
> static void powerup_cpu(void)
> {
> - struct pmc_ctlr *pmc = (struct pmc_ctlr *)NV_PA_PMC_BASE;
> + struct pmc_ctlr *pmc = (struct pmc_ctlr *)TEGRA2_PMC_BASE;
> u32 reg;
> int timeout = IO_STABILIZATION_DELAY;
>
> @@ -157,7 +157,7 @@ static void powerup_cpu(void)
>
> static void enable_cpu_power_rail(void)
> {
> - struct pmc_ctlr *pmc = (struct pmc_ctlr *)NV_PA_PMC_BASE;
> + struct pmc_ctlr *pmc = (struct pmc_ctlr *)TEGRA2_PMC_BASE;
> u32 reg;
>
> reg = readl(&pmc->pmc_cntrl);
> @@ -277,7 +277,7 @@ void enable_scu(void)
>
> void init_pmc_scratch(void)
> {
> - struct pmc_ctlr *const pmc = (struct pmc_ctlr *)NV_PA_PMC_BASE;
> + struct pmc_ctlr *const pmc = (struct pmc_ctlr *)TEGRA2_PMC_BASE;
> int i;
>
> /* SCRATCH0 is initialized by the boot ROM and shouldn't be cleared */
> diff --git a/arch/arm/cpu/armv7/tegra2/board.c
> b/arch/arm/cpu/armv7/tegra2/board.c index ea06570..2c91e69 100644
> --- a/arch/arm/cpu/armv7/tegra2/board.c
> +++ b/arch/arm/cpu/armv7/tegra2/board.c
> @@ -47,7 +47,7 @@ enum {
>
> unsigned int query_sdram_size(void)
> {
> - struct pmc_ctlr *const pmc = (struct pmc_ctlr *)NV_PA_PMC_BASE;
> + struct pmc_ctlr *const pmc = (struct pmc_ctlr *)TEGRA2_PMC_BASE;
> u32 reg;
>
> reg = readl(&pmc->pmc_scratch20);
> diff --git a/arch/arm/include/asm/arch-tegra2/tegra2.h
> b/arch/arm/include/asm/arch-tegra2/tegra2.h index baae2eb..ca1881e 100644
> --- a/arch/arm/include/asm/arch-tegra2/tegra2.h
> +++ b/arch/arm/include/asm/arch-tegra2/tegra2.h
> @@ -39,7 +39,7 @@
> #define NV_PA_APB_UARTD_BASE (NV_PA_APB_MISC_BASE + 0x6300)
> #define NV_PA_APB_UARTE_BASE (NV_PA_APB_MISC_BASE + 0x6400)
> #define TEGRA2_SPI_BASE (NV_PA_APB_MISC_BASE + 0xC380)
> -#define NV_PA_PMC_BASE 0x7000E400
> +#define TEGRA2_PMC_BASE (NV_PA_APB_MISC_BASE + 0xE400)
> #define NV_PA_CSITE_BASE 0x70040000
> #define TEGRA_USB1_BASE 0xC5000000
> #define TEGRA_USB3_BASE 0xC5008000
> @@ -55,7 +55,7 @@ struct timerus {
> unsigned int cntr_1us;
> };
> #else /* __ASSEMBLY__ */
> -#define PRM_RSTCTRL NV_PA_PMC_BASE
> +#define PRM_RSTCTRL TEGRA2_PMC_BASE
> #endif
>
> #endif /* TEGRA2_H */
Looks ok
Acked-by: Marek Vasut <marek.vasut@gmail.com>
next prev parent reply other threads:[~2011-12-26 19:12 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-26 18:11 [U-Boot] [PATCH 0/7] tegra: Add I2C driver and associated parts Simon Glass
2011-12-26 18:11 ` [U-Boot] [PATCH 1/7] tegra: Rename NV_PA_PMC_BASE to TEGRA2_PMC_BASE Simon Glass
2011-12-26 19:12 ` Marek Vasut [this message]
2012-01-09 21:34 ` Stephen Warren
2011-12-26 18:11 ` [U-Boot] [PATCH 2/7] tegra: fdt: Add extra I2C definitions for U-Boot Simon Glass
2011-12-26 19:12 ` Marek Vasut
2011-12-27 4:35 ` Stephen Warren
2011-12-27 5:15 ` Simon Glass
2011-12-29 6:40 ` Stephen Warren
2011-12-29 7:11 ` Simon Glass
2011-12-26 18:11 ` [U-Boot] [PATCH 3/7] tegra: Add I2C support to funcmux Simon Glass
2012-01-09 21:36 ` Stephen Warren
2012-01-09 21:40 ` Simon Glass
2012-01-09 22:56 ` Simon Glass
2011-12-26 18:11 ` [U-Boot] [PATCH 4/7] tegra: Add I2C driver Simon Glass
2011-12-26 19:15 ` Marek Vasut
2012-01-08 16:57 ` Simon Glass
2012-01-08 17:06 ` Marek Vasut
2012-01-08 18:16 ` Simon Glass
2012-01-08 5:57 ` Mike Frysinger
2012-01-08 16:46 ` Simon Glass
2012-01-09 22:07 ` Stephen Warren
2012-01-12 4:17 ` Simon Glass
2012-01-12 19:14 ` Stephen Warren
2012-01-13 7:12 ` Heiko Schocher
2012-01-13 14:49 ` Simon Glass
2012-01-13 15:27 ` Heiko Schocher
2012-02-03 23:18 ` Simon Glass
2011-12-26 18:11 ` [U-Boot] [PATCH 5/7] tegra: Initialise I2C on Nvidia boards Simon Glass
2011-12-26 18:11 ` [U-Boot] [PATCH 6/7] tegra: Select I2C ordering for Seaboard Simon Glass
2012-01-09 21:42 ` Stephen Warren
2011-12-26 18:11 ` [U-Boot] [PATCH 7/7] tegra: Enable I2C on Seaboard Simon Glass
2012-01-09 21:45 ` Stephen Warren
[not found] ` <CAPnjgZ3jTm6j-fK_Kn==W3uGr=8pREEWXawP39kojLzzSH07wQ@mail.gmail.com>
[not found] ` <74CDBE0F657A3D45AFBB94109FB122FF17801D1D4A@HQMAIL01.nvidia.com>
2012-01-12 19:10 ` Simon Glass
2012-01-12 19:21 ` Stephen Warren
2012-01-12 19:28 ` Simon Glass
2012-01-13 7:34 ` Heiko Schocher
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=201112262012.55865.marek.vasut@gmail.com \
--to=marek.vasut@gmail.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