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 <[email protected]>
---
Michal-
Here's a version of this patch outside of my COMMON_CLK patchset as you
requested ontop of your arm-next branch. An explicit dependency was
added in Kconfig as you had suggested.
Thanks,
Josh
drivers/tty/serial/Kconfig | 1 +
drivers/tty/serial/xilinx_uartps.c | 9 ---------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 2a53be5..8cb29b5 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -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.
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index b627363..23efe17 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -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;
@@ -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 */
--
1.8.0
2012/11/5 Josh Cartwright <[email protected]>:
> 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 <[email protected]>
> ---
> Michal-
>
> Here's a version of this patch outside of my COMMON_CLK patchset as you
> requested ontop of your arm-next branch. An explicit dependency was
> added in Kconfig as you had suggested.
>
> Thanks,
> Josh
>
> drivers/tty/serial/Kconfig | 1 +
> drivers/tty/serial/xilinx_uartps.c | 9 ---------
> 2 files changed, 1 insertion(+), 9 deletions(-)
Tested-by: Michal Simek <[email protected]>
Alan: Can you please add this patch to your tree?
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
2012/11/7 Michal Simek <[email protected]>:
> 2012/11/5 Josh Cartwright <[email protected]>:
>> 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 <[email protected]>
>> ---
>> Michal-
>>
>> Here's a version of this patch outside of my COMMON_CLK patchset as you
>> requested ontop of your arm-next branch. An explicit dependency was
>> added in Kconfig as you had suggested.
>>
>> Thanks,
>> Josh
>>
>> drivers/tty/serial/Kconfig | 1 +
>> drivers/tty/serial/xilinx_uartps.c | 9 ---------
>> 2 files changed, 1 insertion(+), 9 deletions(-)
>
> Tested-by: Michal Simek <[email protected]>
>
Greg: Can you please add this patch to your tree?
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian