ARM: at91: asm/at91_pmc.h: fix trival register offset
authorWenyou Yang <wenyou.yang@atmel.com>
Wed, 3 Feb 2016 02:16:47 +0000 (10:16 +0800)
committerAndreas Bießmann <andreas.devel@googlemail.com>
Thu, 18 Feb 2016 20:34:40 +0000 (21:34 +0100)
Remove unnecessary #ifdef CPU_HAS_PCR.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Tested-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
arch/arm/mach-at91/include/mach/at91_pmc.h

index 3f50f7718ff5ce6b2c34828001bd883b91572661..eb401945e9d0b0db109b13918d7ac1546b6c8f0e 100644 (file)
@@ -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 */