* [Patch 0/4] [flexcan/powerpc] Add support for powerpc flexcan (freescale p1010) -V8
@ 2011-08-09 12:28 Robin Holt
2011-08-09 12:28 ` [PATCH 1/4] [flexcan] Remove #include <mach/clock.h> Robin Holt
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Robin Holt @ 2011-08-09 12:28 UTC (permalink / raw)
To: Robin Holt, Marc Kleine-Budde, Wolfgang Grandegger, U Bhaskar-B22300
Cc: socketcan-core, netdev, PPC list, Robin Holt
Marc, Wolfgang or U Bhaskar,
This patch set should have all your comments included. It is based on
the David S. Miller net-next-2.6 tree commit 19fd617.
I have compiled each patch in the series individually for both arm and
powerpc (cheated on ppc and reordered them with the last patch first so
I could select CAN_FLEXCAN.
With all the patches applied, my p1010rdb works for communicating between
its two can ports and also can communicate with an external PSOC. I have
done no testing beyond compile testing on an arm system as I have no
access to an arm based system.
For the first three patches in the series, I believe they are all ready
for submission to David S. Miller for the netdev tree. This is the
first submission of patch 4 which, I believe, will end up going through
the linuxppc-dev list and can go at any time after the flexcan patches
are submitted. As long the first and last patches are both applied,
the tree will compile for either ppc or arm, but will not work without
all patches. If the ppc patch (4/4) gets applied before 1/4, we could
have a random config tester detect a compile failure on ppc if they
select NET, CAN, and CAN_FLEXCAN.
Thanks,
Robin Holt
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/4] [flexcan] Remove #include <mach/clock.h> 2011-08-09 12:28 [Patch 0/4] [flexcan/powerpc] Add support for powerpc flexcan (freescale p1010) -V8 Robin Holt @ 2011-08-09 12:28 ` Robin Holt 2011-08-09 12:28 ` [PATCH 2/4] [flexcan] Abstract off read/write for big/little endian Robin Holt ` (2 subsequent siblings) 3 siblings, 0 replies; 10+ messages in thread From: Robin Holt @ 2011-08-09 12:28 UTC (permalink / raw) To: Robin Holt, Marc Kleine-Budde, Wolfgang Grandegger, U Bhaskar-B22300 Cc: socketcan-core, netdev, PPC list, Robin Holt powerpc does not have a mach-####/clock.h. When testing, I found neither arm nor powerpc needed the mach/clock.h at all so I removed it. Signed-off-by: Robin Holt <holt@sgi.com> To: Marc Kleine-Budde <mkl@pengutronix.de> To: Wolfgang Grandegger <wg@grandegger.com> To: U Bhaskar-B22300 <B22300@freescale.com> Cc: socketcan-core@lists.berlios.de Cc: netdev@vger.kernel.org Cc: PPC list <linuxppc-dev@lists.ozlabs.org> --- drivers/net/can/flexcan.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 1767811..586b2cd 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -35,8 +35,6 @@ #include <linux/module.h> #include <linux/platform_device.h> -#include <mach/clock.h> - #define DRV_NAME "flexcan" /* 8 for RX fifo and 2 error handling */ -- 1.7.2.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/4] [flexcan] Abstract off read/write for big/little endian. 2011-08-09 12:28 [Patch 0/4] [flexcan/powerpc] Add support for powerpc flexcan (freescale p1010) -V8 Robin Holt 2011-08-09 12:28 ` [PATCH 1/4] [flexcan] Remove #include <mach/clock.h> Robin Holt @ 2011-08-09 12:28 ` Robin Holt 2011-08-09 12:28 ` [PATCH 3/4] [flexcan] Add of_match to platform_device definition Robin Holt 2011-08-09 12:28 ` [PATCH 4/4] [powerpc] Add flexcan device support for p1010rdb Robin Holt 3 siblings, 0 replies; 10+ messages in thread From: Robin Holt @ 2011-08-09 12:28 UTC (permalink / raw) To: Robin Holt, Marc Kleine-Budde, Wolfgang Grandegger, U Bhaskar-B22300 Cc: socketcan-core, netdev, PPC list, Robin Holt Make flexcan driver handle register reads in the appropriate endianess. This was a basic search and replace and then define some inlines. Signed-off-by: Robin Holt <holt@sgi.com> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> To: Wolfgang Grandegger <wg@grandegger.com> To: U Bhaskar-B22300 <B22300@freescale.com> Cc: socketcan-core@lists.berlios.de Cc: netdev@vger.kernel.org Cc: PPC list <linuxppc-dev@lists.ozlabs.org> --- drivers/net/can/flexcan.c | 140 ++++++++++++++++++++++++++------------------ 1 files changed, 83 insertions(+), 57 deletions(-) diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 586b2cd..68cbe52 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -190,6 +190,31 @@ static struct can_bittiming_const flexcan_bittiming_const = { }; /* + * Abstract off the read/write for arm versus ppc. + */ +#if defined(__BIG_ENDIAN) +static inline u32 flexcan_read(void __iomem *addr) +{ + return in_be32(addr); +} + +static inline void flexcan_write(u32 val, void __iomem *addr) +{ + out_be32(addr, val); +} +#else +static inline u32 flexcan_read(void __iomem *addr) +{ + return readl(addr); +} + +static inline void flexcan_write(u32 val, void __iomem *addr) +{ + writel(val, addr); +} +#endif + +/* * Swtich transceiver on or off */ static void flexcan_transceiver_switch(const struct flexcan_priv *priv, int on) @@ -210,9 +235,9 @@ static inline void flexcan_chip_enable(struct flexcan_priv *priv) struct flexcan_regs __iomem *regs = priv->base; u32 reg; - reg = readl(®s->mcr); + reg = flexcan_read(®s->mcr); reg &= ~FLEXCAN_MCR_MDIS; - writel(reg, ®s->mcr); + flexcan_write(reg, ®s->mcr); udelay(10); } @@ -222,9 +247,9 @@ static inline void flexcan_chip_disable(struct flexcan_priv *priv) struct flexcan_regs __iomem *regs = priv->base; u32 reg; - reg = readl(®s->mcr); + reg = flexcan_read(®s->mcr); reg |= FLEXCAN_MCR_MDIS; - writel(reg, ®s->mcr); + flexcan_write(reg, ®s->mcr); } static int flexcan_get_berr_counter(const struct net_device *dev, @@ -232,7 +257,7 @@ static int flexcan_get_berr_counter(const struct net_device *dev, { const struct flexcan_priv *priv = netdev_priv(dev); struct flexcan_regs __iomem *regs = priv->base; - u32 reg = readl(®s->ecr); + u32 reg = flexcan_read(®s->ecr); bec->txerr = (reg >> 0) & 0xff; bec->rxerr = (reg >> 8) & 0xff; @@ -266,15 +291,15 @@ static int flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev) if (cf->can_dlc > 0) { u32 data = be32_to_cpup((__be32 *)&cf->data[0]); - writel(data, ®s->cantxfg[FLEXCAN_TX_BUF_ID].data[0]); + flexcan_write(data, ®s->cantxfg[FLEXCAN_TX_BUF_ID].data[0]); } if (cf->can_dlc > 3) { u32 data = be32_to_cpup((__be32 *)&cf->data[4]); - writel(data, ®s->cantxfg[FLEXCAN_TX_BUF_ID].data[1]); + flexcan_write(data, ®s->cantxfg[FLEXCAN_TX_BUF_ID].data[1]); } - writel(can_id, ®s->cantxfg[FLEXCAN_TX_BUF_ID].can_id); - writel(ctrl, ®s->cantxfg[FLEXCAN_TX_BUF_ID].can_ctrl); + flexcan_write(can_id, ®s->cantxfg[FLEXCAN_TX_BUF_ID].can_id); + flexcan_write(ctrl, ®s->cantxfg[FLEXCAN_TX_BUF_ID].can_ctrl); kfree_skb(skb); @@ -462,8 +487,8 @@ static void flexcan_read_fifo(const struct net_device *dev, struct flexcan_mb __iomem *mb = ®s->cantxfg[0]; u32 reg_ctrl, reg_id; - reg_ctrl = readl(&mb->can_ctrl); - reg_id = readl(&mb->can_id); + reg_ctrl = flexcan_read(&mb->can_ctrl); + reg_id = flexcan_read(&mb->can_id); if (reg_ctrl & FLEXCAN_MB_CNT_IDE) cf->can_id = ((reg_id >> 0) & CAN_EFF_MASK) | CAN_EFF_FLAG; else @@ -473,12 +498,12 @@ static void flexcan_read_fifo(const struct net_device *dev, cf->can_id |= CAN_RTR_FLAG; cf->can_dlc = get_can_dlc((reg_ctrl >> 16) & 0xf); - *(__be32 *)(cf->data + 0) = cpu_to_be32(readl(&mb->data[0])); - *(__be32 *)(cf->data + 4) = cpu_to_be32(readl(&mb->data[1])); + *(__be32 *)(cf->data + 0) = cpu_to_be32(flexcan_read(&mb->data[0])); + *(__be32 *)(cf->data + 4) = cpu_to_be32(flexcan_read(&mb->data[1])); /* mark as read */ - writel(FLEXCAN_IFLAG_RX_FIFO_AVAILABLE, ®s->iflag1); - readl(®s->timer); + flexcan_write(FLEXCAN_IFLAG_RX_FIFO_AVAILABLE, ®s->iflag1); + flexcan_read(®s->timer); } static int flexcan_read_frame(struct net_device *dev) @@ -514,17 +539,17 @@ static int flexcan_poll(struct napi_struct *napi, int quota) * The error bits are cleared on read, * use saved value from irq handler. */ - reg_esr = readl(®s->esr) | priv->reg_esr; + reg_esr = flexcan_read(®s->esr) | priv->reg_esr; /* handle state changes */ work_done += flexcan_poll_state(dev, reg_esr); /* handle RX-FIFO */ - reg_iflag1 = readl(®s->iflag1); + reg_iflag1 = flexcan_read(®s->iflag1); while (reg_iflag1 & FLEXCAN_IFLAG_RX_FIFO_AVAILABLE && work_done < quota) { work_done += flexcan_read_frame(dev); - reg_iflag1 = readl(®s->iflag1); + reg_iflag1 = flexcan_read(®s->iflag1); } /* report bus errors */ @@ -534,8 +559,8 @@ static int flexcan_poll(struct napi_struct *napi, int quota) if (work_done < quota) { napi_complete(napi); /* enable IRQs */ - writel(FLEXCAN_IFLAG_DEFAULT, ®s->imask1); - writel(priv->reg_ctrl_default, ®s->ctrl); + flexcan_write(FLEXCAN_IFLAG_DEFAULT, ®s->imask1); + flexcan_write(priv->reg_ctrl_default, ®s->ctrl); } return work_done; @@ -549,9 +574,9 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id) struct flexcan_regs __iomem *regs = priv->base; u32 reg_iflag1, reg_esr; - reg_iflag1 = readl(®s->iflag1); - reg_esr = readl(®s->esr); - writel(FLEXCAN_ESR_ERR_INT, ®s->esr); /* ACK err IRQ */ + reg_iflag1 = flexcan_read(®s->iflag1); + reg_esr = flexcan_read(®s->esr); + flexcan_write(FLEXCAN_ESR_ERR_INT, ®s->esr); /* ACK err IRQ */ /* * schedule NAPI in case of: @@ -567,16 +592,16 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id) * save them for later use. */ priv->reg_esr = reg_esr & FLEXCAN_ESR_ERR_BUS; - writel(FLEXCAN_IFLAG_DEFAULT & ~FLEXCAN_IFLAG_RX_FIFO_AVAILABLE, - ®s->imask1); - writel(priv->reg_ctrl_default & ~FLEXCAN_CTRL_ERR_ALL, + flexcan_write(FLEXCAN_IFLAG_DEFAULT & + ~FLEXCAN_IFLAG_RX_FIFO_AVAILABLE, ®s->imask1); + flexcan_write(priv->reg_ctrl_default & ~FLEXCAN_CTRL_ERR_ALL, ®s->ctrl); napi_schedule(&priv->napi); } /* FIFO overflow */ if (reg_iflag1 & FLEXCAN_IFLAG_RX_FIFO_OVERFLOW) { - writel(FLEXCAN_IFLAG_RX_FIFO_OVERFLOW, ®s->iflag1); + flexcan_write(FLEXCAN_IFLAG_RX_FIFO_OVERFLOW, ®s->iflag1); dev->stats.rx_over_errors++; dev->stats.rx_errors++; } @@ -585,7 +610,7 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id) if (reg_iflag1 & (1 << FLEXCAN_TX_BUF_ID)) { /* tx_bytes is incremented in flexcan_start_xmit */ stats->tx_packets++; - writel((1 << FLEXCAN_TX_BUF_ID), ®s->iflag1); + flexcan_write((1 << FLEXCAN_TX_BUF_ID), ®s->iflag1); netif_wake_queue(dev); } @@ -599,7 +624,7 @@ static void flexcan_set_bittiming(struct net_device *dev) struct flexcan_regs __iomem *regs = priv->base; u32 reg; - reg = readl(®s->ctrl); + reg = flexcan_read(®s->ctrl); reg &= ~(FLEXCAN_CTRL_PRESDIV(0xff) | FLEXCAN_CTRL_RJW(0x3) | FLEXCAN_CTRL_PSEG1(0x7) | @@ -623,11 +648,11 @@ static void flexcan_set_bittiming(struct net_device *dev) reg |= FLEXCAN_CTRL_SMP; dev_info(dev->dev.parent, "writing ctrl=0x%08x\n", reg); - writel(reg, ®s->ctrl); + flexcan_write(reg, ®s->ctrl); /* print chip status */ dev_dbg(dev->dev.parent, "%s: mcr=0x%08x ctrl=0x%08x\n", __func__, - readl(®s->mcr), readl(®s->ctrl)); + flexcan_read(®s->mcr), flexcan_read(®s->ctrl)); } /* @@ -648,10 +673,10 @@ static int flexcan_chip_start(struct net_device *dev) flexcan_chip_enable(priv); /* soft reset */ - writel(FLEXCAN_MCR_SOFTRST, ®s->mcr); + flexcan_write(FLEXCAN_MCR_SOFTRST, ®s->mcr); udelay(10); - reg_mcr = readl(®s->mcr); + reg_mcr = flexcan_read(®s->mcr); if (reg_mcr & FLEXCAN_MCR_SOFTRST) { dev_err(dev->dev.parent, "Failed to softreset can module (mcr=0x%08x)\n", @@ -673,12 +698,12 @@ static int flexcan_chip_start(struct net_device *dev) * choose format C * */ - reg_mcr = readl(®s->mcr); + reg_mcr = flexcan_read(®s->mcr); reg_mcr |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_FEN | FLEXCAN_MCR_HALT | FLEXCAN_MCR_SUPV | FLEXCAN_MCR_WRN_EN | FLEXCAN_MCR_IDAM_C; dev_dbg(dev->dev.parent, "%s: writing mcr=0x%08x", __func__, reg_mcr); - writel(reg_mcr, ®s->mcr); + flexcan_write(reg_mcr, ®s->mcr); /* * CTRL @@ -696,7 +721,7 @@ static int flexcan_chip_start(struct net_device *dev) * (FLEXCAN_CTRL_ERR_MSK), too. Otherwise we don't get any * warning or bus passive interrupts. */ - reg_ctrl = readl(®s->ctrl); + reg_ctrl = flexcan_read(®s->ctrl); reg_ctrl &= ~FLEXCAN_CTRL_TSYN; reg_ctrl |= FLEXCAN_CTRL_BOFF_REC | FLEXCAN_CTRL_LBUF | FLEXCAN_CTRL_ERR_STATE | FLEXCAN_CTRL_ERR_MSK; @@ -704,38 +729,39 @@ static int flexcan_chip_start(struct net_device *dev) /* save for later use */ priv->reg_ctrl_default = reg_ctrl; dev_dbg(dev->dev.parent, "%s: writing ctrl=0x%08x", __func__, reg_ctrl); - writel(reg_ctrl, ®s->ctrl); + flexcan_write(reg_ctrl, ®s->ctrl); for (i = 0; i < ARRAY_SIZE(regs->cantxfg); i++) { - writel(0, ®s->cantxfg[i].can_ctrl); - writel(0, ®s->cantxfg[i].can_id); - writel(0, ®s->cantxfg[i].data[0]); - writel(0, ®s->cantxfg[i].data[1]); + flexcan_write(0, ®s->cantxfg[i].can_ctrl); + flexcan_write(0, ®s->cantxfg[i].can_id); + flexcan_write(0, ®s->cantxfg[i].data[0]); + flexcan_write(0, ®s->cantxfg[i].data[1]); /* put MB into rx queue */ - writel(FLEXCAN_MB_CNT_CODE(0x4), ®s->cantxfg[i].can_ctrl); + flexcan_write(FLEXCAN_MB_CNT_CODE(0x4), + ®s->cantxfg[i].can_ctrl); } /* acceptance mask/acceptance code (accept everything) */ - writel(0x0, ®s->rxgmask); - writel(0x0, ®s->rx14mask); - writel(0x0, ®s->rx15mask); + flexcan_write(0x0, ®s->rxgmask); + flexcan_write(0x0, ®s->rx14mask); + flexcan_write(0x0, ®s->rx15mask); flexcan_transceiver_switch(priv, 1); /* synchronize with the can bus */ - reg_mcr = readl(®s->mcr); + reg_mcr = flexcan_read(®s->mcr); reg_mcr &= ~FLEXCAN_MCR_HALT; - writel(reg_mcr, ®s->mcr); + flexcan_write(reg_mcr, ®s->mcr); priv->can.state = CAN_STATE_ERROR_ACTIVE; /* enable FIFO interrupts */ - writel(FLEXCAN_IFLAG_DEFAULT, ®s->imask1); + flexcan_write(FLEXCAN_IFLAG_DEFAULT, ®s->imask1); /* print chip status */ dev_dbg(dev->dev.parent, "%s: reading mcr=0x%08x ctrl=0x%08x\n", - __func__, readl(®s->mcr), readl(®s->ctrl)); + __func__, flexcan_read(®s->mcr), flexcan_read(®s->ctrl)); return 0; @@ -757,12 +783,12 @@ static void flexcan_chip_stop(struct net_device *dev) u32 reg; /* Disable all interrupts */ - writel(0, ®s->imask1); + flexcan_write(0, ®s->imask1); /* Disable + halt module */ - reg = readl(®s->mcr); + reg = flexcan_read(®s->mcr); reg |= FLEXCAN_MCR_MDIS | FLEXCAN_MCR_HALT; - writel(reg, ®s->mcr); + flexcan_write(reg, ®s->mcr); flexcan_transceiver_switch(priv, 0); priv->can.state = CAN_STATE_STOPPED; @@ -854,24 +880,24 @@ static int __devinit register_flexcandev(struct net_device *dev) /* select "bus clock", chip must be disabled */ flexcan_chip_disable(priv); - reg = readl(®s->ctrl); + reg = flexcan_read(®s->ctrl); reg |= FLEXCAN_CTRL_CLK_SRC; - writel(reg, ®s->ctrl); + flexcan_write(reg, ®s->ctrl); flexcan_chip_enable(priv); /* set freeze, halt and activate FIFO, restrict register access */ - reg = readl(®s->mcr); + reg = flexcan_read(®s->mcr); reg |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT | FLEXCAN_MCR_FEN | FLEXCAN_MCR_SUPV; - writel(reg, ®s->mcr); + flexcan_write(reg, ®s->mcr); /* * Currently we only support newer versions of this core * featuring a RX FIFO. Older cores found on some Coldfire * derivates are not yet supported. */ - reg = readl(®s->mcr); + reg = flexcan_read(®s->mcr); if (!(reg & FLEXCAN_MCR_FEN)) { dev_err(dev->dev.parent, "Could not enable RX FIFO, unsupported core\n"); -- 1.7.2.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/4] [flexcan] Add of_match to platform_device definition. 2011-08-09 12:28 [Patch 0/4] [flexcan/powerpc] Add support for powerpc flexcan (freescale p1010) -V8 Robin Holt 2011-08-09 12:28 ` [PATCH 1/4] [flexcan] Remove #include <mach/clock.h> Robin Holt 2011-08-09 12:28 ` [PATCH 2/4] [flexcan] Abstract off read/write for big/little endian Robin Holt @ 2011-08-09 12:28 ` Robin Holt 2011-08-09 12:28 ` [PATCH 4/4] [powerpc] Add flexcan device support for p1010rdb Robin Holt 3 siblings, 0 replies; 10+ messages in thread From: Robin Holt @ 2011-08-09 12:28 UTC (permalink / raw) To: Robin Holt, Marc Kleine-Budde, Wolfgang Grandegger, U Bhaskar-B22300 Cc: socketcan-core, netdev, PPC list, Robin Holt On powerpc, the OpenFirmware devices are not matched without specifying an of_match array. Introduce that array as that is used for matching on the Freescale P1010 processor. Signed-off-by: Robin Holt <holt@sgi.com> To: Marc Kleine-Budde <mkl@pengutronix.de> To: Wolfgang Grandegger <wg@grandegger.com> To: U Bhaskar-B22300 <B22300@freescale.com> Cc: socketcan-core@lists.berlios.de Cc: netdev@vger.kernel.org Cc: PPC list <linuxppc-dev@lists.ozlabs.org> --- drivers/net/can/flexcan.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 68cbe52..662f832 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -1027,8 +1027,19 @@ static int __devexit flexcan_remove(struct platform_device *pdev) return 0; } +static struct of_device_id flexcan_of_match[] = { + { + .compatible = "fsl,flexcan", + }, + {}, +}; + static struct platform_driver flexcan_driver = { - .driver.name = DRV_NAME, + .driver = { + .name = DRV_NAME, + .owner = THIS_MODULE, + .of_match_table = flexcan_of_match, + }, .probe = flexcan_probe, .remove = __devexit_p(flexcan_remove), }; -- 1.7.2.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/4] [powerpc] Add flexcan device support for p1010rdb. 2011-08-09 12:28 [Patch 0/4] [flexcan/powerpc] Add support for powerpc flexcan (freescale p1010) -V8 Robin Holt ` (2 preceding siblings ...) 2011-08-09 12:28 ` [PATCH 3/4] [flexcan] Add of_match to platform_device definition Robin Holt @ 2011-08-09 12:28 ` Robin Holt 2011-08-09 13:00 ` Wolfgang Grandegger 2011-08-09 14:45 ` U Bhaskar-B22300 3 siblings, 2 replies; 10+ messages in thread From: Robin Holt @ 2011-08-09 12:28 UTC (permalink / raw) To: Robin Holt, Marc Kleine-Budde, Wolfgang Grandegger, U Bhaskar-B22300 Cc: socketcan-core, , PPC list, Robin Holt, netdev I added a simple clock source for the p1010rdb so the flexcan driver could determine a clock frequency. The p1010 can device only has an oscillator of system bus frequency divided by 2. Signed-off-by: Robin Holt <holt@sgi.com> To: Marc Kleine-Budde <mkl@pengutronix.de>, To: Wolfgang Grandegger <wg@grandegger.com>, To: U Bhaskar-B22300 <B22300@freescale.com> Cc: socketcan-core@lists.berlios.de, Cc: netdev@vger.kernel.org, Cc: PPC list <linuxppc-dev@lists.ozlabs.org> --- arch/powerpc/platforms/85xx/Kconfig | 2 + arch/powerpc/platforms/85xx/Makefile | 2 + arch/powerpc/platforms/85xx/clock.c | 42 ++++++++++++++++++++++++++++++++ arch/powerpc/platforms/85xx/p1010rdb.c | 8 ++++++ 4 files changed, 54 insertions(+), 0 deletions(-) create mode 100644 arch/powerpc/platforms/85xx/clock.c diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 498534c..c4304ae 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -70,6 +70,8 @@ config MPC85xx_RDB config P1010_RDB bool "Freescale P1010RDB" select DEFAULT_UIMAGE + select HAVE_CAN_FLEXCAN if NET && CAN + select PPC_CLOCK if CAN_FLEXCAN help This option enables support for the MPC85xx RDB (P1010 RDB) board diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile index a971b32..cc7f381 100644 --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile @@ -3,6 +3,8 @@ # obj-$(CONFIG_SMP) += smp.o +obj-$(CONFIG_PPC_CLOCK) += clock.o + obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o diff --git a/arch/powerpc/platforms/85xx/clock.c b/arch/powerpc/platforms/85xx/clock.c new file mode 100644 index 0000000..a6fd2c8 --- /dev/null +++ b/arch/powerpc/platforms/85xx/clock.c @@ -0,0 +1,42 @@ + +#include <linux/device.h> +#include <linux/err.h> + +#include <asm/clk_interface.h> + +#include <sysdev/fsl_soc.h> + +/* + * p1010 needs to provide a clock source for the flexcan driver. The + * oscillator for the p1010 processor is only ever the system clock / 2. + */ + +static struct clk *mpc85xx_clk_get(struct device *dev, const char *id) +{ + if (!dev) + return ERR_PTR(-ENOENT); + + return NULL; +} + +static void mpc85xx_clk_put(struct clk *clk) +{ + return; +} + +static unsigned long mpc85xx_clk_get_rate(struct clk *clk) +{ + return fsl_get_sys_freq() / 2; +} + +static struct clk_interface mpc85xx_clk_functions = { + .clk_get = mpc85xx_clk_get, + .clk_get_rate = mpc85xx_clk_get_rate, + .clk_put = mpc85xx_clk_put, +}; + +void __init mpc85xx_clk_init(void) +{ + clk_functions = mpc85xx_clk_functions; +} + diff --git a/arch/powerpc/platforms/85xx/p1010rdb.c b/arch/powerpc/platforms/85xx/p1010rdb.c index d7387fa..5e52122 100644 --- a/arch/powerpc/platforms/85xx/p1010rdb.c +++ b/arch/powerpc/platforms/85xx/p1010rdb.c @@ -81,6 +81,13 @@ static void __init p1010_rdb_setup_arch(void) printk(KERN_INFO "P1010 RDB board from Freescale Semiconductor\n"); } +extern void mpc85xx_clk_init(void); + +static void __init p1010_rdb_init(void) +{ + mpc85xx_clk_init(); +} + static struct of_device_id __initdata p1010rdb_ids[] = { { .type = "soc", }, { .compatible = "soc", }, @@ -111,6 +118,7 @@ define_machine(p1010_rdb) { .name = "P1010 RDB", .probe = p1010_rdb_probe, .setup_arch = p1010_rdb_setup_arch, + .init = p1010_rdb_init, .init_IRQ = p1010_rdb_pic_init, #ifdef CONFIG_PCI .pcibios_fixup_bus = fsl_pcibios_fixup_bus, -- 1.7.2.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 4/4] [powerpc] Add flexcan device support for p1010rdb. 2011-08-09 12:28 ` [PATCH 4/4] [powerpc] Add flexcan device support for p1010rdb Robin Holt @ 2011-08-09 13:00 ` Wolfgang Grandegger 2011-08-09 14:45 ` U Bhaskar-B22300 1 sibling, 0 replies; 10+ messages in thread From: Wolfgang Grandegger @ 2011-08-09 13:00 UTC (permalink / raw) To: Robin Holt; +Cc: socketcan-core, U Bhaskar-B22300, PPC list, netdev Hi Robin, On 08/09/2011 02:28 PM, Robin Holt wrote: > I added a simple clock source for the p1010rdb so the flexcan driver > could determine a clock frequency. The p1010 can device only has an > oscillator of system bus frequency divided by 2. > > Signed-off-by: Robin Holt <holt@sgi.com> > To: Marc Kleine-Budde <mkl@pengutronix.de>, > To: Wolfgang Grandegger <wg@grandegger.com>, > To: U Bhaskar-B22300 <B22300@freescale.com> > Cc: socketcan-core@lists.berlios.de, > Cc: netdev@vger.kernel.org, > Cc: PPC list <linuxppc-dev@lists.ozlabs.org> > --- > arch/powerpc/platforms/85xx/Kconfig | 2 + > arch/powerpc/platforms/85xx/Makefile | 2 + > arch/powerpc/platforms/85xx/clock.c | 42 ++++++++++++++++++++++++++++++++ > arch/powerpc/platforms/85xx/p1010rdb.c | 8 ++++++ > 4 files changed, 54 insertions(+), 0 deletions(-) > create mode 100644 arch/powerpc/platforms/85xx/clock.c > > diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig > index 498534c..c4304ae 100644 > --- a/arch/powerpc/platforms/85xx/Kconfig > +++ b/arch/powerpc/platforms/85xx/Kconfig > @@ -70,6 +70,8 @@ config MPC85xx_RDB > config P1010_RDB > bool "Freescale P1010RDB" > select DEFAULT_UIMAGE > + select HAVE_CAN_FLEXCAN if NET && CAN > + select PPC_CLOCK if CAN_FLEXCAN > help > This option enables support for the MPC85xx RDB (P1010 RDB) board > > diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile > index a971b32..cc7f381 100644 > --- a/arch/powerpc/platforms/85xx/Makefile > +++ b/arch/powerpc/platforms/85xx/Makefile > @@ -3,6 +3,8 @@ > # > obj-$(CONFIG_SMP) += smp.o > > +obj-$(CONFIG_PPC_CLOCK) += clock.o > + > obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o > obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o > obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o > diff --git a/arch/powerpc/platforms/85xx/clock.c b/arch/powerpc/platforms/85xx/clock.c > new file mode 100644 > index 0000000..a6fd2c8 > --- /dev/null > +++ b/arch/powerpc/platforms/85xx/clock.c > @@ -0,0 +1,42 @@ > + > +#include <linux/device.h> > +#include <linux/err.h> > + > +#include <asm/clk_interface.h> > + > +#include <sysdev/fsl_soc.h> > + > +/* > + * p1010 needs to provide a clock source for the flexcan driver. The > + * oscillator for the p1010 processor is only ever the system clock / 2. > + */ > + > +static struct clk *mpc85xx_clk_get(struct device *dev, const char *id) > +{ > + if (!dev) > + return ERR_PTR(-ENOENT); > + Ah, I think you removed too much code here. I obviously did not understand what the device node check is good for, sorry. The clock is only implemented for the Flexcan and therefore we should add a check here: if (!dev->of_node || !of_device_is_compatible(dev->of_node, "fsl,flexcan")) return ERR_PTR(-ENOENT); Something like that should work. For the next version you can then add my "Acked-by: Wolfgang Grandegger <wg@grandegger.com" to all patches. Wolfgang. ^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: [PATCH 4/4] [powerpc] Add flexcan device support for p1010rdb. 2011-08-09 12:28 ` [PATCH 4/4] [powerpc] Add flexcan device support for p1010rdb Robin Holt 2011-08-09 13:00 ` Wolfgang Grandegger @ 2011-08-09 14:45 ` U Bhaskar-B22300 2011-08-09 14:55 ` Robin Holt 1 sibling, 1 reply; 10+ messages in thread From: U Bhaskar-B22300 @ 2011-08-09 14:45 UTC (permalink / raw) To: Robin Holt, Marc Kleine-Budde, Wolfgang Grandegger Cc: socketcan-core, netdev, PPC list Hi Robin, Where are you doing the irq handling ie request_irq() for the powerpc base= d P1010. Or the existing code of ARM based FlexCAN will work for P1010 ?? --Bhaskar > -----Original Message----- > From: Robin Holt [mailto:holt@sgi.com] > Sent: Tuesday, August 09, 2011 5:58 PM > To: Robin Holt; Marc Kleine-Budde; Wolfgang Grandegger; U Bhaskar-B22300 > Cc: Robin Holt; socketcan-core@lists.berlios.de; netdev@vger.kernel.org; > PPC list > Subject: [PATCH 4/4] [powerpc] Add flexcan device support for p1010rdb. >=20 > I added a simple clock source for the p1010rdb so the flexcan driver > could determine a clock frequency. The p1010 can device only has an > oscillator of system bus frequency divided by 2. >=20 > Signed-off-by: Robin Holt <holt@sgi.com> > To: Marc Kleine-Budde <mkl@pengutronix.de>, > To: Wolfgang Grandegger <wg@grandegger.com>, > To: U Bhaskar-B22300 <B22300@freescale.com> > Cc: socketcan-core@lists.berlios.de, > Cc: netdev@vger.kernel.org, > Cc: PPC list <linuxppc-dev@lists.ozlabs.org> > --- > arch/powerpc/platforms/85xx/Kconfig | 2 + > arch/powerpc/platforms/85xx/Makefile | 2 + > arch/powerpc/platforms/85xx/clock.c | 42 > ++++++++++++++++++++++++++++++++ > arch/powerpc/platforms/85xx/p1010rdb.c | 8 ++++++ > 4 files changed, 54 insertions(+), 0 deletions(-) create mode 100644 > arch/powerpc/platforms/85xx/clock.c >=20 > diff --git a/arch/powerpc/platforms/85xx/Kconfig > b/arch/powerpc/platforms/85xx/Kconfig > index 498534c..c4304ae 100644 > --- a/arch/powerpc/platforms/85xx/Kconfig > +++ b/arch/powerpc/platforms/85xx/Kconfig > @@ -70,6 +70,8 @@ config MPC85xx_RDB > config P1010_RDB > bool "Freescale P1010RDB" > select DEFAULT_UIMAGE > + select HAVE_CAN_FLEXCAN if NET && CAN > + select PPC_CLOCK if CAN_FLEXCAN > help > This option enables support for the MPC85xx RDB (P1010 RDB) board >=20 > diff --git a/arch/powerpc/platforms/85xx/Makefile > b/arch/powerpc/platforms/85xx/Makefile > index a971b32..cc7f381 100644 > --- a/arch/powerpc/platforms/85xx/Makefile > +++ b/arch/powerpc/platforms/85xx/Makefile > @@ -3,6 +3,8 @@ > # > obj-$(CONFIG_SMP) +=3D smp.o >=20 > +obj-$(CONFIG_PPC_CLOCK) +=3D clock.o > + > obj-$(CONFIG_MPC8540_ADS) +=3D mpc85xx_ads.o > obj-$(CONFIG_MPC8560_ADS) +=3D mpc85xx_ads.o > obj-$(CONFIG_MPC85xx_CDS) +=3D mpc85xx_cds.o diff --git > a/arch/powerpc/platforms/85xx/clock.c > b/arch/powerpc/platforms/85xx/clock.c > new file mode 100644 > index 0000000..a6fd2c8 > --- /dev/null > +++ b/arch/powerpc/platforms/85xx/clock.c > @@ -0,0 +1,42 @@ > + > +#include <linux/device.h> > +#include <linux/err.h> > + > +#include <asm/clk_interface.h> > + > +#include <sysdev/fsl_soc.h> > + > +/* > + * p1010 needs to provide a clock source for the flexcan driver. The > + * oscillator for the p1010 processor is only ever the system clock / 2. > + */ > + > +static struct clk *mpc85xx_clk_get(struct device *dev, const char *id) > +{ > + if (!dev) > + return ERR_PTR(-ENOENT); > + > + return NULL; > +} > + > +static void mpc85xx_clk_put(struct clk *clk) { > + return; > +} > + > +static unsigned long mpc85xx_clk_get_rate(struct clk *clk) { > + return fsl_get_sys_freq() / 2; > +} > + > +static struct clk_interface mpc85xx_clk_functions =3D { > + .clk_get =3D mpc85xx_clk_get, > + .clk_get_rate =3D mpc85xx_clk_get_rate, > + .clk_put =3D mpc85xx_clk_put, > +}; > + > +void __init mpc85xx_clk_init(void) > +{ > + clk_functions =3D mpc85xx_clk_functions; } > + > diff --git a/arch/powerpc/platforms/85xx/p1010rdb.c > b/arch/powerpc/platforms/85xx/p1010rdb.c > index d7387fa..5e52122 100644 > --- a/arch/powerpc/platforms/85xx/p1010rdb.c > +++ b/arch/powerpc/platforms/85xx/p1010rdb.c > @@ -81,6 +81,13 @@ static void __init p1010_rdb_setup_arch(void) > printk(KERN_INFO "P1010 RDB board from Freescale Semiconductor\n"); > } >=20 > +extern void mpc85xx_clk_init(void); > + > +static void __init p1010_rdb_init(void) { > + mpc85xx_clk_init(); > +} > + > static struct of_device_id __initdata p1010rdb_ids[] =3D { > { .type =3D "soc", }, > { .compatible =3D "soc", }, > @@ -111,6 +118,7 @@ define_machine(p1010_rdb) { > .name =3D "P1010 RDB", > .probe =3D p1010_rdb_probe, > .setup_arch =3D p1010_rdb_setup_arch, > + .init =3D p1010_rdb_init, > .init_IRQ =3D p1010_rdb_pic_init, > #ifdef CONFIG_PCI > .pcibios_fixup_bus =3D fsl_pcibios_fixup_bus, > -- > 1.7.2.1 >=20 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 4/4] [powerpc] Add flexcan device support for p1010rdb. 2011-08-09 14:45 ` U Bhaskar-B22300 @ 2011-08-09 14:55 ` Robin Holt 2011-08-09 15:10 ` Wolfgang Grandegger 2011-08-09 15:11 ` Marc Kleine-Budde 0 siblings, 2 replies; 10+ messages in thread From: Robin Holt @ 2011-08-09 14:55 UTC (permalink / raw) To: U Bhaskar-B22300; +Cc: netdev, socketcan-core, Robin Holt, PPC list On Tue, Aug 09, 2011 at 02:45:58PM +0000, U Bhaskar-B22300 wrote: > Hi Robin, > Where are you doing the irq handling ie request_irq() for the powerpc based P1010. > Or the existing code of ARM based FlexCAN will work for P1010 ?? It appears that the of_device stuff got moved under the struct device and that allows the request_irq() to just magically work. Robin ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 4/4] [powerpc] Add flexcan device support for p1010rdb. 2011-08-09 14:55 ` Robin Holt @ 2011-08-09 15:10 ` Wolfgang Grandegger 2011-08-09 15:11 ` Marc Kleine-Budde 1 sibling, 0 replies; 10+ messages in thread From: Wolfgang Grandegger @ 2011-08-09 15:10 UTC (permalink / raw) To: Robin Holt; +Cc: socketcan-core, U Bhaskar-B22300, PPC list, netdev On 08/09/2011 04:55 PM, Robin Holt wrote: > On Tue, Aug 09, 2011 at 02:45:58PM +0000, U Bhaskar-B22300 wrote: >> Hi Robin, >> Where are you doing the irq handling ie request_irq() for the powerpc based P1010. >> Or the existing code of ARM based FlexCAN will work for P1010 ?? > > It appears that the of_device stuff got moved under the struct device > and that allows the request_irq() to just magically work. Cool! Actually I was also missing of_address_to_resource (or of_iomap) and irq_of_parse_and_map(). But the resources seem to be filled in here: http://lxr.linux.no/#linux+v3.0.1/drivers/of/platform.c#L121 Wolfgang. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 4/4] [powerpc] Add flexcan device support for p1010rdb. 2011-08-09 14:55 ` Robin Holt 2011-08-09 15:10 ` Wolfgang Grandegger @ 2011-08-09 15:11 ` Marc Kleine-Budde 1 sibling, 0 replies; 10+ messages in thread From: Marc Kleine-Budde @ 2011-08-09 15:11 UTC (permalink / raw) To: Robin Holt; +Cc: socketcan-core, netdev, U Bhaskar-B22300, PPC list [-- Attachment #1: Type: text/plain, Size: 718 bytes --] On 08/09/2011 04:55 PM, Robin Holt wrote: > On Tue, Aug 09, 2011 at 02:45:58PM +0000, U Bhaskar-B22300 wrote: >> Hi Robin, >> Where are you doing the irq handling ie request_irq() for the powerpc based P1010. >> Or the existing code of ARM based FlexCAN will work for P1010 ?? > > It appears that the of_device stuff got moved under the struct device > and that allows the request_irq() to just magically work. cool :) Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 262 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-08-09 15:11 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-08-09 12:28 [Patch 0/4] [flexcan/powerpc] Add support for powerpc flexcan (freescale p1010) -V8 Robin Holt 2011-08-09 12:28 ` [PATCH 1/4] [flexcan] Remove #include <mach/clock.h> Robin Holt 2011-08-09 12:28 ` [PATCH 2/4] [flexcan] Abstract off read/write for big/little endian Robin Holt 2011-08-09 12:28 ` [PATCH 3/4] [flexcan] Add of_match to platform_device definition Robin Holt 2011-08-09 12:28 ` [PATCH 4/4] [powerpc] Add flexcan device support for p1010rdb Robin Holt 2011-08-09 13:00 ` Wolfgang Grandegger 2011-08-09 14:45 ` U Bhaskar-B22300 2011-08-09 14:55 ` Robin Holt 2011-08-09 15:10 ` Wolfgang Grandegger 2011-08-09 15:11 ` Marc Kleine-Budde
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).