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

Commit 919c1d49 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-soc-for-v5.1' of... 

Merge tag 'renesas-arm-soc-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/fixes

Renesas ARM Based SoC Updates for v5.1

* Correct shared IRQ handling of R-Car Gen2 Regulator quirk
* Add missing dts files to MAINTAINERS

* tag 'renesas-arm-soc-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: Fix R-Car Gen2 regulator quirk
  ARM: shmobile: Add missing dts files to MAINTAINERS

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e61c9200 5347a020

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -2102,6 +2102,8 @@ Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next

S:	Supported

F:	arch/arm/boot/dts/emev2*

F:	arch/arm/boot/dts/gr-peach*

F:	arch/arm/boot/dts/iwg20d-q7*

F:	arch/arm/boot/dts/r7s*

F:	arch/arm/boot/dts/r8a*

F:	arch/arm/boot/dts/r9a*

arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
struct regulator_quirk {

	struct list_head		list;

	const struct of_device_id	*id;

	struct device_node		*np;

	struct of_phandle_args		irq_args;

	struct i2c_msg			i2c_msg;

	bool				shared;	/* IRQ line is shared */
@@ -101,6 +102,9 @@ static int regulator_quirk_notify(struct notifier_block *nb, 
		if (!pos->shared)

			continue;



		if (pos->np->parent != client->dev.parent->of_node)

			continue;



		dev_info(&client->dev, "clearing %s@0x%02x interrupts\n",

			 pos->id->compatible, pos->i2c_msg.addr);
@@ -165,6 +169,7 @@ static int __init rcar_gen2_regulator_quirk(void) 
		memcpy(&quirk->i2c_msg, id->data, sizeof(quirk->i2c_msg));



		quirk->id = id;

		quirk->np = np;

		quirk->i2c_msg.addr = addr;



		ret = of_irq_parse_one(np, 0, argsa);