| Message ID | 1444628796-5484-6-git-send-email-jszhang@marvell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Jisheng Zhang (2015-10-11 22:46:36) > The axi clock properties already exists, so there's no need to set this > flag for sdio0 and sdio1 clk any more. > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Applied to clk-next. Regards, Mike > --- > drivers/clk/berlin/bg2.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/berlin/bg2.c b/drivers/clk/berlin/bg2.c > index 73153fc..23e0e3b 100644 > --- a/drivers/clk/berlin/bg2.c > +++ b/drivers/clk/berlin/bg2.c > @@ -490,8 +490,8 @@ static const struct berlin2_gate_data bg2_gates[] __initconst = { > { "usb0", "perif", 11 }, > { "usb1", "perif", 12 }, > { "pbridge", "perif", 13, CLK_IGNORE_UNUSED }, > - { "sdio0", "perif", 14, CLK_IGNORE_UNUSED }, > - { "sdio1", "perif", 15, CLK_IGNORE_UNUSED }, > + { "sdio0", "perif", 14 }, > + { "sdio1", "perif", 15 }, > { "nfc", "perif", 17 }, > { "smemc", "perif", 19 }, > { "audiohd", "audiohd_pll", 26 }, > -- > 2.6.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/clk/berlin/bg2.c b/drivers/clk/berlin/bg2.c index 73153fc..23e0e3b 100644 --- a/drivers/clk/berlin/bg2.c +++ b/drivers/clk/berlin/bg2.c @@ -490,8 +490,8 @@ static const struct berlin2_gate_data bg2_gates[] __initconst = { { "usb0", "perif", 11 }, { "usb1", "perif", 12 }, { "pbridge", "perif", 13, CLK_IGNORE_UNUSED }, - { "sdio0", "perif", 14, CLK_IGNORE_UNUSED }, - { "sdio1", "perif", 15, CLK_IGNORE_UNUSED }, + { "sdio0", "perif", 14 }, + { "sdio1", "perif", 15 }, { "nfc", "perif", 17 }, { "smemc", "perif", 19 }, { "audiohd", "audiohd_pll", 26 },
The axi clock properties already exists, so there's no need to set this flag for sdio0 and sdio1 clk any more. Signed-off-by: Jisheng Zhang <jszhang@marvell.com> --- drivers/clk/berlin/bg2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)