All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tero Kristo <t-kristo@ti.com>
To: linux-omap@vger.kernel.org, paul@pwsan.com, tony@atomide.com,
	khilman@linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/18] ARM: OMAP3: PRM: move modem reset to PRM driver
Date: Tue, 4 Mar 2014 18:19:06 +0200	[thread overview]
Message-ID: <1393949958-816-7-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1393949958-816-1-git-send-email-t-kristo@ti.com>

This is a more proper isolation of the code. Done in preparation of making
PRM an individual driver.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
 arch/arm/mach-omap2/pm34xx.c  |    5 +----
 arch/arm/mach-omap2/prm3xxx.c |   15 +++++++++++++++
 arch/arm/mach-omap2/prm3xxx.h |    1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index a42f9ea..0eecf6f 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -368,10 +368,7 @@ static void __init omap3_d2d_idle(void)
 	omap_ctrl_writew(padconf, OMAP3_PADCONF_SAD2D_IDLEACK);
 
 	/* reset modem */
-	omap2_prm_write_mod_reg(OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RSTPWRON_MASK |
-			  OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RST_MASK,
-			  CORE_MOD, OMAP2_RM_RSTCTRL);
-	omap2_prm_write_mod_reg(0, CORE_MOD, OMAP2_RM_RSTCTRL);
+	omap3_prm_reset_modem();
 }
 
 static void __init prcm_setup_regs(void)
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index 78ea9a5..92ab46a 100644
--- a/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -259,6 +259,21 @@ int omap3xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 ignore_bits)
 }
 
 /**
+ * omap3_prm_reset_modem - toggle reset signal for modem
+ *
+ * Toggles the reset signal to modem IP block. Required to allow
+ * OMAP3430 without stacked modem to idle properly.
+ */
+void __init omap3_prm_reset_modem(void)
+{
+	omap2_prm_write_mod_reg(
+		OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RSTPWRON_MASK |
+		OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RST_MASK,
+				CORE_MOD, OMAP2_RM_RSTCTRL);
+	omap2_prm_write_mod_reg(0, CORE_MOD, OMAP2_RM_RSTCTRL);
+}
+
+/**
  * omap3xxx_prm_reconfigure_io_chain - clear latches and reconfigure I/O chain
  *
  * Clear any previously-latched I/O wakeup events and ensure that the
diff --git a/arch/arm/mach-omap2/prm3xxx.h b/arch/arm/mach-omap2/prm3xxx.h
index 543eb63..2a0f089 100644
--- a/arch/arm/mach-omap2/prm3xxx.h
+++ b/arch/arm/mach-omap2/prm3xxx.h
@@ -164,6 +164,7 @@ extern int __init omap3xxx_prm_init(void);
 extern u32 omap3xxx_prm_get_reset_sources(void);
 int omap3xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 ignore_bits);
 void omap3xxx_prm_iva_idle(void);
+void omap3_prm_reset_modem(void);
 
 #endif /* __ASSEMBLER */
 
-- 
1.7.9.5


WARNING: multiple messages have this Message-ID (diff)
From: t-kristo@ti.com (Tero Kristo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/18] ARM: OMAP3: PRM: move modem reset to PRM driver
Date: Tue, 4 Mar 2014 18:19:06 +0200	[thread overview]
Message-ID: <1393949958-816-7-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1393949958-816-1-git-send-email-t-kristo@ti.com>

This is a more proper isolation of the code. Done in preparation of making
PRM an individual driver.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
 arch/arm/mach-omap2/pm34xx.c  |    5 +----
 arch/arm/mach-omap2/prm3xxx.c |   15 +++++++++++++++
 arch/arm/mach-omap2/prm3xxx.h |    1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index a42f9ea..0eecf6f 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -368,10 +368,7 @@ static void __init omap3_d2d_idle(void)
 	omap_ctrl_writew(padconf, OMAP3_PADCONF_SAD2D_IDLEACK);
 
 	/* reset modem */
