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

Commit a4b3f029 authored by Jingoo Han's avatar Jingoo Han Committed by Greg Kroah-Hartman
Browse files

ARM: SAMSUNG: Remove unused s5p_device_ehci 



Since commit ca914350 "ARM: EXYNOS: Remove unused board files",
s5p_device_ehci is not used anymore. Thus, s5p_device_ehci can
be removed. Also, unnecessary S5P_DEV_USB_EHCI option is removed.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c4bb942

arch/arm/plat-samsung/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -382,11 +382,6 @@ config S5P_DEV_TV 
	help

	  Compile in platform device definition for TV interface



config S5P_DEV_USB_EHCI

	bool

	help

	  Compile in platform device definition for USB EHCI



config S3C24XX_PWM

	bool "PWM device support"

	select PWM

arch/arm/plat-samsung/devs.c

+0 −34
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
#include <plat/devs.h>

#include <plat/adc.h>

#include <linux/platform_data/ata-samsung_cf.h>

#include <linux/platform_data/usb-ehci-s5p.h>

#include <plat/fb.h>

#include <plat/fb-s3c2410.h>

#include <plat/hdmi.h>
@@ -1359,39 +1358,6 @@ void __init s3c24xx_udc_set_platdata(struct s3c2410_udc_mach_info *pd) 
}

#endif /* CONFIG_PLAT_S3C24XX */



/* USB EHCI Host Controller */



#ifdef CONFIG_S5P_DEV_USB_EHCI

static struct resource s5p_ehci_resource[] = {

	[0] = DEFINE_RES_MEM(S5P_PA_EHCI, SZ_256),

	[1] = DEFINE_RES_IRQ(IRQ_USB_HOST),

};



struct platform_device s5p_device_ehci = {

	.name		= "s5p-ehci",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(s5p_ehci_resource),

	.resource	= s5p_ehci_resource,

	.dev		= {

		.dma_mask		= &samsung_device_dma_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	}

};



void __init s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd)

{

	struct s5p_ehci_platdata *npd;



	npd = s3c_set_platdata(pd, sizeof(struct s5p_ehci_platdata),

			&s5p_device_ehci);



	if (!npd->phy_init)

		npd->phy_init = s5p_usb_phy_init;

	if (!npd->phy_exit)

		npd->phy_exit = s5p_usb_phy_exit;

}

#endif /* CONFIG_S5P_DEV_USB_EHCI */



/* USB HSOTG */



#ifdef CONFIG_S3C_DEV_USB_HSOTG

arch/arm/plat-samsung/include/plat/devs.h

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ extern struct platform_device s3c_device_usb_hsotg; 
extern struct platform_device s3c_device_usb_hsudc;

extern struct platform_device s3c_device_wdt;



extern struct platform_device s5p_device_ehci;

extern struct platform_device s5p_device_fimc0;

extern struct platform_device s5p_device_fimc1;

extern struct platform_device s5p_device_fimc2;