From: Pramod Gurav <gpramod@codeaurora.org>
To: linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: gregkh@linuxfoundation.org, bryanh@codeaurora.org,
sboyd@codeaurora.org, jslaby@suse.cz,
Pramod Gurav <gpramod@codeaurora.org>
Subject: [PATCH v2 1/2] tty: serial: msm: Add mask value for UART_DM registers
Date: Wed, 8 Apr 2015 18:58:52 +0530 [thread overview]
Message-ID: <1428499733-21963-1-git-send-email-gpramod@codeaurora.org> (raw)
The bit masks for RFR_LEVEL1 and STALE_TIMEOUT_MSB values in MR1 and
IPR registers respectively are different for UART and UART_DM hardware
cores. We have been using UART core mask values for these. Add the same
for UART_DM core.
There is no bit setting as UART_IPR_RXSTALE_LAST for UART_DM core so do
it only for UART core.
Signed-off-by: Pramod Gurav <gpramod@codeaurora.org>
---
Changes since last version:
- Added new macro fo UART_DM_MR1_AUTO_RFR_LEVEL1 instead of modifying existing.
- Added a new macro for IPR register as it is also different in UART_DM
- Changed subject line
- Removed change log from message
drivers/tty/serial/msm_serial.c | 19 +++++++++++++++----
drivers/tty/serial/msm_serial.h | 2 ++
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index b73889c..4c1e9ea 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -432,8 +432,13 @@ static int msm_set_baud_rate(struct uart_port *port, unsigned int baud)
/* RX stale watermark */
rxstale = entry->rxstale;
watermark = UART_IPR_STALE_LSB & rxstale;
- watermark |= UART_IPR_RXSTALE_LAST;
- watermark |= UART_IPR_STALE_TIMEOUT_MSB & (rxstale << 2);
+ if (msm_port->is_uartdm)
+ watermark |= UART_DM_IPR_STALE_TIMEOUT_MSB & (rxstale << 2);
+ else {
+ watermark |= UART_IPR_RXSTALE_LAST;
+ watermark |= UART_IPR_STALE_TIMEOUT_MSB & (rxstale << 2);
+ }
+
msm_write(port, watermark, UART_IPR);
/* set RX watermark */
@@ -496,9 +501,15 @@ static int msm_startup(struct uart_port *port)
/* set automatic RFR level */
data = msm_read(port, UART_MR1);
- data &= ~UART_MR1_AUTO_RFR_LEVEL1;
+ if (msm_port->is_uartdm) {
+ data &= ~UART_DM_MR1_AUTO_RFR_LEVEL1;
+ data |= UART_DM_MR1_AUTO_RFR_LEVEL1 & (rfr_level << 2);
+ } else {
+ data &= ~UART_MR1_AUTO_RFR_LEVEL1;
+ data |= UART_MR1_AUTO_RFR_LEVEL1 & (rfr_level << 2);
+ }
+
data &= ~UART_MR1_AUTO_RFR_LEVEL0;
- data |= UART_MR1_AUTO_RFR_LEVEL1 & (rfr_level << 2);
data |= UART_MR1_AUTO_RFR_LEVEL0 & rfr_level;
msm_write(port, data, UART_MR1);
return 0;
diff --git a/drivers/tty/serial/msm_serial.h b/drivers/tty/serial/msm_serial.h
index 3e1c713..caf5363 100644
--- a/drivers/tty/serial/msm_serial.h
+++ b/drivers/tty/serial/msm_serial.h
@@ -20,6 +20,7 @@
#define UART_MR1_AUTO_RFR_LEVEL0 0x3F
#define UART_MR1_AUTO_RFR_LEVEL1 0x3FF00
+#define UART_DM_MR1_AUTO_RFR_LEVEL1 0xFFFFFF00
#define UART_MR1_RX_RDY_CTL (1 << 7)
#define UART_MR1_CTS_CTL (1 << 6)
@@ -78,6 +79,7 @@
#define UART_IPR_RXSTALE_LAST 0x20
#define UART_IPR_STALE_LSB 0x1F
#define UART_IPR_STALE_TIMEOUT_MSB 0x3FF80
+#define UART_DM_IPR_STALE_TIMEOUT_MSB 0xFFFFFF80
#define UART_IPR 0x0018
#define UART_TFWR 0x001C
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next reply other threads:[~2015-04-08 13:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-08 13:28 Pramod Gurav [this message]
2015-04-08 13:28 ` [PATCH v2 2/2] tty: serial: msm: Disable pclk when port is closed Pramod Gurav
2015-04-08 23:51 ` Stephen Boyd
2015-04-09 5:36 ` Pramod Gurav
2015-04-09 14:04 ` Stephen Boyd
2015-04-08 23:31 ` [PATCH v2 1/2] tty: serial: msm: Add mask value for UART_DM registers Stephen Boyd
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=1428499733-21963-1-git-send-email-gpramod@codeaurora.org \
--to=gpramod@codeaurora.org \
--cc=bryanh@codeaurora.org \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=sboyd@codeaurora.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 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.