Skip to contentSkip to conversation

SMDK5250: Modify MAX77686 as per the latest Implementation

PATCH New Rajeshwari Shinde 4 participants 7 messages Dec 10, 2012 – Dec 12, 2012 Char and misc drivers

lore
Share & tools
lore

Rajeshwari Shinde

author
#0 lore raw

cover SMDK5250: Modify MAX77686 as per the latest Implementation

Resolved the compilation errors for PMIC MAX77686 on SMDK5250. Based on resolve branch of u-boot-samsung.

Rajeshwari Shinde (2):
POWER: MAX77686: Modified as per the latest Implementation
SMDK5250: Enable pmic MAX77686

 board/samsung/smdk5250/smdk5250.c  |   15 +++-
 drivers/misc/pmic_max77686.c       |   42 ----------
 drivers/power/pmic/Makefile        |    1 +
 drivers/power/pmic/pmic_max77686.c |   48 +++++++++++
 include/configs/smdk5250.h         |    8 +-
 include/max77686_pmic.h            |  158 ------------------------------------
 include/power/max77686_pmic.h      |  158 ++++++++++++++++++++++++++++++++++++
 7 files changed, 222 insertions(+), 208 deletions(-)
 delete mode 100644 drivers/misc/pmic_max77686.c
 create mode 100644 drivers/power/pmic/pmic_max77686.c
 delete mode 100644 include/max77686_pmic.h
 create mode 100644 include/power/max77686_pmic.h
Signature · 1 line
1.7.4.4
author
#1 lore raw

PATCH 1/2 POWER: MAX77686: Modified as per the latest Implementation

Moved the pmic_max77686.c max77686_pmic.h to drivers/power and made required changes accordingly

Signed-off-by Rajeshwari Shinde <[email protected]>
---
 drivers/misc/pmic_max77686.c       |   42 ----------
 drivers/power/pmic/Makefile        |    1 +
 drivers/power/pmic/pmic_max77686.c |   48 +++++++++++
 include/max77686_pmic.h            |  158 ------------------------------------
 include/power/max77686_pmic.h      |  158 ++++++++++++++++++++++++++++++++++++
 5 files changed, 207 insertions(+), 200 deletions(-)
 delete mode 100644 drivers/misc/pmic_max77686.c
 create mode 100644 drivers/power/pmic/pmic_max77686.c
 delete mode 100644 include/max77686_pmic.h
 create mode 100644 include/power/max77686_pmic.h
