* [PATCH] usb-a926x: only provide the resource if the driver is enable
@ 2013-02-03 13:07 Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:17 ` [PATCH 1/1 v2] " Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 3+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-02-03 13:07 UTC (permalink / raw)
To: barebox
usefull for bootstrap for spead up
other we will wait the phy to reset as example
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/boards/usb-a926x/init.c | 42 +++++++++++++++++++++++++++++++++++---
1 file changed, 39 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c
index 6034658..7c9f999 100644
--- a/arch/arm/boards/usb-a926x/init.c
+++ b/arch/arm/boards/usb-a926x/init.c
@@ -51,6 +51,7 @@ static void usb_a9260_set_board_type(void)
armlinux_set_architecture(MACH_TYPE_USB_A9260);
}
+#if defined(CONFIG_NAND_ATMEL)
static struct atmel_nand_data nand_pdata = {
.ale = 21,
.cle = 22,
@@ -111,7 +112,11 @@ static void usb_a9260_add_device_nand(void)
at91_add_device_nand(&nand_pdata);
}
+#else
+static void usb_a9260_add_device_nand(void) {}
+#endif
+#if defined(CONFIG_DRIVER_NET_MACB)
static struct at91_ether_platform_data macb_pdata = {
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = -1,
@@ -149,6 +154,16 @@ static void usb_a9260_phy_reset(void)
AT91_RSTC_URSTEN);
}
+static void usb_a9260_add_device_eth(void)
+{
+ usb_a9260_phy_reset();
+ at91_add_device_eth(0, &macb_pdata);
+}
+#else
+static void usb_a9260_add_device_eth(void) {}
+#endif
+
+#if defined(CONFIG_DRIVER_SPI_ATMEL)
static const struct spi_board_info usb_a9263_spi_devices[] = {
{
.name = "mtd_dataflash",
@@ -191,6 +206,9 @@ static void usb_a9260_add_spi(void)
at91_add_device_spi(1, &spi_a9g20_pdata);
}
}
+#else
+static void usb_a9260_add_spi(void) {}
+#endif
#if defined(CONFIG_MCI_ATMEL)
static struct atmel_mci_platform_data __initdata usb_a9260_mci_data = {
@@ -205,6 +223,7 @@ static void usb_a9260_add_device_mci(void)
static void usb_a9260_add_device_mci(void) {}
#endif
+#if defined(CONFIG_USB_OHCI)
static struct at91_usbh_data ek_usbh_data = {
.ports = 2,
.vbus_pin = { -EINVAL, -EINVAL },
@@ -218,6 +237,15 @@ static struct at91_udc_data __initdata ek_udc_data = {
.pullup_pin = -EINVAL, /* pull-up driven by UDC */
};
+static void usb_a9260_add_device_usb(void)
+{
+ at91_add_device_usbh_ohci(&ek_usbh_data);
+}
+#else
+static void usb_a9260_add_device_usb(void) {}
+#endif
+
+#ifdef CONFIG_USB_GADGET_DRIVER_AT91
static void __init ek_add_device_udc(void)
{
if (machine_is_usb_a9260() || machine_is_usb_a9g20())
@@ -225,7 +253,11 @@ static void __init ek_add_device_udc(void)
at91_add_device_udc(&ek_udc_data);
}
+#else
+static void __init ek_add_device_udc(void) {}
+#endif
+#ifdef CONFIG_LED_GPIO
struct gpio_led led = {
.gpio = AT91_PIN_PB21,
.led = {
@@ -241,6 +273,9 @@ static void __init ek_add_led(void)
at91_set_gpio_output(led.gpio, led.active_low);
led_gpio_register(&led);
}
+#else
+static void ek_add_led(void) {}
+#endif
static int usb_a9260_mem_init(void)
{
@@ -356,11 +391,10 @@ static void usb_a9260_device_dab_mmx(void) {}
static int usb_a9260_devices_init(void)
{
usb_a9260_add_device_nand();
- usb_a9260_phy_reset();
- at91_add_device_eth(0, &macb_pdata);
usb_a9260_add_device_mci();
+ usb_a9260_add_device_eth();
usb_a9260_add_spi();
- at91_add_device_usbh_ohci(&ek_usbh_data);
+ usb_a9260_add_device_usb();
ek_add_device_udc();
ek_add_led();
ek_add_device_button();
@@ -382,6 +416,7 @@ static int usb_a9260_devices_init(void)
}
device_initcall(usb_a9260_devices_init);
+#ifndef CONFIG_CONSOLE_NONE
static int usb_a9260_console_init(void)
{
struct device_d *dev;
@@ -398,3 +433,4 @@ static int usb_a9260_console_init(void)
return 0;
}
console_initcall(usb_a9260_console_init);
+#endif
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1 v2] usb-a926x: only provide the resource if the driver is enable
2013-02-03 13:07 [PATCH] usb-a926x: only provide the resource if the driver is enable Jean-Christophe PLAGNIOL-VILLARD
@ 2013-02-03 15:17 ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-04 8:45 ` Sascha Hauer
0 siblings, 1 reply; 3+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-02-03 15:17 UTC (permalink / raw)
To: barebox
usefull for bootstrap
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
v2:
fix udc without ohci
arch/arm/boards/usb-a926x/init.c | 42 +++++++++++++++++++++++++++++++++++---
1 file changed, 39 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c
index a5beeed..0383280 100644
--- a/arch/arm/boards/usb-a926x/init.c
+++ b/arch/arm/boards/usb-a926x/init.c
@@ -51,6 +51,7 @@ static void usb_a9260_set_board_type(void)
armlinux_set_architecture(MACH_TYPE_USB_A9260);
}
+#if defined(CONFIG_NAND_ATMEL)
static struct atmel_nand_data nand_pdata = {
.ale = 21,
.cle = 22,
@@ -111,7 +112,11 @@ static void usb_a9260_add_device_nand(void)
at91_add_device_nand(&nand_pdata);
}
+#else
+static void usb_a9260_add_device_nand(void) {}
+#endif
+#if defined(CONFIG_DRIVER_NET_MACB)
static struct at91_ether_platform_data macb_pdata = {
.phy_interface = PHY_INTERFACE_MODE_RMII,
.phy_addr = -1,
@@ -149,6 +154,16 @@ static void usb_a9260_phy_reset(void)
AT91_RSTC_URSTEN);
}
+static void usb_a9260_add_device_eth(void)
+{
+ usb_a9260_phy_reset();
+ at91_add_device_eth(0, &macb_pdata);
+}
+#else
+static void usb_a9260_add_device_eth(void) {}
+#endif
+
+#if defined(CONFIG_DRIVER_SPI_ATMEL)
static const struct spi_board_info usb_a9263_spi_devices[] = {
{
.name = "mtd_dataflash",
@@ -191,6 +206,9 @@ static void usb_a9260_add_spi(void)
at91_add_device_spi(1, &spi_a9g20_pdata);
}
}
+#else
+static void usb_a9260_add_spi(void) {}
+#endif
#if defined(CONFIG_MCI_ATMEL)
static struct atmel_mci_platform_data __initdata usb_a9260_mci_data = {
@@ -205,11 +223,21 @@ static void usb_a9260_add_device_mci(void)
static void usb_a9260_add_device_mci(void) {}
#endif
+#if defined(CONFIG_USB_OHCI)
static struct at91_usbh_data ek_usbh_data = {
.ports = 2,
.vbus_pin = { -EINVAL, -EINVAL },
};
+static void usb_a9260_add_device_usb(void)
+{
+ at91_add_device_usbh_ohci(&ek_usbh_data);
+}
+#else
+static void usb_a9260_add_device_usb(void) {}
+#endif
+
+#ifdef CONFIG_USB_GADGET_DRIVER_AT91
/*
* USB Device port
*/
@@ -225,7 +253,11 @@ static void __init ek_add_device_udc(void)
at91_add_device_udc(&ek_udc_data);
}
+#else
+static void __init ek_add_device_udc(void) {}
+#endif
+#ifdef CONFIG_LED_GPIO
struct gpio_led led = {
.gpio = AT91_PIN_PB21,
.led = {
@@ -241,6 +273,9 @@ static void __init ek_add_led(void)
at91_set_gpio_output(led.gpio, led.active_low);
led_gpio_register(&led);
}
+#else
+static void ek_add_led(void) {}
+#endif
static int usb_a9260_mem_init(void)
{
@@ -356,11 +391,10 @@ static void usb_a9260_device_dab_mmx(void) {}
static int usb_a9260_devices_init(void)
{
usb_a9260_add_device_nand();
- usb_a9260_phy_reset();
- at91_add_device_eth(0, &macb_pdata);
usb_a9260_add_device_mci();
+ usb_a9260_add_device_eth();
usb_a9260_add_spi();
- at91_add_device_usbh_ohci(&ek_usbh_data);
+ usb_a9260_add_device_usb();
ek_add_device_udc();
ek_add_led();
ek_add_device_button();
@@ -382,6 +416,7 @@ static int usb_a9260_devices_init(void)
}
device_initcall(usb_a9260_devices_init);
+#ifndef CONFIG_CONSOLE_NONE
static int usb_a9260_console_init(void)
{
struct device_d *dev;
@@ -398,3 +433,4 @@ static int usb_a9260_console_init(void)
return 0;
}
console_initcall(usb_a9260_console_init);
+#endif
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1 v2] usb-a926x: only provide the resource if the driver is enable
2013-02-03 15:17 ` [PATCH 1/1 v2] " Jean-Christophe PLAGNIOL-VILLARD
@ 2013-02-04 8:45 ` Sascha Hauer
0 siblings, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2013-02-04 8:45 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
On Sun, Feb 03, 2013 at 04:17:04PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> usefull for bootstrap
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Applied, thanks
Sascha
> ---
> v2:
>
> fix udc without ohci
>
> arch/arm/boards/usb-a926x/init.c | 42 +++++++++++++++++++++++++++++++++++---
> 1 file changed, 39 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c
> index a5beeed..0383280 100644
> --- a/arch/arm/boards/usb-a926x/init.c
> +++ b/arch/arm/boards/usb-a926x/init.c
> @@ -51,6 +51,7 @@ static void usb_a9260_set_board_type(void)
> armlinux_set_architecture(MACH_TYPE_USB_A9260);
> }
>
> +#if defined(CONFIG_NAND_ATMEL)
> static struct atmel_nand_data nand_pdata = {
> .ale = 21,
> .cle = 22,
> @@ -111,7 +112,11 @@ static void usb_a9260_add_device_nand(void)
>
> at91_add_device_nand(&nand_pdata);
> }
> +#else
> +static void usb_a9260_add_device_nand(void) {}
> +#endif
>
> +#if defined(CONFIG_DRIVER_NET_MACB)
> static struct at91_ether_platform_data macb_pdata = {
> .phy_interface = PHY_INTERFACE_MODE_RMII,
> .phy_addr = -1,
> @@ -149,6 +154,16 @@ static void usb_a9260_phy_reset(void)
> AT91_RSTC_URSTEN);
> }
>
> +static void usb_a9260_add_device_eth(void)
> +{
> + usb_a9260_phy_reset();
> + at91_add_device_eth(0, &macb_pdata);
> +}
> +#else
> +static void usb_a9260_add_device_eth(void) {}
> +#endif
> +
> +#if defined(CONFIG_DRIVER_SPI_ATMEL)
> static const struct spi_board_info usb_a9263_spi_devices[] = {
> {
> .name = "mtd_dataflash",
> @@ -191,6 +206,9 @@ static void usb_a9260_add_spi(void)
> at91_add_device_spi(1, &spi_a9g20_pdata);
> }
> }
> +#else
> +static void usb_a9260_add_spi(void) {}
> +#endif
>
> #if defined(CONFIG_MCI_ATMEL)
> static struct atmel_mci_platform_data __initdata usb_a9260_mci_data = {
> @@ -205,11 +223,21 @@ static void usb_a9260_add_device_mci(void)
> static void usb_a9260_add_device_mci(void) {}
> #endif
>
> +#if defined(CONFIG_USB_OHCI)
> static struct at91_usbh_data ek_usbh_data = {
> .ports = 2,
> .vbus_pin = { -EINVAL, -EINVAL },
> };
>
> +static void usb_a9260_add_device_usb(void)
> +{
> + at91_add_device_usbh_ohci(&ek_usbh_data);
> +}
> +#else
> +static void usb_a9260_add_device_usb(void) {}
> +#endif
> +
> +#ifdef CONFIG_USB_GADGET_DRIVER_AT91
> /*
> * USB Device port
> */
> @@ -225,7 +253,11 @@ static void __init ek_add_device_udc(void)
>
> at91_add_device_udc(&ek_udc_data);
> }
> +#else
> +static void __init ek_add_device_udc(void) {}
> +#endif
>
> +#ifdef CONFIG_LED_GPIO
> struct gpio_led led = {
> .gpio = AT91_PIN_PB21,
> .led = {
> @@ -241,6 +273,9 @@ static void __init ek_add_led(void)
> at91_set_gpio_output(led.gpio, led.active_low);
> led_gpio_register(&led);
> }
> +#else
> +static void ek_add_led(void) {}
> +#endif
>
> static int usb_a9260_mem_init(void)
> {
> @@ -356,11 +391,10 @@ static void usb_a9260_device_dab_mmx(void) {}
> static int usb_a9260_devices_init(void)
> {
> usb_a9260_add_device_nand();
> - usb_a9260_phy_reset();
> - at91_add_device_eth(0, &macb_pdata);
> usb_a9260_add_device_mci();
> + usb_a9260_add_device_eth();
> usb_a9260_add_spi();
> - at91_add_device_usbh_ohci(&ek_usbh_data);
> + usb_a9260_add_device_usb();
> ek_add_device_udc();
> ek_add_led();
> ek_add_device_button();
> @@ -382,6 +416,7 @@ static int usb_a9260_devices_init(void)
> }
> device_initcall(usb_a9260_devices_init);
>
> +#ifndef CONFIG_CONSOLE_NONE
> static int usb_a9260_console_init(void)
> {
> struct device_d *dev;
> @@ -398,3 +433,4 @@ static int usb_a9260_console_init(void)
> return 0;
> }
> console_initcall(usb_a9260_console_init);
> +#endif
> --
> 1.7.10.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-04 8:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-03 13:07 [PATCH] usb-a926x: only provide the resource if the driver is enable Jean-Christophe PLAGNIOL-VILLARD
2013-02-03 15:17 ` [PATCH 1/1 v2] " Jean-Christophe PLAGNIOL-VILLARD
2013-02-04 8:45 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox