diff mbox series

[4.4.y,04/52] ARM: shmobile: r8a77470: Add clock index macros for DT sources

Message ID 1557761837-24993-5-git-send-email-fabrizio.castro@bp.renesas.com (mailing list archive)
State Accepted
Headers show
Series Add basic support for the iwg23s | expand

Commit Message

Fabrizio Castro May 13, 2019, 3:36 p.m. UTC
Add macros usable by device tree sources to reference the r8a77470
clocks by index.

Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
---
 include/dt-bindings/clock/r8a77470-clock.h | 140 +++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 include/dt-bindings/clock/r8a77470-clock.h

Comments

Pavel Machek May 13, 2019, 7:03 p.m. UTC | #1
On Mon 2019-05-13 16:36:29, Fabrizio Castro wrote:
> Add macros usable by device tree sources to reference the r8a77470
> clocks by index.

Is this commit in the mainline? I could not find it in recent mainline
nor in -next kernel.

> diff --git a/include/dt-bindings/clock/r8a77470-clock.h b/include/dt-bindings/clock/r8a77470-clock.h
> new file mode 100644
> index 0000000..2f20bcc
> --- /dev/null
> +++ b/include/dt-bindings/clock/r8a77470-clock.h
> @@ -0,0 +1,140 @@
> +/*
> + * Copyright (C) 2019 Renesas Electronics Corporation
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + */

World is moving to SPDX. (But you want to fix it in the mainline, not
here, so...)

Best regards,
									Pavel
Nobuhiro Iwamatsu May 13, 2019, 11:56 p.m. UTC | #2
Hi,

On Mon, May 13, 2019 at 09:03:22PM +0200, Pavel Machek wrote:
> On Mon 2019-05-13 16:36:29, Fabrizio Castro wrote:
> > Add macros usable by device tree sources to reference the r8a77470
> > clocks by index.
> 
> Is this commit in the mainline? I could not find it in recent mainline
> nor in -next kernel.
> 
> > diff --git a/include/dt-bindings/clock/r8a77470-clock.h b/include/dt-bindings/clock/r8a77470-clock.h
> > new file mode 100644
> > index 0000000..2f20bcc
> > --- /dev/null
> > +++ b/include/dt-bindings/clock/r8a77470-clock.h
> > @@ -0,0 +1,140 @@
> > +/*
> > + * Copyright (C) 2019 Renesas Electronics Corporation
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License as published by
> > + * the Free Software Foundation; either version 2 of the License, or
> > + * (at your option) any later version.
> > + */
> 
> World is moving to SPDX. (But you want to fix it in the mainline, not
> here, so...)
> 

CIP has _Upstream first_ policy. So we can not apply this patch.
Fabrizio, if you can not backport, please include the reason in the commit log.

Best regards,
  Nobuhiro
Fabrizio Castro May 14, 2019, 9:50 a.m. UTC | #3
Hello Nobuhiro-san, hello Pavel,

> -----Original Message-----
> From: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> Sent: 14 May 2019 00:57
> To: Pavel Machek <pavel@denx.de>
> Cc: Fabrizio Castro <fabrizio.castro@bp.renesas.com>; cip-dev@lists.cip-project.org; Biju Das <biju.das@bp.renesas.com>
> Subject: Re: [cip-dev] [PATCH 4.4.y 04/52] ARM: shmobile: r8a77470: Add clock index macros for DT sources
> 
> Hi,
> 
> On Mon, May 13, 2019 at 09:03:22PM +0200, Pavel Machek wrote:
> > On Mon 2019-05-13 16:36:29, Fabrizio Castro wrote:
> > > Add macros usable by device tree sources to reference the r8a77470
> > > clocks by index.
> >
> > Is this commit in the mainline? I could not find it in recent mainline
> > nor in -next kernel.
> >
> > > diff --git a/include/dt-bindings/clock/r8a77470-clock.h b/include/dt-bindings/clock/r8a77470-clock.h
> > > new file mode 100644
> > > index 0000000..2f20bcc
> > > --- /dev/null
> > > +++ b/include/dt-bindings/clock/r8a77470-clock.h
> > > @@ -0,0 +1,140 @@
> > > +/*
> > > + * Copyright (C) 2019 Renesas Electronics Corporation
> > > + *
> > > + * This program is free software; you can redistribute it and/or modify
> > > + * it under the terms of the GNU General Public License as published by
> > > + * the Free Software Foundation; either version 2 of the License, or
> > > + * (at your option) any later version.
> > > + */
> >
> > World is moving to SPDX. (But you want to fix it in the mainline, not
> > here, so...)

