From: Markus Klotzbuecher Date: Tue, 21 Oct 2008 07:18:01 +0000 (+0200) Subject: Merge git://git.denx.de/u-boot into x1 X-Git-Tag: v2009.01-rc1~157 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=50bd0057ba8fceeb48533f8b1a652ccd0e170838;p=u-boot Merge git://git.denx.de/u-boot into x1 Conflicts: drivers/usb/usb_ohci.c --- 50bd0057ba8fceeb48533f8b1a652ccd0e170838 diff --cc drivers/usb/usb_ohci.c index 660b4b32ac,c1aac3382e..e03371c09a --- a/drivers/usb/usb_ohci.c +++ b/drivers/usb/usb_ohci.c @@@ -95,10 -95,9 +95,10 @@@ #else # define readl(a) (*((volatile u32 *)(a))) # define writel(a, b) (*((volatile u32 *)(b)) = ((volatile u32)a)) - #endif /* CFG_OHCI_SWAP_REG_ACCESS */ + #endif /* CONFIG_SYS_OHCI_SWAP_REG_ACCESS */ -#define min_t(type,x,y) ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) +#define min_t(type, x, y) \ + ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) #ifdef CONFIG_PCI_OHCI static struct pci_device_id ohci_pci_ids[] = { @@@ -127,10 -126,10 +127,10 @@@ static struct pci_device_id ehci_pci_id #ifdef SHOW_INFO #define info(format, arg...) printf("INFO: " format "\n", ## arg) #else -#define info(format, arg...) do {} while(0) +#define info(format, arg...) do {} while (0) #endif - #ifdef CFG_OHCI_BE_CONTROLLER + #ifdef CONFIG_SYS_OHCI_BE_CONTROLLER # define m16_swap(x) cpu_to_be16(x) # define m32_swap(x) cpu_to_be32(x) #else @@@ -1890,18 -1819,18 +1890,18 @@@ int usb_lowlevel_init(void pci_dev_t pdev; #endif - #ifdef CFG_USB_OHCI_CPU_INIT + #ifdef CONFIG_SYS_USB_OHCI_CPU_INIT /* cpu dependant init */ - if(usb_cpu_init()) + if (usb_cpu_init()) return -1; #endif - #ifdef CFG_USB_OHCI_BOARD_INIT + #ifdef CONFIG_SYS_USB_OHCI_BOARD_INIT /* board dependant init */ - if(usb_board_init()) + if (usb_board_init()) return -1; #endif - memset (&gohci, 0, sizeof (ohci_t)); + memset(&gohci, 0, sizeof(ohci_t)); /* align the storage */ if ((__u32)&ghcca[0] & 0xff) { @@@ -1965,11 -1894,14 +1965,11 @@@ return -1; } - /* FIXME this is a second HC reset; why?? */ - /* writel(gohci.hc_control = OHCI_USB_RESET, &gohci.regs->control); - wait_ms(10); */ - if (hc_start (&gohci) < 0) { - err ("can't start usb-%s", gohci.slot_name); - hc_release_ohci (&gohci); + if (hc_start(&gohci) < 0) { + err("can't start usb-%s", gohci.slot_name); + hc_release_ohci(&gohci); /* Initialization failed */ - #ifdef CFG_USB_OHCI_BOARD_INIT + #ifdef CONFIG_SYS_USB_OHCI_BOARD_INIT /* board dependant cleanup */ usb_board_stop(); #endif @@@ -1998,17 -1930,17 +1998,17 @@@ int usb_lowlevel_stop(void return 0; /* TODO release any interrupts, etc. */ /* call hc_release_ohci() here ? */ - hc_reset (&gohci); + hc_reset(&gohci); - #ifdef CFG_USB_OHCI_BOARD_INIT + #ifdef CONFIG_SYS_USB_OHCI_BOARD_INIT /* board dependant cleanup */ - if(usb_board_stop()) + if (usb_board_stop()) return -1; #endif - #ifdef CFG_USB_OHCI_CPU_INIT + #ifdef CONFIG_SYS_USB_OHCI_CPU_INIT /* cpu dependant cleanup */ - if(usb_cpu_stop()) + if (usb_cpu_stop()) return -1; #endif /* This driver is no longer initialised. It needs a new low-level