Skip to contentSkip to conversation

mfd: samsung: Modify samsung mfd header

PATCH Applied Sangbeom Kim 2 participants 3 messages Jul 11, 2012 – Jul 12, 2012

Subsystems (3)
Multifunction devices (MFD) Voltage and current regulator framework Samsung multifunction PMIC device drivers
lore
Share & tools
lore

Sangbeom Kim

author
#0 lore raw

PATCH v3 3/7 mfd: samsung: Modify samsung mfd header

As Prefix of Samsung pmic changed from s5m to s2m, To make common mfd driver for s2m and s5m series, This patch rename header of Samsung mfd and modify mfd driver.

Signed-off-by Sangbeom Kim <[email protected]>
---
 drivers/mfd/sec-core.c               |    6 +-
 drivers/mfd/sec-irq.c                |    5 +-
 drivers/regulator/s5m8767.c          |    4 +-
 include/linux/mfd/samsung/core.h     |  147 +++++++++++++
 include/linux/mfd/samsung/irq.h      |  110 ++++++++++
 include/linux/mfd/samsung/rtc.h      |   83 ++++++++
 include/linux/mfd/samsung/s5m-core.h |  374 ----------------------------------
 include/linux/mfd/samsung/s5m-pmic.h |  129 ------------
 include/linux/mfd/samsung/s5m-rtc.h  |   84 --------
 include/linux/mfd/samsung/s5m8763.h  |   96 +++++++++
 include/linux/mfd/samsung/s5m8767.h  |  188 +++++++++++++++++
 11 files changed, 633 insertions(+), 593 deletions(-)
 create mode 100644 include/linux/mfd/samsung/core.h
 create mode 100644 include/linux/mfd/samsung/irq.h
 create mode 100644 include/linux/mfd/samsung/rtc.h
 delete mode 100644 include/linux/mfd/samsung/s5m-core.h
 delete mode 100644 include/linux/mfd/samsung/s5m-pmic.h
 delete mode 100644 include/linux/mfd/samsung/s5m-rtc.h
 create mode 100644 include/linux/mfd/samsung/s5m8763.h
 create mode 100644 include/linux/mfd/samsung/s5m8767.h
drivers/mfd/sec-core.c +3 -3
index 5dfe671..3a9a467 100644
@@ -21,9 +21,9 @@
 #include <linux/pm_runtime.h>
 #include <linux/mutex.h>
 #include <linux/mfd/core.h>
-#include <linux/mfd/samsung/s5m-core.h>
-#include <linux/mfd/samsung/s5m-pmic.h>
-#include <linux/mfd/samsung/s5m-rtc.h>
+#include <linux/mfd/samsung/core.h>
+#include <linux/mfd/samsung/irq.h>
+#include <linux/mfd/samsung/rtc.h>
 #include <linux/regmap.h>
 
 static struct mfd_cell s5m8751_devs[] = {
drivers/mfd/sec-irq.c +4 -1
index d9c1137..da5ec5b 100644
@@ -14,7 +14,10 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/mfd/samsung/s5m-core.h>
+#include <linux/mfd/samsung/core.h>
+#include <linux/mfd/samsung/irq.h>
+#include <linux/mfd/samsung/s5m8763.h>
+#include <linux/mfd/samsung/s5m8767.h>
 
 struct sec_irq_data {
 	int reg;
drivers/regulator/s5m8767.c +2 -2
index 0049e34..aeea91b 100644
@@ -19,8 +19,8 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
-#include <linux/mfd/samsung/s5m-core.h>
-#include <linux/mfd/samsung/s5m-pmic.h>
+#include <linux/mfd/samsung/core.h>
+#include <linux/mfd/samsung/s5m8767.h>
 
 struct s5m8767_info {
 	struct device *dev;
include/linux/mfd/samsung/core.h new file +147 -0

147 lines not on this page · raw message

include/linux/mfd/samsung/irq.h new file +110 -0

110 lines not on this page · raw message

include/linux/mfd/samsung/rtc.h new file +83 -0

83 lines not on this page · raw message

include/linux/mfd/samsung/s5m-core.h deleted +0 -374

374 lines not on this page · raw message

include/linux/mfd/samsung/s5m-pmic.h deleted +0 -129

129 lines not on this page · raw message

include/linux/mfd/samsung/s5m-rtc.h deleted +0 -84

84 lines not on this page · raw message

include/linux/mfd/samsung/s5m8763.h new file +96 -0

96 lines not on this page · raw message

include/linux/mfd/samsung/s5m8767.h new file +188 -0

188 lines not on this page · raw message

Signature · 1 line
1.7.1
#1 lore raw

include/linux/mfd/samsung/core.h line 5

Quoted 8 lines
include/linux/mfd/samsung/core.h new file +5 -0
@@ -0,0 +1,147 @@
+/*
+ * core.h
+ *
+ * copyright (c) 2011 Samsung Electronics Co., Ltd
+ *              http://www.samsung.com

In most of the files you mentioned 2011.
Should they not be changed to 2012?

Quoted 7 lines
include/linux/mfd/samsung/core.h new file +5 -0
+ *
+ *  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.

include/linux/mfd/samsung/core.h

Quoted 10 lines
include/linux/mfd/samsung/core.h new file +0 -8
 
 
-
-#ifndef __LINUX_MFD_S5M_CORE_H
-#define __LINUX_MFD_S5M_CORE_H
-
-
-	int				buck_set1;
-	int				buck_set2;
-	int				buck_set3;

As you have buck4_enable etc below, by any chance do you need buck_set4 as well here? Similarly should you declare buck1_enable here?

Quoted 5 lines
include/linux/mfd/samsung/core.h new file +0 -5
-	int				buck2_enable;
-	int				buck3_enable;
-	int				buck4_enable;
-	int				buck_default_idx;
-	int				buck2_default_idx;
author
#2 lore raw

Hi!

Quoted 5 lines · Venu Byravarasu
Quoted 2 lines

+ * copyright (c) 2011 Samsung Electronics Co., Ltd
+ * http://www.samsung.com

In most of the files you mentioned 2011.
Should they not be changed to 2012?

Most of the files are created in 2011.
This file is moved from include/linux/mfd/s5m87xx/s5m-core.h

Quoted 5 lines

include/linux/mfd/samsung/s5m-core.h line 359

Quoted 3 lines
include/linux/mfd/samsung/s5m-core.h deleted +0 -3
-	int				buck_set1;
-	int				buck_set2;
-	int				buck_set3;

As you have buck4_enable etc below, by any chance do you need buck_set4 as well here?

No, S5M8767 have 3 controllerble gpios.
The purpose of buck_set1,2,3 is each gpio control. To handle 3 gpio, I had added buck_set1, buck_set2, buck_set3.

Quoted 1 line

Similarly should you declare buck1_enable here?

No, gpio control can be enabled on buck2, buck3, buck4. There is no need buck1_enable.

Quoted 5 lines

include/linux/mfd/samsung/s5m-core.h line 364

Quoted 5 lines
include/linux/mfd/samsung/s5m-core.h deleted +0 -5
-	int				buck2_enable;
-	int				buck3_enable;
-	int				buck4_enable;
-	int				buck_default_idx;
-	int				buck2_default_idx;

Thanks,
Sangbeom.