Commit 9bd91eb64588d4eefd59bf3fc906a296d594111f
1 parent
b03fe79506
Exists in
smarc-rel_imx_4.1.15_2.0.0_ga
Pinmux fixed for rev. 00B0 i.MX7 SMARC module
Showing 4 changed files with 16 additions and 12 deletions Side-by-side Diff
board/embedian/smarcfimx7/smarcfimx7.c
| ... | ... | @@ -183,7 +183,7 @@ |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | static iomux_v3_cfg_t const wdog_pads[] = { |
| 186 | - MX7D_PAD_ENET1_RX_CLK__WDOG2_WDOG_B | MUX_PAD_CTRL(NO_PAD_CTRL), | |
| 186 | + MX7D_PAD_GPIO1_IO00__WDOG1_WDOG_B | MUX_PAD_CTRL(NO_PAD_CTRL), | |
| 187 | 187 | }; |
| 188 | 188 | |
| 189 | 189 | /* SER0/UART6 */ |
| 190 | 190 | |
| ... | ... | @@ -302,12 +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_GPIO1_IO09__GPIO1_IO9 | MUX_PAD_CTRL(WEAK_PULLUP), /* CHARGER_PRSNT# */ | |
| 305 | + MX7D_PAD_ENET1_RX_CLK__GPIO7_IO13 | 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 | 308 | MX7D_PAD_SAI1_RX_BCLK__GPIO6_IO17 | MUX_PAD_CTRL(WEAK_PULLUP), /* CARRIER_PWR_ON# */ |
| 309 | 309 | MX7D_PAD_SD2_RESET_B__GPIO5_IO11 | MUX_PAD_CTRL(WEAK_PULLUP), /* BATLOW# */ |
| 310 | 310 | MX7D_PAD_EPDC_BDR0__GPIO2_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL), /* PCIe_RST# */ |
| 311 | + MX7D_PAD_EPDC_PWR_STAT__GPIO2_IO31 | MUX_PAD_CTRL(NO_PAD_CTRL), /* PCIe_WAKE# */ | |
| 311 | 312 | }; |
| 312 | 313 | |
| 313 | 314 | #ifdef CONFIG_VIDEO_MXS |
| ... | ... | @@ -349,7 +350,7 @@ |
| 349 | 350 | MX7D_PAD_GPIO1_IO02__GPIO1_IO2 | MUX_PAD_CTRL(WEAK_PULLUP), |
| 350 | 351 | |
| 351 | 352 | /* PWM Backlight Control: S141. Use GPIO for Brightness adjustment, duty cycle = period */ |
| 352 | - MX7D_PAD_GPIO1_IO00__GPIO1_IO0 | MUX_PAD_CTRL(NO_PAD_CTRL), | |
| 353 | + MX7D_PAD_GPIO1_IO01__GPIO1_IO1 | MUX_PAD_CTRL(NO_PAD_CTRL), | |
| 353 | 354 | }; |
| 354 | 355 | |
| 355 | 356 | void do_enable_parallel_lcd(struct display_info_t const *dev) |
| 356 | 357 | |
| ... | ... | @@ -359,15 +360,13 @@ |
| 359 | 360 | imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads)); |
| 360 | 361 | |
| 361 | 362 | /* Reset LCD */ |
| 362 | - /*gpio_direction_output(IMX_GPIO_NR(3, 4) , 0); | |
| 363 | - udelay(500);*/ | |
| 364 | 363 | gpio_direction_output(IMX_GPIO_NR(3, 4) , 1); |
| 365 | 364 | |
| 366 | 365 | /* Turn on Backlight */ |
| 367 | 366 | gpio_direction_output(IMX_GPIO_NR(1, 2), 1); |
| 368 | 367 | |
| 369 | 368 | /* Set Brightness to high */ |
| 370 | - gpio_direction_output(IMX_GPIO_NR(1, 0) , 1); | |
| 369 | + gpio_direction_output(IMX_GPIO_NR(1, 1) , 1); | |
| 371 | 370 | } |
| 372 | 371 | |
| 373 | 372 | |
| ... | ... | @@ -469,6 +468,9 @@ |
| 469 | 468 | gpio_direction_output(IMX_GPIO_NR(6, 16), 0); |
| 470 | 469 | gpio_direction_output(IMX_GPIO_NR(6, 17), 0); |
| 471 | 470 | gpio_direction_output(IMX_GPIO_NR(2, 28), 0); |
| 471 | + udelay(500); | |
| 472 | + gpio_direction_output(IMX_GPIO_NR(2, 28), 1); | |
| 473 | + gpio_direction_input(IMX_GPIO_NR(2, 31)); | |
| 472 | 474 | } |
| 473 | 475 | |
| 474 | 476 | static void setup_iomux_flexcan1(void) |
| ... | ... | @@ -661,7 +663,7 @@ |
| 661 | 663 | int eeprom_mac1_read; |
| 662 | 664 | |
| 663 | 665 | /* Read Ethernet MAC address from EEPROM */ |
| 664 | - eeprom_mac1_read = smarcfimx7_read_mac_address(enet1addr); | |
| 666 | + eeprom_mac1_read = smarcfimx7_read_mac1_address(enet1addr); | |
| 665 | 667 | |
| 666 | 668 | /* |
| 667 | 669 | * MAC address not present in the environment |
board/embedian/smarcfimx7/smarcfimx7.h
| ... | ... | @@ -118,7 +118,7 @@ |
| 118 | 118 | printf("Failed to set mac address from EEPROM: %d\n", ret); |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | -int smarcfimx7_read_mac_address1(uint8_t *buf) | |
| 121 | +int smarcfimx7_read_mac1_address(uint8_t *buf) | |
| 122 | 122 | { |
| 123 | 123 | #ifdef CONFIG_SYS_I2C_EEPROM_ADDR |
| 124 | 124 | /* Read MAC address. */ |
| ... | ... | @@ -152,7 +152,7 @@ |
| 152 | 152 | uint8_t env_enet1addr[6]; |
| 153 | 153 | int ret; |
| 154 | 154 | |
| 155 | - ret = eth_getenv_enetaddr_by_index("eth1", 0, env_enet1addr); | |
| 155 | + ret = eth_getenv_enetaddr_by_index("eth", 1, env_enet1addr); | |
| 156 | 156 | if (!ret) { |
| 157 | 157 | /* |
| 158 | 158 | * There is no MAC address in the environment, so we |
drivers/video/mxsfb.c
| ... | ... | @@ -170,6 +170,11 @@ |
| 170 | 170 | { |
| 171 | 171 | struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)(panel.isaBase); |
| 172 | 172 | int timeout = 1000000; |
| 173 | + char *penv; | |
| 174 | + | |
| 175 | + penv = getenv("videomode"); | |
| 176 | + if (!penv) | |
| 177 | + return; | |
| 173 | 178 | |
| 174 | 179 | #ifdef CONFIG_MX6 |
| 175 | 180 | if (check_module_fused(MX6_MODULE_LCDIF)) |
include/configs/smarcfimx7.h
| ... | ... | @@ -184,13 +184,10 @@ |
| 184 | 184 | "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ |
| 185 | 185 | "fdt_addr=0x83000000\0" \ |
| 186 | 186 | "ethprime=FEC0\0" \ |
| 187 | - "fec.macaddr=${ethaddr}\0" \ | |
| 188 | - "fec1.macaddr=${eth1addr}\0" \ | |
| 189 | 187 | "ipaddr=192.168.1.60\0" \ |
| 190 | 188 | "boot_fdt=try\0" \ |
| 191 | 189 | "ip_dyn=yes\0" \ |
| 192 | 190 | "panel=G070VW01\0" \ |
| 193 | - "optargs= fec.macaddr=${ethaddr} fec1.macaddr=${eth1addr}\0" \ | |
| 194 | 191 | "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ |
| 195 | 192 | "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ |
| 196 | 193 | "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ |