Commit 6852b914779fb38bdd12995ce871c04aa286c53e
1 parent
9bd91eb645
Exists in
smarc-rel_imx_4.1.15_2.0.0_ga
Fix pinmux for SMARC-FiMX7 rev. 00B0
Showing 1 changed file with 9 additions and 8 deletions Side-by-side Diff
board/embedian/smarcfimx7/smarcfimx7.c
| ... | ... | @@ -302,13 +302,13 @@ |
| 302 | 302 | /* Misc. pins */ |
| 303 | 303 | static iomux_v3_cfg_t const misc_pads[] = { |
| 304 | 304 | MX7D_PAD_SD2_DATA0__GPIO5_IO14 | MUX_PAD_CTRL(WEAK_PULLUP), /* SLEEP# */ |
| 305 | - MX7D_PAD_ENET1_RX_CLK__GPIO7_IO13 | MUX_PAD_CTRL(WEAK_PULLUP), /* CHARGER_PRSNT# */ | |
| 305 | + MX7D_PAD_GPIO1_IO09__GPIO1_IO9 | MUX_PAD_CTRL(WEAK_PULLUP), /* CHARGER_PRSNT# */ | |
| 306 | 306 | MX7D_PAD_GPIO1_IO08__GPIO1_IO8 | MUX_PAD_CTRL(WEAK_PULLUP), /* CHARGING# */ |
| 307 | 307 | MX7D_PAD_SAI1_RX_SYNC__GPIO6_IO16 | MUX_PAD_CTRL(WEAK_PULLUP), /* CARRIER_STBY# */ |
| 308 | - MX7D_PAD_SAI1_RX_BCLK__GPIO6_IO17 | MUX_PAD_CTRL(WEAK_PULLUP), /* CARRIER_PWR_ON# */ | |
| 309 | 308 | MX7D_PAD_SD2_RESET_B__GPIO5_IO11 | MUX_PAD_CTRL(WEAK_PULLUP), /* BATLOW# */ |
| 310 | 309 | MX7D_PAD_EPDC_BDR0__GPIO2_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL), /* PCIe_RST# */ |
| 311 | 310 | MX7D_PAD_EPDC_PWR_STAT__GPIO2_IO31 | MUX_PAD_CTRL(NO_PAD_CTRL), /* PCIe_WAKE# */ |
| 311 | + MX7D_PAD_ENET1_CRS__GPIO7_IO14 | MUX_PAD_CTRL(NO_PAD_CTRL), /* WDT_TIME_OUT# */ | |
| 312 | 312 | }; |
| 313 | 313 | |
| 314 | 314 | #ifdef CONFIG_VIDEO_MXS |
| 315 | 315 | |
| ... | ... | @@ -347,10 +347,10 @@ |
| 347 | 347 | |
| 348 | 348 | static iomux_v3_cfg_t const backlight_pads[] = { |
| 349 | 349 | /* Backlight Enable for RGB: S127 */ |
| 350 | - MX7D_PAD_GPIO1_IO02__GPIO1_IO2 | MUX_PAD_CTRL(WEAK_PULLUP), | |
| 350 | + MX7D_PAD_SAI1_RX_BCLK__GPIO6_IO17 | MUX_PAD_CTRL(WEAK_PULLUP), | |
| 351 | 351 | |
| 352 | 352 | /* PWM Backlight Control: S141. Use GPIO for Brightness adjustment, duty cycle = period */ |
| 353 | - MX7D_PAD_GPIO1_IO01__GPIO1_IO1 | MUX_PAD_CTRL(NO_PAD_CTRL), | |
| 353 | + MX7D_PAD_GPIO1_IO02__GPIO1_IO2 | MUX_PAD_CTRL(NO_PAD_CTRL), | |
| 354 | 354 | }; |
| 355 | 355 | |
| 356 | 356 | void do_enable_parallel_lcd(struct display_info_t const *dev) |
| 357 | 357 | |
| ... | ... | @@ -363,10 +363,10 @@ |
| 363 | 363 | gpio_direction_output(IMX_GPIO_NR(3, 4) , 1); |
| 364 | 364 | |
| 365 | 365 | /* Turn on Backlight */ |
| 366 | - gpio_direction_output(IMX_GPIO_NR(1, 2), 1); | |
| 366 | + gpio_direction_output(IMX_GPIO_NR(6, 17), 1); | |
| 367 | 367 | |
| 368 | 368 | /* Set Brightness to high */ |
| 369 | - gpio_direction_output(IMX_GPIO_NR(1, 1) , 1); | |
| 369 | + gpio_direction_output(IMX_GPIO_NR(1, 2) , 1); | |
| 370 | 370 | } |
| 371 | 371 | |
| 372 | 372 | |
| 373 | 373 | |
| ... | ... | @@ -466,11 +466,12 @@ |
| 466 | 466 | gpio_direction_input(IMX_GPIO_NR(1, 9)); |
| 467 | 467 | gpio_direction_input(IMX_GPIO_NR(5, 11)); |
| 468 | 468 | gpio_direction_output(IMX_GPIO_NR(6, 16), 0); |
| 469 | - gpio_direction_output(IMX_GPIO_NR(6, 17), 0); | |
| 470 | 469 | gpio_direction_output(IMX_GPIO_NR(2, 28), 0); |
| 471 | 470 | udelay(500); |
| 472 | 471 | gpio_direction_output(IMX_GPIO_NR(2, 28), 1); |
| 473 | 472 | gpio_direction_input(IMX_GPIO_NR(2, 31)); |
| 473 | + /* Set WDT_TIME_OUT# as Output High */ | |
| 474 | + gpio_direction_output(IMX_GPIO_NR(7, 14), 1); | |
| 474 | 475 | } |
| 475 | 476 | |
| 476 | 477 | static void setup_iomux_flexcan1(void) |
| ... | ... | @@ -615,7 +616,7 @@ |
| 615 | 616 | gpio_direction_input(IMX_GPIO_NR(7, 15)); |
| 616 | 617 | } else { |
| 617 | 618 | imx_iomux_v3_setup_multiple_pads(fec2_pads, ARRAY_SIZE(fec2_pads)); |
| 618 | - gpio_direction_input(IMX_GPIO_NR(7, 14)); | |
| 619 | + gpio_direction_input(IMX_GPIO_NR(7, 13)); | |
| 619 | 620 | } |
| 620 | 621 | } |
| 621 | 622 |