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

Commit 779b0d53 authored by Cyril Chemparathy's avatar Cyril Chemparathy Committed by Kevin Hilman
Browse files

Davinci: pinmux - use ioremap() 



This patch modifies the pinmux implementation so as to ioremap() the pinmux
register area on first use.

Signed-off-by: default avatarCyril Chemparathy <cyril@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent bd808947

arch/arm/mach-davinci/da830.c

+1 −2
Original line number Diff line number Diff line
@@ -1191,6 +1191,7 @@ static struct davinci_soc_info davinci_soc_info_da830 = { 
	.cpu_clks		= da830_clks,

	.psc_bases		= da830_psc_bases,

	.psc_bases_num		= ARRAY_SIZE(da830_psc_bases),

	.pinmux_base		= DA8XX_SYSCFG0_BASE + 0x120,

	.pinmux_pins		= da830_pins,

	.pinmux_pins_num	= ARRAY_SIZE(da830_pins),

	.intc_base		= DA8XX_CP_INTC_BASE,
@@ -1213,7 +1214,5 @@ void __init da830_init(void) 
	if (WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module"))

		return;



	davinci_soc_info_da830.pinmux_base = DA8XX_SYSCFG0_VIRT(0x120);



	davinci_common_init(&davinci_soc_info_da830);

}

arch/arm/mach-davinci/da850.c

+1 −2
Original line number Diff line number Diff line
@@ -1076,6 +1076,7 @@ static struct davinci_soc_info davinci_soc_info_da850 = { 
	.cpu_clks		= da850_clks,

	.psc_bases		= da850_psc_bases,

	.psc_bases_num		= ARRAY_SIZE(da850_psc_bases),

	.pinmux_base		= DA8XX_SYSCFG0_BASE + 0x120,

	.pinmux_pins		= da850_pins,

	.pinmux_pins_num	= ARRAY_SIZE(da850_pins),

	.intc_base		= DA8XX_CP_INTC_BASE,
@@ -1106,8 +1107,6 @@ void __init da850_init(void) 
	if (WARN(!da8xx_syscfg1_base, "Unable to map syscfg1 module"))

		return;



	davinci_soc_info_da850.pinmux_base = DA8XX_SYSCFG0_VIRT(0x120);



	davinci_common_init(&davinci_soc_info_da850);



	/*

arch/arm/mach-davinci/dm355.c

+1 −1
Original line number Diff line number Diff line
@@ -844,7 +844,7 @@ static struct davinci_soc_info davinci_soc_info_dm355 = { 
	.cpu_clks		= dm355_clks,

	.psc_bases		= dm355_psc_bases,

	.psc_bases_num		= ARRAY_SIZE(dm355_psc_bases),

	.pinmux_base		= IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE),

	.pinmux_base		= DAVINCI_SYSTEM_MODULE_BASE,

	.pinmux_pins		= dm355_pins,

	.pinmux_pins_num	= ARRAY_SIZE(dm355_pins),

	.intc_base		= DAVINCI_ARM_INTC_BASE,

arch/arm/mach-davinci/dm365.c

+1 −1
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ static struct davinci_soc_info davinci_soc_info_dm365 = { 
	.cpu_clks		= dm365_clks,

	.psc_bases		= dm365_psc_bases,

	.psc_bases_num		= ARRAY_SIZE(dm365_psc_bases),

	.pinmux_base		= IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE),

	.pinmux_base		= DAVINCI_SYSTEM_MODULE_BASE,

	.pinmux_pins		= dm365_pins,

	.pinmux_pins_num	= ARRAY_SIZE(dm365_pins),

	.intc_base		= DAVINCI_ARM_INTC_BASE,

arch/arm/mach-davinci/dm644x.c

+1 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ static struct davinci_soc_info davinci_soc_info_dm644x = { 
	.cpu_clks		= dm644x_clks,

	.psc_bases		= dm644x_psc_bases,

	.psc_bases_num		= ARRAY_SIZE(dm644x_psc_bases),

	.pinmux_base		= IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE),

	.pinmux_base		= DAVINCI_SYSTEM_MODULE_BASE,

	.pinmux_pins		= dm644x_pins,

	.pinmux_pins_num	= ARRAY_SIZE(dm644x_pins),

	.intc_base		= DAVINCI_ARM_INTC_BASE,