Commit 36223604 authored by Shawn Guo's avatar Shawn Guo Committed by Sascha Hauer
Browse files

ARM: mxc: clean up imx-dma device registration 



The patch follows the implementation of gpio-mxc device registration
to break the concentrated imx-dma device registration into soc
specific setup function.  Then we can avoid the churn of "#ifdef"
and the cpu_is_mx checking on such a long list, which makes no sense,
considering more soc supports need to be added and we need to support
single image for multiple socs in the long run.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 8dd7b817

arch/arm/mach-imx/mm-imx21.c

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/init.h>

#include <mach/hardware.h>

#include <mach/common.h>

#include <mach/devices-common.h>

#include <asm/pgtable.h>

#include <asm/mach/map.h>

#include <mach/irqs.h>
@@ -82,4 +83,6 @@ void __init imx21_soc_init(void) 
	mxc_register_gpio(3, MX21_GPIO4_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);

	mxc_register_gpio(4, MX21_GPIO5_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);

	mxc_register_gpio(5, MX21_GPIO6_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);



	imx_add_imx_dma();

}

arch/arm/mach-imx/mm-imx25.c

+26 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/mach/map.h>



#include <mach/common.h>

#include <mach/devices-common.h>

#include <mach/hardware.h>

#include <mach/mx25.h>

#include <mach/iomux-v3.h>
@@ -61,10 +62,35 @@ void __init mx25_init_irq(void) 
	mxc_init_irq(MX25_IO_ADDRESS(MX25_AVIC_BASE_ADDR));

}



static struct sdma_script_start_addrs imx25_sdma_script __initdata = {

	.ap_2_ap_addr = 729,

	.uart_2_mcu_addr = 904,

	.per_2_app_addr = 1255,

	.mcu_2_app_addr = 834,

	.uartsh_2_mcu_addr = 1120,

	.per_2_shp_addr = 1329,

	.mcu_2_shp_addr = 1048,

	.ata_2_mcu_addr = 1560,

	.mcu_2_ata_addr = 1479,

	.app_2_per_addr = 1189,

	.app_2_mcu_addr = 770,

	.shp_2_per_addr = 1407,

	.shp_2_mcu_addr = 979,

};



static struct sdma_platform_data imx25_sdma_pdata __initdata = {

	.sdma_version = 2,

	.cpu_name = "imx25",

	.to_version = 1,

	.script_addrs = &imx25_sdma_script,

};



void __init imx25_soc_init(void)

{

	mxc_register_gpio(0, MX25_GPIO1_BASE_ADDR, SZ_16K, MX25_INT_GPIO1, 0);

	mxc_register_gpio(1, MX25_GPIO2_BASE_ADDR, SZ_16K, MX25_INT_GPIO2, 0);

	mxc_register_gpio(2, MX25_GPIO3_BASE_ADDR, SZ_16K, MX25_INT_GPIO3, 0);

	mxc_register_gpio(3, MX25_GPIO4_BASE_ADDR, SZ_16K, MX25_INT_GPIO4, 0);



	imx_add_imx_sdma(MX25_SDMA_BASE_ADDR, MX25_INT_SDMA, &imx25_sdma_pdata);

}

arch/arm/mach-imx/mm-imx27.c

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/init.h>

#include <mach/hardware.h>

#include <mach/common.h>

#include <mach/devices-common.h>

#include <asm/pgtable.h>

#include <asm/mach/map.h>

#include <mach/irqs.h>
@@ -82,4 +83,6 @@ void __init imx27_soc_init(void) 
	mxc_register_gpio(3, MX27_GPIO4_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);

	mxc_register_gpio(4, MX27_GPIO5_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);

	mxc_register_gpio(5, MX27_GPIO6_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);



	imx_add_imx_dma();

}

arch/arm/mach-imx/mm-imx31.c

+24 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/mach/map.h>



#include <mach/common.h>

#include <mach/devices-common.h>

#include <mach/hardware.h>

#include <mach/iomux-v3.h>

#include <mach/irqs.h>
@@ -57,9 +58,32 @@ void __init mx31_init_irq(void) 
	mxc_init_irq(MX31_IO_ADDRESS(MX31_AVIC_BASE_ADDR));

}



