Merge branch '2020-05-18-reduce-size-of-common.h'

[oweals/u-boot.git] / arch / arm / include / asm / arch-imx8m / clock_imx8mm.h

diff --git a/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h b/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
index 76c73edc90fd2afdbbc36072b444f7e8cc7ab786..63b14b9ca58f44808e0da602a39b66c983c4aa34 100644 (file)
--- a/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
+++ b/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h
@@ -8,6 +8,10 @@
 #ifndef _ASM_ARCH_IMX8MM_CLOCK_H
 #define _ASM_ARCH_IMX8MM_CLOCK_H
 
+#ifndef __ASSEMBLY__
+#include <linux/bitops.h>
+#endif
+
 #define PLL_1443X_RATE(_rate, _m, _p, _s, _k)                  \
        {                                                       \
                .rate   =       (_rate),                        \
@@ -19,7 +23,7 @@
 
 #define LOCK_STATUS    BIT(31)
 #define LOCK_SEL_MASK  BIT(29)
-#define CLKE_MASK      BIT(11)
+#define CLKE_MASK      BIT(13)
 #define RST_MASK       BIT(9)
 #define BYPASS_MASK    BIT(4)
 #define        MDIV_SHIFT      12
@@ -52,7 +56,109 @@ enum pll_clocks {
        ANATOP_DRAM_PLL,
 };
 
-#ifdef CONFIG_IMX8MN
+#ifdef CONFIG_IMX8MP
+enum clk_root_index {
+       ARM_A53_CLK_ROOT                = 0,
+       ARM_M7_CLK_ROOT                 = 1,
+       ML_CLK_ROOT                     = 2,
+       GPU3D_CORE_CLK_ROOT             = 3,
+       GPU3D_SHADER_CLK_ROOT           = 4,
+       GPU2D_CLK_ROOT                  = 5,
+       AUDIO_AXI_CLK_ROOT              = 6,
+       HSIO_AXI_CLK_ROOT               = 7,
+       MEDIA_ISP_CLK_ROOT              = 8,
+       MAIN_AXI_CLK_ROOT               = 16,
+       ENET_AXI_CLK_ROOT               = 17,
+       NAND_USDHC_BUS_CLK_ROOT         = 18,
+       VPU_BUS_CLK_ROOT                = 19,
+       MEDIA_AXI_CLK_ROOT              = 20,
+       MEDIA_APB_CLK_ROOT              = 21,
+       HDMI_APB_CLK_ROOT               = 22,
+       HDMI_AXI_CLK_ROOT               = 23,
+       GPU_AXI_CLK_ROOT                = 24,
+       GPU_AHB_CLK_ROOT                = 25,
+       NOC_CLK_ROOT                    = 26,
+       NOC_IO_CLK_ROOT                 = 27,
+       ML_AXI_CLK_ROOT                 = 28,
+       ML_AHB_CLK_ROOT                 = 29,
+       AHB_CLK_ROOT                    = 32,
+       IPG_CLK_ROOT                    = 33,
+       AUDIO_AHB_CLK_ROOT              = 34,
+       MIPI_DSI_ESC_RX_CLK_ROOT        = 36,
+       MEDIA_DISP2_CLK_ROOT            = 38,
+       DRAM_SEL_CFG                    = 48,
+       CORE_SEL_CFG                    = 49,
+       DRAM_ALT_CLK_ROOT               = 64,
+       DRAM_APB_CLK_ROOT               = 65,
+       VPU_G1_CLK_ROOT                 = 66,
+       VPU_G2_CLK_ROOT                 = 67,
+       CAN1_CLK_ROOT                   = 68,
+       CAN2_CLK_ROOT                   = 69,
+       PCIE_PHY_CLK_ROOT               = 71,
+       PCIE_AUX_CLK_ROOT               = 72,
+       I2C5_CLK_ROOT                   = 73,
+       I2C6_CLK_ROOT                   = 74,
+       SAI1_CLK_ROOT                   = 75,
+       SAI2_CLK_ROOT                   = 76,
+       SAI3_CLK_ROOT                   = 77,
+       SAI4_CLK_ROOT                   = 78,
+       SAI5_CLK_ROOT                   = 79,
+       SAI6_CLK_ROOT                   = 80,
+       ENET_QOS_CLK_ROOT               = 81,
+       ENET_QOS_TIMER_CLK_ROOT         = 82,
+       ENET_REF_CLK_ROOT               = 83,
+       ENET_TIMER_CLK_ROOT             = 84,
+       ENET_PHY_REF_CLK_ROOT           = 85,
+       NAND_CLK_ROOT                   = 86,
+       QSPI_CLK_ROOT                   = 87,
+       USDHC1_CLK_ROOT                 = 88,
+       USDHC2_CLK_ROOT                 = 89,
+       I2C1_CLK_ROOT                   = 90,
+       I2C2_CLK_ROOT                   = 91,
+       I2C3_CLK_ROOT                   = 92,
+       I2C4_CLK_ROOT                   = 93,
+       UART1_CLK_ROOT                  = 94,
+       UART2_CLK_ROOT                  = 95,
+       UART3_CLK_ROOT                  = 96,
+       UART4_CLK_ROOT                  = 97,
+       USB_CORE_REF_CLK_ROOT           = 98,
+       USB_PHY_REF_CLK_ROOT            = 99,
+       GIC_CLK_ROOT                    = 100,
+       ECSPI1_CLK_ROOT                 = 101,
+       ECSPI2_CLK_ROOT                 = 102,
+       PWM1_CLK_ROOT                   = 103,
+       PWM2_CLK_ROOT                   = 104,
+       PWM3_CLK_ROOT                   = 105,
+       PWM4_CLK_ROOT                   = 106,
+       GPT1_CLK_ROOT                   = 107,
+       GPT2_CLK_ROOT                   = 108,
+       GPT3_CLK_ROOT                   = 109,
+       GPT4_CLK_ROOT                   = 110,
+       GPT5_CLK_ROOT                   = 111,
+       GPT6_CLK_ROOT                   = 112,
+       TRACE_CLK_ROOT                  = 113,
+       WDOG_CLK_ROOT                   = 114,
+       WRCLK_CLK_ROOT                  = 115,
+       IPP_DO_CLKO1                    = 116,
+       IPP_DO_CLKO2                    = 117,
+       HDMI_FDCC_TST_CLK_ROOT          = 118,
+       HDMI_27M_CLK_ROOT               = 119,
+       HDMI_REF_266M_CLK_ROOT          = 120,
+       USDHC3_CLK_ROOT                 = 121,
+       MEDIA_CAM1_PIX_CLK_ROOT         = 122,
+       MEDIA_MIPI_PHY1_REF_CLK_ROOT    = 123,
+       MEDIA_DISP1_PIX_CLK_ROOT        = 124,
+       MEDIA_CAM2_PIX_CLK_ROOT         = 125,
+       MEDIA_LDB_CLK_ROOT      = 126,
+       MEMREPAIR_CLK_ROOT      = 127,
+       MEDIA_MIPI_TEST_BYTE_CLK        = 130,
+       ECSPI3_CLK_ROOT                 = 131,
+       PDM_CLK_ROOT                    = 132,
+       VPU_VC8000E_CLK_ROOT            = 133,
+       SAI7_CLK_ROOT                   = 134,
+       CLK_ROOT_MAX,
+};
+#elif defined(CONFIG_IMX8MN)
 enum clk_root_index {
        ARM_A53_CLK_ROOT                = 0,
        ARM_M7_CLK_ROOT                 = 1,
@@ -261,7 +367,8 @@ enum clk_root_src {
        EXT_CLK_2,
        EXT_CLK_3,
        EXT_CLK_4,
-       OSC_HDMI_CLK
+       OSC_HDMI_CLK,
+       ARM_A53_ALT_CLK,
 };
 
 enum clk_ccgr_index {
@@ -284,6 +391,7 @@ enum clk_ccgr_index {
        CCGR_GPT2 = 17,
        CCGR_GPT3 = 18,
        CCGR_GPT4 = 19,
+       CCGR_AAM_8MP = 20,
        CCGR_GPT5 = 20,
        CCGR_GPT6 = 21,
        CCGR_HS = 22,
@@ -315,7 +423,9 @@ enum clk_ccgr_index {
        CCGR_RAWNAND = 48,
        CCGR_RDC = 49,
        CCGR_ROM = 50,
+       CCGR_I2C5_8MP = 51,
        CCGR_SAI1 = 51,
+       CCGR_I2C6_8MP = 52,
        CCGR_SAI2 = 52,
        CCGR_SAI3 = 53,
        CCGR_SAI4 = 54,
@@ -327,13 +437,16 @@ enum clk_ccgr_index {
        CCGR_SEC_DEBUG = 60,
        CCGR_SEMA1 = 61,
        CCGR_SEMA2 = 62,
+       CCGR_IRQ_STEER_8MP = 63,
        CCGR_SIM_DISPLAY = 63,
        CCGR_SIM_ENET = 64,
        CCGR_SIM_M = 65,
        CCGR_SIM_MAIN = 66,
        CCGR_SIM_S = 67,
        CCGR_SIM_WAKEUP = 68,
+       CCGR_GPU2D_8MP = 69,
        CCGR_SIM_HSIO = 69,
+       CCGR_GPU3D_8MP = 70,
        CCGR_SIM_VPU = 70,
        CCGR_SNVS = 71,
        CCGR_TRACE = 72,
@@ -342,6 +455,7 @@ enum clk_ccgr_index {
        CCGR_UART3 = 75,
        CCGR_UART4 = 76,
        CCGR_USB_MSCALE_PL301 = 77,
+       CCGR_USB_PHY_8MP = 79,
        CCGR_GPU3D = 79,
        CCGR_USDHC1 = 81,
        CCGR_USDHC2 = 82,
@@ -361,6 +475,7 @@ enum clk_ccgr_index {
        CCGR_PLL = 97,
        CCGR_TEMP_SENSOR = 98,
        CCGR_VPUMIX_BUS = 99,
+       CCGR_SAI7 = 101,
        CCGR_GPU2D = 102,
        CCGR_MAX
 };