plat/imx8x: Move pin helper macros

To pins.h where they belong.
jonasblixt · Feb 18, 2024 · 7d1f6a3 · 7d1f6a3
1 parent 2e00359
commit 7d1f6a3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/include/plat/imx8x/imx8x.h b/include/plat/imx8x/imx8x.h
@@ -17,23 +17,6 @@
 #include <plat/imx8x/sci/sci.h>
 #include <plat/imx8x/sci/sci_ipc.h>
 
-#define PADRING_IFMUX_EN_SHIFT 31
-#define PADRING_IFMUX_EN_MASK  (1U << PADRING_IFMUX_EN_SHIFT)
-#define PADRING_GP_EN_SHIFT    30
-#define PADRING_GP_EN_MASK     (1U << PADRING_GP_EN_SHIFT)
-#define PADRING_IFMUX_SHIFT    27
-#define PADRING_IFMUX_MASK     (0x7U << PADRING_IFMUX_SHIFT)
-#define PADRING_CONFIG_SHIFT   25
-#define PADRING_CONFIG_MASK    (0x3U << PADRING_CONFIG_SHIFT)
-#define PADRING_LPCONFIG_SHIFT 23
-#define PADRING_LPCONFIG_MASK  (0x3U << PADRING_LPCONFIG_SHIFT)
-#define PADRING_PULL_SHIFT     5
-#define PADRING_PULL_MASK      (0x3U << PADRING_PULL_SHIFT)
-#define PADRING_DSE_SHIFT      0
-#define PADRING_DSE_MASK       (0x7U << PADRING_DSE_SHIFT)
-
-#define IMX8X_PAD_MUX(val)     ((val << PADRING_IFMUX_SHIFT) & PADRING_IFMUX_MASK)
-
 #define UART_PAD_CTRL                                                                              \
     (PADRING_IFMUX_EN_MASK | PADRING_GP_EN_MASK | (SC_PAD_CONFIG_OUT_IN << PADRING_CONFIG_SHIFT) | \
      (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) |                                                  \

diff --git a/include/plat/imx8x/pins.h b/include/plat/imx8x/pins.h
@@ -16,6 +16,23 @@
 
 /* Defines */
 
+#define PADRING_IFMUX_EN_SHIFT             31
+#define PADRING_IFMUX_EN_MASK              (1U << PADRING_IFMUX_EN_SHIFT)
+#define PADRING_GP_EN_SHIFT                30
+#define PADRING_GP_EN_MASK                 (1U << PADRING_GP_EN_SHIFT)
+#define PADRING_IFMUX_SHIFT                27
+#define PADRING_IFMUX_MASK                 (0x7U << PADRING_IFMUX_SHIFT)
+#define PADRING_CONFIG_SHIFT               25
+#define PADRING_CONFIG_MASK                (0x3U << PADRING_CONFIG_SHIFT)
+#define PADRING_LPCONFIG_SHIFT             23
+#define PADRING_LPCONFIG_MASK              (0x3U << PADRING_LPCONFIG_SHIFT)
+#define PADRING_PULL_SHIFT                 5
+#define PADRING_PULL_MASK                  (0x3U << PADRING_PULL_SHIFT)
+#define PADRING_DSE_SHIFT                  0
+#define PADRING_DSE_MASK                   (0x7U << PADRING_DSE_SHIFT)
+
+#define IMX8X_PAD_MUX(val)                 ((val << PADRING_IFMUX_SHIFT) & PADRING_IFMUX_MASK)
+
 /*!
  * @name Pad Definitions
  */