* [PATCH v2 1/4] ARM: dts: berlin: correct BG2Q's sdhci2 2nd clock
2015-10-20 11:16 [PATCH v2 0/4] berlin sdhci clock clean up Jisheng Zhang
@ 2015-10-20 11:16 ` Jisheng Zhang
2015-10-20 11:16 ` [PATCH v2 2/4] ARM: dts: berlin: add 2nd clock for BG2Q sdhci0 and sdhci1 Jisheng Zhang
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Jisheng Zhang @ 2015-10-20 11:16 UTC (permalink / raw)
To: linux-arm-kernel
The optional 2nd 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 63a4849..2cb07fa 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 = "io", "core";
status = "disabled";
};
--
2.6.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 2/4] ARM: dts: berlin: add 2nd clock for BG2Q sdhci0 and sdhci1
2015-10-20 11:16 [PATCH v2 0/4] berlin sdhci clock clean up Jisheng Zhang
2015-10-20 11:16 ` [PATCH v2 1/4] ARM: dts: berlin: correct BG2Q's sdhci2 2nd clock Jisheng Zhang
@ 2015-10-20 11:16 ` Jisheng Zhang
2015-10-20 11:16 ` [PATCH v2 3/4] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk Jisheng Zhang
2015-10-20 11:16 ` [PATCH v2 4/4] clk: berlin: bg2: " Jisheng Zhang
3 siblings, 0 replies; 9+ messages in thread
From: Jisheng Zhang @ 2015-10-20 11:16 UTC (permalink / raw)
To: linux-arm-kernel
Add the optional 2nd clock for BG2Q's sdhci0 and sdhci1. This would let the
clock be disabled during runtime pm, so saves power a bit.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
arch/arm/boot/dts/berlin2q.dtsi | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 2cb07fa..71b5d5e 100644
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -102,7 +102,8 @@
sdhci0: sdhci at ab0000 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab0000 0x200>;
- clocks = <&chip_clk CLKID_SDIO1XIN>;
+ clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO>;
+ clock-names = "io", "core";
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
@@ -110,7 +111,8 @@
sdhci1: sdhci at ab0800 {
compatible = "mrvl,pxav3-mmc";
reg = <0xab0800 0x200>;
- clocks = <&chip_clk CLKID_SDIO1XIN>;
+ clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO>;
+ clock-names = "io", "core";
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
--
2.6.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 3/4] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk
2015-10-20 11:16 [PATCH v2 0/4] berlin sdhci clock clean up Jisheng Zhang
2015-10-20 11:16 ` [PATCH v2 1/4] ARM: dts: berlin: correct BG2Q's sdhci2 2nd clock Jisheng Zhang
2015-10-20 11:16 ` [PATCH v2 2/4] ARM: dts: berlin: add 2nd clock for BG2Q sdhci0 and sdhci1 Jisheng Zhang
@ 2015-10-20 11:16 ` Jisheng Zhang
2015-10-21 9:30 ` Michael Turquette
2015-10-20 11:16 ` [PATCH v2 4/4] clk: berlin: bg2: " Jisheng Zhang
3 siblings, 1 reply; 9+ messages in thread
From: Jisheng Zhang @ 2015-10-20 11:16 UTC (permalink / raw)
To: linux-arm-kernel
Since we have added the necessary two clks' 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
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 3/4] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk
2015-10-20 11:16 ` [PATCH v2 3/4] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk Jisheng Zhang
@ 2015-10-21 9:30 ` Michael Turquette
2015-10-21 9:54 ` Michael Turquette
0 siblings, 1 reply; 9+ messages in thread
From: Michael Turquette @ 2015-10-21 9:30 UTC (permalink / raw)
To: linux-arm-kernel
Quoting Jisheng Zhang (2015-10-20 04:16:46)
> Since we have added the necessary two clks' 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
>
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2 3/4] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk
2015-10-21 9:30 ` Michael Turquette
@ 2015-10-21 9:54 ` Michael Turquette
2015-10-21 10:08 ` Jisheng Zhang
0 siblings, 1 reply; 9+ messages in thread
From: Michael Turquette @ 2015-10-21 9:54 UTC (permalink / raw)
To: linux-arm-kernel
Quoting Michael Turquette (2015-10-21 02:30:39)
> Quoting Jisheng Zhang (2015-10-20 04:16:46)
> > Since we have added the necessary two clks' 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.
So the sdhci change was dropped from v2. Do you want me to Ack these
instead so you can send them all together?
Regards,
Mike
>
> 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
> >
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2 3/4] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk
2015-10-21 9:54 ` Michael Turquette
@ 2015-10-21 10:08 ` Jisheng Zhang
0 siblings, 0 replies; 9+ messages in thread
From: Jisheng Zhang @ 2015-10-21 10:08 UTC (permalink / raw)
To: linux-arm-kernel
Dear Michael,
On Wed, 21 Oct 2015 02:54:54 -0700
Michael Turquette <mturquette@baylibre.com> wrote:
> Quoting Michael Turquette (2015-10-21 02:30:39)
> > Quoting Jisheng Zhang (2015-10-20 04:16:46)
> > > Since we have added the necessary two clks' 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.
>
> So the sdhci change was dropped from v2. Do you want me to Ack these
> instead so you can send them all together?
I'll send another patch to for the sdhci change. it doesn't matter even the
sdhci change delay a merge window because no functionality changes in the
sdhci commit.
It's better we firstly take these clk clean ups because it saves power a bit
and clean up the CLK_IGNORE_UNUSED flag.
Hi Sebastian,
What do you think?
Thanks,
Jisheng
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 4/4] clk: berlin: bg2: remove CLK_IGNORE_UNUSED flag for sdio clk
2015-10-20 11:16 [PATCH v2 0/4] berlin sdhci clock clean up Jisheng Zhang
` (2 preceding siblings ...)
2015-10-20 11:16 ` [PATCH v2 3/4] clk: berlin: bg2q: remove CLK_IGNORE_UNUSED flag for sdio clk Jisheng Zhang
@ 2015-10-20 11:16 ` Jisheng Zhang
2015-10-21 9:30 ` Michael Turquette
3 siblings, 1 reply; 9+ messages in thread
From: Jisheng Zhang @ 2015-10-20 11:16 UTC (permalink / raw)
To: linux-arm-kernel
The clocks' properties have been already properly set, 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(-)
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
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 4/4] clk: berlin: bg2: remove CLK_IGNORE_UNUSED flag for sdio clk
2015-10-20 11:16 ` [PATCH v2 4/4] clk: berlin: bg2: " Jisheng Zhang
@ 2015-10-21 9:30 ` Michael Turquette
0 siblings, 0 replies; 9+ messages in thread
From: Michael Turquette @ 2015-10-21 9:30 UTC (permalink / raw)
To: linux-arm-kernel
Quoting Jisheng Zhang (2015-10-20 04:16:47)
> The clocks' properties have been already properly set, 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
>
^ permalink raw reply [flat|nested] 9+ messages in thread