Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e98aa46 authored by Gabor Juhos's avatar Gabor Juhos Committed by Ralf Baechle
Browse files

MIPS: ath79: add common USB Host Controller device 



Add common platform_device and helper code to make the registration of
the built-in USB controllers easier on the board which are using them.
Also register the USB controller on the AP81 and PB44 boards.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarImre Kaloz <kaloz@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2442/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent d2b4ac1e

arch/mips/ath79/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config ATH79_MACH_AP81 
	select ATH79_DEV_GPIO_BUTTONS

	select ATH79_DEV_LEDS_GPIO

	select ATH79_DEV_SPI

	select ATH79_DEV_USB

	help

	  Say 'Y' here if you want your kernel to support the

	  Atheros AP81 reference board.
@@ -19,6 +20,7 @@ config ATH79_MACH_PB44 
	select ATH79_DEV_GPIO_BUTTONS

	select ATH79_DEV_LEDS_GPIO

	select ATH79_DEV_SPI

	select ATH79_DEV_USB

	help

	  Say 'Y' here if you want your kernel to support the

	  Atheros PB44 reference board.
@@ -52,4 +54,7 @@ config ATH79_DEV_LEDS_GPIO 
config ATH79_DEV_SPI

	def_bool n



config ATH79_DEV_USB

	def_bool n



endif

arch/mips/ath79/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_ATH79_DEV_AR913X_WMAC) += dev-ar913x-wmac.o 
obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS)	+= dev-gpio-buttons.o

obj-$(CONFIG_ATH79_DEV_LEDS_GPIO)	+= dev-leds-gpio.o

obj-$(CONFIG_ATH79_DEV_SPI)		+= dev-spi.o

obj-$(CONFIG_ATH79_DEV_USB)		+= dev-usb.o



#

# Machines

arch/mips/ath79/dev-usb.c

0 → 100644
+178 −0
Original line number Diff line number Diff line 
/*

 *  Atheros AR7XXX/AR9XXX USB Host Controller device

 *

 *  Copyright (C) 2008-2011 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/irq.h>

#include <linux/dma-mapping.h>

#include <linux/platform_device.h>



#include <asm/mach-ath79/ath79.h>

#include <asm/mach-ath79/ar71xx_regs.h>

#include "common.h"

#include "dev-usb.h"



static struct resource ath79_ohci_resources[] = {

	[0] = {

		/* .start and .end fields are filled dynamically */

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= ATH79_MISC_IRQ_OHCI,

		.end	= ATH79_MISC_IRQ_OHCI,

		.flags	= IORESOURCE_IRQ,

	},

};



static u64 ath79_ohci_dmamask = DMA_BIT_MASK(32);

static struct platform_device ath79_ohci_device = {

	.name		= "ath79-ohci",

	.id		= -1,

	.resource	= ath79_ohci_resources,

	.num_resources	= ARRAY_SIZE(ath79_ohci_resources),

	.dev = {

		.dma_mask		= &ath79_ohci_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};



static struct resource ath79_ehci_resources[] = {

	[0] = {

		/* .start and .end fields are filled dynamically */

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= ATH79_CPU_IRQ_USB,

		.end	= ATH79_CPU_IRQ_USB,

		.flags	= IORESOURCE_IRQ,

	},

};



static u64 ath79_ehci_dmamask = DMA_BIT_MASK(32);

static struct platform_device ath79_ehci_device = {

	.name		= "ath79-ehci",

	.id		= -1,

	.resource	= ath79_ehci_resources,

	.num_resources	= ARRAY_SIZE(ath79_ehci_resources),

	.dev = {

		.dma_mask		= &ath79_ehci_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};



#define AR71XX_USB_RESET_MASK	(AR71XX_RESET_USB_HOST | \

				 AR71XX_RESET_USB_PHY | \

