Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1244394 > unrolled thread

[PATCH 0/5] fix sdhci-pxav3 clock name and berlin clk clean up

Started byJisheng Zhang <jszhang@marvell.com>
First post2015-10-12 08:00 +0200
Last post2015-10-16 15:30 +0200
Articles 5 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/5] fix sdhci-pxav3 clock name and berlin clk clean up Jisheng Zhang <jszhang@marvell.com> - 2015-10-12 08:00 +0200
    [PATCH 2/5] ARM: dts: berlin: correct BG2Q's sdhci2 axi clock Jisheng Zhang <jszhang@marvell.com> - 2015-10-12 08:00 +0200
    [PATCH 4/5] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk Jisheng Zhang <jszhang@marvell.com> - 2015-10-12 08:00 +0200
      Re: [PATCH 4/5] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk Michael Turquette <mturquette@baylibre.com> - 2015-10-16 14:50 +0200
        Re: [PATCH 4/5] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for  sdio clk Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> - 2015-10-16 15:30 +0200

#1244394 — [PATCH 0/5] fix sdhci-pxav3 clock name and berlin clk clean up

FromJisheng Zhang <jszhang@marvell.com>
Date2015-10-12 08:00 +0200
Subject[PATCH 0/5] fix sdhci-pxav3 clock name and berlin clk clean up
Message-ID<qiEjo-6Ib-3@gated-at.bofh.it>
The sdhci-pxav3's clock name isn't correct. The current "io" clock is really
the PXAv3 SDHCI IP's "core" clock which is manadatory. The current "core"
clock is really the IP's "axi" clock which is optional. We fix this in patch1.

The following patches add the axi clock properties to bg2q dtsi, then remove
the CLK_IGNORE_UNUSED flag for sdio clk(s).

Jisheng Zhang (5):
  mmc: sdhci-pxav3: fix optional clock name
  ARM: dts: berlin: correct BG2Q's sdhci2 axi clock
  ARM: dts: berlin: add axi clock for BG2Q sdhci0 and sdhci1
  clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk
  clk: berlin: bg2: remove CLK_IGNORE_UNUSED flag for sdio clk

 .../devicetree/bindings/mmc/sdhci-pxa.txt          |  8 ++---
 arch/arm/boot/dts/berlin2.dtsi                     |  6 ++--
 arch/arm/boot/dts/berlin2cd.dtsi                   |  2 +-
 arch/arm/boot/dts/berlin2q.dtsi                    | 10 +++---
 drivers/clk/berlin/bg2.c                           |  4 +--
 drivers/clk/berlin/bg2q.c                          |  2 +-
 drivers/mmc/host/sdhci-pxav3.c                     | 40 +++++++++++-----------
 7 files changed, 37 insertions(+), 35 deletions(-)

-- 
2.6.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1244395 — [PATCH 2/5] ARM: dts: berlin: correct BG2Q's sdhci2 axi clock

FromJisheng Zhang <jszhang@marvell.com>
Date2015-10-12 08:00 +0200
Subject[PATCH 2/5] ARM: dts: berlin: correct BG2Q's sdhci2 axi clock
Message-ID<qiEjp-6Ib-17@gated-at.bofh.it>
In reply to#1244394
The optional axi clock is CLKID_SDIO.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
 arch/arm/boot/dts/berlin2q.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 4ad585c..2f12048 100644
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -119,7 +119,7 @@
 			compatible = "mrvl,pxav3-mmc";
 			reg = <0xab1000 0x200>;
 			interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&chip_clk CLKID_NFC_ECC>, <&chip_clk CLKID_NFC>;
+			clocks = <&chip_clk CLKID_NFC_ECC>, <&chip_clk CLKID_SDIO>;
 			clock-names = "core", "axi";
 			status = "disabled";
 		};
-- 
2.6.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1244398 — [PATCH 4/5] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk

FromJisheng Zhang <jszhang@marvell.com>
Date2015-10-12 08:00 +0200
Subject[PATCH 4/5] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk
Message-ID<qiEjp-6Ib-15@gated-at.bofh.it>
In reply to#1244394
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(-)

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1248710 — Re: [PATCH 4/5] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk

FromMichael Turquette <mturquette@baylibre.com>
Date2015-10-16 14:50 +0200
SubjectRe: [PATCH 4/5] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk
Message-ID<qkcCm-6zl-13@gated-at.bofh.it>
In reply to#1244398
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
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1248753 — Re: [PATCH 4/5] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk

FromSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Date2015-10-16 15:30 +0200
SubjectRe: [PATCH 4/5] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk
Message-ID<qkdf4-7zE-25@gated-at.bofh.it>
In reply to#1248710
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
>>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web