summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/immap_85xx.h
diff options
context:
space:
mode:
authorYork Sun <york.sun@nxp.com>2016-11-16 16:02:09 -0800
committerYork Sun <york.sun@nxp.com>2016-11-23 23:42:08 -0800
commit46d9fc0bb722cf8e676071017aef758755351f76 (patch)
tree63d52137e5476c54de3bd7330ca1254b6a6dfc0f /arch/powerpc/include/asm/immap_85xx.h
parent2f8b81268a75dc4c5be55d6ca5a065d5065f45d9 (diff)
powerpc: P1014: Drop configuration for P1014
P1014 is a variant of P1010. There is no P1014 target configured. Drop related macros. P1014 SoC is still supported. Signed-off-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'arch/powerpc/include/asm/immap_85xx.h')
-rw-r--r--arch/powerpc/include/asm/immap_85xx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index c82daab6ee..222bb4c949 100644
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -2222,7 +2222,7 @@ typedef struct ccsr_gur {
u32 gpindr; /* General-purpose input data */
u8 res5[12];
u32 pmuxcr; /* Alt. function signal multiplex control */
-#if defined(CONFIG_ARCH_P1010) || defined(CONFIG_P1014)
+#if defined(CONFIG_ARCH_P1010)
#define MPC85xx_PMUXCR_TSEC1_0_1588 0x40000000
#define MPC85xx_PMUXCR_TSEC1_0_RES 0xC0000000
#define MPC85xx_PMUXCR_TSEC1_1_1588_TRIG 0x10000000
@@ -2350,7 +2350,7 @@ typedef struct ccsr_gur {
#define MPC85xx_PMUXCR_SPI_GPIO 0x00000100
#endif
u32 pmuxcr2; /* Alt. function signal multiplex control 2 */
-#if defined(CONFIG_ARCH_P1010) || defined(CONFIG_P1014)
+#if defined(CONFIG_ARCH_P1010)
#define MPC85xx_PMUXCR2_UART_GPIO 0x40000000
#define MPC85xx_PMUXCR2_UART_TDM 0x80000000
#define MPC85xx_PMUXCR2_UART_RES 0xC0000000