From: Aaro Koskinen <aaro.koskinen-X3B1VOXEql0@public.gmane.org>
To: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>,
Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>,
Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Cc: Aaro Koskinen <aaro.koskinen-X3B1VOXEql0@public.gmane.org>
Subject: [PATCH 4/7] ARM: OMAP: N8x0: configure menelaus using DT
Date: Sat, 27 Dec 2014 19:52:56 +0200 [thread overview]
Message-ID: <1419702779-16001-5-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1419702779-16001-1-git-send-email-aaro.koskinen-X3B1VOXEql0@public.gmane.org>
Configure Menelaus using DT.
Signed-off-by: Aaro Koskinen <aaro.koskinen-X3B1VOXEql0@public.gmane.org>
---
arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 3 ++
arch/arm/mach-omap2/board-n8x0.c | 57 -----------------------------
arch/arm/mach-omap2/pdata-quirks.c | 1 -
3 files changed, 3 insertions(+), 58 deletions(-)
diff --git a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
index c9f1e93..c19718c 100644
--- a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
+++ b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
@@ -32,6 +32,9 @@
compatible = "menelaus";
reg = <0x72>;
interrupts = <7 IRQ_TYPE_EDGE_RISING>;
+ ti,autosleep;
+ ti,vcore-min-microvolt = <1050000>;
+ ti,vcore-max-microvolt = <1400000>;
};
};
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index b6443a4..0b511c0 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -516,63 +516,6 @@ void __init n8x0_mmc_init(void)
}
#endif /* CONFIG_MMC_OMAP */
-#ifdef CONFIG_MENELAUS
-
-static int n8x0_auto_sleep_regulators(void)
-{
- u32 val;
- int ret;
-
- val = EN_VPLL_SLEEP | EN_VMMC_SLEEP \
- | EN_VAUX_SLEEP | EN_VIO_SLEEP \
- | EN_VMEM_SLEEP | EN_DC3_SLEEP \
- | EN_VC_SLEEP | EN_DC2_SLEEP;
-
- ret = menelaus_set_regulator_sleep(1, val);
- if (ret < 0) {
- pr_err("Could not set regulators to sleep on menelaus: %u\n",
- ret);
- return ret;
- }
- return 0;
-}
-
-static int n8x0_auto_voltage_scale(void)
-{
- int ret;
-
- ret = menelaus_set_vcore_hw(1400, 1050);
- if (ret < 0) {
- pr_err("Could not set VCORE voltage on menelaus: %u\n", ret);
- return ret;
- }
- return 0;
-}
-
-static int n8x0_menelaus_late_init(struct device *dev)
-{
- int ret;
-
- ret = n8x0_auto_voltage_scale();
- if (ret < 0)
- return ret;
- ret = n8x0_auto_sleep_regulators();
- if (ret < 0)
- return ret;
- return 0;
-}
-
-#else
-static int n8x0_menelaus_late_init(struct device *dev)
-{
- return 0;
-}
-#endif
-
-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
- .late_init = n8x0_menelaus_late_init,
-};
-
struct aic3x_pdata n810_aic33_data __initdata = {
.gpio_reset = 118,
};
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 3d7eee1..fca4650 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -369,7 +369,6 @@ static struct pdata_init auxdata_quirks[] __initdata = {
struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
#ifdef CONFIG_MACH_NOKIA_N8X0
OF_DEV_AUXDATA("ti,omap2420-mmc", 0x4809c000, "mmci-omap.0", NULL),
- OF_DEV_AUXDATA("menelaus", 0x72, "1-0072", &n8x0_menelaus_platform_data),
OF_DEV_AUXDATA("tlv320aic3x", 0x18, "2-0018", &n810_aic33_data),
#endif
#ifdef CONFIG_ARCH_OMAP3
--
2.2.0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2014-12-27 17:52 UTC|newest]
Thread overview: 18+ 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 ` [PATCH 1/7] mfd: menelaus: delete omap_has_menelaus Aaro Koskinen
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
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 21:25 ` Felipe Balbi
2014-12-28 23:34 ` Aaro Koskinen
2014-12-29 18:12 ` Felipe Balbi
2014-12-27 17:52 ` [PATCH 5/7] mfd: menelaus: delete platform data support Aaro Koskinen
2015-01-20 13:54 ` Lee Jones
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 14:01 ` Lee Jones
2014-12-27 17:52 ` [PATCH 7/7] mfd: menelaus: use macro for magic number Aaro Koskinen
[not found] ` <1419702779-16001-8-git-send-email-aaro.koskinen-X3B1VOXEql0@public.gmane.org>
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 ` Aaro Koskinen [this message]
2015-01-20 17:13 ` [PATCH 0/7] Menelaus cleanup for DT, phase 1 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-5-git-send-email-aaro.koskinen@iki.fi \
--to=aaro.koskinen-x3b1voxeql0@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
--cc=tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).