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

Commit c8b8b1f2 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds
Browse files

[PATCH] powermac: Fix loss of ethernet PHY on sleep 



Some recent PowerBook models tend to lose the ethernet PHY on
suspend/resume.  It -seems- that they use a combo ethernet-firewire PHY
chip and the firewire PHY seems to die the same way when that happens.  Not
trying to toggle the firewire cable power appears to fix it.  So this patch
disables changes to the firewire cable power control GPIO on those models.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e1c92117

arch/powerpc/platforms/powermac/feature.c

+5 −5
Original line number Diff line number Diff line
@@ -1646,10 +1646,10 @@ static void intrepid_shutdown(struct macio_chip *macio, int sleep_mode) 
		  KL0_SCC_CELL_ENABLE);



	MACIO_BIC(KEYLARGO_FCR1,

		  /*KL1_USB2_CELL_ENABLE |*/

		KL1_I2S0_CELL_ENABLE | KL1_I2S0_CLK_ENABLE_BIT |

		KL1_I2S0_ENABLE | KL1_I2S1_CELL_ENABLE |

		KL1_I2S1_CLK_ENABLE_BIT | KL1_I2S1_ENABLE);

		KL1_I2S1_CLK_ENABLE_BIT | KL1_I2S1_ENABLE |

		KL1_EIDE0_ENABLE);

	if (pmac_mb.board_flags & PMAC_MB_MOBILE)

		MACIO_BIC(KEYLARGO_FCR1, KL1_UIDE_RESET_N);
@@ -2183,7 +2183,7 @@ static struct pmac_mb_def pmac_mb_defs[] = { 
	},

	{	"PowerMac10,1",			"Mac mini",

		PMAC_TYPE_UNKNOWN_INTREPID,	intrepid_features,

		PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER,

		PMAC_MB_MAY_SLEEP,

	},

	{	"iMac,1",			"iMac (first generation)",

		PMAC_TYPE_ORIG_IMAC,		paddington_features,
@@ -2295,11 +2295,11 @@ static struct pmac_mb_def pmac_mb_defs[] = { 
	},

	{	"PowerBook5,8",			"PowerBook G4 15\"",

		PMAC_TYPE_UNKNOWN_INTREPID,	intrepid_features,

		PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,

		PMAC_MB_MAY_SLEEP  | PMAC_MB_MOBILE,

	},

	{	"PowerBook5,9",			"PowerBook G4 17\"",

		PMAC_TYPE_UNKNOWN_INTREPID,	intrepid_features,

		PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,

		PMAC_MB_MAY_SLEEP | PMAC_MB_MOBILE,

	},

	{	"PowerBook6,1",			"PowerBook G4 12\"",

		PMAC_TYPE_UNKNOWN_INTREPID,	intrepid_features,