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

Commit f2688854 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: mx5: dynamically allocate high speed i2c (imx-i2c actually) 



This removes the last device from devices.c.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 6cafe48a

arch/arm/mach-mx5/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



# Object file lists.

obj-y   := cpu.o mm.o clock-mx51-mx53.o devices.o ehci.o system.o

obj-y   := cpu.o mm.o clock-mx51-mx53.o ehci.o system.o

obj-$(CONFIG_SOC_IMX50) += mm-mx50.o



obj-$(CONFIG_PM) += pm-imx5.o

arch/arm/mach-mx5/board-mx51_babbage.c

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <asm/mach/time.h>



#include "devices-imx51.h"

#include "devices.h"

#include "cpu_op-mx51.h"



#define BABBAGE_USB_HUB_RESET	IMX_GPIO_NR(1, 7)
@@ -176,7 +175,7 @@ static const struct imxi2c_platform_data babbage_i2c_data __initconst = { 
	.bitrate = 100000,

};



static struct imxi2c_platform_data babbage_hsi2c_data = {

static const struct imxi2c_platform_data babbage_hsi2c_data __initconst = {

	.bitrate = 400000,

};
@@ -381,7 +380,7 @@ static void __init mx51_babbage_init(void) 


	imx51_add_imx_i2c(0, &babbage_i2c_data);

	imx51_add_imx_i2c(1, &babbage_i2c_data);

	mxc_register_device(&mxc_hsi2c_device, &babbage_hsi2c_data);

	imx51_add_hsi2c(&babbage_hsi2c_data);



	if (otg_mode_host)

		imx51_add_mxc_ehci_otg(&dr_utmi_config);

arch/arm/mach-mx5/devices-imx51.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ extern const struct imx_fsl_usb2_udc_data imx51_fsl_usb2_udc_data; 
extern const struct imx_imx_i2c_data imx51_imx_i2c_data[];

#define imx51_add_imx_i2c(id, pdata)	\

	imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata)

#define imx51_add_hsi2c(pdata)	\

	imx51_add_imx_i2c(2, pdata)



extern const struct imx_imx_ssi_data imx51_imx_ssi_data[];

#define imx51_add_imx_ssi(id, pdata)	\

arch/arm/mach-mx5/devices.c

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

 * Copyright 2009 Amit Kucheria <amit.kucheria@canonical.com>

 * Copyright (C) 2010 Freescale Semiconductor, Inc.

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <mach/hardware.h>

#include <mach/imx-uart.h>

#include <mach/irqs.h>



static struct resource mxc_hsi2c_resources[] = {

	{

		.start = MX51_HSI2C_DMA_BASE_ADDR,

		.end = MX51_HSI2C_DMA_BASE_ADDR + SZ_16K - 1,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = MX51_INT_HS_I2C,

		.end = MX51_INT_HS_I2C,

		.flags = IORESOURCE_IRQ,

	},

};



struct platform_device mxc_hsi2c_device = {

	.name = "imx-i2c",

	.id = 2,

	.num_resources = ARRAY_SIZE(mxc_hsi2c_resources),

	.resource = mxc_hsi2c_resources

};

arch/arm/mach-mx5/devices.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
extern struct platform_device mxc_hsi2c_device;