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

Commit df93bd76 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

OMAP2+: remove unused UART base addresses from omap_globals 



Now that omap_hwmod + omap_device is used for OMAP UART device and
driver code, we no longer need the UART physical addresses in
omap_globals.

Note that the #defines for the base addresses are still left in
<plat/serial.h> since they are used by DEBUG_LL and uncompress code.

Build tested for OMAP1 (omap1_defconfig) and OMAP2+ (omap2plus_defconfig)

Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 5c56f32e

arch/arm/mach-omap2/common.c

+0 −14
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ static struct omap_globals omap242x_globals = { 
	.ctrl	= OMAP242X_CTRL_BASE,

	.prm	= OMAP2420_PRM_BASE,

	.cm	= OMAP2420_CM_BASE,

	.uart1_phys	= OMAP2_UART1_BASE,

	.uart2_phys	= OMAP2_UART2_BASE,

	.uart3_phys	= OMAP2_UART3_BASE,

};



void __init omap2_set_globals_242x(void)
@@ -71,9 +68,6 @@ static struct omap_globals omap243x_globals = { 
	.ctrl	= OMAP243X_CTRL_BASE,

	.prm	= OMAP2430_PRM_BASE,

	.cm	= OMAP2430_CM_BASE,

	.uart1_phys	= OMAP2_UART1_BASE,

	.uart2_phys	= OMAP2_UART2_BASE,

	.uart3_phys	= OMAP2_UART3_BASE,

};



void __init omap2_set_globals_243x(void)
@@ -92,10 +86,6 @@ static struct omap_globals omap3_globals = { 
	.ctrl	= OMAP343X_CTRL_BASE,

	.prm	= OMAP3430_PRM_BASE,

	.cm	= OMAP3430_CM_BASE,

	.uart1_phys	= OMAP3_UART1_BASE,

	.uart2_phys	= OMAP3_UART2_BASE,

	.uart3_phys	= OMAP3_UART3_BASE,

	.uart4_phys	= OMAP3_UART4_BASE,	/* Only on 3630 */

};



void __init omap2_set_globals_3xxx(void)
@@ -119,10 +109,6 @@ static struct omap_globals omap4_globals = { 
	.prm	= OMAP4430_PRM_BASE,

	.cm	= OMAP4430_CM_BASE,

	.cm2	= OMAP4430_CM2_BASE,

	.uart1_phys	= OMAP4_UART1_BASE,

	.uart2_phys	= OMAP4_UART2_BASE,

	.uart3_phys	= OMAP4_UART3_BASE,

	.uart4_phys	= OMAP4_UART4_BASE,

};



void __init omap2_set_globals_443x(void)

arch/arm/plat-omap/include/plat/common.h

+0 −4
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ struct omap_globals { 
	unsigned long   prm;            /* Power and Reset Management */

	unsigned long   cm;             /* Clock Management */

	unsigned long   cm2;

	unsigned long	uart1_phys;

	unsigned long	uart2_phys;

	unsigned long	uart3_phys;

	unsigned long	uart4_phys;

};



void omap2_set_globals_242x(void);