All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wenyou Yang <wenyou.yang@atmel.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 1/5] ARM: at91: asm/at91_pmc.h: fix trival register offset
Date: Thu, 10 Dec 2015 10:20:49 +0800	[thread overview]
Message-ID: <1449714053-26416-2-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1449714053-26416-1-git-send-email-wenyou.yang@atmel.com>

Remove unnecessary #ifdef CPU_HAS_PCR.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---

Changes in v3: None
Changes in v2: None

 arch/arm/mach-at91/include/mach/at91_pmc.h |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-at91/include/mach/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h
index 3f50f77..eb40194 100644
--- a/arch/arm/mach-at91/include/mach/at91_pmc.h
+++ b/arch/arm/mach-at91/include/mach/at91_pmc.h
@@ -51,19 +51,15 @@ typedef struct at91_pmc {
 	u32	imr;		/* 0x6C Interrupt Mask Register */
 	u32	reserved4[4];
 	u32	pllicpr;	/* 0x80 Change Pump Current Register (SAM9) */
-	u32	reserved5[21];
+	u32	reserved5[24];
 	u32	wpmr;		/* 0xE4 Write Protect Mode Register (CAP0) */
 	u32	wpsr;		/* 0xE8 Write Protect Status Register (CAP0) */
-#ifdef CPU_HAS_PCR
-	u32	reserved6[8];
+	u32	reserved6[5];
 	u32	pcer1;		/* 0x100 Periperial Clock Enable Register 1 */
 	u32	pcdr1;		/* 0x104 Periperial Clock Disable Register 1 */
 	u32	pcsr1;		/* 0x108 Periperial Clock Status Register 1 */
 	u32	pcr;		/* 0x10c Periperial Control Register */
 	u32	ocr;		/* 0x110 Oscillator Calibration Register */
-#else
-	u32	reserved8[5];
-#endif
 } at91_pmc_t;
 
 #endif	/* end not assembly */
-- 
1.7.9.5

  reply	other threads:[~2015-12-10  2:20 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-10  2:20 [U-Boot] [PATCH v3 0/5] ARM: at91: improve peripheral and system clock handle functions Wenyou Yang
2015-12-10  2:20 ` Wenyou Yang [this message]
2015-12-10  9:37   ` [U-Boot] [PATCH v3 1/5] ARM: at91: asm/at91_pmc.h: fix trival register offset Heiko Schocher
2016-01-27 16:22   ` Andreas Bießmann
2015-12-10  2:20 ` [U-Boot] [PATCH v3 2/5] ARM: at91: clock: add a new file to handle clock Wenyou Yang
2015-12-10  9:37   ` Heiko Schocher
2016-01-27 16:29   ` Andreas Bießmann
2015-12-10  2:20 ` [U-Boot] [PATCH v3 3/5] ARM: cpu: at91: clean up peripheral clock code Wenyou Yang
2015-12-10  9:38   ` Heiko Schocher
2016-01-27 16:22   ` Andreas Bießmann
2015-12-10  2:20 ` [U-Boot] [PATCH v3 4/5] board: atmel: " Wenyou Yang
2015-12-10  9:38   ` Heiko Schocher
2015-12-10  2:20 ` [U-Boot] [PATCH v3 5/5] drivers: at91: " Wenyou Yang
2015-12-10  9:38   ` 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=1449714053-26416-2-git-send-email-wenyou.yang@atmel.com \
    --to=wenyou.yang@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.