* [U-Boot] [PATCH 0/2] SMDK5250: Modify MAX77686 as per the latest Implementation
@ 2012-12-10 11:55 Rajeshwari Shinde
2012-12-10 11:55 ` [U-Boot] [PATCH 1/2] POWER: MAX77686: Modified " Rajeshwari Shinde
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Rajeshwari Shinde @ 2012-12-10 11:55 UTC (permalink / raw)
To: u-boot
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
--
1.7.4.4
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 1/2] POWER: MAX77686: Modified as per the latest Implementation
2012-12-10 11:55 [U-Boot] [PATCH 0/2] SMDK5250: Modify MAX77686 as per the latest Implementation Rajeshwari Shinde
@ 2012-12-10 11:55 ` Rajeshwari Shinde
2012-12-12 14:27 ` Simon Glass
2012-12-10 11:55 ` [U-Boot] [PATCH 2/2] SMDK5250: Enable pmic MAX77686 Rajeshwari Shinde
2012-12-10 13:16 ` [U-Boot] [PATCH 0/2] SMDK5250: Modify MAX77686 as per the latest Implementation Lukasz Majewski
2 siblings, 1 reply; 7+ messages in thread
From: Rajeshwari Shinde @ 2012-12-10 11:55 UTC (permalink / raw)
To: u-boot
Moved the pmic_max77686.c max77686_pmic.h to drivers/power
and made required changes accordingly
Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
---
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
diff --git a/drivers/misc/pmic_max77686.c b/drivers/misc/pmic_max77686.c
deleted file mode 100644
index 36f7f4d..0000000
--- a/drivers/misc/pmic_max77686.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics
- * Rajeshwari Shinde <rajeshwari.s@samsung.com>
- *
- * 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;
-}
diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index e19a9a8..14d426f 100644
--- a/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@ -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)
diff --git a/drivers/power/pmic/pmic_max77686.c b/drivers/power/pmic/pmic_max77686.c
new file mode 100644
index 0000000..fce0183
--- /dev/null
+++ b/drivers/power/pmic/pmic_max77686.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics
+ * Rajeshwari Shinde <rajeshwari.s@samsung.com>
+ *
+ * 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 <power/pmic.h>
+#include <power/max77686_pmic.h>
+#include <errno.h>
+
+int pmic_init(unsigned char bus)
+{
+ static const char name[] = "MAX77686_PMIC";
+ struct pmic *p = pmic_alloc();
+
+ if (!p) {
+ printf("%s: POWER allocation error!\n", __func__);
+ return -ENOMEM;
+ }
+
+ 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 = bus;
+
+ return 0;
+}
diff --git a/include/max77686_pmic.h b/include/max77686_pmic.h
deleted file mode 100644
index d949ace..0000000
--- a/include/max77686_pmic.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics
- * Rajeshwari Shinde <rajeshwari.s@samsung.com>
- *
- * 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
- */
-
-#ifndef __MAX77686_H_
-#define __MAX77686_H_
-
-enum {
- MAX77686_REG_PMIC_ID = 0x0,
- MAX77686_REG_PMIC_INTSRC,
- MAX77686_REG_PMIC_INT1,
- MAX77686_REG_PMIC_INT2,
- MAX77686_REG_PMIC_INT1MSK,
- MAX77686_REG_PMIC_INT2MSK,
-
- MAX77686_REG_PMIC_STATUS1,
- MAX77686_REG_PMIC_STATUS2,
-
- MAX77686_REG_PMIC_PWRON,
- MAX77686_REG_PMIC_ONOFFDELAY,
- MAX77686_REG_PMIC_MRSTB,
-
- MAX77686_REG_PMIC_BUCK1CRTL = 0x10,
- MAX77686_REG_PMIC_BUCK1OUT,
- MAX77686_REG_PMIC_BUCK2CTRL1,
- MAX77686_REG_PMIC_BUCK234FREQ,
- MAX77686_REG_PMIC_BUCK2DVS1,
- MAX77686_REG_PMIC_BUCK2DVS2,
- MAX77686_REG_PMIC_BUCK2DVS3,
- MAX77686_REG_PMIC_BUCK2DVS4,
- MAX77686_REG_PMIC_BUCK2DVS5,
- MAX77686_REG_PMIC_BUCK2DVS6,
- MAX77686_REG_PMIC_BUCK2DVS7,
- MAX77686_REG_PMIC_BUCK2DVS8,
- MAX77686_REG_PMIC_BUCK3CTRL,
- MAX77686_REG_PMIC_BUCK3DVS1,
- MAX77686_REG_PMIC_BUCK3DVS2,
- MAX77686_REG_PMIC_BUCK3DVS3,
- MAX77686_REG_PMIC_BUCK3DVS4,
- MAX77686_REG_PMIC_BUCK3DVS5,
- MAX77686_REG_PMIC_BUCK3DVS6,
- MAX77686_REG_PMIC_BUCK3DVS7,
- MAX77686_REG_PMIC_BUCK3DVS8,
- MAX77686_REG_PMIC_BUCK4CTRL1,
- MAX77686_REG_PMIC_BUCK4DVS1 = 0x28,
- MAX77686_REG_PMIC_BUCK4DVS2,
- MAX77686_REG_PMIC_BUCK4DVS3,
- MAX77686_REG_PMIC_BUCK4DVS4,
- MAX77686_REG_PMIC_BUCK4DVS5,
- MAX77686_REG_PMIC_BUCK4DVS6,
- MAX77686_REG_PMIC_BUCK4DVS7,
- MAX77686_REG_PMIC_BUCK4DVS8,
- MAX77686_REG_PMIC_BUCK5CTRL,
- MAX77686_REG_PMIC_BUCK5OUT,
- MAX77686_REG_PMIC_BUCK6CRTL,
- MAX77686_REG_PMIC_BUCK6OUT,
- MAX77686_REG_PMIC_BUCK7CRTL,
- MAX77686_REG_PMIC_BUCK7OUT,
- MAX77686_REG_PMIC_BUCK8CRTL,
- MAX77686_REG_PMIC_BUCK8OUT,
- MAX77686_REG_PMIC_BUCK9CRTL,
- MAX77686_REG_PMIC_BUCK9OUT,
-
- MAX77686_REG_PMIC_LDO1CTRL1 = 0x40,
- MAX77686_REG_PMIC_LDO2CTRL1,
- MAX77686_REG_PMIC_LDO3CTRL1,
- MAX77686_REG_PMIC_LDO4CTRL1,
- MAX77686_REG_PMIC_LDO5CTRL1,
- MAX77686_REG_PMIC_LDO6CTRL1,
- MAX77686_REG_PMIC_LDO7CTRL1,
- MAX77686_REG_PMIC_LDO8CTRL1,
- MAX77686_REG_PMIC_LDO9CTRL1,
- MAX77686_REG_PMIC_LDO10CTRL1,
- MAX77686_REG_PMIC_LDO11CTRL1,
- MAX77686_REG_PMIC_LDO12CTRL1,
- MAX77686_REG_PMIC_LDO13CTRL1,
- MAX77686_REG_PMIC_LDO14CTRL1,
- MAX77686_REG_PMIC_LDO15CTRL1,
- MAX77686_REG_PMIC_LDO16CTRL1,
- MAX77686_REG_PMIC_LDO17CTRL1,
- MAX77686_REG_PMIC_LDO18CTRL1,
- MAX77686_REG_PMIC_LDO19CTRL1,
- MAX77686_REG_PMIC_LDO20CTRL1,
- MAX77686_REG_PMIC_LDO21CTRL1,
- MAX77686_REG_PMIC_LDO22CTRL1,
- MAX77686_REG_PMIC_LDO23CTRL1,
- MAX77686_REG_PMIC_LDO24CTRL1,
- MAX77686_REG_PMIC_LDO25CTRL1,
- MAX77686_REG_PMIC_LDO26CTRL1,
- MAX77686_REG_PMIC_LDO1CTRL2,
- MAX77686_REG_PMIC_LDO2CTRL2,
- MAX77686_REG_PMIC_LDO3CTRL2,
- MAX77686_REG_PMIC_LDO4CTRL2,
- MAX77686_REG_PMIC_LDO5CTRL2,
- MAX77686_REG_PMIC_LDO6CTRL2,
- MAX77686_REG_PMIC_LDO7CTRL2,
- MAX77686_REG_PMIC_LDO8CTRL2,
- MAX77686_REG_PMIC_LDO9CTRL2,
- MAX77686_REG_PMIC_LDO10CTRL2,
- MAX77686_REG_PMIC_LDO11CTRL2,
- MAX77686_REG_PMIC_LDO12CTRL2,
- MAX77686_REG_PMIC_LDO13CTRL2,
- MAX77686_REG_PMIC_LDO14CTRL2,
- MAX77686_REG_PMIC_LDO15CTRL2,
- MAX77686_REG_PMIC_LDO16CTRL2,
- MAX77686_REG_PMIC_LDO17CTRL2,
- MAX77686_REG_PMIC_LDO18CTRL2,
- MAX77686_REG_PMIC_LDO19CTRL2,
- MAX77686_REG_PMIC_LDO20CTRL2,
- MAX77686_REG_PMIC_LDO21CTRL2,
- MAX77686_REG_PMIC_LDO22CTRL2,
- MAX77686_REG_PMIC_LDO23CTRL2,
- MAX77686_REG_PMIC_LDO24CTRL2,
- MAX77686_REG_PMIC_LDO25CTRL2,
- MAX77686_REG_PMIC_LDO26CTRL2,
-
- MAX77686_REG_PMIC_BBAT = 0x7e,
- MAX77686_REG_PMIC_32KHZ,
-
- PMIC_NUM_OF_REGS,
-};
-
-/* I2C device address for pmic max77686 */
-#define MAX77686_I2C_ADDR (0x12 >> 1)
-
-enum {
- REG_DISABLE = 0,
- REG_ENABLE
-};
-
-enum {
- LDO_OFF = 0,
- LDO_ON,
-
- DIS_LDO = (0x00 << 6),
- EN_LDO = (0x3 << 6),
-};
-
-#endif /* __MAX77686_PMIC_H_ */
diff --git a/include/power/max77686_pmic.h b/include/power/max77686_pmic.h
new file mode 100644
index 0000000..d949ace
--- /dev/null
+++ b/include/power/max77686_pmic.h
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics
+ * Rajeshwari Shinde <rajeshwari.s@samsung.com>
+ *
+ * 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
+ */
+
+#ifndef __MAX77686_H_
+#define __MAX77686_H_
+
+enum {
+ MAX77686_REG_PMIC_ID = 0x0,
+ MAX77686_REG_PMIC_INTSRC,
+ MAX77686_REG_PMIC_INT1,
+ MAX77686_REG_PMIC_INT2,
+ MAX77686_REG_PMIC_INT1MSK,
+ MAX77686_REG_PMIC_INT2MSK,
+
+ MAX77686_REG_PMIC_STATUS1,
+ MAX77686_REG_PMIC_STATUS2,
+
+ MAX77686_REG_PMIC_PWRON,
+ MAX77686_REG_PMIC_ONOFFDELAY,
+ MAX77686_REG_PMIC_MRSTB,
+
+ MAX77686_REG_PMIC_BUCK1CRTL = 0x10,
+ MAX77686_REG_PMIC_BUCK1OUT,
+ MAX77686_REG_PMIC_BUCK2CTRL1,
+ MAX77686_REG_PMIC_BUCK234FREQ,
+ MAX77686_REG_PMIC_BUCK2DVS1,
+ MAX77686_REG_PMIC_BUCK2DVS2,
+ MAX77686_REG_PMIC_BUCK2DVS3,
+ MAX77686_REG_PMIC_BUCK2DVS4,
+ MAX77686_REG_PMIC_BUCK2DVS5,
+ MAX77686_REG_PMIC_BUCK2DVS6,
+ MAX77686_REG_PMIC_BUCK2DVS7,
+ MAX77686_REG_PMIC_BUCK2DVS8,
+ MAX77686_REG_PMIC_BUCK3CTRL,
+ MAX77686_REG_PMIC_BUCK3DVS1,
+ MAX77686_REG_PMIC_BUCK3DVS2,
+ MAX77686_REG_PMIC_BUCK3DVS3,
+ MAX77686_REG_PMIC_BUCK3DVS4,
+ MAX77686_REG_PMIC_BUCK3DVS5,
+ MAX77686_REG_PMIC_BUCK3DVS6,
+ MAX77686_REG_PMIC_BUCK3DVS7,
+ MAX77686_REG_PMIC_BUCK3DVS8,
+ MAX77686_REG_PMIC_BUCK4CTRL1,
+ MAX77686_REG_PMIC_BUCK4DVS1 = 0x28,
+ MAX77686_REG_PMIC_BUCK4DVS2,
+ MAX77686_REG_PMIC_BUCK4DVS3,
+ MAX77686_REG_PMIC_BUCK4DVS4,
+ MAX77686_REG_PMIC_BUCK4DVS5,
+ MAX77686_REG_PMIC_BUCK4DVS6,
+ MAX77686_REG_PMIC_BUCK4DVS7,
+ MAX77686_REG_PMIC_BUCK4DVS8,
+ MAX77686_REG_PMIC_BUCK5CTRL,
+ MAX77686_REG_PMIC_BUCK5OUT,
+ MAX77686_REG_PMIC_BUCK6CRTL,
+ MAX77686_REG_PMIC_BUCK6OUT,
+ MAX77686_REG_PMIC_BUCK7CRTL,
+ MAX77686_REG_PMIC_BUCK7OUT,
+ MAX77686_REG_PMIC_BUCK8CRTL,
+ MAX77686_REG_PMIC_BUCK8OUT,
+ MAX77686_REG_PMIC_BUCK9CRTL,
+ MAX77686_REG_PMIC_BUCK9OUT,
+
+ MAX77686_REG_PMIC_LDO1CTRL1 = 0x40,
+ MAX77686_REG_PMIC_LDO2CTRL1,
+ MAX77686_REG_PMIC_LDO3CTRL1,
+ MAX77686_REG_PMIC_LDO4CTRL1,
+ MAX77686_REG_PMIC_LDO5CTRL1,
+ MAX77686_REG_PMIC_LDO6CTRL1,
+ MAX77686_REG_PMIC_LDO7CTRL1,
+ MAX77686_REG_PMIC_LDO8CTRL1,
+ MAX77686_REG_PMIC_LDO9CTRL1,
+ MAX77686_REG_PMIC_LDO10CTRL1,
+ MAX77686_REG_PMIC_LDO11CTRL1,
+ MAX77686_REG_PMIC_LDO12CTRL1,
+ MAX77686_REG_PMIC_LDO13CTRL1,
+ MAX77686_REG_PMIC_LDO14CTRL1,
+ MAX77686_REG_PMIC_LDO15CTRL1,
+ MAX77686_REG_PMIC_LDO16CTRL1,
+ MAX77686_REG_PMIC_LDO17CTRL1,
+ MAX77686_REG_PMIC_LDO18CTRL1,
+ MAX77686_REG_PMIC_LDO19CTRL1,
+ MAX77686_REG_PMIC_LDO20CTRL1,
+ MAX77686_REG_PMIC_LDO21CTRL1,
+ MAX77686_REG_PMIC_LDO22CTRL1,
+ MAX77686_REG_PMIC_LDO23CTRL1,
+ MAX77686_REG_PMIC_LDO24CTRL1,
+ MAX77686_REG_PMIC_LDO25CTRL1,
+ MAX77686_REG_PMIC_LDO26CTRL1,
+ MAX77686_REG_PMIC_LDO1CTRL2,
+ MAX77686_REG_PMIC_LDO2CTRL2,
+ MAX77686_REG_PMIC_LDO3CTRL2,
+ MAX77686_REG_PMIC_LDO4CTRL2,
+ MAX77686_REG_PMIC_LDO5CTRL2,
+ MAX77686_REG_PMIC_LDO6CTRL2,
+ MAX77686_REG_PMIC_LDO7CTRL2,
+ MAX77686_REG_PMIC_LDO8CTRL2,
+ MAX77686_REG_PMIC_LDO9CTRL2,
+ MAX77686_REG_PMIC_LDO10CTRL2,
+ MAX77686_REG_PMIC_LDO11CTRL2,
+ MAX77686_REG_PMIC_LDO12CTRL2,
+ MAX77686_REG_PMIC_LDO13CTRL2,
+ MAX77686_REG_PMIC_LDO14CTRL2,
+ MAX77686_REG_PMIC_LDO15CTRL2,
+ MAX77686_REG_PMIC_LDO16CTRL2,
+ MAX77686_REG_PMIC_LDO17CTRL2,
+ MAX77686_REG_PMIC_LDO18CTRL2,
+ MAX77686_REG_PMIC_LDO19CTRL2,
+ MAX77686_REG_PMIC_LDO20CTRL2,
+ MAX77686_REG_PMIC_LDO21CTRL2,
+ MAX77686_REG_PMIC_LDO22CTRL2,
+ MAX77686_REG_PMIC_LDO23CTRL2,
+ MAX77686_REG_PMIC_LDO24CTRL2,
+ MAX77686_REG_PMIC_LDO25CTRL2,
+ MAX77686_REG_PMIC_LDO26CTRL2,
+
+ MAX77686_REG_PMIC_BBAT = 0x7e,
+ MAX77686_REG_PMIC_32KHZ,
+
+ PMIC_NUM_OF_REGS,
+};
+
+/* I2C device address for pmic max77686 */
+#define MAX77686_I2C_ADDR (0x12 >> 1)
+
+enum {
+ REG_DISABLE = 0,
+ REG_ENABLE
+};
+
+enum {
+ LDO_OFF = 0,
+ LDO_ON,
+
+ DIS_LDO = (0x00 << 6),
+ EN_LDO = (0x3 << 6),
+};
+
+#endif /* __MAX77686_PMIC_H_ */
--
1.7.4.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] SMDK5250: Enable pmic MAX77686
2012-12-10 11:55 [U-Boot] [PATCH 0/2] SMDK5250: Modify MAX77686 as per the latest Implementation Rajeshwari Shinde
2012-12-10 11:55 ` [U-Boot] [PATCH 1/2] POWER: MAX77686: Modified " Rajeshwari Shinde
@ 2012-12-10 11:55 ` Rajeshwari Shinde
2012-12-12 14:28 ` Simon Glass
2012-12-10 13:16 ` [U-Boot] [PATCH 0/2] SMDK5250: Modify MAX77686 as per the latest Implementation Lukasz Majewski
2 siblings, 1 reply; 7+ messages in thread
From: Rajeshwari Shinde @ 2012-12-10 11:55 UTC (permalink / raw)
To: u-boot
Enabled pmic MAX77686 for SMDK5250.
Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
---
board/samsung/smdk5250/smdk5250.c | 15 +++++++++++----
include/configs/smdk5250.h | 8 ++++----
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
index 4c50342..9c926d6 100644
--- a/board/samsung/smdk5250/smdk5250.c
+++ b/board/samsung/smdk5250/smdk5250.c
@@ -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;
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index e412da8..df00305 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -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
--
1.7.4.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 0/2] SMDK5250: Modify MAX77686 as per the latest Implementation
2012-12-10 11:55 [U-Boot] [PATCH 0/2] SMDK5250: Modify MAX77686 as per the latest Implementation Rajeshwari Shinde
2012-12-10 11:55 ` [U-Boot] [PATCH 1/2] POWER: MAX77686: Modified " Rajeshwari Shinde
2012-12-10 11:55 ` [U-Boot] [PATCH 2/2] SMDK5250: Enable pmic MAX77686 Rajeshwari Shinde
@ 2012-12-10 13:16 ` Lukasz Majewski
2012-12-11 4:03 ` Minkyu Kang
2 siblings, 1 reply; 7+ messages in thread
From: Lukasz Majewski @ 2012-12-10 13:16 UTC (permalink / raw)
To: u-boot
Hi Rajeshwari,
> 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
>
Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Thanks :-)
--
Best regards,
Lukasz Majewski
Samsung Poland R&D Center | Linux Platform Group
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 0/2] SMDK5250: Modify MAX77686 as per the latest Implementation
2012-12-10 13:16 ` [U-Boot] [PATCH 0/2] SMDK5250: Modify MAX77686 as per the latest Implementation Lukasz Majewski
@ 2012-12-11 4:03 ` Minkyu Kang
0 siblings, 0 replies; 7+ messages in thread
From: Minkyu Kang @ 2012-12-11 4:03 UTC (permalink / raw)
To: u-boot
On 10/12/12 22:16, Lukasz Majewski wrote:
> Hi Rajeshwari,
>
>> 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
>>
>
> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
> Acked-by: Lukasz Majewski <l.majewski@samsung.com>
>
> Thanks :-)
>
applied to u-boot-samsung/resolve
Thanks.
Minkyu Kang.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 1/2] POWER: MAX77686: Modified as per the latest Implementation
2012-12-10 11:55 ` [U-Boot] [PATCH 1/2] POWER: MAX77686: Modified " Rajeshwari Shinde
@ 2012-12-12 14:27 ` Simon Glass
0 siblings, 0 replies; 7+ messages in thread
From: Simon Glass @ 2012-12-12 14:27 UTC (permalink / raw)
To: u-boot
Hi Rajeshwari,
On Mon, Dec 10, 2012 at 3:55 AM, Rajeshwari Shinde
<rajeshwari.s@samsung.com> wrote:
> Moved the pmic_max77686.c max77686_pmic.h to drivers/power
> and made required changes accordingly
>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Acked-by: Simon Glass <sjg@chomium.org>
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 | 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
>
> diff --git a/drivers/misc/pmic_max77686.c b/drivers/misc/pmic_max77686.c
> deleted file mode 100644
> index 36f7f4d..0000000
[snip]
\
> +++ b/drivers/power/pmic/pmic_max77686.c
> @@ -0,0 +1,48 @@
> +/*
> + * Copyright (C) 2012 Samsung Electronics
> + * Rajeshwari Shinde <rajeshwari.s@samsung.com>
> + *
> + * 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 <power/pmic.h>
> +#include <power/max77686_pmic.h>
> +#include <errno.h>
I think this should go above the power/ headers, below common.
Regards,
Simon
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] SMDK5250: Enable pmic MAX77686
2012-12-10 11:55 ` [U-Boot] [PATCH 2/2] SMDK5250: Enable pmic MAX77686 Rajeshwari Shinde
@ 2012-12-12 14:28 ` Simon Glass
0 siblings, 0 replies; 7+ messages in thread
From: Simon Glass @ 2012-12-12 14:28 UTC (permalink / raw)
To: u-boot
Hi Rajeshwari,
On Mon, Dec 10, 2012 at 3:55 AM, Rajeshwari Shinde
<rajeshwari.s@samsung.com> wrote:
> Enabled pmic MAX77686 for SMDK5250.
>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
With nit below fixed:
Acked-by: Simon Glass <sjg@chromium.org>
> ---
> board/samsung/smdk5250/smdk5250.c | 15 +++++++++++----
> include/configs/smdk5250.h | 8 ++++----
> 2 files changed, 15 insertions(+), 8 deletions(-)
>
> diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
> index 4c50342..9c926d6 100644
> --- a/board/samsung/smdk5250/smdk5250.c
> +++ b/board/samsung/smdk5250/smdk5250.c
> @@ -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;
> diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
> index e412da8..df00305 100644
> --- a/include/configs/smdk5250.h
> +++ b/include/configs/smdk5250.h
> @@ -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?
>
> /* 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
> --
> 1.7.4.4
>
Regards,
Simon
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-12-12 14:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-10 11:55 [U-Boot] [PATCH 0/2] SMDK5250: Modify MAX77686 as per the latest Implementation Rajeshwari Shinde
2012-12-10 11:55 ` [U-Boot] [PATCH 1/2] POWER: MAX77686: Modified " Rajeshwari Shinde
2012-12-12 14:27 ` Simon Glass
2012-12-10 11:55 ` [U-Boot] [PATCH 2/2] SMDK5250: Enable pmic MAX77686 Rajeshwari Shinde
2012-12-12 14:28 ` Simon Glass
2012-12-10 13:16 ` [U-Boot] [PATCH 0/2] SMDK5250: Modify MAX77686 as per the latest Implementation Lukasz Majewski
2012-12-11 4:03 ` Minkyu Kang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox