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

Commit 782f2d78 authored by Cyril Chemparathy's avatar Cyril Chemparathy Committed by Kevin Hilman
Browse files

davinci: cleanup mdio arch code and switch to phy_id 



This patch removes davinci architecture code that has now been rendered
useless by the previous patches in the MDIO separation series.

In addition, the earlier phy_mask definitions have been replaced with
corresponding phy_id definitions.

Signed-off-by: default avatarCyril Chemparathy <cyril@ti.com>
Tested-by: default avatarMichael Williamson <michael.williamson@criticallink.com>
Tested-by: default avatarCaglar Akyuz <caglarakyuz@gmail.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 5d69e007

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

+2 −5
Original line number Diff line number Diff line
@@ -31,9 +31,7 @@ 
#include <mach/usb.h>

#include <mach/aemif.h>



#define DA830_EVM_PHY_MASK		0x0

#define DA830_EVM_MDIO_FREQUENCY	2200000	/* PHY bus frequency */



#define DA830_EVM_PHY_ID		""

/*

 * USB1 VBUS is controlled by GPIO1[15], over-current is reported on GPIO2[4].

 */
@@ -558,9 +556,8 @@ static __init void da830_evm_init(void) 


	da830_evm_usb_init();



	soc_info->emac_pdata->phy_mask = DA830_EVM_PHY_MASK;

	soc_info->emac_pdata->mdio_max_freq = DA830_EVM_MDIO_FREQUENCY;

	soc_info->emac_pdata->rmii_en = 1;

	soc_info->emac_pdata->phy_id = DA830_EVM_PHY_ID;



	ret = davinci_cfg_reg_list(da830_cpgmac_pins);

	if (ret)

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

+2 −5
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ 
#include <mach/mux.h>

#include <mach/aemif.h>



#define DA850_EVM_PHY_MASK		0x1

#define DA850_EVM_MDIO_FREQUENCY	2200000 /* PHY bus frequency */



#define DA850_EVM_PHY_ID		"0:00"

#define DA850_LCD_PWR_PIN		GPIO_TO_PIN(2, 8)

#define DA850_LCD_BL_PIN		GPIO_TO_PIN(2, 15)
@@ -678,8 +676,7 @@ static int __init da850_evm_config_emac(void) 
	/* Enable/Disable MII MDIO clock */

	gpio_direction_output(DA850_MII_MDIO_CLKEN_PIN, rmii_en);



	soc_info->emac_pdata->phy_mask = DA850_EVM_PHY_MASK;

	soc_info->emac_pdata->mdio_max_freq = DA850_EVM_MDIO_FREQUENCY;

	soc_info->emac_pdata->phy_id = DA850_EVM_PHY_ID;



	ret = da8xx_register_emac();

	if (ret)

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

+2 −5
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ static inline int have_tvp7002(void) 
	return 0;

}



#define DM365_EVM_PHY_MASK		(0x2)

#define DM365_EVM_MDIO_FREQUENCY	(2200000) /* PHY bus frequency */



#define DM365_EVM_PHY_ID		"0:01"

/*

 * A MAX-II CPLD is used for various board control functions.

 */
@@ -535,8 +533,7 @@ static void __init evm_init_cpld(void) 


		/* ... and ENET ... */

		dm365evm_emac_configure();

		soc_info->emac_pdata->phy_mask = DM365_EVM_PHY_MASK;

		soc_info->emac_pdata->mdio_max_freq = DM365_EVM_MDIO_FREQUENCY;

		soc_info->emac_pdata->phy_id = DM365_EVM_PHY_ID;

		resets &= ~BIT(3);



		/* ... and AIC33 */

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

+2 −6
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ 
#include <mach/usb.h>

#include <mach/aemif.h>



#define DM644X_EVM_PHY_MASK		(0x2)

#define DM644X_EVM_MDIO_FREQUENCY	(2200000) /* PHY bus frequency */



#define DM644X_EVM_PHY_ID		"0:01"

#define LXT971_PHY_ID	(0x001378e2)

#define LXT971_PHY_MASK	(0xfffffff0)
@@ -707,9 +705,7 @@ static __init void davinci_evm_init(void) 
	davinci_serial_init(&uart_config);

	dm644x_init_asp(&dm644x_evm_snd_data);



	soc_info->emac_pdata->phy_mask = DM644X_EVM_PHY_MASK;

	soc_info->emac_pdata->mdio_max_freq = DM644X_EVM_MDIO_FREQUENCY;



	soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID;

	/* Register the fixup for PHY on DaVinci */

	phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK,

					davinci_phy_fixup);

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

+2 −5
Original line number Diff line number Diff line
@@ -729,9 +729,7 @@ static struct davinci_uart_config uart_config __initdata = { 
	.enabled_uarts = (1 << 0),

};



#define DM646X_EVM_PHY_MASK		(0x2)

#define DM646X_EVM_MDIO_FREQUENCY	(2200000) /* PHY bus frequency */



#define DM646X_EVM_PHY_ID		"0:01"

/*

 * The following EDMA channels/slots are not being used by drivers (for

 * example: Timer, GPIO, UART events etc) on dm646x, hence they are being
@@ -784,8 +782,7 @@ static __init void evm_init(void) 
	if (HAS_ATA)

		davinci_init_ide();



	soc_info->emac_pdata->phy_mask = DM646X_EVM_PHY_MASK;

	soc_info->emac_pdata->mdio_max_freq = DM646X_EVM_MDIO_FREQUENCY;

	soc_info->emac_pdata->phy_id = DM646X_EVM_PHY_ID;

}



#define DM646X_EVM_REF_FREQ		27000000