From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/5] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk
Date: Fri, 16 Oct 2015 15:27:14 +0200 [thread overview]
Message-ID: <5620FB32.8030705@gmail.com> (raw)
In-Reply-To: <20151016124705.20687.51712@quantum>
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
>>
next prev parent reply other threads:[~2015-10-16 13:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-12 5:46 [PATCH 0/5] fix sdhci-pxav3 clock name and berlin clk clean up Jisheng Zhang
2015-10-12 5:46 ` [PATCH 1/5] mmc: sdhci-pxav3: fix optional clock name Jisheng Zhang
2015-10-15 21:41 ` Sebastian Hesselbarth
2015-10-16 11:40 ` Jisheng Zhang
2015-10-16 19:58 ` Sebastian Hesselbarth
2015-10-12 5:46 ` [PATCH 2/5] ARM: dts: berlin: correct BG2Q's sdhci2 axi clock Jisheng Zhang
2015-10-12 5:46 ` [PATCH 3/5] ARM: dts: berlin: add axi clock for BG2Q sdhci0 and sdhci1 Jisheng Zhang
2015-10-12 5:46 ` [PATCH 4/5] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk Jisheng Zhang
2015-10-16 12:47 ` Michael Turquette
2015-10-16 13:27 ` Sebastian Hesselbarth [this message]
2015-10-12 5:46 ` [PATCH 5/5] clk: berlin: bg2: " Jisheng Zhang
2015-10-16 12:47 ` Michael Turquette
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5620FB32.8030705@gmail.com \
--to=sebastian.hesselbarth@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).