Skip to content

Commit 5f931b5

Browse files
committed
Merge tag 'renesas-drivers-for-v6.17-tag1' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/drivers
Renesas driver updates for v6.17 - Initial support for the Renesas RZ/T2H (R9A09G077) and RZ/N2H (R9A09G087) SoCs, - Convert the RZ/V2M External Power Sequence Controller (PWC) driver to the new GPIO line value setter callbacks. * tag 'renesas-drivers-for-v6.17-tag1' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: soc: renesas: pwc-rzv2m: Use new GPIO line value setter callbacks soc: renesas: Add RZ/N2H (R9A09G087) config option soc: renesas: Add RZ/T2H (R9A09G077) config option Link: https://lore.kernel.org/r/cover.1751026661.git.geert+renesas@glider.be Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 86731a2 + 1cf74da commit 5f931b5

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

drivers/soc/renesas/Kconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,18 @@ config ARCH_R9A09G057
408408
help
409409
This enables support for the Renesas RZ/V2H(P) SoC variants.
410410

411+
config ARCH_R9A09G077
412+
bool "ARM64 Platform support for RZ/T2H"
413+
default y if ARCH_RENESAS
414+
help
415+
This enables support for the Renesas RZ/T2H SoC variants.
416+
417+
config ARCH_R9A09G087
418+
bool "ARM64 Platform support for RZ/N2H"
419+
default y if ARCH_RENESAS
420+
help
421+
This enables support for the Renesas RZ/N2H SoC variants.
422+
411423
endif # ARM64
412424

413425
if RISCV

drivers/soc/renesas/pwc-rzv2m.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ struct rzv2m_pwc_priv {
2424
DECLARE_BITMAP(ch_en_bits, 2);
2525
};
2626

27-
static void rzv2m_pwc_gpio_set(struct gpio_chip *chip, unsigned int offset,
28-
int value)
27+
static int rzv2m_pwc_gpio_set(struct gpio_chip *chip, unsigned int offset,
28+
int value)
2929
{
3030
struct rzv2m_pwc_priv *priv = gpiochip_get_data(chip);
3131
u32 reg;
@@ -38,6 +38,8 @@ static void rzv2m_pwc_gpio_set(struct gpio_chip *chip, unsigned int offset,
3838
writel(reg, priv->base + PWC_GPIO);
3939

4040
assign_bit(offset, priv->ch_en_bits, value);
41+
42+
return 0;
4143
}
4244

4345
static int rzv2m_pwc_gpio_get(struct gpio_chip *chip, unsigned int offset)
@@ -62,7 +64,7 @@ static const struct gpio_chip rzv2m_pwc_gc = {
6264
.label = "gpio_rzv2m_pwc",
6365
.owner = THIS_MODULE,
6466
.get = rzv2m_pwc_gpio_get,
65-
.set = rzv2m_pwc_gpio_set,
67+
.set_rv = rzv2m_pwc_gpio_set,
6668
.direction_output = rzv2m_pwc_gpio_direction_output,
6769
.can_sleep = false,
6870
.ngpio = 2,

0 commit comments

Comments
 (0)