Message ID | 1312945564-6626-5-git-send-email-holt@sgi.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
On 08/10/2011 05:06 AM, 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> > Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>, > Acked-by: 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> > Cc: Kumar Gala <galak@kernel.crashing.org> > --- > arch/powerpc/platforms/85xx/Kconfig | 2 + > arch/powerpc/platforms/85xx/Makefile | 2 + > arch/powerpc/platforms/85xx/clock.c | 53 ++++++++++++++++++++++++++++++++ > arch/powerpc/platforms/85xx/p1010rdb.c | 8 +++++ > 4 files changed, 65 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..16fae04 > --- /dev/null > +++ b/arch/powerpc/platforms/85xx/clock.c > @@ -0,0 +1,53 @@ > +/* > + * Copyright 2011 SGI, inc. > + * > + * This code is licensed for use under the GPL V2 as published by > + * the Free Software Foundation. > + */ > + > +#include <linux/device.h> > +#include <linux/err.h> > +#include <linux/of.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); > + > + if (!dev->of_node || > + !of_device_is_compatible(dev->of_node, "fsl,flexcan")) > + 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; > +} > + git is even picker then me: "new blank line at EOF." please fix > 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, Marc
On Wed, Aug 10, 2011 at 11:56:01AM +0200, Marc Kleine-Budde wrote: > On 08/10/2011 05:06 AM, Robin Holt wrote: > > diff --git a/arch/powerpc/platforms/85xx/clock.c b/arch/powerpc/platforms/85xx/clock.c > > new file mode 100644 > > index 0000000..16fae04 > > --- /dev/null > > +++ b/arch/powerpc/platforms/85xx/clock.c > > @@ -0,0 +1,53 @@ ... > > +void __init mpc85xx_clk_init(void) > > +{ > > + clk_functions = mpc85xx_clk_functions; > > +} > > + > > git is even picker then me: "new blank line at EOF." > please fix That reminded me that I have slacked on using checkpatch.pl in a few resends and it really does not like this patch at all so I will rework the patch with its concerns. I am going to hold off on resending until there are more substantial changes. Thanks, Robin
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..16fae04 --- /dev/null +++ b/arch/powerpc/platforms/85xx/clock.c @@ -0,0 +1,53 @@ +/* + * Copyright 2011 SGI, inc. + * + * This code is licensed for use under the GPL V2 as published by + * the Free Software Foundation. + */ + +#include <linux/device.h> +#include <linux/err.h> +#include <linux/of.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); + + if (!dev->of_node || + !of_device_is_compatible(dev->of_node, "fsl,flexcan")) + 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,