I can confirm this file is not coming from mainline, it's brand you, would you like
me to send a patch for this?

> >
> 
> CIP has _Upstream first_ policy. So we can not apply this patch.
> Fabrizio, if you can not backport, please include the reason in the commit log.

For some things backporting is not possible, especially for the clocks as the driver
architecture has changed so much over time that the code in mainline is not
applicable in here. We have found ourselves at crossroads in the past because of
this, and after discussing this with Ben (who is now reading us in copy) we all
agreed it made sense to add new commits to compensate for differences between
mainline and the CIP version we need to backport the patches to.

In particular, this patch comes from the same context as the below patches:
* bdc09aa64336 ("ARM: shmobile: r8a7745: Add clock index macros for DT sources")
* 9683f2eba952 ("ARM: shmobile: r8a7743: Add clock index macros for DT sources")
And therefore the commit messages are all very similar.

Could you please suggest a format for new commits you would be comfortable with
so that we know what to do?

Thanks,
Fab

> 
> Best regards,
>   Nobuhiro
Nobuhiro Iwamatsu May 14, 2019, 1:43 p.m. UTC | #4
Hi,

2019年5月14日(火) 18:50 Fabrizio Castro <fabrizio.castro@bp.renesas.com>:
>
> Hello Nobuhiro-san, hello Pavel,
>
> > -----Original Message-----
> > From: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> > Sent: 14 May 2019 00:57
> > To: Pavel Machek <pavel@denx.de>
> > Cc: Fabrizio Castro <fabrizio.castro@bp.renesas.com>; cip-dev@lists.cip-project.org; Biju Das <biju.das@bp.renesas.com>
> > Subject: Re: [cip-dev] [PATCH 4.4.y 04/52] ARM: shmobile: r8a77470: Add clock index macros for DT sources
> >
> > Hi,
> >
> > On Mon, May 13, 2019 at 09:03:22PM +0200, Pavel Machek wrote:
> > > On Mon 2019-05-13 16:36:29, Fabrizio Castro wrote:
> > > > Add macros usable by device tree sources to reference the r8a77470
> > > > clocks by index.
> > >
> > > Is this commit in the mainline? I could not find it in recent mainline
> > > nor in -next kernel.
> > >
> > > > diff --git a/include/dt-bindings/clock/r8a77470-clock.h b/include/dt-bindings/clock/r8a77470-clock.h
> > > > new file mode 100644
> > > > index 0000000..2f20bcc
> > > > --- /dev/null
> > > > +++ b/include/dt-bindings/clock/r8a77470-clock.h
> > > > @@ -0,0 +1,140 @@
> > > > +/*
> > > > + * Copyright (C) 2019 Renesas Electronics Corporation
> > > > + *
> > > > + * This program is free software; you can redistribute it and/or modify
> > > > + * it under the terms of the GNU General Public License as published by
> > > > + * the Free Software Foundation; either version 2 of the License, or
> > > > + * (at your option) any later version.
> > > > + */
> > >
> > > World is moving to SPDX. (But you want to fix it in the mainline, not
> > > here, so...)
>
> I can confirm this file is not coming from mainline, it's brand you, would you like
> me to send a patch for this?
>
> > >
> >
> > CIP has _Upstream first_ policy. So we can not apply this patch.
> > Fabrizio, if you can not backport, please include the reason in the commit log.
>
> For some things backporting is not possible, especially for the clocks as the driver
> architecture has changed so much over time that the code in mainline is not
> applicable in here. We have found ourselves at crossroads in the past because of
> this, and after discussing this with Ben (who is now reading us in copy) we all
> agreed it made sense to add new commits to compensate for differences between
> mainline and the CIP version we need to backport the patches to.
>

