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

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

arm/imx: remove mx31_setup_weimcs() from mx31.h 



The helper function mx31_setup_weimcs() references IOMEM() and
IMX_IO_P2V() but without required header mach/hardware.h included
in mx31.h.  This will break the build of those mx31 based board file
with no direct inclusion of mach/hardware.h, or when indirect inclusion
to mach/hardware.h breaks.

For example, when the inclusion of mach/hardware.h gets removed from
mach/gpio.h, we will see the following compile error.

  CC      arch/arm/mach-imx/mach-pcm037_eet.o
In file included from arch/arm/mach-imx/devices-imx31.h:9:0,
                 from arch/arm/mach-imx/mach-pcm037_eet.c:20:
arch/arm/plat-mxc/include/mach/mx31.h: In function ‘mx31_setup_weimcs’:
arch/arm/plat-mxc/include/mach/mx31.h:129:2: error: implicit declaration of function ‘IOMEM’
arch/arm/plat-mxc/include/mach/mx31.h:129:2: error: implicit declaration of function ‘IMX_IO_P2V’

This patch removes mx31_setup_weimcs() from mx31.h and makes it local
to mach-qong.c, which is the only user for this helper.

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

arch/arm/mach-imx/mach-qong.c

+4 −1
Original line number Diff line number Diff line
@@ -190,7 +190,10 @@ static struct platform_device qong_nand_device = { 
static void __init qong_init_nand_mtd(void)

{

	/* init CS */

	mx31_setup_weimcs(3, 0x00004f00, 0x20013b31, 0x00020800);

	__raw_writel(0x00004f00, MX31_IO_ADDRESS(MX31_WEIM_CSCRxU(3)));

	__raw_writel(0x20013b31, MX31_IO_ADDRESS(MX31_WEIM_CSCRxL(3)));

	__raw_writel(0x00020800, MX31_IO_ADDRESS(MX31_WEIM_CSCRxA(3)));



	mxc_iomux_set_gpr(MUX_SDCTL_CSD1_SEL, true);



	/* enable pin */

arch/arm/plat-mxc/include/mach/mx31.h

+0 −14
Original line number Diff line number Diff line 
#ifndef __MACH_MX31_H__

#define __MACH_MX31_H__



#ifndef __ASSEMBLER__

#include <linux/io.h>

#endif



/*

 * IRAM

 */
@@ -122,16 +118,6 @@ 
#define MX31_IO_P2V(x)			IMX_IO_P2V(x)

#define MX31_IO_ADDRESS(x)		IOMEM(MX31_IO_P2V(x))



#ifndef __ASSEMBLER__

static inline void mx31_setup_weimcs(size_t cs,

		unsigned upper, unsigned lower, unsigned addional)

{

	__raw_writel(upper, MX31_IO_ADDRESS(MX31_WEIM_CSCRxU(cs)));

	__raw_writel(lower, MX31_IO_ADDRESS(MX31_WEIM_CSCRxL(cs)));

	__raw_writel(addional, MX31_IO_ADDRESS(MX31_WEIM_CSCRxA(cs)));

}

#endif



#define MX31_INT_I2C3		3

#define MX31_INT_I2C2		4

#define MX31_INT_MPEG4_ENCODER	5