				 AR71XX_RESET_USB_OHCI_DLL)



static void __init ath79_usb_setup(void)

{

	void __iomem *usb_ctrl_base;



	ath79_device_reset_set(AR71XX_USB_RESET_MASK);

	mdelay(1000);

	ath79_device_reset_clear(AR71XX_USB_RESET_MASK);



	usb_ctrl_base = ioremap(AR71XX_USB_CTRL_BASE, AR71XX_USB_CTRL_SIZE);



	/* Turning on the Buff and Desc swap bits */

	__raw_writel(0xf0000, usb_ctrl_base + AR71XX_USB_CTRL_REG_CONFIG);



	/* WAR for HW bug. Here it adjusts the duration between two SOFS */

	__raw_writel(0x20c00, usb_ctrl_base + AR71XX_USB_CTRL_REG_FLADJ);



	iounmap(usb_ctrl_base);



	mdelay(900);



	ath79_ohci_resources[0].start = AR71XX_OHCI_BASE;

	ath79_ohci_resources[0].end = AR71XX_OHCI_BASE + AR71XX_OHCI_SIZE - 1;

	platform_device_register(&ath79_ohci_device);



	ath79_ehci_resources[0].start = AR71XX_EHCI_BASE;

	ath79_ehci_resources[0].end = AR71XX_EHCI_BASE + AR71XX_EHCI_SIZE - 1;

	ath79_ehci_device.name = "ar71xx-ehci";

	platform_device_register(&ath79_ehci_device);

}



static void __init ar7240_usb_setup(void)

{

	void __iomem *usb_ctrl_base;



	ath79_device_reset_clear(AR7240_RESET_OHCI_DLL);

	ath79_device_reset_set(AR7240_RESET_USB_HOST);



	mdelay(1000);



	ath79_device_reset_set(AR7240_RESET_OHCI_DLL);

	ath79_device_reset_clear(AR7240_RESET_USB_HOST);



	usb_ctrl_base = ioremap(AR7240_USB_CTRL_BASE, AR7240_USB_CTRL_SIZE);



	/* WAR for HW bug. Here it adjusts the duration between two SOFS */

	__raw_writel(0x3, usb_ctrl_base + AR71XX_USB_CTRL_REG_FLADJ);



	iounmap(usb_ctrl_base);



	ath79_ohci_resources[0].start = AR7240_OHCI_BASE;

	ath79_ohci_resources[0].end = AR7240_OHCI_BASE + AR7240_OHCI_SIZE - 1;

	platform_device_register(&ath79_ohci_device);

}



static void __init ar724x_usb_setup(void)

{

	ath79_device_reset_set(AR724X_RESET_USBSUS_OVERRIDE);

	mdelay(10);



	ath79_device_reset_clear(AR724X_RESET_USB_HOST);

	mdelay(10);



	ath79_device_reset_clear(AR724X_RESET_USB_PHY);

	mdelay(10);



	ath79_ehci_resources[0].start = AR724X_EHCI_BASE;

	ath79_ehci_resources[0].end = AR724X_EHCI_BASE + AR724X_EHCI_SIZE - 1;

	ath79_ehci_device.name = "ar724x-ehci";

	platform_device_register(&ath79_ehci_device);

}



static void __init ar913x_usb_setup(void)

{

	ath79_device_reset_set(AR913X_RESET_USBSUS_OVERRIDE);

	mdelay(10);



	ath79_device_reset_clear(AR913X_RESET_USB_HOST);

	mdelay(10);



	ath79_device_reset_clear(AR913X_RESET_USB_PHY);

	mdelay(10);



	ath79_ehci_resources[0].start = AR913X_EHCI_BASE;

	ath79_ehci_resources[0].end = AR913X_EHCI_BASE + AR913X_EHCI_SIZE - 1;

	ath79_ehci_device.name = "ar913x-ehci";

	platform_device_register(&ath79_ehci_device);

}



void __init ath79_register_usb(void)

{

	if (soc_is_ar71xx())

		ath79_usb_setup();

	else if (soc_is_ar7240())

		ar7240_usb_setup();

	else if (soc_is_ar7241() || soc_is_ar7242())

		ar724x_usb_setup();

	else if (soc_is_ar913x())

		ar913x_usb_setup();

	else

		BUG();

}

arch/mips/ath79/dev-usb.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/*

 *  Atheros AR71XX/AR724X/AR913X USB Host Controller support

 *

 *  Copyright (C) 2008-2010 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 _ATH79_DEV_USB_H

#define _ATH79_DEV_USB_H



void ath79_register_usb(void);



#endif /* _ATH79_DEV_USB_H */

arch/mips/ath79/mach-ap81.c

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "dev-gpio-buttons.h"

#include "dev-leds-gpio.h"

#include "dev-spi.h"

#include "dev-usb.h"



#define AP81_GPIO_LED_STATUS	1

#define AP81_GPIO_LED_AOSS	3
@@ -92,6 +93,7 @@ static void __init ap81_setup(void) 
	ath79_register_spi(&ap81_spi_data, ap81_spi_info,

			   ARRAY_SIZE(ap81_spi_info));

	ath79_register_ar913x_wmac(cal_data);

	ath79_register_usb();

}



MIPS_MACHINE(ATH79_MACH_AP81, "AP81", "Atheros AP81 reference board",