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

Commit e1b24377 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Shawn Guo
Browse files

ARM: i.MX: Remove registration helper for i.MX1 USB UDC 



imx_udc driver was removed from the kernel of about 10 months ago.
This patch removes a registration helper for this driver and
orphaned driver header.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent ac36187b

arch/arm/mach-imx/devices/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ config IMX_HAVE_PLATFORM_IMX_SSI 
config IMX_HAVE_PLATFORM_IMX_UART

	bool



config IMX_HAVE_PLATFORM_IMX_UDC

	bool



config IMX_HAVE_PLATFORM_IPU_CORE

	bool

arch/arm/mach-imx/devices/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_KEYPAD) += platform-imx-keypad.o 
obj-$(CONFIG_IMX_HAVE_PLATFORM_PATA_IMX) += platform-pata_imx.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UDC) += platform-imx_udc.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IPU_CORE) += platform-ipu-core.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MX1_CAMERA) += platform-mx1-camera.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_CAMERA) += platform-mx2-camera.o

arch/arm/mach-imx/devices/devices-common.h

+0 −16
Original line number Diff line number Diff line
@@ -176,22 +176,6 @@ struct platform_device *__init imx_add_imx_uart_1irq( 
		const struct imx_imx_uart_1irq_data *data,

		const struct imxuart_platform_data *pdata);



#include <linux/platform_data/usb-imx_udc.h>

struct imx_imx_udc_data {

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq0;

	resource_size_t irq1;

	resource_size_t irq2;

	resource_size_t irq3;

	resource_size_t irq4;

	resource_size_t irq5;

	resource_size_t irq6;

};

struct platform_device *__init imx_add_imx_udc(

		const struct imx_imx_udc_data *data,

		const struct imxusb_platform_data *pdata);



#include <linux/platform_data/video-mx3fb.h>

#include <linux/platform_data/camera-mx3.h>

struct imx_ipu_core_data {

arch/arm/mach-imx/devices/platform-imx_udc.c

deleted100644 → 0
+0 −75
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 Pengutronix

 * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>

 *

 * 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 "../hardware.h"

#include "devices-common.h"



#define imx_imx_udc_data_entry_single(soc, _size)			\

	{								\

		.iobase = soc ## _USBD_BASE_ADDR,			\

		.iosize = _size,					\

		.irq0 = soc ## _INT_USBD0,				\

		.irq1 = soc ## _INT_USBD1,				\

		.irq2 = soc ## _INT_USBD2,				\

		.irq3 = soc ## _INT_USBD3,				\

		.irq4 = soc ## _INT_USBD4,				\

		.irq5 = soc ## _INT_USBD5,				\

		.irq6 = soc ## _INT_USBD6,				\

	}



#define imx_imx_udc_data_entry(soc, _size)				\

	[_id] = imx_imx_udc_data_entry_single(soc, _size)



#ifdef CONFIG_SOC_IMX1

const struct imx_imx_udc_data imx1_imx_udc_data __initconst =

	imx_imx_udc_data_entry_single(MX1, SZ_4K);

#endif /* ifdef CONFIG_SOC_IMX1 */



struct platform_device *__init imx_add_imx_udc(

		const struct imx_imx_udc_data *data,

		const struct imxusb_platform_data *pdata)

{

	struct resource res[] = {

		{

			.start = data->iobase,

			.end = data->iobase + data->iosize - 1,

			.flags = IORESOURCE_MEM,

		}, {

			.start = data->irq0,

			.end = data->irq0,

			.flags = IORESOURCE_IRQ,

		}, {

			.start = data->irq1,

			.end = data->irq1,

			.flags = IORESOURCE_IRQ,

		}, {

			.start = data->irq2,

			.end = data->irq2,

			.flags = IORESOURCE_IRQ,

		}, {

			.start = data->irq3,

			.end = data->irq3,

			.flags = IORESOURCE_IRQ,

		}, {

			.start = data->irq4,

			.end = data->irq4,

			.flags = IORESOURCE_IRQ,

		}, {

			.start = data->irq5,

			.end = data->irq5,

			.flags = IORESOURCE_IRQ,

		}, {

			.start = data->irq6,

			.end = data->irq6,

			.flags = IORESOURCE_IRQ,

		},

	};



	return imx_add_platform_device("imx_udc", 0,

			res, ARRAY_SIZE(res), pdata, sizeof(*pdata));

}

include/linux/platform_data/usb-imx_udc.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/*

 *	Copyright (C) 2008 Darius Augulis <augulis.darius@gmail.com>

 *

 *	This program is free software; you can redistribute it and/or modify

 *	it under the terms of the GNU General Public License as published by

 *	the Free Software Foundation; either version 2 of the License, or

 *	(at your option) any later version.

 *

 *	This program is distributed in the hope that it will be useful,

 *	but WITHOUT ANY WARRANTY; without even the implied warranty of

 *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *	GNU General Public License for more details.

 */



#ifndef __ASM_ARCH_MXC_USB

#define __ASM_ARCH_MXC_USB



struct imxusb_platform_data {

	int (*init)(struct device *);

	void (*exit)(struct device *);

};



#endif /* __ASM_ARCH_MXC_USB */