| Message ID | 1444628796-5484-5-git-send-email-jszhang@marvell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Jisheng Zhang (2015-10-11 22:46:35) > Since we have added the necessary axi clk properties in dts, we can > remove the "sdio" clk's CLK_IGNORE_UNUSED flag now. > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Applied to clk-next. Regards, Mike > --- > drivers/clk/berlin/bg2q.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clk/berlin/bg2q.c b/drivers/clk/berlin/bg2q.c > index 221f40c..243f421 100644 > --- a/drivers/clk/berlin/bg2q.c > +++ b/drivers/clk/berlin/bg2q.c > @@ -283,7 +283,7 @@ static const struct berlin2_gate_data bg2q_gates[] __initconst = { > { "usb2", "perif", 13 }, > { "usb3", "perif", 14 }, > { "pbridge", "perif", 15, CLK_IGNORE_UNUSED }, > - { "sdio", "perif", 16, CLK_IGNORE_UNUSED }, > + { "sdio", "perif", 16 }, > { "nfc", "perif", 18 }, > { "pcie", "perif", 22 }, > }; > -- > 2.6.1 >
On 16.10.2015 14:47, Michael Turquette wrote: > Quoting Jisheng Zhang (2015-10-11 22:46:35) >> Since we have added the necessary axi clk properties in dts, we can >> remove the "sdio" clk's CLK_IGNORE_UNUSED flag now. >> >> Signed-off-by: Jisheng Zhang <jszhang@marvell.com> > > Applied to clk-next. Mike, these two patches will break Berlin SoCs if not applied after the sdhci and DT changes went in. Please hold them back until the discussion has been settled. Thanks, Sebastian > >> --- >> drivers/clk/berlin/bg2q.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/clk/berlin/bg2q.c b/drivers/clk/berlin/bg2q.c >> index 221f40c..243f421 100644 >> --- a/drivers/clk/berlin/bg2q.c >> +++ b/drivers/clk/berlin/bg2q.c >> @@ -283,7 +283,7 @@ static const struct berlin2_gate_data bg2q_gates[] __initconst = { >> { "usb2", "perif", 13 }, >> { "usb3", "perif", 14 }, >> { "pbridge", "perif", 15, CLK_IGNORE_UNUSED }, >> - { "sdio", "perif", 16, CLK_IGNORE_UNUSED }, >> + { "sdio", "perif", 16 }, >> { "nfc", "perif", 18 }, >> { "pcie", "perif", 22 }, >> }; >> -- >> 2.6.1 >>
diff --git a/drivers/clk/berlin/bg2q.c b/drivers/clk/berlin/bg2q.c index 221f40c..243f421 100644 --- a/drivers/clk/berlin/bg2q.c +++ b/drivers/clk/berlin/bg2q.c @@ -283,7 +283,7 @@ static const struct berlin2_gate_data bg2q_gates[] __initconst = { { "usb2", "perif", 13 }, { "usb3", "perif", 14 }, { "pbridge", "perif", 15, CLK_IGNORE_UNUSED }, - { "sdio", "perif", 16, CLK_IGNORE_UNUSED }, + { "sdio", "perif", 16 }, { "nfc", "perif", 18 }, { "pcie", "perif", 22 }, };
Since we have added the necessary axi clk properties in dts, we can remove the "sdio" clk's CLK_IGNORE_UNUSED flag now. Signed-off-by: Jisheng Zhang <jszhang@marvell.com> --- drivers/clk/berlin/bg2q.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)