clk: imx: Make the i.MX8MQ CCM clock driver CLK_IMX8MQ dependant

Commit Message

Abel Vesa Dec. 13, 2018, 4:17 p.m. UTC

Remove the dependency between the i.MX8MQ CCM clock driver
and the CONFIG_SOC_IMX8MQ and use CONFIG_CLK_IMX8MQ instead.
CONFIG_CLK_IMX8MQ depends on ARCH_MXC && ARM64.

Signed-off-by: Abel Vesa <[e-mail]>
---
 drivers/clk/Kconfig      | 1 +
 drivers/clk/imx/Kconfig  | 5 +++++
 drivers/clk/imx/Makefile | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 drivers/clk/imx/Kconfig

Comments

Daniel Baluta Dec. 13, 2018, 4:22 p.m. UTC | #1

<snip>

> --- a/drivers/clk/imx/Makefile
> +++ b/drivers/clk/imx/Makefile
> @@ -34,5 +34,6 @@ obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o
>  obj-$(CONFIG_SOC_IMX6UL) += clk-imx6ul.o
>  obj-$(CONFIG_SOC_IMX7D)  += clk-imx7d.o
>  obj-$(CONFIG_SOC_IMX7ULP) += clk-imx7ulp.o
> -obj-$(CONFIG_SOC_IMX8MQ) += clk-imx8mq.o
>  obj-$(CONFIG_SOC_VF610)  += clk-vf610.o
> +
> +obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o

Nit: Do we want to keep CONFIG_ sorted?

Aisheng Dong Dec. 13, 2018, 4:51 p.m. UTC | #2

[...]

> > --- a/drivers/clk/imx/Makefile
> > +++ b/drivers/clk/imx/Makefile
> > @@ -34,5 +34,6 @@ obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o
> >  obj-$(CONFIG_SOC_IMX6UL) += clk-imx6ul.o
> >  obj-$(CONFIG_SOC_IMX7D)  += clk-imx7d.o
> >  obj-$(CONFIG_SOC_IMX7ULP) += clk-imx7ulp.o
> > -obj-$(CONFIG_SOC_IMX8MQ) += clk-imx8mq.o
> >  obj-$(CONFIG_SOC_VF610)  += clk-vf610.o
> > +
> > +obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o
> 
> Nit: Do we want to keep CONFIG_ sorted?

IMHO It might be okay to make MX8 (ARM64) a new group to start
To get a clear separation. (Slightly not sorted due to VF610)
Anyway, it leaves to Stephen to make the judge.

Regards
Dong Aisheng

Stephen Boyd Dec. 13, 2018, 10:04 p.m. UTC | #3

Quoting Aisheng Dong (2018-12-13 08:51:18)
> [...]
> 
> > > --- a/drivers/clk/imx/Makefile
> > > +++ b/drivers/clk/imx/Makefile
> > > @@ -34,5 +34,6 @@ obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o
> > >  obj-$(CONFIG_SOC_IMX6UL) += clk-imx6ul.o
> > >  obj-$(CONFIG_SOC_IMX7D)  += clk-imx7d.o
> > >  obj-$(CONFIG_SOC_IMX7ULP) += clk-imx7ulp.o
> > > -obj-$(CONFIG_SOC_IMX8MQ) += clk-imx8mq.o
> > >  obj-$(CONFIG_SOC_VF610)  += clk-vf610.o
> > > +
> > > +obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o
> > 
> > Nit: Do we want to keep CONFIG_ sorted?
> 
> IMHO It might be okay to make MX8 (ARM64) a new group to start
> To get a clear separation. (Slightly not sorted due to VF610)
> Anyway, it leaves to Stephen to make the judge.
> 

This is fine to split the two if they're not related. Just have a
comment indicating this.

Shawn Guo Dec. 14, 2018, 1:01 a.m. UTC | #4

On Thu, Dec 13, 2018 at 04:51:18PM +0000, Aisheng Dong wrote:
> [...]
> 
> > > --- a/drivers/clk/imx/Makefile
> > > +++ b/drivers/clk/imx/Makefile
> > > @@ -34,5 +34,6 @@ obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o
> > >  obj-$(CONFIG_SOC_IMX6UL) += clk-imx6ul.o
> > >  obj-$(CONFIG_SOC_IMX7D)  += clk-imx7d.o
> > >  obj-$(CONFIG_SOC_IMX7ULP) += clk-imx7ulp.o
> > > -obj-$(CONFIG_SOC_IMX8MQ) += clk-imx8mq.o
> > >  obj-$(CONFIG_SOC_VF610)  += clk-vf610.o
> > > +
> > > +obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o
> > 
> > Nit: Do we want to keep CONFIG_ sorted?
> 
> IMHO It might be okay to make MX8 (ARM64) a new group to start
> To get a clear separation. (Slightly not sorted due to VF610)
> Anyway, it leaves to Stephen to make the judge.

I think Daniel is suggesting that we put CONFIG_CLK_IMX8MQ prior to
CONFIG_SOC_IMX1, so that all CONFIG_CLK_xxx options go before
CONFIG_SOC_xxx and the list is still naturally alphabetically sorted.

