[PATCH 1/3] mfd: menelaus: delete omap_has_menelaus
Delete unused macro. Signed-off-by: Aaro Koskinen --- include/linux/mfd/menelaus.h | 6 -- 1 file changed, 6 deletions(-) diff --git a/include/linux/mfd/menelaus.h b/include/linux/mfd/menelaus.h index f097e89..a1e12bf3 100644 --- a/include/linux/mfd/menelaus.h +++ b/include/linux/mfd/menelaus.h @@ -38,10 +38,4 @@ extern int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV); extern int menelaus_set_regulator_sleep(int enable, u32 val); -#if defined(CONFIG_ARCH_OMAP2) && defined(CONFIG_MENELAUS) -#define omap_has_menelaus()1 -#else -#define omap_has_menelaus()0 -#endif - #endif -- 2.2.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/3] mfd: menelaus: use macro for magic number
Use macro to check a register bit. Signed-off-by: Aaro Koskinen --- drivers/mfd/menelaus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 917fa86..c2ca665 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -1216,7 +1216,7 @@ static int menelaus_probe(struct i2c_client *client, err = menelaus_read_reg(MENELAUS_VCORE_CTRL1); if (err < 0) goto fail; - if (err & BIT(7)) + if (err & VCORE_CTRL1_HW_NSW) menelaus->vcore_hw_mode = 1; else menelaus->vcore_hw_mode = 0; -- 2.2.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/3] mfd: menelaus: drop support for SW controller VCORE
Drop support for SW controlled VCORE, nobody uses it.
Signed-off-by: Aaro Koskinen
---
drivers/mfd/menelaus.c | 23 ---
include/linux/mfd/menelaus.h | 1 -
2 files changed, 24 deletions(-)
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 9f01aef..917fa86 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -532,29 +532,6 @@ static const struct menelaus_vtg_value vcore_values[] = {
{ 1450, 18 },
};
-int menelaus_set_vcore_sw(unsigned int mV)
-{
- int val, ret;
- struct i2c_client *c = the_menelaus->client;
-
- val = menelaus_get_vtg_value(mV, vcore_values,
-ARRAY_SIZE(vcore_values));
- if (val < 0)
- return -EINVAL;
-
- dev_dbg(&c->dev, "Setting VCORE to %d mV (val 0x%02x)\n", mV, val);
-
- /* Set SW mode and the voltage in one go. */
- mutex_lock(&the_menelaus->lock);
- ret = menelaus_write_reg(MENELAUS_VCORE_CTRL1, val);
- if (ret == 0)
- the_menelaus->vcore_hw_mode = 0;
- mutex_unlock(&the_menelaus->lock);
- msleep(1);
-
- return ret;
-}
-
int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV)
{
int fval, rval, val, ret;
diff --git a/include/linux/mfd/menelaus.h b/include/linux/mfd/menelaus.h
index a1e12bf3..9e85ac0 100644
--- a/include/linux/mfd/menelaus.h
+++ b/include/linux/mfd/menelaus.h
@@ -24,7 +24,6 @@ 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_sw(unsigned int mV);
extern int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV);
#define EN_VPLL_SLEEP (1 << 7)
--
2.2.0
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/3] mfd: menelaus: couple simple cleanups
Hi, I came across these while trying to start DT conversion for menelaus (http://marc.info/?t=14197028735&r=1&w=2). While the DT work failed and is still pending, I think it's still worth to apply these as they are independent and they remove some cruft from the tree. A. Aaro Koskinen (3): mfd: menelaus: delete omap_has_menelaus mfd: menelaus: drop support for SW controller VCORE mfd: menelaus: use macro for magic number drivers/mfd/menelaus.c | 25 + include/linux/mfd/menelaus.h | 7 --- 2 files changed, 1 insertion(+), 31 deletions(-) -- 2.2.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 1/2] omap non-urgent fixes for v4.1
The following changes since commit c517d838eb7d07bbe9507871fab3931deccff539: Linux 4.0-rc1 (2015-02-22 18:21:14 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.1/fixes-0 for you to fetch changes up to 209431eff8afb928d72200c79153165c7d860ca0: ARM: DRA7: Enable Cortex A15 errata 798181 (2015-03-27 14:38:03 -0700) Fixes for omaps that were not considered urgent enough for the -rc cycle. This is mostly to enable errata 798181 and thermal support for dra7, configure ocp2scp for am437x, remove dead code for OMAP4_ERRATA_I688 and fix build warnings for omap1510 only config. Felipe Balbi (1): MAINTAINERS: add OMAP defconfigs under OMAP SUPPORT Keerthy (1): ARM: dts: DRA7: Add bandgap and related thermal nodes Kishon Vijay Abraham I (2): ARM: dts: am4372: Add "ti,am437x-ocp2scp" as compatible string for OCP2SCP bus: ocp2scp: SYNC2 value should be changed to 0x6 Nishanth Menon (1): ARM: dts: am57xx-beagle-x15: Add thermal map to include fan and tmp102 Paul Walmsley (1): ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs Praneeth Bajjuri (1): ARM: DRA7: Enable Cortex A15 errata 798181 Stefan Agner (1): ARM: OMAP2+: remove superfluous NULL pointer check Stefan Hengelein (1): ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688 Tony Lindgren (1): Merge branch 'omap-for-v4.1/ocp2scp' into omap-for-v4.1/fixes-not-urgent .../devicetree/bindings/bus/omap-ocp2scp.txt | 3 +- MAINTAINERS| 2 + arch/arm/boot/dts/am4372.dtsi | 4 +- arch/arm/boot/dts/am57xx-beagle-x15.dts| 49 +++ arch/arm/boot/dts/dra7.dtsi| 23 arch/arm/boot/dts/dra72x.dtsi | 5 ++ arch/arm/boot/dts/dra74x.dtsi | 5 ++ arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 4 +- arch/arm/mach-omap1/pm.c | 51 arch/arm/mach-omap2/Kconfig| 22 +-- arch/arm/mach-omap2/common.c | 1 - arch/arm/mach-omap2/common.h | 3 - arch/arm/mach-omap2/io.c | 2 - arch/arm/mach-omap2/mux.c | 2 +- arch/arm/mach-omap2/omap-secure.h | 7 --- arch/arm/mach-omap2/omap4-common.c | 69 -- arch/arm/mach-omap2/sleep44xx.S| 2 - drivers/bus/omap-ocp2scp.c | 34 +++ 18 files changed, 151 insertions(+), 137 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL 2/2] omap soc changes for v4.1
The following changes since commit c517d838eb7d07bbe9507871fab3931deccff539: Linux 4.0-rc1 (2015-02-22 18:21:14 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/v4.1-soc for you to fetch changes up to a6b188e50a6ad6fa4d2da163a44f21280cea01c2: Merge tag 'for-v4.1/omap-hwmod-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.1/soc (2015-03-27 10:42:16 -0700) SoC related changes for omaps. Mostly hwmod related changes via Paul Walmsley : OMAP hwmod data changes for AM43xx and DRA7xx for v4.1 Add support for the AM43xx HDQ/1-wire driver and fix the GPTIMER data for DRA7xx. Note that I do not have AM43xx nor DRA7xx boards, and cannot test these patches on those platforms. Basic build, boot, and PM test logs are available at: http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v4.1/20150324185246/ Grygorii Strashko (1): ARM: omap-device: add missed callback for suspend-to-disk Sourav Poddar (1): ARM: OMAP2: hwmod: AM43XX: Add hwmod support for HDQ-1W Suman Anna (2): ARM: DRA7: hwmod: Add data for GPTimers 13 through 16 ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4 Tony Lindgren (1): Merge tag 'for-v4.1/omap-hwmod-a' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v4.1/soc arch/arm/mach-omap2/omap_device.c | 3 + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 36 + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 113 + arch/arm/mach-omap2/prcm43xx.h | 1 + 4 files changed, 137 insertions(+), 16 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
