Skip to contentSkip to conversation

powerpc/inka4x0: Remove left-over ide reset code.

PATCH New Detlev Zundel 3 participants 5 messages May 5, 2009 – May 15, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/inka4x0: Remove left-over ide reset code.

The pin which was used in preliminary versions of the board for ide reset is really connected to the rtc clock.

---
 board/inka4x0/inka4x0.c   |   33 ---------------------------------
 include/configs/inka4x0.h |    1 -
 2 files changed, 0 insertions(+), 34 deletions(-)
board/inka4x0/inka4x0.c +0 -33
index 7428b92..c645b05 100644
@@ -274,36 +274,3 @@ void pci_init_board(void)
 	pci_mpc5xxx_init(&hose);
 }
 #endif
-
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
-
-void init_ide_reset (void)
-{
-	volatile struct mpc5xxx_wu_gpio	*wu_gpio =
-		(struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO;
-
-	debug ("init_ide_reset\n");
-
-	/* Configure PSC1_4 as GPIO output for ATA reset */
-	setbits_8(&wu_gpio->enable, MPC5XXX_GPIO_WKUP_PSC1_4);
-	setbits_8(&wu_gpio->ddr,    MPC5XXX_GPIO_WKUP_PSC1_4);
-	/* Deassert reset */
-	setbits_8(&wu_gpio->dvo,    MPC5XXX_GPIO_WKUP_PSC1_4);
-}
-
-void ide_set_reset (int idereset)
-{
-	volatile struct mpc5xxx_wu_gpio	*wu_gpio =
-		(struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO;
-
-	debug ("ide_reset(%d)\n", idereset);
-
-	if (idereset) {
-		clrbits_8(&wu_gpio->dvo, MPC5XXX_GPIO_WKUP_PSC1_4);
-		/* Make a delay. MPC5200 spec says 25 usec min */
-		udelay(500000);
-	} else {
-		setbits_8(&wu_gpio->dvo, MPC5XXX_GPIO_WKUP_PSC1_4);
-	}
-}
-#endif
include/configs/inka4x0.h +0 -1
index 5f06b09..46606ca 100644
@@ -418,7 +418,6 @@ static inline void tws_data_config_output(unsigned output)
 #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/
 #undef	CONFIG_IDE_LED			/* LED   for ide not supported	*/
 
-#define	CONFIG_IDE_RESET		/* reset for ide supported	*/
 #define CONFIG_IDE_PREINIT
 
 #define CONFIG_SYS_IDE_MAXBUS		1	/* max. 1 IDE bus		*/
Signature · 1 line
1.6.0.6
#1 lore raw

PATCH 1/1 powerpc/inka4x0: Remove left-over ide reset code.

Hi Grant,

realizing that I forgot to CC you on the original mail[1], I now formally ask you to pull the patch into your repo as it fixes a real bug.

Thanks
Detlev

[1] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/59148

Quoted 62 lines

The pin which was used in preliminary versions of the board for ide reset is really connected to the rtc clock.

---
 board/inka4x0/inka4x0.c   |   33 ---------------------------------
 include/configs/inka4x0.h |    1 -
 2 files changed, 0 insertions(+), 34 deletions(-)
board/inka4x0/inka4x0.c +0 -33
index 7428b92..c645b05 100644
@@ -274,36 +274,3 @@ void pci_init_board(void)
 	pci_mpc5xxx_init(&hose);
 }
 #endif
-
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
-
-void init_ide_reset (void)
-{
-	volatile struct mpc5xxx_wu_gpio	*wu_gpio =
-		(struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO;
-
-	debug ("init_ide_reset\n");
-
-	/* Configure PSC1_4 as GPIO output for ATA reset */
-	setbits_8(&wu_gpio->enable, MPC5XXX_GPIO_WKUP_PSC1_4);
-	setbits_8(&wu_gpio->ddr,    MPC5XXX_GPIO_WKUP_PSC1_4);
-	/* Deassert reset */
-	setbits_8(&wu_gpio->dvo,    MPC5XXX_GPIO_WKUP_PSC1_4);
-}
-
-void ide_set_reset (int idereset)
-{
-	volatile struct mpc5xxx_wu_gpio	*wu_gpio =
-		(struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO;
-
-	debug ("ide_reset(%d)\n", idereset);
-
-	if (idereset) {
-		clrbits_8(&wu_gpio->dvo, MPC5XXX_GPIO_WKUP_PSC1_4);
-		/* Make a delay. MPC5200 spec says 25 usec min */
-		udelay(500000);
-	} else {
-		setbits_8(&wu_gpio->dvo, MPC5XXX_GPIO_WKUP_PSC1_4);
-	}
-}
-#endif
include/configs/inka4x0.h +0 -1
index 5f06b09..46606ca 100644
@@ -418,7 +418,6 @@ static inline void tws_data_config_output(unsigned output)
 #undef	CONFIG_IDE_8xx_DIRECT		/* Direct IDE    not supported	*/
 #undef	CONFIG_IDE_LED			/* LED   for ide not supported	*/
 
-#define	CONFIG_IDE_RESET		/* reset for ide supported	*/
 #define CONFIG_IDE_PREINIT
 
 #define CONFIG_SYS_IDE_MAXBUS		1	/* max. 1 IDE bus		*/
Signature · 5 lines
Old mathematicians never die; they just lose some of their functions.
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
#2 lore raw

PATCH 1/1 powerpc/inka4x0: Remove left-over ide reset code.

Quoted 4 lines · Detlev Zundel

Hi Grant,

realizing that I forgot to CC you on the original mail[1], I now formally ask you to pull the patch into your repo as it fixes a real bug.

Hi Detlev,

I'm not the u-boot mpc5xxx maintainer anymore. I didn't have time to keep up with it. John Rigby is the current maintainer.

g.

Signature · 2 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
#3 lore raw

PATCH 1/1 powerpc/inka4x0: Remove left-over ide reset code.

Hi Grant,

Quoted 2 lines

I'm not the u-boot mpc5xxx maintainer anymore. I didn't have time to keep up with it. John Rigby is the current maintainer.

Argh, my fault, I should have known better. Sorry for the noise.

Cheers
Detlev

Signature · 6 lines
#define KSAMTIB_CIGAM_2SFFJ 0x8519 /* For detecting wrong-endian fs */
                              -- include/linux/jffs2.h
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
#4 lore raw

PATCH 1/1 powerpc/inka4x0: Remove left-over ide reset code.

In reply to Detlev Zundel

Dear Detlev Zundel,

Quoted 8 lines · In message <[email protected]> you wrote:

The pin which was used in preliminary versions of the board for ide reset is really connected to the rtc clock.

---
 board/inka4x0/inka4x0.c   |   33 ---------------------------------
 include/configs/inka4x0.h |    1 -
 2 files changed, 0 insertions(+), 34 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"This is a test of the Emergency Broadcast System. If this had been an
actual emergency, do you really think we'd stick around to tell you?"