config: rename CONFIG_MX* to CONFIG_SOC_MX*

[karo-tx-uboot.git] / arch / arm / include / asm / arch-mxs / regs-timrot.h

diff --git a/arch/arm/include/asm/arch-mxs/regs-timrot.h b/arch/arm/include/asm/arch-mxs/regs-timrot.h
index 0ee3ec81bb7818baf41be1c01a14c2514f93bda5..b5160c9e02782da02b16397cccb34905b1c0035a 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-timrot.h
+++ b/arch/arm/include/asm/arch-mxs/regs-timrot.h
@@ -18,7 +18,7 @@
 struct mxs_timrot_regs {
        mxs_reg_32(hw_timrot_rotctrl);
        mxs_reg_32(hw_timrot_rotcount);
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
        mxs_reg_32(hw_timrot_timctrl0);
        mxs_reg_32(hw_timrot_timcount0);
        mxs_reg_32(hw_timrot_timctrl1);
@@ -27,7 +27,7 @@ struct mxs_timrot_regs {
        mxs_reg_32(hw_timrot_timcount2);
        mxs_reg_32(hw_timrot_timctrl3);
        mxs_reg_32(hw_timrot_timcount3);
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
        mxs_reg_32(hw_timrot_timctrl0);
        mxs_reg_32(hw_timrot_running_count0);
        mxs_reg_32(hw_timrot_fixed_count0);
@@ -69,9 +69,9 @@ struct mxs_timrot_regs {
 #define        TIMROT_ROTCTRL_OVERSAMPLE_1X                    (0x3 << 10)
 #define        TIMROT_ROTCTRL_POLARITY_B                       (1 << 9)
 #define        TIMROT_ROTCTRL_POLARITY_A                       (1 << 8)
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
 #define        TIMROT_ROTCTRL_SELECT_B_MASK                    (0x7 << 4)
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
 #define        TIMROT_ROTCTRL_SELECT_B_MASK                    (0xf << 4)
 #endif
 #define        TIMROT_ROTCTRL_SELECT_B_OFFSET                  4
@@ -81,19 +81,19 @@ struct mxs_timrot_regs {
 #define        TIMROT_ROTCTRL_SELECT_B_PWM2                    (0x3 << 4)
 #define        TIMROT_ROTCTRL_SELECT_B_PWM3                    (0x4 << 4)
 #define        TIMROT_ROTCTRL_SELECT_B_PWM4                    (0x5 << 4)
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
 #define        TIMROT_ROTCTRL_SELECT_B_ROTARYA         (0x6 << 4)
 #define        TIMROT_ROTCTRL_SELECT_B_ROTARYB         (0x7 << 4)
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
 #define        TIMROT_ROTCTRL_SELECT_B_PWM5                    (0x6 << 4)
 #define        TIMROT_ROTCTRL_SELECT_B_PWM6                    (0x7 << 4)
 #define        TIMROT_ROTCTRL_SELECT_B_PWM7                    (0x8 << 4)
 #define        TIMROT_ROTCTRL_SELECT_B_ROTARYA                 (0x9 << 4)
 #define        TIMROT_ROTCTRL_SELECT_B_ROTARYB                 (0xa << 4)
 #endif
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
 #define        TIMROT_ROTCTRL_SELECT_A_MASK                    0x7
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
 #define        TIMROT_ROTCTRL_SELECT_A_MASK                    0xf
 #endif
 #define        TIMROT_ROTCTRL_SELECT_A_OFFSET                  0
@@ -103,10 +103,10 @@ struct mxs_timrot_regs {
 #define        TIMROT_ROTCTRL_SELECT_A_PWM2                    0x3
 #define        TIMROT_ROTCTRL_SELECT_A_PWM3                    0x4
 #define        TIMROT_ROTCTRL_SELECT_A_PWM4                    0x5
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
 #define        TIMROT_ROTCTRL_SELECT_A_ROTARYA         0x6
 #define        TIMROT_ROTCTRL_SELECT_A_ROTARYB         0x7
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
 #define        TIMROT_ROTCTRL_SELECT_A_PWM5                    0x6
 #define        TIMROT_ROTCTRL_SELECT_A_PWM6                    0x7
 #define        TIMROT_ROTCTRL_SELECT_A_PWM7                    0x8
@@ -119,7 +119,7 @@ struct mxs_timrot_regs {
 
 #define        TIMROT_TIMCTRLn_IRQ                             (1 << 15)
 #define        TIMROT_TIMCTRLn_IRQ_EN                          (1 << 14)
-#if defined(CONFIG_MX28)
+#if defined(CONFIG_SOC_MX28)
 #define        TIMROT_TIMCTRLn_MATCH_MODE                      (1 << 11)
 #endif
 #define        TIMROT_TIMCTRLn_POLARITY                        (1 << 8)
@@ -139,7 +139,7 @@ struct mxs_timrot_regs {
 #define        TIMROT_TIMCTRLn_SELECT_PWM2                     0x3
 #define        TIMROT_TIMCTRLn_SELECT_PWM3                     0x4
 #define        TIMROT_TIMCTRLn_SELECT_PWM4                     0x5
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
 #define        TIMROT_TIMCTRLn_SELECT_ROTARYA          0x6
 #define        TIMROT_TIMCTRLn_SELECT_ROTARYB          0x7
 #define        TIMROT_TIMCTRLn_SELECT_32KHZ_XTAL               0x8
@@ -147,7 +147,7 @@ struct mxs_timrot_regs {
 #define        TIMROT_TIMCTRLn_SELECT_4KHZ_XTAL                0xa
 #define        TIMROT_TIMCTRLn_SELECT_1KHZ_XTAL                0xb
 #define        TIMROT_TIMCTRLn_SELECT_TICK_ALWAYS              0xc
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
 #define        TIMROT_TIMCTRLn_SELECT_PWM5                     0x6
 #define        TIMROT_TIMCTRLn_SELECT_PWM6                     0x7
 #define        TIMROT_TIMCTRLn_SELECT_PWM7                     0x8
@@ -160,23 +160,23 @@ struct mxs_timrot_regs {
 #define        TIMROT_TIMCTRLn_SELECT_TICK_ALWAYS              0xf
 #endif
 
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
 #define        TIMROT_RUNNING_COUNTn_RUNNING_COUNT_MASK        (0xffff << 16)
 #define        TIMROT_RUNNING_COUNTn_RUNNING_COUNT_OFFSET      16
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
 #define        TIMROT_RUNNING_COUNTn_RUNNING_COUNT_MASK        0xffffffff
 #define        TIMROT_RUNNING_COUNTn_RUNNING_COUNT_OFFSET      0
 #endif
 
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
 #define        TIMROT_FIXED_COUNTn_FIXED_COUNT_MASK            0xffff
 #define        TIMROT_FIXED_COUNTn_FIXED_COUNT_OFFSET          0
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
 #define        TIMROT_FIXED_COUNTn_FIXED_COUNT_MASK            0xffffffff
 #define        TIMROT_FIXED_COUNTn_FIXED_COUNT_OFFSET          0
 #endif
 
-#if defined(CONFIG_MX28)
+#if defined(CONFIG_SOC_MX28)
 #define        TIMROT_MATCH_COUNTn_MATCH_COUNT_MASK            0xffffffff
 #define        TIMROT_MATCH_COUNTn_MATCH_COUNT_OFFSET          0
 #endif
@@ -189,7 +189,7 @@ struct mxs_timrot_regs {
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_PWM2                (0x3 << 16)
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_PWM3                (0x4 << 16)
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_PWM4                (0x5 << 16)
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_ROTARYA             (0x6 << 16)
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_ROTARYB             (0x7 << 16)
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_32KHZ_XTAL          (0x8 << 16)
@@ -197,7 +197,7 @@ struct mxs_timrot_regs {
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_4KHZ_XTAL           (0xa << 16)
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_1KHZ_XTAL           (0xb << 16)
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_TICK_ALWAYS         (0xc << 16)
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_PWM5                (0x6 << 16)
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_PWM6                (0x7 << 16)
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_PWM7                (0x8 << 16)
@@ -209,13 +209,13 @@ struct mxs_timrot_regs {
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_1KHZ_XTAL           (0xe << 16)
 #define        TIMROT_TIMCTRL3_TEST_SIGNAL_TICK_ALWAYS         (0xf << 16)
 #endif
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
 #define        TIMROT_TIMCTRL3_IRQ                             (1 << 15)
 #define        TIMROT_TIMCTRL3_IRQ_EN                          (1 << 14)
 #define        TIMROT_TIMCTRL3_DUTU_VALID                      (1 << 10)
 #endif
 #define        TIMROT_TIMCTRL3_DUTY_CYCLE                      (1 << 9)
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
 #define        TIMROT_TIMCTRL3_POLARITY_MASK                   (0x1 << 8)
 #define        TIMROT_TIMCTRL3_POLARITY_OFFSET         8
 #define        TIMROT_TIMCTRL3_POLARITY_POSITIVE               (0x0 << 8)