* [POWERPC] mpc5200: Factor out 52xx dependencies from 52xx psc driver
From: John Rigby @ 2008-01-22 19:12 UTC (permalink / raw)
To: Grant Likely, linuxppc-dev
This version fixes the problem of no output
in userland on efika and liteb.
PSCs change from 5200 to 5121
this patch localizes the differences in
preparation for adding 5121 support
Signed-off-by: John Rigby <jrigby@freescale.com>
---
drivers/serial/mpc52xx_uart.c | 256 ++++++++++++++++++++++++++++++----------
1 files changed, 192 insertions(+), 64 deletions(-)
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 1e3721a..5bd1171 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -67,7 +67,6 @@
#include <linux/serial.h>
#include <linux/sysrq.h>
#include <linux/console.h>
-
#include <linux/delay.h>
#include <linux/io.h>
@@ -111,8 +110,8 @@ static struct device_node *mpc52xx_uart_nodes[MPC52xx_PSC_MAXNUM];
static void mpc52xx_uart_of_enumerate(void);
#endif
+
#define PSC(port) ((struct mpc52xx_psc __iomem *)((port)->membase))
-#define FIFO(port) ((struct mpc52xx_psc_fifo __iomem *)(PSC(port)+1))
/* Forward declaration of the interruption handling routine */
@@ -135,6 +134,162 @@ static struct of_device_id mpc52xx_uart_of_match[] = {
};
#endif
+/* ======================================================================== */
+/* PSC fifo operations for isolating differences between 52xx and 512x */
+/* ======================================================================== */
+
+struct psc_ops {
+ void (*fifo_init)(struct uart_port *port);
+ int (*raw_rx_rdy)(struct uart_port *port);
+ int (*raw_tx_rdy)(struct uart_port *port);
+ int (*rx_rdy)(struct uart_port *port);
+ int (*tx_rdy)(struct uart_port *port);
+ int (*tx_empty)(struct uart_port *port);
+ void (*stop_rx)(struct uart_port *port);
+ void (*start_tx)(struct uart_port *port);
+ void (*stop_tx)(struct uart_port *port);
+ void (*rx_clr_irq)(struct uart_port *port);
+ void (*tx_clr_irq)(struct uart_port *port);
+ void (*write_char)(struct uart_port *port, unsigned char c);
+ unsigned char (*read_char)(struct uart_port *port);
+ void (*cw_disable_ints)(struct uart_port *port);
+ void (*cw_restore_ints)(struct uart_port *port);
+ unsigned long (*getuartclk)(void *p);
+};
+
+#define FIFO_52xx(port) ((struct mpc52xx_psc_fifo __iomem *)(PSC(port)+1))
+static void mpc52xx_psc_fifo_init(struct uart_port *port)
+{
+ struct mpc52xx_psc __iomem *psc = PSC(port);
+ struct mpc52xx_psc_fifo __iomem *fifo = FIFO_52xx(port);
+
+ /* /32 prescaler */
+ out_be16(&psc->mpc52xx_psc_clock_select, 0xdd00);
+
+ out_8(&fifo->rfcntl, 0x00);
+ out_be16(&fifo->rfalarm, 0x1ff);
+ out_8(&fifo->tfcntl, 0x07);
+ out_be16(&fifo->tfalarm, 0x80);
+
+ port->read_status_mask |= MPC52xx_PSC_IMR_RXRDY | MPC52xx_PSC_IMR_TXRDY;
+ out_be16(&psc->mpc52xx_psc_imr, port->read_status_mask);
+}
+
+static int mpc52xx_psc_raw_rx_rdy(struct uart_port *port)
+{
+ return in_be16(&PSC(port)->mpc52xx_psc_status)
+ & MPC52xx_PSC_SR_RXRDY;
+}
+
+static int mpc52xx_psc_raw_tx_rdy(struct uart_port *port)
+{
+ return in_be16(&PSC(port)->mpc52xx_psc_status)
+ & MPC52xx_PSC_SR_TXRDY;
+}
+
+
+static int mpc52xx_psc_rx_rdy(struct uart_port *port)
+{
+ return in_be16(&PSC(port)->mpc52xx_psc_isr)
+ & port->read_status_mask
+ & MPC52xx_PSC_IMR_RXRDY;
+}
+
+static int mpc52xx_psc_tx_rdy(struct uart_port *port)
+{
+ return in_be16(&PSC(port)->mpc52xx_psc_isr)
+ & port->read_status_mask
+ & MPC52xx_PSC_IMR_TXRDY;
+}
+
+static int mpc52xx_psc_tx_empty(struct uart_port *port)
+{
+ return in_be16(&PSC(port)->mpc52xx_psc_status)
+ & MPC52xx_PSC_SR_TXEMP;
+}
+
+static void mpc52xx_psc_start_tx(struct uart_port *port)
+{
+ port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
+ out_be16(&PSC(port)->mpc52xx_psc_imr, port->read_status_mask);
+}
+
+static void mpc52xx_psc_stop_tx(struct uart_port *port)
+{
+ port->read_status_mask &= ~MPC52xx_PSC_IMR_TXRDY;
+ out_be16(&PSC(port)->mpc52xx_psc_imr, port->read_status_mask);
+}
+
+static void mpc52xx_psc_stop_rx(struct uart_port *port)
+{
+ port->read_status_mask &= ~MPC52xx_PSC_IMR_RXRDY;
+ out_be16(&PSC(port)->mpc52xx_psc_imr, port->read_status_mask);
+}
+
+static void mpc52xx_psc_rx_clr_irq(struct uart_port *port)
+{
+}
+
+static void mpc52xx_psc_tx_clr_irq(struct uart_port *port)
+{
+}
+
+static void mpc52xx_psc_write_char(struct uart_port *port, unsigned char c)
+{
+ out_8(&PSC(port)->mpc52xx_psc_buffer_8, c);
+}
+
+static unsigned char mpc52xx_psc_read_char(struct uart_port *port)
+{
+ return in_8(&PSC(port)->mpc52xx_psc_buffer_8);
+}
+
+static void mpc52xx_psc_cw_disable_ints(struct uart_port *port)
+{
+ out_be16(&PSC(port)->mpc52xx_psc_imr, 0);
+}
+
+static void mpc52xx_psc_cw_restore_ints(struct uart_port *port)
+{
+ out_be16(&PSC(port)->mpc52xx_psc_imr, port->read_status_mask);
+}
+
+/* Search for bus-frequency property in this node or a parent */
+static unsigned long mpc52xx_getuartclk(void *p)
+{
+#if defined(CONFIG_PPC_MERGE)
+ /*
+ * 5200 UARTs have a / 32 prescaler
+ * but the generic serial code assumes 16
+ * so return ipb freq / 2
+ */
+ return mpc52xx_find_ipb_freq(p) / 2;
+#else
+ pr_debug("unexpected call to mpc52xx_getuartclk with arch/ppc\n");
+ return NULL;
+#endif
+}
+
+static struct psc_ops mpc52xx_psc_ops = {
+ .fifo_init = mpc52xx_psc_fifo_init,
+ .raw_rx_rdy = mpc52xx_psc_raw_rx_rdy,
+ .raw_tx_rdy = mpc52xx_psc_raw_tx_rdy,
+ .rx_rdy = mpc52xx_psc_rx_rdy,
+ .tx_rdy = mpc52xx_psc_tx_rdy,
+ .tx_empty = mpc52xx_psc_tx_empty,
+ .stop_rx = mpc52xx_psc_stop_rx,
+ .start_tx = mpc52xx_psc_start_tx,
+ .stop_tx = mpc52xx_psc_stop_tx,
+ .rx_clr_irq = mpc52xx_psc_rx_clr_irq,
+ .tx_clr_irq = mpc52xx_psc_tx_clr_irq,
+ .write_char = mpc52xx_psc_write_char,
+ .read_char = mpc52xx_psc_read_char,
+ .cw_disable_ints = mpc52xx_psc_cw_disable_ints,
+ .cw_restore_ints = mpc52xx_psc_cw_restore_ints,
+ .getuartclk = mpc52xx_getuartclk,
+};
+
+static struct psc_ops *psc_ops = &mpc52xx_psc_ops;
/* ======================================================================== */
/* UART operations */
@@ -143,8 +298,7 @@ static struct of_device_id mpc52xx_uart_of_match[] = {
static unsigned int
mpc52xx_uart_tx_empty(struct uart_port *port)
{
- int status = in_be16(&PSC(port)->mpc52xx_psc_status);
- return (status & MPC52xx_PSC_SR_TXEMP) ? TIOCSER_TEMT : 0;
+ return psc_ops->tx_empty(port) ? TIOCSER_TEMT : 0;
}
static void
@@ -164,16 +318,14 @@ static void
mpc52xx_uart_stop_tx(struct uart_port *port)
{
/* port->lock taken by caller */
- port->read_status_mask &= ~MPC52xx_PSC_IMR_TXRDY;
- out_be16(&PSC(port)->mpc52xx_psc_imr, port->read_status_mask);
+ psc_ops->stop_tx(port);
}
static void
mpc52xx_uart_start_tx(struct uart_port *port)
{
/* port->lock taken by caller */
- port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
- out_be16(&PSC(port)->mpc52xx_psc_imr, port->read_status_mask);
+ psc_ops->start_tx(port);
}
static void
@@ -186,8 +338,7 @@ mpc52xx_uart_send_xchar(struct uart_port *port, char ch)
if (ch) {
/* Make sure tx interrupts are on */
/* Truly necessary ??? They should be anyway */
- port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
- out_be16(&PSC(port)->mpc52xx_psc_imr, port->read_status_mask);
+ psc_ops->start_tx(port);
}
spin_unlock_irqrestore(&port->lock, flags);
@@ -197,8 +348,7 @@ static void
mpc52xx_uart_stop_rx(struct uart_port *port)
{
/* port->lock taken by caller */
- port->read_status_mask &= ~MPC52xx_PSC_IMR_RXRDY;
- out_be16(&PSC(port)->mpc52xx_psc_imr, port->read_status_mask);
+ psc_ops->stop_rx(port);
}
static void
@@ -225,7 +375,6 @@ static int
mpc52xx_uart_startup(struct uart_port *port)
{
struct mpc52xx_psc __iomem *psc = PSC(port);
- struct mpc52xx_psc_fifo __iomem *fifo = FIFO(port);
int ret;
/* Request IRQ */
@@ -240,15 +389,7 @@ mpc52xx_uart_startup(struct uart_port *port)
out_be32(&psc->sicr, 0); /* UART mode DCD ignored */
- out_be16(&psc->mpc52xx_psc_clock_select, 0xdd00); /* /16 prescaler on */
-
- out_8(&fifo->rfcntl, 0x00);
- out_be16(&fifo->rfalarm, 0x1ff);
- out_8(&fifo->tfcntl, 0x07);
- out_be16(&fifo->tfalarm, 0x80);
-
- port->read_status_mask |= MPC52xx_PSC_IMR_RXRDY | MPC52xx_PSC_IMR_TXRDY;
- out_be16(&psc->mpc52xx_psc_imr, port->read_status_mask);
+ psc_ops->fifo_init(port);
out_8(&psc->command, MPC52xx_PSC_TX_ENABLE);
out_8(&psc->command, MPC52xx_PSC_RX_ENABLE);
@@ -331,8 +472,7 @@ mpc52xx_uart_set_termios(struct uart_port *port, struct ktermios *new,
* boot for the console, all stuff is not yet ready to receive at that
* time and that just makes the kernel oops */
/* while (j-- && mpc52xx_uart_int_rx_chars(port)); */
- while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXEMP) &&
- --j)
+ while (!mpc52xx_uart_tx_empty(port) && --j)
udelay(1);
if (!j)
@@ -460,11 +600,9 @@ mpc52xx_uart_int_rx_chars(struct uart_port *port)
unsigned short status;
/* While we can read, do so ! */
- while ((status = in_be16(&PSC(port)->mpc52xx_psc_status)) &
- MPC52xx_PSC_SR_RXRDY) {
-
+ while (psc_ops->raw_rx_rdy(port)) {
/* Get the char */
- ch = in_8(&PSC(port)->mpc52xx_psc_buffer_8);
+ ch = psc_ops->read_char(port);
/* Handle sysreq char */
#ifdef SUPPORT_SYSRQ
@@ -479,6 +617,8 @@ mpc52xx_uart_int_rx_chars(struct uart_port *port)
flag = TTY_NORMAL;
port->icount.rx++;
+ status = in_be16(&PSC(port)->mpc52xx_psc_status);
+
if (status & (MPC52xx_PSC_SR_PE |
MPC52xx_PSC_SR_FE |
MPC52xx_PSC_SR_RB)) {
@@ -508,7 +648,7 @@ mpc52xx_uart_int_rx_chars(struct uart_port *port)
tty_flip_buffer_push(tty);
- return in_be16(&PSC(port)->mpc52xx_psc_status) & MPC52xx_PSC_SR_RXRDY;
+ return psc_ops->raw_rx_rdy(port);
}
static inline int
@@ -518,7 +658,7 @@ mpc52xx_uart_int_tx_chars(struct uart_port *port)
/* Process out of band chars */
if (port->x_char) {
- out_8(&PSC(port)->mpc52xx_psc_buffer_8, port->x_char);
+ psc_ops->write_char(port, port->x_char);
port->icount.tx++;
port->x_char = 0;
return 1;
@@ -531,8 +671,8 @@ mpc52xx_uart_int_tx_chars(struct uart_port *port)
}
/* Send chars */
- while (in_be16(&PSC(port)->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXRDY) {
- out_8(&PSC(port)->mpc52xx_psc_buffer_8, xmit->buf[xmit->tail]);
+ while (psc_ops->raw_tx_rdy(port)) {
+ psc_ops->write_char(port, xmit->buf[xmit->tail]);
xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
port->icount.tx++;
if (uart_circ_empty(xmit))
@@ -558,7 +698,6 @@ mpc52xx_uart_int(int irq, void *dev_id)
struct uart_port *port = dev_id;
unsigned long pass = ISR_PASS_LIMIT;
unsigned int keepgoing;
- unsigned short status;
spin_lock(&port->lock);
@@ -567,18 +706,12 @@ mpc52xx_uart_int(int irq, void *dev_id)
/* If we don't find anything to do, we stop */
keepgoing = 0;
- /* Read status */
- status = in_be16(&PSC(port)->mpc52xx_psc_isr);
- status &= port->read_status_mask;
-
- /* Do we need to receive chars ? */
- /* For this RX interrupts must be on and some chars waiting */
- if (status & MPC52xx_PSC_IMR_RXRDY)
+ psc_ops->rx_clr_irq(port);
+ if (psc_ops->rx_rdy(port))
keepgoing |= mpc52xx_uart_int_rx_chars(port);
- /* Do we need to send chars ? */
- /* For this, TX must be ready and TX interrupt enabled */
- if (status & MPC52xx_PSC_IMR_TXRDY)
+ psc_ops->tx_clr_irq(port);
+ if (psc_ops->tx_rdy(port))
keepgoing |= mpc52xx_uart_int_tx_chars(port);
/* Limit number of iteration */
@@ -645,36 +778,33 @@ static void
mpc52xx_console_write(struct console *co, const char *s, unsigned int count)
{
struct uart_port *port = &mpc52xx_uart_ports[co->index];
- struct mpc52xx_psc __iomem *psc = PSC(port);
unsigned int i, j;
/* Disable interrupts */
- out_be16(&psc->mpc52xx_psc_imr, 0);
+ psc_ops->cw_disable_ints(port);
/* Wait the TX buffer to be empty */
j = 5000000; /* Maximum wait */
- while (!(in_be16(&psc->mpc52xx_psc_status) & MPC52xx_PSC_SR_TXEMP) &&
- --j)
+ while (!mpc52xx_uart_tx_empty(port) && --j)
udelay(1);
/* Write all the chars */
for (i = 0; i < count; i++, s++) {
/* Line return handling */
if (*s == '\n')
- out_8(&psc->mpc52xx_psc_buffer_8, '\r');
+ psc_ops->write_char(port, '\r');
/* Send the char */
- out_8(&psc->mpc52xx_psc_buffer_8, *s);
+ psc_ops->write_char(port, *s);
/* Wait the TX buffer to be empty */
j = 20000; /* Maximum wait */
- while (!(in_be16(&psc->mpc52xx_psc_status) &
- MPC52xx_PSC_SR_TXEMP) && --j)
+ while (!mpc52xx_uart_tx_empty(port) && --j)
udelay(1);
}
/* Restore interrupt state */
- out_be16(&psc->mpc52xx_psc_imr, port->read_status_mask);
+ psc_ops->cw_restore_ints(port);
}
#if !defined(CONFIG_PPC_MERGE)
@@ -719,7 +849,7 @@ mpc52xx_console_setup(struct console *co, char *options)
{
struct uart_port *port = &mpc52xx_uart_ports[co->index];
struct device_node *np = mpc52xx_uart_nodes[co->index];
- unsigned int ipb_freq;
+ unsigned int uartclk;
struct resource res;
int ret;
@@ -751,17 +881,16 @@ mpc52xx_console_setup(struct console *co, char *options)
return ret;
}
- /* Search for bus-frequency property in this node or a parent */
- ipb_freq = mpc52xx_find_ipb_freq(np);
- if (ipb_freq == 0) {
- pr_debug("Could not find IPB bus frequency!\n");
+ uartclk = psc_ops->getuartclk(np);
+ if (uartclk == 0) {
+ pr_debug("Could not find uart clock frequency!\n");
return -EINVAL;
}
/* Basic port init. Needed since we use some uart_??? func before
* real init for early access */
spin_lock_init(&port->lock);
- port->uartclk = ipb_freq / 2;
+ port->uartclk = uartclk;
port->ops = &mpc52xx_uart_ops;
port->mapbase = res.start;
port->membase = ioremap(res.start, sizeof(struct mpc52xx_psc));
@@ -947,7 +1076,7 @@ static int __devinit
mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
{
int idx = -1;
- unsigned int ipb_freq;
+ unsigned int uartclk;
struct uart_port *port = NULL;
struct resource res;
int ret;
@@ -963,10 +1092,9 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
pr_debug("Found %s assigned to ttyPSC%x\n",
mpc52xx_uart_nodes[idx]->full_name, idx);
- /* Search for bus-frequency property in this node or a parent */
- ipb_freq = mpc52xx_find_ipb_freq(op->node);
- if (ipb_freq == 0) {
- dev_dbg(&op->dev, "Could not find IPB bus frequency!\n");
+ uartclk = psc_ops->getuartclk(op->node);
+ if (uartclk == 0) {
+ dev_dbg(&op->dev, "Could not find uart clock frequency!\n");
return -EINVAL;
}
@@ -974,7 +1102,7 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
port = &mpc52xx_uart_ports[idx];
spin_lock_init(&port->lock);
- port->uartclk = ipb_freq / 2;
+ port->uartclk = uartclk;
port->fifosize = 512;
port->iotype = UPIO_MEM;
port->flags = UPF_BOOT_AUTOCONF |
--
1.5.3.5.726.g41a7a
^ permalink raw reply related
* [PATCH v3] create modalias file in sysfs for bus of_platform
From: Olaf Hering @ 2008-01-22 19:09 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <20080122144053.GA13019@aepfle.de>
Create /sys/bus/of_platform/devices/*/modalias file to allow autoloading
of modules. modalias files are already present for many other bus types.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
drivers/of/device.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -86,7 +86,20 @@ static ssize_t dev_show_devspec(struct d
return sprintf(buf, "%s", ofdev->node->full_name);
}
+static ssize_t dev_show_modalias(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct of_device *ofdev = to_of_device(dev);
+ ssize_t len = 0;
+
+ len = of_device_get_modalias(ofdev, buf, PAGE_SIZE - 2);
+ buf[len] = '\n';
+ buf[len+1] = 0;
+ return len+1;
+}
+
static DEVICE_ATTR(devspec, S_IRUGO, dev_show_devspec, NULL);
+static DEVICE_ATTR(modalias, S_IRUGO, dev_show_modalias, NULL);
/**
* of_release_dev - free an of device structure when all users of it are finished.
@@ -116,6 +129,11 @@ int of_device_register(struct of_device
return rc;
rc = device_create_file(&ofdev->dev, &dev_attr_devspec);
+ if (rc) {
+ device_unregister(&ofdev->dev);
+ return rc;
+ }
+ rc = device_create_file(&ofdev->dev, &dev_attr_modalias);
if (rc)
device_unregister(&ofdev->dev);
@@ -126,6 +144,7 @@ EXPORT_SYMBOL(of_device_register);
void of_device_unregister(struct of_device *ofdev)
{
device_remove_file(&ofdev->dev, &dev_attr_devspec);
+ device_remove_file(&ofdev->dev, &dev_attr_modalias);
device_unregister(&ofdev->dev);
}
EXPORT_SYMBOL(of_device_unregister);
^ permalink raw reply
* [PATCH 0/8] pseries: phyp dump: hypervisor-assisted dump
From: Manish Ahuja @ 2008-01-22 18:46 UTC (permalink / raw)
To: ppc-dev, paulus; +Cc: mahuja, linasvepstas, lkessler, Michael Strosaker
The following series of patches implement a basic framework
for hypervisor-assisted dump. The very first patch provides
documentation explaining what this is :-) . Yes, its supposed
to be an improvement over kdump.
A list of open issues / todo list is included in the documentation.
It also appears that the not-yet-released firmware versions this was tested
on are still, ahem, incomplete; this work is also pending.
I have included most of the changes requested. Although, I did find
one or two, fixed in a later patch file rather than the first location
they appeared at.
-- Manish & Linas.
^ permalink raw reply
* Re: [PATCH] adder875: Fix flash bus-width and remove duplicate __initdata.
From: Scott Wood @ 2008-01-22 18:45 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev
In-Reply-To: <D6E6BC8F-1BDE-4752-950C-FBD609FD4EFD@kernel.crashing.org>
Kumar Gala wrote:
> On Jan 22, 2008, at 12:31 PM, Scott Wood wrote:
>
>> Signed-off-by: Scott Wood <scottwood@freescale.com>
>> ---
>> arch/powerpc/boot/dts/adder875-redboot.dts | 2 +-
>> arch/powerpc/boot/dts/adder875-uboot.dts | 2 +-
>> arch/powerpc/platforms/8xx/adder875.c | 2 +-
>> 3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/powerpc/boot/dts/adder875-redboot.dts b/arch/
>> powerpc/boot/dts/adder875-redboot.dts
>> index 8f7a79f..930bfb3 100644
>> --- a/arch/powerpc/boot/dts/adder875-redboot.dts
>> +++ b/arch/powerpc/boot/dts/adder875-redboot.dts
>> @@ -62,7 +62,7 @@
>> flash@0,0 {
>> compatible = "cfi-flash";
>> reg = <0 0 0x800000>;
>> - bank-width = <4>;
>> + bank-width = <2>;
>> device-width = <2>;
>> };
>> };
>
> I'm assuming the bank-width was just wrong before?
Yes, I got a bug report (off-list) about it today. I thought I had
tested it a while back; maybe the dts got reverted to an older version
somewhere along the way.
-Scott
^ permalink raw reply
* Re: [PATCH] adder875: Fix flash bus-width and remove duplicate __initdata.
From: Kumar Gala @ 2008-01-22 18:33 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev
In-Reply-To: <20080122183141.GB17036@loki.buserror.net>
On Jan 22, 2008, at 12:31 PM, Scott Wood wrote:
> Signed-off-by: Scott Wood <scottwood@freescale.com>
> ---
> arch/powerpc/boot/dts/adder875-redboot.dts | 2 +-
> arch/powerpc/boot/dts/adder875-uboot.dts | 2 +-
> arch/powerpc/platforms/8xx/adder875.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/powerpc/boot/dts/adder875-redboot.dts b/arch/
> powerpc/boot/dts/adder875-redboot.dts
> index 8f7a79f..930bfb3 100644
> --- a/arch/powerpc/boot/dts/adder875-redboot.dts
> +++ b/arch/powerpc/boot/dts/adder875-redboot.dts
> @@ -62,7 +62,7 @@
> flash@0,0 {
> compatible = "cfi-flash";
> reg = <0 0 0x800000>;
> - bank-width = <4>;
> + bank-width = <2>;
> device-width = <2>;
> };
> };
I'm assuming the bank-width was just wrong before?
- k
^ permalink raw reply
* [PATCH] adder875: Fix flash bus-width and remove duplicate __initdata.
From: Scott Wood @ 2008-01-22 18:31 UTC (permalink / raw)
To: galak; +Cc: linuxppc-dev
Signed-off-by: Scott Wood <scottwood@freescale.com>
---
arch/powerpc/boot/dts/adder875-redboot.dts | 2 +-
arch/powerpc/boot/dts/adder875-uboot.dts | 2 +-
arch/powerpc/platforms/8xx/adder875.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/boot/dts/adder875-redboot.dts b/arch/powerpc/boot/dts/adder875-redboot.dts
index 8f7a79f..930bfb3 100644
--- a/arch/powerpc/boot/dts/adder875-redboot.dts
+++ b/arch/powerpc/boot/dts/adder875-redboot.dts
@@ -62,7 +62,7 @@
flash@0,0 {
compatible = "cfi-flash";
reg = <0 0 0x800000>;
- bank-width = <4>;
+ bank-width = <2>;
device-width = <2>;
};
};
diff --git a/arch/powerpc/boot/dts/adder875-uboot.dts b/arch/powerpc/boot/dts/adder875-uboot.dts
index 60d4ad5..0197242 100644
--- a/arch/powerpc/boot/dts/adder875-uboot.dts
+++ b/arch/powerpc/boot/dts/adder875-uboot.dts
@@ -61,7 +61,7 @@
flash@0,0 {
compatible = "cfi-flash";
reg = <0 0 0x800000>;
- bank-width = <4>;
+ bank-width = <2>;
device-width = <2>;
};
};
diff --git a/arch/powerpc/platforms/8xx/adder875.c b/arch/powerpc/platforms/8xx/adder875.c
index af040fd..c6bc078 100644
--- a/arch/powerpc/platforms/8xx/adder875.c
+++ b/arch/powerpc/platforms/8xx/adder875.c
@@ -92,7 +92,7 @@ static int __init adder875_probe(void)
return of_flat_dt_is_compatible(root, "analogue-and-micro,adder875");
}
-static __initdata struct of_device_id __initdata of_bus_ids[] = {
+static __initdata struct of_device_id of_bus_ids[] = {
{ .compatible = "simple-bus", },
{},
};
--
1.5.3.8
^ permalink raw reply related
* [PATCH] [POWERPC] mpc52xx: clean up Kconfig
From: Grant Likely @ 2008-01-22 18:22 UTC (permalink / raw)
To: linuxppc-dev
From: Grant Likely <grant.likely@secretlab.ca>
Put all the mpc5200 board config option behind a menu item to get them
out of the top level of the platform support list
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
arch/powerpc/platforms/52xx/Kconfig | 41 +++++++++++++----------------------
1 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig
index 733a806..515f244 100644
--- a/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@ -1,31 +1,14 @@
config PPC_MPC52xx
- bool
+ bool "52xx-based boards"
+ depends on PPC_MULTIPLATFORM && PPC32
select FSL_SOC
select PPC_CLOCK
- default n
-
-config PPC_MPC5200
- bool
- select PPC_MPC52xx
- default n
-
-config PPC_MPC5200_BUGFIX
- bool "MPC5200 (L25R) bugfix support"
- depends on PPC_MPC5200
- default n
- help
- Enable workarounds for original MPC5200 errata. This is not required
- for MPC5200B based boards.
-
- It is safe to say 'Y' here
config PPC_MPC5200_SIMPLE
bool "Generic support for simple MPC5200 based boards"
- depends on PPC_MULTIPLATFORM && PPC32
- select PPC_MPC5200
+ depends on PPC_MPC52xx
select DEFAULT_UIMAGE
select WANT_DEVICE_TREE
- default n
help
This option enables support for a simple MPC52xx based boards which
do not need a custom platform specific setup. Such boards are
@@ -43,17 +26,23 @@ config PPC_MPC5200_SIMPLE
config PPC_EFIKA
bool "bPlan Efika 5k2. MPC5200B based computer"
- depends on PPC_MULTIPLATFORM && PPC32
+ depends on PPC_MPC52xx
select PPC_RTAS
select RTAS_PROC
- select PPC_MPC52xx
select PPC_NATIVE
- default n
config PPC_LITE5200
bool "Freescale Lite5200 Eval Board"
- depends on PPC_MULTIPLATFORM && PPC32
- select PPC_MPC5200
+ depends on PPC_MPC52xx
select DEFAULT_UIMAGE
select WANT_DEVICE_TREE
- default n
+
+config PPC_MPC5200_BUGFIX
+ bool "MPC5200 (L25R) bugfix support"
+ depends on PPC_MPC52xx
+ help
+ Enable workarounds for original MPC5200 errata. This is not required
+ for MPC5200B based boards.
+
+ It is safe to say 'Y' here
+
^ permalink raw reply related
* RE: Generated xilinx linux 2.6 image sections
From: Stephen Neuendorffer @ 2008-01-22 17:40 UTC (permalink / raw)
To: greenlean, linuxppc-embedded
In-Reply-To: <15018508.post@talk.nabble.com>
That would do it!
What's strange is that the testapps linked into the second bank by
default, which *happened* to work.
Steve
> -----Original Message-----
> From: linuxppc-embedded-bounces+stephen=3Dneuendorffer.name@ozlabs.org
[mailto:linuxppc-embedded-
> bounces+stephen=3Dneuendorffer.name@ozlabs.org] On Behalf Of greenlean
> Sent: Tuesday, January 22, 2008 5:29 AM
> To: linuxppc-embedded@ozlabs.org
> Subject: RE: Generated xilinx linux 2.6 image sections
>=20
>=20
> Now It's running the problem was the DDR controller I was including
the 512
> one but I'm working with a 256 DDR module .......
>=20
> Thanks for the orientation, really usefull.
>=20
> Bye.
>=20
>=20
> Stephen Neuendorffer wrote:
> >
> > The testapps are generated using a different linker script.
> >
> > Based on what you sent out, it looks like your EDK design has a
memory
> > at 0x10000000, but this is
> > not reflected in the linux image you've generated. This makes me
> > suspect that you haven't generated the BSP and copied the
appropriate
> > xparameters file over xparameters_xup.h (assuming you are using
> > CONFIG_XILINX_XUPV2P).
> >
> > Steve
> >
> >> -----Original Message-----
> >> From:
linuxppc-embedded-bounces+stephen=3Dneuendorffer.name@ozlabs.org
> > [mailto:linuxppc-embedded-
> >> bounces+stephen=3Dneuendorffer.name@ozlabs.org] On Behalf Of
greenlean
> >> Sent: Monday, January 21, 2008 5:06 AM
> >> To: linuxppc-embedded@ozlabs.org
> >> Subject: Generated xilinx linux 2.6 image sections
> >>
> >>
> >> Hi all,
> >>
> >> I'm trying to boot the 2.6 xilinx kernel downloaded from their git
> > server in
> >> the XUPV2P board I'm really having troubles (I can't see anything
in
> > the
> >> minicom console terminal). I'm not seeing anything, neither the
> > ucompressing
> >> kernel string nor the prompt with the memory addresses that kernel
> > prompt at
> >> first time, so I have started to distrust of anything.
> >>
> >>
> >> Linuxppc-embedded@ozlabs.org
> >> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
> >
> >
> > _______________________________________________
> > Linuxppc-embedded mailing list
> > Linuxppc-embedded@ozlabs.org
> > https://ozlabs.org/mailman/listinfo/linuxppc-embedded
> >
> >
>=20
>=20
>=20
> --
> View this message in context:
http://www.nabble.com/Generated-xilinx-linux-2.6--image-sections-
> tp14997109p15018508.html
> Sent from the linuxppc-embedded mailing list archive at Nabble.com.
>=20
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
^ permalink raw reply
* Re: [PATCH] Various new ibm405 DCRN #defines
From: Josh Boyer @ 2008-01-22 17:10 UTC (permalink / raw)
To: Joshua Williams; +Cc: linuxppc-dev
In-Reply-To: <47962316.8040709@qlogic.com>
On Tue, 22 Jan 2008 11:08:38 -0600
Joshua Williams <joshua.williams@qlogic.com> wrote:
> Benjamin Herrenschmidt wrote:
> > On Mon, 2008-01-21 at 16:43 -0600, Joshua Williams wrote:
> >> Various new ibm405 DCRN #defines.
> >>
> >> Signed-off-by: Joshua Williams <joshua.williams@qlogic.com>
> >
> > May I ask what for ? :-) Also, it's all arch/ppc, not arch/powerpc...
> > nothing we want to improve to much on at this stage unless there's a
> > really good reason.
>
> The 405x #defines were incomplete and this was meant to
> make them a bit tighter. Since arch/ppc is in life support
> mode this can wait until the 405x stuff gets moved over to
> arch/powerpc.
Which 405x stuff? Walnut is moved over already. Other boards will
need to be ported by people that have those boards.
josh
^ permalink raw reply
* Re: [PATCH] Various new ibm405 DCRN #defines
From: Joshua Williams @ 2008-01-22 17:08 UTC (permalink / raw)
To: benh; +Cc: linuxppc-dev
In-Reply-To: <1200956274.6807.12.camel@pasglop>
Benjamin Herrenschmidt wrote:
> On Mon, 2008-01-21 at 16:43 -0600, Joshua Williams wrote:
>> Various new ibm405 DCRN #defines.
>>
>> Signed-off-by: Joshua Williams <joshua.williams@qlogic.com>
>
> May I ask what for ? :-) Also, it's all arch/ppc, not arch/powerpc...
> nothing we want to improve to much on at this stage unless there's a
> really good reason.
The 405x #defines were incomplete and this was meant to
make them a bit tighter. Since arch/ppc is in life support
mode this can wait until the 405x stuff gets moved over to
arch/powerpc.
Thanks!
- Josh
>> ---
>> arch/ppc/platforms/4xx/ibm405ep.h | 3 +++
>> arch/ppc/platforms/4xx/ibm405gp.h | 9 +++++++++
>> arch/ppc/platforms/4xx/ibm405gpr.h | 9 +++++++++
>> include/asm-ppc/ibm405.h | 27 +++++++++++++++++++++++++++
>> 4 files changed, 48 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/ppc/platforms/4xx/ibm405ep.h
>> b/arch/ppc/platforms/4xx/ibm405ep.h
>> index 3ef20a5..d82a4c7 100644
>> --- a/arch/ppc/platforms/4xx/ibm405ep.h
>> +++ b/arch/ppc/platforms/4xx/ibm405ep.h
>> @@ -139,6 +139,9 @@
>> #define DCRN_UIC0_BASE 0x0C0
>> #define UIC0 DCRN_UIC0_BASE
>>
>> +/* DCRN_SDRAM0_BASE offsets - general 405 offsets in asm/ibm405.h */
>> +#define DCRN_SDRAM0_STATUS 0x24 /* SDRAM Controller Status */
>> +
>> #include <asm/ibm405.h>
>>
>> #endif /* __ASM_IBM405EP_H__ */
>> diff --git a/arch/ppc/platforms/4xx/ibm405gp.h
>> b/arch/ppc/platforms/4xx/ibm405gp.h
>> index 9f15e55..9f7e850 100644
>> --- a/arch/ppc/platforms/4xx/ibm405gp.h
>> +++ b/arch/ppc/platforms/4xx/ibm405gp.h
>> @@ -142,6 +142,15 @@
>> #define DCRN_UIC0_BASE 0x0C0
>> #define UIC0 DCRN_UIC0_BASE
>>
>> +/* DCRN_SDRAM0_BASE offsets - general 405 offsets in asm/ibm405.h */
>> +#define DCRN_SDRAM0_BESR0 0x00 /* Bus Error Syndrome Reg 0 */
>> +#define DCRN_SDRAM0_BESR1 0x08 /* Bus Error Syndrome Reg 1 */
>> +#define DCRN_SDRAM0_BEAR 0x10 /* Bus Error Address Reg */
>> +#define DCRN_SDRAM0_B2CR 0x48 /* Memory Bank 2 Configuration Reg */
>> +#define DCRN_SDRAM0_B3CR 0x4c /* Memory Bank 3 Configuration Reg */
>> +#define DCRN_SDRAM0_ECCCFG 0x94 /* ECC Configuration */
>> +#define DCRN_SDRAM0_ECCESR 0x98 /* ECC Error Status */
>> +
>> #include <asm/ibm405.h>
>>
>> #endif /* __ASM_IBM405GP_H__ */
>> diff --git a/arch/ppc/platforms/4xx/ibm405gpr.h
>> b/arch/ppc/platforms/4xx/ibm405gpr.h
>> index 9e01f15..6f39042 100644
>> --- a/arch/ppc/platforms/4xx/ibm405gpr.h
>> +++ b/arch/ppc/platforms/4xx/ibm405gpr.h
>> @@ -142,6 +142,15 @@
>> #define DCRN_UIC0_BASE 0x0C0
>> #define UIC0 DCRN_UIC0_BASE
>>
>> +/* DCRN_SDRAM0_BASE offsets - general 405 offsets in asm/ibm405.h */
>> +#define DCRN_SDRAM0_BESR0 0x00 /* Bus Error Syndrome Reg 0 */
>> +#define DCRN_SDRAM0_BESR1 0x08 /* Bus Error Syndrome Reg 1 */
>> +#define DCRN_SDRAM0_BEAR 0x10 /* Bus Error Address Reg */
>> +#define DCRN_SDRAM0_B2CR 0x48 /* Memory Bank 2 Configuration Reg */
>> +#define DCRN_SDRAM0_B3CR 0x4c /* Memory Bank 3 Configuration Reg */
>> +#define DCRN_SDRAM0_ECCCFG 0x94 /* ECC Configuration */
>> +#define DCRN_SDRAM0_ECCESR 0x98 /* ECC Error Status */
>> +
>> #include <asm/ibm405.h>
>>
>> #endif /* __ASM_IBM405GPR_H__ */
>> diff --git a/include/asm-ppc/ibm405.h b/include/asm-ppc/ibm405.h
>> index 4e5be9e..04aaae6 100644
>> --- a/include/asm-ppc/ibm405.h
>> +++ b/include/asm-ppc/ibm405.h
>> @@ -135,6 +135,26 @@
>> #ifdef DCRN_EBC_BASE
>> #define DCRN_EBCCFGADR (DCRN_EBC_BASE + 0x0) /* Peripheral Controller
>> Address */
>> #define DCRN_EBCCFGDATA (DCRN_EBC_BASE + 0x1) /* Peripheral Controller
>> Data */
>> +#define DCRN_EBC_PB0CR 0x00 /* Peripheral Bank 0 Config Reg */
>> +#define DCRN_EBC_PB1CR 0x01 /* Peripheral Bank 1 Config Reg */
>> +#define DCRN_EBC_PB2CR 0x02 /* Peripheral Bank 2 Config Reg */
>> +#define DCRN_EBC_PB3CR 0x03 /* Peripheral Bank 3 Config Reg */
>> +#define DCRN_EBC_PB4CR 0x04 /* Peripheral Bank 4 Config Reg */
>> +#define DCRN_EBC_PB5CR 0x05 /* Peripheral Bank 5 Config Reg */
>> +#define DCRN_EBC_PB6CR 0x06 /* Peripheral Bank 6 Config Reg */
>> +#define DCRN_EBC_PB7CR 0x07 /* Peripheral Bank 7 Config Reg */
>> +#define DCRN_EBC_PB0AP 0x10 /* Peripheral Bank 0 Access Parameters */
>> +#define DCRN_EBC_PB1AP 0x11 /* Peripheral Bank 1 Access parameters */
>> +#define DCRN_EBC_PB2AP 0x12 /* Peripheral Bank 2 Access Parameters */
>> +#define DCRN_EBC_PB3AP 0x13 /* Peripheral Bank 3 Access Parameters */
>> +#define DCRN_EBC_PB4AP 0x14 /* Peripheral Bank 4 Access Parameters */
>> +#define DCRN_EBC_PB5AP 0x15 /* Peripheral Bank 5 Access Parameters */
>> +#define DCRN_EBC_PB6AP 0x16 /* Peripheral Bank 6 Access Parameters */
>> +#define DCRN_EBC_PB7AP 0x17 /* Peripheral Bank 7 Access Parameters */
>> +#define DCRN_EBC_PBEAR 0x20 /* Peripheral Bus Error Address Reg */
>> +#define DCRN_EBC_PBESR0 0x21 /* Peripheral Bus Error Status Reg 0 */
>> +#define DCRN_EBC_PBESR1 0x22 /* Peripheral Bus Error Status Reg 1 */
>> +#define DCRN_EBC_EPCR 0x23 /* External Peripheral Control Reg */
>> #endif
>>
>> #ifdef DCRN_EXIER_BASE
>> @@ -286,6 +306,13 @@
>> #ifdef DCRN_SDRAM0_BASE
>> #define DCRN_SDRAM0_CFGADDR (DCRN_SDRAM0_BASE + 0x0) /* Memory
>> Controller Address */
>> #define DCRN_SDRAM0_CFGDATA (DCRN_SDRAM0_BASE + 0x1) /* Memory
>> Controller Data */
>> +#define DCRN_SDRAM0_CFG 0x20 /* SDRAM Configuration */
>> +#define DCRN_SDRAM0_STATUS 0x24 /* SDRAM Controller Status */
>> +#define DCRN_SDRAM0_RTR 0x30 /* Refresh Timer Reg */
>> +#define DCRN_SDRAM0_PMIT 0x34 /* Power Management Idle Timer */
>> +#define DCRN_SDRAM0_B0CR 0x40 /* Memory Bank 0 Configuration Reg */
>> +#define DCRN_SDRAM0_B1CR 0x44 /* Memory Bank 1 Configuration Reg */
>> +#define DCRN_SDRAM0_TR 0x80 /* SDRAM Timing Reg */
>> #endif
>>
>> #ifdef DCRN_OCM0_BASE
>> _______________________________________________
>> Linuxppc-dev mailing list
>> Linuxppc-dev@ozlabs.org
>> https://ozlabs.org/mailman/listinfo/linuxppc-dev
>
>
^ permalink raw reply
* [PATCH 1/2] Add flash node to mpc8641_hpcn.dts
From: Wade Farnsworth @ 2008-01-22 16:38 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev
Add flash and partition information to mpc8641_hpcn.dts
Signed-off-by: Wade Farnsworth <wfarnsworth@mvista.com>
---
arch/powerpc/boot/dts/mpc8641_hpcn.dts | 27 +++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index a719179..679e857 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -457,4 +457,31 @@
0 00100000>;
};
};
+
+ flash@ff800000 {
+ compatible = "cfi-flash";
+ reg = <ff800000 00800000>;
+ bank-width = <2>;
+ device-width = <2>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ partition@0 {
+ label = "kernel";
+ reg = <00000000 00300000>;
+ };
+ partition@300000 {
+ label = "firmware b";
+ reg = <00300000 00100000>;
+ read-only;
+ };
+ partition@400000 {
+ label = "fs";
+ reg = <00400000 00300000>;
+ };
+ partition@700000 {
+ label = "firmware a";
+ reg = <00700000 00100000>;
+ read-only;
+ };
+ };
};
^ permalink raw reply related
* Re: [PATCH 1/2] Add flash node to mpc8641_hpcn.dts
From: Kumar Gala @ 2008-01-22 16:49 UTC (permalink / raw)
To: Wade Farnsworth; +Cc: linuxppc-dev
In-Reply-To: <1201020463.5716.161.camel@rhino>
On Jan 22, 2008, at 10:47 AM, Wade Farnsworth wrote:
> On Tue, 2008-01-22 at 10:44 -0600, Kumar Gala wrote:
>> On Jan 22, 2008, at 10:38 AM, Wade Farnsworth wrote:
>>
>>> Add flash and partition information to mpc8641_hpcn.dts
>>>
>>> Signed-off-by: Wade Farnsworth <wfarnsworth@mvista.com>
>>>
>>> ---
>>> arch/powerpc/boot/dts/mpc8641_hpcn.dts | 27 +++++++++++++++++++++
>>> ++
>>> 1 file changed, 27 insertions(+)
>>>
>>> diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/
>>> boot/dts/mpc8641_hpcn.dts
>>> index a719179..679e857 100644
>>> --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
>>> +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
>>> @@ -457,4 +457,31 @@
>>> 0 00100000>;
>>> };
>>> };
>>
>> This really should be under a localbus node.
>>
>> - k
>>
>
> Ok. I'll fix it up and resend.
look at the mpc8313erdb.dts (in my tree, as an example).
- k
^ permalink raw reply
* Re: [PATCH 2/2] MPC8641 HPCN: publish all soc and flash devices
From: Kumar Gala @ 2008-01-22 16:50 UTC (permalink / raw)
To: Wade Farnsworth; +Cc: linuxppc-dev
In-Reply-To: <1201020432.5716.159.camel@rhino>
On Jan 22, 2008, at 10:47 AM, Wade Farnsworth wrote:
> Publish all soc and flash devices from the device tree, similar to
> what
> is done for other boards.
>
> Signed-off-by: Wade Farnsworth <wfarnsworth@mvista.com>
>
> ---
> arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/
> powerpc/platforms/86xx/mpc86xx_hpcn.c
> index 14f4e52..f266264 100644
> --- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
> +++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
> @@ -18,6 +18,7 @@
> #include <linux/kdev_t.h>
> #include <linux/delay.h>
> #include <linux/seq_file.h>
> +#include <linux/of_platform.h>
>
> #include <asm/system.h>
> #include <asm/time.h>
> @@ -212,6 +213,21 @@ mpc86xx_time_init(void)
> return 0;
> }
>
> +static struct of_device_id mpc86xx_ids[] = {
> + { .type = "soc", },
> + { .compatible = "soc", },
> + { .compatible = "cfi-flash", },
> + {},
> +};
> +
> +static int __init mpc86xx_publish_devices(void)
> +{
> + of_platform_bus_probe(NULL, mpc86xx_ids, NULL);
> +
> + return 0;
> +}
> +device_initcall(mpc86xx_publish_devices);
> +
this should look more like:
+static struct of_device_id __initdata of_bus_ids[] = {
+ { .compatible = "simple-bus" },
+ {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+ of_platform_bus_probe(NULL, of_bus_ids, NULL);
+ return 0;
+}
+machine_device_initcall(mpc86xx_hpcn, mpc86xx_publish_devices);
+
>
> define_machine(mpc86xx_hpcn) {
> .name = "MPC86xx HPCN",
> .probe = mpc86xx_hpcn_probe,
>
^ permalink raw reply
* Re: [PATCH 1/2] Add flash node to mpc8641_hpcn.dts
From: Wade Farnsworth @ 2008-01-22 16:47 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev
In-Reply-To: <06AA1424-0697-4AF8-B843-945211A5B54A@kernel.crashing.org>
On Tue, 2008-01-22 at 10:44 -0600, Kumar Gala wrote:
> On Jan 22, 2008, at 10:38 AM, Wade Farnsworth wrote:
>
> > Add flash and partition information to mpc8641_hpcn.dts
> >
> > Signed-off-by: Wade Farnsworth <wfarnsworth@mvista.com>
> >
> > ---
> > arch/powerpc/boot/dts/mpc8641_hpcn.dts | 27 +++++++++++++++++++++++
> > 1 file changed, 27 insertions(+)
> >
> > diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/
> > boot/dts/mpc8641_hpcn.dts
> > index a719179..679e857 100644
> > --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> > +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> > @@ -457,4 +457,31 @@
> > 0 00100000>;
> > };
> > };
>
> This really should be under a localbus node.
>
> - k
>
Ok. I'll fix it up and resend.
--Wade
^ permalink raw reply
* [PATCH 2/2] MPC8641 HPCN: publish all soc and flash devices
From: Wade Farnsworth @ 2008-01-22 16:47 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev
In-Reply-To: <1201019917.5716.154.camel@rhino>
Publish all soc and flash devices from the device tree, similar to what
is done for other boards.
Signed-off-by: Wade Farnsworth <wfarnsworth@mvista.com>
---
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 14f4e52..f266264 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -18,6 +18,7 @@
#include <linux/kdev_t.h>
#include <linux/delay.h>
#include <linux/seq_file.h>
+#include <linux/of_platform.h>
#include <asm/system.h>
#include <asm/time.h>
@@ -212,6 +213,21 @@ mpc86xx_time_init(void)
return 0;
}
+static struct of_device_id mpc86xx_ids[] = {
+ { .type = "soc", },
+ { .compatible = "soc", },
+ { .compatible = "cfi-flash", },
+ {},
+};
+
+static int __init mpc86xx_publish_devices(void)
+{
+ of_platform_bus_probe(NULL, mpc86xx_ids, NULL);
+
+ return 0;
+}
+device_initcall(mpc86xx_publish_devices);
+
define_machine(mpc86xx_hpcn) {
.name = "MPC86xx HPCN",
.probe = mpc86xx_hpcn_probe,
^ permalink raw reply related
* Re: framebuffer swap endianess
From: Josh Boyer @ 2008-01-22 16:45 UTC (permalink / raw)
To: Angelo; +Cc: linuxppc-embedded
In-Reply-To: <323144.65236.qm@web23105.mail.ird.yahoo.com>
On Tue, 22 Jan 2008 16:46:47 +0100 (CET)
Angelo <s104259@yahoo.it> wrote:
> Hi, i'm angelo.
>
> I have just create a framebuffer for an embedded system:
> - powerpc (little endian) with a GPU (big endian).
I think you have those backwards? PowerPC is big-endian...
josh
^ permalink raw reply
* Re: [PATCH 1/2] Add flash node to mpc8641_hpcn.dts
From: Kumar Gala @ 2008-01-22 16:44 UTC (permalink / raw)
To: Wade Farnsworth; +Cc: linuxppc-dev
In-Reply-To: <1201019917.5716.154.camel@rhino>
On Jan 22, 2008, at 10:38 AM, Wade Farnsworth wrote:
> Add flash and partition information to mpc8641_hpcn.dts
>
> Signed-off-by: Wade Farnsworth <wfarnsworth@mvista.com>
>
> ---
> arch/powerpc/boot/dts/mpc8641_hpcn.dts | 27 +++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/
> boot/dts/mpc8641_hpcn.dts
> index a719179..679e857 100644
> --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
> @@ -457,4 +457,31 @@
> 0 00100000>;
> };
> };
This really should be under a localbus node.
- k
>
> +
> + flash@ff800000 {
> + compatible = "cfi-flash";
> + reg = <ff800000 00800000>;
> + bank-width = <2>;
> + device-width = <2>;
> + #address-cells = <1>;
> + #size-cells = <1>;
> + partition@0 {
> + label = "kernel";
> + reg = <00000000 00300000>;
> + };
> + partition@300000 {
> + label = "firmware b";
> + reg = <00300000 00100000>;
> + read-only;
> + };
> + partition@400000 {
> + label = "fs";
> + reg = <00400000 00300000>;
> + };
> + partition@700000 {
> + label = "firmware a";
> + reg = <00700000 00100000>;
> + read-only;
> + };
> + };
> };
>
^ permalink raw reply
* framebuffer swap endianess
From: Angelo @ 2008-01-22 15:46 UTC (permalink / raw)
To: linuxppc-embedded
[-- Attachment #1: Type: text/plain, Size: 739 bytes --]
Hi, i'm angelo.
I have just create a framebuffer for an embedded system:
- powerpc (little endian) with a GPU (big endian).
I'm working on linux 2.6.22
When i try to execute Xfbdev, it starts but with wrong colors.
I need to swap the RGB format (RRRRRGGGGGGBBBBB) to BGR, respecting the endianess (GGGRRRRRBBBBBGGG).
I know that X loads with some ioctl, the principal settings through framebuffer.
But i'm not sure if framebuffer can inform it on the RGB format.
I also tried to change something on cmap, but nothing changes on display;
So, i hope you can help me.
Many thanks.
---------------------------------
---------------------------------
L'email della prossima generazione? Puoi averla con la nuova Yahoo! Mail
[-- Attachment #2: Type: text/html, Size: 952 bytes --]
^ permalink raw reply
* Re: [PATCH v2] create modalias file in sysfs for bus of_platform
From: Stephen Rothwell @ 2008-01-22 14:58 UTC (permalink / raw)
To: Olaf Hering; +Cc: sparclinux, linuxppc-dev
In-Reply-To: <20080122144053.GA13019@aepfle.de>
[-- Attachment #1: Type: text/plain, Size: 2185 bytes --]
Hi Olaf,
Thanks for doing this. Patches to drivers/of should also be cc'd to the
Sparc guys as they share this stuff with is, now.
Also, drivers/macintosh/macio_sysfs.c does this for itself, so that
should probably be removed.
On Tue, 22 Jan 2008 15:40:53 +0100 Olaf Hering <olaf@aepfle.de> wrote:
>
> Create /sys/bus/of_platform/devices/*/modalias file to allow autoloading
> of modules. modalias files are already present for many other bus types.
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
>
> ---
> drivers/of/device.c | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> --- a/drivers/of/device.c
> +++ b/drivers/of/device.c
> @@ -86,7 +86,20 @@ static ssize_t dev_show_devspec(struct d
> return sprintf(buf, "%s", ofdev->node->full_name);
> }
>
> +static ssize_t dev_show_modalias(struct device *dev,
> + struct device_attribute *attr, char *buf)
> +{
> + struct of_device *ofdev = to_of_device(dev);
> + ssize_t len = 0;
> +
> + len = of_device_get_modalias(ofdev, buf, PAGE_SIZE);
Should you pass (PAGE_SIZE - 1 (or 2)) here?
> + buf[len] = '\n';
> + buf[len+1] = 0;
> + return len+1;
> +}
> +
> static DEVICE_ATTR(devspec, S_IRUGO, dev_show_devspec, NULL);
> +static DEVICE_ATTR(modalias, S_IRUGO, dev_show_modalias, NULL);
>
> /**
> * of_release_dev - free an of device structure when all users of it are finished.
> @@ -116,6 +129,11 @@ int of_device_register(struct of_device
> return rc;
>
> rc = device_create_file(&ofdev->dev, &dev_attr_devspec);
> + if (rc) {
> + device_unregister(&ofdev->dev);
> + return rc;
> + }
> + rc = device_create_file(&ofdev->dev, &dev_attr_modalias);
> if (rc)
> device_unregister(&ofdev->dev);
>
> @@ -126,6 +144,7 @@ EXPORT_SYMBOL(of_device_register);
> void of_device_unregister(struct of_device *ofdev)
> {
> device_remove_file(&ofdev->dev, &dev_attr_devspec);
> + device_remove_file(&ofdev->dev, &dev_attr_modalias);
> device_unregister(&ofdev->dev);
> }
> EXPORT_SYMBOL(of_device_unregister);
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: ppc32: Weird process scheduling behaviour with 2.6.24-rc
From: Michel Dänzer @ 2008-01-22 14:56 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Ingo Molnar
In-Reply-To: <1200659696.23161.81.camel@thor.sulgenrain.local>
On Fri, 2008-01-18 at 13:34 +0100, Michel Dänzer wrote:
> This is on a PowerBook5,8.
>
> In a nutshell, things seem more sluggish in general than with 2.6.23.
> But in particular, processes running at nice levels >0 can get most of
> the CPU cycles available, slowing down processes running at nice level
> 0.
The canonical test case I've come up with is to run an infinite loop
with
sudo -u nobody nice -n 19 sh -c 'while true; do true; done'
This makes my X session (X server running at nice level -1, clients at
0) unusably sluggish (it can even take several seconds to process ctrl-c
to interrupt the infinite loop) with 2.6.24-rc but works as expected
with 2.6.23.
Anybody else seeing this?
> I've seen this since .24-rc5 (the first .24-rc I tried), and it's still
> there with -rc8. I'd be surprised if this kind of behaviour remained
> unfixed for that long if it affected x86, so I presume it's powerpc
> specific.
Or maybe not... I've bisected this down to the scheduler changes between
df3d80f5a5c74168be42788364d13cf6c83c7b9c/23fd50450a34f2558070ceabb0bfebc1c9604af5 and b5869ce7f68b233ceb81465a7644be0d9a5f3dbb . I'll try and bisect it further, but this is my main work machine, so I can't reboot it too often. I'm CC'ing Ingo in case he has any ideas offhand.
--
Earthling Michel Dänzer | http://tungstengraphics.com
Libre software enthusiast | Debian, X and DRI developer
^ permalink raw reply
* [PATCH v2] create modalias file in sysfs for bus of_platform
From: Olaf Hering @ 2008-01-22 14:40 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <20080122142109.GA12967@aepfle.de>
Create /sys/bus/of_platform/devices/*/modalias file to allow autoloading
of modules. modalias files are already present for many other bus types.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
drivers/of/device.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -86,7 +86,20 @@ static ssize_t dev_show_devspec(struct d
return sprintf(buf, "%s", ofdev->node->full_name);
}
+static ssize_t dev_show_modalias(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct of_device *ofdev = to_of_device(dev);
+ ssize_t len = 0;
+
+ len = of_device_get_modalias(ofdev, buf, PAGE_SIZE);
+ buf[len] = '\n';
+ buf[len+1] = 0;
+ return len+1;
+}
+
static DEVICE_ATTR(devspec, S_IRUGO, dev_show_devspec, NULL);
+static DEVICE_ATTR(modalias, S_IRUGO, dev_show_modalias, NULL);
/**
* of_release_dev - free an of device structure when all users of it are finished.
@@ -116,6 +129,11 @@ int of_device_register(struct of_device
return rc;
rc = device_create_file(&ofdev->dev, &dev_attr_devspec);
+ if (rc) {
+ device_unregister(&ofdev->dev);
+ return rc;
+ }
+ rc = device_create_file(&ofdev->dev, &dev_attr_modalias);
if (rc)
device_unregister(&ofdev->dev);
@@ -126,6 +144,7 @@ EXPORT_SYMBOL(of_device_register);
void of_device_unregister(struct of_device *ofdev)
{
device_remove_file(&ofdev->dev, &dev_attr_devspec);
+ device_remove_file(&ofdev->dev, &dev_attr_modalias);
device_unregister(&ofdev->dev);
}
EXPORT_SYMBOL(of_device_unregister);
^ permalink raw reply
* Re: [PATCH 3/4] Convert axon_msi to an of_platform driver
From: Stephen Rothwell @ 2008-01-22 14:38 UTC (permalink / raw)
To: Michael Ellerman; +Cc: linuxppc-dev, cbe-oss-dev
In-Reply-To: <c04b1ca531fcd78c42c5a13802c1c331f9b4c8a7.1200999872.git.michael@ellerman.id.au>
[-- Attachment #1: Type: text/plain, Size: 399 bytes --]
Hi Michael,
On Tue, 22 Jan 2008 22:04:40 +1100 (EST) Michael Ellerman <michael@ellerman.id.au> wrote:
>
> +#include <asm/of_platform.h>
You must have missed the lectures :-) Please use linux/of_platform.h
> +static struct of_device_id axon_msi_device_id[] = {
const, please.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [PATCH 2/4] Create and hook up of_platform_device_shutdown
From: Stephen Rothwell @ 2008-01-22 14:34 UTC (permalink / raw)
To: Michael Ellerman; +Cc: linuxppc-dev, cbe-oss-dev
In-Reply-To: <bb8d7cc1a060af291ef6efb0f4222f81fa91f417.1200999872.git.michael@ellerman.id.au>
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
Hi Michael,
Just a couple of things.
On Tue, 22 Jan 2008 22:04:40 +1100 (EST) Michael Ellerman <michael@ellerman.id.au> wrote:
>
> +static void of_platform_device_shutdown(struct device * dev)
^
No space, please.
Also, I wonder if we should check that the drivers that already have
specified a shutdown routine (drivers/input/misc/sparcspkr.c,
drivers/usb/host/ohci-ppc-of.c and drivers/watchdog/mpc5200_wdt.c) are
actually ok if it actually gets called. :-)
Also, patches like this should be cc'd to (at least) the sparc guys
(sparclinux@vger.kernel.org) since they share this stuff with us, now.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* [PATCH] create modalias file in sysfs for bus of_platform
From: Olaf Hering @ 2008-01-22 14:21 UTC (permalink / raw)
To: linuxppc-dev
Create /sys/bus/of_platform/devices/*/modalias file to allow autoloading
of modules. modalias files are already present for many other bus types.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
drivers/of/device.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -86,7 +86,19 @@ static ssize_t dev_show_devspec(struct d
return sprintf(buf, "%s", ofdev->node->full_name);
}
+static ssize_t dev_show_modalias(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct of_device *ofdev = to_of_device(dev);
+ ssize_t len = 0;
+
+ if (ofdev)
+ len = of_device_get_modalias(ofdev, buf, PAGE_SIZE);
+ return len;
+}
+
static DEVICE_ATTR(devspec, S_IRUGO, dev_show_devspec, NULL);
+static DEVICE_ATTR(modalias, S_IRUGO, dev_show_modalias, NULL);
/**
* of_release_dev - free an of device structure when all users of it are finished.
@@ -116,6 +128,11 @@ int of_device_register(struct of_device
return rc;
rc = device_create_file(&ofdev->dev, &dev_attr_devspec);
+ if (rc) {
+ device_unregister(&ofdev->dev);
+ return rc;
+ }
+ rc = device_create_file(&ofdev->dev, &dev_attr_modalias);
if (rc)
device_unregister(&ofdev->dev);
@@ -126,6 +143,7 @@ EXPORT_SYMBOL(of_device_register);
void of_device_unregister(struct of_device *ofdev)
{
device_remove_file(&ofdev->dev, &dev_attr_devspec);
+ device_remove_file(&ofdev->dev, &dev_attr_modalias);
device_unregister(&ofdev->dev);
}
EXPORT_SYMBOL(of_device_unregister);
^ permalink raw reply
* Re: [PATCH] create modalias file in sysfs for bus vio
From: Stephen Rothwell @ 2008-01-22 14:05 UTC (permalink / raw)
To: Olaf Hering; +Cc: linuxppc-dev
In-Reply-To: <20080122083328.GA11928@aepfle.de>
[-- Attachment #1: Type: text/plain, Size: 824 bytes --]
Hi Olaf,
Thanks for this. Just a couple of nits ...
On Tue, 22 Jan 2008 09:33:28 +0100 Olaf Hering <olaf@aepfle.de> wrote:
>
> +static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
^
No space here, please.
> + char *buf)
> +{
> + struct device_node *of_node = dev->archdata.of_node;
> + const char *compat;
> + int i = 0;
> +
> + if (of_node) {
> + compat = of_get_property(of_node, "compatible", &i);
> + i = sprintf (buf, "vio:T%sS%s\n", of_node->type, compat ? compat : "");
^
Or here.
It would be nice if we could factor out the "vio:T%sS%s" string as it is
also used in vio_hotplug().
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox