From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.rutland@arm.com (Mark Rutland) Date: Mon, 14 Sep 2015 15:19:21 +0100 Subject: [PATCH] clk: rockchip: add critical clock for rk3368 In-Reply-To: <5267432.TORlj1Iv40@diego> References: <5267432.TORlj1Iv40@diego> Message-ID: <20150914141920.GF7002@leverpostej> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Sun, Sep 13, 2015 at 12:20:36PM +0100, Heiko St?bner wrote: > Again a result of the gpio-clock-liberation the rk3368 needs the > pclk_pd_pmu marked as critical, to boot successfully. > > Reported-by: Mark Rutland > Signed-off-by: Heiko Stuebner FWIW: Tested-by: Mark Rutland I'm surprised that we don't describe these as critical in the DT, given that this isn't really an internal property of the clock controller, but rather what happens to be attached to it. That ship appears to have sailed, however. Thanks, Mark. > --- > should go on top of clk-fixes. Sorry only finding these piece > by piece :-) . > > drivers/clk/rockchip/clk-rk3368.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/clk/rockchip/clk-rk3368.c b/drivers/clk/rockchip/clk-rk3368.c > index 9c5d61e..7e6b783 100644 > --- a/drivers/clk/rockchip/clk-rk3368.c > +++ b/drivers/clk/rockchip/clk-rk3368.c > @@ -818,6 +818,10 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = { > GATE(0, "sclk_timer00", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 0, GFLAGS), > }; > > +static const char *const rk3368_critical_clocks[] __initconst = { > + "pclk_pd_pmu", > +}; > + > static void __init rk3368_clk_init(struct device_node *np) > { > void __iomem *reg_base; > @@ -862,6 +866,8 @@ static void __init rk3368_clk_init(struct device_node *np) > RK3368_GRF_SOC_STATUS0); > rockchip_clk_register_branches(rk3368_clk_branches, > ARRAY_SIZE(rk3368_clk_branches)); > + rockchip_clk_protect_critical(rk3368_critical_clocks, > + ARRAY_SIZE(rk3368_critical_clocks)); > > rockchip_clk_register_armclk(ARMCLKB, "armclkb", > mux_armclkb_p, ARRAY_SIZE(mux_armclkb_p), > -- > 2.5.1 > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 14 Sep 2015 15:19:21 +0100 From: Mark Rutland To: Heiko =?utf-8?Q?St=C3=BCbner?= Subject: Re: [PATCH] clk: rockchip: add critical clock for rk3368 Message-ID: <20150914141920.GF7002@leverpostej> References: <5267432.TORlj1Iv40@diego> MIME-Version: 1.0 In-Reply-To: <5267432.TORlj1Iv40@diego> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "linux-rockchip@lists.infradead.org" , "mturquette@baylibre.com" , "sboyd@codeaurora.org" , "linux-clk@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset="utf-8" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+mturquette=linaro.org@lists.infradead.org List-ID: T24gU3VuLCBTZXAgMTMsIDIwMTUgYXQgMTI6MjA6MzZQTSArMDEwMCwgSGVpa28gU3TDvGJuZXIg d3JvdGU6Cj4gQWdhaW4gYSByZXN1bHQgb2YgdGhlIGdwaW8tY2xvY2stbGliZXJhdGlvbiB0aGUg cmszMzY4IG5lZWRzIHRoZQo+IHBjbGtfcGRfcG11IG1hcmtlZCBhcyBjcml0aWNhbCwgdG8gYm9v dCBzdWNjZXNzZnVsbHkuCj4gCj4gUmVwb3J0ZWQtYnk6IE1hcmsgUnV0bGFuZCA8bWFyay5ydXRs YW5kQGFybS5jb20+Cj4gU2lnbmVkLW9mZi1ieTogSGVpa28gU3R1ZWJuZXIgPGhlaWtvQHNudGVj aC5kZT4KCkZXSVc6IFRlc3RlZC1ieTogTWFyayBSdXRsYW5kIDxtYXJrLnJ1dGxhbmRAYXJtLmNv bT4KCkknbSBzdXJwcmlzZWQgdGhhdCB3ZSBkb24ndCBkZXNjcmliZSB0aGVzZSBhcyBjcml0aWNh bCBpbiB0aGUgRFQsIGdpdmVuCnRoYXQgdGhpcyBpc24ndCByZWFsbHkgYW4gaW50ZXJuYWwgcHJv cGVydHkgb2YgdGhlIGNsb2NrIGNvbnRyb2xsZXIsIGJ1dApyYXRoZXIgd2hhdCBoYXBwZW5zIHRv IGJlIGF0dGFjaGVkIHRvIGl0LiBUaGF0IHNoaXAgYXBwZWFycyB0byBoYXZlCnNhaWxlZCwgaG93 ZXZlci4KClRoYW5rcywKTWFyay4KCj4gLS0tCj4gc2hvdWxkIGdvIG9uIHRvcCBvZiBjbGstZml4 ZXMuIFNvcnJ5IG9ubHkgZmluZGluZyB0aGVzZSBwaWVjZQo+IGJ5IHBpZWNlIDotKSAuCj4gCj4g IGRyaXZlcnMvY2xrL3JvY2tjaGlwL2Nsay1yazMzNjguYyB8IDYgKysrKysrCj4gIDEgZmlsZSBj aGFuZ2VkLCA2IGluc2VydGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9jbGsvcm9j a2NoaXAvY2xrLXJrMzM2OC5jIGIvZHJpdmVycy9jbGsvcm9ja2NoaXAvY2xrLXJrMzM2OC5jCj4g aW5kZXggOWM1ZDYxZS4uN2U2Yjc4MyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2Nsay9yb2NrY2hp cC9jbGstcmszMzY4LmMKPiArKysgYi9kcml2ZXJzL2Nsay9yb2NrY2hpcC9jbGstcmszMzY4LmMK PiBAQCAtODE4LDYgKzgxOCwxMCBAQCBzdGF0aWMgc3RydWN0IHJvY2tjaGlwX2Nsa19icmFuY2gg cmszMzY4X2Nsa19icmFuY2hlc1tdIF9faW5pdGRhdGEgPSB7Cj4gIAlHQVRFKDAsICJzY2xrX3Rp bWVyMDAiLCAieGluMjRtIiwgQ0xLX0lHTk9SRV9VTlVTRUQsIFJLMzM2OF9DTEtHQVRFX0NPTigy NCksIDAsIEdGTEFHUyksCj4gIH07Cj4gIAo+ICtzdGF0aWMgY29uc3QgY2hhciAqY29uc3Qgcmsz MzY4X2NyaXRpY2FsX2Nsb2Nrc1tdIF9faW5pdGNvbnN0ID0gewo+ICsJInBjbGtfcGRfcG11IiwK PiArfTsKPiArCj4gIHN0YXRpYyB2b2lkIF9faW5pdCByazMzNjhfY2xrX2luaXQoc3RydWN0IGRl dmljZV9ub2RlICpucCkKPiAgewo+ICAJdm9pZCBfX2lvbWVtICpyZWdfYmFzZTsKPiBAQCAtODYy LDYgKzg2Niw4IEBAIHN0YXRpYyB2b2lkIF9faW5pdCByazMzNjhfY2xrX2luaXQoc3RydWN0IGRl dmljZV9ub2RlICpucCkKPiAgCQkJCSAgIFJLMzM2OF9HUkZfU09DX1NUQVRVUzApOwo+ICAJcm9j a2NoaXBfY2xrX3JlZ2lzdGVyX2JyYW5jaGVzKHJrMzM2OF9jbGtfYnJhbmNoZXMsCj4gIAkJCQkg IEFSUkFZX1NJWkUocmszMzY4X2Nsa19icmFuY2hlcykpOwo+ICsJcm9ja2NoaXBfY2xrX3Byb3Rl Y3RfY3JpdGljYWwocmszMzY4X2NyaXRpY2FsX2Nsb2NrcywKPiArCQkJCSAgICAgIEFSUkFZX1NJ WkUocmszMzY4X2NyaXRpY2FsX2Nsb2NrcykpOwo+ICAKPiAgCXJvY2tjaGlwX2Nsa19yZWdpc3Rl cl9hcm1jbGsoQVJNQ0xLQiwgImFybWNsa2IiLAo+ICAJCQltdXhfYXJtY2xrYl9wLCBBUlJBWV9T SVpFKG11eF9hcm1jbGtiX3ApLAo+IC0tIAo+IDIuNS4xCj4gCj4gCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcg bGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmlu ZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Rutland Subject: Re: [PATCH] clk: rockchip: add critical clock for rk3368 Date: Mon, 14 Sep 2015 15:19:21 +0100 Message-ID: <20150914141920.GF7002@leverpostej> References: <5267432.TORlj1Iv40@diego> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <5267432.TORlj1Iv40@diego> Sender: linux-clk-owner@vger.kernel.org To: Heiko =?utf-8?Q?St=C3=BCbner?= Cc: "mturquette@baylibre.com" , "sboyd@codeaurora.org" , "linux-clk@vger.kernel.org" , "linux-rockchip@lists.infradead.org" , "linux-arm-kernel@lists.infradead.org" List-Id: linux-rockchip.vger.kernel.org On Sun, Sep 13, 2015 at 12:20:36PM +0100, Heiko St=C3=BCbner wrote: > Again a result of the gpio-clock-liberation the rk3368 needs the > pclk_pd_pmu marked as critical, to boot successfully. >=20 > Reported-by: Mark Rutland > Signed-off-by: Heiko Stuebner =46WIW: Tested-by: Mark Rutland I'm surprised that we don't describe these as critical in the DT, given that this isn't really an internal property of the clock controller, bu= t rather what happens to be attached to it. That ship appears to have sailed, however. Thanks, Mark. > --- > should go on top of clk-fixes. Sorry only finding these piece > by piece :-) . >=20 > drivers/clk/rockchip/clk-rk3368.c | 6 ++++++ > 1 file changed, 6 insertions(+) >=20 > diff --git a/drivers/clk/rockchip/clk-rk3368.c b/drivers/clk/rockchip= /clk-rk3368.c > index 9c5d61e..7e6b783 100644 > --- a/drivers/clk/rockchip/clk-rk3368.c > +++ b/drivers/clk/rockchip/clk-rk3368.c > @@ -818,6 +818,10 @@ static struct rockchip_clk_branch rk3368_clk_bra= nches[] __initdata =3D { > GATE(0, "sclk_timer00", "xin24m", CLK_IGNORE_UNUSED, RK3368_CLKGATE= _CON(24), 0, GFLAGS), > }; > =20 > +static const char *const rk3368_critical_clocks[] __initconst =3D { > + "pclk_pd_pmu", > +}; > + > static void __init rk3368_clk_init(struct device_node *np) > { > void __iomem *reg_base; > @@ -862,6 +866,8 @@ static void __init rk3368_clk_init(struct device_= node *np) > RK3368_GRF_SOC_STATUS0); > rockchip_clk_register_branches(rk3368_clk_branches, > ARRAY_SIZE(rk3368_clk_branches)); > + rockchip_clk_protect_critical(rk3368_critical_clocks, > + ARRAY_SIZE(rk3368_critical_clocks)); > =20 > rockchip_clk_register_armclk(ARMCLKB, "armclkb", > mux_armclkb_p, ARRAY_SIZE(mux_armclkb_p), > --=20 > 2.5.1 >=20 >=20