| Message ID | 1367941941-19152-4-git-send-email-valentin.longchamp@keymile.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Valentin, Nice series! I thought once the mv643xx_eth DT bindings take hold that this was going to be one of the holdovers with a custom board init file. Looks like that won't be the case ;-) On Tue, May 07, 2013 at 05:52:21PM +0200, Valentin Longchamp wrote: > A new clock gating controller is available for the prestera-kw kirkwood > variant. This controller does not enable the unavailable clk gates. > > This patch removes the fixes from the board-km_kirkwood file and enables > the correct clk gating controller for kirkwood-98dx4122.dtsi. > > Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> > --- > arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 7 +++++++ > arch/arm/mach-kirkwood/board-km_kirkwood.c | 15 --------------- > 2 files changed, 7 insertions(+), 15 deletions(-) > > diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi > index 3271e4c..8c73673 100644 > --- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi > +++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi > @@ -27,5 +27,12 @@ > marvell,function = "uart1"; > }; > }; > + > + gate_clk: clock-gating-control@2011c { > + compatible = "marvell,prestera-kw-gating-clock"; > + reg = <0x2011c 0x4>; > + clocks = <&core_clk 0>; > + #clock-cells = <1>; > + }; > }; > }; --->8---- Please split this into two patches, one for the dtsi, and one for code removal. It'll prevent merge conflicts and branch dependencies for us. thx, Jason. > diff --git a/arch/arm/mach-kirkwood/board-km_kirkwood.c b/arch/arm/mach-kirkwood/board-km_kirkwood.c > index 44e4605..f1a6ab7 100644 > --- a/arch/arm/mach-kirkwood/board-km_kirkwood.c > +++ b/arch/arm/mach-kirkwood/board-km_kirkwood.c > @@ -25,20 +25,5 @@ static struct mv643xx_eth_platform_data km_kirkwood_ge00_data = { > > void __init km_kirkwood_init(void) > { > - struct clk *sata_clk; > - /* > - * Our variant of kirkwood (integrated in the Bobcat) hangs on accessing > - * SATA bits (14-15) of the Clock Gating Control Register. Since these > - * devices are also not present in this variant, their clocks get > - * disabled because unused when clk_disable_unused() gets called. > - * That's why we change the flags to these clocks to CLK_IGNORE_UNUSED > - */ > - sata_clk = clk_get_sys("sata_mv.0", "0"); > - if (!IS_ERR(sata_clk)) > - sata_clk->flags |= CLK_IGNORE_UNUSED; > - sata_clk = clk_get_sys("sata_mv.0", "1"); > - if (!IS_ERR(sata_clk)) > - sata_clk->flags |= CLK_IGNORE_UNUSED; > - > kirkwood_ge00_init(&km_kirkwood_ge00_data); > } > -- > 1.8.0.1 >
diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi index 3271e4c..8c73673 100644 --- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi +++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi @@ -27,5 +27,12 @@ marvell,function = "uart1"; }; }; + + gate_clk: clock-gating-control@2011c { + compatible = "marvell,prestera-kw-gating-clock"; + reg = <0x2011c 0x4>; + clocks = <&core_clk 0>; + #clock-cells = <1>; + }; }; }; diff --git a/arch/arm/mach-kirkwood/board-km_kirkwood.c b/arch/arm/mach-kirkwood/board-km_kirkwood.c index 44e4605..f1a6ab7 100644 --- a/arch/arm/mach-kirkwood/board-km_kirkwood.c +++ b/arch/arm/mach-kirkwood/board-km_kirkwood.c @@ -25,20 +25,5 @@ static struct mv643xx_eth_platform_data km_kirkwood_ge00_data = { void __init km_kirkwood_init(void) { - struct clk *sata_clk; - /* - * Our variant of kirkwood (integrated in the Bobcat) hangs on accessing - * SATA bits (14-15) of the Clock Gating Control Register. Since these - * devices are also not present in this variant, their clocks get - * disabled because unused when clk_disable_unused() gets called. - * That's why we change the flags to these clocks to CLK_IGNORE_UNUSED - */ - sata_clk = clk_get_sys("sata_mv.0", "0"); - if (!IS_ERR(sata_clk)) - sata_clk->flags |= CLK_IGNORE_UNUSED; - sata_clk = clk_get_sys("sata_mv.0", "1"); - if (!IS_ERR(sata_clk)) - sata_clk->flags |= CLK_IGNORE_UNUSED; - kirkwood_ge00_init(&km_kirkwood_ge00_data); }
A new clock gating controller is available for the prestera-kw kirkwood variant. This controller does not enable the unavailable clk gates. This patch removes the fixes from the board-km_kirkwood file and enables the correct clk gating controller for kirkwood-98dx4122.dtsi. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> --- arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 7 +++++++ arch/arm/mach-kirkwood/board-km_kirkwood.c | 15 --------------- 2 files changed, 7 insertions(+), 15 deletions(-)