Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion arch/arm/configs/silverbullet_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ CONFIG_CPU_THERMAL=y
CONFIG_IMX_THERMAL=y
CONFIG_DEVICE_THERMAL=y
CONFIG_WATCHDOG=y
CONFIG_ID95APM_WATCHDOG=y
# CONFIG_ID95APM_WATCHDOG is not set
CONFIG_IMX2_WDT=y
CONFIG_MFD_DA9052_I2C=y
CONFIG_MFD_ID95APM=y
Expand Down Expand Up @@ -375,3 +375,5 @@ CONFIG_CRC_CCITT=m
CONFIG_CRC_T10DIF=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_TOUCHSCREEN_CLICKTOUCH=y

26 changes: 26 additions & 0 deletions drivers/net/phy/micrel.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@
#define KS8737_CTRL_INT_ACTIVE_HIGH (1 << 14)
#define KSZ8051_RMII_50MHZ_CLK (1 << 7)

static int gigabit_enabled __initdata = 0;

static int __init gigabit_setup(char *gigabit)
{
if(gigabit != 0 && strcmp(gigabit, "1") == 0)
gigabit_enabled = 1;

return 1;
}
__setup("gigabit=", gigabit_setup);

static int ksz_config_flags(struct phy_device *phydev)
{
int regval;
Expand Down Expand Up @@ -324,6 +335,21 @@ static struct phy_driver ksphy_driver[] = {

static int __init ksphy_init(void)
{
// Tweak KSZ9031
int i = 0;
for(i = 0; i < ARRAY_SIZE(ksphy_driver); i++)
{
if(ksphy_driver[i].phy_id == PHY_ID_KSZ9031)
{
if(gigabit_enabled)
ksphy_driver[i].features = (PHY_GBIT_FEATURES | SUPPORTED_Pause | SUPPORTED_Asym_Pause);
else
ksphy_driver[i].features = (PHY_BASIC_FEATURES | SUPPORTED_Pause | SUPPORTED_Asym_Pause);

break;
}
}

return phy_drivers_register(ksphy_driver,
ARRAY_SIZE(ksphy_driver));
}
Expand Down