All of lore.kernel.org
 help / color / mirror / Atom feed
From: Aaro Koskinen <aaro.koskinen@iki.fi>
To: Tony Lindgren <tony@atomide.com>,
	Samuel Ortiz <sameo@linux.intel.com>,
	Lee Jones <lee.jones@linaro.org>,
	devicetree@vger.kernel.org, linux-omap@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Subject: [PATCH 6/7] mfd: menelaus: make vcore and regulator controls internal
Date: Sat, 27 Dec 2014 19:52:58 +0200	[thread overview]
Message-ID: <1419702779-16001-7-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1419702779-16001-1-git-send-email-aaro.koskinen@iki.fi>

Make vcore and regulator control functions internal to the driver.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 drivers/mfd/menelaus.c       | 13 +++++++++++--
 include/linux/mfd/menelaus.h | 12 ------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 4a900cc..8660adf 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -163,6 +163,15 @@
 #define MCT_PIN_ST_S1_CD_ST		(1 << 0)
 #define MCT_PIN_ST_S2_CD_ST		(1 << 1)
 
+#define EN_VPLL_SLEEP			(1 << 7)
+#define EN_VMMC_SLEEP			(1 << 6)
+#define EN_VAUX_SLEEP			(1 << 5)
+#define EN_VIO_SLEEP			(1 << 4)
+#define EN_VMEM_SLEEP			(1 << 3)
+#define EN_DC3_SLEEP			(1 << 2)
+#define EN_DC2_SLEEP			(1 << 1)
+#define EN_VC_SLEEP			(1 << 0)
+
 static void menelaus_work(struct work_struct *_menelaus);
 
 struct menelaus_chip {
@@ -534,7 +543,7 @@ static const struct menelaus_vtg_value vcore_values[] = {
 	{ 1450, 18 },
 };
 
-int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV)
+static int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV)
 {
 	int fval, rval, val, ret;
 	struct i2c_client *c = the_menelaus->client;
@@ -743,7 +752,7 @@ int menelaus_get_slot_pin_states(void)
 }
 EXPORT_SYMBOL(menelaus_get_slot_pin_states);
 
-int menelaus_set_regulator_sleep(int enable, u32 val)
+static int menelaus_set_regulator_sleep(int enable, u32 val)
 {
 	int t, ret;
 	struct i2c_client *c = the_menelaus->client;
diff --git a/include/linux/mfd/menelaus.h b/include/linux/mfd/menelaus.h
index 21eeff5..bcabc03 100644
--- a/include/linux/mfd/menelaus.h
+++ b/include/linux/mfd/menelaus.h
@@ -18,17 +18,5 @@ extern int menelaus_set_vaux(unsigned int mV);
 extern int menelaus_set_vdcdc(int dcdc, unsigned int mV);
 extern int menelaus_set_slot_sel(int enable);
 extern int menelaus_get_slot_pin_states(void);
-extern int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV);
-
-#define EN_VPLL_SLEEP	(1 << 7)
-#define EN_VMMC_SLEEP	(1 << 6)
-#define EN_VAUX_SLEEP	(1 << 5)
-#define EN_VIO_SLEEP	(1 << 4)
-#define EN_VMEM_SLEEP	(1 << 3)
-#define EN_DC3_SLEEP	(1 << 2)
-#define EN_DC2_SLEEP	(1 << 1)
-#define EN_VC_SLEEP	(1 << 0)
-
-extern int menelaus_set_regulator_sleep(int enable, u32 val);
 
 #endif
-- 
2.2.0


WARNING: multiple messages have this Message-ID (diff)
From: aaro.koskinen@iki.fi (Aaro Koskinen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/7] mfd: menelaus: make vcore and regulator controls internal
Date: Sat, 27 Dec 2014 19:52:58 +0200	[thread overview]
Message-ID: <1419702779-16001-7-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1419702779-16001-1-git-send-email-aaro.koskinen@iki.fi>

Make vcore and regulator control functions internal to the driver.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 drivers/mfd/menelaus.c       | 13 +++++++++++--
 include/linux/mfd/menelaus.h | 12 ------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 4a900cc..8660adf 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -163,6 +163,15 @@
 #define MCT_PIN_ST_S1_CD_ST		(1 << 0)
 #define MCT_PIN_ST_S2_CD_ST		(1 << 1)
 
+#define EN_VPLL_SLEEP			(1 << 7)
+#define EN_VMMC_SLEEP			(1 << 6)
+#define EN_VAUX_SLEEP			(1 << 5)
+#define EN_VIO_SLEEP			(1 << 4)
+#define EN_VMEM_SLEEP			(1 << 3)
+#define EN_DC3_SLEEP			(1 << 2)
+#define EN_DC2_SLEEP			(1 << 1)
+#define EN_VC_SLEEP			(1 << 0)
+
 static void menelaus_work(struct work_struct *_menelaus);
 
 struct menelaus_chip {
@@ -534,7 +543,7 @@ static const struct menelaus_vtg_value vcore_values[] = {
 	{ 1450, 18 },
 };
 
-int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV)
+static int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV)
 {
 	int fval, rval, val, ret;
 	struct i2c_client *c = the_menelaus->client;
@@ -743,7 +752,7 @@ int menelaus_get_slot_pin_states(void)
 }
 EXPORT_SYMBOL(menelaus_get_slot_pin_states);
 
-int menelaus_set_regulator_sleep(int enable, u32 val)
+static int menelaus_set_regulator_sleep(int enable, u32 val)
 {
 	int t, ret;
 	struct i2c_client *c = the_menelaus->client;
diff --git a/include/linux/mfd/menelaus.h b/include/linux/mfd/menelaus.h
index 21eeff5..bcabc03 100644
--- a/include/linux/mfd/menelaus.h
+++ b/include/linux/mfd/menelaus.h
@@ -18,17 +18,5 @@ extern int menelaus_set_vaux(unsigned int mV);
 extern int menelaus_set_vdcdc(int dcdc, unsigned int mV);
 extern int menelaus_set_slot_sel(int enable);
 extern int menelaus_get_slot_pin_states(void);
-extern int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV);
-
-#define EN_VPLL_SLEEP	(1 << 7)
-#define EN_VMMC_SLEEP	(1 << 6)
-#define EN_VAUX_SLEEP	(1 << 5)
-#define EN_VIO_SLEEP	(1 << 4)
-#define EN_VMEM_SLEEP	(1 << 3)
-#define EN_DC3_SLEEP	(1 << 2)
-#define EN_DC2_SLEEP	(1 << 1)
-#define EN_VC_SLEEP	(1 << 0)
-
-extern int menelaus_set_regulator_sleep(int enable, u32 val);
 
 #endif
-- 
2.2.0

  parent reply	other threads:[~2014-12-27 17:52 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-27 17:52 [PATCH 0/7] Menelaus cleanup for DT, phase 1 Aaro Koskinen
2014-12-27 17:52 ` Aaro Koskinen
2014-12-27 17:52 ` [PATCH 1/7] mfd: menelaus: delete omap_has_menelaus Aaro Koskinen
2014-12-27 17:52   ` Aaro Koskinen
2015-01-20 13:50   ` Lee Jones
2015-01-20 13:50     ` Lee Jones
2014-12-27 17:52 ` [PATCH 2/7] mfd: menelaus: drop support for SW controller VCORE Aaro Koskinen
2014-12-27 17:52   ` Aaro Koskinen
2015-01-20 13:52   ` Lee Jones
2015-01-20 13:52     ` Lee Jones
2014-12-27 17:52 ` [PATCH 3/7] mfd: menelaus: add initial DT support Aaro Koskinen
2014-12-27 17:52   ` Aaro Koskinen
2014-12-27 21:25   ` Felipe Balbi
2014-12-27 21:25     ` Felipe Balbi
2014-12-28 23:34     ` Aaro Koskinen
2014-12-28 23:34       ` Aaro Koskinen
2014-12-29 18:12       ` Felipe Balbi
2014-12-29 18:12         ` Felipe Balbi
2014-12-27 17:52 ` [PATCH 5/7] mfd: menelaus: delete platform data support Aaro Koskinen
2014-12-27 17:52   ` Aaro Koskinen
2015-01-20 13:54   ` Lee Jones
2015-01-20 13:54     ` Lee Jones
2014-12-27 17:52 ` Aaro Koskinen [this message]
2014-12-27 17:52   ` [PATCH 6/7] mfd: menelaus: make vcore and regulator controls internal Aaro Koskinen
2015-01-20 13:58   ` Lee Jones
2015-01-20 13:58     ` Lee Jones
2015-01-20 14:01     ` Lee Jones
2015-01-20 14:01       ` Lee Jones
2014-12-27 17:52 ` [PATCH 7/7] mfd: menelaus: use macro for magic number Aaro Koskinen
2014-12-27 17:52   ` Aaro Koskinen
     [not found]   ` <1419702779-16001-8-git-send-email-aaro.koskinen-X3B1VOXEql0@public.gmane.org>
2015-01-20 14:01     ` Lee Jones
2015-01-20 14:01       ` Lee Jones
     [not found] ` <1419702779-16001-1-git-send-email-aaro.koskinen-X3B1VOXEql0@public.gmane.org>
2014-12-27 17:52   ` [PATCH 4/7] ARM: OMAP: N8x0: configure menelaus using DT Aaro Koskinen
2014-12-27 17:52     ` Aaro Koskinen
2015-01-20 17:13   ` [PATCH 0/7] Menelaus cleanup for DT, phase 1 Lee Jones
2015-01-20 17:13     ` Lee Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1419702779-16001-7-git-send-email-aaro.koskinen@iki.fi \
    --to=aaro.koskinen@iki.fi \
    --cc=devicetree@vger.kernel.org \
    --cc=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=sameo@linux.intel.com \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.