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

Commit 6da00dd7 authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman
Browse files

ARM: cns3xxx: use OHCI platform driver 



This patch converts the cns3xxx platform to use the ohci-platform driver which
is now suitable for use.

A previous patch converted the cns3xxx platform to use the ehci-platform
driver, and thus introduced the need to have power_{on,off} callbacks.
Since both the EHCI and OHCI platform drivers use the same same power_{on,off}
callbacks now, rename them to cns3xx_usb_power_{on,off} to show that they are
shared.

Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 60da65f9

arch/arm/mach-cns3xxx/cns3420vb.c

+13 −5
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/mtd/physmap.h>

#include <linux/mtd/partitions.h>

#include <linux/usb/ehci_pdriver.h>

#include <linux/usb/ohci_pdriver.h>

#include <asm/setup.h>

#include <asm/mach-types.h>

#include <asm/hardware/gic.h>
@@ -127,7 +128,7 @@ static struct resource cns3xxx_usb_ehci_resources[] = { 


static u64 cns3xxx_usb_ehci_dma_mask = DMA_BIT_MASK(32);



static int csn3xxx_usb_ehci_power_on(struct platform_device *pdev)

static int csn3xxx_usb_power_on(struct platform_device *pdev)

{

	/*

	 * EHCI and OHCI share the same clock and power,
@@ -148,7 +149,7 @@ static int csn3xxx_usb_ehci_power_on(struct platform_device *pdev) 
	return 0;

}



static void csn3xxx_usb_ehci_power_off(struct platform_device *pdev)

static void csn3xxx_usb_power_off(struct platform_device *pdev)

{

	/*

	 * EHCI and OHCI share the same clock and power,
@@ -162,8 +163,8 @@ static void csn3xxx_usb_ehci_power_off(struct platform_device *pdev) 


static struct usb_ehci_pdata cns3xxx_usb_ehci_pdata = {

	.port_power_off	= 1,

	.power_on	= csn3xxx_usb_ehci_power_on,

	.power_off	= csn3xxx_usb_ehci_power_off,

	.power_on	= csn3xxx_usb_power_on,

	.power_off	= csn3xxx_usb_power_off,

};



static struct platform_device cns3xxx_usb_ehci_device = {
@@ -191,13 +192,20 @@ static struct resource cns3xxx_usb_ohci_resources[] = { 


static u64 cns3xxx_usb_ohci_dma_mask = DMA_BIT_MASK(32);



static struct usb_ohci_pdata cns3xxx_usb_ohci_pdata = {

	.num_ports	= 1,

	.power_on	= csn3xxx_usb_power_on,

	.power_off	= csn3xxx_usb_power_off,

};



static struct platform_device cns3xxx_usb_ohci_device = {

	.name          = "cns3xxx-ohci",

	.name          = "ohci-platform",

	.num_resources = ARRAY_SIZE(cns3xxx_usb_ohci_resources),

	.resource      = cns3xxx_usb_ohci_resources,

	.dev           = {

		.dma_mask          = &cns3xxx_usb_ohci_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data	   = &cns3xxx_usb_ohci_pdata,

	},

};