ARM i.MX: remove unused improperly prefixed register defines
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
d089e3caa5
commit
4c53af062b
|
@ -167,8 +167,8 @@ static int imx25_3ds_fec_init(void)
|
|||
* FEC_RESET_B: gpio2[3] is ALT 5 mode of pin A17
|
||||
* FEC_ENABLE_B: gpio4[8] is ALT 5 mode of pin D12
|
||||
*/
|
||||
writel(0x8, IMX_IOMUXC_BASE + 0x0238); /* open drain */
|
||||
writel(0x0, IMX_IOMUXC_BASE + 0x028C); /* cmos, no pu/pd */
|
||||
writel(0x8, MX25_IOMUXC_BASE_ADDR + 0x0238); /* open drain */
|
||||
writel(0x0, MX25_IOMUXC_BASE_ADDR + 0x028C); /* cmos, no pu/pd */
|
||||
|
||||
#define FEC_ENABLE_GPIO 35
|
||||
#define FEC_RESET_B_GPIO 104
|
||||
|
|
|
@ -187,7 +187,7 @@ static void __bare_init noinline setup_sdram(u32 memsize, u32 mode, u32 sdram_ad
|
|||
void __bare_init __naked reset(void)
|
||||
{
|
||||
u32 r0, r1;
|
||||
void *iomuxc_base = (void *)IMX_IOMUXC_BASE;
|
||||
void *iomuxc_base = (void *)MX35_IOMUXC_BASE_ADDR;
|
||||
int i;
|
||||
#ifdef CONFIG_NAND_IMX_BOOT
|
||||
unsigned int *trg, *src;
|
||||
|
|
|
@ -116,7 +116,7 @@ static void __bare_init __memcpy32(void *trg, const void *src, int size)
|
|||
static int __maybe_unused is_pagesize_2k(void)
|
||||
{
|
||||
#ifdef CONFIG_ARCH_IMX21
|
||||
if (readl(IMX_SYSTEM_CTL_BASE + 0x14) & (1 << 5))
|
||||
if (readl(MX21_SYSCTRL_BASE_ADDR + 0x14) & (1 << 5))
|
||||
return 1;
|
||||
else
|
||||
return 0;
|
||||
|
|
|
@ -59,11 +59,6 @@
|
|||
#define MX1_AVIC_BASE_ADDR (0x23000 + MX1_IO_BASE_ADDR)
|
||||
#define MX1_CSI_BASE_ADDR (0x24000 + MX1_IO_BASE_ADDR)
|
||||
|
||||
/* FIXME: get rid of these */
|
||||
#define IMX_TIM1_BASE MX1_CCM_BASE_ADDR
|
||||
#define IMX_WDT_BASE MX1_WDT_BASE_ADDR
|
||||
#define IMX_GPIO_BASE MX1_GPIO_BASE_ADDR
|
||||
|
||||
/* SYSCTRL Registers */
|
||||
#define SIDR __REG(MX1_SCM_BASE_ADDR + 0x4) /* Silicon ID Register */
|
||||
#define FMCR __REG(MX1_SCM_BASE_ADDR + 0x8) /* Function Multiplex Control Register */
|
||||
|
|
|
@ -71,12 +71,6 @@
|
|||
|
||||
#define MX21_IRAM_BASE_ADDR 0xffffe800 /* internal ram */
|
||||
|
||||
/* FIXME: Get rid of these */
|
||||
#define IMX_GPIO_BASE MX21_GPIO_BASE_ADDR
|
||||
#define IMX_TIM1_BASE MX21_GPT1_BASE_ADDR
|
||||
#define IMX_WDT_BASE MX21_WDOG_BASE_ADDR
|
||||
#define IMX_SYSTEM_CTL_BASE MX21_SYSCTRL_BASE_ADDR
|
||||
|
||||
/* AIPI */
|
||||
#define AIPI1_PSR0 __REG(MX21_AIPI_BASE_ADDR + 0x00)
|
||||
#define AIPI1_PSR1 __REG(MX21_AIPI_BASE_ADDR + 0x04)
|
||||
|
|
|
@ -76,13 +76,6 @@
|
|||
#define MX25_USB_HS_BASE_ADDR (MX25_USB_BASE_ADDR + 0x0400)
|
||||
#define MX25_CSI_BASE_ADDR 0x53ff8000
|
||||
|
||||
/* FIXME: Get rid of these */
|
||||
#define IMX_TIM1_BASE MX25_GPT1_BASE_ADDR
|
||||
#define IMX_IOMUXC_BASE MX25_IOMUXC_BASE_ADDR
|
||||
#define IMX_WDT_BASE MX25_WDOG_BASE_ADDR
|
||||
#define IMX_CCM_BASE MX25_CCM_BASE_ADDR
|
||||
#define IMX_ESD_BASE MX25_ESDCTL_BASE_ADDR
|
||||
|
||||
/*
|
||||
* Clock Controller Module (CCM)
|
||||
*/
|
||||
|
@ -139,14 +132,4 @@
|
|||
#define MX25_ESDCTL_BASE_ADDR 0xb8001000
|
||||
#define MX25_WEIM_BASE_ADDR 0xb8002000
|
||||
|
||||
/*
|
||||
* Watchdog Registers
|
||||
*/
|
||||
#define WCR __REG16(IMX_WDT_BASE + 0x00) /* Watchdog Control Register */
|
||||
#define WSR __REG16(IMX_WDT_BASE + 0x02) /* Watchdog Service Register */
|
||||
#define WSTR __REG16(IMX_WDT_BASE + 0x04) /* Watchdog Status Register */
|
||||
|
||||
/* important definition of some bits of WCR */
|
||||
#define WCR_WDE 0x04
|
||||
|
||||
#endif /* __ASM_ARCH_MX25_REGS_H */
|
||||
|
|
|
@ -101,12 +101,6 @@
|
|||
/* IRAM */
|
||||
#define MX27_IRAM_BASE_ADDR 0xffff4c00 /* internal ram */
|
||||
|
||||
/* FIXME: get rid of these */
|
||||
#define IMX_GPIO_BASE MX27_GPIO_BASE_ADDR
|
||||
#define IMX_NFC_BASE MX27_NFC_BASE_ADDR
|
||||
#define IMX_WDT_BASE MX27_WDOG_BASE_ADDR
|
||||
#define IMX_ESD_BASE MX27_SDRAMC_BASE_ADDR
|
||||
|
||||
#define PCMCIA_PIPR (MX27_PCMCIA_CTL_BASE_ADDR + 0x00)
|
||||
#define PCMCIA_PSCR (MX27_PCMCIA_CTL_BASE_ADDR + 0x04)
|
||||
#define PCMCIA_PER (MX27_PCMCIA_CTL_BASE_ADDR + 0x08)
|
||||
|
|
|
@ -130,13 +130,6 @@
|
|||
|
||||
#define MX31_PCMCIA_MEM_BASE_ADDR 0xbc000000
|
||||
|
||||
/* FIXME: Get rid of these */
|
||||
#define IMX_TIM1_BASE MX31_GPT1_BASE_ADDR
|
||||
#define IMX_WDT_BASE MX31_WDOG_BASE_ADDR
|
||||
#define IMX_ESD_BASE MX31_ESDCTL_BASE_ADDR
|
||||
#define IMX_NFC_BASE MX31_NFC_BASE_ADDR
|
||||
#define IOMUXC_BASE MX31_IOMUXC_BASE_ADDR
|
||||
|
||||
/*
|
||||
* Clock Controller Module (CCM)
|
||||
*/
|
||||
|
|
|
@ -130,14 +130,6 @@
|
|||
#define MX35_NFC_BASE_ADDR 0xbb000000
|
||||
#define MX35_PCMCIA_MEM_BASE_ADDR 0xbc000000
|
||||
|
||||
/* FIXME: Get rid of these */
|
||||
#define IMX_WDT_BASE MX35_WDOG_BASE_ADDR
|
||||
#define IMX_TIM1_BASE MX35_GPT1_BASE_ADDR
|
||||
#define IMX_ESD_BASE MX35_ESDCTL_BASE_ADDR
|
||||
#define IMX_IOMUXC_BASE MX35_IOMUXC_BASE_ADDR
|
||||
#define IMX_CCM_BASE MX35_CCM_BASE_ADDR
|
||||
#define IMX_NFC_BASE MX35_NFC_BASE_ADDR
|
||||
|
||||
/*
|
||||
* Clock Controller Module (CCM)
|
||||
*/
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
#ifndef __MACH_IMX51_REGS_H
|
||||
#define __MACH_IMX51_REGS_H
|
||||
|
||||
#define IMX_TIM1_BASE 0x73fa0000
|
||||
#define IMX_WDT_BASE 0x73f98000
|
||||
#define IMX_IOMUXC_BASE 0x73fa8000
|
||||
|
||||
/* WEIM registers */
|
||||
#define WEIM_CSxGCR1(n) (((n) * 0x18) + 0x00)
|
||||
#define WEIM_CSxGCR2(n) (((n) * 0x18) + 0x04)
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
#ifndef __MACH_IMX53_REGS_H
|
||||
#define __MACH_IMX53_REGS_H
|
||||
|
||||
#define IMX_TIM1_BASE 0X53FA0000
|
||||
#define IMX_WDT_BASE 0X53F98000
|
||||
#define IMX_IOMUXC_BASE 0X53FA8000
|
||||
|
||||
#define MX53_IROM_BASE_ADDR 0x0
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
#ifndef __MACH_IMX6_REGS_H
|
||||
#define __MACH_IMX6_REGS_H
|
||||
|
||||
#define IMX_TIM1_BASE 0x02098000
|
||||
#define IMX_WDT_BASE 0x020bc000
|
||||
#define IMX_IOMUXC_BASE 0x020e0000
|
||||
|
||||
#define MX6_AIPS1_ARB_BASE_ADDR 0x02000000
|
||||
#define MX6_AIPS2_ARB_BASE_ADDR 0x02100000
|
||||
|
||||
|
@ -12,8 +8,6 @@
|
|||
#define MX6_ATZ1_BASE_ADDR MX6_AIPS1_ARB_BASE_ADDR
|
||||
#define MX6_ATZ2_BASE_ADDR MX6_AIPS2_ARB_BASE_ADDR
|
||||
|
||||
#define IPU_CTRL_BASE_ADDR 0x02400000
|
||||
|
||||
/* slots 0,7 of SDMA reserved, therefore left unused in IPMUX3 */
|
||||
#define MX6_SPDIF_BASE_ADDR (MX6_ATZ1_BASE_ADDR + 0x04000)
|
||||
#define MX6_ECSPI1_BASE_ADDR (MX6_ATZ1_BASE_ADDR + 0x08000)
|
||||
|
|
Loading…
Reference in New Issue