KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: move USB host device support into a separate file

Browse source 
SVN-Revision: 18940
This commit is contained in:
Gabor Juhos 2009-12-26 14:19:13 +00:00
parent a93033d354
commit 6ee4aa34ed
21 changed files with 220 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
target/linux/ar71xx/config-2.6.30
View file

@ -10,6 +10,7 @@ CONFIG_AR71XX_DEV_GPIO_BUTTONS=y
CONFIG_AR71XX_DEV_LEDS_GPIO=y
CONFIG_AR71XX_DEV_M25P80=y
CONFIG_AR71XX_DEV_PB42_PCI=y
CONFIG_AR71XX_DEV_USB=y
CONFIG_AR71XX_MACH_AP81=y
CONFIG_AR71XX_MACH_AP83=y
CONFIG_AR71XX_MACH_AW_NR580=y

1
target/linux/ar71xx/config-2.6.31
View file

@ -12,6 +12,7 @@ CONFIG_AR71XX_DEV_GPIO_BUTTONS=y
CONFIG_AR71XX_DEV_LEDS_GPIO=y
CONFIG_AR71XX_DEV_M25P80=y
CONFIG_AR71XX_DEV_PB42_PCI=y
CONFIG_AR71XX_DEV_USB=y
CONFIG_AR71XX_MACH_AP81=y
CONFIG_AR71XX_MACH_AP83=y
CONFIG_AR71XX_MACH_AW_NR580=y

1
target/linux/ar71xx/config-2.6.32
View file

@ -12,6 +12,7 @@ CONFIG_AR71XX_DEV_GPIO_BUTTONS=y
CONFIG_AR71XX_DEV_LEDS_GPIO=y
CONFIG_AR71XX_DEV_M25P80=y
CONFIG_AR71XX_DEV_PB42_PCI=y
CONFIG_AR71XX_DEV_USB=y
CONFIG_AR71XX_MACH_AP81=y
CONFIG_AR71XX_MACH_AP83=y
CONFIG_AR71XX_MACH_AW_NR580=y

14
target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
View file

@ -8,6 +8,7 @@ config AR71XX_MACH_AP81
select AR71XX_DEV_AR913X_WMAC
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_LEDS_GPIO
select AR71XX_DEV_USB
default y
config AR71XX_MACH_AP83
@ -15,6 +16,7 @@ config AR71XX_MACH_AP83
select AR71XX_DEV_AR913X_WMAC
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_LEDS_GPIO
select AR71XX_DEV_USB
default y
config AR71XX_MACH_DIR_615_C1
@ -31,6 +33,7 @@ config AR71XX_MACH_DIR_825_B1
select AR71XX_DEV_AP94_PCI if PCI
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_LEDS_GPIO
select AR71XX_DEV_USB
default y
config AR71XX_MACH_PB42
@ -45,6 +48,7 @@ config AR71XX_MACH_PB44
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_PB42_PCI if PCI
select AR71XX_DEV_LEDS_GPIO
select AR71XX_DEV_USB
default y
config AR71XX_MACH_AW_NR580
@ -66,6 +70,7 @@ config AR71XX_MACH_WP543
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_PB42_PCI if PCI
select AR71XX_DEV_LEDS_GPIO
select AR71XX_DEV_USB
default y
config AR71XX_MACH_WRT160NL
@ -74,6 +79,7 @@ config AR71XX_MACH_WRT160NL
select AR71XX_DEV_AR913X_WMAC
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_LEDS_GPIO
select AR71XX_DEV_USB
default y
config AR71XX_MACH_WRT400N
@ -87,6 +93,7 @@ config AR71XX_MACH_RB_4XX
bool "MikroTik RouterBOARD 4xx series support"
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_LEDS_GPIO
select AR71XX_DEV_USB
default y
config AR71XX_MACH_WNDR3700
@ -95,6 +102,7 @@ config AR71XX_MACH_WNDR3700
select AR71XX_DEV_AP94_PCI if PCI
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_LEDS_GPIO
select AR71XX_DEV_USB
default y
config AR71XX_MACH_WNR2000
@ -111,6 +119,7 @@ config AR71XX_MACH_MZK_W04NU
select AR71XX_DEV_AR913X_WMAC
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_LEDS_GPIO
select AR71XX_DEV_USB
default y
config AR71XX_MACH_MZK_W300NH
@ -151,6 +160,7 @@ config AR71XX_MACH_TL_WR1043ND
select AR71XX_DEV_AR913X_WMAC
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_LEDS_GPIO
select AR71XX_DEV_USB
default y
config AR71XX_MACH_TEW_632BRP
@ -168,6 +178,7 @@ config AR71XX_MACH_UBNT
select AR71XX_DEV_GPIO_BUTTONS
select AR71XX_DEV_LEDS_GPIO
select AR71XX_DEV_PB42_PCI if PCI
select AR71XX_DEV_USB
default y
endmenu
@ -193,4 +204,7 @@ config AR71XX_DEV_LEDS_GPIO
config AR71XX_DEV_PB42_PCI
def_bool n
config AR71XX_DEV_USB
def_bool n
endif

