mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Juergen Borleis <jbe@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 13/19] MPC5xxx/serial: re-factor the code to share it between MPC5200/MPC5125
Date: Tue,  7 Oct 2014 16:22:12 +0200	[thread overview]
Message-ID: <1412691738-11145-14-git-send-email-jbe@pengutronix.de> (raw)
In-Reply-To: <1412691738-11145-1-git-send-email-jbe@pengutronix.de>

The MPC5200 and MPC5125 PSC units differs in:

 - register layout and status and control bits
 - configuration (baudrate, data format)
 - FIFO handling
 - clocking

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 drivers/serial/serial_mpc5xxx.c | 84 ++++++++++++++++++++++++++++++-----------
 1 file changed, 62 insertions(+), 22 deletions(-)

diff --git a/drivers/serial/serial_mpc5xxx.c b/drivers/serial/serial_mpc5xxx.c
index 3b83bee..7cd448c 100644
--- a/drivers/serial/serial_mpc5xxx.c
+++ b/drivers/serial/serial_mpc5xxx.c
@@ -39,16 +39,66 @@
 #include <mach/clocks.h>
 #include <mach/mpc5xxx_psc.h>
 
-static int __mpc5xxx_serial_setbaudrate(struct mpc5xxx_psc *psc, int baudrate)
+static int psc_tx_rdy(struct mpc5xxx_psc *psc)
 {
-	unsigned long baseclk;
-	int div;
+	return in_be16(&psc->psc_status) & PSC_SR_TXEMP;
+}
+
+static int psc_rx_rdy(struct mpc5xxx_psc *psc)
+{
+	return in_be16(&psc->psc_status) & PSC_SR_RXRDY;
+}
+
+static void psc_tx_write(struct mpc5xxx_psc *psc, char c)
+{
+	out_8(&psc->psc_buffer_8, c);
+}
+
+static int psc_rx_read(struct mpc5xxx_psc *psc)
+{
+	return in_8(&psc->psc_buffer_8);
+}
+
+static unsigned long mpc5xxx_get_base_clock(struct mpc5xxx_psc *psc)
+{
+#if defined(CONFIG_MGT5100)
+	return (CFG_MPC5XXX_CLKIN + 16) / 32;
+#elif defined(CONFIG_MPC5200)
+	return (get_ipb_clock() + 16) / 32;
+#else
+# error "Unknwon CPU"
+#endif
+}
 
+static void mpc5xxx_select_clock_source(struct mpc5xxx_psc *psc)
+{
 #if defined(CONFIG_MGT5100)
-	baseclk = (CFG_MPC5XXX_CLKIN + 16) / 32;
+	out_be16(&psc->psc_clock_select, 0xdd00);
 #elif defined(CONFIG_MPC5200)
-	baseclk = (get_ipb_clock() + 16) / 32;
+	out_be16(&psc->psc_clock_select, 0);
+#else
+# error "Unknwon CPU"
 #endif
+}
+
+static void mpc5xxx_configure_serial_protocol(struct mpc5xxx_psc *psc)
+{
+#if defined(CONFIG_MGT5100)
+	out_8(&psc->mode, PSC_MODE_ERR | PSC_MODE_8_BITS | PSC_MODE_PARNONE);
+#elif defined(CONFIG_MPC5200)
+	out_8(&psc->mode, PSC_MODE_8_BITS | PSC_MODE_PARNONE);
+	out_8(&psc->mode, PSC_MODE_ONE_STOP);
+#else
+# error "Unknwon CPU"
+#endif
+}
+
+static int __mpc5xxx_serial_setbaudrate(struct mpc5xxx_psc *psc, int baudrate)
+{
+	unsigned long baseclk;
+	int div;
+
+	baseclk = mpc5xxx_get_base_clock(psc);
 
 	/* set up UART divisor */
 	div = (baseclk + (baudrate/2)) / baudrate;
@@ -73,23 +123,13 @@ static int __mpc5xxx_serial_init(struct mpc5xxx_psc *psc)
 	/* reset PSC */
 	out_8(&psc->command, PSC_SEL_MODE_REG_1);
 
-	/* select clock sources */
-#if defined(CONFIG_MGT5100)
-	out_be16(&psc->psc_clock_select, 0xdd00);
-#elif defined(CONFIG_MPC5200)
-	out_be16(&psc->psc_clock_select, 0);
-#endif
+	mpc5xxx_select_clock_source(psc);
 
 	/* switch to UART mode */
 	out_be32(&psc->sicr, 0);
 
 	/* configure parity, bit length and so on */
-#if defined(CONFIG_MGT5100)
-	out_8(&psc->mode, PSC_MODE_ERR | PSC_MODE_8_BITS | PSC_MODE_PARNONE);
-#elif defined(CONFIG_MPC5200)
-	out_8(&psc->mode, PSC_MODE_8_BITS | PSC_MODE_PARNONE);
-#endif
-	out_8(&psc->mode, PSC_MODE_ONE_STOP);
+	mpc5xxx_configure_serial_protocol(psc);
 
 	/* disable all interrupts */
 	out_be16(&psc->psc_imr, 0);
@@ -118,10 +158,10 @@ static void mpc5xxx_serial_putc (struct console_device *cdev, const char c)
 	struct mpc5xxx_psc *psc = dev->priv;
 
 	/* Wait for last character to go. */
-	while (!(in_be16(&psc->psc_status) & PSC_SR_TXEMP))
+	while (!psc_tx_rdy(psc))
 		;
 
-	out_8(&psc->psc_buffer_8, c);
+	psc_tx_write(psc, c);
 }
 
 static int mpc5xxx_serial_getc (struct console_device *cdev)
@@ -130,10 +170,10 @@ static int mpc5xxx_serial_getc (struct console_device *cdev)
 	struct mpc5xxx_psc *psc = dev->priv;
 
 	/* Wait for a character to arrive. */
-	while (!(in_be16(&psc->psc_status) & PSC_SR_RXRDY))
+	while (!psc_rx_rdy(psc))
 		;
 
-	return in_8(&psc->psc_buffer_8);
+	return psc_rx_read(psc);
 }
 
 static int mpc5xxx_serial_tstc (struct console_device *cdev)
@@ -141,7 +181,7 @@ static int mpc5xxx_serial_tstc (struct console_device *cdev)
 	struct device_d *dev = cdev->dev;
 	struct mpc5xxx_psc *psc = dev->priv;
 
-	return in_be16(&psc->psc_status) & PSC_SR_RXRDY;
+	return psc_rx_rdy(psc);
 }
 
 static int mpc5xxx_serial_probe(struct device_d *dev)
-- 
2.1.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2014-10-07 14:22 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-07 14:21 [RFC] Add PowerPC MPC5125 support Juergen Borleis
2014-10-07 14:22 ` [PATCH 01/19] arch/MPC5xxx: fix linker script for MPC5200 Juergen Borleis
2014-10-07 14:22 ` [PATCH 02/19] arch/MPC5xxx: use a mach specific linker script instead of a board specific one Juergen Borleis
2014-10-07 14:22 ` [PATCH 03/19] arch/MPC5xxx: replace 'depends on' by 'select' Juergen Borleis
2014-10-07 14:22 ` [PATCH 04/19] arch/MPC5xxx: Simplify the calculation Juergen Borleis
2014-10-07 14:22 ` [PATCH 05/19] arch/MPC5xxx: just a format clean up Juergen Borleis
2014-10-07 14:22 ` [PATCH 06/19] arch/MPC5xxx: move away existing files to be able to add a new SoC type Juergen Borleis
2014-10-07 14:22 ` [PATCH 07/19] arch/MPC5xxx: separate architecture's main SoC header file Juergen Borleis
2014-10-07 14:22 ` [PATCH 08/19] arch/MPC5xxx: separate clock functions Juergen Borleis
2014-10-07 14:22 ` [PATCH 09/19] arch/MPC5xxx: just use macros instead of anonymous digits Juergen Borleis
2014-10-07 14:22 ` [PATCH 10/19] MPC5xxx/serial: use dedicated I/O functions instead of memory access Juergen Borleis
2014-10-07 14:22 ` [PATCH 11/19] MPC5xxx/serial: provide an easier way to share register description Juergen Borleis
2014-10-07 14:22 ` [PATCH 12/19] MPC5xxx/serial: use new shared " Juergen Borleis
2014-10-07 14:22 ` Juergen Borleis [this message]
2014-10-07 14:22 ` [PATCH 14/19] arch/MPC5xxx: add MPC5125 SoC support Juergen Borleis
2014-10-07 14:22 ` [PATCH 15/19] arch/MPC5xxx: add MPC5125 to the build-system Juergen Borleis
2014-10-07 14:22 ` [PATCH 16/19] MPC5xxx/serial: add support for the MPC5125 SoC Juergen Borleis
2014-10-07 14:22 ` [PATCH 17/19] MPC5125/FEC: add another FEC driver " Juergen Borleis
2014-10-07 14:22 ` [PATCH 18/19] MPC5125/WDG: add a watchdog driver Juergen Borleis
2014-10-07 14:22 ` [PATCH 19/19] MPC5125/GPIO: add a generic GPIO driver Juergen Borleis

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=1412691738-11145-14-git-send-email-jbe@pengutronix.de \
    --to=jbe@pengutronix.de \
    --cc=barebox@lists.infradead.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