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

Commit ec53fe3d authored by Eric Bénard's avatar Eric Bénard Committed by Sascha Hauer
Browse files

eukrea-baseboards: fix the merge in one file 



Last change I did made a big mess in function names and CONFIG names,
this patch fixes this so that the baseboard support is really built
when selected.

Signed-off-by: default avatarEric Bénard <eric@eukrea.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent da5cabf8

arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -215,7 +215,7 @@ struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata = { 
 * Add platform devices present on this baseboard and init

 * Add platform devices present on this baseboard and init

 * them from CPU side as far as required to use them later on

 * them from CPU side as far as required to use them later on

 */

 */

void __init eukrea_mbimxsd_baseboard_init(void)

void __init eukrea_mbimxsd25_baseboard_init(void)

{

{

	if (mxc_iomux_v3_setup_multiple_pads(eukrea_mbimxsd_pads,

	if (mxc_iomux_v3_setup_multiple_pads(eukrea_mbimxsd_pads,

			ARRAY_SIZE(eukrea_mbimxsd_pads)))

			ARRAY_SIZE(eukrea_mbimxsd_pads)))

arch/arm/mach-mx25/mach-cpuimx25.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -147,8 +147,8 @@ static void __init eukrea_cpuimx25_init(void) 
	if (!otg_mode_host)

	if (!otg_mode_host)

		mxc_register_device(&otg_udc_device, &otg_device_pdata);

		mxc_register_device(&otg_udc_device, &otg_device_pdata);





#ifdef CONFIG_MACH_EUKREA_MBIMXSD_BASEBOARD

#ifdef CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD

	eukrea_mbimxsd_baseboard_init();

	eukrea_mbimxsd25_baseboard_init();

#endif

#endif

}

}

arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -216,7 +216,7 @@ struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata = { 
 * Add platform devices present on this baseboard and init

 * Add platform devices present on this baseboard and init

 * them from CPU side as far as required to use them later on

 * them from CPU side as far as required to use them later on

 */

 */

void __init eukrea_mbimxsd_baseboard_init(void)

void __init eukrea_mbimxsd35_baseboard_init(void)

{

{

	if (mxc_iomux_v3_setup_multiple_pads(eukrea_mbimxsd_pads,

	if (mxc_iomux_v3_setup_multiple_pads(eukrea_mbimxsd_pads,

			ARRAY_SIZE(eukrea_mbimxsd_pads)))

			ARRAY_SIZE(eukrea_mbimxsd_pads)))

arch/arm/mach-mx3/mach-cpuimx35.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -201,8 +201,8 @@ static void __init mxc_board_init(void) 
	if (!otg_mode_host)

	if (!otg_mode_host)

		mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata);

		mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata);





#ifdef CONFIG_MACH_EUKREA_MBIMXSD_BASEBOARD

#ifdef CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD

	eukrea_mbimxsd_baseboard_init();

	eukrea_mbimxsd35_baseboard_init();

#endif

#endif

}

}

arch/arm/plat-mxc/include/mach/eukrea-baseboards.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -37,9 +37,9 @@ 
 * mach-mx5/eukrea_mbimx51-baseboard.c for cpuimx51

 * mach-mx5/eukrea_mbimx51-baseboard.c for cpuimx51

 */

 */





extern void eukrea_mbimx25_baseboard_init(void);

extern void eukrea_mbimxsd25_baseboard_init(void);

extern void eukrea_mbimx27_baseboard_init(void);

extern void eukrea_mbimx27_baseboard_init(void);

extern void eukrea_mbimx35_baseboard_init(void);

extern void eukrea_mbimxsd35_baseboard_init(void);

extern void eukrea_mbimx51_baseboard_init(void);

extern void eukrea_mbimx51_baseboard_init(void);





#endif

#endif