Skip to content

Commit

Permalink
serial: xilinx_uartps: kill CONFIG_OF conditional
Browse files Browse the repository at this point in the history
The Zynq platform requires the use of CONFIG_OF.  Remove the #ifdef
conditionals in the uartps driver.  Make dependency explicit in Kconfig.

Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
Tested-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Josh Cartwright authored and Greg Kroah-Hartman committed Nov 16, 2012
1 parent d1519e2 commit 4bb535d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
1 change: 1 addition & 0 deletions drivers/tty/serial/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1376,6 +1376,7 @@ config SERIAL_MXS_AUART_CONSOLE

config SERIAL_XILINX_PS_UART
tristate "Xilinx PS UART support"
depends on OF
select SERIAL_CORE
help
This driver supports the Xilinx PS UART port.
Expand Down
9 changes: 0 additions & 9 deletions drivers/tty/serial/xilinx_uartps.c
Original file line number Diff line number Diff line change
Expand Up @@ -946,15 +946,11 @@ static int __devinit xuartps_probe(struct platform_device *pdev)
struct resource *res, *res2;
int clk = 0;

#ifdef CONFIG_OF
const unsigned int *prop;

prop = of_get_property(pdev->dev.of_node, "clock", NULL);
if (prop)
clk = be32_to_cpup(prop);
#else
clk = *((unsigned int *)(pdev->dev.platform_data));
#endif
if (!clk) {
dev_err(&pdev->dev, "no clock specified\n");
return -ENODEV;
Expand Down Expand Up @@ -1044,16 +1040,11 @@ static int xuartps_resume(struct platform_device *pdev)
}

/* Match table for of_platform binding */

#ifdef CONFIG_OF
static struct of_device_id xuartps_of_match[] __devinitdata = {
{ .compatible = "xlnx,xuartps", },
{}
};
MODULE_DEVICE_TABLE(of, xuartps_of_match);
#else
#define xuartps_of_match NULL
#endif

static struct platform_driver xuartps_platform_driver = {
.probe = xuartps_probe, /* Probe method */
Expand Down

0 comments on commit 4bb535d

Please sign in to comment.