[PATCH] [POWERPC] Enable correct operation of serial ports with nonzero regshift.

Add regshift reading to serial drivers.
This enables correct operation of serial ports with nonzero regshift.

Signed-off-by: Pavel Kiryukhin <redacted>
---
 arch/powerpc/kernel/legacy_serial.c |    6 +++++-
 drivers/serial/of_serial.c          |    6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 61dd174..74bd1f3 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c

@@ -50,7 +50,7 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
 				  phys_addr_t taddr, unsigned long irq,
 				  upf_t flags, int irq_check_parent)
 {
-	const u32 *clk, *spd;
+	const u32 *clk, *spd, *regshift;
 	u32 clock = BASE_BAUD * 16;
 	int index;
 

@@ -62,6 +62,9 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
 	/* get default speed if present */
 	spd = of_get_property(np, "current-speed", NULL);
 
+	/* get regshift if present*/
+	regshift = get_property(np, "reg-shift", NULL);
+
 	/* If we have a location index, then try to use it */
 	if (want_index >= 0 && want_index < MAX_LEGACY_SERIAL_PORTS)
 		index = want_index;

@@ -104,6 +107,7 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
 	legacy_serial_ports[index].uartclk = clock;
 	legacy_serial_ports[index].irq = irq;
 	legacy_serial_ports[index].flags = flags;
+	legacy_serial_ports[index].regshift = regshift ? (u8)*regshift : 0;
 	legacy_serial_infos[index].taddr = taddr;
 	legacy_serial_infos[index].np = of_node_get(np);
 	legacy_serial_infos[index].clock = clock;

diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index a64d858..ea9f1e4 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c

@@ -30,7 +30,7 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
 {
 	struct resource resource;
 	struct device_node *np = ofdev->node;
-	const unsigned int *clk, *spd;
+	const unsigned int *clk, *spd, *regshift;
 	int ret;
 
 	memset(port, 0, sizeof *port);

@@ -40,7 +40,7 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
 		dev_warn(&ofdev->dev, "no clock-frequency property set\n");
 		return -ENODEV;
 	}
-
+	regshift = get_property(np, "reg-shift", NULL);
 	ret = of_address_to_resource(np, 0, &resource);
 	if (ret) {
 		dev_warn(&ofdev->dev, "invalid address\n");

@@ -57,6 +57,8 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
 		| UPF_FIXED_PORT;
 	port->dev = &ofdev->dev;
 	port->custom_divisor = *clk / (16 * (*spd));
+	if (regshift)
+		port->regshift = *regshift;
 
 	return 0;
 }

-- 
1.5.4.1

On Feb 13, 2008, at 3:19 PM, Pavel Kiryukhin wrote:

Add regshift reading to serial drivers.
This enables correct operation of serial ports with nonzero regshift.

what device needs this?

- k

Kumar Gala wrote:

On Feb 13, 2008, at 3:19 PM, Pavel Kiryukhin wrote:

quoted

Add regshift reading to serial drivers.
This enables correct operation of serial ports with nonzero regshift.

what device needs this?

- k

Xilinx opb 16550 uart

--
Pavel

On Feb 14, 2008, at 3:10 AM, Pavel Kiryukhin wrote:

Kumar Gala wrote:

quoted

On Feb 13, 2008, at 3:19 PM, Pavel Kiryukhin wrote:

quoted

Add regshift reading to serial drivers.
This enables correct operation of serial ports with nonzero  
regshift.

what device needs this?

- k

Xilinx opb 16550 uart

please add that info to the commit message so we know why this change  
was made.  Other it looks ok to me.

- k

of_get_property, presumably?

--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c

+	regshift =3D get_property(np, "reg-shift", NULL);

ditto...

Otherwise,=20

Acked-by: Stephen Neuendorffer <redacted>

Also, can you post a patch to the Xilinx portion of
booting-without-of.txt that has the device tree entries necessary to get
the uart to work?  (Since I happened to be tracking down what I assume
is the same issue when you posted the patch!)

Steve

On Thu, 14 Feb 2008 10:55:31 -0800 "Stephen Neuendorffer" [off-list ref] wrote:

quoted

--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
+	/* get regshift if present*/
+	regshift = get_property(np, "reg-shift", NULL);

of_get_property, presumably?

Damn, how did I miss that?  :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

gcc knows better. :)

-----Original Message-----
From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
Sent: Thursday, February 14, 2008 3:27 PM
To: Stephen Neuendorffer
Cc: Pavel Kiryukhin; linuxppc-dev@ozlabs.org
Subject: Re: [PATCH] [POWERPC] Enable correct operation of serial

ports withnonzero regshift.

=20
On Thu, 14 Feb 2008 10:55:31 -0800 "Stephen Neuendorffer"

[off-list ref] wrote:

quoted

quoted

--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
+	/* get regshift if present*/
+	regshift =3D get_property(np, "reg-shift", NULL);

of_get_property, presumably?

=20
Damn, how did I miss that?  :-)
=20
--
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/