[PATCH 1/2] glamo-core: remove duplicated (and conflicting) defines

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2] glamo-core: remove duplicated (and conflicting) defines

Thibaut Girka
---
 drivers/mfd/glamo-core.c |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/drivers/mfd/glamo-core.c b/drivers/mfd/glamo-core.c
index 8880263..88f2109 100644
--- a/drivers/mfd/glamo-core.c
+++ b/drivers/mfd/glamo-core.c
@@ -50,16 +50,6 @@
 
 #define GLAMO_NR_IRQS 9
 
-#define GLAMO_IRQ_HOSTBUS 0
-#define GLAMO_IRQ_JPEG 1
-#define GLAMO_IRQ_MPEG 2
-#define GLAMO_IRQ_MPROC1 3
-#define GLAMO_IRQ_MPROC0 4
-#define GLAMO_IRQ_CMDQUEUE 5
-#define GLAMO_IRQ_2D 6
-#define GLAMO_IRQ_MMC 7
-#define GLAMO_IRQ_RISC 8
-
 /*
  * Glamo internal settings
  *
@@ -209,8 +199,8 @@ static struct resource glamo_mmc_resources[] = {
   GLAMO_MMC_BUFFER_SIZE - 1,
  .flags = IORESOURCE_MEM
  }, {
- .start = GLAMO_IRQ_MMC,
- .end = GLAMO_IRQ_MMC,
+ .start = GLAMO_IRQIDX_MMC,
+ .end = GLAMO_IRQIDX_MMC,
  .flags = IORESOURCE_IRQ,
  },
 };
--
1.7.1


Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2] glamo-core: clearer indentation for register sets

Thibaut Girka
---
 drivers/mfd/glamo-core.c |   75 ++++++++++++++++++++++++++++------------------
 1 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/drivers/mfd/glamo-core.c b/drivers/mfd/glamo-core.c
index 88f2109..6c99c51 100644
--- a/drivers/mfd/glamo-core.c
+++ b/drivers/mfd/glamo-core.c
@@ -413,54 +413,71 @@ struct glamo_engine_desc {
 };
 
 static const struct glamo_engine_reg_set glamo_lcd_regs[] = {
- { GLAMO_REG_CLOCK_LCD,
- GLAMO_CLOCK_LCD_EN_M5CLK |
- GLAMO_CLOCK_LCD_DG_M5CLK |
- GLAMO_CLOCK_LCD_EN_DMCLK,
+ {
+ GLAMO_REG_CLOCK_LCD,
+
+ GLAMO_CLOCK_LCD_EN_M5CLK |
+ GLAMO_CLOCK_LCD_DG_M5CLK |
+ GLAMO_CLOCK_LCD_EN_DMCLK,
 
- GLAMO_CLOCK_LCD_EN_DHCLK |
- GLAMO_CLOCK_LCD_EN_DCLK
+ GLAMO_CLOCK_LCD_EN_DHCLK |
+ GLAMO_CLOCK_LCD_EN_DCLK
  },
- { GLAMO_REG_CLOCK_GEN5_1,
- GLAMO_CLOCK_GEN51_EN_DIV_DMCLK,
+ {
+ GLAMO_REG_CLOCK_GEN5_1,
 
- GLAMO_CLOCK_GEN51_EN_DIV_DHCLK |
- GLAMO_CLOCK_GEN51_EN_DIV_DCLK
+ GLAMO_CLOCK_GEN51_EN_DIV_DMCLK,
+
+ GLAMO_CLOCK_GEN51_EN_DIV_DHCLK |
+ GLAMO_CLOCK_GEN51_EN_DIV_DCLK
  }
 };
 
 static const struct glamo_engine_reg_set glamo_mmc_regs[] = {
- { GLAMO_REG_CLOCK_MMC,
- GLAMO_CLOCK_MMC_EN_M9CLK |
- GLAMO_CLOCK_MMC_DG_M9CLK,
+ {
+ GLAMO_REG_CLOCK_MMC,
 
- GLAMO_CLOCK_MMC_EN_TCLK |
- GLAMO_CLOCK_MMC_DG_TCLK
+ GLAMO_CLOCK_MMC_EN_M9CLK |
+ GLAMO_CLOCK_MMC_DG_M9CLK,
+
+ GLAMO_CLOCK_MMC_EN_TCLK |
+ GLAMO_CLOCK_MMC_DG_TCLK
  },
- { GLAMO_REG_CLOCK_GEN5_1,
- 0,
- GLAMO_CLOCK_GEN51_EN_DIV_TCLK
+ {
+ GLAMO_REG_CLOCK_GEN5_1,
+
+ 0,
+
+ GLAMO_CLOCK_GEN51_EN_DIV_TCLK
  }
 };
 
 static const struct glamo_engine_reg_set glamo_2d_regs[] = {
- { GLAMO_REG_CLOCK_2D,
- GLAMO_CLOCK_2D_EN_M7CLK |
- GLAMO_CLOCK_2D_DG_M7CLK,
+ {
+ GLAMO_REG_CLOCK_2D,
+
+ GLAMO_CLOCK_2D_EN_M7CLK |
+ GLAMO_CLOCK_2D_DG_M7CLK,
 
- GLAMO_CLOCK_2D_EN_GCLK |
- GLAMO_CLOCK_2D_DG_GCLK
+ GLAMO_CLOCK_2D_EN_GCLK |
+ GLAMO_CLOCK_2D_DG_GCLK
  },
- { GLAMO_REG_CLOCK_GEN5_1,
- 0,
- GLAMO_CLOCK_GEN51_EN_DIV_GCLK,
+ {
+ GLAMO_REG_CLOCK_GEN5_1,
+
+ 0,
+
+ GLAMO_CLOCK_GEN51_EN_DIV_GCLK,
  }
 };
 
 static const struct glamo_engine_reg_set glamo_cmdq_regs[] = {
- { GLAMO_REG_CLOCK_2D,
- GLAMO_CLOCK_2D_EN_M6CLK,
- 0
+ {
+ GLAMO_REG_CLOCK_2D,
+
+ GLAMO_CLOCK_2D_EN_M6CLK,
+
+ 0
  },
 };
 
--
1.7.1