diff options
author | York Sun <york.sun@nxp.com> | 2016-11-16 11:06:47 -0800 |
---|---|---|
committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:04 -0800 |
commit | 24ad75ae55e7136e958e00380d58c87696216657 (patch) | |
tree | 80d806c946e90c12135b1f31d815f8676c97c3b4 /arch/powerpc/include/asm/immap_85xx.h | |
parent | ebccf25518dc8d5253d70d69fc738c0f80cb888a (diff) |
powerpc: MPC8536: Move CONFIG_MPC8536 to Kconfig option
Replace CONFIG_MPC8536 with ARCH_MPC8536 in Kconfig and clean up existing
macros.
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.h | 4 |
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 cef9da06ef..1ae5af1fcd 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -2120,7 +2120,7 @@ typedef struct ccsr_rcpm { #else typedef struct ccsr_gur { u32 porpllsr; /* POR PLL ratio status */ -#ifdef CONFIG_MPC8536 +#ifdef CONFIG_ARCH_MPC8536 #define MPC85xx_PORPLLSR_DDR_RATIO 0x3e000000 #define MPC85xx_PORPLLSR_DDR_RATIO_SHIFT 25 #elif defined(CONFIG_ARCH_C29X) @@ -2203,7 +2203,7 @@ typedef struct ccsr_gur { u8 res1[8]; u32 gpporcr; /* General-purpose POR configuration */ u8 res2[12]; -#if defined(CONFIG_MPC8536) +#if defined(CONFIG_ARCH_MPC8536) u32 gencfgr; /* General Configuration Register */ #define MPC85xx_GENCFGR_SDHC_WP_INV 0x20000000 #else |