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

Commit 0cef0203 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'sh-pfc-for-v4.21-tag2' of... 

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

pinctrl: sh-pfc: Updates for v4.21 (take two)

  - Two small fixes for RZ/N1.
parents 34812fe1 3f3327db

drivers/pinctrl/pinctrl-rzn1.c

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ struct rzn1_pinctrl { 
	struct rzn1_pinctrl_regs __iomem *lev2;

	u32 lev1_protect_phys;

	u32 lev2_protect_phys;

	u32 mdio_func[2];

	int mdio_func[2];



	struct rzn1_pin_group *groups;

	unsigned int ngroups;
@@ -810,8 +810,8 @@ static int rzn1_pinctrl_probe_dt(struct platform_device *pdev, 
	struct device_node *np = pdev->dev.of_node;

	struct device_node *child;

	unsigned int maxgroups = 0;

	unsigned int nfuncs = 0;

	unsigned int i = 0;

	int nfuncs = 0;

	int ret;



	nfuncs = of_get_child_count(np);