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

Commit 972cc482 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC 



Some usages of ARCH_MX25 are assuming that if it is
defined the other SoCs are undefined.  Use SOC_IMX25 for the save
places.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 36a8cac9

arch/arm/plat-mxc/audmux-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int mxc_audmux_v2_init(void) 
		audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR);

	}

#endif

#if defined(CONFIG_ARCH_MX25)

#if defined(CONFIG_SOC_IMX25)

	if (cpu_is_mx25()) {

		audmux_clk = clk_get(NULL, "audmux");

		if (IS_ERR(audmux_clk)) {
@@ -220,7 +220,7 @@ static int mxc_audmux_v2_init(void) 
		}

		audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR);

	}

#endif

#endif /* if defined(CONFIG_SOC_IMX25) */

	audmux_debugfs_init();



	return 0;

arch/arm/plat-mxc/devices/platform-esdhc.c

+2 −2
Original line number Diff line number Diff line
@@ -20,14 +20,14 @@ 
#define imx_esdhc_imx_data_entry(soc, id, hwid)	\

	[id] = imx_esdhc_imx_data_entry_single(soc, id, hwid)



#ifdef CONFIG_ARCH_MX25

#ifdef CONFIG_SOC_IMX25

const struct imx_esdhc_imx_data imx25_esdhc_data[] __initconst = {

#define imx25_esdhc_data_entry(_id, _hwid)				\

	imx_esdhc_imx_data_entry(MX25, _id, _hwid)

	imx25_esdhc_data_entry(0, 1),

	imx25_esdhc_data_entry(1, 2),

};

#endif /* ifdef CONFIG_ARCH_MX25 */

#endif /* ifdef CONFIG_SOC_IMX25 */



#ifdef CONFIG_ARCH_MX35

const struct imx_esdhc_imx_data imx35_esdhc_data[] __initconst = {

arch/arm/plat-mxc/devices/platform-fec.c

+2 −2
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 
		.irq = soc ## _INT_FEC,					\

	}



#ifdef CONFIG_ARCH_MX25

#ifdef CONFIG_SOC_IMX25

const struct imx_fec_data imx25_fec_data __initconst =

	imx_fec_data_entry_single(MX25);

#endif /* ifdef CONFIG_ARCH_MX25 */

#endif /* ifdef CONFIG_SOC_IMX25 */



#ifdef CONFIG_SOC_IMX27

const struct imx_fec_data imx27_fec_data __initconst =

arch/arm/plat-mxc/devices/platform-flexcan.c

+2 −2
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ 
#define imx_flexcan_data_entry(soc, _id, _hwid, _size)			\

	[_id] = imx_flexcan_data_entry_single(soc, _id, _hwid, _size)



#ifdef CONFIG_ARCH_MX25

#ifdef CONFIG_SOC_IMX25

const struct imx_flexcan_data imx25_flexcan_data[] __initconst = {

#define imx25_flexcan_data_entry(_id, _hwid)				\

	imx_flexcan_data_entry(MX25, _id, _hwid, SZ_16K)

	imx25_flexcan_data_entry(0, 1),

	imx25_flexcan_data_entry(1, 2),

};

#endif /* ifdef CONFIG_ARCH_MX25 */

#endif /* ifdef CONFIG_SOC_IMX25 */



#ifdef CONFIG_ARCH_MX35

const struct imx_flexcan_data imx35_flexcan_data[] __initconst = {

arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c

+2 −2
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
		.irq = soc ## _INT_USB_OTG,				\

	}



#ifdef CONFIG_ARCH_MX25

#ifdef CONFIG_SOC_IMX25

const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst =

	imx_fsl_usb2_udc_data_entry_single(MX25);

#endif

#endif /* ifdef CONFIG_SOC_IMX25 */



#ifdef CONFIG_SOC_IMX27

const struct imx_fsl_usb2_udc_data imx27_fsl_usb2_udc_data __initconst =