Skip to content

Commit 5bf7f4a

Browse files
codrin989bebarino
authored andcommitted
clk: at91: sam9x60: Don't use audio PLL
On sam9x60, there is not audio PLL and so I2S and classD have to use one of the best matching parents for their generated clock. Fixes: 01e2113 ("clk: at91: add sam9x60 pmc driver") Signed-off-by: Codrin Ciubotariu <[email protected]> Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Stephen Boyd <[email protected]>
1 parent bb6d3fb commit 5bf7f4a

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

drivers/clk/at91/sam9x60.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ static const struct {
124124
char *n;
125125
u8 id;
126126
struct clk_range r;
127-
bool pll;
128127
} sam9x60_gck[] = {
129128
{ .n = "flex0_gclk", .id = 5, },
130129
{ .n = "flex1_gclk", .id = 6, },
@@ -144,11 +143,9 @@ static const struct {
144143
{ .n = "sdmmc1_gclk", .id = 26, .r = { .min = 0, .max = 105000000 }, },
145144
{ .n = "flex11_gclk", .id = 32, },
146145
{ .n = "flex12_gclk", .id = 33, },
147-
{ .n = "i2s_gclk", .id = 34, .r = { .min = 0, .max = 105000000 },
148-
.pll = true, },
146+
{ .n = "i2s_gclk", .id = 34, .r = { .min = 0, .max = 105000000 }, },
149147
{ .n = "pit64b_gclk", .id = 37, },
150-
{ .n = "classd_gclk", .id = 42, .r = { .min = 0, .max = 100000000 },
151-
.pll = true, },
148+
{ .n = "classd_gclk", .id = 42, .r = { .min = 0, .max = 100000000 }, },
152149
{ .n = "tcb1_gclk", .id = 45, },
153150
{ .n = "dbgu_gclk", .id = 47, },
154151
};
@@ -290,7 +287,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np)
290287
sam9x60_gck[i].n,
291288
parent_names, 6,
292289
sam9x60_gck[i].id,
293-
sam9x60_gck[i].pll,
290+
false,
294291
&sam9x60_gck[i].r);
295292
if (IS_ERR(hw))
296293
goto err_free;

0 commit comments

Comments
 (0)