From patchwork Tue Aug 9 12:28:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: holt@sgi.com X-Patchwork-Id: 109204 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1D36BB73BC for ; Tue, 9 Aug 2011 22:28:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753430Ab1HIM2m (ORCPT ); Tue, 9 Aug 2011 08:28:42 -0400 Received: from relay3.sgi.com ([192.48.152.1]:50497 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753306Ab1HIM2k (ORCPT ); Tue, 9 Aug 2011 08:28:40 -0400 Received: from gulag1.americas.sgi.com (gulag1.americas.sgi.com [128.162.236.41]) by relay3.corp.sgi.com (Postfix) with ESMTP id 04874AC00A; Tue, 9 Aug 2011 05:28:40 -0700 (PDT) Received: by gulag1.americas.sgi.com (Postfix, from userid 1641) id B55B81056EB04; Tue, 9 Aug 2011 07:28:39 -0500 (CDT) From: Robin Holt 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. Date: Tue, 9 Aug 2011 07:28:27 -0500 Message-Id: <1312892907-20419-5-git-send-email-holt@sgi.com> X-Mailer: git-send-email 1.7.2.1 In-Reply-To: <1312892907-20419-1-git-send-email-holt@sgi.com> References: <1312892907-20419-1-git-send-email-holt@sgi.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 To: Marc Kleine-Budde , To: Wolfgang Grandegger , To: U Bhaskar-B22300 Cc: socketcan-core@lists.berlios.de, Cc: netdev@vger.kernel.org, Cc: PPC list --- 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 +#include + +#include + +#include + +/* + * 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,