1
target/linux/ar71xx/files/arch/mips/ar71xx/Makefile
View file

@ -20,6 +20,7 @@ obj-$(CONFIG_AR71XX_DEV_GPIO_BUTTONS) += dev-gpio-buttons.o
obj-$(CONFIG_AR71XX_DEV_LEDS_GPIO) += dev-leds-gpio.o
obj-$(CONFIG_AR71XX_DEV_M25P80) += dev-m25p80.o
obj-$(CONFIG_AR71XX_DEV_PB42_PCI) += dev-pb42-pci.o
obj-$(CONFIG_AR71XX_DEV_USB) += dev-usb.o
obj-$(CONFIG_AR71XX_MACH_AP81) += mach-ap81.o
obj-$(CONFIG_AR71XX_MACH_AP83) += mach-ap83.o

173
target/linux/ar71xx/files/arch/mips/ar71xx/dev-usb.c Normal file
View file

@ -0,0 +1,173 @@
/*
* Atheros AR71xx USB host device support
*
* Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
* Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
*
* Parts of this file are based on Atheros' 2.6.15 BSP
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*/
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h>
#include <asm/mach-ar71xx/ar71xx.h>
#include <asm/mach-ar71xx/platform.h>
#include "dev-usb.h"
/*
* OHCI (USB full speed host controller)
*/
static struct resource ar71xx_ohci_resources[] = {
[0] = {
.start = AR71XX_OHCI_BASE,
.end = AR71XX_OHCI_BASE + AR71XX_OHCI_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AR71XX_MISC_IRQ_OHCI,
.end = AR71XX_MISC_IRQ_OHCI,
.flags = IORESOURCE_IRQ,
},
};
static struct resource ar7240_ohci_resources[] = {
[0] = {
.start = AR7240_OHCI_BASE,
.end = AR7240_OHCI_BASE + AR7240_OHCI_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AR71XX_CPU_IRQ_USB,
.end = AR71XX_CPU_IRQ_USB,
.flags = IORESOURCE_IRQ,
},
};
static u64 ar71xx_ohci_dmamask = DMA_BIT_MASK(32);
static struct platform_device ar71xx_ohci_device = {
.name = "ar71xx-ohci",
.id = -1,
.resource = ar71xx_ohci_resources,
.num_resources = ARRAY_SIZE(ar71xx_ohci_resources),
.dev = {
.dma_mask = &ar71xx_ohci_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
},
};
/*
* EHCI (USB full speed host controller)
*/
static struct resource ar71xx_ehci_resources[] = {
[0] = {
.start = AR71XX_EHCI_BASE,
.end = AR71XX_EHCI_BASE + AR71XX_EHCI_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AR71XX_CPU_IRQ_USB,
.end = AR71XX_CPU_IRQ_USB,
.flags = IORESOURCE_IRQ,
},
};
static u64 ar71xx_ehci_dmamask = DMA_BIT_MASK(32);
static struct ar71xx_ehci_platform_data ar71xx_ehci_data;
static struct platform_device ar71xx_ehci_device = {
.name = "ar71xx-ehci",
.id = -1,
.resource = ar71xx_ehci_resources,
.num_resources = ARRAY_SIZE(ar71xx_ehci_resources),
.dev = {
.dma_mask = &ar71xx_ehci_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &ar71xx_ehci_data,
},
};
#define AR71XX_USB_RESET_MASK \
(RESET_MODULE_USB_HOST | RESET_MODULE_USB_PHY \
| RESET_MODULE_USB_OHCI_DLL)
#define AR7240_USB_RESET_MASK \
(RESET_MODULE_USB_HOST | RESET_MODULE_USB_OHCI_DLL_7240)
static void __init ar71xx_usb_setup(void)
{
ar71xx_device_stop(AR71XX_USB_RESET_MASK);
mdelay(1000);
ar71xx_device_start(AR71XX_USB_RESET_MASK);
/* Turning on the Buff and Desc swap bits */
ar71xx_usb_ctrl_wr(USB_CTRL_REG_CONFIG, 0xf0000);
/* WAR for HW bug. Here it adjusts the duration between two SOFS */
ar71xx_usb_ctrl_wr(USB_CTRL_REG_FLADJ, 0x20c00);
mdelay(900);
platform_device_register(&ar71xx_ohci_device);
platform_device_register(&ar71xx_ehci_device);
}
static void __init ar7240_usb_setup(void)
{
ar71xx_device_stop(AR7240_USB_RESET_MASK);
mdelay(1000);
ar71xx_device_start(AR7240_USB_RESET_MASK);
/* WAR for HW bug. Here it adjusts the duration between two SOFS */
ar71xx_usb_ctrl_wr(USB_CTRL_REG_FLADJ, 0x3);
ar71xx_ohci_device.resource = ar7240_ohci_resources;
ar71xx_ohci_device.num_resources = ARRAY_SIZE(ar7240_ohci_resources);
platform_device_register(&ar71xx_ohci_device);
}
static void __init ar91xx_usb_setup(void)
{
ar71xx_device_stop(RESET_MODULE_USBSUS_OVERRIDE);
mdelay(10);
ar71xx_device_start(RESET_MODULE_USB_HOST);
mdelay(10);
ar71xx_device_start(RESET_MODULE_USB_PHY);
mdelay(10);
ar71xx_ehci_data.is_ar91xx = 1;
platform_device_register(&ar71xx_ehci_device);
}
void __init ar71xx_add_device_usb(void)
{
switch (ar71xx_soc) {
case AR71XX_SOC_AR7240:
ar7240_usb_setup();
break;
case AR71XX_SOC_AR7130:
case AR71XX_SOC_AR7141:
case AR71XX_SOC_AR7161:
ar71xx_usb_setup();
break;
case AR71XX_SOC_AR9130:
case AR71XX_SOC_AR9132:
ar91xx_usb_setup();
break;
default:
BUG();
}
}

