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

Commit 85b8307f authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Kevin Hilman
Browse files

DA850: move MII/RMII pin lists to the board file 



The CPGMAC pin list in da850.c was incorrectly split into two MII/RMII mode
specific pin lists, while what pin group is used is a function of how the board
is wired.  Copy the pin lists to board-da850-evm.c, renaming them accordingly,
and merge the two lists in da850.c into one, da850_cpgmac_pins[], representing
the CPGMAC module as a whole...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Tested-by: default avatarBen Gardiner <bengardiner@nanometrics.ca>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent f48ecc2f

arch/arm/mach-davinci/board-da850-evm.c

+19 −2
Original line number Diff line number Diff line
@@ -600,6 +600,23 @@ static const short da850_evm_lcdc_pins[] = { 
	-1

};



static const short da850_evm_mii_pins[] = {

	DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3,

	DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER,

	DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3,

	DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, DA850_MDIO_CLK,

	DA850_MDIO_D,

	-1

};



static const short da850_evm_rmii_pins[] = {

	DA850_RMII_TXD_0, DA850_RMII_TXD_1, DA850_RMII_TXEN,

	DA850_RMII_CRS_DV, DA850_RMII_RXD_0, DA850_RMII_RXD_1,

	DA850_RMII_RXER, DA850_RMII_MHZ_50_CLK, DA850_MDIO_CLK,

	DA850_MDIO_D,

	-1

};



static int __init da850_evm_config_emac(void)

{

	void __iomem *cfg_chip3_base;
@@ -617,12 +634,12 @@ static int __init da850_evm_config_emac(void) 


	if (rmii_en) {

		val |= BIT(8);

		ret = davinci_cfg_reg_list(da850_rmii_pins);

		ret = davinci_cfg_reg_list(da850_evm_rmii_pins);

		pr_info("EMAC: RMII PHY configured, MII PHY will not be"

							" functional\n");

	} else {

		val &= ~BIT(8);

		ret = davinci_cfg_reg_list(da850_cpgmac_pins);

		ret = davinci_cfg_reg_list(da850_evm_mii_pins);

		pr_info("EMAC: MII PHY configured, RMII PHY will not be"

							" functional\n");

	}

arch/arm/mach-davinci/da850.c

+3 −9
Original line number Diff line number Diff line
@@ -574,15 +574,9 @@ const short da850_cpgmac_pins[] __initdata = { 
	DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER,

	DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3,

	DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, DA850_MDIO_CLK,

	DA850_MDIO_D,

	-1

};



const short da850_rmii_pins[] __initdata = {

	DA850_RMII_TXD_0, DA850_RMII_TXD_1, DA850_RMII_TXEN,

	DA850_RMII_CRS_DV, DA850_RMII_RXD_0, DA850_RMII_RXD_1,

	DA850_RMII_RXER, DA850_RMII_MHZ_50_CLK, DA850_MDIO_CLK,

	DA850_MDIO_D,

	DA850_MDIO_D, DA850_RMII_TXD_0, DA850_RMII_TXD_1, DA850_RMII_TXEN,

	DA850_RMII_CRS_DV, DA850_RMII_RXD_0, DA850_RMII_RXD_1, DA850_RMII_RXER,

	DA850_RMII_MHZ_50_CLK,

	-1

};

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

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ extern const short da850_uart2_pins[]; 
extern const short da850_i2c0_pins[];

extern const short da850_i2c1_pins[];

extern const short da850_cpgmac_pins[];

extern const short da850_rmii_pins[];

extern const short da850_mcasp_pins[];

extern const short da850_lcdcntl_pins[];

extern const short da850_mmcsd0_pins[];