I understand that some patches can not backport because the frameworks
don't match.

> In particular, this patch comes from the same context as the below patches:
> * bdc09aa64336 ("ARM: shmobile: r8a7745: Add clock index macros for DT sources")
> * 9683f2eba952 ("ARM: shmobile: r8a7743: Add clock index macros for DT sources")
> And therefore the commit messages are all very similar.
>

I see.

> Could you please suggest a format for new commits you would be comfortable with
> so that we know what to do?

I do not think that the format is necessary. I wrote in other emails,
it's easy to understand
why it's not a backport patch, as it is written in the commit message.

Do you think about this?

Best regards,
  Nobuhiro
Fabrizio Castro May 15, 2019, 12:58 p.m. UTC | #5
Hello Nobuhiro-san

Thank you for your feedback!

> From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Sent: 14 May 2019 14:43
> Subject: Re: [cip-dev] [PATCH 4.4.y 04/52] ARM: shmobile: r8a77470: Add clock index macros for DT sources
> 
> Hi,
> 
> 2019年5月14日(火) 18:50 Fabrizio Castro <fabrizio.castro@bp.renesas.com>:
> >
> > Hello Nobuhiro-san, hello Pavel,
> >
> > > -----Original Message-----
> > > From: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> > > Sent: 14 May 2019 00:57
> > > To: Pavel Machek <pavel@denx.de>
> > > Cc: Fabrizio Castro <fabrizio.castro@bp.renesas.com>; cip-dev@lists.cip-project.org; Biju Das <biju.das@bp.renesas.com>
> > > Subject: Re: [cip-dev] [PATCH 4.4.y 04/52] ARM: shmobile: r8a77470: Add clock index macros for DT sources
> > >
> > > Hi,
> > >
> > > On Mon, May 13, 2019 at 09:03:22PM +0200, Pavel Machek wrote:
> > > > On Mon 2019-05-13 16:36:29, Fabrizio Castro wrote:
> > > > > Add macros usable by device tree sources to reference the r8a77470
> > > > > clocks by index.
> > > >
> > > > Is this commit in the mainline? I could not find it in recent mainline
> > > > nor in -next kernel.
> > > >
> > > > > diff --git a/include/dt-bindings/clock/r8a77470-clock.h b/include/dt-bindings/clock/r8a77470-clock.h
> > > > > new file mode 100644
> > > > > index 0000000..2f20bcc
> > > > > --- /dev/null
> > > > > +++ b/include/dt-bindings/clock/r8a77470-clock.h
> > > > > @@ -0,0 +1,140 @@
> > > > > +/*
> > > > > + * Copyright (C) 2019 Renesas Electronics Corporation
> > > > > + *
> > > > > + * This program is free software; you can redistribute it and/or modify
> > > > > + * it under the terms of the GNU General Public License as published by
> > > > > + * the Free Software Foundation; either version 2 of the License, or
> > > > > + * (at your option) any later version.
> > > > > + */
> > > >
> > > > World is moving to SPDX. (But you want to fix it in the mainline, not
> > > > here, so...)
> >
> > I can confirm this file is not coming from mainline, it's brand you, would you like
> > me to send a patch for this?
> >
> > > >
> > >
> > > CIP has _Upstream first_ policy. So we can not apply this patch.
> > > Fabrizio, if you can not backport, please include the reason in the commit log.
> >
> > For some things backporting is not possible, especially for the clocks as the driver
> > architecture has changed so much over time that the code in mainline is not
> > applicable in here. We have found ourselves at crossroads in the past because of
> > this, and after discussing this with Ben (who is now reading us in copy) we all
> > agreed it made sense to add new commits to compensate for differences between
> > mainline and the CIP version we need to backport the patches to.
> >
> 
> I understand that some patches can not backport because the frameworks
> don't match.
> 
> > In particular, this patch comes from the same context as the below patches:
> > * bdc09aa64336 ("ARM: shmobile: r8a7745: Add clock index macros for DT sources")
> > * 9683f2eba952 ("ARM: shmobile: r8a7743: Add clock index macros for DT sources")
> > And therefore the commit messages are all very similar.
> >
> 
> I see.
> 
> > Could you please suggest a format for new commits you would be comfortable with
> > so that we know what to do?
> 
> I do not think that the format is necessary. I wrote in other emails,
> it's easy to understand
> why it's not a backport patch, as it is written in the commit message.
> 
> Do you think about this?

