Skip to content

Commit 43090d6

Browse files
billy-tsaiBartosz Golaszewski
authored andcommitted
gpio: aspeed-sgpio: Convert IRQ functions to use llops callbacks
Update aspeed_sgpio_irq_handler() and aspeed_sgpio_setup_irqs() to use the llops callbacks for register access instead of direct iowrite32(). This creates a unified hardware access layer, which is essential for supporting SoCs with different register layouts like the AST2700. Additionally, change the loop bounds to use ngpio instead of the static ARRAY_SIZE(aspeed_sgpio_banks). This allows the driver to adapt to the actual number of supported pins on the running SoC. Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com> Link: https://lore.kernel.org/r/20260123-upstream_sgpio-v2-4-69cfd1631400@aspeedtech.com Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
1 parent a3d37e0 commit 43090d6

1 file changed

Lines changed: 10 additions & 12 deletions

File tree

drivers/gpio/gpio-aspeed-sgpio.c

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,13 @@ static void aspeed_sgpio_irq_handler(struct irq_desc *desc)
319319
struct gpio_chip *gc = irq_desc_get_handler_data(desc);
320320
struct irq_chip *ic = irq_desc_get_chip(desc);
321321
struct aspeed_sgpio *data = gpiochip_get_data(gc);
322-
unsigned int i, p;
322+
unsigned int i, p, banks;
323323
unsigned long reg;
324324

325325
chained_irq_enter(ic, desc);
326326

327-
for (i = 0; i < ARRAY_SIZE(aspeed_sgpio_banks); i++) {
327+
banks = DIV_ROUND_UP(gc->ngpio, 64);
328+
for (i = 0; i < banks; i++) {
328329
reg = data->pdata->llops->reg_bank_get(data, i << 6, reg_irq_status);
329330

330331
for_each_set_bit(p, &reg, 32)
@@ -355,7 +356,6 @@ static int aspeed_sgpio_setup_irqs(struct aspeed_sgpio *gpio,
355356
struct platform_device *pdev)
356357
{
357358
int rc, i;
358-
const struct aspeed_sgpio_bank *bank;
359359
struct gpio_irq_chip *irq;
360360

361361
rc = platform_get_irq(pdev, 0);
@@ -365,12 +365,11 @@ static int aspeed_sgpio_setup_irqs(struct aspeed_sgpio *gpio,
365365
gpio->irq = rc;
366366

367367
/* Disable IRQ and clear Interrupt status registers for all SGPIO Pins. */
368-
for (i = 0; i < ARRAY_SIZE(aspeed_sgpio_banks); i++) {
369-
bank = &aspeed_sgpio_banks[i];
368+
for (i = 0; i < gpio->chip.ngpio; i += 2) {
370369
/* disable irq enable bits */
371-
iowrite32(0x00000000, bank_reg(gpio, bank, reg_irq_enable));
370+
gpio->pdata->llops->reg_bit_set(gpio, i, reg_irq_enable, 0);
372371
/* clear status bits */
373-
iowrite32(0xffffffff, bank_reg(gpio, bank, reg_irq_status));
372+
gpio->pdata->llops->reg_bit_set(gpio, i, reg_irq_status, 1);
374373
}
375374

376375
irq = &gpio->chip.irq;
@@ -384,14 +383,13 @@ static int aspeed_sgpio_setup_irqs(struct aspeed_sgpio *gpio,
384383
irq->num_parents = 1;
385384

386385
/* Apply default IRQ settings */
387-
for (i = 0; i < ARRAY_SIZE(aspeed_sgpio_banks); i++) {
388-
bank = &aspeed_sgpio_banks[i];
386+
for (i = 0; i < gpio->chip.ngpio; i += 2) {
389387
/* set falling or level-low irq */
390-
iowrite32(0x00000000, bank_reg(gpio, bank, reg_irq_type0));
388+
gpio->pdata->llops->reg_bit_set(gpio, i, reg_irq_type0, 0);
391389
/* trigger type is edge */
392-
iowrite32(0x00000000, bank_reg(gpio, bank, reg_irq_type1));
390+
gpio->pdata->llops->reg_bit_set(gpio, i, reg_irq_type1, 0);
393391
/* single edge trigger */
394-
iowrite32(0x00000000, bank_reg(gpio, bank, reg_irq_type2));
392+
gpio->pdata->llops->reg_bit_set(gpio, i, reg_irq_type2, 0);
395393
}
396394

397395
return 0;

0 commit comments

Comments
 (0)