Re: [RESEND PATCH 1/4] omap: igep0020: name refactoring for future merge with IGEP3

2011-05-18 Thread Igor Grinberg 
On 05/17/11 13:33, Tony Lindgren wrote:

 * Enric Balletbò i Serra eballe...@gmail.com [110517 00:53]:
 Hi,

 2011/5/17 Tony Lindgren t...@atomide.com:
 * Enric Balletbò i Serra eballe...@gmail.com [110516 10:11]:
 Hi Mike,

 The only comment I wanted to do is maybe I prefer rename the
 board-igep0020 to board-igep00x0 to be more generic. Apart from this
 these patch series looks good for me and has my ack. Thanks.
 I suggest we do the rename separately later on. Otherwise it
 easily gets classified as crazy churn type of patch, so best
 to stick to just code coalescing and fixes for this merge window.
 Ok, so Mike you've my ack, thanks
 Thanks, applying these to devel-cleanup for the upcoming merge
 window.

You mean for-next? Or you've just forgot to update the devel-cleanup?


-- 
Regards,
Igor.

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [RESEND PATCH 1/4] omap: igep0020: name refactoring for future merge with IGEP3

2011-05-17 Thread Tony Lindgren 
* Enric Balletbò i Serra eballe...@gmail.com [110516 10:11]:
 Hi Mike,
 
 The only comment I wanted to do is maybe I prefer rename the
 board-igep0020 to board-igep00x0 to be more generic. Apart from this
 these patch series looks good for me and has my ack. Thanks.

I suggest we do the rename separately later on. Otherwise it
easily gets classified as crazy churn type of patch, so best
to stick to just code coalescing and fixes for this merge window.

Tony
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [RESEND PATCH 1/4] omap: igep0020: name refactoring for future merge with IGEP3

2011-05-17 Thread Enric Balletbò i Serra 
Hi,

2011/5/17 Tony Lindgren t...@atomide.com:
 * Enric Balletbò i Serra eballe...@gmail.com [110516 10:11]:
 Hi Mike,

 The only comment I wanted to do is maybe I prefer rename the
 board-igep0020 to board-igep00x0 to be more generic. Apart from this
 these patch series looks good for me and has my ack. Thanks.

 I suggest we do the rename separately later on. Otherwise it
 easily gets classified as crazy churn type of patch, so best
 to stick to just code coalescing and fixes for this merge window.

Ok, so Mike you've my ack, thanks

Cheers,
   Enric
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [RESEND PATCH 1/4] omap: igep0020: name refactoring for future merge with IGEP3

2011-05-17 Thread Tony Lindgren 
* Enric Balletbò i Serra eballe...@gmail.com [110517 00:53]:
 Hi,
 
 2011/5/17 Tony Lindgren t...@atomide.com:
  * Enric Balletbò i Serra eballe...@gmail.com [110516 10:11]:
  Hi Mike,
 
  The only comment I wanted to do is maybe I prefer rename the
  board-igep0020 to board-igep00x0 to be more generic. Apart from this
  these patch series looks good for me and has my ack. Thanks.
 
  I suggest we do the rename separately later on. Otherwise it
  easily gets classified as crazy churn type of patch, so best
  to stick to just code coalescing and fixes for this merge window.
 
 Ok, so Mike you've my ack, thanks

Thanks, applying these to devel-cleanup for the upcoming merge
window.

Tony
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [RESEND PATCH 1/4] omap: igep0020: name refactoring for future merge with IGEP3

2011-05-16 Thread Enric Balletbò i Serra 
Hi Mike,

The only comment I wanted to do is maybe I prefer rename the
board-igep0020 to board-igep00x0 to be more generic. Apart from this
these patch series looks good for me and has my ack. Thanks.

