diff for duplicates of <20150914141920.GF7002@leverpostej> diff --git a/a/1.txt b/N1/1.txt index 1718c20..92ae3b6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,35 +1,52 @@ -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== +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 <mark.rutland@arm.com> +> Signed-off-by: Heiko Stuebner <heiko@sntech.de> + +FWIW: Tested-by: Mark Rutland <mark.rutland@arm.com> + +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 +> +> diff --git a/a/content_digest b/N1/content_digest index bb92cc8..4f42759 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,47 +3,64 @@ "Subject\0Re: [PATCH] clk: rockchip: add critical clock for rk3368\0" "Date\0Mon, 14 Sep 2015 15:19:21 +0100\0" "To\0Heiko St\303\274bner <heiko@sntech.de>\0" - "Cc\0linux-rockchip@lists.infradead.org <linux-rockchip@lists.infradead.org>" - mturquette@baylibre.com <mturquette@baylibre.com> + "Cc\0mturquette@baylibre.com <mturquette@baylibre.com>" sboyd@codeaurora.org <sboyd@codeaurora.org> linux-clk@vger.kernel.org <linux-clk@vger.kernel.org> + linux-rockchip@lists.infradead.org <linux-rockchip@lists.infradead.org> " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" - "T24gU3VuLCBTZXAgMTMsIDIwMTUgYXQgMTI6MjA6MzZQTSArMDEwMCwgSGVpa28gU3TDvGJuZXIg\n" - "d3JvdGU6Cj4gQWdhaW4gYSByZXN1bHQgb2YgdGhlIGdwaW8tY2xvY2stbGliZXJhdGlvbiB0aGUg\n" - "cmszMzY4IG5lZWRzIHRoZQo+IHBjbGtfcGRfcG11IG1hcmtlZCBhcyBjcml0aWNhbCwgdG8gYm9v\n" - "dCBzdWNjZXNzZnVsbHkuCj4gCj4gUmVwb3J0ZWQtYnk6IE1hcmsgUnV0bGFuZCA8bWFyay5ydXRs\n" - "YW5kQGFybS5jb20+Cj4gU2lnbmVkLW9mZi1ieTogSGVpa28gU3R1ZWJuZXIgPGhlaWtvQHNudGVj\n" - "aC5kZT4KCkZXSVc6IFRlc3RlZC1ieTogTWFyayBSdXRsYW5kIDxtYXJrLnJ1dGxhbmRAYXJtLmNv\n" - "bT4KCkknbSBzdXJwcmlzZWQgdGhhdCB3ZSBkb24ndCBkZXNjcmliZSB0aGVzZSBhcyBjcml0aWNh\n" - "bCBpbiB0aGUgRFQsIGdpdmVuCnRoYXQgdGhpcyBpc24ndCByZWFsbHkgYW4gaW50ZXJuYWwgcHJv\n" - "cGVydHkgb2YgdGhlIGNsb2NrIGNvbnRyb2xsZXIsIGJ1dApyYXRoZXIgd2hhdCBoYXBwZW5zIHRv\n" - "IGJlIGF0dGFjaGVkIHRvIGl0LiBUaGF0IHNoaXAgYXBwZWFycyB0byBoYXZlCnNhaWxlZCwgaG93\n" - "ZXZlci4KClRoYW5rcywKTWFyay4KCj4gLS0tCj4gc2hvdWxkIGdvIG9uIHRvcCBvZiBjbGstZml4\n" - "ZXMuIFNvcnJ5IG9ubHkgZmluZGluZyB0aGVzZSBwaWVjZQo+IGJ5IHBpZWNlIDotKSAuCj4gCj4g\n" - "IGRyaXZlcnMvY2xrL3JvY2tjaGlwL2Nsay1yazMzNjguYyB8IDYgKysrKysrCj4gIDEgZmlsZSBj\n" - "aGFuZ2VkLCA2IGluc2VydGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9jbGsvcm9j\n" - "a2NoaXAvY2xrLXJrMzM2OC5jIGIvZHJpdmVycy9jbGsvcm9ja2NoaXAvY2xrLXJrMzM2OC5jCj4g\n" - "aW5kZXggOWM1ZDYxZS4uN2U2Yjc4MyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2Nsay9yb2NrY2hp\n" - "cC9jbGstcmszMzY4LmMKPiArKysgYi9kcml2ZXJzL2Nsay9yb2NrY2hpcC9jbGstcmszMzY4LmMK\n" - "PiBAQCAtODE4LDYgKzgxOCwxMCBAQCBzdGF0aWMgc3RydWN0IHJvY2tjaGlwX2Nsa19icmFuY2gg\n" - "cmszMzY4X2Nsa19icmFuY2hlc1tdIF9faW5pdGRhdGEgPSB7Cj4gIAlHQVRFKDAsICJzY2xrX3Rp\n" - "bWVyMDAiLCAieGluMjRtIiwgQ0xLX0lHTk9SRV9VTlVTRUQsIFJLMzM2OF9DTEtHQVRFX0NPTigy\n" - "NCksIDAsIEdGTEFHUyksCj4gIH07Cj4gIAo+ICtzdGF0aWMgY29uc3QgY2hhciAqY29uc3Qgcmsz\n" - "MzY4X2NyaXRpY2FsX2Nsb2Nrc1tdIF9faW5pdGNvbnN0ID0gewo+ICsJInBjbGtfcGRfcG11IiwK\n" - "PiArfTsKPiArCj4gIHN0YXRpYyB2b2lkIF9faW5pdCByazMzNjhfY2xrX2luaXQoc3RydWN0IGRl\n" - "dmljZV9ub2RlICpucCkKPiAgewo+ICAJdm9pZCBfX2lvbWVtICpyZWdfYmFzZTsKPiBAQCAtODYy\n" - "LDYgKzg2Niw4IEBAIHN0YXRpYyB2b2lkIF9faW5pdCByazMzNjhfY2xrX2luaXQoc3RydWN0IGRl\n" - "dmljZV9ub2RlICpucCkKPiAgCQkJCSAgIFJLMzM2OF9HUkZfU09DX1NUQVRVUzApOwo+ICAJcm9j\n" - "a2NoaXBfY2xrX3JlZ2lzdGVyX2JyYW5jaGVzKHJrMzM2OF9jbGtfYnJhbmNoZXMsCj4gIAkJCQkg\n" - "IEFSUkFZX1NJWkUocmszMzY4X2Nsa19icmFuY2hlcykpOwo+ICsJcm9ja2NoaXBfY2xrX3Byb3Rl\n" - "Y3RfY3JpdGljYWwocmszMzY4X2NyaXRpY2FsX2Nsb2NrcywKPiArCQkJCSAgICAgIEFSUkFZX1NJ\n" - "WkUocmszMzY4X2NyaXRpY2FsX2Nsb2NrcykpOwo+ICAKPiAgCXJvY2tjaGlwX2Nsa19yZWdpc3Rl\n" - "cl9hcm1jbGsoQVJNQ0xLQiwgImFybWNsa2IiLAo+ICAJCQltdXhfYXJtY2xrYl9wLCBBUlJBWV9T\n" - "SVpFKG11eF9hcm1jbGtiX3ApLAo+IC0tIAo+IDIuNS4xCj4gCj4gCgpfX19fX19fX19fX19fX19f\n" - "X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcg\n" - "bGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmlu\n" - ZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== + "On Sun, Sep 13, 2015 at 12:20:36PM +0100, Heiko St\303\274bner wrote:\n" + "> Again a result of the gpio-clock-liberation the rk3368 needs the\n" + "> pclk_pd_pmu marked as critical, to boot successfully.\n" + "> \n" + "> Reported-by: Mark Rutland <mark.rutland@arm.com>\n" + "> Signed-off-by: Heiko Stuebner <heiko@sntech.de>\n" + "\n" + "FWIW: Tested-by: Mark Rutland <mark.rutland@arm.com>\n" + "\n" + "I'm surprised that we don't describe these as critical in the DT, given\n" + "that this isn't really an internal property of the clock controller, but\n" + "rather what happens to be attached to it. That ship appears to have\n" + "sailed, however.\n" + "\n" + "Thanks,\n" + "Mark.\n" + "\n" + "> ---\n" + "> should go on top of clk-fixes. Sorry only finding these piece\n" + "> by piece :-) .\n" + "> \n" + "> drivers/clk/rockchip/clk-rk3368.c | 6 ++++++\n" + "> 1 file changed, 6 insertions(+)\n" + "> \n" + "> diff --git a/drivers/clk/rockchip/clk-rk3368.c b/drivers/clk/rockchip/clk-rk3368.c\n" + "> index 9c5d61e..7e6b783 100644\n" + "> --- a/drivers/clk/rockchip/clk-rk3368.c\n" + "> +++ b/drivers/clk/rockchip/clk-rk3368.c\n" + "> @@ -818,6 +818,10 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = {\n" + "> \tGATE(0, \"sclk_timer00\", \"xin24m\", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 0, GFLAGS),\n" + "> };\n" + "> \n" + "> +static const char *const rk3368_critical_clocks[] __initconst = {\n" + "> +\t\"pclk_pd_pmu\",\n" + "> +};\n" + "> +\n" + "> static void __init rk3368_clk_init(struct device_node *np)\n" + "> {\n" + "> \tvoid __iomem *reg_base;\n" + "> @@ -862,6 +866,8 @@ static void __init rk3368_clk_init(struct device_node *np)\n" + "> \t\t\t\t RK3368_GRF_SOC_STATUS0);\n" + "> \trockchip_clk_register_branches(rk3368_clk_branches,\n" + "> \t\t\t\t ARRAY_SIZE(rk3368_clk_branches));\n" + "> +\trockchip_clk_protect_critical(rk3368_critical_clocks,\n" + "> +\t\t\t\t ARRAY_SIZE(rk3368_critical_clocks));\n" + "> \n" + "> \trockchip_clk_register_armclk(ARMCLKB, \"armclkb\",\n" + "> \t\t\tmux_armclkb_p, ARRAY_SIZE(mux_armclkb_p),\n" + "> -- \n" + "> 2.5.1\n" + "> \n" + > -757d6168c88561e57053fb67e018b11a96d81ec404b24bce9c67727d92c92d5c +89eac5912411d7564bf8e56f342a1c301d0fe6fb50bb3c46e3e11c38439eab4c
diff --git a/a/1.txt b/N2/1.txt index 1718c20..fca49a3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,35 +1,52 @@ -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== +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 <mark.rutland@arm.com> +> Signed-off-by: Heiko Stuebner <heiko@sntech.de> + +FWIW: Tested-by: Mark Rutland <mark.rutland@arm.com> + +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 +> +> diff --git a/a/content_digest b/N2/content_digest index bb92cc8..07b9a01 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,49 +1,61 @@ "ref\05267432.TORlj1Iv40@diego\0" - "From\0Mark Rutland <mark.rutland@arm.com>\0" - "Subject\0Re: [PATCH] clk: rockchip: add critical clock for rk3368\0" + "From\0mark.rutland@arm.com (Mark Rutland)\0" + "Subject\0[PATCH] clk: rockchip: add critical clock for rk3368\0" "Date\0Mon, 14 Sep 2015 15:19:21 +0100\0" - "To\0Heiko St\303\274bner <heiko@sntech.de>\0" - "Cc\0linux-rockchip@lists.infradead.org <linux-rockchip@lists.infradead.org>" - mturquette@baylibre.com <mturquette@baylibre.com> - sboyd@codeaurora.org <sboyd@codeaurora.org> - linux-clk@vger.kernel.org <linux-clk@vger.kernel.org> - " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "T24gU3VuLCBTZXAgMTMsIDIwMTUgYXQgMTI6MjA6MzZQTSArMDEwMCwgSGVpa28gU3TDvGJuZXIg\n" - "d3JvdGU6Cj4gQWdhaW4gYSByZXN1bHQgb2YgdGhlIGdwaW8tY2xvY2stbGliZXJhdGlvbiB0aGUg\n" - "cmszMzY4IG5lZWRzIHRoZQo+IHBjbGtfcGRfcG11IG1hcmtlZCBhcyBjcml0aWNhbCwgdG8gYm9v\n" - "dCBzdWNjZXNzZnVsbHkuCj4gCj4gUmVwb3J0ZWQtYnk6IE1hcmsgUnV0bGFuZCA8bWFyay5ydXRs\n" - "YW5kQGFybS5jb20+Cj4gU2lnbmVkLW9mZi1ieTogSGVpa28gU3R1ZWJuZXIgPGhlaWtvQHNudGVj\n" - "aC5kZT4KCkZXSVc6IFRlc3RlZC1ieTogTWFyayBSdXRsYW5kIDxtYXJrLnJ1dGxhbmRAYXJtLmNv\n" - "bT4KCkknbSBzdXJwcmlzZWQgdGhhdCB3ZSBkb24ndCBkZXNjcmliZSB0aGVzZSBhcyBjcml0aWNh\n" - "bCBpbiB0aGUgRFQsIGdpdmVuCnRoYXQgdGhpcyBpc24ndCByZWFsbHkgYW4gaW50ZXJuYWwgcHJv\n" - "cGVydHkgb2YgdGhlIGNsb2NrIGNvbnRyb2xsZXIsIGJ1dApyYXRoZXIgd2hhdCBoYXBwZW5zIHRv\n" - "IGJlIGF0dGFjaGVkIHRvIGl0LiBUaGF0IHNoaXAgYXBwZWFycyB0byBoYXZlCnNhaWxlZCwgaG93\n" - "ZXZlci4KClRoYW5rcywKTWFyay4KCj4gLS0tCj4gc2hvdWxkIGdvIG9uIHRvcCBvZiBjbGstZml4\n" - "ZXMuIFNvcnJ5IG9ubHkgZmluZGluZyB0aGVzZSBwaWVjZQo+IGJ5IHBpZWNlIDotKSAuCj4gCj4g\n" - "IGRyaXZlcnMvY2xrL3JvY2tjaGlwL2Nsay1yazMzNjguYyB8IDYgKysrKysrCj4gIDEgZmlsZSBj\n" - "aGFuZ2VkLCA2IGluc2VydGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9jbGsvcm9j\n" - "a2NoaXAvY2xrLXJrMzM2OC5jIGIvZHJpdmVycy9jbGsvcm9ja2NoaXAvY2xrLXJrMzM2OC5jCj4g\n" - "aW5kZXggOWM1ZDYxZS4uN2U2Yjc4MyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2Nsay9yb2NrY2hp\n" - "cC9jbGstcmszMzY4LmMKPiArKysgYi9kcml2ZXJzL2Nsay9yb2NrY2hpcC9jbGstcmszMzY4LmMK\n" - "PiBAQCAtODE4LDYgKzgxOCwxMCBAQCBzdGF0aWMgc3RydWN0IHJvY2tjaGlwX2Nsa19icmFuY2gg\n" - "cmszMzY4X2Nsa19icmFuY2hlc1tdIF9faW5pdGRhdGEgPSB7Cj4gIAlHQVRFKDAsICJzY2xrX3Rp\n" - "bWVyMDAiLCAieGluMjRtIiwgQ0xLX0lHTk9SRV9VTlVTRUQsIFJLMzM2OF9DTEtHQVRFX0NPTigy\n" - "NCksIDAsIEdGTEFHUyksCj4gIH07Cj4gIAo+ICtzdGF0aWMgY29uc3QgY2hhciAqY29uc3Qgcmsz\n" - "MzY4X2NyaXRpY2FsX2Nsb2Nrc1tdIF9faW5pdGNvbnN0ID0gewo+ICsJInBjbGtfcGRfcG11IiwK\n" - "PiArfTsKPiArCj4gIHN0YXRpYyB2b2lkIF9faW5pdCByazMzNjhfY2xrX2luaXQoc3RydWN0IGRl\n" - "dmljZV9ub2RlICpucCkKPiAgewo+ICAJdm9pZCBfX2lvbWVtICpyZWdfYmFzZTsKPiBAQCAtODYy\n" - "LDYgKzg2Niw4IEBAIHN0YXRpYyB2b2lkIF9faW5pdCByazMzNjhfY2xrX2luaXQoc3RydWN0IGRl\n" - "dmljZV9ub2RlICpucCkKPiAgCQkJCSAgIFJLMzM2OF9HUkZfU09DX1NUQVRVUzApOwo+ICAJcm9j\n" - "a2NoaXBfY2xrX3JlZ2lzdGVyX2JyYW5jaGVzKHJrMzM2OF9jbGtfYnJhbmNoZXMsCj4gIAkJCQkg\n" - "IEFSUkFZX1NJWkUocmszMzY4X2Nsa19icmFuY2hlcykpOwo+ICsJcm9ja2NoaXBfY2xrX3Byb3Rl\n" - "Y3RfY3JpdGljYWwocmszMzY4X2NyaXRpY2FsX2Nsb2NrcywKPiArCQkJCSAgICAgIEFSUkFZX1NJ\n" - "WkUocmszMzY4X2NyaXRpY2FsX2Nsb2NrcykpOwo+ICAKPiAgCXJvY2tjaGlwX2Nsa19yZWdpc3Rl\n" - "cl9hcm1jbGsoQVJNQ0xLQiwgImFybWNsa2IiLAo+ICAJCQltdXhfYXJtY2xrYl9wLCBBUlJBWV9T\n" - "SVpFKG11eF9hcm1jbGtiX3ApLAo+IC0tIAo+IDIuNS4xCj4gCj4gCgpfX19fX19fX19fX19fX19f\n" - "X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcg\n" - "bGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmlu\n" - ZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== + "On Sun, Sep 13, 2015 at 12:20:36PM +0100, Heiko St?bner wrote:\n" + "> Again a result of the gpio-clock-liberation the rk3368 needs the\n" + "> pclk_pd_pmu marked as critical, to boot successfully.\n" + "> \n" + "> Reported-by: Mark Rutland <mark.rutland@arm.com>\n" + "> Signed-off-by: Heiko Stuebner <heiko@sntech.de>\n" + "\n" + "FWIW: Tested-by: Mark Rutland <mark.rutland@arm.com>\n" + "\n" + "I'm surprised that we don't describe these as critical in the DT, given\n" + "that this isn't really an internal property of the clock controller, but\n" + "rather what happens to be attached to it. That ship appears to have\n" + "sailed, however.\n" + "\n" + "Thanks,\n" + "Mark.\n" + "\n" + "> ---\n" + "> should go on top of clk-fixes. Sorry only finding these piece\n" + "> by piece :-) .\n" + "> \n" + "> drivers/clk/rockchip/clk-rk3368.c | 6 ++++++\n" + "> 1 file changed, 6 insertions(+)\n" + "> \n" + "> diff --git a/drivers/clk/rockchip/clk-rk3368.c b/drivers/clk/rockchip/clk-rk3368.c\n" + "> index 9c5d61e..7e6b783 100644\n" + "> --- a/drivers/clk/rockchip/clk-rk3368.c\n" + "> +++ b/drivers/clk/rockchip/clk-rk3368.c\n" + "> @@ -818,6 +818,10 @@ static struct rockchip_clk_branch rk3368_clk_branches[] __initdata = {\n" + "> \tGATE(0, \"sclk_timer00\", \"xin24m\", CLK_IGNORE_UNUSED, RK3368_CLKGATE_CON(24), 0, GFLAGS),\n" + "> };\n" + "> \n" + "> +static const char *const rk3368_critical_clocks[] __initconst = {\n" + "> +\t\"pclk_pd_pmu\",\n" + "> +};\n" + "> +\n" + "> static void __init rk3368_clk_init(struct device_node *np)\n" + "> {\n" + "> \tvoid __iomem *reg_base;\n" + "> @@ -862,6 +866,8 @@ static void __init rk3368_clk_init(struct device_node *np)\n" + "> \t\t\t\t RK3368_GRF_SOC_STATUS0);\n" + "> \trockchip_clk_register_branches(rk3368_clk_branches,\n" + "> \t\t\t\t ARRAY_SIZE(rk3368_clk_branches));\n" + "> +\trockchip_clk_protect_critical(rk3368_critical_clocks,\n" + "> +\t\t\t\t ARRAY_SIZE(rk3368_critical_clocks));\n" + "> \n" + "> \trockchip_clk_register_armclk(ARMCLKB, \"armclkb\",\n" + "> \t\t\tmux_armclkb_p, ARRAY_SIZE(mux_armclkb_p),\n" + "> -- \n" + "> 2.5.1\n" + "> \n" + > -757d6168c88561e57053fb67e018b11a96d81ec404b24bce9c67727d92c92d5c +4d0a8427095909200ece8e42bddeb5ad4be4283ba8298b1b5ca465992bf818ae
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.