From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 To: =?utf-8?q?Heiko_St=C3=BCbner?= , "Sjoerd Simons" From: Michael Turquette In-Reply-To: <2030894.j0VJujBTor@diego> Cc: linux-rockchip@lists.infradead.org, "Stephen Boyd" , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org References: <1438077162-27623-1-git-send-email-sjoerd.simons@collabora.co.uk> <2030894.j0VJujBTor@diego> Message-ID: <20150811213433.31346.58424@quantum> Subject: Re: [PATCH] clk: rockchip: Fix SPIF special clock definition Date: Tue, 11 Aug 2015 14:34:33 -0700 List-ID: Quoting Heiko St=C3=BCbner (2015-07-28 03:08:54) > Am Dienstag, 28. Juli 2015, 11:52:42 schrieb Sjoerd Simons: > > Neither spdif_src nor spdif_pll exists, judging by the vendor kernel in > > both cases spdif_pre was meant. This brings the naming in line and > > hierachy in line with that of sclk_i2s0. > > = > > Also allow sclk_spdif and spdif_frac to change their parents rate as > > that the upstream dividers are purely there to feed sclk_spdif > > = > > Signed-off-by: Sjoerd Simons > = > I guess there was one rename to many back in the time :-) . > Verified this with the CRU documentation, so > = > Reviewed-by: Heiko Stuebner Applied to clk-next. Regards, Mike > = > > --- > > drivers/clk/rockchip/clk-rk3188.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > = > > diff --git a/drivers/clk/rockchip/clk-rk3188.c > > b/drivers/clk/rockchip/clk-rk3188.c index 0abf22d..ed02bbc 100644 > > --- a/drivers/clk/rockchip/clk-rk3188.c > > +++ b/drivers/clk/rockchip/clk-rk3188.c > > @@ -202,7 +202,7 @@ PNAME(mux_pll_src_cpll_gpll_p) =3D { "cpll", "gp= ll" }; > > PNAME(mux_aclk_cpu_p) =3D { "apll", "gpll" }; > > PNAME(mux_sclk_cif0_p) =3D { "cif0_pre", "xin24m" }; > > PNAME(mux_sclk_i2s0_p) =3D { "i2s0_pre", "i2s0_frac", "x= in12m" }; > > -PNAME(mux_sclk_spdif_p) =3D { "spdif_src", "spdif_frac", = "xin12m" }; > > +PNAME(mux_sclk_spdif_p) =3D { "spdif_pre", "spdif_frac", = "xin12m" }; > > PNAME(mux_sclk_uart0_p) =3D { "uart0_pre", "uart0_frac", = "xin24m" }; > > PNAME(mux_sclk_uart1_p) =3D { "uart1_pre", "uart1_frac", = "xin24m" }; > > PNAME(mux_sclk_uart2_p) =3D { "uart2_pre", "uart2_frac", = "xin24m" }; > > @@ -350,10 +350,10 @@ static struct rockchip_clk_branch > > common_clk_branches[] __initdata =3D { COMPOSITE_NOMUX(0, "spdif_pre", > > "i2s_src", 0, > > RK2928_CLKSEL_CON(5), 0, 7, DFLAGS, > > RK2928_CLKGATE_CON(0), 13, GFLAGS), > > - COMPOSITE_FRAC(0, "spdif_frac", "spdif_pll", 0, > > + COMPOSITE_FRAC(0, "spdif_frac", "spdif_pre", CLK_SET_RATE_PARENT, > > RK2928_CLKSEL_CON(9), 0, > > RK2928_CLKGATE_CON(0), 14, GFLAGS), > > - MUX(SCLK_SPDIF, "sclk_spdif", mux_sclk_spdif_p, 0, > > + MUX(SCLK_SPDIF, "sclk_spdif", mux_sclk_spdif_p, CLK_SET_RATE_PARE= NT, > > RK2928_CLKSEL_CON(5), 8, 2, MFLAGS), > > = > > /* > = > = > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Turquette Subject: Re: [PATCH] clk: rockchip: Fix SPIF special clock definition Date: Tue, 11 Aug 2015 14:34:33 -0700 Message-ID: <20150811213433.31346.58424@quantum> References: <1438077162-27623-1-git-send-email-sjoerd.simons@collabora.co.uk> <2030894.j0VJujBTor@diego> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <2030894.j0VJujBTor@diego> 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: =?utf-8?q?Heiko_St=C3=BCbner?= , Sjoerd Simons Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Stephen Boyd , linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: linux-rockchip.vger.kernel.org UXVvdGluZyBIZWlrbyBTdMO8Ym5lciAoMjAxNS0wNy0yOCAwMzowODo1NCkKPiBBbSBEaWVuc3Rh ZywgMjguIEp1bGkgMjAxNSwgMTE6NTI6NDIgc2NocmllYiBTam9lcmQgU2ltb25zOgo+ID4gTmVp dGhlciBzcGRpZl9zcmMgbm9yIHNwZGlmX3BsbCBleGlzdHMsIGp1ZGdpbmcgYnkgdGhlIHZlbmRv ciBrZXJuZWwgaW4KPiA+IGJvdGggY2FzZXMgc3BkaWZfcHJlIHdhcyBtZWFudC4gVGhpcyBicmlu Z3MgdGhlIG5hbWluZyBpbiBsaW5lIGFuZAo+ID4gaGllcmFjaHkgaW4gbGluZSB3aXRoIHRoYXQg b2Ygc2Nsa19pMnMwLgo+ID4gCj4gPiBBbHNvIGFsbG93IHNjbGtfc3BkaWYgYW5kIHNwZGlmX2Zy YWMgdG8gY2hhbmdlIHRoZWlyIHBhcmVudHMgcmF0ZSBhcwo+ID4gdGhhdCB0aGUgdXBzdHJlYW0g ZGl2aWRlcnMgYXJlIHB1cmVseSB0aGVyZSB0byBmZWVkIHNjbGtfc3BkaWYKPiA+IAo+ID4gU2ln bmVkLW9mZi1ieTogU2pvZXJkIFNpbW9ucyA8c2pvZXJkLnNpbW9uc0Bjb2xsYWJvcmEuY28udWs+ Cj4gCj4gSSBndWVzcyB0aGVyZSB3YXMgb25lIHJlbmFtZSB0byBtYW55IGJhY2sgaW4gdGhlIHRp bWUgOi0pIC4KPiBWZXJpZmllZCB0aGlzIHdpdGggdGhlIENSVSBkb2N1bWVudGF0aW9uLCBzbwo+ IAo+IFJldmlld2VkLWJ5OiBIZWlrbyBTdHVlYm5lciA8aGVpa29Ac250ZWNoLmRlPgoKQXBwbGll ZCB0byBjbGstbmV4dC4KClJlZ2FyZHMsCk1pa2UKCj4gCj4gPiAtLS0KPiA+ICBkcml2ZXJzL2Ns ay9yb2NrY2hpcC9jbGstcmszMTg4LmMgfCA2ICsrKy0tLQo+ID4gIDEgZmlsZSBjaGFuZ2VkLCAz IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCj4gPiAKPiA+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2Nsay9yb2NrY2hpcC9jbGstcmszMTg4LmMKPiA+IGIvZHJpdmVycy9jbGsvcm9ja2NoaXAv Y2xrLXJrMzE4OC5jIGluZGV4IDBhYmYyMmQuLmVkMDJiYmMgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2 ZXJzL2Nsay9yb2NrY2hpcC9jbGstcmszMTg4LmMKPiA+ICsrKyBiL2RyaXZlcnMvY2xrL3JvY2tj aGlwL2Nsay1yazMxODguYwo+ID4gQEAgLTIwMiw3ICsyMDIsNyBAQCBQTkFNRShtdXhfcGxsX3Ny Y19jcGxsX2dwbGxfcCkgICAgPSB7ICJjcGxsIiwgImdwbGwiIH07Cj4gPiAgUE5BTUUobXV4X2Fj bGtfY3B1X3ApICAgICAgICAgICAgICAgID0geyAiYXBsbCIsICJncGxsIiB9Owo+ID4gIFBOQU1F KG11eF9zY2xrX2NpZjBfcCkgICAgICAgICAgICAgICA9IHsgImNpZjBfcHJlIiwgInhpbjI0bSIg fTsKPiA+ICBQTkFNRShtdXhfc2Nsa19pMnMwX3ApICAgICAgICAgICAgICAgPSB7ICJpMnMwX3By ZSIsICJpMnMwX2ZyYWMiLCAieGluMTJtIiB9Owo+ID4gLVBOQU1FKG11eF9zY2xrX3NwZGlmX3Ap ICAgICAgICAgICAgICA9IHsgInNwZGlmX3NyYyIsICJzcGRpZl9mcmFjIiwgInhpbjEybSIgfTsK PiA+ICtQTkFNRShtdXhfc2Nsa19zcGRpZl9wKSAgICAgICAgICAgICAgPSB7ICJzcGRpZl9wcmUi LCAic3BkaWZfZnJhYyIsICJ4aW4xMm0iIH07Cj4gPiAgUE5BTUUobXV4X3NjbGtfdWFydDBfcCkg ICAgICAgICAgICAgID0geyAidWFydDBfcHJlIiwgInVhcnQwX2ZyYWMiLCAieGluMjRtIiB9Owo+ ID4gIFBOQU1FKG11eF9zY2xrX3VhcnQxX3ApICAgICAgICAgICAgICA9IHsgInVhcnQxX3ByZSIs ICJ1YXJ0MV9mcmFjIiwgInhpbjI0bSIgfTsKPiA+ICBQTkFNRShtdXhfc2Nsa191YXJ0Ml9wKSAg ICAgICAgICAgICAgPSB7ICJ1YXJ0Ml9wcmUiLCAidWFydDJfZnJhYyIsICJ4aW4yNG0iIH07Cj4g PiBAQCAtMzUwLDEwICszNTAsMTAgQEAgc3RhdGljIHN0cnVjdCByb2NrY2hpcF9jbGtfYnJhbmNo Cj4gPiBjb21tb25fY2xrX2JyYW5jaGVzW10gX19pbml0ZGF0YSA9IHsgQ09NUE9TSVRFX05PTVVY KDAsICJzcGRpZl9wcmUiLAo+ID4gImkyc19zcmMiLCAwLAo+ID4gICAgICAgICAgICAgICAgICAg ICAgIFJLMjkyOF9DTEtTRUxfQ09OKDUpLCAwLCA3LCBERkxBR1MsCj4gPiAgICAgICAgICAgICAg ICAgICAgICAgUksyOTI4X0NMS0dBVEVfQ09OKDApLCAxMywgR0ZMQUdTKSwKPiA+IC0gICAgIENP TVBPU0lURV9GUkFDKDAsICJzcGRpZl9mcmFjIiwgInNwZGlmX3BsbCIsIDAsCj4gPiArICAgICBD T01QT1NJVEVfRlJBQygwLCAic3BkaWZfZnJhYyIsICJzcGRpZl9wcmUiLCBDTEtfU0VUX1JBVEVf UEFSRU5ULAo+ID4gICAgICAgICAgICAgICAgICAgICAgIFJLMjkyOF9DTEtTRUxfQ09OKDkpLCAw LAo+ID4gICAgICAgICAgICAgICAgICAgICAgIFJLMjkyOF9DTEtHQVRFX0NPTigwKSwgMTQsIEdG TEFHUyksCj4gPiAtICAgICBNVVgoU0NMS19TUERJRiwgInNjbGtfc3BkaWYiLCBtdXhfc2Nsa19z cGRpZl9wLCAwLAo+ID4gKyAgICAgTVVYKFNDTEtfU1BESUYsICJzY2xrX3NwZGlmIiwgbXV4X3Nj bGtfc3BkaWZfcCwgQ0xLX1NFVF9SQVRFX1BBUkVOVCwKPiA+ICAgICAgICAgICAgICAgICAgICAg ICBSSzI5MjhfQ0xLU0VMX0NPTig1KSwgOCwgMiwgTUZMQUdTKSwKPiA+IAo+ID4gICAgICAgLyoK PiAKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+ IGxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0Cj4gbGludXgtYXJtLWtlcm5lbEBsaXN0cy5p bmZyYWRlYWQub3JnCj4gaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5m by9saW51eC1hcm0ta2VybmVsCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpMaW51eC1yb2NrY2hpcCBtYWlsaW5nIGxpc3QKTGludXgtcm9ja2NoaXBAbGlz dHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2xpbnV4LXJvY2tjaGlwCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: mturquette@baylibre.com (Michael Turquette) Date: Tue, 11 Aug 2015 14:34:33 -0700 Subject: [PATCH] clk: rockchip: Fix SPIF special clock definition In-Reply-To: <2030894.j0VJujBTor@diego> References: <1438077162-27623-1-git-send-email-sjoerd.simons@collabora.co.uk> <2030894.j0VJujBTor@diego> Message-ID: <20150811213433.31346.58424@quantum> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Quoting Heiko St?bner (2015-07-28 03:08:54) > Am Dienstag, 28. Juli 2015, 11:52:42 schrieb Sjoerd Simons: > > Neither spdif_src nor spdif_pll exists, judging by the vendor kernel in > > both cases spdif_pre was meant. This brings the naming in line and > > hierachy in line with that of sclk_i2s0. > > > > Also allow sclk_spdif and spdif_frac to change their parents rate as > > that the upstream dividers are purely there to feed sclk_spdif > > > > Signed-off-by: Sjoerd Simons > > I guess there was one rename to many back in the time :-) . > Verified this with the CRU documentation, so > > Reviewed-by: Heiko Stuebner Applied to clk-next. Regards, Mike > > > --- > > drivers/clk/rockchip/clk-rk3188.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/clk/rockchip/clk-rk3188.c > > b/drivers/clk/rockchip/clk-rk3188.c index 0abf22d..ed02bbc 100644 > > --- a/drivers/clk/rockchip/clk-rk3188.c > > +++ b/drivers/clk/rockchip/clk-rk3188.c > > @@ -202,7 +202,7 @@ PNAME(mux_pll_src_cpll_gpll_p) = { "cpll", "gpll" }; > > PNAME(mux_aclk_cpu_p) = { "apll", "gpll" }; > > PNAME(mux_sclk_cif0_p) = { "cif0_pre", "xin24m" }; > > PNAME(mux_sclk_i2s0_p) = { "i2s0_pre", "i2s0_frac", "xin12m" }; > > -PNAME(mux_sclk_spdif_p) = { "spdif_src", "spdif_frac", "xin12m" }; > > +PNAME(mux_sclk_spdif_p) = { "spdif_pre", "spdif_frac", "xin12m" }; > > PNAME(mux_sclk_uart0_p) = { "uart0_pre", "uart0_frac", "xin24m" }; > > PNAME(mux_sclk_uart1_p) = { "uart1_pre", "uart1_frac", "xin24m" }; > > PNAME(mux_sclk_uart2_p) = { "uart2_pre", "uart2_frac", "xin24m" }; > > @@ -350,10 +350,10 @@ static struct rockchip_clk_branch > > common_clk_branches[] __initdata = { COMPOSITE_NOMUX(0, "spdif_pre", > > "i2s_src", 0, > > RK2928_CLKSEL_CON(5), 0, 7, DFLAGS, > > RK2928_CLKGATE_CON(0), 13, GFLAGS), > > - COMPOSITE_FRAC(0, "spdif_frac", "spdif_pll", 0, > > + COMPOSITE_FRAC(0, "spdif_frac", "spdif_pre", CLK_SET_RATE_PARENT, > > RK2928_CLKSEL_CON(9), 0, > > RK2928_CLKGATE_CON(0), 14, GFLAGS), > > - MUX(SCLK_SPDIF, "sclk_spdif", mux_sclk_spdif_p, 0, > > + MUX(SCLK_SPDIF, "sclk_spdif", mux_sclk_spdif_p, CLK_SET_RATE_PARENT, > > RK2928_CLKSEL_CON(5), 8, 2, MFLAGS), > > > > /* > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel