diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-01 12:22:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-01 12:22:47 -0700 |
| commit | 68e952d5f9d145e43cc2c4baedd11fc55e1b7d60 (patch) | |
| tree | bda26d01ac21064e1d88acc98beb455a6d69cb29 /drivers/clk/socfpga/clk.c | |
| parent | 6920a1bd037374a632d585de127b6f945199dcb8 (diff) | |
| parent | 2f9f64bc5aa31836810cd25301aa4772ad73ebab (diff) | |
| download | linux-68e952d5f9d145e43cc2c4baedd11fc55e1b7d60.tar.gz | |
Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
Pull clock subsystem fixes from Mike Turquette.
* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
clk: fixup argument order when setting VCO parameters
clk: socfpga: Fix incorrect sdmmc clock name
clk: armada-370: fix tclk frequencies
clk: nomadik: set all timers to use 2.4 MHz TIMCLK
Diffstat (limited to 'drivers/clk/socfpga/clk.c')
| -rw-r--r-- | drivers/clk/socfpga/clk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c index 5bb848cac6ec..81dd31a686df 100644 --- a/drivers/clk/socfpga/clk.c +++ b/drivers/clk/socfpga/clk.c @@ -49,7 +49,7 @@ #define SOCFPGA_L4_SP_CLK "l4_sp_clk" #define SOCFPGA_NAND_CLK "nand_clk" #define SOCFPGA_NAND_X_CLK "nand_x_clk" -#define SOCFPGA_MMC_CLK "mmc_clk" +#define SOCFPGA_MMC_CLK "sdmmc_clk" #define SOCFPGA_DB_CLK "gpio_db_clk" #define div_mask(width) ((1 << (width)) - 1) |