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

Commit e0c199d0 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Sekhar Nori
Browse files

DA8xx: kill duplicate #define DA8XX_PLL1_BASE 



Commit 044ca015 (davinci: da850/omap-l138: add
support for SoC suspend) introduced DA8XX_PLL1_BASE despite PLL1 exists only on
DA850/OMAP-L138 and da850.c even already #define'd DA850_PLL1_BASE. Kill the
duplicate macro, renaming an existing reference to it...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
parent 5a9f68fd

arch/arm/mach-davinci/da850.c

+1 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ int da850_register_pm(struct platform_device *pdev) 
	if (!pdata->cpupll_reg_base)

		return -ENOMEM;



	pdata->ddrpll_reg_base = ioremap(DA8XX_PLL1_BASE, SZ_4K);

	pdata->ddrpll_reg_base = ioremap(DA850_PLL1_BASE, SZ_4K);

	if (!pdata->ddrpll_reg_base) {

		ret = -ENOMEM;

		goto no_ddrpll_mem;

arch/arm/mach-davinci/include/mach/da8xx.h

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ extern unsigned int da850_max_speed; 
#define DA8XX_GPIO_BASE		0x01e26000

#define DA8XX_PSC1_BASE		0x01e27000

#define DA8XX_LCD_CNTRL_BASE	0x01e13000

#define DA8XX_PLL1_BASE		0x01e1a000

#define DA8XX_MMCSD0_BASE	0x01c40000

#define DA8XX_AEMIF_CS2_BASE	0x60000000

#define DA8XX_AEMIF_CS3_BASE	0x62000000