static struct sdma_script_start_addrs imx31_to1_sdma_script __initdata = {

	.per_2_per_addr = 1677,

};



static struct sdma_script_start_addrs imx31_to2_sdma_script __initdata = {

	.ap_2_ap_addr = 423,

	.ap_2_bp_addr = 829,

	.bp_2_ap_addr = 1029,

};



static struct sdma_platform_data imx31_sdma_pdata __initdata = {

	.sdma_version = 1,

	.cpu_name = "imx31",

	.script_addrs = &imx31_to2_sdma_script,

};



void __init imx31_soc_init(void)

{

	int to_version = mx31_revision() >> 4;



	mxc_register_gpio(0, MX31_GPIO1_BASE_ADDR, SZ_16K, MX31_INT_GPIO1, 0);

	mxc_register_gpio(1, MX31_GPIO2_BASE_ADDR, SZ_16K, MX31_INT_GPIO2, 0);

	mxc_register_gpio(2, MX31_GPIO3_BASE_ADDR, SZ_16K, MX31_INT_GPIO3, 0);



	imx31_sdma_pdata.to_version = to_version;

	if (to_version == 1)

		imx31_sdma_pdata.script_addrs = &imx31_to1_sdma_script;

	imx_add_imx_sdma(MX31_SDMA_BASE_ADDR, MX31_INT_SDMA, &imx31_sdma_pdata);

}

arch/arm/mach-imx/mm-imx35.c

+44 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <asm/hardware/cache-l2x0.h>



#include <mach/common.h>

#include <mach/devices-common.h>

#include <mach/hardware.h>

#include <mach/iomux-v3.h>

#include <mach/irqs.h>
@@ -54,9 +55,52 @@ void __init mx35_init_irq(void) 
	mxc_init_irq(MX35_IO_ADDRESS(MX35_AVIC_BASE_ADDR));

}



static struct sdma_script_start_addrs imx35_to1_sdma_script __initdata = {

	.ap_2_ap_addr = 642,

	.uart_2_mcu_addr = 817,

	.mcu_2_app_addr = 747,

	.uartsh_2_mcu_addr = 1183,

	.per_2_shp_addr = 1033,

	.mcu_2_shp_addr = 961,

	.ata_2_mcu_addr = 1333,

	.mcu_2_ata_addr = 1252,

	.app_2_mcu_addr = 683,

	.shp_2_per_addr = 1111,

	.shp_2_mcu_addr = 892,

};



static struct sdma_script_start_addrs imx35_to2_sdma_script __initdata = {

	.ap_2_ap_addr = 729,

	.uart_2_mcu_addr = 904,

	.per_2_app_addr = 1597,

	.mcu_2_app_addr = 834,

	.uartsh_2_mcu_addr = 1270,

	.per_2_shp_addr = 1120,

	.mcu_2_shp_addr = 1048,

	.ata_2_mcu_addr = 1429,

	.mcu_2_ata_addr = 1339,

	.app_2_per_addr = 1531,

	.app_2_mcu_addr = 770,

	.shp_2_per_addr = 1198,

	.shp_2_mcu_addr = 979,

};



static struct sdma_platform_data imx35_sdma_pdata __initdata = {

	.sdma_version = 2,

	.cpu_name = "imx35",

	.script_addrs = &imx35_to2_sdma_script,

};



void __init imx35_soc_init(void)

{

	int to_version = mx35_revision() >> 4;



	mxc_register_gpio(0, MX35_GPIO1_BASE_ADDR, SZ_16K, MX35_INT_GPIO1, 0);

	mxc_register_gpio(1, MX35_GPIO2_BASE_ADDR, SZ_16K, MX35_INT_GPIO2, 0);

	mxc_register_gpio(2, MX35_GPIO3_BASE_ADDR, SZ_16K, MX35_INT_GPIO3, 0);



	imx35_sdma_pdata.to_version = to_version;

	if (to_version == 1)

		imx35_sdma_pdata.script_addrs = &imx35_to1_sdma_script;

	imx_add_imx_sdma(MX35_SDMA_BASE_ADDR, MX35_INT_SDMA, &imx35_sdma_pdata);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE