mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Antony Pavlov <antonynpavlov@gmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] serial_ns16550: remove legacy code copied from U-Boot v1
Date: Sun, 17 Jul 2011 17:42:41 +0200	[thread overview]
Message-ID: <20110717154241.GR6069@pengutronix.de> (raw)
In-Reply-To: <1310821471-16907-1-git-send-email-antonynpavlov@gmail.com>

On Sat, Jul 16, 2011 at 05:04:31PM +0400, Antony Pavlov wrote:
> ---
>  drivers/serial/serial_ns16550.c |   19 -------------------
>  drivers/serial/serial_ns16550.h |    4 ----
>  2 files changed, 0 insertions(+), 23 deletions(-)

Applied to master.

Sascha

> 
> diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
> index ab172e7..9a4b4dc 100644
> --- a/drivers/serial/serial_ns16550.c
> +++ b/drivers/serial/serial_ns16550.c
> @@ -62,26 +62,7 @@ static unsigned int ns16550_calc_divisor(struct console_device *cdev,
>  	struct NS16550_plat *plat = (struct NS16550_plat *)
>  	    cdev->dev->platform_data;
>  	unsigned int clk = plat->clock;
> -#ifdef CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS
> -	/* FIXME: Legacy Code copied from U-Boot V1 implementation
> -	 */
> -#ifdef CONFIG_ARCH_OMAP1510
> -	unsigned long base = cdev->dev->map_base;
> -	/* If can't cleanly clock 115200 set div to 1 */
> -	if ((clk == 12000000) && (baudrate == 115200)) {
> -		/* enable 6.5 * divisor */
> -		plat->reg_write(OSC_12M_SEL, base, osc_12m_sel);
> -		return 1;	/* return 1 for base divisor */
> -	}
> -	/* clear if previously set */
> -	plat->reg_write(0, base, osc_12m_sel);
> -#elif defined(CONFIG_ARCH_OMAP1610)
> -	/* If can't cleanly clock 115200 set div to 1 */
> -	if ((clk == 48000000) && (baudrate == 115200))
> -		return 26;	/* return 26 for base divisor */
> -#endif
>  
> -#endif				/* End of OMAP specific handling */
>  	return (clk / MODE_X_DIV / baudrate);
>  
>  }
> diff --git a/drivers/serial/serial_ns16550.h b/drivers/serial/serial_ns16550.h
> index eb2fd10..db8fe64 100644
> --- a/drivers/serial/serial_ns16550.h
> +++ b/drivers/serial/serial_ns16550.h
> @@ -81,10 +81,6 @@
>  #define LSR_TEMT	0x40	/* Xmitter empty */
>  #define LSR_ERR		0x80	/* Error */
>  
> -#ifdef CONFIG_ARCH_OMAP1510
> -#define OSC_12M_SEL	0x01	/* selects 6.5 * current clk div */
> -#endif
> -
>  /* useful defaults for LCR */
>  #define LCR_8N1		0x03
>  
> -- 
> 1.7.5.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

      reply	other threads:[~2011-07-17 15:42 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-16 13:04 Antony Pavlov
2011-07-17 15:42 ` Sascha Hauer [this message]

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=20110717154241.GR6069@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=antonynpavlov@gmail.com \
    --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