Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755663Ab2BVCAY (ORCPT ); Tue, 21 Feb 2012 21:00:24 -0500 Received: from mga11.intel.com ([192.55.52.93]:29216 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755061Ab2BVCAQ (ORCPT ); Tue, 21 Feb 2012 21:00:16 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="119904477" From: Darren Hart To: Linux Kernel Mailing List Cc: Darren Hart , Tomoya MORINAGA , Feng Tang , Greg Kroah-Hartman , Alan Cox , linux-serial@vger.kernel.org Subject: [PATCH 3/4] pch_uart: Add user_uartclk parameter Date: Tue, 21 Feb 2012 17:59:32 -0800 Message-Id: X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <26a433d1bdb5805cac69efb20d3e32dbf790339b.1329875301.git.dvhart@linux.intel.com> References: <26a433d1bdb5805cac69efb20d3e32dbf790339b.1329875301.git.dvhart@linux.intel.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2483 Lines: 61 For cases where boards with non-default clocks are not yet added to the kernel or when the clock varies across hardware revisions, it is useful to be able to specify the UART clock on the kernel command line. Add the user_uartclk parameter and prefer it, if set, to the default and board specific UART clock settings. Specify user_uartclock on the command-line with "pch_uart.user_uartclk=48000000". Signed-off-by: Darren Hart CC: Tomoya MORINAGA CC: Feng Tang CC: Greg Kroah-Hartman CC: Alan Cox CC: linux-serial@vger.kernel.org --- drivers/tty/serial/pch_uart.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index b070a4a..d00b75c 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c @@ -289,6 +289,7 @@ static struct pch_uart_driver_data drv_dat[] = { static struct eg20t_port *pch_uart_ports[PCH_UART_NR]; #endif static unsigned int default_baud = 9600; +static unsigned int user_uartclk = 0; static const int trigger_level_256[4] = { 1, 64, 128, 224 }; static const int trigger_level_64[4] = { 1, 16, 32, 56 }; static const int trigger_level_16[4] = { 1, 4, 8, 14 }; @@ -1521,7 +1522,7 @@ static int __init pch_console_setup(struct console *co, char *options) if (board_name && strstr(board_name, "Fish River Island II")) uartclk = FRI2_UARTCLK; - port->uartclk = uartclk; + port->uartclk = user_uartclk ? user_uartclk : uartclk; if (options) uart_parse_options(options, &baud, &parity, &bits, &flow); @@ -1591,6 +1592,8 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev, if (board_name && strstr(board_name, "Fish River Island II")) uartclk = FRI2_UARTCLK; + uartclk = user_uartclk ? user_uartclk : uartclk; + switch (port_type) { case PORT_UNKNOWN: fifosize = 256; /* EG20T/ML7213: UART0 */ @@ -1803,3 +1806,4 @@ module_exit(pch_uart_module_exit); MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("Intel EG20T PCH UART PCI Driver"); module_param(default_baud, uint, S_IRUGO); +module_param(user_uartclk, uint, S_IRUGO); -- 1.7.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/