Ok, it sounds good to me.

Thanks,
Fab

> 
> Best regards,
>   Nobuhiro
> 
> --
> Nobuhiro Iwamatsu
>    iwamatsu at {nigauri.org / debian.org}
>    GPG ID: 40AD1FA6
diff mbox series

Patch

diff --git a/include/dt-bindings/clock/r8a77470-clock.h b/include/dt-bindings/clock/r8a77470-clock.h
new file mode 100644
index 0000000..2f20bcc
--- /dev/null
+++ b/include/dt-bindings/clock/r8a77470-clock.h
@@ -0,0 +1,140 @@ 
+/*
+ * Copyright (C) 2019 Renesas Electronics Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __DT_BINDINGS_CLOCK_R8A77470_H__
+#define __DT_BINDINGS_CLOCK_R8A77470_H__
+
+/* CPG */
+#define R8A77470_CLK_MAIN		0
+#define R8A77470_CLK_PLL0		1
+#define R8A77470_CLK_PLL1		2
+#define R8A77470_CLK_PLL3		3
+#define R8A77470_CLK_LB			4
+#define R8A77470_CLK_QSPI		5
+#define R8A77470_CLK_SDH		6
+#define R8A77470_CLK_SD0		7
+#define R8A77470_CLK_SD1		8
+#define R8A77470_CLK_RCAN		9
+
+/* MSTP0 */
+#define R8A77470_CLK_MSIOF0		0
+
+/* MSTP1 */
+#define R8A77470_CLK_VCP0		1
+#define R8A77470_CLK_VPC0		3
+#define R8A77470_CLK_STB		4
+#define R8A77470_CLK_TMU1		11
+#define R8A77470_CLK_3DG		12
+#define R8A77470_CLK_2DDMAC		15
+#define R8A77470_CLK_FDP1_0		19
+#define R8A77470_CLK_TMU3		21
+#define R8A77470_CLK_TMU2		22
+#define R8A77470_CLK_CMT0		24
+#define R8A77470_CLK_VSP1DU0		28
+#define R8A77470_CLK_VSP1_SY		31
+
+/* MSTP2 */
+#define R8A77470_CLK_MSIOF2		5
+#define R8A77470_CLK_MSIOF1		8
+#define R8A77470_CLK_SYS_DMAC1		18
+#define R8A77470_CLK_SYS_DMAC0		19
+
+/* MSTP3 */
+#define R8A77470_CLK_SDHI2		12
+#define R8A77470_CLK_SDHI1		13
+#define R8A77470_CLK_SDHI0		14
+#define R8A77470_CLK_USBHS_DMAC0_CH1	26
+#define R8A77470_CLK_USBHS_DMAC1_CH1	27
+#define R8A77470_CLK_CMT1		29
+#define R8A77470_CLK_USBHS_DMAC0_CH0	30
+#define R8A77470_CLK_USBHS_DMAC1_CH0	31
+
+/* MSTP4 */
+#define R8A77470_CLK_RWDT		2
+#define R8A77470_CLK_USB_DDM0		6
+#define R8A77470_CLK_IRQC		7
+#define R8A77470_CLK_INTC_SYS		8
+#define R8A77470_CLK_USB_DDM1		9
+
+/* MSTP5 */
+#define R8A77470_CLK_AUDIO_DMAC0	2
+#define R8A77470_CLK_PWM		23
+#define R8A77470_CLK_BOOT_ROM		30
+
+/* MSTP7 */
+#define R8A77470_CLK_USB_EHCI_0		3
+#define R8A77470_CLK_USBHS0		4
+#define R8A77470_CLK_USB_EHCI_1		5
+#define R8A77470_CLK_USBHS1		6
+#define R8A77470_CLK_HSCIF2		13
+#define R8A77470_CLK_SCIF5		14
+#define R8A77470_CLK_SCIF4		15
+#define R8A77470_CLK_HSCIF1		16
+#define R8A77470_CLK_HSCIF0		17
+#define R8A77470_CLK_SCIF3		18
+#define R8A77470_CLK_SCIF2		19
+#define R8A77470_CLK_SCIF1		20
+#define R8A77470_CLK_SCIF0		21
+#define R8A77470_CLK_DU1		23
+#define R8A77470_CLK_DU0		24
+#define R8A77470_CLK_LVDS		26
+#define R8A77470_CLK_DVE		27
+
+/* MSTP8 */
+#define R8A77470_CLK_IPMMU_SGX		0
+#define R8A77470_CLK_DVD		1
+#define R8A77470_CLK_VIN1		10
+#define R8A77470_CLK_VIN0		11
+#define R8A77470_CLK_ETHERAVB		12
+#define R8A77470_CLK_ETHER		13
+
+/* MSTP9 */
+#define R8A77470_CLK_IR_RECEIVER	3
+#define R8A77470_CLK_GPIO5		7
+#define R8A77470_CLK_GPIO4		8
+#define R8A77470_CLK_GPIO3		9
+#define R8A77470_CLK_GPIO2		10
+#define R8A77470_CLK_GPIO1		11
+#define R8A77470_CLK_GPIO0		12
+#define R8A77470_CLK_CAN1		15
+#define R8A77470_CLK_CAN0		16
+#define R8A77470_CLK_QUAD_SPI1		17
+#define R8A77470_CLK_QUAD_SPI0		18
+#define R8A77470_CLK_ADG		22
+#define R8A77470_CLK_I2C4		27
+#define R8A77470_CLK_I2C3		28
+#define R8A77470_CLK_I2C2		29
+#define R8A77470_CLK_I2C1		30
+#define R8A77470_CLK_I2C0		31
+
+/* MSTP10 */
+#define R8A77470_CLK_SSI_ALL		5
+#define R8A77470_CLK_SSI9		6
+#define R8A77470_CLK_SSI8		7
+#define R8A77470_CLK_SSI7		8
+#define R8A77470_CLK_SSI6		9
+#define R8A77470_CLK_SSI5		10
+#define R8A77470_CLK_SSI4		11
+#define R8A77470_CLK_SSI3		12
+#define R8A77470_CLK_SSI2		13
+#define R8A77470_CLK_SSI1		14
+#define R8A77470_CLK_SSI0		15
+#define R8A77470_CLK_SCU_ALL		17
+#define R8A77470_CLK_SCU_DVC1		18
+#define R8A77470_CLK_SCU_DVC0		19
+#define R8A77470_CLK_SCU_CTU1_MIX1	20
+#define R8A77470_CLK_SCU_CTU0_MIX0	21
+#define R8A77470_CLK_SCU_SRC6		25
+#define R8A77470_CLK_SCU_SRC5		26
+#define R8A77470_CLK_SCU_SRC4		27
+#define R8A77470_CLK_SCU_SRC3		28
+#define R8A77470_CLK_SCU_SRC2		29
+#define R8A77470_CLK_SCU_SRC1		30
+
+#endif /* __DT_BINDINGS_CLOCK_R8A77470_H__ */