Shawn

Stephen Boyd Dec. 14, 2018, 1:40 a.m. UTC | #5

Quoting Shawn Guo (2018-12-13 17:01:02)
> On Thu, Dec 13, 2018 at 04:51:18PM +0000, Aisheng Dong wrote:
> > [...]
> > 
> > > > --- a/drivers/clk/imx/Makefile
> > > > +++ b/drivers/clk/imx/Makefile
> > > > @@ -34,5 +34,6 @@ obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o
> > > >  obj-$(CONFIG_SOC_IMX6UL) += clk-imx6ul.o
> > > >  obj-$(CONFIG_SOC_IMX7D)  += clk-imx7d.o
> > > >  obj-$(CONFIG_SOC_IMX7ULP) += clk-imx7ulp.o
> > > > -obj-$(CONFIG_SOC_IMX8MQ) += clk-imx8mq.o
> > > >  obj-$(CONFIG_SOC_VF610)  += clk-vf610.o
> > > > +
> > > > +obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o
> > > 
> > > Nit: Do we want to keep CONFIG_ sorted?
> > 
> > IMHO It might be okay to make MX8 (ARM64) a new group to start
> > To get a clear separation. (Slightly not sorted due to VF610)
> > Anyway, it leaves to Stephen to make the judge.
> 
> I think Daniel is suggesting that we put CONFIG_CLK_IMX8MQ prior to
> CONFIG_SOC_IMX1, so that all CONFIG_CLK_xxx options go before
> CONFIG_SOC_xxx and the list is still naturally alphabetically sorted.
> 

Fine by me. Please resend this patch with the final decision.

Daniel Baluta Dec. 14, 2018, 2:11 p.m. UTC | #6

On Fri, Dec 14, 2018 at 3:02 AM Shawn Guo <[e-mail]> wrote:
>
> On Thu, Dec 13, 2018 at 04:51:18PM +0000, Aisheng Dong wrote:
> > [...]
> >
> > > > --- a/drivers/clk/imx/Makefile
> > > > +++ b/drivers/clk/imx/Makefile
> > > > @@ -34,5 +34,6 @@ obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o
> > > >  obj-$(CONFIG_SOC_IMX6UL) += clk-imx6ul.o
> > > >  obj-$(CONFIG_SOC_IMX7D)  += clk-imx7d.o
> > > >  obj-$(CONFIG_SOC_IMX7ULP) += clk-imx7ulp.o
> > > > -obj-$(CONFIG_SOC_IMX8MQ) += clk-imx8mq.o
> > > >  obj-$(CONFIG_SOC_VF610)  += clk-vf610.o
> > > > +
> > > > +obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o
> > >
> > > Nit: Do we want to keep CONFIG_ sorted?
> >
> > IMHO It might be okay to make MX8 (ARM64) a new group to start
> > To get a clear separation. (Slightly not sorted due to VF610)
> > Anyway, it leaves to Stephen to make the judge.
>
> I think Daniel is suggesting that we put CONFIG_CLK_IMX8MQ prior to
> CONFIG_SOC_IMX1, so that all CONFIG_CLK_xxx options go before
> CONFIG_SOC_xxx and the list is still naturally alphabetically sorted.

Yes, that's correct.

Patch

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 2dc12bf..833353c 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -293,6 +293,7 @@  config COMMON_CLK_BD718XX
 source "drivers/clk/actions/Kconfig"
 source "drivers/clk/bcm/Kconfig"
 source "drivers/clk/hisilicon/Kconfig"
+source "drivers/clk/imx/Kconfig"
 source "drivers/clk/imgtec/Kconfig"
 source "drivers/clk/ingenic/Kconfig"
 source "drivers/clk/keystone/Kconfig"
diff --git a/drivers/clk/imx/Kconfig b/drivers/clk/imx/Kconfig
new file mode 100644
index 0000000..98ede6a
--- /dev/null
+++ b/drivers/clk/imx/Kconfig
@@ -0,0 +1,5 @@ 
+config CLK_IMX8MQ
+	bool "IMX8MQ CCM Clock Driver"
+	depends on ARCH_MXC && ARM64
+	help
+	    Build the driver for i.MX8MQ CCM Clock Driver
diff --git a/drivers/clk/imx/Makefile b/drivers/clk/imx/Makefile
index 5c0b11e..01e5f55 100644
--- a/drivers/clk/imx/Makefile
+++ b/drivers/clk/imx/Makefile
@@ -34,5 +34,6 @@  obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o
 obj-$(CONFIG_SOC_IMX6UL) += clk-imx6ul.o
 obj-$(CONFIG_SOC_IMX7D)  += clk-imx7d.o
 obj-$(CONFIG_SOC_IMX7ULP) += clk-imx7ulp.o
-obj-$(CONFIG_SOC_IMX8MQ) += clk-imx8mq.o
 obj-$(CONFIG_SOC_VF610)  += clk-vf610.o
+
+obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o