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

Commit 9bbef187 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: move revision definitions and declarations into a header 



The revision definitions and declarations are widely used by clock
drivers.  As a step of moving clock drivers out of arch/arm/mach-imx,
let's create header include/soc/imx/revision.h to accommodate them.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 5ab96a8d

arch/arm/mach-imx/common.h

+0 −4
Original line number Diff line number Diff line
@@ -56,13 +56,10 @@ struct platform_device *mxc_register_gpio(char *name, int id, 
void mxc_set_cpu_type(unsigned int type);

void mxc_restart(enum reboot_mode, const char *);

void mxc_arch_reset_init(void __iomem *);

int mx51_revision(void);

int mx53_revision(void);

void imx_set_aips(void __iomem *);

void imx_aips_allow_unprivileged_access(const char *compat);

int mxc_device_init(void);

void imx_set_soc_revision(unsigned int rev);

unsigned int imx_get_soc_revision(void);

void imx_init_revision_from_anatop(void);

struct device *imx_soc_device_init(void);

void imx6_enable_rbc(bool enable);
@@ -87,7 +84,6 @@ enum mx3_cpu_pwr_mode { 
};



void mx3_cpu_lp_set(enum mx3_cpu_pwr_mode mode);

void imx_print_silicon_rev(const char *cpu, int srev);



void imx_enable_cpu(int cpu, bool enable);

void imx_set_cpu_jump(int cpu, void *jump_addr);

arch/arm/mach-imx/hardware.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#ifndef __ASSEMBLY__

#include <asm/io.h>

#include <soc/imx/revision.h>

#endif

#include <asm/sizes.h>

arch/arm/mach-imx/mx27.h

+0 −4
Original line number Diff line number Diff line
@@ -231,8 +231,4 @@ 
#define MX27_DMA_REQ_SDHC3	36

#define MX27_DMA_REQ_NFC	37



#ifndef __ASSEMBLY__

extern int mx27_revision(void);

#endif



#endif /* ifndef __MACH_MX27_H__ */

arch/arm/mach-imx/mx3x.h

+0 −7
Original line number Diff line number Diff line
@@ -185,11 +185,4 @@ 


#define MX3x_PROD_SIGNATURE		0x1	/* For MX31 */



/* Mandatory defines used globally */



#if !defined(__ASSEMBLY__) && !defined(__MXC_BOOT_UNCOMPRESS)

extern int mx35_revision(void);

extern int mx31_revision(void);

#endif



#endif /* ifndef __MACH_MX3x_H__ */

arch/arm/mach-imx/mxc.h

+0 −16
Original line number Diff line number Diff line
@@ -39,22 +39,6 @@ 
#define MXC_CPU_IMX6SX		0x62

#define MXC_CPU_IMX6Q		0x63



#define IMX_CHIP_REVISION_1_0		0x10

#define IMX_CHIP_REVISION_1_1		0x11

#define IMX_CHIP_REVISION_1_2		0x12

#define IMX_CHIP_REVISION_1_3		0x13

#define IMX_CHIP_REVISION_1_4		0x14

#define IMX_CHIP_REVISION_1_5		0x15

#define IMX_CHIP_REVISION_2_0		0x20

#define IMX_CHIP_REVISION_2_1		0x21

#define IMX_CHIP_REVISION_2_2		0x22

#define IMX_CHIP_REVISION_2_3		0x23

#define IMX_CHIP_REVISION_3_0		0x30

#define IMX_CHIP_REVISION_3_1		0x31

#define IMX_CHIP_REVISION_3_2		0x32

#define IMX_CHIP_REVISION_3_3		0x33

#define IMX_CHIP_REVISION_UNKNOWN	0xff



#define IMX_DDR_TYPE_LPDDR2		1



#ifndef __ASSEMBLY__