| Message ID | 20220809125959.217333-3-ralph.siemsen@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Renesas RZ/N1 SoC initial support | expand |
On 8/9/22 8:59 AM, Ralph Siemsen wrote: > Allow CONFIG_CLK_RENESAS to be set without bringing in RCAR-GEN2/3 code. > > CONFIG_RENESAS is used in drivers/clk/Makefile to control recursion into > the drivers/clk/renesas subdirectory. It also controls compilation of > renesas-cpg-mssr.c support code for the RCAR-GEN2 and RCAR-GEN3 devices. > > The support code contains platform specific hardware access (TMU_BASE), > and it is not needed for other Renesas devices such as RZ/N1. Therefore, > alter Makefile to build renesas-cpg-mssr.c only for RCAR-GEN2 and RCAR-GEN3. > > Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> > --- > > drivers/clk/renesas/Kconfig | 2 +- > drivers/clk/renesas/Makefile | 5 ++--- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/clk/renesas/Kconfig b/drivers/clk/renesas/Kconfig > index f4d6ef9f93..c53ff3ce01 100644 > --- a/drivers/clk/renesas/Kconfig > +++ b/drivers/clk/renesas/Kconfig > @@ -1,6 +1,6 @@ > config CLK_RENESAS > bool "Renesas clock drivers" > - depends on CLK && ARCH_RMOBILE > + depends on CLK && (ARCH_RMOBILE || ARCH_RZN1) > help > Enable support for clock present on Renesas RCar SoCs. > > diff --git a/drivers/clk/renesas/Makefile b/drivers/clk/renesas/Makefile > index 36a5ca65f4..2cd2c69f68 100644 > --- a/drivers/clk/renesas/Makefile > +++ b/drivers/clk/renesas/Makefile > @@ -1,5 +1,4 @@ > -obj-$(CONFIG_CLK_RENESAS) += renesas-cpg-mssr.o > -obj-$(CONFIG_CLK_RCAR_GEN2) += clk-rcar-gen2.o > +obj-$(CONFIG_CLK_RCAR_GEN2) += clk-rcar-gen2.o renesas-cpg-mssr.o > obj-$(CONFIG_CLK_R8A774A1) += r8a774a1-cpg-mssr.o > obj-$(CONFIG_CLK_R8A774B1) += r8a774b1-cpg-mssr.o > obj-$(CONFIG_CLK_R8A774C0) += r8a774c0-cpg-mssr.o > @@ -9,7 +8,7 @@ obj-$(CONFIG_CLK_R8A7791) += r8a7791-cpg-mssr.o > obj-$(CONFIG_CLK_R8A7792) += r8a7792-cpg-mssr.o > obj-$(CONFIG_CLK_R8A7793) += r8a7791-cpg-mssr.o > obj-$(CONFIG_CLK_R8A7794) += r8a7794-cpg-mssr.o > -obj-$(CONFIG_CLK_RCAR_GEN3) += clk-rcar-gen3.o > +obj-$(CONFIG_CLK_RCAR_GEN3) += clk-rcar-gen3.o renesas-cpg-mssr.o > obj-$(CONFIG_CLK_R8A7795) += r8a7795-cpg-mssr.o > obj-$(CONFIG_CLK_R8A7796) += r8a7796-cpg-mssr.o > obj-$(CONFIG_CLK_R8A77965) += r8a77965-cpg-mssr.o > Reviewed-by: Sean Anderson <seanga2@gmail.com>
diff --git a/drivers/clk/renesas/Kconfig b/drivers/clk/renesas/Kconfig index f4d6ef9f93..c53ff3ce01 100644 --- a/drivers/clk/renesas/Kconfig +++ b/drivers/clk/renesas/Kconfig @@ -1,6 +1,6 @@ config CLK_RENESAS bool "Renesas clock drivers" - depends on CLK && ARCH_RMOBILE + depends on CLK && (ARCH_RMOBILE || ARCH_RZN1) help Enable support for clock present on Renesas RCar SoCs. diff --git a/drivers/clk/renesas/Makefile b/drivers/clk/renesas/Makefile index 36a5ca65f4..2cd2c69f68 100644 --- a/drivers/clk/renesas/Makefile +++ b/drivers/clk/renesas/Makefile @@ -1,5 +1,4 @@ -obj-$(CONFIG_CLK_RENESAS) += renesas-cpg-mssr.o -obj-$(CONFIG_CLK_RCAR_GEN2) += clk-rcar-gen2.o +obj-$(CONFIG_CLK_RCAR_GEN2) += clk-rcar-gen2.o renesas-cpg-mssr.o obj-$(CONFIG_CLK_R8A774A1) += r8a774a1-cpg-mssr.o obj-$(CONFIG_CLK_R8A774B1) += r8a774b1-cpg-mssr.o obj-$(CONFIG_CLK_R8A774C0) += r8a774c0-cpg-mssr.o @@ -9,7 +8,7 @@ obj-$(CONFIG_CLK_R8A7791) += r8a7791-cpg-mssr.o obj-$(CONFIG_CLK_R8A7792) += r8a7792-cpg-mssr.o obj-$(CONFIG_CLK_R8A7793) += r8a7791-cpg-mssr.o obj-$(CONFIG_CLK_R8A7794) += r8a7794-cpg-mssr.o -obj-$(CONFIG_CLK_RCAR_GEN3) += clk-rcar-gen3.o +obj-$(CONFIG_CLK_RCAR_GEN3) += clk-rcar-gen3.o renesas-cpg-mssr.o obj-$(CONFIG_CLK_R8A7795) += r8a7795-cpg-mssr.o obj-$(CONFIG_CLK_R8A7796) += r8a7796-cpg-mssr.o obj-$(CONFIG_CLK_R8A77965) += r8a77965-cpg-mssr.o
Allow CONFIG_CLK_RENESAS to be set without bringing in RCAR-GEN2/3 code. CONFIG_RENESAS is used in drivers/clk/Makefile to control recursion into the drivers/clk/renesas subdirectory. It also controls compilation of renesas-cpg-mssr.c support code for the RCAR-GEN2 and RCAR-GEN3 devices. The support code contains platform specific hardware access (TMU_BASE), and it is not needed for other Renesas devices such as RZ/N1. Therefore, alter Makefile to build renesas-cpg-mssr.c only for RCAR-GEN2 and RCAR-GEN3. Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> --- drivers/clk/renesas/Kconfig | 2 +- drivers/clk/renesas/Makefile | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)