X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=board%2Fkaro%2Ftx28%2Ftx28.c;h=cf64c5392f51cc67df0680aff91536cfad329b31;hp=46f7dbfb5ebd71f6388988b42d7e99a28f8ea5f3;hb=12aeca6d4dfb76d8c1087f6fdf5a7f8e7aff0a45;hpb=bb2f8e9d9b632c3f8f4b65c7669ef1626cc03154

diff --git a/board/karo/tx28/tx28.c b/board/karo/tx28/tx28.c
index 46f7dbfb5e..cf64c5392f 100644
--- a/board/karo/tx28/tx28.c
+++ b/board/karo/tx28/tx28.c
@@ -51,6 +51,8 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define TX28_LED_GPIO		MX28_PAD_ENET0_RXD3__GPIO_4_10
 
+#define STK5_CAN_XCVR_GPIO	MX28_PAD_LCD_D00__GPIO_1_0
+
 static const struct gpio tx28_gpios[] = {
 	{ TX28_USBH_VBUSEN_GPIO, GPIOF_OUTPUT_INIT_LOW, "USBH VBUSEN", },
 	{ TX28_USBH_OC_GPIO, GPIOF_INPUT, "USBH OC", },
@@ -107,9 +109,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();
 	}
@@ -566,9 +570,6 @@ 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[] = {
@@ -788,9 +789,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, GPIOF_OUTPUT_INIT_HIGH,
 			"Flexcan Transceiver");
-	mxs_iomux_setup_pad(MX28_PAD_LCD_D00__GPIO_1_0);
+	mxs_iomux_setup_pad(STK5_CAN_XCVR_GPIO);
 }
 
 int tx28_fec1_enabled(void)
@@ -897,7 +898,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_SDRAM_SIZE / SZ_128M +
+		CONFIG_SYS_NAND_BLOCKS / 2048 * 2);
 
 	printf("POWERUP Source: ");
 	if (pwrup_src & (3 << 0)) {
@@ -996,7 +998,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 
 	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);
 }