LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MLK-18145 imx: Fix wrong pad name prefix 

The pads name bind with CONFIG_MX6Q and CONFIG_6DL should start with MX6_PAD
not MX6Q_PAD and MX6DL_PAD. Otherwise we will get build break.

Signed-off-by: Ye Li <ye.li@nxp.com>
This commit is contained in:
Ye Li 2018-03-23 02:24:09 -07:00
parent f0f452da4b
commit be7aa84842
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/include/asm/mach-imx/iomux-v3.h
View File

@ -268,9 +268,9 @@ if (is_mx6dq() || is_mx6dqp()) { \
#define SETUP_IOMUX_PADS(x) \ #define SETUP_IOMUX_PADS(x) \
imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)/2) imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)/2)
#elif defined(CONFIG_MX6Q) #elif defined(CONFIG_MX6Q)
#define IOMUX_PADS(x) MX6Q_##x #define IOMUX_PADS(x) MX6_##x
#define SETUP_IOMUX_PAD(def) \ #define SETUP_IOMUX_PAD(def) \
imx_iomux_v3_setup_pad(MX6Q_##def); imx_iomux_v3_setup_pad(MX6_##def);
#define SETUP_IOMUX_PADS(x) \ #define SETUP_IOMUX_PADS(x) \
imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)) imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
#elif defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) #elif defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
@ -280,9 +280,9 @@ if (is_mx6dq() || is_mx6dqp()) { \
#define SETUP_IOMUX_PADS(x) \ #define SETUP_IOMUX_PADS(x) \
imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)) imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
#else #else
#define IOMUX_PADS(x) MX6DL_##x #define IOMUX_PADS(x) MX6_##x
#define SETUP_IOMUX_PAD(def) \ #define SETUP_IOMUX_PAD(def) \
imx_iomux_v3_setup_pad(MX6DL_##def); imx_iomux_v3_setup_pad(MX6_##def);
#define SETUP_IOMUX_PADS(x) \ #define SETUP_IOMUX_PADS(x) \
imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)) imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x))
#endif #endif