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

ARM: imx: reorganize nand registration to use a struct 



Addiontionally make the interrupt #defines match the base address
defines MX.._NFC_BASE_ADDR.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 40e2eda9

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

+2 −1
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ extern const struct imx_imx_uart_1irq_data imx21_imx_uart_data[] __initconst; 
#define imx21_add_imx_uart2(pdata)	imx21_add_imx_uart(2, pdata)

#define imx21_add_imx_uart3(pdata)	imx21_add_imx_uart(3, pdata)



extern const struct imx_mxc_nand_data imx21_mxc_nand_data __initconst;

#define imx21_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v1(MX21_NFC_BASE_ADDR, MX21_INT_NANDFC, pdata)

	imx_add_mxc_nand(&imx21_mxc_nand_data, pdata)



extern const struct imx_spi_imx_data imx21_cspi_data[] __initconst;

#define imx21_add_cspi(id, pdata)	\

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

+2 −1
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[] __initconst; 
#define imx27_add_imx_uart4(pdata)	imx27_add_imx_uart(4, pdata)

#define imx27_add_imx_uart5(pdata)	imx27_add_imx_uart(5, pdata)



extern const struct imx_mxc_nand_data imx27_mxc_nand_data __initconst;

#define imx27_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v1(MX27_NFC_BASE_ADDR, MX27_INT_NANDFC, pdata)

	imx_add_mxc_nand(&imx27_mxc_nand_data, pdata)



extern const struct imx_spi_imx_data imx27_cspi_data[] __initconst;

#define imx27_add_cspi(id, pdata)	\

arch/arm/mach-mx25/devices-imx25.h

+2 −1
Original line number Diff line number Diff line
@@ -34,8 +34,9 @@ extern const struct imx_imx_uart_1irq_data imx25_imx_uart_data[] __initconst; 
#define imx25_add_imx_uart3(pdata)	imx25_add_imx_uart(3, pdata)

#define imx25_add_imx_uart4(pdata)	imx25_add_imx_uart(4, pdata)



extern const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst;

#define imx25_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v21(MX25_NFC_BASE_ADDR, MX25_INT_NANDFC, pdata)

	imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)



extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;

#define imx25_add_spi_imx(id, pdata)	\

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

+2 −1
Original line number Diff line number Diff line
@@ -29,8 +29,9 @@ extern const struct imx_imx_uart_1irq_data imx31_imx_uart_data[] __initconst; 
#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_mxc_nand_data imx31_mxc_nand_data __initconst;

#define imx31_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v1(MX31_NFC_BASE_ADDR, MX31_INT_NANDFC, pdata)

	imx_add_mxc_nand(&imx31_mxc_nand_data, pdata)



extern const struct imx_spi_imx_data imx31_cspi_data[] __initconst;

#define imx31_add_cspi(id, pdata)	\

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

+2 −1
Original line number Diff line number Diff line
@@ -32,8 +32,9 @@ extern const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst; 
#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_mxc_nand_data imx35_mxc_nand_data __initconst;

#define imx35_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v21(MX35_NFC_BASE_ADDR, MX35_INT_NANDFC, pdata)

	imx_add_mxc_nand(&imx35_mxc_nand_data, pdata)



extern const struct imx_spi_imx_data imx35_cspi_data[] __initconst;

#define imx35_add_cspi(id, pdata)	\

CRA Git | Maintained and supported by SUSTech CRA and CCSE