diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2012-12-07 06:56:56 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-12-10 15:47:30 -0500 |
commit | 5b5ac41447de30cb5ed5e72d3d4e1a9e6e12f640 (patch) | |
tree | 9c5ea531adfad60c873281bea03a9d40e76d406a /drivers/bcma/driver_chipcommon.c | |
parent | 576d28a7c73013717311cfcb514dbcae27c82eeb (diff) |
bcma: unify naming schema for clock functions
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma/driver_chipcommon.c')
-rw-r--r-- | drivers/bcma/driver_chipcommon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c index d017f2512275..dc96dd8ebff2 100644 --- a/drivers/bcma/driver_chipcommon.c +++ b/drivers/bcma/driver_chipcommon.c | |||
@@ -25,10 +25,10 @@ static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset, | |||
25 | return value; | 25 | return value; |
26 | } | 26 | } |
27 | 27 | ||
28 | static u32 bcma_chipco_alp_clock(struct bcma_drv_cc *cc) | 28 | static u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc) |
29 | { | 29 | { |
30 | if (cc->capabilities & BCMA_CC_CAP_PMU) | 30 | if (cc->capabilities & BCMA_CC_CAP_PMU) |
31 | return bcma_pmu_alp_clock(cc); | 31 | return bcma_pmu_get_alp_clock(cc); |
32 | 32 | ||
33 | return 20000000; | 33 | return 20000000; |
34 | } | 34 | } |
@@ -79,12 +79,12 @@ static int bcma_chipco_watchdog_ticks_per_ms(struct bcma_drv_cc *cc) | |||
79 | if (cc->capabilities & BCMA_CC_CAP_PMU) { | 79 | if (cc->capabilities & BCMA_CC_CAP_PMU) { |
80 | if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) | 80 | if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) |
81 | /* 4706 CC and PMU watchdogs are clocked at 1/4 of ALP clock */ | 81 | /* 4706 CC and PMU watchdogs are clocked at 1/4 of ALP clock */ |
82 | return bcma_chipco_alp_clock(cc) / 4000; | 82 | return bcma_chipco_get_alp_clock(cc) / 4000; |
83 | else | 83 | else |
84 | /* based on 32KHz ILP clock */ | 84 | /* based on 32KHz ILP clock */ |
85 | return 32; | 85 | return 32; |
86 | } else { | 86 | } else { |
87 | return bcma_chipco_alp_clock(cc) / 1000; | 87 | return bcma_chipco_get_alp_clock(cc) / 1000; |
88 | } | 88 | } |
89 | } | 89 | } |
90 | 90 | ||
@@ -236,7 +236,7 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc) | |||
236 | struct bcma_serial_port *ports = cc->serial_ports; | 236 | struct bcma_serial_port *ports = cc->serial_ports; |
237 | 237 | ||
238 | if (ccrev >= 11 && ccrev != 15) { | 238 | if (ccrev >= 11 && ccrev != 15) { |
239 | baud_base = bcma_chipco_alp_clock(cc); | 239 | baud_base = bcma_chipco_get_alp_clock(cc); |
240 | if (ccrev >= 21) { | 240 | if (ccrev >= 21) { |
241 | /* Turn off UART clock before switching clocksource. */ | 241 | /* Turn off UART clock before switching clocksource. */ |
242 | bcma_cc_write32(cc, BCMA_CC_CORECTL, | 242 | bcma_cc_write32(cc, BCMA_CC_CORECTL, |