Skip to contentSkip to conversation

ARM: colibri-pxa300: use correct SD detect pin

PATCH New Marek Vasut 4 participants 8 messages Dec 23, 2010 – Jan 17, 2011 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 ARM: colibri-pxa300: use correct SD detect pin

Quoted 5 lines · On Thursday 23 December 2010 16:01:02 Bj?rn Forsman wrote:

The use of wrong SD detect pin was introduced by this commit:

ARM: pxa: Push Colibri evalboard MFP into module files

This fixes it.

Ah, one more thing -- CC linux-arm-kernel (done)

Quoted 45 lines
---
 arch/arm/mach-pxa/colibri-evalboard.c    |    2 +-
 arch/arm/mach-pxa/colibri-pxa300.c       |    2 +-
 arch/arm/mach-pxa/include/mach/colibri.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-pxa/colibri-evalboard.c index 6b2c800..28f667e 100644

arch/arm/mach-pxa/colibri-evalboard.c +1 -1
@@ -50,7 +50,7 @@ static void __init colibri_mmc_init(void)
 			GPIO0_COLIBRI_PXA270_SD_DETECT;
 	if (machine_is_colibri300())	/* PXA300 Colibri */
 		colibri_mci_platform_data.gpio_card_detect =
-			GPIO39_COLIBRI_PXA300_SD_DETECT;
+			GPIO13_COLIBRI_PXA300_SD_DETECT;
 	else				/* PXA320 Colibri */
 		colibri_mci_platform_data.gpio_card_detect =
 			GPIO28_COLIBRI_PXA320_SD_DETECT;
(quoted diff) +0 -0

b/arch/arm/mach-pxa/colibri-pxa300.c index fddb16d..66dd81c 100644

