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

Commit ac8c635a authored by Olof Johansson's avatar Olof Johansson Committed by Jeff Garzik
Browse files

phylib: Add ID for Marvell 88E1240 



Add PHY IDs for Marvell 88E1240. It seems to have close enough programming
models to 1111/1112 for basic support at least.

Also clean up whitespace in the ID list a bit.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent d2ea732e

drivers/net/phy/marvell.c

+18 −5
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static struct phy_driver marvell_drivers[] = { 
		.read_status = &genphy_read_status,

		.ack_interrupt = &marvell_ack_interrupt,

		.config_intr = &marvell_config_intr,

		.driver = {.owner = THIS_MODULE,},

		.driver = { .owner = THIS_MODULE },

	},

	{

		.phy_id = 0x01410c90,
@@ -278,7 +278,7 @@ static struct phy_driver marvell_drivers[] = { 
		.read_status = &genphy_read_status,

		.ack_interrupt = &marvell_ack_interrupt,

		.config_intr = &marvell_config_intr,

		.driver = {.owner = THIS_MODULE,},

		.driver = { .owner = THIS_MODULE },

	},

	{

		.phy_id = 0x01410cc0,
@@ -291,7 +291,7 @@ static struct phy_driver marvell_drivers[] = { 
		.read_status = &genphy_read_status,

		.ack_interrupt = &marvell_ack_interrupt,

		.config_intr = &marvell_config_intr,

		.driver = {.owner = THIS_MODULE,},

		.driver = { .owner = THIS_MODULE },

	},

	{

		.phy_id = 0x01410cd0,
@@ -304,8 +304,21 @@ static struct phy_driver marvell_drivers[] = { 
		.read_status = &genphy_read_status,

		.ack_interrupt = &marvell_ack_interrupt,

		.config_intr = &marvell_config_intr,

		.driver = {.owner = THIS_MODULE,},

	}

		.driver = { .owner = THIS_MODULE },

	},

	{

		.phy_id = 0x01410e30,

		.phy_id_mask = 0xfffffff0,

		.name = "Marvell 88E1240",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.config_init = &m88e1111_config_init,

		.config_aneg = &marvell_config_aneg,

		.read_status = &genphy_read_status,

		.ack_interrupt = &marvell_ack_interrupt,

		.config_intr = &marvell_config_intr,

		.driver = { .owner = THIS_MODULE },

	},

};



static int __init marvell_init(void)