diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2014-12-31 16:05:13 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-01-13 07:24:57 -0800 |
| commit | 1eb47efc49f1db8384f62c12f82b27d2bfbbae2e (patch) | |
| tree | f7f0f7294777198382cd937961bf2ee4e74401dc | |
| parent | 3db886a5bf38700b51a1d7a7b00ec8b64c9c2089 (diff) | |
| download | u-boot-imx-1eb47efc49f1db8384f62c12f82b27d2bfbbae2e.zip u-boot-imx-1eb47efc49f1db8384f62c12f82b27d2bfbbae2e.tar.gz u-boot-imx-1eb47efc49f1db8384f62c12f82b27d2bfbbae2e.tar.bz2 | |
x86: Use ePAPR defined properties for x86-uart
Use ePAPR defined properties for x86-uart: clock-frequency and
current-speed. Assign the value of clock-frequency in device tree
to plat->clock of x86-uart instead of using hardcoded number.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/x86/dts/serial.dtsi | 5 | ||||
| -rw-r--r-- | drivers/serial/serial_x86.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/arch/x86/dts/serial.dtsi b/arch/x86/dts/serial.dtsi index ebdda76..9b097f4 100644 --- a/arch/x86/dts/serial.dtsi +++ b/arch/x86/dts/serial.dtsi @@ -3,8 +3,7 @@ compatible = "x86-uart"; reg = <0x3f8 8>; reg-shift = <0>; - io-mapped = <1>; - multiplier = <1>; - baudrate = <115200>; + clock-frequency = <1843200>; + current-speed = <115200>; }; }; diff --git a/drivers/serial/serial_x86.c b/drivers/serial/serial_x86.c index e81e035..4bf6062 100644 --- a/drivers/serial/serial_x86.c +++ b/drivers/serial/serial_x86.c @@ -6,9 +6,12 @@ #include <common.h> #include <dm.h> +#include <fdtdec.h> #include <ns16550.h> #include <serial.h> +DECLARE_GLOBAL_DATA_PTR; + static const struct udevice_id x86_serial_ids[] = { { .compatible = "x86-uart" }, { } @@ -22,10 +25,13 @@ static int x86_serial_ofdata_to_platdata(struct udevice *dev) ret = ns16550_serial_ofdata_to_platdata(dev); if (ret) return ret; - plat->clock = 1843200; + + plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset, + "clock-frequency", 1843200); return 0; } + U_BOOT_DRIVER(serial_ns16550) = { .name = "serial_x86", .id = UCLASS_SERIAL, |