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

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

ARM: imx: change the way spi-imx devices are registered 



Group soc specific data in a global struct instead of repeating it for
each call to imxXX_add_spi_imxX.  The structs holding the actual data
are placed in .init.constdata and so don't do much harm.  Compared to
the previous approach this reduces code size to call imx_add_spi_imx.

Acked-by: default avatarJason Wang <jason77.wang@gmail.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent a8a05b85

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

+5 −4
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
#define imx21_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v1(MX21_NFC_BASE_ADDR, MX21_INT_NANDFC, pdata)



#define imx21_add_spi_imx0(pdata)	\

	imx_add_spi_imx(0, MX21_CSPI1_BASE_ADDR, SZ_4K, MX21_INT_CSPI1, pdata)

#define imx21_add_spi_imx1(pdata)	\

	imx_add_spi_imx(1, MX21_CSPI2_BASE_ADDR, SZ_4K, MX21_INT_CSPI2, pdata)
 
extern const struct imx_spi_imx_data imx21_cspi_data[] __initconst;

#define imx21_add_cspi(id, pdata)	\

	imx_add_spi_imx(&imx21_cspi_data[id], pdata)

#define imx21_add_spi_imx0(pdata)	imx21_add_cspi(0, pdata)

#define imx21_add_spi_imx1(pdata)	imx21_add_cspi(1, pdata)

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

+6 −6
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 
#define imx27_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v1(MX27_NFC_BASE_ADDR, MX27_INT_NANDFC, pdata)



#define imx27_add_spi_imx0(pdata)	\

	imx_add_spi_imx(0, MX27_CSPI1_BASE_ADDR, SZ_4K, MX27_INT_CSPI1, pdata)

#define imx27_add_spi_imx1(pdata)	\

	imx_add_spi_imx(1, MX27_CSPI2_BASE_ADDR, SZ_4K, MX27_INT_CSPI2, pdata)

#define imx27_add_spi_imx2(pdata)	\

	imx_add_spi_imx(2, MX27_CSPI3_BASE_ADDR, SZ_4K, MX27_INT_CSPI3, pdata)
 
extern const struct imx_spi_imx_data imx27_cspi_data[] __initconst;

#define imx27_add_cspi(id, pdata)	\

	imx_add_spi_imx(&imx27_cspi_data[id], pdata)

#define imx27_add_spi_imx0(pdata)	imx27_add_cspi(0, pdata)

#define imx27_add_spi_imx1(pdata)	imx27_add_cspi(1, pdata)

#define imx27_add_spi_imx2(pdata)	imx27_add_cspi(2, pdata)

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

+6 −6
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ 
#define imx25_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v21(MX25_NFC_BASE_ADDR, MX25_INT_NANDFC, pdata)



#define imx25_add_spi_imx0(pdata)	\

	imx_add_spi_imx(0, MX25_CSPI1_BASE_ADDR, SZ_16K, MX25_INT_CSPI1, pdata)

#define imx25_add_spi_imx1(pdata)	\

	imx_add_spi_imx(1, MX25_CSPI2_BASE_ADDR, SZ_16K, MX25_INT_CSPI2, pdata)

#define imx25_add_spi_imx2(pdata)	\

	imx_add_spi_imx(2, MX25_CSPI3_BASE_ADDR, SZ_16K, MX25_INT_CSPI3, pdata)
 
extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;

#define imx25_add_spi_imx(id, pdata)	\

	imx_add_spi_imx(&imx25_spi_imx_data[id], pdata)

#define imx25_add_spi_imx0(pdata)	imx25_add_spi_imx(0, pdata)

#define imx25_add_spi_imx1(pdata)	imx25_add_spi_imx(1, pdata)

#define imx25_add_spi_imx2(pdata)	imx25_add_spi_imx(2, pdata)

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

+6 −6
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 
#define imx31_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v1(MX31_NFC_BASE_ADDR, MX31_INT_NANDFC, pdata)



#define imx31_add_spi_imx0(pdata)	\

	imx_add_spi_imx(0, MX31_CSPI1_BASE_ADDR, SZ_4K, MX31_INT_CSPI1, pdata)

#define imx31_add_spi_imx1(pdata)	\

	imx_add_spi_imx(1, MX31_CSPI2_BASE_ADDR, SZ_4K, MX31_INT_CSPI2, pdata)

#define imx31_add_spi_imx2(pdata)	\

	imx_add_spi_imx(2, MX31_CSPI3_BASE_ADDR, SZ_4K, MX31_INT_CSPI3, pdata)
 
extern const struct imx_spi_imx_data imx31_cspi_data[] __initconst;

#define imx31_add_cspi(id, pdata)	\

	imx_add_spi_imx(&imx31_cspi_data[id], pdata)

#define imx31_add_spi_imx0(pdata)	imx31_add_cspi(0, pdata)

#define imx31_add_spi_imx1(pdata)	imx31_add_cspi(1, pdata)

#define imx31_add_spi_imx2(pdata)	imx31_add_cspi(2, pdata)

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

+5 −4
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ 
#define imx35_add_mxc_nand(pdata)	\

	imx_add_mxc_nand_v21(MX35_NFC_BASE_ADDR, MX35_INT_NANDFC, pdata)



#define imx35_add_spi_imx0(pdata)	\

	imx_add_spi_imx(0, MX35_CSPI1_BASE_ADDR, SZ_4K, MX35_INT_CSPI1, pdata)

#define imx35_add_spi_imx1(pdata)	\

	imx_add_spi_imx(1, MX35_CSPI2_BASE_ADDR, SZ_4K, MX35_INT_CSPI2, pdata)
 
extern const struct imx_spi_imx_data imx35_cspi_data[] __initconst;

#define imx35_add_cspi(id, pdata)	\

	imx_add_spi_imx(&imx35_cspi_data[id], pdata)

#define imx35_add_spi_imx0(pdata)	imx35_add_cspi(0, pdata)

#define imx35_add_spi_imx1(pdata)	imx35_add_cspi(1, pdata)