nitrogen6x: prepare for CONFIG_MX6QDL
Subsystems (3)
PATCH v2 1/2 nitrogen6x: prepare for CONFIG_MX6QDL
The next patch adds CONFIG_MX6QDL so that
errata will be enabled again.
---
v2: new patch
The macro I2C_PADS_INFO_ENTRY definition has the checkpatch output:
Macro argument reuse 'i2cnum' - possible side-effects?
for all of its arguments. Since this is a data structure macro, this does not apply.
--- board/boundary/nitrogen6x/nitrogen6x.c | 370 +++++++++++++------------ 1 file changed, 194 insertions(+), 176 deletions(-)
board/boundary/nitrogen6x/nitrogen6x.c +194 -176
@@ -57,6 +57,8 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ PAD_CTL_ODE | PAD_CTL_SRE_FAST) +#define RGB_PAD_CTRL PAD_CTL_DSE_120ohm +#define WEAK_PULLUP (PAD_CTL_PUS_100K_UP | \ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ PAD_CTL_SRE_SLOW)
@@ -67,6 +69,56 @@ DECLARE_GLOBAL_DATA_PTR;#define OUTPUT_40OHM (PAD_CTL_SPEED_MED|PAD_CTL_DSE_40ohm) +/* Prevent compiler error if gpio number 08 or 09 is used */ +#define not_octal (gp) ((((0x##gp >> 4) & 0xf) * 10) + ((0x##gp & 0xf))) + +#define _I2C_PADS_INFO_CPU (cpu, i2cnum, scl_pad, scl_bank, scl_gp, \ + sda_pad, sda_bank, sda_gp, pad_ctrl, join_io) { \ + .scl = { \ + .i2c_mode = NEW_PAD_CTRL(cpu##_PAD_##scl_pad##__##i2cnum##_SCL,\ + pad_ctrl), \ + .gpio_mode = NEW_PAD_CTRL( \ + cpu##_PAD_##scl_pad##__GPIO##scl_bank##join_io##scl_gp,\ + pad_ctrl), \ + .gp = IMX_GPIO_NR(scl_bank, not_octal(scl_gp)) \ + }, \ + .sda = { \ + .i2c_mode = NEW_PAD_CTRL(cpu##_PAD_##sda_pad##__##i2cnum##_SDA,\ + pad_ctrl), \ + .gpio_mode = NEW_PAD_CTRL( \ + cpu##_PAD_##sda_pad##__GPIO##sda_bank##join_io##sda_gp,\ + pad_ctrl), \ + .gp = IMX_GPIO_NR(sda_bank, not_octal(sda_gp)) \ + } \ +} + +#define I2C_PADS_INFO_CPU (cpu, i2cnum, scl_pad, scl_bank, scl_gp, \ + sda_pad, sda_bank, sda_gp, pad_ctrl) \ + _I2C_PADS_INFO_CPU(cpu, i2cnum, scl_pad, scl_bank, scl_gp, \ + sda_pad, sda_bank, sda_gp, pad_ctrl, _IO) + +#if defined(CONFIG_MX6QDL ) +#define I2C_PADS_INFO_ENTRY (i2cnum, scl_pad, scl_bank, scl_gp, \ + sda_pad, sda_bank, sda_gp, pad_ctrl) \ + I2C_PADS_INFO_CPU(MX6Q, i2cnum, scl_pad, scl_bank, scl_gp, \ + sda_pad, sda_bank, sda_gp, pad_ctrl), \ + I2C_PADS_INFO_CPU(MX6DL, i2cnum, scl_pad, scl_bank, scl_gp, \ + sda_pad, sda_bank, sda_gp, pad_ctrl) +#define I2C_PADS_INFO_ENTRY_SPACING 2 + +#define IOMUX_PAD_CTRL (name, pad_ctrl) \ + NEW_PAD_CTRL(MX6Q_PAD_##name, pad_ctrl), \ + NEW_PAD_CTRL(MX6DL_PAD_##name, pad_ctrl) +#else +#define I2C_PADS_INFO_ENTRY (i2cnum, scl_pad, scl_bank, scl_gp, \ + sda_pad, sda_bank, sda_gp, pad_ctrl) \ + I2C_PADS_INFO_CPU(MX6, i2cnum, scl_pad, scl_bank, scl_gp, \ + sda_pad, sda_bank, sda_gp, pad_ctrl) +#define I2C_PADS_INFO_ENTRY_SPACING 1 + +#define IOMUX_PAD_CTRL (name, pad_ctrl) NEW_PAD_CTRL(MX6_PAD_##name, pad_ctrl) +#endif +int dram_init (void ) { gd->ram_size = ((ulong )CONFIG_DDR_MB *1024 *1024 );
@@ -75,140 +127,105 @@ int dram_init(void) }static iomux_v3_cfg_t const uart1_pads[] = { -MX6_PAD_SD3_DAT6__UART1_RX_DATA |MUX_PAD_CTRL (UART_PAD_CTRL ), -MX6_PAD_SD3_DAT7__UART1_TX_DATA |MUX_PAD_CTRL (UART_PAD_CTRL ), +IOMUX_PAD_CTRL (SD3_DAT6__UART1_RX_DATA ,UART_PAD_CTRL ), +IOMUX_PAD_CTRL (SD3_DAT7__UART1_TX_DATA ,UART_PAD_CTRL ), };static iomux_v3_cfg_t const uart2_pads[] = { -MX6_PAD_EIM_D26__UART2_TX_DATA |MUX_PAD_CTRL (UART_PAD_CTRL ), -MX6_PAD_EIM_D27__UART2_RX_DATA |MUX_PAD_CTRL (UART_PAD_CTRL ), -}; - -#define PC MUX_PAD_CTRL(I2C_PAD_CTRL) - -/* I2C1, SGTL5000 */ -static struct i2c_pads_info i2c_pad_info0 = { - .scl = { - .i2c_mode =MX6_PAD_EIM_D21__I2C1_SCL |PC , - .gpio_mode =MX6_PAD_EIM_D21__GPIO3_IO21 |PC , - .gp =IMX_GPIO_NR (3 ,21 ) - }, - .sda = { - .i2c_mode =MX6_PAD_EIM_D28__I2C1_SDA |PC , - .gpio_mode =MX6_PAD_EIM_D28__GPIO3_IO28 |PC , - .gp =IMX_GPIO_NR (3 ,28 ) - } +IOMUX_PAD_CTRL (EIM_D26__UART2_TX_DATA ,UART_PAD_CTRL ), +IOMUX_PAD_CTRL (EIM_D27__UART2_RX_DATA ,UART_PAD_CTRL ), }; -/* I2C2 Camera, MIPI */ -static struct i2c_pads_info i2c_pad_info1 = { - .scl = { - .i2c_mode =MX6_PAD_KEY_COL3__I2C2_SCL |PC , - .gpio_mode =MX6_PAD_KEY_COL3__GPIO4_IO12 |PC , - .gp =IMX_GPIO_NR (4 ,12 ) - }, - .sda = { - .i2c_mode =MX6_PAD_KEY_ROW3__I2C2_SDA |PC , - .gpio_mode =MX6_PAD_KEY_ROW3__GPIO4_IO13 |PC , - .gp =IMX_GPIO_NR (4 ,13 ) - } +static struct i2c_pads_info i2c_pads[] = { +/* I2C1, SGTL5000 */ +I2C_PADS_INFO_ENTRY (I2C1 ,EIM_D21 ,3 ,21 ,EIM_D28 ,3 ,28 ,I2C_PAD_CTRL ), +/* I2C2 Camera, MIPI */ +I2C_PADS_INFO_ENTRY (I2C2 ,KEY_COL3 ,4 ,12 ,KEY_ROW3 ,4 ,13 , +I2C_PAD_CTRL ), +/* I2C3, J15 - RGB connector */ +I2C_PADS_INFO_ENTRY (I2C3 ,GPIO_5 ,1 ,05 ,GPIO_16 ,7 ,11 ,I2C_PAD_CTRL ), }; -/* I2C3, J15 - RGB connector */ -static struct i2c_pads_info i2c_pad_info2 = { - .scl = { - .i2c_mode =MX6_PAD_GPIO_5__I2C3_SCL |PC , - .gpio_mode =MX6_PAD_GPIO_5__GPIO1_IO05 |PC , - .gp =IMX_GPIO_NR (1 ,5 ) - }, - .sda = { - .i2c_mode =MX6_PAD_GPIO_16__I2C3_SDA |PC , - .gpio_mode =MX6_PAD_GPIO_16__GPIO7_IO11 |PC , - .gp =IMX_GPIO_NR (7 ,11 ) - } -}; +#define I2C_BUS_CNT 3static iomux_v3_cfg_t const usdhc2_pads[] = { -MX6_PAD_SD2_CLK__SD2_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_CMD__SD2_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT0__SD2_DATA0 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT1__SD2_DATA1 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT2__SD2_DATA2 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT3__SD2_DATA3 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD2_CLK__SD2_CLK ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD2_CMD__SD2_CMD ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD2_DAT0__SD2_DATA0 ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD2_DAT1__SD2_DATA1 ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD2_DAT2__SD2_DATA2 ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD2_DAT3__SD2_DATA3 ,USDHC_PAD_CTRL ), };static iomux_v3_cfg_t const usdhc3_pads[] = { -MX6_PAD_SD3_CLK__SD3_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD3_CMD__SD3_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD3_DAT0__SD3_DATA0 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD3_DAT1__SD3_DATA1 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD3_DAT2__SD3_DATA2 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD3_DAT3__SD3_DATA3 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD3_DAT5__GPIO7_IO00 |MUX_PAD_CTRL (NO_PAD_CTRL ),/* CD */ +IOMUX_PAD_CTRL (SD3_CLK__SD3_CLK ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD3_CMD__SD3_CMD ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD3_DAT0__SD3_DATA0 ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD3_DAT1__SD3_DATA1 ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD3_DAT2__SD3_DATA2 ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD3_DAT3__SD3_DATA3 ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD3_DAT5__GPIO7_IO00 ,NO_PAD_CTRL ),/* CD */ };static iomux_v3_cfg_t const usdhc4_pads[] = { -MX6_PAD_SD4_CLK__SD4_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD4_CMD__SD4_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD4_DAT0__SD4_DATA0 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD4_DAT1__SD4_DATA1 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD4_DAT2__SD4_DATA2 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD4_DAT3__SD4_DATA3 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_NANDF_D6__GPIO2_IO06 |MUX_PAD_CTRL (NO_PAD_CTRL ),/* CD */ +IOMUX_PAD_CTRL (SD4_CLK__SD4_CLK ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD4_CMD__SD4_CMD ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD4_DAT0__SD4_DATA0 ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD4_DAT1__SD4_DATA1 ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD4_DAT2__SD4_DATA2 ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (SD4_DAT3__SD4_DATA3 ,USDHC_PAD_CTRL ), +IOMUX_PAD_CTRL (NANDF_D6__GPIO2_IO06 ,NO_PAD_CTRL ),/* CD */ };static iomux_v3_cfg_t const enet_pads1[] = { -MX6_PAD_ENET_MDIO__ENET_MDIO |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_ENET_MDC__ENET_MDC |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_RGMII_TXC__RGMII_TXC |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_RGMII_TD0__RGMII_TD0 |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_RGMII_TD1__RGMII_TD1 |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_RGMII_TD2__RGMII_TD2 |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_RGMII_TD3__RGMII_TD3 |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_RGMII_TX_CTL__RGMII_TX_CTL |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_ENET_REF_CLK__ENET_TX_CLK |MUX_PAD_CTRL (ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (ENET_MDIO__ENET_MDIO ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (ENET_MDC__ENET_MDC ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_TXC__RGMII_TXC ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_TD0__RGMII_TD0 ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_TD1__RGMII_TD1 ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_TD2__RGMII_TD2 ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_TD3__RGMII_TD3 ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_TX_CTL__RGMII_TX_CTL ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (ENET_REF_CLK__ENET_TX_CLK ,ENET_PAD_CTRL ),/* pin 35 - 1 (PHY_AD2) on reset */ -MX6_PAD_RGMII_RXC__GPIO6_IO30 |MUX_PAD_CTRL (NO_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_RXC__GPIO6_IO30 ,NO_PAD_CTRL ),/* pin 32 - 1 - (MODE0) all */ -MX6_PAD_RGMII_RD0__GPIO6_IO25 |MUX_PAD_CTRL (NO_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_RD0__GPIO6_IO25 ,NO_PAD_CTRL ),/* pin 31 - 1 - (MODE1) all */ -MX6_PAD_RGMII_RD1__GPIO6_IO27 |MUX_PAD_CTRL (NO_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_RD1__GPIO6_IO27 ,NO_PAD_CTRL ),/* pin 28 - 1 - (MODE2) all */ -MX6_PAD_RGMII_RD2__GPIO6_IO28 |MUX_PAD_CTRL (NO_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_RD2__GPIO6_IO28 ,NO_PAD_CTRL ),/* pin 27 - 1 - (MODE3) all */ -MX6_PAD_RGMII_RD3__GPIO6_IO29 |MUX_PAD_CTRL (NO_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_RD3__GPIO6_IO29 ,NO_PAD_CTRL ),/* pin 33 - 1 - (CLK125_EN) 125Mhz clockout enabled */ -MX6_PAD_RGMII_RX_CTL__GPIO6_IO24 |MUX_PAD_CTRL (NO_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_RX_CTL__GPIO6_IO24 ,NO_PAD_CTRL ),/* pin 42 PHY nRST */ -MX6_PAD_EIM_D23__GPIO3_IO23 |MUX_PAD_CTRL (NO_PAD_CTRL ), -MX6_PAD_ENET_RXD0__GPIO1_IO27 |MUX_PAD_CTRL (NO_PAD_CTRL ), +IOMUX_PAD_CTRL (EIM_D23__GPIO3_IO23 ,NO_PAD_CTRL ), +IOMUX_PAD_CTRL (ENET_RXD0__GPIO1_IO27 ,NO_PAD_CTRL ), };static iomux_v3_cfg_t const enet_pads2[] = { -MX6_PAD_RGMII_RXC__RGMII_RXC |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_RGMII_RD0__RGMII_RD0 |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_RGMII_RD1__RGMII_RD1 |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_RGMII_RD2__RGMII_RD2 |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_RGMII_RD3__RGMII_RD3 |MUX_PAD_CTRL (ENET_PAD_CTRL ), -MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL |MUX_PAD_CTRL (ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_RXC__RGMII_RXC ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_RD0__RGMII_RD0 ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_RD1__RGMII_RD1 ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_RD2__RGMII_RD2 ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_RD3__RGMII_RD3 ,ENET_PAD_CTRL ), +IOMUX_PAD_CTRL (RGMII_RX_CTL__RGMII_RX_CTL ,ENET_PAD_CTRL ), };static iomux_v3_cfg_t const misc_pads[] = { -MX6_PAD_GPIO_1__USB_OTG_ID |MUX_PAD_CTRL (WEAK_PULLUP ), -MX6_PAD_KEY_COL4__USB_OTG_OC |MUX_PAD_CTRL (WEAK_PULLUP ), -MX6_PAD_EIM_D30__USB_H1_OC |MUX_PAD_CTRL (WEAK_PULLUP ), +IOMUX_PAD_CTRL (GPIO_1__USB_OTG_ID ,WEAK_PULLUP ), +IOMUX_PAD_CTRL (KEY_COL4__USB_OTG_OC ,WEAK_PULLUP ), +IOMUX_PAD_CTRL (EIM_D30__USB_H1_OC ,WEAK_PULLUP ),/* OTG Power enable */ -MX6_PAD_EIM_D22__GPIO3_IO22 |MUX_PAD_CTRL (OUTPUT_40OHM ), +IOMUX_PAD_CTRL (EIM_D22__GPIO3_IO22 ,OUTPUT_40OHM ), };/* wl1271 pads on nitrogen6x */ static iomux_v3_cfg_t const wl12xx_pads[] = { - (MX6_PAD_NANDF_CS1__GPIO6_IO14 & ~MUX_PAD_CTRL_MASK ) - |MUX_PAD_CTRL (WEAK_PULLDOWN ), - (MX6_PAD_NANDF_CS2__GPIO6_IO15 & ~MUX_PAD_CTRL_MASK ) - |MUX_PAD_CTRL (OUTPUT_40OHM ), - (MX6_PAD_NANDF_CS3__GPIO6_IO16 & ~MUX_PAD_CTRL_MASK ) - |MUX_PAD_CTRL (OUTPUT_40OHM ), +IOMUX_PAD_CTRL (NANDF_CS1__GPIO6_IO14 ,WEAK_PULLDOWN ), +IOMUX_PAD_CTRL (NANDF_CS2__GPIO6_IO15 ,OUTPUT_40OHM ), +IOMUX_PAD_CTRL (NANDF_CS3__GPIO6_IO16 ,OUTPUT_40OHM ), };#define WL12XX_WL_IRQ_GP IMX_GPIO_NR(6, 14)#define WL12XX_WL_ENABLE_GP IMX_GPIO_NR(6, 15)
@@ -217,17 +234,17 @@ static iomux_v3_cfg_t const wl12xx_pads[] = {/* Button assignments for J14 */ static iomux_v3_cfg_t const button_pads[] = {/* Menu */ -MX6_PAD_NANDF_D1__GPIO2_IO01 |MUX_PAD_CTRL (BUTTON_PAD_CTRL ), +IOMUX_PAD_CTRL (NANDF_D1__GPIO2_IO01 ,BUTTON_PAD_CTRL ),/* Back */ -MX6_PAD_NANDF_D2__GPIO2_IO02 |MUX_PAD_CTRL (BUTTON_PAD_CTRL ), +IOMUX_PAD_CTRL (NANDF_D2__GPIO2_IO02 ,BUTTON_PAD_CTRL ),/* Labelled Search (mapped to Power under Android) */ -MX6_PAD_NANDF_D3__GPIO2_IO03 |MUX_PAD_CTRL (BUTTON_PAD_CTRL ), +IOMUX_PAD_CTRL (NANDF_D3__GPIO2_IO03 ,BUTTON_PAD_CTRL ),/* Home */ -MX6_PAD_NANDF_D4__GPIO2_IO04 |MUX_PAD_CTRL (BUTTON_PAD_CTRL ), +IOMUX_PAD_CTRL (NANDF_D4__GPIO2_IO04 ,BUTTON_PAD_CTRL ),/* Volume Down */ -MX6_PAD_GPIO_19__GPIO4_IO05 |MUX_PAD_CTRL (BUTTON_PAD_CTRL ), +IOMUX_PAD_CTRL (GPIO_19__GPIO4_IO05 ,BUTTON_PAD_CTRL ),/* Volume Up */ -MX6_PAD_GPIO_18__GPIO7_IO13 |MUX_PAD_CTRL (BUTTON_PAD_CTRL ), +IOMUX_PAD_CTRL (GPIO_18__GPIO7_IO13 ,BUTTON_PAD_CTRL ), };static void setup_iomux_enet (void )
@@ -239,7 +256,7 @@ static void setup_iomux_enet(void)gpio_direction_output (IMX_GPIO_NR (6 ,27 ),1 );gpio_direction_output (IMX_GPIO_NR (6 ,28 ),1 );gpio_direction_output (IMX_GPIO_NR (6 ,29 ),1 ); -imx_iomux_v3_setup_multiple_pads (enet_pads1,ARRAY_SIZE (enet_pads1)); +SETUP_IOMUX_PADS (enet_pads1);gpio_direction_output (IMX_GPIO_NR (6 ,24 ),1 );/* Need delay 10ms according to KSZ9021 spec */
@@ -247,24 +264,24 @@ static void setup_iomux_enet(void)gpio_set_value (IMX_GPIO_NR (3 ,23 ),1 );/* SABRE Lite PHY reset */ gpio_set_value (IMX_GPIO_NR (1 ,27 ),1 );/* Nitrogen6X PHY reset */ -imx_iomux_v3_setup_multiple_pads (enet_pads2,ARRAY_SIZE (enet_pads2)); +SETUP_IOMUX_PADS (enet_pads2);udelay (100 );/* Wait 100 us before using mii interface */ }static iomux_v3_cfg_t const usb_pads[] = { -MX6_PAD_GPIO_17__GPIO7_IO12 |MUX_PAD_CTRL (NO_PAD_CTRL ), +IOMUX_PAD_CTRL (GPIO_17__GPIO7_IO12 ,NO_PAD_CTRL ), };static void setup_iomux_uart (void ) { -imx_iomux_v3_setup_multiple_pads (uart1_pads,ARRAY_SIZE (uart1_pads)); -imx_iomux_v3_setup_multiple_pads (uart2_pads,ARRAY_SIZE (uart2_pads)); +SETUP_IOMUX_PADS (uart1_pads); +SETUP_IOMUX_PADS (uart2_pads); }#ifdef CONFIG_USB_EHCI_MX6 int board_ehci_hcd_init (int port) { -imx_iomux_v3_setup_multiple_pads (usb_pads,ARRAY_SIZE (usb_pads)); +SETUP_IOMUX_PADS (usb_pads);/* Reset USB hub */ gpio_direction_output (IMX_GPIO_NR (7 ,12 ),0 );
@@ -314,12 +331,10 @@ int board_mmc_init(bd_t *bis)for (index =0 ; index <CONFIG_SYS_FSL_USDHC_NUM ; ++index) {switch (index) {case 0 : -imx_iomux_v3_setup_multiple_pads ( - usdhc3_pads,ARRAY_SIZE (usdhc3_pads)); +SETUP_IOMUX_PADS (usdhc3_pads);break ;case 1 : -imx_iomux_v3_setup_multiple_pads ( - usdhc4_pads,ARRAY_SIZE (usdhc4_pads)); +SETUP_IOMUX_PADS (usdhc4_pads);break ;default : printf("Warning: you configured more USDHC controllers"
@@ -345,16 +360,15 @@ int board_spi_cs_gpio(unsigned bus, unsigned cs)static iomux_v3_cfg_t const ecspi1_pads[] = {/* SS1 */ -MX6_PAD_EIM_D19__GPIO3_IO19 |MUX_PAD_CTRL (NO_PAD_CTRL ), -MX6_PAD_EIM_D17__ECSPI1_MISO |MUX_PAD_CTRL (SPI_PAD_CTRL ), -MX6_PAD_EIM_D18__ECSPI1_MOSI |MUX_PAD_CTRL (SPI_PAD_CTRL ), -MX6_PAD_EIM_D16__ECSPI1_SCLK |MUX_PAD_CTRL (SPI_PAD_CTRL ), +IOMUX_PAD_CTRL (EIM_D19__GPIO3_IO19 ,NO_PAD_CTRL ), +IOMUX_PAD_CTRL (EIM_D17__ECSPI1_MISO ,SPI_PAD_CTRL ), +IOMUX_PAD_CTRL (EIM_D18__ECSPI1_MOSI ,SPI_PAD_CTRL ), +IOMUX_PAD_CTRL (EIM_D16__ECSPI1_SCLK ,SPI_PAD_CTRL ), };static void setup_spi (void ) { -imx_iomux_v3_setup_multiple_pads (ecspi1_pads, -ARRAY_SIZE (ecspi1_pads)); +SETUP_IOMUX_PADS (ecspi1_pads); }#endif
@@ -424,52 +438,51 @@ free_bus:static void setup_buttons (void ) { -imx_iomux_v3_setup_multiple_pads (button_pads, -ARRAY_SIZE (button_pads)); +SETUP_IOMUX_PADS (button_pads); }#if defined(CONFIG_VIDEO_IPUV3 )static iomux_v3_cfg_t const backlight_pads[] = {/* Backlight on RGB connector: J15 */ -MX6_PAD_SD1_DAT3__GPIO1_IO21 |MUX_PAD_CTRL (NO_PAD_CTRL ), +IOMUX_PAD_CTRL (SD1_DAT3__GPIO1_IO21 ,NO_PAD_CTRL ), #define RGB_BACKLIGHT_GP IMX_GPIO_NR(1, 21)/* Backlight on LVDS connector: J6 */ -MX6_PAD_SD1_CMD__GPIO1_IO18 |MUX_PAD_CTRL (NO_PAD_CTRL ), +IOMUX_PAD_CTRL (SD1_CMD__GPIO1_IO18 ,NO_PAD_CTRL ), #define LVDS_BACKLIGHT_GP IMX_GPIO_NR(1, 18) };static iomux_v3_cfg_t const rgb_pads[] = { -MX6_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK , -MX6_PAD_DI0_PIN15__IPU1_DI0_PIN15 , -MX6_PAD_DI0_PIN2__IPU1_DI0_PIN02 , -MX6_PAD_DI0_PIN3__IPU1_DI0_PIN03 , -MX6_PAD_DI0_PIN4__GPIO4_IO20 , -MX6_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 , -MX6_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 , -MX6_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 , -MX6_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 , -MX6_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 , -MX6_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 , -MX6_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 , -MX6_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 , -MX6_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 , -MX6_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 , -MX6_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 , -MX6_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 , -MX6_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 , -MX6_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 , -MX6_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 , -MX6_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 , -MX6_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 , -MX6_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 , -MX6_PAD_DISP0_DAT18__IPU1_DISP0_DATA18 , -MX6_PAD_DISP0_DAT19__IPU1_DISP0_DATA19 , -MX6_PAD_DISP0_DAT20__IPU1_DISP0_DATA20 , -MX6_PAD_DISP0_DAT21__IPU1_DISP0_DATA21 , -MX6_PAD_DISP0_DAT22__IPU1_DISP0_DATA22 , -MX6_PAD_DISP0_DAT23__IPU1_DISP0_DATA23 , +IOMUX_PAD_CTRL (DI0_DISP_CLK__IPU1_DI0_DISP_CLK ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DI0_PIN15__IPU1_DI0_PIN15 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DI0_PIN2__IPU1_DI0_PIN02 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DI0_PIN3__IPU1_DI0_PIN03 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DI0_PIN4__GPIO4_IO20 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT0__IPU1_DISP0_DATA00 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT1__IPU1_DISP0_DATA01 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT2__IPU1_DISP0_DATA02 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT3__IPU1_DISP0_DATA03 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT4__IPU1_DISP0_DATA04 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT5__IPU1_DISP0_DATA05 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT6__IPU1_DISP0_DATA06 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT7__IPU1_DISP0_DATA07 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT8__IPU1_DISP0_DATA08 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT9__IPU1_DISP0_DATA09 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT10__IPU1_DISP0_DATA10 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT11__IPU1_DISP0_DATA11 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT12__IPU1_DISP0_DATA12 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT13__IPU1_DISP0_DATA13 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT14__IPU1_DISP0_DATA14 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT15__IPU1_DISP0_DATA15 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT16__IPU1_DISP0_DATA16 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT17__IPU1_DISP0_DATA17 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT18__IPU1_DISP0_DATA18 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT19__IPU1_DISP0_DATA19 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT20__IPU1_DISP0_DATA20 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT21__IPU1_DISP0_DATA21 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT22__IPU1_DISP0_DATA22 ,RGB_PAD_CTRL ), +IOMUX_PAD_CTRL (DISP0_DAT23__IPU1_DISP0_DATA23 ,RGB_PAD_CTRL ), };static void do_enable_hdmi (struct display_info_t const *dev)
@@ -507,9 +520,7 @@ static void enable_lvds_jeida(struct display_info_t const *dev)static void enable_rgb (struct display_info_t const *dev) { -imx_iomux_v3_setup_multiple_pads ( - rgb_pads, -ARRAY_SIZE (rgb_pads)); +SETUP_IOMUX_PADS (rgb_pads);gpio_direction_output (RGB_BACKLIGHT_GP ,1 ); }
@@ -810,8 +821,7 @@ static void setup_display(void)writel (reg, &iomux->gpr[3 ]);/* backlights off until needed */ -imx_iomux_v3_setup_multiple_pads (backlight_pads, -ARRAY_SIZE (backlight_pads)); +SETUP_IOMUX_PADS (backlight_pads);gpio_direction_input (LVDS_BACKLIGHT_GP );gpio_direction_input (RGB_BACKLIGHT_GP ); }
@@ -819,24 +829,24 @@ static void setup_display(void)static iomux_v3_cfg_t const init_pads[] = {/* SGTL5000 sys_mclk */ -NEW_PAD_CTRL (MX6_PAD_GPIO_0__CCM_CLKO1 ,OUTPUT_40OHM ), +IOMUX_PAD_CTRL (GPIO_0__CCM_CLKO1 ,OUTPUT_40OHM ),/* J5 - Camera MCLK */ -NEW_PAD_CTRL (MX6_PAD_GPIO_3__CCM_CLKO2 ,OUTPUT_40OHM ), +IOMUX_PAD_CTRL (GPIO_3__CCM_CLKO2 ,OUTPUT_40OHM ),/* wl1271 pads on nitrogen6x */ /* WL12XX_WL_IRQ_GP */ -NEW_PAD_CTRL (MX6_PAD_NANDF_CS1__GPIO6_IO14 ,WEAK_PULLDOWN ), +IOMUX_PAD_CTRL (NANDF_CS1__GPIO6_IO14 ,WEAK_PULLDOWN ),/* WL12XX_WL_ENABLE_GP */ -NEW_PAD_CTRL (MX6_PAD_NANDF_CS2__GPIO6_IO15 ,OUTPUT_40OHM ), +IOMUX_PAD_CTRL (NANDF_CS2__GPIO6_IO15 ,OUTPUT_40OHM ),/* WL12XX_BT_ENABLE_GP */ -NEW_PAD_CTRL (MX6_PAD_NANDF_CS3__GPIO6_IO16 ,OUTPUT_40OHM ), +IOMUX_PAD_CTRL (NANDF_CS3__GPIO6_IO16 ,OUTPUT_40OHM ),/* USB otg power */ -NEW_PAD_CTRL (MX6_PAD_EIM_D22__GPIO3_IO22 ,OUTPUT_40OHM ), -NEW_PAD_CTRL (MX6_PAD_NANDF_D5__GPIO2_IO05 ,OUTPUT_40OHM ), -NEW_PAD_CTRL (MX6_PAD_NANDF_WP_B__GPIO6_IO09 ,OUTPUT_40OHM ), -NEW_PAD_CTRL (MX6_PAD_GPIO_8__GPIO1_IO08 ,OUTPUT_40OHM ), -NEW_PAD_CTRL (MX6_PAD_GPIO_6__GPIO1_IO06 ,OUTPUT_40OHM ), +IOMUX_PAD_CTRL (EIM_D22__GPIO3_IO22 ,OUTPUT_40OHM ), +IOMUX_PAD_CTRL (NANDF_D5__GPIO2_IO05 ,OUTPUT_40OHM ), +IOMUX_PAD_CTRL (NANDF_WP_B__GPIO6_IO09 ,OUTPUT_40OHM ), +IOMUX_PAD_CTRL (GPIO_8__GPIO1_IO08 ,OUTPUT_40OHM ), +IOMUX_PAD_CTRL (GPIO_6__GPIO1_IO06 ,OUTPUT_40OHM ), };#define WL12XX_WL_IRQ_GP IMX_GPIO_NR(6, 14)
@@ -871,8 +881,8 @@ int board_early_init_f(void)set_gpios (gpios_out_low,ARRAY_SIZE (gpios_out_low),0 );gpio_direction_input (WL12XX_WL_IRQ_GP ); -imx_iomux_v3_setup_multiple_pads (wl12xx_pads,ARRAY_SIZE (wl12xx_pads)); -imx_iomux_v3_setup_multiple_pads (init_pads,ARRAY_SIZE (init_pads)); +SETUP_IOMUX_PADS (wl12xx_pads); +SETUP_IOMUX_PADS (init_pads);setup_buttons ();#if defined(CONFIG_VIDEO_IPUV3 )
@@ -893,12 +903,20 @@ int overwrite_console(void)int board_init (void ) {struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR ; +struct i2c_pads_info *p = i2c_pads; +int i; +int stride =1 ; +#if defined(CONFIG_MX6QDL ) + stride =2 ; +if (!is_mx6dq () && !is_mx6dqp ()) + p +=1 ; +#endif clrsetbits_le32 (&iomuxc_regs->gpr[1 ],IOMUXC_GPR1_OTG_ID_MASK ,IOMUXC_GPR1_OTG_ID_GPIO1 ); -imx_iomux_v3_setup_multiple_pads (misc_pads,ARRAY_SIZE (misc_pads)); +SETUP_IOMUX_PADS (misc_pads);/* address of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ;
@@ -906,11 +924,11 @@ int board_init(void)#ifdef CONFIG_MXC_SPI setup_spi ();#endif -imx_iomux_v3_setup_multiple_pads ( - usdhc2_pads,ARRAY_SIZE (usdhc2_pads)); -setup_i2c (0 ,CONFIG_SYS_I2C_SPEED ,0x7f , &i2c_pad_info0); -setup_i2c (1 ,CONFIG_SYS_I2C_SPEED ,0x7f , &i2c_pad_info1); -setup_i2c (2 ,CONFIG_SYS_I2C_SPEED ,0x7f , &i2c_pad_info2); +SETUP_IOMUX_PADS (usdhc2_pads); +for (i =0 ; i <I2C_BUS_CNT ; i++) { +setup_i2c (i,CONFIG_SYS_I2C_SPEED ,0x7f , p); + p += stride; + }#ifdef CONFIG_SATA setup_sata ();
Signature · 1 line
2.18.0
PATCH v2 2/2 ARM: i.MX6: TARGET_NITROGEN6X: add 'select MX6QDL'
This fixes commit <91435cd40d30> "ARM: i.MX6: exclude the ARM errata
from i.MX6 UP system"
for nitrogen6x. The above commit removed the errata for the board since MX6Q/MXDL/MX6S is selected via CONFIG_SYS_EXTRA_OPTIONS
This restores the errata configs.
---
Note:
marsboard, mx6qarm2, seem to have same problem.
v2: unchanged
--- arch/arm/mach-imx/mx6/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-imx/mx6/Kconfig +1 -0
@@ -417,6 +417,7 @@ config TARGET_NITROGEN6X imply USB_ETHER_MCS7830 imply USB_ETHER_SMSC95XX imply USB_HOST_ETHER + select MX6QDL config TARGET_OPOS6ULDEV bool "Armadeus OPOS6ULDev board"
Signature · 1 line
2.18.0
PATCH v2 2/2 ARM: i.MX6: TARGET_NITROGEN6X: add 'select MX6QDL'
Quoted 25 lines · Troy Kisky
This fixes commit <
91435cd40d30> "ARM: i.MX6: exclude the ARM errata
from i.MX6 UP system"for nitrogen6x. The above commit removed the errata for the board since MX6Q/MXDL/MX6S is selected via
CONFIG_SYS_EXTRA_OPTIONSThis restores the errata configs.
Signed-off-by Troy Kisky <[email protected]>---
Note:
marsboard, mx6qarm2, seem to have same problem.v2: unchanged
--- arch/arm/mach-imx/mx6/Kconfig | 1 + 1 file changed, 1 insertion(+)arch/arm/mach-imx/mx6/Kconfig +0
-0
arch/arm/mach-imx/mx6/Kconfig config TARGET_NITROGEN6X · line 423
Quoted 7 lines
arch/arm/mach-imx/mx6/Kconfig +1
-0@@ -417,6 +417,7 @@ config TARGET_NITROGEN6X imply USB_ETHER_MCS7830 imply USB_ETHER_SMSC95XX imply USB_HOST_ETHER + select MX6QDL config TARGET_OPOS6ULDEV bool "Armadeus OPOS6ULDev board"
Could these two be applied for 2020.01?
Thanks
Troy
Fabio Estevam
reviewerPATCH v2 2/2 ARM: i.MX6: TARGET_NITROGEN6X: add 'select MX6QDL'
In reply to Troy KiskyQuoted 10 lines · Troy Kisky
This fixes commit <
91435cd40d30> "ARM: i.MX6: exclude the ARM errata
from i.MX6 UP system"for nitrogen6x. The above commit removed the errata for the board since MX6Q/MXDL/MX6S is selected via
CONFIG_SYS_EXTRA_OPTIONSThis restores the errata configs.
Signed-off-by Troy Kisky <[email protected]>
PATCH v2 2/2 ARM: i.MX6: TARGET_NITROGEN6X: add 'select MX6QDL'
In reply to Troy KiskyQuoted 7 lines
This fixes commit <
91435cd40d30> "ARM: i.MX6: exclude the ARM errata
from i.MX6 UP system"
for nitrogen6x. The above commit removed the errata for the board since MX6Q/MXDL/MX6S is selected viaCONFIG_SYS_EXTRA_OPTIONSThis restores the errata configs.Signed-off-by Troy Kisky <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v2 1/2 nitrogen6x: prepare for CONFIG_MX6QDL
In reply to Troy KiskyQuoted 3 lines
The next patch adds
CONFIG_MX6QDLso that
errata will be enabled again.Signed-off-by Troy Kisky <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================