Both i.MX8 and i.MX7 have similar CCMs, so move any code that can be share into a separate file. Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx> --- arch/arm/mach-imx/include/mach/ccm.h | 20 +++++++++++++++++++ .../arm/mach-imx/include/mach/imx7-ccm-regs.h | 16 +-------------- 2 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 arch/arm/mach-imx/include/mach/ccm.h diff --git a/arch/arm/mach-imx/include/mach/ccm.h b/arch/arm/mach-imx/include/mach/ccm.h new file mode 100644 index 000000000..32254a85b --- /dev/null +++ b/arch/arm/mach-imx/include/mach/ccm.h @@ -0,0 +1,20 @@ +#ifndef __IMX_CCM_H__ + +/* 0 <= n <= 190 */ +#define CCM_CCGRn_SET(n) (0x4004 + 16 * (n)) +#define CCM_CCGRn_CLR(n) (0x4008 + 16 * (n)) + +/* 0 <= n <= 120 */ +#define CCM_TARGET_ROOTn(n) (0x8000 + 128 * (n)) + +#define CCM_TARGET_ROOTn_MUX(x) ((x) << 24) +#define CCM_TARGET_ROOTn_ENABLE BIT(28) + + +#define CCM_CCGR_SETTINGn(n, s) ((s) << ((n) * 4)) +#define CCM_CCGR_SETTINGn_NOT_NEEDED(n) CCM_CCGR_SETTINGn(n, 0b00) +#define CCM_CCGR_SETTINGn_NEEDED_RUN(n) CCM_CCGR_SETTINGn(n, 0b01) +#define CCM_CCGR_SETTINGn_NEEDED_RUN_WAIT(n) CCM_CCGR_SETTINGn(n, 0b10) +#define CCM_CCGR_SETTINGn_NEEDED(n) CCM_CCGR_SETTINGn(n, 0b11) + +#endif \ No newline at end of file diff --git a/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h b/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h index 97fe240fc..43b9425df 100644 --- a/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h +++ b/arch/arm/mach-imx/include/mach/imx7-ccm-regs.h @@ -1,25 +1,11 @@ #ifndef __MACH_IMX7_CCM_REGS_H__ #define __MACH_IMX7_CCM_REGS_H__ -/* 0 <= n <= 190 */ -#define CCM_CCGRn_SET(n) (0x4004 + 16 * (n)) -#define CCM_CCGRn_CLR(n) (0x4008 + 16 * (n)) +#include "ccm.h" #define CCM_CCGR_UART1 148 #define CCM_CCGR_UART2 149 -#define CCM_CCGR_SETTINGn(n, s) ((s) << ((n) * 4)) -#define CCM_CCGR_SETTINGn_NOT_NEEDED(n) CCM_CCGR_SETTINGn(n, 0b00) -#define CCM_CCGR_SETTINGn_NEEDED_RUN(n) CCM_CCGR_SETTINGn(n, 0b01) -#define CCM_CCGR_SETTINGn_NEEDED_RUN_WAIT(n) CCM_CCGR_SETTINGn(n, 0b10) -#define CCM_CCGR_SETTINGn_NEEDED(n) CCM_CCGR_SETTINGn(n, 0b11) - -/* 0 <= n <= 120 */ -#define CCM_TARGET_ROOTn(n) (0x8000 + 128 * (n)) - -#define CCM_TARGET_ROOTn_MUX(x) ((x) << 24) -#define CCM_TARGET_ROOTn_ENABLE BIT(28) - #define CLOCK_ROOT_INDEX(x) (((x) - 0x8000) / 128) /* -- 2.17.0 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
