Skip to content

Commit cf39e60

Browse files
author
Marc Zyngier
committed
Merge branch irq/generic_handle_domain_irq into irq/irqchip-next
- Tree-wide conversion to generic_handle_domain_irq() - irqdomain documentation update Drag the pinctl ib-rockchip branch to resolve conflicts. * irq/generic_handle_domain_irq: pinctrl/rockchip: drop the gpio related codes gpio/rockchip: drop irq_gc_lock/irq_gc_unlock for irq set type gpio/rockchip: support next version gpio controller gpio/rockchip: use struct rockchip_gpio_regs for gpio controller gpio/rockchip: add driver for rockchip gpio dt-bindings: gpio: change items restriction of clock for rockchip,gpio-bank pinctrl/rockchip: add pinctrl device to gpio bank struct pinctrl/rockchip: separate struct rockchip_pin_bank to a head file pinctrl/rockchip: always enable clock for gpio controller Signed-off-by: Marc Zyngier <[email protected]>
2 parents 4513fb8 + 6ecd53f commit cf39e60

File tree

6 files changed

+1089
-887
lines changed

6 files changed

+1089
-887
lines changed

Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ properties:
2222
maxItems: 1
2323

2424
clocks:
25-
maxItems: 1
25+
minItems: 1
26+
items:
27+
- description: APB interface clock source
28+
- description: GPIO debounce reference clock source
2629

2730
gpio-controller: true
2831

drivers/gpio/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,14 @@ config GPIO_REG
520520
A 32-bit single register GPIO fixed in/out implementation. This
521521
can be used to represent any register as a set of GPIO signals.
522522

523+
config GPIO_ROCKCHIP
524+
tristate "Rockchip GPIO support"
525+
depends on ARCH_ROCKCHIP || COMPILE_TEST
526+
select GPIOLIB_IRQCHIP
527+
default ARCH_ROCKCHIP
528+
help
529+
Say yes here to support GPIO on Rockchip SoCs.
530+
523531
config GPIO_SAMA5D2_PIOBU
524532
tristate "SAMA5D2 PIOBU GPIO support"
525533
depends on MFD_SYSCON

drivers/gpio/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ obj-$(CONFIG_GPIO_RDA) += gpio-rda.o
128128
obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o
129129
obj-$(CONFIG_GPIO_REALTEK_OTTO) += gpio-realtek-otto.o
130130
obj-$(CONFIG_GPIO_REG) += gpio-reg.o
131+
obj-$(CONFIG_GPIO_ROCKCHIP) += gpio-rockchip.o
131132
obj-$(CONFIG_ARCH_SA1100) += gpio-sa1100.o
132133
obj-$(CONFIG_GPIO_SAMA5D2_PIOBU) += gpio-sama5d2-piobu.o
133134
obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o

0 commit comments

Comments
 (0)