17
target/linux/ar71xx/files/arch/mips/ar71xx/dev-usb.h Normal file
View file

@ -0,0 +1,17 @@
/*
* Atheros AR71xx USB host device support
*
* Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
* Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*/
#ifndef _AR71XX_DEV_USB_H
#define _AR71XX_DEV_USB_H
void ar71xx_add_device_usb(void) __init;
#endif /* _AR71XX_DEV_USB_H */

148
target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
View file

@ -14,7 +14,6 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/etherdevice.h>
#include <linux/platform_device.h>
#include <linux/serial_8250.h>
@ -25,153 +24,6 @@
static u8 ar71xx_mac_base[ETH_ALEN] __initdata;
/*
* OHCI (USB full speed host controller)
*/
static struct resource ar71xx_ohci_resources[] = {
[0] = {
.start = AR71XX_OHCI_BASE,
.end = AR71XX_OHCI_BASE + AR71XX_OHCI_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AR71XX_MISC_IRQ_OHCI,
.end = AR71XX_MISC_IRQ_OHCI,
.flags = IORESOURCE_IRQ,
},
};
static struct resource ar7240_ohci_resources[] = {
[0] = {
.start = AR7240_OHCI_BASE,
.end = AR7240_OHCI_BASE + AR7240_OHCI_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AR71XX_CPU_IRQ_USB,
.end = AR71XX_CPU_IRQ_USB,
.flags = IORESOURCE_IRQ,
},
};
static u64 ar71xx_ohci_dmamask = DMA_BIT_MASK(32);
static struct platform_device ar71xx_ohci_device = {
.name = "ar71xx-ohci",
.id = -1,
.resource = ar71xx_ohci_resources,
.num_resources = ARRAY_SIZE(ar71xx_ohci_resources),
.dev = {
.dma_mask = &ar71xx_ohci_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
},
};
/*
* EHCI (USB full speed host controller)
*/
static struct resource ar71xx_ehci_resources[] = {
[0] = {
.start = AR71XX_EHCI_BASE,
.end = AR71XX_EHCI_BASE + AR71XX_EHCI_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AR71XX_CPU_IRQ_USB,
.end = AR71XX_CPU_IRQ_USB,
.flags = IORESOURCE_IRQ,
},
};
static u64 ar71xx_ehci_dmamask = DMA_BIT_MASK(32);
static struct ar71xx_ehci_platform_data ar71xx_ehci_data;
static struct platform_device ar71xx_ehci_device = {
.name = "ar71xx-ehci",
.id = -1,
.resource = ar71xx_ehci_resources,
.num_resources = ARRAY_SIZE(ar71xx_ehci_resources),
.dev = {
.dma_mask = &ar71xx_ehci_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &ar71xx_ehci_data,
},
};
#define AR71XX_USB_RESET_MASK \
(RESET_MODULE_USB_HOST | RESET_MODULE_USB_PHY \
| RESET_MODULE_USB_OHCI_DLL)
#define AR7240_USB_RESET_MASK \
(RESET_MODULE_USB_HOST | RESET_MODULE_USB_OHCI_DLL_7240)
static void __init ar71xx_usb_setup(void)
{
ar71xx_device_stop(AR71XX_USB_RESET_MASK);
mdelay(1000);
ar71xx_device_start(AR71XX_USB_RESET_MASK);
/* Turning on the Buff and Desc swap bits */
ar71xx_usb_ctrl_wr(USB_CTRL_REG_CONFIG, 0xf0000);
/* WAR for HW bug. Here it adjusts the duration between two SOFS */
ar71xx_usb_ctrl_wr(USB_CTRL_REG_FLADJ, 0x20c00);
mdelay(900);
}
static void __init ar7240_usb_setup(void)
{
ar71xx_ohci_device.resource = ar7240_ohci_resources;
ar71xx_device_stop(AR7240_USB_RESET_MASK);
mdelay(1000);
ar71xx_device_start(AR7240_USB_RESET_MASK);
/* WAR for HW bug. Here it adjusts the duration between two SOFS */
ar71xx_usb_ctrl_wr(USB_CTRL_REG_FLADJ, 0x3);
}
static void __init ar91xx_usb_setup(void)
{
ar71xx_device_stop(RESET_MODULE_USBSUS_OVERRIDE);
mdelay(10);
ar71xx_device_start(RESET_MODULE_USB_HOST);
mdelay(10);
ar71xx_device_start(RESET_MODULE_USB_PHY);
mdelay(10);
}
void __init ar71xx_add_device_usb(void)
{
switch (ar71xx_soc) {
case AR71XX_SOC_AR7240:
ar7240_usb_setup();
platform_device_register(&ar71xx_ohci_device);
break;
case AR71XX_SOC_AR7130:
case AR71XX_SOC_AR7141:
case AR71XX_SOC_AR7161:
ar71xx_usb_setup();
platform_device_register(&ar71xx_ohci_device);
platform_device_register(&ar71xx_ehci_device);
break;
case AR71XX_SOC_AR9130:
case AR71XX_SOC_AR9132:
ar91xx_usb_setup();
ar71xx_ehci_data.is_ar91xx = 1;
platform_device_register(&ar71xx_ehci_device);
break;
default:
BUG();
}
}
static struct resource ar71xx_uart_resources[] = {
{
.start = AR71XX_UART_BASE,

1
target/linux/ar71xx/files/arch/mips/ar71xx/devices.h
View file

@ -38,7 +38,6 @@ void ar71xx_add_device_eth(unsigned int id) __init;
void ar71xx_add_device_mdio(u32 phy_mask) __init;
void ar71xx_add_device_usb(void) __init;
void ar71xx_add_device_uart(void) __init;
void ar71xx_add_device_wdt(void) __init;

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
View file

@ -20,6 +20,7 @@
#include "dev-ar913x-wmac.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-usb.h"
#define AP81_GPIO_LED_STATUS 1
#define AP81_GPIO_LED_AOSS 3

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
View file

@ -25,6 +25,7 @@
#include "dev-ar913x-wmac.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-usb.h"
#define AP83_GPIO_LED_WLAN 6
#define AP83_GPIO_LED_POWER 14

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
View file

@ -24,6 +24,7 @@
#include "dev-ap94-pci.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-usb.h"
#define DIR825B1_GPIO_LED_BLUE_USB 0
#define DIR825B1_GPIO_LED_ORANGE_POWER 1

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
View file

@ -19,6 +19,7 @@
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-m25p80.h"
#include "dev-usb.h"
#define MZK_W04NU_GPIO_LED_USB 0
#define MZK_W04NU_GPIO_LED_STATUS 1

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c
View file

@ -16,6 +16,7 @@
#include "dev-m25p80.h"
#include "dev-gpio-buttons.h"
#include "dev-pb42-pci.h"
#include "dev-usb.h"
#define PB42_BUTTONS_POLL_INTERVAL 20

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c
View file

@ -26,6 +26,7 @@
#include "dev-pb42-pci.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-usb.h"
#define PB44_PCF8757_VSC7395_CS 0
#define PB44_PCF8757_STEREO_CS 1

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c
View file

@ -23,6 +23,7 @@
#include "devices.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-usb.h"
#define RB4XX_GPIO_USER_LED 4
#define RB4XX_GPIO_RESET_SWITCH 7

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
View file

@ -19,6 +19,7 @@
#include "dev-ar913x-wmac.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-usb.h"
#define TL_WR1043ND_GPIO_LED_USB 1
#define TL_WR1043ND_GPIO_LED_SYSTEM 2

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
View file

@ -19,6 +19,7 @@
#include "dev-gpio-buttons.h"
#include "dev-pb42-pci.h"
#include "dev-leds-gpio.h"
#include "dev-usb.h"
#define UBNT_RS_GPIO_LED_RF 2
#define UBNT_RS_GPIO_SW4 8

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
View file

@ -23,6 +23,7 @@
#include "dev-ap94-pci.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-usb.h"
#define WNDR3700_GPIO_LED_WPS_ORANGE 0
#define WNDR3700_GPIO_LED_POWER_ORANGE 1

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
View file

@ -20,6 +20,7 @@
#include "dev-pb42-pci.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-usb.h"
#define WP543_GPIO_SW6 2
#define WP543_GPIO_LED_1 3

1
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c
View file

@ -19,6 +19,7 @@
#include "dev-ar913x-wmac.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-usb.h"
#define WRT160NL_GPIO_LED_POWER 14
#define WRT160NL_GPIO_LED_WPS_AMBER 9