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

Commit 0e585952 authored by Mark A. Greer's avatar Mark A. Greer Committed by Kevin Hilman
Browse files

davinci: Move pinmux setup info to SoC infrastructure 



The pinmux register base and setup can be different for different
SoCs so move the pinmux reg base, pinmux table (and its size) to
the SoC infrastructure.

Signed-off-by: default avatarMark A. Greer <mgreer@mvista.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent d81d188c

arch/arm/mach-davinci/dm355.c

+5 −1
Original line number Diff line number Diff line
@@ -436,6 +436,7 @@ void __init dm355_init_spi0(unsigned chipselect_mask, 
 *				reg  offset mask  mode

 */

static const struct mux_config dm355_pins[] = {

#ifdef CONFIG_DAVINCI_MUX

MUX_CFG(DM355,	MMCSD0,		4,   2,     1,	  0,	 false)



MUX_CFG(DM355,	SD1_CLK,	3,   6,     1,	  1,	 false)
@@ -466,6 +467,7 @@ INT_CFG(DM355, INT_EDMA_TC1_ERR, 4, 1, 1, false) 
EVT_CFG(DM355,  EVT8_ASP1_TX,	      0,    1,    0,     false)

EVT_CFG(DM355,  EVT9_ASP1_RX,	      1,    1,    0,     false)

EVT_CFG(DM355,  EVT26_MMC0_RX,	      2,    1,    0,     false)

#endif

};



/*----------------------------------------------------------------------*/
@@ -558,12 +560,14 @@ 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_pins		= dm355_pins,

	.pinmux_pins_num	= ARRAY_SIZE(dm355_pins),

};



void __init dm355_init(void)

{

	davinci_common_init(&davinci_soc_info_dm355);

	davinci_mux_register(dm355_pins, ARRAY_SIZE(dm355_pins));;

}



static int __init dm355_init_devices(void)

arch/arm/mach-davinci/dm644x.c

+5 −1
Original line number Diff line number Diff line
@@ -346,6 +346,7 @@ static struct platform_device dm644x_emac_device = { 
 *				reg  offset mask  mode

 */

static const struct mux_config dm644x_pins[] = {

#ifdef CONFIG_DAVINCI_MUX

MUX_CFG(DM644X, HDIREN,		0,   16,    1,	  1,	 true)

MUX_CFG(DM644X, ATAEN,		0,   17,    1,	  1,	 true)

MUX_CFG(DM644X, ATAEN_DISABLE,	0,   17,    1,	  0,	 true)
@@ -386,6 +387,7 @@ MUX_CFG(DM644X, RGB666, 0, 22, 1, 1, true) 


MUX_CFG(DM644X, LOEEN,		0,   24,    1,	  1,	 true)

MUX_CFG(DM644X, LFLDEN,		0,   25,    1,	  1,	 false)

#endif

};



/*----------------------------------------------------------------------*/
@@ -498,12 +500,14 @@ 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_pins		= dm644x_pins,

	.pinmux_pins_num	= ARRAY_SIZE(dm644x_pins),

};



void __init dm644x_init(void)

{

	davinci_common_init(&davinci_soc_info_dm644x);

	davinci_mux_register(dm644x_pins, ARRAY_SIZE(dm644x_pins));

}



static int __init dm644x_init_devices(void)

arch/arm/mach-davinci/dm646x.c

+5 −1
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ static struct platform_device dm646x_emac_device = { 
 *				reg  offset mask  mode

 */

static const struct mux_config dm646x_pins[] = {

#ifdef CONFIG_DAVINCI_MUX

MUX_CFG(DM646X, ATAEN,		0,   0,     1,	  1,	 true)



MUX_CFG(DM646X, AUDCK1,		0,   29,    1,	  0,	 false)
@@ -354,6 +355,7 @@ MUX_CFG(DM646X, PTSIMUX_PARALLEL, 0, 16, 3, 2, true) 
MUX_CFG(DM646X, PTSOMUX_SERIAL,		0,   18,    3,    3,	 true)



MUX_CFG(DM646X, PTSIMUX_SERIAL,		0,   16,    3,    3,	 true)

#endif

};



/*----------------------------------------------------------------------*/
@@ -478,12 +480,14 @@ static struct davinci_soc_info davinci_soc_info_dm646x = { 
	.cpu_clks		= dm646x_clks,

	.psc_bases		= dm646x_psc_bases,

	.psc_bases_num		= ARRAY_SIZE(dm646x_psc_bases),

	.pinmux_base		= IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE),

	.pinmux_pins		= dm646x_pins,

	.pinmux_pins_num	= ARRAY_SIZE(dm646x_pins),

};



void __init dm646x_init(void)

{

	davinci_common_init(&davinci_soc_info_dm646x);

	davinci_mux_register(dm646x_pins, ARRAY_SIZE(dm646x_pins));

}



static int __init dm646x_init_devices(void)

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

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ struct davinci_soc_info { 
	struct davinci_clk		*cpu_clks;

	void __iomem			**psc_bases;

	unsigned long			psc_bases_num;

	void __iomem			*pinmux_base;

	const struct mux_config		*pinmux_pins;

	unsigned long			pinmux_pins_num;

};



extern struct davinci_soc_info davinci_soc_info;

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

+0 −6
Original line number Diff line number Diff line
@@ -168,15 +168,9 @@ enum davinci_dm355_index { 


#ifdef CONFIG_DAVINCI_MUX

/* setup pin muxing */

extern void davinci_mux_init(void);

extern int davinci_mux_register(const struct mux_config *pins,

				unsigned long size);

extern int davinci_cfg_reg(unsigned long reg_cfg);

#else

/* boot loader does it all (no warnings from CONFIG_DAVINCI_MUX_WARNINGS) */

static inline void davinci_mux_init(void) {}

static inline int davinci_mux_register(const struct mux_config *pins,

				       unsigned long size) { return 0; }

static inline int davinci_cfg_reg(unsigned long reg_cfg) { return 0; }

#endif