Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8bac70f authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Geert Uytterhoeven
Browse files

pinctrl: sh-pfc: r8a7794: Add R8A7745 support 



Renesas RZ/G1E (R8A7745) is pin compatible with R-Car E2 (R8A7794),
however it doesn't have several automotive specific peripherals.
Annotate all the items that only exist on the R-Car SoCs...

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
[geert: Drop annotations, as they are implied by pin groups/functions]
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent 13385db5

Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Required Properties: 
    - "renesas,pfc-r8a73a4": for R8A73A4 (R-Mobile APE6) compatible pin-controller.

    - "renesas,pfc-r8a7740": for R8A7740 (R-Mobile A1) compatible pin-controller.

    - "renesas,pfc-r8a7743": for R8A7743 (RZ/G1M) compatible pin-controller.

    - "renesas,pfc-r8a7745": for R8A7745 (RZ/G1E) compatible pin-controller.

    - "renesas,pfc-r8a7778": for R8A7778 (R-Mobile M1) compatible pin-controller.

    - "renesas,pfc-r8a7779": for R8A7779 (R-Car H1) compatible pin-controller.

    - "renesas,pfc-r8a7790": for R8A7790 (R-Car H2) compatible pin-controller.

drivers/pinctrl/sh-pfc/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ config PINCTRL_PFC_R8A7743 
	depends on ARCH_R8A7743

	select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A7745

        def_bool y

        depends on ARCH_R8A7745

        select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A7778

	def_bool y

	depends on ARCH_R8A7778

drivers/pinctrl/sh-pfc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ obj-$(CONFIG_PINCTRL_PFC_EMEV2) += pfc-emev2.o 
obj-$(CONFIG_PINCTRL_PFC_R8A73A4)	+= pfc-r8a73a4.o

obj-$(CONFIG_PINCTRL_PFC_R8A7740)	+= pfc-r8a7740.o

obj-$(CONFIG_PINCTRL_PFC_R8A7743)	+= pfc-r8a7791.o

obj-$(CONFIG_PINCTRL_PFC_R8A7745)	+= pfc-r8a7794.o

obj-$(CONFIG_PINCTRL_PFC_R8A7778)	+= pfc-r8a7778.o

obj-$(CONFIG_PINCTRL_PFC_R8A7779)	+= pfc-r8a7779.o

obj-$(CONFIG_PINCTRL_PFC_R8A7790)	+= pfc-r8a7790.o

drivers/pinctrl/sh-pfc/core.c

+6 −0
Original line number Diff line number Diff line
@@ -491,6 +491,12 @@ static const struct of_device_id sh_pfc_of_table[] = { 
		.data = &r8a7743_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A7745

	{

		.compatible = "renesas,pfc-r8a7745",

		.data = &r8a7745_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A7778

	{

		.compatible = "renesas,pfc-r8a7778",

drivers/pinctrl/sh-pfc/pfc-r8a7794.c

+25 −2
Original line number Diff line number Diff line 
/*

 * r8a7794 processor support - PFC hardware block.

 * r8a7794/r8a7745 processor support - PFC hardware block.

 *

 * Copyright (C) 2014-2015 Renesas Electronics Corporation

 * Copyright (C) 2015 Renesas Solutions Corp.

 * Copyright (C) 2015-2016 Cogent Embedded, Inc., <source@cogentembedded.com>

 * Copyright (C) 2015-2017 Cogent Embedded, Inc. <source@cogentembedded.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2
@@ -5094,6 +5094,28 @@ static const struct sh_pfc_soc_operations r8a7794_pinmux_ops = { 
	.pin_to_pocctrl = r8a7794_pin_to_pocctrl,

};



#ifdef CONFIG_PINCTRL_PFC_R8A7745

const struct sh_pfc_soc_info r8a7745_pinmux_info = {

	.name = "r8a77450_pfc",

	.unlock_reg = 0xe6060000, /* PMMR */



	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },



	.pins = pinmux_pins,

	.nr_pins = ARRAY_SIZE(pinmux_pins),

	.groups = pinmux_groups,

	.nr_groups = ARRAY_SIZE(pinmux_groups),

	.functions = pinmux_functions,

	.nr_functions = ARRAY_SIZE(pinmux_functions),



	.cfg_regs = pinmux_config_regs,



	.pinmux_data = pinmux_data,

	.pinmux_data_size = ARRAY_SIZE(pinmux_data),

};

#endif



#ifdef CONFIG_PINCTRL_PFC_R8A7794

const struct sh_pfc_soc_info r8a7794_pinmux_info = {

	.name = "r8a77940_pfc",

	.ops = &r8a7794_pinmux_ops,
@@ -5113,3 +5135,4 @@ const struct sh_pfc_soc_info r8a7794_pinmux_info = { 
	.pinmux_data = pinmux_data,

	.pinmux_data_size = ARRAY_SIZE(pinmux_data),

};

#endif