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

Commit afa77ef3 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sascha Hauer
Browse files

ARM: mx3: dynamically allocate "ipu-core" devices 



... together with the related devices "mx3_camera" and "mx3_sdc_fb".

"mx3_camera" doesn't fit the scheme of the other devices that just are
allocated and registered in a single function because it needs additional
care to get some dmaable memory. So currently imx31_alloc_mx3_camera
duplicates most of imx_add_platform_device_dmamask, but I'm not sure it's
worth to split the latter to be able to reuse more code.

This gets rid of mach-mx3/devices.[ch] and so several files need to be
adapted not to #include devices.h anymore.

LAKML-Reference: 1299271882-2130-5-git-send-email-u.kleine-koenig@pengutronix.de
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 031e9127

arch/arm/mach-mx3/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ config MACH_PCM037 
	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND
@@ -99,6 +100,7 @@ config MACH_MX31_3DS 
	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SPI_IMX
@@ -122,6 +124,7 @@ config MACH_MX31MOBOARD 
	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_SPI_IMX
@@ -134,6 +137,7 @@ config MACH_MX31LILLY 
	bool "Support MX31 LILLY-1131 platforms (INCO startec)"

	select SOC_IMX31

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_SPI_IMX
@@ -159,6 +163,7 @@ config MACH_PCM043 
	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
@@ -173,6 +178,7 @@ config MACH_ARMADILLO5X0 
	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND
@@ -238,6 +244,7 @@ config MACH_EUKREA_MBIMXSD35_BASEBOARD 
	bool "Eukrea MBIMXSD development board"

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IPU_CORE

	help

	  This adds board specific devices that can be found on Eukrea's

	  MBIMXSD evaluation board.
@@ -252,6 +259,7 @@ config MACH_VPR200 
	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IPU_CORE

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

arch/arm/mach-mx3/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


# Object file lists.



obj-y				:= mm.o devices.o cpu.o

obj-y				:= mm.o cpu.o

obj-$(CONFIG_SOC_IMX31)		+= clock-imx31.o iomux-imx31.o ehci-imx31.o

obj-$(CONFIG_SOC_IMX35)		+= clock-imx35.o ehci-imx35.o

obj-$(CONFIG_MACH_MX31ADS)	+= mach-mx31ads.o

arch/arm/mach-mx3/devices-imx31.h

+8 −0
Original line number Diff line number Diff line
@@ -41,6 +41,14 @@ extern const struct imx_imx_uart_1irq_data imx31_imx_uart_data[]; 
#define imx31_add_imx_uart3(pdata)	imx31_add_imx_uart(3, pdata)

#define imx31_add_imx_uart4(pdata)	imx31_add_imx_uart(4, pdata)



extern const struct imx_ipu_core_data imx31_ipu_core_data;

#define imx31_add_ipu_core(pdata)	\

	imx_add_ipu_core(&imx31_ipu_core_data, pdata)

#define imx31_alloc_mx3_camera(pdata)	\

	imx_alloc_mx3_camera(&imx31_ipu_core_data, pdata)

#define imx31_add_mx3_sdc_fb(pdata)	\

	imx_add_mx3_sdc_fb(&imx31_ipu_core_data, pdata)



extern const struct imx_mxc_ehci_data imx31_mxc_ehci_otg_data;

#define imx31_add_mxc_ehci_otg(pdata)	\

	imx_add_mxc_ehci(&imx31_mxc_ehci_otg_data, pdata)

arch/arm/mach-mx3/devices-imx35.h

+8 −0
Original line number Diff line number Diff line
@@ -49,6 +49,14 @@ extern const struct imx_imx_uart_1irq_data imx35_imx_uart_data[]; 
#define imx35_add_imx_uart1(pdata)	imx35_add_imx_uart(1, pdata)

#define imx35_add_imx_uart2(pdata)	imx35_add_imx_uart(2, pdata)



extern const struct imx_ipu_core_data imx35_ipu_core_data;

#define imx35_add_ipu_core(pdata)	\

	imx_add_ipu_core(&imx35_ipu_core_data, pdata)

#define imx35_alloc_mx3_camera(pdata)	\

	imx_alloc_mx3_camera(&imx35_ipu_core_data, pdata)

#define imx35_add_mx3_sdc_fb(pdata)	\

	imx_add_mx3_sdc_fb(&imx35_ipu_core_data, pdata)



extern const struct imx_mxc_ehci_data imx35_mxc_ehci_otg_data;

#define imx35_add_mxc_ehci_otg(pdata)	\

	imx_add_mxc_ehci(&imx35_mxc_ehci_otg_data, pdata)

arch/arm/mach-mx3/devices.c

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

 * Copyright 2006-2007 Freescale Semiconductor, Inc. All Rights Reserved.

 * Copyright 2008 Sascha Hauer, kernel@pengutronix.de

 *

 * 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.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor,

 * Boston, MA  02110-1301, USA.

 */



#include <linux/dma-mapping.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/serial.h>

#include <linux/gpio.h>

#include <mach/hardware.h>

#include <mach/irqs.h>

#include <mach/common.h>

#include <mach/mx3_camera.h>



#include "devices.h"



/* i.MX31 Image Processing Unit */



/* The resource order is important! */

static struct resource mx3_ipu_rsrc[] = {

	{

		.start = MX3x_IPU_CTRL_BASE_ADDR,

		.end = MX3x_IPU_CTRL_BASE_ADDR + 0x5F,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MX3x_IPU_CTRL_BASE_ADDR + 0x88,

		.end = MX3x_IPU_CTRL_BASE_ADDR + 0xB3,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MX3x_INT_IPU_SYN,

		.end = MX3x_INT_IPU_SYN,

		.flags = IORESOURCE_IRQ,

	}, {

		.start = MX3x_INT_IPU_ERR,

		.end = MX3x_INT_IPU_ERR,

		.flags = IORESOURCE_IRQ,

	},

};



struct platform_device mx3_ipu = {

	.name = "ipu-core",

	.id = -1,

	.num_resources = ARRAY_SIZE(mx3_ipu_rsrc),

	.resource = mx3_ipu_rsrc,

};



static struct resource fb_resources[] = {

	{

		.start	= MX3x_IPU_CTRL_BASE_ADDR + 0xB4,

		.end	= MX3x_IPU_CTRL_BASE_ADDR + 0x1BF,

		.flags	= IORESOURCE_MEM,

	},

};



struct platform_device mx3_fb = {

	.name		= "mx3_sdc_fb",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(fb_resources),

	.resource	= fb_resources,

	.dev		= {

		.coherent_dma_mask = DMA_BIT_MASK(32),

       },

};



static struct resource camera_resources[] = {

	{

		.start	= MX3x_IPU_CTRL_BASE_ADDR + 0x60,

		.end	= MX3x_IPU_CTRL_BASE_ADDR + 0x87,

		.flags	= IORESOURCE_MEM,

	},

};



struct platform_device mx3_camera = {

	.name		= "mx3-camera",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(camera_resources),

	.resource	= camera_resources,

	.dev		= {

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

};