Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 91588
b: refs/heads/master
c: 7f0a6fc
h: refs/heads/master
v: v3
  • Loading branch information
Anton Vorontsov authored and Kumar Gala committed Apr 17, 2008
1 parent c9488ee commit 4cc17a1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ab1220d5ac69bd3327305c4d367548221f2bc3b4
refs/heads/master: 7f0a6fc81213b957714dfd2a49a28b110283ecc8
5 changes: 3 additions & 2 deletions trunk/arch/powerpc/sysdev/qe_lib/qe.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ EXPORT_SYMBOL(qe_issue_cmd);
*/
static unsigned int brg_clk = 0;

unsigned int get_brg_clk(void)
unsigned int qe_get_brg_clk(void)
{
struct device_node *qe;
unsigned int size;
Expand All @@ -180,6 +180,7 @@ unsigned int get_brg_clk(void)

return brg_clk;
}
EXPORT_SYMBOL(qe_get_brg_clk);

/* Program the BRG to the given sampling rate and multiplier
*
Expand All @@ -197,7 +198,7 @@ int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier)
if ((brg < QE_BRG1) || (brg > QE_BRG16))
return -EINVAL;

divisor = get_brg_clk() / (rate * multiplier);
divisor = qe_get_brg_clk() / (rate * multiplier);

if (divisor > QE_BRGC_DIVISOR_MAX + 1) {
div16 = QE_BRGC_DIV16;
Expand Down
1 change: 1 addition & 0 deletions trunk/include/asm-powerpc/qe.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ extern int par_io_data_set(u8 port, u8 pin, u8 val);
/* QE internal API */
int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input);
enum qe_clock qe_clock_source(const char *source);
unsigned int qe_get_brg_clk(void);
int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier);
int qe_get_snum(void);
void qe_put_snum(u8 snum);
Expand Down

0 comments on commit 4cc17a1

Please sign in to comment.