mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
linux-mainline 3.2: kernel recipe based on mainline 3.2.16 with additional patches for e.g. beagleboard on top
This patchset is managed in https://github.com/beagleboard/kernel/tree/beagleboard-3.2 by Robert Nelson and myself. Tested on beagleboard-xM/Angstrom Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
This commit is contained in:
Koen Kooi
committed by
Denys Dmytriyenko
Denys Dmytriyenko
parent
aff1018e66
commit
4e18d70247
+33
@@ -0,0 +1,33 @@
|
||||
From 8c23e194ca34d280d21ca845acd18052928002d0 Mon Sep 17 00:00:00 2001
|
||||
From: Sanjeev Premi <premi@ti.com>
|
||||
Date: Thu, 29 Apr 2010 14:09:42 +0530
|
||||
Subject: [PATCH 1/6] omap3: Increase limit on bootarg 'mpurate'
|
||||
|
||||
The value of mpurate is currently expected to be less
|
||||
than 1000 when specified in MHz.
|
||||
|
||||
This patch raises this limit to 2000 to support 1GHz
|
||||
capable processors. The new limit should be reasonable
|
||||
for quite some time.
|
||||
|
||||
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
|
||||
---
|
||||
arch/arm/plat-omap/clock.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
|
||||
index 567e4b5..fe4e67c 100644
|
||||
--- a/arch/arm/plat-omap/clock.c
|
||||
+++ b/arch/arm/plat-omap/clock.c
|
||||
@@ -186,7 +186,7 @@ static int __init omap_clk_setup(char *str)
|
||||
if (!mpurate)
|
||||
return 1;
|
||||
|
||||
- if (mpurate < 1000)
|
||||
+ if (mpurate < 2000)
|
||||
mpurate *= 1000000;
|
||||
|
||||
return 1;
|
||||
--
|
||||
1.7.7.4
|
||||
|
||||
+110
@@ -0,0 +1,110 @@
|
||||
From 4f047b347137482b1894ab1c48ed472993dbbe54 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Walmsley <paul@pwsan.com>
|
||||
Date: Fri, 16 Dec 2011 16:09:11 -0800
|
||||
Subject: [PATCH 2/6] ARM: OMAP: AM3517/3505: fix crash on boot due to
|
||||
incorrect voltagedomain data
|
||||
|
||||
AM3517/3505 chips don't have voltage controller and voltage processor
|
||||
IP blocks. Trying to use OMAP34xx/36xx voltage domain data on these
|
||||
chips causes a crash during boot:
|
||||
|
||||
omap_vc_init_channel: PMIC info requried to configure vc forvdd_core not populated.Hence cannot initialize vc
|
||||
Unable to handle kernel NULL pointer dereference at virtual address 00000025
|
||||
pgd = c0004000
|
||||
[00000025] *pgd=00000000
|
||||
Internal error: Oops: 5 [#1] SMP
|
||||
Modules linked in:
|
||||
CPU: 0 Tainted: G W (3.2.0-rc5-00006-g402ecf4 #304)
|
||||
PC is at omap_vp_init+0x5c/0x14c
|
||||
LR is at omap_vp_init+0x54/0x14c
|
||||
|
||||
Fix this by using very minimal voltage domain definitions for AM3517/3505.
|
||||
|
||||
Signed-off-by: Paul Walmsley <paul@pwsan.com>
|
||||
Cc: Igor Grinberg <grinberg@compulab.co.il>
|
||||
Cc: Kevin Hilman <khilman@ti.com>
|
||||
Signed-off-by: Tony Lindgren <tony@atomide.com>
|
||||
---
|
||||
arch/arm/mach-omap2/voltagedomains3xxx_data.c | 40 +++++++++++++++++++++----
|
||||
1 files changed, 34 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
|
||||
index 071101d..636b688 100644
|
||||
--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
|
||||
+++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
|
||||
@@ -31,6 +31,14 @@
|
||||
* VDD data
|
||||
*/
|
||||
|
||||
+/* OMAP3-common voltagedomain data */
|
||||
+
|
||||
+static struct voltagedomain omap3_voltdm_wkup = {
|
||||
+ .name = "wakeup",
|
||||
+};
|
||||
+
|
||||
+/* 34xx/36xx voltagedomain data */
|
||||
+
|
||||
static const struct omap_vfsm_instance omap3_vdd1_vfsm = {
|
||||
.voltsetup_reg = OMAP3_PRM_VOLTSETUP1_OFFSET,
|
||||
.voltsetup_mask = OMAP3430_SETUP_TIME1_MASK,
|
||||
@@ -63,10 +71,6 @@ static struct voltagedomain omap3_voltdm_core = {
|
||||
.vp = &omap3_vp_core,
|
||||
};
|
||||
|
||||
-static struct voltagedomain omap3_voltdm_wkup = {
|
||||
- .name = "wakeup",
|
||||
-};
|
||||
-
|
||||
static struct voltagedomain *voltagedomains_omap3[] __initdata = {
|
||||
&omap3_voltdm_mpu,
|
||||
&omap3_voltdm_core,
|
||||
@@ -74,11 +78,30 @@ static struct voltagedomain *voltagedomains_omap3[] __initdata = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
+/* AM35xx voltagedomain data */
|
||||
+
|
||||
+static struct voltagedomain am35xx_voltdm_mpu = {
|
||||
+ .name = "mpu_iva",
|
||||
+};
|
||||
+
|
||||
+static struct voltagedomain am35xx_voltdm_core = {
|
||||
+ .name = "core",
|
||||
+};
|
||||
+
|
||||
+static struct voltagedomain *voltagedomains_am35xx[] __initdata = {
|
||||
+ &am35xx_voltdm_mpu,
|
||||
+ &am35xx_voltdm_core,
|
||||
+ &omap3_voltdm_wkup,
|
||||
+ NULL,
|
||||
+};
|
||||
+
|
||||
+
|
||||
static const char *sys_clk_name __initdata = "sys_ck";
|
||||
|
||||
void __init omap3xxx_voltagedomains_init(void)
|
||||
{
|
||||
struct voltagedomain *voltdm;
|
||||
+ struct voltagedomain **voltdms;
|
||||
int i;
|
||||
|
||||
/*
|
||||
@@ -93,8 +116,13 @@ void __init omap3xxx_voltagedomains_init(void)
|
||||
omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data;
|
||||
}
|
||||
|
||||
- for (i = 0; voltdm = voltagedomains_omap3[i], voltdm; i++)
|
||||
+ if (cpu_is_omap3517() || cpu_is_omap3505())
|
||||
+ voltdms = voltagedomains_am35xx;
|
||||
+ else
|
||||
+ voltdms = voltagedomains_omap3;
|
||||
+
|
||||
+ for (i = 0; voltdm = voltdms[i], voltdm; i++)
|
||||
voltdm->sys_clk.name = sys_clk_name;
|
||||
|
||||
- voltdm_init(voltagedomains_omap3);
|
||||
+ voltdm_init(voltdms);
|
||||
};
|
||||
--
|
||||
1.7.7.4
|
||||
|
||||
+200
@@ -0,0 +1,200 @@
|
||||
From 3752df4a899250ce6ad4ebd46e0c58235f9dcfa0 Mon Sep 17 00:00:00 2001
|
||||
From: Benoit Cousson <b-cousson@ti.com>
|
||||
Date: Fri, 16 Dec 2011 16:09:11 -0800
|
||||
Subject: [PATCH 3/6] ARM: OMAP4: hwmod: Don't wait for the idle status if
|
||||
modulemode is not supported
|
||||
|
||||
If the module does not have any modulemode, the _disable_module function
|
||||
will do nothing. There is then no point waiting for a idle status change.
|
||||
|
||||
It will remove the following warnings.
|
||||
|
||||
[ 0.331848] omap_hwmod: dmm: _wait_target_disable failed
|
||||
[ 0.339935] omap_hwmod: emif_fw: _wait_target_disable failed
|
||||
[ 0.348358] omap_hwmod: l3_main_1: _wait_target_disable failed
|
||||
[ 0.356964] omap_hwmod: l3_main_2: _wait_target_disable failed
|
||||
[ 0.365600] omap_hwmod: l4_abe: _wait_target_disable failed
|
||||
[ 0.373931] omap_hwmod: l4_cfg: _wait_target_disable failed
|
||||
[ 0.382263] omap_hwmod: l4_per: _wait_target_disable failed
|
||||
[ 0.391113] omap_hwmod: l4_wkup: _wait_target_disable failed
|
||||
[ 0.399536] omap_hwmod: dma_system: _wait_target_disable failed
|
||||
[ 0.408325] omap_hwmod: dss_core: _wait_target_disable failed
|
||||
[ 0.416839] omap_hwmod: dss_dispc: _wait_target_disable failed
|
||||
[ 0.425445] omap_hwmod: dss_dsi1: _wait_target_disable failed
|
||||
[ 0.433990] omap_hwmod: dss_dsi2: _wait_target_disable failed
|
||||
[ 0.442504] omap_hwmod: dss_hdmi: _wait_target_disable failed
|
||||
[ 0.451019] omap_hwmod: dss_rfbi: _wait_target_disable failed
|
||||
[ 0.459564] omap_hwmod: dss_venc: _wait_target_disable failed
|
||||
[ 0.489471] omap_hwmod: mailbox: _wait_target_disable failed
|
||||
[ 0.505920] omap_hwmod: spinlock: _wait_target_disable failed
|
||||
|
||||
Note: For such module, the state is managed automatically by HW according
|
||||
to clock domain transition. It is then not possible to wait for idle even
|
||||
later in the _idle function since the status will change at clock domain
|
||||
boundary.
|
||||
|
||||
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
|
||||
Cc: Paul Walmsley <paul@pwsan.com>
|
||||
Cc: Rajendra Nayak <rnayak@ti.com>
|
||||
[paul@pwsan.com: renamed fns to indicate that they are OMAP4-only; moved
|
||||
_wait_target_disable() into _disable_module(), removing duplicate code]
|
||||
Signed-off-by: Paul Walmsley <paul@pwsan.com>
|
||||
Signed-off-by: Tony Lindgren <tony@atomide.com>
|
||||
---
|
||||
arch/arm/mach-omap2/omap_hwmod.c | 98 +++++++++++++++++++-------------------
|
||||
1 files changed, 49 insertions(+), 49 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
|
||||
index 207a2ff..ebace0f 100644
|
||||
--- a/arch/arm/mach-omap2/omap_hwmod.c
|
||||
+++ b/arch/arm/mach-omap2/omap_hwmod.c
|
||||
@@ -706,27 +706,65 @@ static void _enable_module(struct omap_hwmod *oh)
|
||||
}
|
||||
|
||||
/**
|
||||
- * _disable_module - enable CLKCTRL modulemode on OMAP4
|
||||
+ * _omap4_wait_target_disable - wait for a module to be disabled on OMAP4
|
||||
+ * @oh: struct omap_hwmod *
|
||||
+ *
|
||||
+ * Wait for a module @oh to enter slave idle. Returns 0 if the module
|
||||
+ * does not have an IDLEST bit or if the module successfully enters
|
||||
+ * slave idle; otherwise, pass along the return value of the
|
||||
+ * appropriate *_cm*_wait_module_idle() function.
|
||||
+ */
|
||||
+static int _omap4_wait_target_disable(struct omap_hwmod *oh)
|
||||
+{
|
||||
+ if (!cpu_is_omap44xx())
|
||||
+ return 0;
|
||||
+
|
||||
+ if (!oh)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ if (oh->_int_flags & _HWMOD_NO_MPU_PORT)
|
||||
+ return 0;
|
||||
+
|
||||
+ if (oh->flags & HWMOD_NO_IDLEST)
|
||||
+ return 0;
|
||||
+
|
||||
+ return omap4_cminst_wait_module_idle(oh->clkdm->prcm_partition,
|
||||
+ oh->clkdm->cm_inst,
|
||||
+ oh->clkdm->clkdm_offs,
|
||||
+ oh->prcm.omap4.clkctrl_offs);
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * _omap4_disable_module - enable CLKCTRL modulemode on OMAP4
|
||||
* @oh: struct omap_hwmod *
|
||||
*
|
||||
* Disable the PRCM module mode related to the hwmod @oh.
|
||||
- * No return value.
|
||||
+ * Return EINVAL if the modulemode is not supported and 0 in case of success.
|
||||
*/
|
||||
-static void _disable_module(struct omap_hwmod *oh)
|
||||
+static int _omap4_disable_module(struct omap_hwmod *oh)
|
||||
{
|
||||
+ int v;
|
||||
+
|
||||
/* The module mode does not exist prior OMAP4 */
|
||||
- if (cpu_is_omap24xx() || cpu_is_omap34xx())
|
||||
- return;
|
||||
+ if (!cpu_is_omap44xx())
|
||||
+ return -EINVAL;
|
||||
|
||||
if (!oh->clkdm || !oh->prcm.omap4.modulemode)
|
||||
- return;
|
||||
+ return -EINVAL;
|
||||
|
||||
- pr_debug("omap_hwmod: %s: _disable_module\n", oh->name);
|
||||
+ pr_debug("omap_hwmod: %s: %s\n", oh->name, __func__);
|
||||
|
||||
omap4_cminst_module_disable(oh->clkdm->prcm_partition,
|
||||
oh->clkdm->cm_inst,
|
||||
oh->clkdm->clkdm_offs,
|
||||
oh->prcm.omap4.clkctrl_offs);
|
||||
+
|
||||
+ v = _omap4_wait_target_disable(oh);
|
||||
+ if (v)
|
||||
+ pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",
|
||||
+ oh->name);
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1153,36 +1191,6 @@ static int _wait_target_ready(struct omap_hwmod *oh)
|
||||
}
|
||||
|
||||
/**
|
||||
- * _wait_target_disable - wait for a module to be disabled
|
||||
- * @oh: struct omap_hwmod *
|
||||
- *
|
||||
- * Wait for a module @oh to enter slave idle. Returns 0 if the module
|
||||
- * does not have an IDLEST bit or if the module successfully enters
|
||||
- * slave idle; otherwise, pass along the return value of the
|
||||
- * appropriate *_cm*_wait_module_idle() function.
|
||||
- */
|
||||
-static int _wait_target_disable(struct omap_hwmod *oh)
|
||||
-{
|
||||
- /* TODO: For now just handle OMAP4+ */
|
||||
- if (cpu_is_omap24xx() || cpu_is_omap34xx())
|
||||
- return 0;
|
||||
-
|
||||
- if (!oh)
|
||||
- return -EINVAL;
|
||||
-
|
||||
- if (oh->_int_flags & _HWMOD_NO_MPU_PORT)
|
||||
- return 0;
|
||||
-
|
||||
- if (oh->flags & HWMOD_NO_IDLEST)
|
||||
- return 0;
|
||||
-
|
||||
- return omap4_cminst_wait_module_idle(oh->clkdm->prcm_partition,
|
||||
- oh->clkdm->cm_inst,
|
||||
- oh->clkdm->clkdm_offs,
|
||||
- oh->prcm.omap4.clkctrl_offs);
|
||||
-}
|
||||
-
|
||||
-/**
|
||||
* _lookup_hardreset - fill register bit info for this hwmod/reset line
|
||||
* @oh: struct omap_hwmod *
|
||||
* @name: name of the reset line in the context of this hwmod
|
||||
@@ -1524,8 +1532,6 @@ static int _enable(struct omap_hwmod *oh)
|
||||
*/
|
||||
static int _idle(struct omap_hwmod *oh)
|
||||
{
|
||||
- int ret;
|
||||
-
|
||||
pr_debug("omap_hwmod: %s: idling\n", oh->name);
|
||||
|
||||
if (oh->_state != _HWMOD_STATE_ENABLED) {
|
||||
@@ -1537,11 +1543,9 @@ static int _idle(struct omap_hwmod *oh)
|
||||
if (oh->class->sysc)
|
||||
_idle_sysc(oh);
|
||||
_del_initiator_dep(oh, mpu_oh);
|
||||
- _disable_module(oh);
|
||||
- ret = _wait_target_disable(oh);
|
||||
- if (ret)
|
||||
- pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",
|
||||
- oh->name);
|
||||
+
|
||||
+ _omap4_disable_module(oh);
|
||||
+
|
||||
/*
|
||||
* The module must be in idle mode before disabling any parents
|
||||
* clocks. Otherwise, the parent clock might be disabled before
|
||||
@@ -1642,11 +1646,7 @@ static int _shutdown(struct omap_hwmod *oh)
|
||||
if (oh->_state == _HWMOD_STATE_ENABLED) {
|
||||
_del_initiator_dep(oh, mpu_oh);
|
||||
/* XXX what about the other system initiators here? dma, dsp */
|
||||
- _disable_module(oh);
|
||||
- ret = _wait_target_disable(oh);
|
||||
- if (ret)
|
||||
- pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",
|
||||
- oh->name);
|
||||
+ _omap4_disable_module(oh);
|
||||
_disable_clocks(oh);
|
||||
if (oh->clkdm)
|
||||
clkdm_hwmod_disable(oh->clkdm, oh);
|
||||
--
|
||||
1.7.7.4
|
||||
|
||||
+56
@@ -0,0 +1,56 @@
|
||||
From 65f1ea963900225224754f674e8907248262a46b Mon Sep 17 00:00:00 2001
|
||||
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
|
||||
Date: Fri, 16 Dec 2011 16:09:12 -0800
|
||||
Subject: [PATCH 4/6] ARM: OMAP4: clock: Add CPU local timer clock node
|
||||
|
||||
Local timer clock is sourced from the CPU clock and hence changes
|
||||
along with CPU clock. These per CPU local timers are used as
|
||||
clock-events, so they need to be reconfigured on CPU frequency
|
||||
change as part of CPUfreq governor.
|
||||
|
||||
Newly introduced clockevents_reconfigure() needs to know the
|
||||
twd clock-rate. Provide a clock-node to make clk_get_rate() work
|
||||
for TWD.
|
||||
|
||||
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
|
||||
Cc: Paul Walmsley <paul@pwsan.com>
|
||||
Cc: Kevin Hilman <khilman@ti.com>
|
||||
[paul@pwsan.com: renamed clock node to 'mpu_periphclk' to indicate that this
|
||||
is the Cortex-A9 MPCore subsystem clock PERIPHCLK (DDI 0407G); moved
|
||||
clock and clkdev entries to match the autogenerated script output]
|
||||
Signed-off-by: Paul Walmsley <paul@pwsan.com>
|
||||
Signed-off-by: Tony Lindgren <tony@atomide.com>
|
||||
---
|
||||
arch/arm/mach-omap2/clock44xx_data.c | 9 +++++++++
|
||||
1 files changed, 9 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
|
||||
index 0798a80..730097e 100644
|
||||
--- a/arch/arm/mach-omap2/clock44xx_data.c
|
||||
+++ b/arch/arm/mach-omap2/clock44xx_data.c
|
||||
@@ -1206,6 +1206,14 @@ static const struct clksel ocp_abe_iclk_div[] = {
|
||||
{ .parent = NULL },
|
||||
};
|
||||
|
||||
+static struct clk mpu_periphclk = {
|
||||
+ .name = "mpu_periphclk",
|
||||
+ .parent = &dpll_mpu_ck,
|
||||
+ .ops = &clkops_null,
|
||||
+ .fixed_div = 2,
|
||||
+ .recalc = &omap_fixed_divisor_recalc,
|
||||
+};
|
||||
+
|
||||
static struct clk ocp_abe_iclk = {
|
||||
.name = "ocp_abe_iclk",
|
||||
.parent = &aess_fclk,
|
||||
@@ -3189,6 +3197,7 @@ static struct omap_clk omap44xx_clks[] = {
|
||||
CLK(NULL, "l4_div_ck", &l4_div_ck, CK_443X),
|
||||
CLK(NULL, "lp_clk_div_ck", &lp_clk_div_ck, CK_443X),
|
||||
CLK(NULL, "l4_wkup_clk_mux_ck", &l4_wkup_clk_mux_ck, CK_443X),
|
||||
+ CLK("smp_twd", NULL, &mpu_periphclk, CK_443X),
|
||||
CLK(NULL, "ocp_abe_iclk", &ocp_abe_iclk, CK_443X),
|
||||
CLK(NULL, "per_abe_24m_fclk", &per_abe_24m_fclk, CK_443X),
|
||||
CLK(NULL, "per_abe_nc_fclk", &per_abe_nc_fclk, CK_443X),
|
||||
--
|
||||
1.7.7.4
|
||||
|
||||
+161
@@ -0,0 +1,161 @@
|
||||
From 44d502c38e4c7bd924c7ac987af4525ec3e8818f Mon Sep 17 00:00:00 2001
|
||||
From: Paul Walmsley <paul@pwsan.com>
|
||||
Date: Thu, 15 Dec 2011 23:30:44 -0700
|
||||
Subject: [PATCH 5/6] ARM: OMAP3: hwmod data: disable multiblock reads on
|
||||
MMC1/2 on OMAP34xx/35xx <= ES2.1
|
||||
|
||||
The HSMMC1/HSMMC2 host controllers on OMAP34xx and
|
||||
OMAP3503/3515/3525/3530 chips at ES levels prior to 3.0 can't do multiple
|
||||
block reads[1]. Mark the hwmod data appropriately.
|
||||
|
||||
Reported by Dave Hylands <dhylands@gmail.com> and Steve Sakoman
|
||||
<sakoman@gmail.com>. Thanks to Steve Sakoman for further help
|
||||
testing this patch.
|
||||
|
||||
1. See for example Advisory 2.1.1.128 "MMC: Multiple Block Read
|
||||
Operation Issue" in _OMAP3530/3525/3515/3503 Silicon Errata_
|
||||
Revision F (October 2010) (SPRZ278F), available from
|
||||
http://focus.ti.com/lit/er/sprz278f/sprz278f.pdf
|
||||
|
||||
Note: added 36xx/am35 stuff in the next patch..
|
||||
|
||||
Signed-off-by: Paul Walmsley <paul@pwsan.com>
|
||||
Cc: Dave Hylands <dhylands@gmail.com>
|
||||
Cc: Steve Sakoman <sakoman@gmail.com>
|
||||
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
|
||||
---
|
||||
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 90 ++++++++++++++++++++++++++-
|
||||
1 files changed, 86 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
|
||||
index eef43e2..dcbcd64 100644
|
||||
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
|
||||
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
|
||||
@@ -3072,7 +3072,35 @@ static struct omap_mmc_dev_attr mmc1_dev_attr = {
|
||||
.flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT,
|
||||
};
|
||||
|
||||
-static struct omap_hwmod omap3xxx_mmc1_hwmod = {
|
||||
+/* See 35xx errata 2.1.1.128 in SPRZ278F */
|
||||
+static struct omap_mmc_dev_attr mmc1_pre_es3_dev_attr = {
|
||||
+ .flags = (OMAP_HSMMC_SUPPORTS_DUAL_VOLT |
|
||||
+ OMAP_HSMMC_BROKEN_MULTIBLOCK_READ),
|
||||
+};
|
||||
+
|
||||
+static struct omap_hwmod omap3xxx_pre_es3_mmc1_hwmod = {
|
||||
+ .name = "mmc1",
|
||||
+ .mpu_irqs = omap34xx_mmc1_mpu_irqs,
|
||||
+ .sdma_reqs = omap34xx_mmc1_sdma_reqs,
|
||||
+ .opt_clks = omap34xx_mmc1_opt_clks,
|
||||
+ .opt_clks_cnt = ARRAY_SIZE(omap34xx_mmc1_opt_clks),
|
||||
+ .main_clk = "mmchs1_fck",
|
||||
+ .prcm = {
|
||||
+ .omap2 = {
|
||||
+ .module_offs = CORE_MOD,
|
||||
+ .prcm_reg_id = 1,
|
||||
+ .module_bit = OMAP3430_EN_MMC1_SHIFT,
|
||||
+ .idlest_reg_id = 1,
|
||||
+ .idlest_idle_bit = OMAP3430_ST_MMC1_SHIFT,
|
||||
+ },
|
||||
+ },
|
||||
+ .dev_attr = &mmc1_pre_es3_dev_attr,
|
||||
+ .slaves = omap3xxx_mmc1_slaves,
|
||||
+ .slaves_cnt = ARRAY_SIZE(omap3xxx_mmc1_slaves),
|
||||
+ .class = &omap34xx_mmc_class,
|
||||
+};
|
||||
+
|
||||
+static struct omap_hwmod omap3xxx_es3plus_mmc1_hwmod = {
|
||||
.name = "mmc1",
|
||||
.mpu_irqs = omap34xx_mmc1_mpu_irqs,
|
||||
.sdma_reqs = omap34xx_mmc1_sdma_reqs,
|
||||
@@ -3115,7 +3143,34 @@ static struct omap_hwmod_ocp_if *omap3xxx_mmc2_slaves[] = {
|
||||
&omap3xxx_l4_core__mmc2,
|
||||
};
|
||||
|
||||
-static struct omap_hwmod omap3xxx_mmc2_hwmod = {
|
||||
+/* See 35xx errata 2.1.1.128 in SPRZ278F */
|
||||
+static struct omap_mmc_dev_attr mmc2_pre_es3_dev_attr = {
|
||||
+ .flags = OMAP_HSMMC_BROKEN_MULTIBLOCK_READ,
|
||||
+};
|
||||
+
|
||||
+static struct omap_hwmod omap3xxx_pre_es3_mmc2_hwmod = {
|
||||
+ .name = "mmc2",
|
||||
+ .mpu_irqs = omap34xx_mmc2_mpu_irqs,
|
||||
+ .sdma_reqs = omap34xx_mmc2_sdma_reqs,
|
||||
+ .opt_clks = omap34xx_mmc2_opt_clks,
|
||||
+ .opt_clks_cnt = ARRAY_SIZE(omap34xx_mmc2_opt_clks),
|
||||
+ .main_clk = "mmchs2_fck",
|
||||
+ .prcm = {
|
||||
+ .omap2 = {
|
||||
+ .module_offs = CORE_MOD,
|
||||
+ .prcm_reg_id = 1,
|
||||
+ .module_bit = OMAP3430_EN_MMC2_SHIFT,
|
||||
+ .idlest_reg_id = 1,
|
||||
+ .idlest_idle_bit = OMAP3430_ST_MMC2_SHIFT,
|
||||
+ },
|
||||
+ },
|
||||
+ .dev_attr = &mmc2_pre_es3_dev_attr,
|
||||
+ .slaves = omap3xxx_mmc2_slaves,
|
||||
+ .slaves_cnt = ARRAY_SIZE(omap3xxx_mmc2_slaves),
|
||||
+ .class = &omap34xx_mmc_class,
|
||||
+};
|
||||
+
|
||||
+static struct omap_hwmod omap3xxx_es3plus_mmc2_hwmod = {
|
||||
.name = "mmc2",
|
||||
.mpu_irqs = omap34xx_mmc2_mpu_irqs,
|
||||
.sdma_reqs = omap34xx_mmc2_sdma_reqs,
|
||||
@@ -3182,8 +3237,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
|
||||
&omap3xxx_l4_core_hwmod,
|
||||
&omap3xxx_l4_per_hwmod,
|
||||
&omap3xxx_l4_wkup_hwmod,
|
||||
- &omap3xxx_mmc1_hwmod,
|
||||
- &omap3xxx_mmc2_hwmod,
|
||||
&omap3xxx_mmc3_hwmod,
|
||||
&omap3xxx_mpu_hwmod,
|
||||
|
||||
@@ -3258,6 +3311,20 @@ static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {
|
||||
NULL
|
||||
};
|
||||
|
||||
+/* <= 3430ES3-only hwmods */
|
||||
+static struct omap_hwmod *omap3430_pre_es3_hwmods[] __initdata = {
|
||||
+ &omap3xxx_pre_es3_mmc1_hwmod,
|
||||
+ &omap3xxx_pre_es3_mmc2_hwmod,
|
||||
+ NULL
|
||||
+};
|
||||
+
|
||||
+/* 3430ES3+-only hwmods */
|
||||
+static struct omap_hwmod *omap3430_es3plus_hwmods[] __initdata = {
|
||||
+ &omap3xxx_es3plus_mmc1_hwmod,
|
||||
+ &omap3xxx_es3plus_mmc2_hwmod,
|
||||
+ NULL
|
||||
+};
|
||||
+
|
||||
/* 34xx-only hwmods (all ES revisions) */
|
||||
static __initdata struct omap_hwmod *omap34xx_hwmods[] = {
|
||||
&omap3xxx_iva_hwmod,
|
||||
@@ -3334,6 +3401,21 @@ int __init omap3xxx_hwmod_init(void)
|
||||
h = omap3430es2plus_hwmods;
|
||||
};
|
||||
|
||||
+ if (h) {
|
||||
+ r = omap_hwmod_register(h);
|
||||
+ if (r < 0)
|
||||
+ return r;
|
||||
+ }
|
||||
+
|
||||
+ h = NULL;
|
||||
+ if (rev == OMAP3430_REV_ES1_0 || rev == OMAP3430_REV_ES2_0 ||
|
||||
+ rev == OMAP3430_REV_ES2_1) {
|
||||
+ h = omap3430_pre_es3_hwmods;
|
||||
+ } else if (rev == OMAP3430_REV_ES3_0 || rev == OMAP3430_REV_ES3_1 ||
|
||||
+ rev == OMAP3430_REV_ES3_1_2) {
|
||||
+ h = omap3430_es3plus_hwmods;
|
||||
+ };
|
||||
+
|
||||
if (h)
|
||||
r = omap_hwmod_register(h);
|
||||
|
||||
--
|
||||
1.7.7.4
|
||||
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
From 9607ccc0276ee734d3c1a58da0ab4ee18c7fbd29 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Nelson <robertcnelson@gmail.com>
|
||||
Date: Wed, 28 Dec 2011 10:32:54 -0600
|
||||
Subject: [PATCH 6/6] OMAP: HWMOD: add es3plus to am36xx/am35xx
|
||||
|
||||
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
|
||||
---
|
||||
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 ++++
|
||||
1 files changed, 4 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
|
||||
index dcbcd64..3e1a489 100644
|
||||
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
|
||||
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
|
||||
@@ -3343,12 +3343,16 @@ static __initdata struct omap_hwmod *omap36xx_hwmods[] = {
|
||||
&omap36xx_sr2_hwmod,
|
||||
&omap3xxx_usbhsotg_hwmod,
|
||||
&omap3xxx_mailbox_hwmod,
|
||||
+ &omap3xxx_es3plus_mmc1_hwmod,
|
||||
+ &omap3xxx_es3plus_mmc2_hwmod,
|
||||
NULL
|
||||
};
|
||||
|
||||
static __initdata struct omap_hwmod *am35xx_hwmods[] = {
|
||||
&omap3xxx_dss_core_hwmod, /* XXX ??? */
|
||||
&am35xx_usbhsotg_hwmod,
|
||||
+ &omap3xxx_es3plus_mmc1_hwmod,
|
||||
+ &omap3xxx_es3plus_mmc2_hwmod,
|
||||
NULL
|
||||
};
|
||||
|
||||
--
|
||||
1.7.7.4
|
||||
|
||||
Reference in New Issue
Block a user