drivers/misc/pmic_max77686.c deleted +0 -42
deleted file mode 100644
index 36f7f4d..0000000
@@ -1,42 +0,0 @@
-/*
- *  Copyright (C) 2012 Samsung Electronics
- *  Rajeshwari Shinde <[email protected]>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <pmic.h>
-#include <max77686_pmic.h>
-
-int pmic_init(void)
-{
-	struct pmic *p = get_pmic();
-	static const char name[] = "MAX77686_PMIC";
-
-	puts("Board PMIC init\n");
-	p->name = name;
-	p->interface = PMIC_I2C;
-	p->number_of_regs = PMIC_NUM_OF_REGS;
-	p->hw.i2c.addr = MAX77686_I2C_ADDR;
-	p->hw.i2c.tx_num = 1;
-	p->bus = I2C_PMIC;
-
-	return 0;
-}
drivers/power/pmic/Makefile +1 -0
index e19a9a8..14d426f 100644
@@ -28,6 +28,7 @@ LIB	:= $(obj)libpmic.o
 COBJS-$(CONFIG_POWER_MAX8998) += pmic_max8998.o
 COBJS-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
 COBJS-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
+COBJS-$(CONFIG_POWER_MAX77686) += pmic_max77686.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
drivers/power/pmic/pmic_max77686.c new file +48 -0

48 lines not on this page · raw message

include/max77686_pmic.h deleted +0 -158

158 lines not on this page · raw message

include/power/max77686_pmic.h new file +158 -0

158 lines not on this page · raw message

Signature · 1 line
1.7.4.4
#2 lore raw

PATCH 1/2 POWER: MAX77686: Modified as per the latest Implementation

Hi Rajeshwari,

Quoted 4 lines · Rajeshwari Shinde

Moved the pmic_max77686.c max77686_pmic.h to drivers/power and made required changes accordingly

Signed-off-by Rajeshwari Shinde <[email protected]>
Acked-by Simon Glass <[email protected]>

See nit below if you end up resending.

You might consider using the -M option to git format-patch which detects renames. Or you could use patman...

drivers/misc/pmic_max77686.c

Quoted 15 lines
---
 drivers/misc/pmic_max77686.c       |   42 ----------
 drivers/power/pmic/Makefile        |    1 +
 drivers/power/pmic/pmic_max77686.c |   48 +++++++++++
 include/max77686_pmic.h            |  158 ------------------------------------
 include/power/max77686_pmic.h      |  158 ++++++++++++++++++++++++++++++++++++
 5 files changed, 207 insertions(+), 200 deletions(-)
 delete mode 100644 drivers/misc/pmic_max77686.c
 create mode 100644 drivers/power/pmic/pmic_max77686.c
 delete mode 100644 include/max77686_pmic.h
 create mode 100644 include/power/max77686_pmic.h
drivers/misc/pmic_max77686.c deleted +0 -0
deleted file mode 100644
index 36f7f4d..0000000

[snip]
\

Quoted 19 lines

+++ b/drivers/power/pmic/pmic_max77686.c

drivers/misc/pmic_max77686.c deleted +17 -0
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (C) 2012 Samsung Electronics
+ *  Rajeshwari Shinde <[email protected]>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *

drivers/misc/pmic_max77686.c line 27

Quoted 10 lines
drivers/misc/pmic_max77686.c deleted +10 -0
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <power/pmic.h>
+#include <power/max77686_pmic.h>
+#include <errno.h>

I think this should go above the power/ headers, below common.

Regards,
Simon

author
#3 lore raw

PATCH 2/2 SMDK5250: Enable pmic MAX77686

In reply to Rajeshwari Shinde

Enabled pmic MAX77686 for SMDK5250.

Signed-off-by Rajeshwari Shinde <[email protected]>
---
 board/samsung/smdk5250/smdk5250.c |   15 +++++++++++----
 include/configs/smdk5250.h        |    8 ++++----
 2 files changed, 15 insertions(+), 8 deletions(-)
board/samsung/smdk5250/smdk5250.c +11 -4
index 4c50342..9c926d6 100644
@@ -30,7 +30,7 @@
 #include <asm/arch/mmc.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/sromc.h>
-#include <pmic.h>
+#include <power/pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

@@ -65,9 +65,6 @@ static int smc9115_pre_init(void)
 int board_init(void)
 {
 	gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL);
-#if defined(CONFIG_PMIC)
-	pmic_init();
-#endif
 #ifdef CONFIG_EXYNOS_SPI
 	spi_init();
 #endif

@@ -87,6 +84,16 @@ int dram_init(void)
 	return 0;
 }
 
+#if defined(CONFIG_POWER)
+int power_init_board(void)
+{
+	if (pmic_init(I2C_PMIC))
+		return -1;
+	else
+		return 0;
+}
+#endif
+
 void dram_init_banksize(void)
 {
 	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
include/configs/smdk5250.h +4 -4
index e412da8..df00305 100644
@@ -65,7 +65,7 @@
 #define INFORM1_OFFSET			0x804
 
 /* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (1 << 20))
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (4 << 20))
 
 /* select serial console configuration */
 #define CONFIG_SERIAL3			/* use SERIAL 3 */

@@ -209,9 +209,9 @@
 #define CONFIG_SYS_I2C_SLAVE    0x0
 
 /* PMIC */
-#define CONFIG_PMIC
-#define CONFIG_PMIC_I2C
-#define CONFIG_PMIC_MAX77686
+#define CONFIG_POWER
+#define CONFIG_POWER_I2C
+#define CONFIG_POWER_MAX77686
 
 /* SPI */
 #define CONFIG_ENV_IS_IN_SPI_FLASH
Signature · 1 line
1.7.4.4
#4 lore raw

PATCH 2/2 SMDK5250: Enable pmic MAX77686

Hi Rajeshwari,

Quoted 3 lines · Rajeshwari Shinde

Enabled pmic MAX77686 for SMDK5250.

Signed-off-by Rajeshwari Shinde <[email protected]>

With nit below fixed:

Acked-by Simon Glass <[email protected]>
Quoted 50 lines
---
 board/samsung/smdk5250/smdk5250.c |   15 +++++++++++----
 include/configs/smdk5250.h        |    8 ++++----
 2 files changed, 15 insertions(+), 8 deletions(-)
board/samsung/smdk5250/smdk5250.c +11 -4
index 4c50342..9c926d6 100644
@@ -30,7 +30,7 @@
 #include <asm/arch/mmc.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/sromc.h>
-#include <pmic.h>
+#include <power/pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

@@ -65,9 +65,6 @@ static int smc9115_pre_init(void)
 int board_init(void)
 {
        gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL);
