X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=board%2Fkaro%2Ftx28%2Ftx28.c;h=b7ece9272e330ccf2df69e4927b5d05125262ca4;hp=1afd4bb19feb257e7fb3c99b6e54fe0a009ebec4;hb=24ec4dbd5a59630f8d0ede2aad560d1336e31fdd;hpb=81086b70d447344d44b579adfb25aa52cdf1ac87 diff --git a/board/karo/tx28/tx28.c b/board/karo/tx28/tx28.c index 1afd4bb19f..b7ece9272e 100644 --- a/board/karo/tx28/tx28.c +++ b/board/karo/tx28/tx28.c @@ -24,10 +24,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -37,49 +39,44 @@ DECLARE_GLOBAL_DATA_PTR; -#define MXS_GPIO_NR(p, o) (((p) << 5) | (o)) +#define TX28_LCD_PWR_GPIO MXS_PAD_TO_GPIO(MX28_PAD_LCD_ENABLE__GPIO_1_31) +#define TX28_LCD_RST_GPIO MXS_PAD_TO_GPIO(MX28_PAD_LCD_RESET__GPIO_3_30) +#define TX28_LCD_BACKLIGHT_GPIO MXS_PAD_TO_GPIO(MX28_PAD_PWM0__GPIO_3_16) -#define TX28_LCD_PWR_GPIO MX28_PAD_LCD_ENABLE__GPIO_1_31 -#define TX28_LCD_RST_GPIO MX28_PAD_LCD_RESET__GPIO_3_30 -#define TX28_LCD_BACKLIGHT_GPIO MX28_PAD_PWM0__GPIO_3_16 +#define TX28_USBH_VBUSEN_GPIO MXS_PAD_TO_GPIO(MX28_PAD_SPDIF__GPIO_3_27) +#define TX28_USBH_OC_GPIO MXS_PAD_TO_GPIO(MX28_PAD_JTAG_RTCK__GPIO_4_20) +#define TX28_USBOTG_VBUSEN_GPIO MXS_PAD_TO_GPIO(MX28_PAD_GPMI_CE2N__GPIO_0_18) +#define TX28_USBOTG_OC_GPIO MXS_PAD_TO_GPIO(MX28_PAD_GPMI_CE3N__GPIO_0_19) +#define TX28_USBOTG_ID_GPIO MXS_PAD_TO_GPIO(MX28_PAD_PWM2__GPIO_3_18) -#define TX28_USBH_VBUSEN_GPIO MX28_PAD_SPDIF__GPIO_3_27 -#define TX28_USBH_OC_GPIO MX28_PAD_JTAG_RTCK__GPIO_4_20 -#define TX28_USBOTG_VBUSEN_GPIO MX28_PAD_GPMI_CE2N__GPIO_0_18 -#define TX28_USBOTG_OC_GPIO MX28_PAD_GPMI_CE3N__GPIO_0_19 -#define TX28_USBOTG_ID_GPIO MX28_PAD_PWM2__GPIO_3_18 +#define TX28_LED_GPIO MXS_PAD_TO_GPIO(MX28_PAD_ENET0_RXD3__GPIO_4_10) -#define TX28_LED_GPIO MX28_PAD_ENET0_RXD3__GPIO_4_10 +#define STK5_CAN_XCVR_PAD MX28_PAD_LCD_D00__GPIO_1_0 +#define STK5_CAN_XCVR_GPIO MXS_PAD_TO_GPIO(STK5_CAN_XCVR_PAD) + +#define ENET_PAD_CTRL (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP) +#define GPIO_PAD_CTRL (MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_PULLUP) +#define I2C_PAD_CTRL (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_PULLUP) + +#ifndef CONFIG_CONS_INDEX +struct serial_device *default_serial_console(void) +{ + return NULL; +} +#endif static const struct gpio tx28_gpios[] = { - { TX28_USBH_VBUSEN_GPIO, GPIOF_OUTPUT_INIT_LOW, "USBH VBUSEN", }, - { TX28_USBH_OC_GPIO, GPIOF_INPUT, "USBH OC", }, - { TX28_USBOTG_VBUSEN_GPIO, GPIOF_OUTPUT_INIT_LOW, "USBOTG VBUSEN", }, - { TX28_USBOTG_OC_GPIO, GPIOF_INPUT, "USBOTG OC", }, - { TX28_USBOTG_ID_GPIO, GPIOF_INPUT, "USBOTG ID", }, + { TX28_USBH_VBUSEN_GPIO, GPIOFLAG_OUTPUT_INIT_LOW, "USBH VBUSEN", }, + { TX28_USBH_OC_GPIO, GPIOFLAG_INPUT, "USBH OC", }, + { TX28_USBOTG_VBUSEN_GPIO, GPIOFLAG_OUTPUT_INIT_LOW, "USBOTG VBUSEN", }, + { TX28_USBOTG_OC_GPIO, GPIOFLAG_INPUT, "USBOTG OC", }, + { TX28_USBOTG_ID_GPIO, GPIOFLAG_INPUT, "USBOTG ID", }, }; static const iomux_cfg_t tx28_pads[] = { - /* UART pads */ -#if CONFIG_CONS_INDEX == 0 - MX28_PAD_AUART0_RX__DUART_CTS, - MX28_PAD_AUART0_TX__DUART_RTS, - MX28_PAD_AUART0_CTS__DUART_RX, - MX28_PAD_AUART0_RTS__DUART_TX, -#elif CONFIG_CONS_INDEX == 1 - MX28_PAD_AUART1_RX__AUART1_RX, - MX28_PAD_AUART1_TX__AUART1_TX, - MX28_PAD_AUART1_CTS__AUART1_CTS, - MX28_PAD_AUART1_RTS__AUART1_RTS, -#elif CONFIG_CONS_INDEX == 2 - MX28_PAD_AUART3_RX__AUART3_RX, - MX28_PAD_AUART3_TX__AUART3_TX, - MX28_PAD_AUART3_CTS__AUART3_CTS, - MX28_PAD_AUART3_RTS__AUART3_RTS, -#endif /* I2C bus for internal DS1339, PCA9554 and on DIMM pins 40/41 */ - MX28_PAD_I2C0_SCL__I2C0_SCL, - MX28_PAD_I2C0_SDA__I2C0_SDA, + MX28_PAD_I2C0_SCL__I2C0_SCL | I2C_PAD_CTRL, + MX28_PAD_I2C0_SDA__I2C0_SDA | I2C_PAD_CTRL, /* USBH VBUSEN, OC */ MX28_PAD_SPDIF__GPIO_3_27, @@ -98,7 +95,7 @@ static const iomux_cfg_t tx28_pads[] = { /* provide at least _some_ sort of randomness */ #define MAX_LOOPS 100 -static u32 random; +static u32 random __attribute__((section("data"))); static inline void random_init(void) { @@ -107,9 +104,11 @@ static inline void random_init(void) int i; for (i = 0; i < MAX_LOOPS; i++) { - unsigned int usec = readl(&digctl_regs->hw_digctl_microseconds); + u32 hclk = readl(&digctl_regs->hw_digctl_hclkcount); + u32 entropy = readl(&digctl_regs->hw_digctl_entropy); + u32 usec = readl(&digctl_regs->hw_digctl_microseconds); - seed = get_timer(usec + random + seed); + seed = get_timer(hclk ^ entropy ^ usec ^ random ^ seed); srand(seed); random = rand(); } @@ -143,7 +142,7 @@ int board_early_init_f(void) while ((rtc_stat = readl(&rtc_regs->hw_rtc_stat)) & RTC_STAT_STALE_REGS_PERSISTENT0) { if (timeout-- < 0) - return 0; + return 1; udelay(1); } boot_cause = readl(&rtc_regs->hw_rtc_persistent0); @@ -158,11 +157,14 @@ int board_early_init_f(void) rtc_err: serial_puts("Inconsistent value in RTC_PERSISTENT0 register; power-on-reset required\n"); - return 0; + return 1; } int board_init(void) { + if (ctrlc()) + printf("CTRL-C detected; safeboot enabled\n"); + /* Address of boot parameters */ #ifdef CONFIG_OF_LIBFDT gd->bd->bi_arch_number = -1; @@ -191,7 +193,7 @@ int board_mmc_init(bd_t *bis) #ifdef CONFIG_FEC_MXC #ifdef CONFIG_GET_FEC_MAC_ADDR_FROM_IIM -#ifdef CONFIG_FEC_MXC_MULTI +#ifndef CONFIG_TX28_S #define FEC_MAX_IDX 1 #else #define FEC_MAX_IDX 0 @@ -232,7 +234,7 @@ static int fec_get_mac_addr(int index) val = readl(&cust[index * 8 + i]); mac[i] = val >> shift; } - if (!is_valid_ether_addr(mac)) { + if (!is_valid_ethaddr(mac)) { if (index == 0) printf("No valid MAC address programmed\n"); return 0; @@ -247,12 +249,72 @@ static int fec_get_mac_addr(int index) eth_setenv_enetaddr(env_name, mac); return 0; } + +static inline int tx28_fec1_enabled(void) +{ + const char *status; + int off; + + if (!gd->fdt_blob) + return 0; + + off = fdt_path_offset(gd->fdt_blob, "ethernet1"); + if (off < 0) + return 0; + + status = fdt_getprop(gd->fdt_blob, off, "status", NULL); + return status && (strcmp(status, "okay") == 0); +} + +static void tx28_init_mac(void) +{ + int ret; + + ret = fec_get_mac_addr(0); + if (ret < 0) { + printf("Failed to read FEC0 MAC address from OCOTP\n"); + return; + } +#ifdef CONFIG_TX28_S + if (tx28_fec1_enabled()) { + ret = fec_get_mac_addr(1); + if (ret < 0) { + printf("Failed to read FEC1 MAC address from OCOTP\n"); + return; + } + } +#endif +} +#else +static inline void tx28_init_mac(void) +{ +} #endif /* CONFIG_GET_FEC_MAC_ADDR_FROM_IIM */ static const iomux_cfg_t tx28_fec_pads[] = { - MX28_PAD_ENET0_RX_EN__ENET0_RX_EN, - MX28_PAD_ENET0_RXD0__ENET0_RXD0, - MX28_PAD_ENET0_RXD1__ENET0_RXD1, + MX28_PAD_ENET0_RX_EN__ENET0_RX_EN | ENET_PAD_CTRL, + MX28_PAD_ENET0_RXD0__ENET0_RXD0 | ENET_PAD_CTRL, + MX28_PAD_ENET0_RXD1__ENET0_RXD1 | ENET_PAD_CTRL, +}; + +static struct gpio tx28_fec_strap_gpios[] = { + /* first entry must be RESET pin */ + { MXS_PAD_TO_GPIO(MX28_PAD_ENET0_RX_CLK__GPIO_4_13), + GPIOFLAG_OUTPUT_INIT_LOW, "PHY Reset", }, + + { MXS_PAD_TO_GPIO(MX28_PAD_PWM4__GPIO_3_29), + GPIOFLAG_OUTPUT_INIT_HIGH, "PHY Power", }, + + /* Pull strap pins to high */ + { MXS_PAD_TO_GPIO(MX28_PAD_ENET0_RX_EN__GPIO_4_2), + GPIOFLAG_OUTPUT_INIT_HIGH, "PHY Mode0", }, + { MXS_PAD_TO_GPIO(MX28_PAD_ENET0_RXD0__GPIO_4_3), + GPIOFLAG_OUTPUT_INIT_HIGH, "PHY Mode1", }, + { MXS_PAD_TO_GPIO(MX28_PAD_ENET0_RXD1__GPIO_4_4), + GPIOFLAG_OUTPUT_INIT_HIGH, "PHY Mode2", }, + + { MXS_PAD_TO_GPIO(MX28_PAD_ENET0_TX_CLK__GPIO_4_5), + GPIOFLAG_INPUT, "PHY INT", }, }; int board_eth_init(bd_t *bis) @@ -260,19 +322,13 @@ int board_eth_init(bd_t *bis) int ret; /* Reset the external phy */ - gpio_direction_output(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 0); - - /* Power on the external phy */ - gpio_direction_output(MX28_PAD_PWM4__GPIO_3_29, 1); - - /* Pull strap pins to high */ - gpio_direction_output(MX28_PAD_ENET0_RX_EN__GPIO_4_2, 1); - gpio_direction_output(MX28_PAD_ENET0_RXD0__GPIO_4_3, 1); - gpio_direction_output(MX28_PAD_ENET0_RXD1__GPIO_4_4, 1); - gpio_direction_input(MX28_PAD_ENET0_TX_CLK__GPIO_4_5); + ret = gpio_request_array(tx28_fec_strap_gpios, + ARRAY_SIZE(tx28_fec_strap_gpios)); + if (ret) + printf("Failed to request FEC GPIOs: %d\n", ret); udelay(25000); - gpio_set_value(MX28_PAD_ENET0_RX_CLK__GPIO_4_13, 1); + gpio_set_value(tx28_fec_strap_gpios[0].gpio, 1); udelay(100); mxs_iomux_setup_multiple_pads(tx28_fec_pads, ARRAY_SIZE(tx28_fec_pads)); @@ -283,7 +339,7 @@ int board_eth_init(bd_t *bis) return ret; } -#ifdef CONFIG_FEC_MXC_MULTI +#ifndef CONFIG_TX28_S if (getenv("ethaddr")) { ret = fecmxc_initialize_multi(bis, 0, 0, MXS_ENET0_BASE); if (ret) { @@ -310,53 +366,65 @@ int board_eth_init(bd_t *bis) #endif return 0; } +#else +static inline void tx28_init_mac(void) +{ +} #endif /* CONFIG_FEC_MXC */ enum { LED_STATE_INIT = -1, LED_STATE_OFF, LED_STATE_ON, + LED_STATE_DISABLED, }; +static int led_state = LED_STATE_DISABLED; + void show_activity(int arg) { - static int led_state = LED_STATE_INIT; static ulong last; + int ret; - if (led_state == LED_STATE_INIT) { + if (led_state == LED_STATE_DISABLED) { + return; + } else if (led_state == LED_STATE_INIT) { last = get_timer(0); - gpio_set_value(TX28_LED_GPIO, 1); - led_state = LED_STATE_ON; + ret = gpio_request_one(TX28_LED_GPIO, + GPIOFLAG_OUTPUT_INIT_HIGH, "Activity"); + if (ret == 0) + led_state = LED_STATE_ON; + else + led_state = LED_STATE_DISABLED; } else { if (get_timer(last) > CONFIG_SYS_HZ) { last = get_timer(0); if (led_state == LED_STATE_ON) { gpio_set_value(TX28_LED_GPIO, 0); + led_state = LED_STATE_OFF; } else { gpio_set_value(TX28_LED_GPIO, 1); + led_state = LED_STATE_ON; } - led_state = 1 - led_state; } } } static const iomux_cfg_t stk5_pads[] = { /* SW controlled LED on STK5 baseboard */ - MX28_PAD_ENET0_RXD3__GPIO_4_10, + MX28_PAD_ENET0_RXD3__GPIO_4_10 | GPIO_PAD_CTRL, }; static const struct gpio stk5_gpios[] = { }; #ifdef CONFIG_LCD -static ushort tx28_cmap[256]; vidinfo_t panel_info = { /* set to max. size supported by SoC */ .vl_col = 1600, .vl_row = 1200, - .vl_bpix = LCD_COLOR24, /* Bits per pixel, 0: 1bpp, 1: 2bpp, 2: 4bpp, 3: 8bpp ... */ - .cmap = tx28_cmap, + .vl_bpix = LCD_COLOR32, /* Bits per pixel, 0: 1bpp, 1: 2bpp, 2: 4bpp, 3: 8bpp ... */ }; static struct fb_videomode tx28_fb_modes[] = { @@ -486,6 +554,12 @@ static struct fb_videomode tx28_fb_modes[] = { }; static int lcd_enabled = 1; +static int lcd_bl_polarity; + +static int lcd_backlight_polarity(void) +{ + return lcd_bl_polarity; +} void lcd_enable(void) { @@ -503,7 +577,8 @@ void lcd_enable(void) udelay(100); gpio_set_value(TX28_LCD_RST_GPIO, 1); udelay(300000); - gpio_set_value(TX28_LCD_BACKLIGHT_GPIO, 0); + gpio_set_value(TX28_LCD_BACKLIGHT_GPIO, + lcd_backlight_polarity()); } } @@ -515,7 +590,8 @@ void lcd_panel_disable(void) { if (lcd_enabled) { debug("Switching LCD off\n"); - gpio_set_value(TX28_LCD_BACKLIGHT_GPIO, 1); + gpio_set_value(TX28_LCD_BACKLIGHT_GPIO, + !lcd_backlight_polarity()); gpio_set_value(TX28_LCD_RST_GPIO, 0); gpio_set_value(TX28_LCD_PWR_GPIO, 0); } @@ -558,19 +634,14 @@ static const iomux_cfg_t stk5_lcd_pads[] = { MX28_PAD_LCD_WR_RWN__LCD_HSYNC | MXS_PAD_CTRL, MX28_PAD_LCD_RS__LCD_DOTCLK | MXS_PAD_CTRL, MX28_PAD_LCD_CS__LCD_CS | MXS_PAD_CTRL, - MX28_PAD_LCD_VSYNC__LCD_VSYNC | MXS_PAD_CTRL, - MX28_PAD_LCD_HSYNC__LCD_HSYNC | MXS_PAD_CTRL, - MX28_PAD_LCD_DOTCLK__LCD_DOTCLK | MXS_PAD_CTRL, }; static const struct gpio stk5_lcd_gpios[] = { - { TX28_LCD_RST_GPIO, GPIOF_OUTPUT_INIT_LOW, "LCD RESET", }, - { TX28_LCD_PWR_GPIO, GPIOF_OUTPUT_INIT_LOW, "LCD POWER", }, - { TX28_LCD_BACKLIGHT_GPIO, GPIOF_OUTPUT_INIT_HIGH, "LCD BACKLIGHT", }, + { TX28_LCD_RST_GPIO, GPIOFLAG_OUTPUT_INIT_LOW, "LCD RESET", }, + { TX28_LCD_PWR_GPIO, GPIOFLAG_OUTPUT_INIT_LOW, "LCD POWER", }, + { TX28_LCD_BACKLIGHT_GPIO, GPIOFLAG_OUTPUT_INIT_HIGH, "LCD BACKLIGHT", }, }; -extern void video_hw_init(void *lcdbase); - void lcd_ctrl_init(void *lcdbase) { int color_depth = 24; @@ -595,6 +666,7 @@ void lcd_ctrl_init(void *lcdbase) } karo_fdt_move_fdt(); + lcd_bl_polarity = karo_fdt_get_backlight_polarity(working_fdt); if (video_mode == NULL) { debug("Disabling LCD\n"); @@ -713,7 +785,7 @@ void lcd_ctrl_init(void *lcdbase) panel_info.vl_bpix = LCD_COLOR16; break; default: - panel_info.vl_bpix = LCD_COLOR24; + panel_info.vl_bpix = LCD_COLOR32; } p->pixclock = KHZ2PICOS(refresh * @@ -753,7 +825,7 @@ void lcd_ctrl_init(void *lcdbase) setenv("videomode", vmode); debug("Initializing LCD controller\n"); - video_hw_init(lcdbase); + video_hw_init(); setenv("videomode", NULL); } else { debug("Skipping initialization of LCD controller\n"); @@ -771,6 +843,7 @@ static void stk5_board_init(void) static void stk5v3_board_init(void) { + led_state = LED_STATE_INIT; stk5_board_init(); } @@ -779,45 +852,9 @@ static void stk5v5_board_init(void) stk5_board_init(); /* init flexcan transceiver enable GPIO */ - gpio_request_one(MXS_GPIO_NR(0, 1), GPIOF_OUTPUT_INIT_HIGH, + gpio_request_one(STK5_CAN_XCVR_GPIO, GPIOFLAG_OUTPUT_INIT_HIGH, "Flexcan Transceiver"); - mxs_iomux_setup_pad(MX28_PAD_LCD_D00__GPIO_1_0); -} - -int tx28_fec1_enabled(void) -{ - const char *status; - int off; - - if (!gd->fdt_blob) - return 0; - - off = fdt_path_offset(gd->fdt_blob, "ethernet1"); - if (off < 0) - return 0; - - status = fdt_getprop(gd->fdt_blob, off, "status", NULL); - return status && (strcmp(status, "okay") == 0); -} - -static void tx28_init_mac(void) -{ - int ret; - - ret = fec_get_mac_addr(0); - if (ret < 0) { - printf("Failed to read FEC0 MAC address from OCOTP\n"); - return; - } -#ifdef CONFIG_FEC_MXC_MULTI - if (tx28_fec1_enabled()) { - ret = fec_get_mac_addr(1); - if (ret < 0) { - printf("Failed to read FEC1 MAC address from OCOTP\n"); - return; - } - } -#endif + mxs_iomux_setup_pad(STK5_CAN_XCVR_PAD); } int board_late_init(void) @@ -825,7 +862,12 @@ int board_late_init(void) int ret = 0; const char *baseboard; - karo_fdt_move_fdt(); + env_cleanup(); + + if (had_ctrlc()) + setenv_ulong("safeboot", 1); + else + karo_fdt_move_fdt(); baseboard = getenv("baseboard"); if (!baseboard) @@ -853,7 +895,8 @@ int board_late_init(void) } else { printf("WARNING: Unsupported baseboard: '%s'\n", baseboard); - ret = -EINVAL; + if (!had_ctrlc()) + ret = -EINVAL; } exit: @@ -888,7 +931,8 @@ int checkboard(void) const char *dlm = ""; printf("Board: Ka-Ro TX28-4%sx%d\n", TX28_MOD_SUFFIX, - CONFIG_SDRAM_SIZE / SZ_128M); + CONFIG_SYS_SDRAM_SIZE / SZ_128M + + CONFIG_SYS_NAND_BLOCKS / 2048 * 2); printf("POWERUP Source: "); if (pwrup_src & (3 << 0)) { @@ -961,7 +1005,7 @@ static const char *tx28_touchpanels[] = { "fsl,imx28-lradc", }; -void ft_board_setup(void *blob, bd_t *bd) +int ft_board_setup(void *blob, bd_t *bd) { const char *baseboard = getenv("baseboard"); int stk5_v5 = baseboard != NULL && (strcmp(baseboard, "stk5-v5") == 0); @@ -969,9 +1013,10 @@ void ft_board_setup(void *blob, bd_t *bd) int ret; ret = fdt_increase_size(blob, 4096); - if (ret) + if (ret) { printf("Failed to increase FDT size: %s\n", fdt_strerror(ret)); - + return ret; + } #ifdef CONFIG_TX28_S /* TX28-41xx (aka TX28S) has no external RTC * and no I2C GPIO extender @@ -983,12 +1028,13 @@ void ft_board_setup(void *blob, bd_t *bd) karo_fdt_enable_node(blob, "stk5led", 0); fdt_fixup_mtdparts(blob, tx28_nand_nodes, ARRAY_SIZE(tx28_nand_nodes)); - fdt_fixup_ethernet(blob); karo_fdt_fixup_touchpanel(blob, tx28_touchpanels, ARRAY_SIZE(tx28_touchpanels)); - karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy"); + karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy", "vbus-supply"); karo_fdt_fixup_flexcan(blob, stk5_v5); karo_fdt_update_fb_mode(blob, video_mode); + + return 0; } #endif /* CONFIG_OF_BOARD_SETUP */