-	omap2_prm_write_mod_reg(OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RSTPWRON_MASK |
-			  OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RST_MASK,
-			  CORE_MOD, OMAP2_RM_RSTCTRL);
-	omap2_prm_write_mod_reg(0, CORE_MOD, OMAP2_RM_RSTCTRL);
+	omap3_prm_reset_modem();
 }
 
 static void __init prcm_setup_regs(void)
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index 78ea9a5..92ab46a 100644
--- a/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -259,6 +259,21 @@ int omap3xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 ignore_bits)
 }
 
 /**
+ * omap3_prm_reset_modem - toggle reset signal for modem
+ *
+ * Toggles the reset signal to modem IP block. Required to allow
+ * OMAP3430 without stacked modem to idle properly.
+ */
+void __init omap3_prm_reset_modem(void)
+{
+	omap2_prm_write_mod_reg(
+		OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RSTPWRON_MASK |
+		OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RST_MASK,
+				CORE_MOD, OMAP2_RM_RSTCTRL);
+	omap2_prm_write_mod_reg(0, CORE_MOD, OMAP2_RM_RSTCTRL);
+}
+
+/**
  * omap3xxx_prm_reconfigure_io_chain - clear latches and reconfigure I/O chain
  *
  * Clear any previously-latched I/O wakeup events and ensure that the
diff --git a/arch/arm/mach-omap2/prm3xxx.h b/arch/arm/mach-omap2/prm3xxx.h
index 543eb63..2a0f089 100644
--- a/arch/arm/mach-omap2/prm3xxx.h
+++ b/arch/arm/mach-omap2/prm3xxx.h
@@ -164,6 +164,7 @@ extern int __init omap3xxx_prm_init(void);
 extern u32 omap3xxx_prm_get_reset_sources(void);
 int omap3xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 ignore_bits);
 void omap3xxx_prm_iva_idle(void);
+void omap3_prm_reset_modem(void);
 
 #endif /* __ASSEMBLER */
 
-- 
1.7.9.5

  parent reply	other threads:[~2014-03-04 16:20 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-04 16:19 [PATCH 00/18] ARM: OMAP2+: CM/PRM cleanup set Tero Kristo
2014-03-04 16:19 ` Tero Kristo
2014-03-04 16:19 ` [PATCH 01/18] ARM: OMAP3: CM: remove a few OMAP34XX_CM_REGADDR defines Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 02/18] ARM: OMAP2+: prcm: add omap_test_timeout to prcm-common.h Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 03/18] ARM: OMAP2/3: CM: remove some external dependencies Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 04/18] ARM: OMAP3: PRM: move prcm wakeup helper to prm driver Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 05/18] ARM: OMAP3: PRM: move iva reset to PRM driver Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` Tero Kristo [this message]
2014-03-04 16:19   ` [PATCH 06/18] ARM: OMAP3: PRM: move modem " Tero Kristo
2014-03-04 16:19 ` [PATCH 07/18] ARM: OMAP2/3: CM: remove direct register access macros from common header Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 08/18] ARM: OMAP3: PRM: add API for checking and clearing cold reset status Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 09/18] ARM: OMAP3: PRM: add API for saving PRM scratchpad contents Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 10/18] ARM: OMAP24xx: PRM: add API for clearing wakeup status bits Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 11/18] ARM: OMAP24xx: PRM: move PRM init code within PRM driver from PM core Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 12/18] ARM: OMAP3: PM: remove access to PRM_VOLTCTRL register Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-25 22:36   ` Tony Lindgren
2014-03-25 22:36     ` Tony Lindgren
2014-03-26  8:00     ` Tero Kristo
2014-03-26  8:00       ` Tero Kristo
2014-03-26 18:40       ` Tony Lindgren
2014-03-26 18:40         ` Tony Lindgren
2014-03-04 16:19 ` [PATCH 13/18] ARM: OMAP3: PRM: move PRM init code from PM core to the driver Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 14/18] ARM: OMAP2/3: PRM: split PRM header file to common and internal versions Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 15/18] ARM: OMAP4+: PRM: make prm register access internal to PRM driver only Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 16/18] ARM: OMAP3: control: add API for setting up the modem pads Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 17/18] ARM: OMAP3: PRM: move modem reset and iva2 idle to PRM driver Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-04 16:19 ` [PATCH 18/18] ARM: OMAP3: control: isolate control module init to its own function Tero Kristo
2014-03-04 16:19   ` Tero Kristo
2014-03-05 17:36 ` [PATCH 00/18] ARM: OMAP2+: CM/PRM cleanup set Tony Lindgren
2014-03-05 17:36   ` Tony Lindgren
2014-04-12 10:22 ` Tero Kristo
2014-04-12 10:22   ` Tero Kristo

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=1393949958-816-7-git-send-email-t-kristo@ti.com \
    --to=t-kristo@ti.com \
    --cc=khilman@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=paul@pwsan.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.