diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-13 09:26:03 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-13 09:26:03 +0100 |
| commit | a9ba8a1d0d5c164b6962f7b80f08278302f54182 (patch) | |
| tree | f00c9185ecee018cf8e24105a60b413098e8eef6 /drivers | |
| parent | d01aad9b1cd042abf2b6690b8a034812bd215736 (diff) | |
| parent | 436fb44220fdc9d50d17a2ba5c9408f752a0ad9f (diff) | |
| download | barebox-a9ba8a1d0d5c164b6962f7b80f08278302f54182.tar.gz barebox-a9ba8a1d0d5c164b6962f7b80f08278302f54182.tar.xz | |
Merge branch 'for-next/arm'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/nand_s3c24xx.c | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_ns16550.c | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_s3c24xx.c b/drivers/mtd/nand/nand_s3c24xx.c index 83d45172b1..df22735488 100644 --- a/drivers/mtd/nand/nand_s3c24xx.c +++ b/drivers/mtd/nand/nand_s3c24xx.c @@ -614,7 +614,7 @@ void __nand_boot_init s3c24x0_nand_load_image(void *dest, int size, int page) void __nand_boot_init nand_boot(void) { void *dest = _text; - int size = ld_var(_barebox_image_size); + int size = barebox_image_size; int page = 0; s3c24x0_nand_load_image(dest, size, page); diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index c6548e3b85..439b7d5517 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -287,12 +287,31 @@ static int ns16550_tstc(struct console_device *cdev) static void ns16550_probe_dt(struct device_d *dev, struct ns16550_priv *priv) { struct device_node *np = dev->device_node; + u32 width; if (!IS_ENABLED(CONFIG_OFDEVICE)) return; of_property_read_u32(np, "clock-frequency", &priv->plat.clock); of_property_read_u32(np, "reg-shift", &priv->plat.shift); + if (!of_property_read_u32(np, "reg-io-width", &width)) + switch (width) { + case 1: + priv->read_reg = ns16550_read_reg_mmio_8; + priv->write_reg = ns16550_write_reg_mmio_8; + break; + case 2: + priv->read_reg = ns16550_read_reg_mmio_16; + priv->write_reg = ns16550_write_reg_mmio_16; + break; + case 4: + priv->read_reg = ns16550_read_reg_mmio_32; + priv->write_reg = ns16550_write_reg_mmio_32; + break; + default: + dev_err(dev, "unsupported reg-io-width (%d)\n", + width); + } } static struct ns16550_drvdata ns16450_drvdata = { |