From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?B?UGF3ZcWC?= Jarosz Subject: [PATCH v2 1/2] clk: rockchip: Add bindings for cpu and peri clocks on rk3066 Date: Fri, 14 Oct 2016 14:16:39 +0200 Message-ID: <938d05a66c34bd8af255979462fbed387a67abff.1476447057.git.paweljarosz3691@gmail.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+glpar-linux-rockchip=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: paweljarosz3691-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Cc: mark.rutland-5wv7dgnIgG8@public.gmane.org, heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org, mturquette-rdvid1DuHRBWk0Htik3J/w@public.gmane.org, sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: linux-rockchip.vger.kernel.org QWRkIGJpbmRpbmdzIGZvciBBQ0xLX0NQVSwgSENMS19DUFUsIFBDTEtfQ1BVLCBBQ0xLX1BFUkks IEhDTEtfUEVSSSwgUENMS19QRVJJLgoKV2UgbmVlZCB0aGlzIHRvIGluaXQgaXQncyByYXRlIGF0 IGJvb3QgdGltZS4KClNpZ25lZC1vZmYtYnk6IFBhd2XFgiBKYXJvc3ogPHBhd2VsamFyb3N6MzY5 MUBnbWFpbC5jb20+Ci0tLQoKQ2hhbmdlcyBpbiB2MjoKLSBub25lCgogZHJpdmVycy9jbGsvcm9j a2NoaXAvY2xrLXJrMzE4OC5jICAgICAgICAgICAgIHwgMTIgKysrKysrLS0tLS0tCiBpbmNsdWRl L2R0LWJpbmRpbmdzL2Nsb2NrL3JrMzE4OC1jcnUtY29tbW9uLmggfCAgOCArKysrKysrLQogMiBm aWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvY2xrL3JvY2tjaGlwL2Nsay1yazMxODguYyBiL2RyaXZlcnMvY2xrL3JvY2tj aGlwL2Nsay1yazMxODguYwppbmRleCBkMGU3MjJhLi5hNmQzOThmIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2Nsay9yb2NrY2hpcC9jbGstcmszMTg4LmMKKysrIGIvZHJpdmVycy9jbGsvcm9ja2NoaXAv Y2xrLXJrMzE4OC5jCkBAIC0zMDYsMTQgKzMwNiwxNCBAQCBzdGF0aWMgc3RydWN0IHJvY2tjaGlw X2Nsa19icmFuY2ggY29tbW9uX2Nsa19icmFuY2hlc1tdIF9faW5pdGRhdGEgPSB7CiAJCQlSSzI5 MjhfQ0xLU0VMX0NPTigyNiksIDgsIDEsIE1GTEFHUywgMCwgMiwgREZMQUdTIHwgQ0xLX0RJVklE RVJfUE9XRVJfT0ZfVFdPLAogCQkJUksyOTI4X0NMS0dBVEVfQ09OKDApLCAyLCBHRkxBR1MpLAog Ci0JR0FURSgwLCAiYWNsa19jcHUiLCAiYWNsa19jcHVfcHJlIiwgMCwKKwlHQVRFKEFDTEtfQ1BV LCAiYWNsa19jcHUiLCAiYWNsa19jcHVfcHJlIiwgMCwKIAkJCVJLMjkyOF9DTEtHQVRFX0NPTigw KSwgMywgR0ZMQUdTKSwKIAogCUdBVEUoMCwgImF0Y2xrX2NwdSIsICJwY2xrX2NwdV9wcmUiLCAw LAogCQkJUksyOTI4X0NMS0dBVEVfQ09OKDApLCA2LCBHRkxBR1MpLAotCUdBVEUoMCwgInBjbGtf Y3B1IiwgInBjbGtfY3B1X3ByZSIsIDAsCisJR0FURShQQ0xLX0NQVSwgInBjbGtfY3B1IiwgInBj bGtfY3B1X3ByZSIsIDAsCiAJCQlSSzI5MjhfQ0xLR0FURV9DT04oMCksIDUsIEdGTEFHUyksCi0J R0FURSgwLCAiaGNsa19jcHUiLCAiaGNsa19jcHVfcHJlIiwgQ0xLX0lHTk9SRV9VTlVTRUQsCisJ R0FURShIQ0xLX0NQVSwgImhjbGtfY3B1IiwgImhjbGtfY3B1X3ByZSIsIENMS19JR05PUkVfVU5V U0VELAogCQkJUksyOTI4X0NMS0dBVEVfQ09OKDApLCA0LCBHRkxBR1MpLAogCiAJQ09NUE9TSVRF KDAsICJhY2xrX2xjZGMwX3ByZSIsIG11eF9wbGxfc3JjX2NwbGxfZ3BsbF9wLCBDTEtfSUdOT1JF X1VOVVNFRCwKQEAgLTMyMywxMiArMzIzLDEyIEBAIHN0YXRpYyBzdHJ1Y3Qgcm9ja2NoaXBfY2xr X2JyYW5jaCBjb21tb25fY2xrX2JyYW5jaGVzW10gX19pbml0ZGF0YSA9IHsKIAkJCVJLMjkyOF9D TEtTRUxfQ09OKDMxKSwgMTUsIDEsIE1GTEFHUywgOCwgNSwgREZMQUdTLAogCQkJUksyOTI4X0NM S0dBVEVfQ09OKDEpLCA0LCBHRkxBR1MpLAogCi0JR0FURSgwLCAiYWNsa19wZXJpIiwgImFjbGtf cGVyaV9wcmUiLCAwLAorCUdBVEUoQUNMS19QRVJJLCAiYWNsa19wZXJpIiwgImFjbGtfcGVyaV9w cmUiLCAwLAogCQkJUksyOTI4X0NMS0dBVEVfQ09OKDIpLCAxLCBHRkxBR1MpLAotCUNPTVBPU0lU RV9OT01VWCgwLCAiaGNsa19wZXJpIiwgImFjbGtfcGVyaV9wcmUiLCAwLAorCUNPTVBPU0lURV9O T01VWChIQ0xLX1BFUkksICJoY2xrX3BlcmkiLCAiYWNsa19wZXJpX3ByZSIsIDAsCiAJCQlSSzI5 MjhfQ0xLU0VMX0NPTigxMCksIDgsIDIsIERGTEFHUyB8IENMS19ESVZJREVSX1BPV0VSX09GX1RX TywKIAkJCVJLMjkyOF9DTEtHQVRFX0NPTigyKSwgMiwgR0ZMQUdTKSwKLQlDT01QT1NJVEVfTk9N VVgoMCwgInBjbGtfcGVyaSIsICJhY2xrX3BlcmlfcHJlIiwgMCwKKwlDT01QT1NJVEVfTk9NVVgo UENMS19QRVJJLCAicGNsa19wZXJpIiwgImFjbGtfcGVyaV9wcmUiLCAwLAogCQkJUksyOTI4X0NM S1NFTF9DT04oMTApLCAxMiwgMiwgREZMQUdTIHwgQ0xLX0RJVklERVJfUE9XRVJfT0ZfVFdPLAog CQkJUksyOTI4X0NMS0dBVEVfQ09OKDIpLCAzLCBHRkxBR1MpLAogCmRpZmYgLS1naXQgYS9pbmNs dWRlL2R0LWJpbmRpbmdzL2Nsb2NrL3JrMzE4OC1jcnUtY29tbW9uLmggYi9pbmNsdWRlL2R0LWJp bmRpbmdzL2Nsb2NrL3JrMzE4OC1jcnUtY29tbW9uLmgKaW5kZXggNGY1M2U3MC4uZDE0MWMxZiAx MDA2NDQKLS0tIGEvaW5jbHVkZS9kdC1iaW5kaW5ncy9jbG9jay9yazMxODgtY3J1LWNvbW1vbi5o CisrKyBiL2luY2x1ZGUvZHQtYmluZGluZ3MvY2xvY2svcmszMTg4LWNydS1jb21tb24uaApAQCAt NzIsNiArNzIsOCBAQAogI2RlZmluZSBBQ0xLX0lQUAkJMjAwCiAjZGVmaW5lIEFDTEtfUkdBCQky MDEKICNkZWZpbmUgQUNMS19DSUYwCQkyMDIKKyNkZWZpbmUgQUNMS19DUFUJCTIwMworI2RlZmlu ZSBBQ0xLX1BFUkkJCTIwNAogCiAvKiBwY2xrIGdhdGVzICovCiAjZGVmaW5lIFBDTEtfR1JGCQkz MjAKQEAgLTEwNCw2ICsxMDYsOCBAQAogI2RlZmluZSBQQ0xLX0VGVVNFCQkzNDcKICNkZWZpbmUg UENMS19UWlBDCQkzNDgKICNkZWZpbmUgUENMS19UU0FEQwkJMzQ5CisjZGVmaW5lIFBDTEtfQ1BV CQkzNTAKKyNkZWZpbmUgUENMS19QRVJJCQkzNTEKIAogLyogaGNsayBnYXRlcyAqLwogI2RlZmlu ZSBIQ0xLX1NETU1DCQk0NDgKQEAgLTEyNiw4ICsxMzAsMTAgQEAKICNkZWZpbmUgSENMS19JUFAJ CTQ2NQogI2RlZmluZSBIQ0xLX1JHQQkJNDY2CiAjZGVmaW5lIEhDTEtfTkFOREMwCQk0NjcKKyNk ZWZpbmUgSENMS19DUFUJCTQ2OAorI2RlZmluZSBIQ0xLX1BFUkkJCTQ2OQogCi0jZGVmaW5lIENM S19OUl9DTEtTCQkoSENMS19OQU5EQzAgKyAxKQorI2RlZmluZSBDTEtfTlJfQ0xLUwkJKEhDTEtf UEVSSSArIDEpCiAKIC8qIHNvZnQtcmVzZXQgaW5kaWNlcyAqLwogI2RlZmluZSBTUlNUX01DT1JF CQkyCi0tIAoyLjcuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkxpbnV4LXJvY2tjaGlwIG1haWxpbmcgbGlzdApMaW51eC1yb2NrY2hpcEBsaXN0cy5p bmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8v bGludXgtcm9ja2NoaXAK From mboxrd@z Thu Jan 1 00:00:00 1970 From: paweljarosz3691@gmail.com (=?utf-8?B?UGF3ZcWC?= Jarosz) Date: Fri, 14 Oct 2016 14:16:39 +0200 Subject: [PATCH v2 1/2] clk: rockchip: Add bindings for cpu and peri clocks on rk3066 In-Reply-To: References: Message-ID: <938d05a66c34bd8af255979462fbed387a67abff.1476447057.git.paweljarosz3691@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Add bindings for ACLK_CPU, HCLK_CPU, PCLK_CPU, ACLK_PERI, HCLK_PERI, PCLK_PERI. We need this to init it's rate at boot time. Signed-off-by: Pawe? Jarosz --- Changes in v2: - none drivers/clk/rockchip/clk-rk3188.c | 12 ++++++------ include/dt-bindings/clock/rk3188-cru-common.h | 8 +++++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c index d0e722a..a6d398f 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c @@ -306,14 +306,14 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { RK2928_CLKSEL_CON(26), 8, 1, MFLAGS, 0, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO, RK2928_CLKGATE_CON(0), 2, GFLAGS), - GATE(0, "aclk_cpu", "aclk_cpu_pre", 0, + GATE(ACLK_CPU, "aclk_cpu", "aclk_cpu_pre", 0, RK2928_CLKGATE_CON(0), 3, GFLAGS), GATE(0, "atclk_cpu", "pclk_cpu_pre", 0, RK2928_CLKGATE_CON(0), 6, GFLAGS), - GATE(0, "pclk_cpu", "pclk_cpu_pre", 0, + GATE(PCLK_CPU, "pclk_cpu", "pclk_cpu_pre", 0, RK2928_CLKGATE_CON(0), 5, GFLAGS), - GATE(0, "hclk_cpu", "hclk_cpu_pre", CLK_IGNORE_UNUSED, + GATE(HCLK_CPU, "hclk_cpu", "hclk_cpu_pre", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(0), 4, GFLAGS), COMPOSITE(0, "aclk_lcdc0_pre", mux_pll_src_cpll_gpll_p, CLK_IGNORE_UNUSED, @@ -323,12 +323,12 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { RK2928_CLKSEL_CON(31), 15, 1, MFLAGS, 8, 5, DFLAGS, RK2928_CLKGATE_CON(1), 4, GFLAGS), - GATE(0, "aclk_peri", "aclk_peri_pre", 0, + GATE(ACLK_PERI, "aclk_peri", "aclk_peri_pre", 0, RK2928_CLKGATE_CON(2), 1, GFLAGS), - COMPOSITE_NOMUX(0, "hclk_peri", "aclk_peri_pre", 0, + COMPOSITE_NOMUX(HCLK_PERI, "hclk_peri", "aclk_peri_pre", 0, RK2928_CLKSEL_CON(10), 8, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO, RK2928_CLKGATE_CON(2), 2, GFLAGS), - COMPOSITE_NOMUX(0, "pclk_peri", "aclk_peri_pre", 0, + COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "aclk_peri_pre", 0, RK2928_CLKSEL_CON(10), 12, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO, RK2928_CLKGATE_CON(2), 3, GFLAGS), diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h index 4f53e70..d141c1f 100644 --- a/include/dt-bindings/clock/rk3188-cru-common.h +++ b/include/dt-bindings/clock/rk3188-cru-common.h @@ -72,6 +72,8 @@ #define ACLK_IPP 200 #define ACLK_RGA 201 #define ACLK_CIF0 202 +#define ACLK_CPU 203 +#define ACLK_PERI 204 /* pclk gates */ #define PCLK_GRF 320 @@ -104,6 +106,8 @@ #define PCLK_EFUSE 347 #define PCLK_TZPC 348 #define PCLK_TSADC 349 +#define PCLK_CPU 350 +#define PCLK_PERI 351 /* hclk gates */ #define HCLK_SDMMC 448 @@ -126,8 +130,10 @@ #define HCLK_IPP 465 #define HCLK_RGA 466 #define HCLK_NANDC0 467 +#define HCLK_CPU 468 +#define HCLK_PERI 469 -#define CLK_NR_CLKS (HCLK_NANDC0 + 1) +#define CLK_NR_CLKS (HCLK_PERI + 1) /* soft-reset indices */ #define SRST_MCORE 2 -- 2.7.4