arch/arm/mach-pxa/colibri-pxa300.c +1 -1
@@ -41,7 +41,7 @@ static mfp_cfg_t colibri_pxa300_evalboard_pin_config[]
 __initdata = { GPIO4_MMC1_DAT1,
 	GPIO5_MMC1_DAT2,
 	GPIO6_MMC1_DAT3,
-	GPIO39_GPIO,	/* SD detect */
+	GPIO13_GPIO,	/* GPIO13_COLIBRI_PXA300_SD_DETECT */
 
 	/* UHC */
 	GPIO0_2_USBH_PEN,
(quoted diff) +0 -0

b/arch/arm/mach-pxa/include/mach/colibri.h index 388a96f..cb4236e 100644

arch/arm/mach-pxa/include/mach/colibri.h +1 -1
@@ -60,7 +60,7 @@ static inline void colibri_pxa3xx_init_nand(void) {}
 #define GPIO113_COLIBRI_PXA270_TS_IRQ	113
 
 /* GPIO definitions for Colibri PXA300/310 */
-#define GPIO39_COLIBRI_PXA300_SD_DETECT	39
+#define GPIO13_COLIBRI_PXA300_SD_DETECT	13
 
 /* GPIO definitions for Colibri PXA320 */
 #define GPIO28_COLIBRI_PXA320_SD_DETECT	28
#2 lore raw

PATCH 1/1 ARM: colibri-pxa300: use correct SD detect pin

Hi Marek,

2010/12/23 Marek Vasut <[email protected]>:

Quoted 8 lines · On Thursday 23 December 2010 16:01:02 Bj?rn Forsman wrote:
Quoted 5 lines

The use of wrong SD detect pin was introduced by this commit:

? ARM: pxa: Push Colibri evalboard MFP into module files

This fixes it.

Ah, one more thing -- CC linux-arm-kernel (done)

I didn't CC linux-arm-kernel because the patch was meant for Eric Miao's pxa-linux-2.6.git tree (devel branch). I doesn't apply to mainline.

As Eric anyways uses 'git rebase' on his tree every -rc cycle I suggested that he could squash my patch into your original patch so that we get nice bisectable history.

Best regards,
Bj?rn Forsman

#3 lore raw

PATCH 1/1 ARM: colibri-pxa300: use correct SD detect pin

Quoted 12 lines · On Thursday 23 December 2010 17:59:40 Bj?rn Forsman wrote:

Hi Marek,

2010/12/23 Marek Vasut <[email protected]>:

Quoted 8 lines · On Thursday 23 December 2010 16:01:02 Bj?rn Forsman wrote:
Quoted 5 lines

The use of wrong SD detect pin was introduced by this commit:

ARM: pxa: Push Colibri evalboard MFP into module files

This fixes it.

Ah, one more thing -- CC linux-arm-kernel (done)

Quoted 7 lines

I didn't CC linux-arm-kernel because the patch was meant for Eric Miao's pxa-linux-2.6.git tree (devel branch). I doesn't apply to mainline.

As Eric anyways uses 'git rebase' on his tree every -rc cycle I suggested that he could squash my patch into your original patch so that we get nice bisectable history.

No, no, no ... regarding arm patches, you always CC linux-arm-kernel.

Quoted 3 lines

Best regards,
Bj?rn Forsman

#4 lore raw

PATCH 1/1 ARM: colibri-pxa300: use correct SD detect pin

2010/12/23 Marek Vasut <[email protected]>:

Quoted 17 lines · On Thursday 23 December 2010 17:59:40 Bj?rn Forsman wrote:
Quoted 16 lines

Hi Marek,

2010/12/23 Marek Vasut <[email protected]>:

Quoted 8 lines · On Thursday 23 December 2010 16:01:02 Bj?rn Forsman wrote:
Quoted 5 lines

The use of wrong SD detect pin was introduced by this commit:

? ARM: pxa: Push Colibri evalboard MFP into module files

This fixes it.

Ah, one more thing -- CC linux-arm-kernel (done)

I didn't CC linux-arm-kernel because the patch was meant for Eric Miao's pxa-linux-2.6.git tree (devel branch). I doesn't apply to mainline.

Quoted 5 lines
Quoted 3 lines

As Eric anyways uses 'git rebase' on his tree every -rc cycle I suggested that he could squash my patch into your original patch so that we get nice bisectable history.

No, no, no ... regarding arm patches, you always CC linux-arm-kernel.

Ok.

When the patch is not against mainline, where is appropriate place to say what tree it applies to? As a reply to the patch thread?

Best regards,
Bj?rn Forsman

#5 lore raw

PATCH 1/1 ARM: colibri-pxa300: use correct SD detect pin

Quoted 16 lines · Bj?rn Forsman

2010/12/23 Marek Vasut <[email protected]>:

Quoted 15 lines · On Thursday 23 December 2010 17:59:40 Bj?rn Forsman wrote:
Quoted 14 lines

Hi Marek,

2010/12/23 Marek Vasut <[email protected]>:

Quoted 7 lines · On Thursday 23 December 2010 16:01:02 Bj?rn Forsman wrote:
Quoted 5 lines

The use of wrong SD detect pin was introduced by this commit:

ARM: pxa: Push Colibri evalboard MFP into module files

This fixes it.

Ah, one more thing -- CC linux-arm-kernel (done)

I didn't CC linux-arm-kernel because the patch was meant for Eric Miao's pxa-linux-2.6.git tree (devel branch). I doesn't apply to mainline.

Quoted 8 lines
Quoted 4 lines
Quoted 3 lines

As Eric anyways uses 'git rebase' on his tree every -rc cycle I suggested that he could squash my patch into your original patch so that we get nice bisectable history.

No, no, no ... regarding arm patches, you always CC linux-arm-kernel.

Ok.

When the patch is not against mainline, where is appropriate place to say what tree it applies to? As a reply to the patch thread?

You can write the explanation in the cover letter, or if it is just a small single patch without the cover letter, then beneath the "---" line, but before the "diff ...."

Signature · 2 lines
Regards,
Igor.
#6 lore raw

PATCH 1/1 ARM: colibri-pxa300: use correct SD detect pin

2010/12/24 Igor Grinberg <[email protected]>:

Quoted 7 lines · Bj?rn Forsman
Quoted 2 lines

When the patch is not against mainline, where is appropriate place to say what tree it applies to? As a reply to the patch thread?

You can write the explanation in the cover letter, or if it is just a small single patch without the cover letter, then beneath the "---" line, but before the "diff ...."

Thanks!

#7 lore raw

PATCH 1/1 ARM: colibri-pxa300: use correct SD detect pin

In reply to a message not in the archive

2010/12/23 Bj?rn Forsman <[email protected]>:

Quoted 48 lines

The use of wrong SD detect pin was introduced by this commit:

?ARM: pxa: Push Colibri evalboard MFP into module files

This fixes it.
---

?arch/arm/mach-pxa/colibri-evalboard.c ? ?| ? ?2 +-
?arch/arm/mach-pxa/colibri-pxa300.c ? ? ? | ? ?2 +-
?arch/arm/mach-pxa/include/mach/colibri.h | ? ?2 +-

?3 files changed, 3 insertions(+), 3 deletions(-)

arch/arm/mach-pxa/colibri-evalboard.c +0 -0
index 6b2c800..28f667e 100644
@@ -50,7 +50,7 @@ static void __init colibri_mmc_init(void)
 ? ? ? ? ? ? ? ? ? ? ? ?GPIO0_COLIBRI_PXA270_SD_DETECT;

? ? ? ?if (machine_is_colibri300()) ? ?/* PXA300 Colibri */ ? ? ? ? ? ? ? ?colibri_mci_platform_data.gpio_card_detect =
- ? ? ? ? ? ? ? ? ? ? ? GPIO39_COLIBRI_PXA300_SD_DETECT;
+ ? ? ? ? ? ? ? ? ? ? ? GPIO13_COLIBRI_PXA300_SD_DETECT; ? ? ? ?else ? ? ? ? ? ? ? ? ? ? ? ? ? ?/* PXA320 Colibri */ ? ? ? ? ? ? ? ?colibri_mci_platform_data.gpio_card_detect = ? ? ? ? ? ? ? ? ? ? ? ?GPIO28_COLIBRI_PXA320_SD_DETECT;

arch/arm/mach-pxa/colibri-pxa300.c +1 -1
index fddb16d..66dd81c 100644
@@ -41,7 +41,7 @@ static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = {
 ? ? ? ?GPIO4_MMC1_DAT1,
 ? ? ? ?GPIO5_MMC1_DAT2,
 ? ? ? ?GPIO6_MMC1_DAT3,
- ? ? ? GPIO39_GPIO, ? ?/* SD detect */
+ ? ? ? GPIO13_GPIO, ? ?/* GPIO13_COLIBRI_PXA300_SD_DETECT */
 

? ? ? ?/* UHC */
? ? ? ?GPIO0_2_USBH_PEN,

arch/arm/mach-pxa/include/mach/colibri.h +0 -0
index 388a96f..cb4236e 100644
@@ -60,7 +60,7 @@ static inline void colibri_pxa3xx_init_nand(void) {}

?#define GPIO113_COLIBRI_PXA270_TS_IRQ ?113

?/* GPIO definitions for Colibri PXA300/310 */

arch/arm/mach-pxa/include/mach/colibri.h +1 -1
-#define GPIO39_COLIBRI_PXA300_SD_DETECT ? ? ? ?39
+#define GPIO13_COLIBRI_PXA300_SD_DETECT ? ? ? ?13
Quoted 6 lines

?/* GPIO definitions for Colibri PXA320 */ ?#define GPIO28_COLIBRI_PXA320_SD_DETECT ? ? ? ?28 --
1.7.0.4

Ping?

Applied
#8 lore raw

PATCH 1/1 ARM: colibri-pxa300: use correct SD detect pin

2011/1/15 Bj?rn Forsman <[email protected]>:

Quoted 6 lines

2010/12/23 Bj?rn Forsman <[email protected]>:

Quoted 5 lines

The use of wrong SD detect pin was introduced by this commit:

?ARM: pxa: Push Colibri evalboard MFP into module files

This fixes it.

Applied.

Quoted 52 lines
Quoted 43 lines

---

?arch/arm/mach-pxa/colibri-evalboard.c ? ?| ? ?2 +-
?arch/arm/mach-pxa/colibri-pxa300.c ? ? ? | ? ?2 +-
?arch/arm/mach-pxa/include/mach/colibri.h | ? ?2 +-

?3 files changed, 3 insertions(+), 3 deletions(-)

arch/arm/mach-pxa/colibri-evalboard.c +0 -0
index 6b2c800..28f667e 100644
@@ -50,7 +50,7 @@ static void __init colibri_mmc_init(void)
 ? ? ? ? ? ? ? ? ? ? ? ?GPIO0_COLIBRI_PXA270_SD_DETECT;

? ? ? ?if (machine_is_colibri300()) ? ?/* PXA300 Colibri */ ? ? ? ? ? ? ? ?colibri_mci_platform_data.gpio_card_detect =
- ? ? ? ? ? ? ? ? ? ? ? GPIO39_COLIBRI_PXA300_SD_DETECT;
+ ? ? ? ? ? ? ? ? ? ? ? GPIO13_COLIBRI_PXA300_SD_DETECT; ? ? ? ?else ? ? ? ? ? ? ? ? ? ? ? ? ? ?/* PXA320 Colibri */ ? ? ? ? ? ? ? ?colibri_mci_platform_data.gpio_card_detect = ? ? ? ? ? ? ? ? ? ? ? ?GPIO28_COLIBRI_PXA320_SD_DETECT;

arch/arm/mach-pxa/colibri-pxa300.c +1 -1
index fddb16d..66dd81c 100644
@@ -41,7 +41,7 @@ static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = {
 ? ? ? ?GPIO4_MMC1_DAT1,
 ? ? ? ?GPIO5_MMC1_DAT2,
 ? ? ? ?GPIO6_MMC1_DAT3,
- ? ? ? GPIO39_GPIO, ? ?/* SD detect */
+ ? ? ? GPIO13_GPIO, ? ?/* GPIO13_COLIBRI_PXA300_SD_DETECT */
 

? ? ? ?/* UHC */
? ? ? ?GPIO0_2_USBH_PEN,

arch/arm/mach-pxa/include/mach/colibri.h +0 -0
index 388a96f..cb4236e 100644
@@ -60,7 +60,7 @@ static inline void colibri_pxa3xx_init_nand(void) {}

?#define GPIO113_COLIBRI_PXA270_TS_IRQ ?113

?/* GPIO definitions for Colibri PXA300/310 */

arch/arm/mach-pxa/include/mach/colibri.h +1 -1
-#define GPIO39_COLIBRI_PXA300_SD_DETECT ? ? ? ?39
+#define GPIO13_COLIBRI_PXA300_SD_DETECT ? ? ? ?13
Quoted 6 lines

?/* GPIO definitions for Colibri PXA320 */ ?#define GPIO28_COLIBRI_PXA320_SD_DETECT ? ? ? ?28 --
1.7.0.4

Ping?