* [PATCH] ARM: colibri-pxa300: use correct SD detect pin [not found] <1293116462-10189-1-git-send-email-bjorn.forsman@gmail.com> @ 2010-12-23 16:15 ` Marek Vasut 2010-12-23 16:59 ` Bjørn Forsman 2011-01-15 18:15 ` Bjørn Forsman 1 sibling, 1 reply; 8+ messages in thread From: Marek Vasut @ 2010-12-23 16:15 UTC (permalink / raw) To: linux-arm-kernel 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) > --- > 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(-) > > diff --git a/arch/arm/mach-pxa/colibri-evalboard.c > b/arch/arm/mach-pxa/colibri-evalboard.c index 6b2c800..28f667e 100644 > --- a/arch/arm/mach-pxa/colibri-evalboard.c > +++ b/arch/arm/mach-pxa/colibri-evalboard.c > @@ -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; > diff --git a/arch/arm/mach-pxa/colibri-pxa300.c > b/arch/arm/mach-pxa/colibri-pxa300.c index fddb16d..66dd81c 100644 > --- a/arch/arm/mach-pxa/colibri-pxa300.c > +++ b/arch/arm/mach-pxa/colibri-pxa300.c > @@ -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, > diff --git a/arch/arm/mach-pxa/include/mach/colibri.h > b/arch/arm/mach-pxa/include/mach/colibri.h index 388a96f..cb4236e 100644 > --- a/arch/arm/mach-pxa/include/mach/colibri.h > +++ b/arch/arm/mach-pxa/include/mach/colibri.h > @@ -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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: colibri-pxa300: use correct SD detect pin 2010-12-23 16:15 ` [PATCH] ARM: colibri-pxa300: use correct SD detect pin Marek Vasut @ 2010-12-23 16:59 ` Bjørn Forsman 2010-12-23 20:57 ` Marek Vasut 0 siblings, 1 reply; 8+ messages in thread From: Bjørn Forsman @ 2010-12-23 16:59 UTC (permalink / raw) To: linux-arm-kernel Hi Marek, 2010/12/23 Marek Vasut <marek.vasut@gmail.com>: > 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) 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: colibri-pxa300: use correct SD detect pin 2010-12-23 16:59 ` Bjørn Forsman @ 2010-12-23 20:57 ` Marek Vasut 2010-12-23 22:13 ` Bjørn Forsman 0 siblings, 1 reply; 8+ messages in thread From: Marek Vasut @ 2010-12-23 20:57 UTC (permalink / raw) To: linux-arm-kernel On Thursday 23 December 2010 17:59:40 Bj?rn Forsman wrote: > Hi Marek, > > 2010/12/23 Marek Vasut <marek.vasut@gmail.com>: > > 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) > > 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. > > Best regards, > Bj?rn Forsman ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: colibri-pxa300: use correct SD detect pin 2010-12-23 20:57 ` Marek Vasut @ 2010-12-23 22:13 ` Bjørn Forsman 2010-12-24 14:27 ` Igor Grinberg 0 siblings, 1 reply; 8+ messages in thread From: Bjørn Forsman @ 2010-12-23 22:13 UTC (permalink / raw) To: linux-arm-kernel 2010/12/23 Marek Vasut <marek.vasut@gmail.com>: > On Thursday 23 December 2010 17:59:40 Bj?rn Forsman wrote: >> Hi Marek, >> >> 2010/12/23 Marek Vasut <marek.vasut@gmail.com>: >> > 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) >> >> 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. 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: colibri-pxa300: use correct SD detect pin 2010-12-23 22:13 ` Bjørn Forsman @ 2010-12-24 14:27 ` Igor Grinberg 2010-12-24 18:41 ` Bjørn Forsman 0 siblings, 1 reply; 8+ messages in thread From: Igor Grinberg @ 2010-12-24 14:27 UTC (permalink / raw) To: linux-arm-kernel On 12/24/10 00:13, Bj?rn Forsman wrote: > 2010/12/23 Marek Vasut <marek.vasut@gmail.com>: >> On Thursday 23 December 2010 17:59:40 Bj?rn Forsman wrote: >>> Hi Marek, >>> >>> 2010/12/23 Marek Vasut <marek.vasut@gmail.com>: >>>> 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) >>> 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. > 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 ...." -- Regards, Igor. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: colibri-pxa300: use correct SD detect pin 2010-12-24 14:27 ` Igor Grinberg @ 2010-12-24 18:41 ` Bjørn Forsman 0 siblings, 0 replies; 8+ messages in thread From: Bjørn Forsman @ 2010-12-24 18:41 UTC (permalink / raw) To: linux-arm-kernel 2010/12/24 Igor Grinberg <grinberg@compulab.co.il>: > On 12/24/10 00:13, Bj?rn Forsman wrote: >> 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! ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: colibri-pxa300: use correct SD detect pin [not found] <1293116462-10189-1-git-send-email-bjorn.forsman@gmail.com> 2010-12-23 16:15 ` [PATCH] ARM: colibri-pxa300: use correct SD detect pin Marek Vasut @ 2011-01-15 18:15 ` Bjørn Forsman 2011-01-17 17:38 ` Eric Miao 1 sibling, 1 reply; 8+ messages in thread From: Bjørn Forsman @ 2011-01-15 18:15 UTC (permalink / raw) To: linux-arm-kernel 2010/12/23 Bj?rn Forsman <bjorn.forsman@gmail.com>: > 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(-) > > diff --git a/arch/arm/mach-pxa/colibri-evalboard.c b/arch/arm/mach-pxa/colibri-evalboard.c > index 6b2c800..28f667e 100644 > --- a/arch/arm/mach-pxa/colibri-evalboard.c > +++ b/arch/arm/mach-pxa/colibri-evalboard.c > @@ -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; > diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c > index fddb16d..66dd81c 100644 > --- a/arch/arm/mach-pxa/colibri-pxa300.c > +++ b/arch/arm/mach-pxa/colibri-pxa300.c > @@ -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, > diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h > index 388a96f..cb4236e 100644 > --- a/arch/arm/mach-pxa/include/mach/colibri.h > +++ b/arch/arm/mach-pxa/include/mach/colibri.h > @@ -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 > -- > 1.7.0.4 > > Ping? ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] ARM: colibri-pxa300: use correct SD detect pin 2011-01-15 18:15 ` Bjørn Forsman @ 2011-01-17 17:38 ` Eric Miao 0 siblings, 0 replies; 8+ messages in thread From: Eric Miao @ 2011-01-17 17:38 UTC (permalink / raw) To: linux-arm-kernel 2011/1/15 Bj?rn Forsman <bjorn.forsman@gmail.com>: > 2010/12/23 Bj?rn Forsman <bjorn.forsman@gmail.com>: >> 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. >> --- >> ?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(-) >> >> diff --git a/arch/arm/mach-pxa/colibri-evalboard.c b/arch/arm/mach-pxa/colibri-evalboard.c >> index 6b2c800..28f667e 100644 >> --- a/arch/arm/mach-pxa/colibri-evalboard.c >> +++ b/arch/arm/mach-pxa/colibri-evalboard.c >> @@ -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; >> diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c >> index fddb16d..66dd81c 100644 >> --- a/arch/arm/mach-pxa/colibri-pxa300.c >> +++ b/arch/arm/mach-pxa/colibri-pxa300.c >> @@ -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, >> diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h >> index 388a96f..cb4236e 100644 >> --- a/arch/arm/mach-pxa/include/mach/colibri.h >> +++ b/arch/arm/mach-pxa/include/mach/colibri.h >> @@ -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 >> -- >> 1.7.0.4 >> >> > > Ping? > ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-01-17 17:38 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1293116462-10189-1-git-send-email-bjorn.forsman@gmail.com>
2010-12-23 16:15 ` [PATCH] ARM: colibri-pxa300: use correct SD detect pin Marek Vasut
2010-12-23 16:59 ` Bjørn Forsman
2010-12-23 20:57 ` Marek Vasut
2010-12-23 22:13 ` Bjørn Forsman
2010-12-24 14:27 ` Igor Grinberg
2010-12-24 18:41 ` Bjørn Forsman
2011-01-15 18:15 ` Bjørn Forsman
2011-01-17 17:38 ` Eric Miao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).