diff options
Diffstat (limited to 'drivers/clk/tegra/clk-tegra30.c')
| -rw-r--r-- | drivers/clk/tegra/clk-tegra30.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c index 4b9d8bd3d0bf..4b26509fc218 100644 --- a/drivers/clk/tegra/clk-tegra30.c +++ b/drivers/clk/tegra/clk-tegra30.c | |||
| @@ -657,16 +657,16 @@ static struct tegra_devclk devclks[] __initdata = { | |||
| 657 | { .con_id = "fuse_burn", .dev_id = "fuse-tegra", .dt_id = TEGRA30_CLK_FUSE_BURN }, | 657 | { .con_id = "fuse_burn", .dev_id = "fuse-tegra", .dt_id = TEGRA30_CLK_FUSE_BURN }, |
| 658 | { .con_id = "apbif", .dev_id = "tegra30-ahub", .dt_id = TEGRA30_CLK_APBIF }, | 658 | { .con_id = "apbif", .dev_id = "tegra30-ahub", .dt_id = TEGRA30_CLK_APBIF }, |
| 659 | { .con_id = "hda2hdmi", .dev_id = "tegra30-hda", .dt_id = TEGRA30_CLK_HDA2HDMI }, | 659 | { .con_id = "hda2hdmi", .dev_id = "tegra30-hda", .dt_id = TEGRA30_CLK_HDA2HDMI }, |
| 660 | { .dev_id = "tegra-apbdma", .dt_id = TEGRA30_CLK_APBDMA }, | 660 | { .dev_id = "tegra-apbdma", .dt_id = TEGRA30_CLK_APBDMA }, |
| 661 | { .dev_id = "rtc-tegra", .dt_id = TEGRA30_CLK_RTC }, | 661 | { .dev_id = "rtc-tegra", .dt_id = TEGRA30_CLK_RTC }, |
| 662 | { .dev_id = "timer", .dt_id = TEGRA30_CLK_TIMER }, | 662 | { .dev_id = "timer", .dt_id = TEGRA30_CLK_TIMER }, |
| 663 | { .dev_id = "tegra-kbc", .dt_id = TEGRA30_CLK_KBC }, | 663 | { .dev_id = "tegra-kbc", .dt_id = TEGRA30_CLK_KBC }, |
| 664 | { .dev_id = "fsl-tegra-udc", .dt_id = TEGRA30_CLK_USBD }, | 664 | { .dev_id = "fsl-tegra-udc", .dt_id = TEGRA30_CLK_USBD }, |
| 665 | { .dev_id = "tegra-ehci.1", .dt_id = TEGRA30_CLK_USB2 }, | 665 | { .dev_id = "tegra-ehci.1", .dt_id = TEGRA30_CLK_USB2 }, |
| 666 | { .dev_id = "tegra-ehci.2", .dt_id = TEGRA30_CLK_USB2 }, | 666 | { .dev_id = "tegra-ehci.2", .dt_id = TEGRA30_CLK_USB2 }, |
| 667 | { .dev_id = "kfuse-tegra", .dt_id = TEGRA30_CLK_KFUSE }, | 667 | { .dev_id = "kfuse-tegra", .dt_id = TEGRA30_CLK_KFUSE }, |
| 668 | { .dev_id = "tegra_sata_cold", .dt_id = TEGRA30_CLK_SATA_COLD }, | 668 | { .dev_id = "tegra_sata_cold", .dt_id = TEGRA30_CLK_SATA_COLD }, |
| 669 | { .dev_id = "dtv", .dt_id = TEGRA30_CLK_DTV }, | 669 | { .dev_id = "dtv", .dt_id = TEGRA30_CLK_DTV }, |
| 670 | { .dev_id = "tegra30-i2s.0", .dt_id = TEGRA30_CLK_I2S0 }, | 670 | { .dev_id = "tegra30-i2s.0", .dt_id = TEGRA30_CLK_I2S0 }, |
| 671 | { .dev_id = "tegra30-i2s.1", .dt_id = TEGRA30_CLK_I2S1 }, | 671 | { .dev_id = "tegra30-i2s.1", .dt_id = TEGRA30_CLK_I2S1 }, |
| 672 | { .dev_id = "tegra30-i2s.2", .dt_id = TEGRA30_CLK_I2S2 }, | 672 | { .dev_id = "tegra30-i2s.2", .dt_id = TEGRA30_CLK_I2S2 }, |
| @@ -1434,7 +1434,8 @@ static void __init tegra30_clock_init(struct device_node *np) | |||
| 1434 | return; | 1434 | return; |
| 1435 | 1435 | ||
| 1436 | if (tegra_osc_clk_init(clk_base, tegra30_clks, tegra30_input_freq, | 1436 | if (tegra_osc_clk_init(clk_base, tegra30_clks, tegra30_input_freq, |
| 1437 | ARRAY_SIZE(tegra30_input_freq), &input_freq, NULL) < 0) | 1437 | ARRAY_SIZE(tegra30_input_freq), 1, &input_freq, |
| 1438 | NULL) < 0) | ||
| 1438 | return; | 1439 | return; |
| 1439 | 1440 | ||
| 1440 | 1441 | ||