-#if defined(CONFIG_PMIC)
-       pmic_init();
-#endif
 #ifdef CONFIG_EXYNOS_SPI
        spi_init();
 #endif

@@ -87,6 +84,16 @@ int dram_init(void)
        return 0;
 }
 
+#if defined(CONFIG_POWER)
+int power_init_board(void)
+{
+       if (pmic_init(I2C_PMIC))
+               return -1;
+       else
+               return 0;
+}
+#endif
+
 void dram_init_banksize(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
include/configs/smdk5250.h +0 -0
index e412da8..df00305 100644

include/configs/smdk5250.h line 68

Quoted 5 lines
include/configs/smdk5250.h +1 -1
@@ -65,7 +65,7 @@
 #define INFORM1_OFFSET                 0x804
 
 /* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (1 << 20))
+#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (4 << 20))

Unrelated?

Quoted 17 lines
include/configs/smdk5250.h +3 -4
 /* select serial console configuration */
 #define CONFIG_SERIAL3                 /* use SERIAL 3 */

@@ -209,9 +209,9 @@
 #define CONFIG_SYS_I2C_SLAVE    0x0
 
 /* PMIC */
-#define CONFIG_PMIC
-#define CONFIG_PMIC_I2C
-#define CONFIG_PMIC_MAX77686
+#define CONFIG_POWER
+#define CONFIG_POWER_I2C
+#define CONFIG_POWER_MAX77686
 
 /* SPI */
 #define CONFIG_ENV_IS_IN_SPI_FLASH
--
Quoted 2 lines

1.7.4.4

Regards,
Simon

#5 lore raw

cover SMDK5250: Modify MAX77686 as per the latest Implementation

In reply to Rajeshwari Shinde

Hi Rajeshwari,

Quoted 13 lines

Resolved the compilation errors for PMIC MAX77686 on SMDK5250. Based on resolve branch of u-boot-samsung.

Rajeshwari Shinde (2):
POWER: MAX77686: Modified as per the latest Implementation
SMDK5250: Enable pmic MAX77686

 board/samsung/smdk5250/smdk5250.c  |   15 +++-
 drivers/misc/pmic_max77686.c       |   42 ----------
 drivers/power/pmic/Makefile        |    1 +
 drivers/power/pmic/pmic_max77686.c |   48 +++++++++++
 include/configs/smdk5250.h         |    8 +-
 include/max77686_pmic.h            |  158
Quoted 9 lines

------------------------------------
include/power/max77686_pmic.h | 158
++++++++++++++++++++++++++++++++++++ 7 files changed, 222 insertions(+), 208 deletions(-) delete mode 100644 drivers/misc/pmic_max77686.c create mode 100644 drivers/power/pmic/pmic_max77686.c delete mode 100644 include/max77686_pmic.h create mode 100644 include/power/max77686_pmic.h

Reviewed-by Lukasz Majewski <[email protected]>
Acked-by Lukasz Majewski <[email protected]>

Thanks :-)

Signature · 5 lines
Best regards,

Lukasz Majewski

Samsung Poland R&D Center | Linux Platform Group
#6 lore raw

cover SMDK5250: Modify MAX77686 as per the latest Implementation

Quoted 25 lines · Lukasz Majewski

Hi Rajeshwari,

Quoted 13 lines

Resolved the compilation errors for PMIC MAX77686 on SMDK5250. Based on resolve branch of u-boot-samsung.

Rajeshwari Shinde (2):
POWER: MAX77686: Modified as per the latest Implementation
SMDK5250: Enable pmic MAX77686

 board/samsung/smdk5250/smdk5250.c  |   15 +++-
 drivers/misc/pmic_max77686.c       |   42 ----------
 drivers/power/pmic/Makefile        |    1 +
 drivers/power/pmic/pmic_max77686.c |   48 +++++++++++
 include/configs/smdk5250.h         |    8 +-
 include/max77686_pmic.h            |  158
Quoted 9 lines

------------------------------------
include/power/max77686_pmic.h | 158
++++++++++++++++++++++++++++++++++++ 7 files changed, 222 insertions(+), 208 deletions(-) delete mode 100644 drivers/misc/pmic_max77686.c create mode 100644 drivers/power/pmic/pmic_max77686.c delete mode 100644 include/max77686_pmic.h create mode 100644 include/power/max77686_pmic.h

Quoted 5 lines
Reviewed-by Lukasz Majewski <[email protected]>
Acked-by Lukasz Majewski <[email protected]>

Thanks :-)

applied to u-boot-samsung/resolve

Thanks.
Minkyu Kang.