Commit 6fe7c07a authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'sh-pfc-for-v5.8-tag2' of... 

Merge tag 'sh-pfc-for-v5.8-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel

pinctrl: sh-pfc: Updates for v5.8 (take two)

  - Add support for the new RZ/G1H (r8a7742) SoC,
  - Minor fixes and improvements.
parents d04996ea dfae0422

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

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required Properties: 
    - "renesas,pfc-emev2": for EMEV2 (EMMA Mobile EV2) compatible pin-controller.

    - "renesas,pfc-r8a73a4": for R8A73A4 (R-Mobile APE6) compatible pin-controller.

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

    - "renesas,pfc-r8a7742": for R8A7742 (RZ/G1H) compatible pin-controller.

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

    - "renesas,pfc-r8a7744": for R8A7744 (RZ/G1N) compatible pin-controller.

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

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -13344,7 +13344,7 @@ F: drivers/pinctrl/qcom/ 
PIN CONTROLLER - RENESAS

M:	Geert Uytterhoeven <geert+renesas@glider.be>

L:	linux-renesas-soc@vger.kernel.org

S:	Maintained

S:	Supported

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc

F:	Documentation/devicetree/bindings/pinctrl/renesas,*

F:	drivers/pinctrl/pinctrl-rz*

drivers/pinctrl/pinctrl-rza1.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ struct rza1_bidir_entry { 
};



/**

 * rza1_swio_pin - describe a single pin that needs bidir flag applied.

 * rza1_swio_pin - describe a single pin that needs swio flag applied.

 */

struct rza1_swio_pin {

	u16 pin: 4;

drivers/pinctrl/sh-pfc/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config PINCTRL_SH_PFC 
	select PINCTRL_PFC_EMEV2 if ARCH_EMEV2

	select PINCTRL_PFC_R8A73A4 if ARCH_R8A73A4

	select PINCTRL_PFC_R8A7740 if ARCH_R8A7740

	select PINCTRL_PFC_R8A7742 if ARCH_R8A7742

	select PINCTRL_PFC_R8A7743 if ARCH_R8A7743

	select PINCTRL_PFC_R8A7744 if ARCH_R8A7744

	select PINCTRL_PFC_R8A7745 if ARCH_R8A7745
@@ -74,6 +75,9 @@ config PINCTRL_PFC_R8A7740 
	bool "R-Mobile A1 pin control support" if COMPILE_TEST

	select PINCTRL_SH_PFC_GPIO



config PINCTRL_PFC_R8A7742

	bool "RZ/G1H pin control support" if COMPILE_TEST



config PINCTRL_PFC_R8A7743

	bool "RZ/G1M pin control support" if COMPILE_TEST

drivers/pinctrl/sh-pfc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ obj-$(CONFIG_PINCTRL_SH_PFC_GPIO) += gpio.o 
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_R8A7742)	+= pfc-r8a7790.o

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

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

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