From: Lothar Waßmann Date: Thu, 26 Nov 2015 14:30:00 +0000 (+0100) Subject: imx6: rename ANADIG_PLL_AUDIO_TEST_DIV to ANADIG_PLL_AUDIO_POST_DIV X-Git-Tag: KARO-TX6UL-2015-11-30~5 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=10919fda8f38907b285a44598f196cca4b52b0c6 imx6: rename ANADIG_PLL_AUDIO_TEST_DIV to ANADIG_PLL_AUDIO_POST_DIV --- diff --git a/arch/arm/include/asm/arch-mx6/crm_regs.h b/arch/arm/include/asm/arch-mx6/crm_regs.h index 1bebafe98d..cee9c43455 100644 --- a/arch/arm/include/asm/arch-mx6/crm_regs.h +++ b/arch/arm/include/asm/arch-mx6/crm_regs.h @@ -861,11 +861,11 @@ struct mxc_ccm_reg { #define BM_ANADIG_PLL_AUDIO_LOCK (1 << 31) #define BM_ANADIG_PLL_AUDIO_SSC_EN (1 << 21) -#define BP_ANADIG_PLL_AUDIO_TEST_DIV_SELECT 19 -#define BM_ANADIG_PLL_AUDIO_TEST_DIV_SELECT (0x3 << BP_ANADIG_PLL_AUDIO_TEST_DIV_SELECT) -#define BF_ANADIG_PLL_AUDIO_TEST_DIV_SELECT(v) \ - (((v) << BP_ANADIG_PLL_AUDIO_TEST_DIV_SELECT) & \ - BM_ANADIG_PLL_AUDIO_TEST_DIV_SELECT) +#define BP_ANADIG_PLL_AUDIO_POST_DIV_SELECT 19 +#define BM_ANADIG_PLL_AUDIO_POST_DIV_SELECT (0x3 << BP_ANADIG_PLL_AUDIO_POST_DIV_SELECT) +#define BF_ANADIG_PLL_AUDIO_POST_DIV_SELECT(v) \ + (((v) << BP_ANADIG_PLL_AUDIO_POST_DIV_SELECT) & \ + BM_ANADIG_PLL_AUDIO_POST_DIV_SELECT) #define BM_ANADIG_PLL_AUDIO_PFD_OFFSET_EN (1 << 18) #define BM_ANADIG_PLL_AUDIO_DITHER_ENABLE (1 << 17) #define BM_ANADIG_PLL_AUDIO_BYPASS (1 << 16)