2011/5/12 Mike Rapoport m...@compulab.co.il:
 IGEP2 and IGEP3 boards are very similar and can be merged into one file.
 Start refactoring with changing igep2 to igep where applicable.

 Signed-off-by: Mike Rapoport m...@compulab.co.il
 ---
  arch/arm/mach-omap2/board-igep0020.c |  158 
 +-
  1 files changed, 79 insertions(+), 79 deletions(-)

 diff --git a/arch/arm/mach-omap2/board-igep0020.c 
 b/arch/arm/mach-omap2/board-igep0020.c
 index c62c297e..ad20f7b 100644
 --- a/arch/arm/mach-omap2/board-igep0020.c
 +++ b/arch/arm/mach-omap2/board-igep0020.c
 @@ -112,7 +112,7 @@ static void __init igep2_get_revision(void)
  * So MTD regards it as 4KiB page size and 256KiB block size 64*(2*2048)
  */

 -static struct mtd_partition igep2_onenand_partitions[] = {
 +static struct mtd_partition igep_onenand_partitions[] = {
        {
                .name           = X-Loader,
                .offset         = 0,
 @@ -140,21 +140,21 @@ static struct mtd_partition igep2_onenand_partitions[] 
 = {
        },
  };

 -static struct omap_onenand_platform_data igep2_onenand_data = {
 -       .parts = igep2_onenand_partitions,
 -       .nr_parts = ARRAY_SIZE(igep2_onenand_partitions),
 +static struct omap_onenand_platform_data igep_onenand_data = {
 +       .parts = igep_onenand_partitions,
 +       .nr_parts = ARRAY_SIZE(igep_onenand_partitions),
        .dma_channel    = -1,   /* disable DMA in OMAP OneNAND driver */
  };

 -static struct platform_device igep2_onenand_device = {
 +static struct platform_device igep_onenand_device = {
        .name           = omap2-onenand,
        .id             = -1,
        .dev = {
 -               .platform_data = igep2_onenand_data,
 +               .platform_data = igep_onenand_data,
        },
  };

 -static void __init igep2_flash_init(void)
 +static void __init igep_flash_init(void)
  {
        u8 cs = 0;
        u8 onenandcs = GPMC_CS_NUM + 1;
 @@ -166,7 +166,7 @@ static void __init igep2_flash_init(void)
                /* Check if NAND/oneNAND is configured */
                if ((ret  0xC00) == 0x800)
                        /* NAND found */
 -                       pr_err(IGEP2: Unsupported NAND found\n);
 +                       pr_err(IGEP: Unsupported NAND found\n);
                else {
                        ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG7);
                        if ((ret  0x3F) == (ONENAND_MAP  24))
 @@ -176,18 +176,18 @@ static void __init igep2_flash_init(void)
        }

        if (onenandcs  GPMC_CS_NUM) {
 -               pr_err(IGEP2: Unable to find configuration in GPMC\n);
 +               pr_err(IGEP: Unable to find configuration in GPMC\n);
                return;
        }

 -       igep2_onenand_data.cs = onenandcs;
 +       igep_onenand_data.cs = onenandcs;

 -       if (platform_device_register(igep2_onenand_device)  0)
 -               pr_err(IGEP2: Unable to register OneNAND device\n);
 +       if (platform_device_register(igep_onenand_device)  0)
 +               pr_err(IGEP: Unable to register OneNAND device\n);
  }

  #else
 -static void __init igep2_flash_init(void) {}
 +static void __init igep_flash_init(void) {}
  #endif

  #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
 @@ -211,11 +211,11 @@ static inline void __init igep2_init_smsc911x(void)
  static inline void __init igep2_init_smsc911x(void) { }
  #endif

 -static struct regulator_consumer_supply igep2_vmmc1_supply =
 +static struct regulator_consumer_supply igep_vmmc1_supply =
        REGULATOR_SUPPLY(vmmc, omap_hsmmc.0);

  /* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
 -static struct regulator_init_data igep2_vmmc1 = {
 +static struct regulator_init_data igep_vmmc1 = {
        .constraints = {
                .min_uV                 = 185,
                .max_uV                 = 315,
 @@ -226,13 +226,13 @@ static struct regulator_init_data igep2_vmmc1 = {
                                        | REGULATOR_CHANGE_STATUS,
        },
        .num_consumer_supplies  = 1,
 -       .consumer_supplies      = igep2_vmmc1_supply,
 +       .consumer_supplies      = igep_vmmc1_supply,
  };

 -static struct regulator_consumer_supply igep2_vio_supply =
 +static struct regulator_consumer_supply igep_vio_supply =
        REGULATOR_SUPPLY(vmmc_aux, omap_hsmmc.1);

 -static struct regulator_init_data igep2_vio = {
 +static struct regulator_init_data igep_vio = {
        .constraints = {
                .min_uV                 = 180,
                .max_uV                 = 180,
 @@ -244,34 +244,34 @@ static struct regulator_init_data igep2_vio = {
                                        | REGULATOR_CHANGE_STATUS,
        },
        .num_consumer_supplies  = 1,
 -       .consumer_supplies      = igep2_vio_supply,
 +      

[PATCH 1/4] omap: igep0020: name refactoring for future merge with IGEP3

2011-05-12 Thread Mike Rapoport 
IGEP2 and IGEP3 boards are very similar and can be merged into one file.
Start refactoring with changing igep2 to igep where applicable.

Signed-off-by: Mike Rapoport m...@compulab.co.il
---
 arch/arm/mach-omap2/board-igep0020.c |  158 +-
 1 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/arch/arm/mach-omap2/board-igep0020.c 
b/arch/arm/mach-omap2/board-igep0020.c
index c62c297e..ad20f7b 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -112,7 +112,7 @@ static void __init igep2_get_revision(void)
  * So MTD regards it as 4KiB page size and 256KiB block size 64*(2*2048)
  */
 
-static struct mtd_partition igep2_onenand_partitions[] = {
+static struct mtd_partition igep_onenand_partitions[] = {
{
.name   = X-Loader,
.offset = 0,
@@ -140,21 +140,21 @@ static struct mtd_partition igep2_onenand_partitions[] = {
},
 };
 
-static struct omap_onenand_platform_data igep2_onenand_data = {
-   .parts = igep2_onenand_partitions,
-   .nr_parts = ARRAY_SIZE(igep2_onenand_partitions),
+static struct omap_onenand_platform_data igep_onenand_data = {
+   .parts = igep_onenand_partitions,
+   .nr_parts = ARRAY_SIZE(igep_onenand_partitions),
.dma_channel= -1,   /* disable DMA in OMAP OneNAND driver */
 };
 
-static struct platform_device igep2_onenand_device = {
+static struct platform_device igep_onenand_device = {
.name   = omap2-onenand,
.id = -1,
.dev = {
-   .platform_data = igep2_onenand_data,
+   .platform_data = igep_onenand_data,
},
 };
 
-static void __init igep2_flash_init(void)
+static void __init igep_flash_init(void)
 {
u8 cs = 0;
u8 onenandcs = GPMC_CS_NUM + 1;
@@ -166,7 +166,7 @@ static void __init igep2_flash_init(void)
/* Check if NAND/oneNAND is configured */
if ((ret  0xC00) == 0x800)
/* NAND found */
-   pr_err(IGEP2: Unsupported NAND found\n);
+   pr_err(IGEP: Unsupported NAND found\n);
else {
ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG7);
if ((ret  0x3F) == (ONENAND_MAP  24))
@@ -176,18 +176,18 @@ static void __init igep2_flash_init(void)
}
 
if (onenandcs  GPMC_CS_NUM) {
-   pr_err(IGEP2: Unable to find configuration in GPMC\n);
+   pr_err(IGEP: Unable to find configuration in GPMC\n);
return;
}
 
-   igep2_onenand_data.cs = onenandcs;
+   igep_onenand_data.cs = onenandcs;
 
-   if (platform_device_register(igep2_onenand_device)  0)
-   pr_err(IGEP2: Unable to register OneNAND device\n);
+   if (platform_device_register(igep_onenand_device)  0)
+   pr_err(IGEP: Unable to register OneNAND device\n);
 }
 
 #else
-static void __init igep2_flash_init(void) {}
+static void __init igep_flash_init(void) {}
 #endif
 
 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
@@ -211,11 +211,11 @@ static inline void __init igep2_init_smsc911x(void)
 static inline void __init igep2_init_smsc911x(void) { }
 #endif
 
-static struct regulator_consumer_supply igep2_vmmc1_supply =
+static struct regulator_consumer_supply igep_vmmc1_supply =
REGULATOR_SUPPLY(vmmc, omap_hsmmc.0);
 
 /* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
-static struct regulator_init_data igep2_vmmc1 = {
+static struct regulator_init_data igep_vmmc1 = {
.constraints = {
.min_uV = 185,
.max_uV = 315,
@@ -226,13 +226,13 @@ static struct regulator_init_data igep2_vmmc1 = {
| REGULATOR_CHANGE_STATUS,
},
.num_consumer_supplies  = 1,
-   .consumer_supplies  = igep2_vmmc1_supply,
+   .consumer_supplies  = igep_vmmc1_supply,
 };
 
-static struct regulator_consumer_supply igep2_vio_supply =
+static struct regulator_consumer_supply igep_vio_supply =
REGULATOR_SUPPLY(vmmc_aux, omap_hsmmc.1);
 
-static struct regulator_init_data igep2_vio = {
+static struct regulator_init_data igep_vio = {
.constraints = {
.min_uV = 180,
.max_uV = 180,
@@ -244,34 +244,34 @@ static struct regulator_init_data igep2_vio = {
| REGULATOR_CHANGE_STATUS,
},
.num_consumer_supplies  = 1,
-   .consumer_supplies  = igep2_vio_supply,
+   .consumer_supplies  = igep_vio_supply,
 };
 
-static struct regulator_consumer_supply igep2_vmmc2_supply =
+static struct regulator_consumer_supply igep_vmmc2_supply =
REGULATOR_SUPPLY(vmmc, omap_hsmmc.1);
 
-static struct regulator_init_data igep2_vmmc2 = {
+static struct