aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorWolfgang Grandegger <wg@denx.de>2010-01-13 20:05:48 -0500
committerDavid S. Miller <davem@davemloft.net>2010-01-15 04:43:30 -0500
commitc5bab5e94d148aee2c852450374143c89aa56511 (patch)
tree79bda2606af8b68d0c2bd010bd1c5f0109d1dde4 /drivers/net/can
parent3a4d5c94e959359ece6d6b55045c3f046677f55c (diff)
can: mscan-mpc5xxx: fix broken support for the MPC5200
Due to an invalid "#ifdef CONFIG_PPC_MPC5200", the real clock setup function was not called for the MPC5200. Signed-off-by: Wolfgang Grandegger <wg@denx.de> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/mscan/mpc5xxx_can.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index f73487f723b8..03e7c48465a2 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -43,7 +43,7 @@ struct mpc5xxx_can_data {
43 int *mscan_clksrc); 43 int *mscan_clksrc);
44}; 44};
45 45
46#ifdef CONFIG_PPC_MPC5200 46#ifdef CONFIG_PPC_MPC52xx
47static struct of_device_id __devinitdata mpc52xx_cdm_ids[] = { 47static struct of_device_id __devinitdata mpc52xx_cdm_ids[] = {
48 { .compatible = "fsl,mpc5200-cdm", }, 48 { .compatible = "fsl,mpc5200-cdm", },
49 {} 49 {}
@@ -84,7 +84,7 @@ static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
84 /* Determine SYS_XTAL_IN frequency from the clock domain settings */ 84 /* Determine SYS_XTAL_IN frequency from the clock domain settings */
85 np_cdm = of_find_matching_node(NULL, mpc52xx_cdm_ids); 85 np_cdm = of_find_matching_node(NULL, mpc52xx_cdm_ids);
86 if (!np_cdm) { 86 if (!np_cdm) {
87 dev_err(&of->dev, "can't get clock node!\n"); 87 dev_err(&ofdev->dev, "can't get clock node!\n");
88 return 0; 88 return 0;
89 } 89 }
90 cdm = of_iomap(np_cdm, 0); 90 cdm = of_iomap(np_cdm, 0);
@@ -101,14 +101,14 @@ static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
101 101
102 return freq; 102 return freq;
103} 103}
104#else /* !CONFIG_PPC_MPC5200 */ 104#else /* !CONFIG_PPC_MPC52xx */
105static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev, 105static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
106 const char *clock_name, 106 const char *clock_name,
107 int *mscan_clksrc) 107 int *mscan_clksrc)
108{ 108{
109 return 0; 109 return 0;
110} 110}
111#endif /* CONFIG_PPC_MPC5200 */ 111#endif /* CONFIG_PPC_MPC52xx */
112 112
113#ifdef CONFIG_PPC_MPC512x 113#ifdef CONFIG_PPC_MPC512x
114struct mpc512x_clockctl { 114struct mpc512x_clockctl {