diff mbox

[v2] clk: renesas: rz: Select EXTAL vs USB clock

Message ID 20160830031358.19468-1-chris.brandt@renesas.com (mailing list archive)
State Changes Requested, archived
Headers show

Commit Message

Chris Brandt Aug. 30, 2016, 3:13 a.m. UTC
Check the MD_CLK pin to determine the current clock mode in order to set
the pll clock parent correctly.

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
---
v2:
* Switched to reading MD_CLK pin to determine mode
---
 drivers/clk/renesas/clk-rz.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

Comments

Simon Horman Aug. 30, 2016, 7:04 a.m. UTC | #1
On Mon, Aug 29, 2016 at 11:13:58PM -0400, Chris Brandt wrote:
> Check the MD_CLK pin to determine the current clock mode in order to set
> the pll clock parent correctly.
> 
> Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
> ---
> v2:
> * Switched to reading MD_CLK pin to determine mode

Thanks, I have queued this up.
--
To unsubscribe from this list: send the line "unsubscribe linux-clk" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman Aug. 30, 2016, 7:06 a.m. UTC | #2
On Tue, Aug 30, 2016 at 09:04:44AM +0200, Simon Horman wrote:
> On Mon, Aug 29, 2016 at 11:13:58PM -0400, Chris Brandt wrote:
> > Check the MD_CLK pin to determine the current clock mode in order to set
> > the pll clock parent correctly.
> > 
> > Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
> > ---
> > v2:
> > * Switched to reading MD_CLK pin to determine mode
> 
> Thanks, I have queued this up.

Sorry, I hit reply to the wrong message
This patch is for Geert not me.

--
To unsubscribe from this list: send the line "unsubscribe linux-clk" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Geert Uytterhoeven Aug. 30, 2016, 7:23 a.m. UTC | #3
Hi Chris,

On Tue, Aug 30, 2016 at 5:13 AM, Chris Brandt <chris.brandt@renesas.com> wrote:
> Check the MD_CLK pin to determine the current clock mode in order to set
> the pll clock parent correctly.
>
> Signed-off-by: Chris Brandt <chris.brandt@renesas.com>

Thanks for your patch!

> ---
> v2:
> * Switched to reading MD_CLK pin to determine mode
> ---
>  drivers/clk/renesas/clk-rz.c | 21 +++++++++++++++++----
>  1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/clk/renesas/clk-rz.c b/drivers/clk/renesas/clk-rz.c
> index f6312c6..2fc8aae 100644
> --- a/drivers/clk/renesas/clk-rz.c
> +++ b/drivers/clk/renesas/clk-rz.c
> @@ -25,6 +25,9 @@ struct rz_cpg {
>  #define CPG_FRQCR      0x10
>  #define CPG_FRQCR2     0x14
>
> +#define PPR0 0xFCFE3200
> +#define PIBC0 0xFCFE7000
> +
>  /* -----------------------------------------------------------------------------
>   * Initialization
>   */
> @@ -37,10 +40,20 @@ rz_cpg_register_clock(struct device_node *np, struct rz_cpg *cpg, const char *na
>         static const unsigned frqcr_tab[4] = { 3, 2, 0, 1 };
>
>         if (strcmp(name, "pll") == 0) {
> -               /* FIXME: cpg_mode should be read from GPIO. But no GPIO support yet */
> -               unsigned cpg_mode = 0; /* hardcoded to EXTAL for now */
> -               const char *parent_name = of_clk_get_parent_name(np, cpg_mode);
> -
> +               unsigned int cpg_mode;
> +               const char *parent_name;
> +               void __iomem *ppr0, *pibc0;
> +
> +               /* MD_CLK is on P0_2 */
> +               ppr0 = ioremap_nocache(PPR0, 2);
> +               pibc0 = ioremap_nocache(PIBC0, 2);
> +               BUG_ON(!ppr0 || !pibc0);
> +               iowrite16(4, pibc0);    /* Enable input buffer */
> +               cpg_mode = ioread16(ppr0) & 4;
> +               iounmap(ppr0);
> +               iounmap(pibc0);
> +
> +               parent_name = cpg_mode ? "usb_x1" : "extal";

If you would use "cpg_mode = (ioread16(ppr0) >> 2) & 1;", the value of
cpg_mode would be in sync with Table 6.2. Then you can avoid relying on actual
clock names in DT, and keep

    parent_name = of_clk_get_parent_name(np, cpg_mode);

The bindings already dictate the parent clocks must match clock modes in the
datasheet, i.e. Table 6.2.

For easier maintenance, I would factor out reading the mode pins in a separate
function. When a proper GPIO driver is added, the function can be removed,
and its callsite updated.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-clk" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Chris Brandt Aug. 30, 2016, 1:31 p.m. UTC | #4
SGkgR2VlcnQsDQoNClRoYW5rIHlvdSBmb3IgdGhlIGdvb2QgcmV2aWV3IQ0KDQoNCk9uIEF1ZyAz
MCwgMjAxNiwgR2VlcnQgVXl0dGVyaG9ldmVuIHdyb3RlOg0KPiBJZiB5b3Ugd291bGQgdXNlICJj
cGdfbW9kZSA9IChpb3JlYWQxNihwcHIwKSA+PiAyKSAmIDE7IiwgdGhlIHZhbHVlIG9mIGNwZ19t
b2RlIHdvdWxkDQo+IGJlIGluIHN5bmMgd2l0aCBUYWJsZSA2LjIuIFRoZW4geW91IGNhbiBhdm9p
ZCByZWx5aW5nIG9uIGFjdHVhbCBjbG9jayBuYW1lcyBpbiBEVCwgYW5kDQo+IGtlZXANCj4NCj4g
ICAgcGFyZW50X25hbWUgPSBvZl9jbGtfZ2V0X3BhcmVudF9uYW1lKG5wLCBjcGdfbW9kZSk7DQo+
DQo+IFRoZSBiaW5kaW5ncyBhbHJlYWR5IGRpY3RhdGUgdGhlIHBhcmVudCBjbG9ja3MgbXVzdCBt
YXRjaCBjbG9jayBtb2RlcyBpbiB0aGUgZGF0YXNoZWV0LA0KPiBpLmUuIFRhYmxlIDYuMi4NCg0K
Q29vbCB0cmljay4gSSBndWVzcyBJIGRvbid0IGdldCB1bmRlcnN0YW5kIGFsbCB0aGUgIkRUIE1h
Z2ljIiB5ZXQuDQpJJ2xsIHVwZGF0ZSB0aGUgcGF0Y2ggYW5kIHJlc2VuZC4NCg0KDQo+IEZvciBl
YXNpZXIgbWFpbnRlbmFuY2UsIEkgd291bGQgZmFjdG9yIG91dCByZWFkaW5nIHRoZSBtb2RlIHBp
bnMgaW4gYSBzZXBhcmF0ZSBmdW5jdGlvbi4NCj4gV2hlbiBhIHByb3BlciBHUElPIGRyaXZlciBp
cyBhZGRlZCwgdGhlIGZ1bmN0aW9uIGNhbiBiZSByZW1vdmVkLCBhbmQgaXRzIGNhbGxzaXRlIHVw
ZGF0ZWQuDQoNCk9LLiBJIHNlZSBzZXR1cC1yY2FyLWdlbjIuYyBoYWQgYSBzZXBhcmF0ZSByY2Fy
X2dlbjJfcmVhZF9tb2RlX3BpbnMoKSBmdW5jdGlvbi4NCkluc2lkZSBvZiBjbGstcnouYyBJJ2xs
IG1ha2UgYSByel9jcGdfcmVhZF9tb2RlX3BpbigpIGZ1bmN0aW9uLg0KDQpDaHJpcw0K
--
To unsubscribe from this list: send the line "unsubscribe linux-clk" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/clk/renesas/clk-rz.c b/drivers/clk/renesas/clk-rz.c
index f6312c6..2fc8aae 100644
--- a/drivers/clk/renesas/clk-rz.c
+++ b/drivers/clk/renesas/clk-rz.c
@@ -25,6 +25,9 @@  struct rz_cpg {
 #define CPG_FRQCR	0x10
 #define CPG_FRQCR2	0x14
 
+#define PPR0 0xFCFE3200
+#define PIBC0 0xFCFE7000
+
 /* -----------------------------------------------------------------------------
  * Initialization
  */
@@ -37,10 +40,20 @@  rz_cpg_register_clock(struct device_node *np, struct rz_cpg *cpg, const char *na
 	static const unsigned frqcr_tab[4] = { 3, 2, 0, 1 };
 
 	if (strcmp(name, "pll") == 0) {
-		/* FIXME: cpg_mode should be read from GPIO. But no GPIO support yet */
-		unsigned cpg_mode = 0; /* hardcoded to EXTAL for now */
-		const char *parent_name = of_clk_get_parent_name(np, cpg_mode);
-
+		unsigned int cpg_mode;
+		const char *parent_name;
+		void __iomem *ppr0, *pibc0;
+
+		/* MD_CLK is on P0_2 */
+		ppr0 = ioremap_nocache(PPR0, 2);
+		pibc0 = ioremap_nocache(PIBC0, 2);
+		BUG_ON(!ppr0 || !pibc0);
+		iowrite16(4, pibc0);	/* Enable input buffer */
+		cpg_mode = ioread16(ppr0) & 4;
+		iounmap(ppr0);
+		iounmap(pibc0);
+
+		parent_name = cpg_mode ? "usb_x1" : "extal";
 		mult = cpg_mode ? (32 / 4) : 30;
 
 		return clk_register_fixed_factor(NULL, name, parent_name, 0, mult, 1);