Skip to content

Commit d60b122

Browse files
committed
Merge tag 'soc_fsl-6.17-1' of https://github.com/chleroy/linux into soc/drivers
FSL SOC Changes for 6.17: - Use dev_fwnode() instead of of_fwnode_handle() - Use new GPIO line value setter callbacks * tag 'soc_fsl-6.17-1' of https://github.com/chleroy/linux: soc: Use dev_fwnode() soc: fsl: qe: use new GPIO line value setter callbacks Link: https://lore.kernel.org/r/c947d537-cae5-44f0-abd8-0c558bac46d2@csgroup.eu Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 708109c + 76760b9 commit d60b122

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/soc/fsl/qe/gpio.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio)
5757
return !!(ioread32be(&regs->cpdata) & pin_mask);
5858
}
5959

60-
static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
60+
static int qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
6161
{
6262
struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
6363
struct qe_gpio_chip *qe_gc = gpiochip_get_data(gc);
@@ -75,6 +75,8 @@ static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
7575
iowrite32be(qe_gc->cpdata, &regs->cpdata);
7676

7777
spin_unlock_irqrestore(&qe_gc->lock, flags);
78+
79+
return 0;
7880
}
7981

8082
static void qe_gpio_set_multiple(struct gpio_chip *gc,
@@ -317,7 +319,7 @@ static int __init qe_add_gpiochips(void)
317319
gc->direction_input = qe_gpio_dir_in;
318320
gc->direction_output = qe_gpio_dir_out;
319321
gc->get = qe_gpio_get;
320-
gc->set = qe_gpio_set;
322+
gc->set_rv = qe_gpio_set;
321323
gc->set_multiple = qe_gpio_set_multiple;
322324

323325
ret = of_mm_gpiochip_add_data(np, mm_gc, qe_gc);

drivers/soc/fsl/qe/qe_ic.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@ static int qe_ic_init(struct platform_device *pdev)
407407
void (*high_handler)(struct irq_desc *desc);
408408
struct qe_ic *qe_ic;
409409
struct resource *res;
410-
struct device_node *node = pdev->dev.of_node;
411410

412411
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
413412
if (res == NULL) {
@@ -441,7 +440,7 @@ static int qe_ic_init(struct platform_device *pdev)
441440
high_handler = NULL;
442441
}
443442

444-
qe_ic->irqhost = irq_domain_create_linear(of_fwnode_handle(node), NR_QE_IC_INTS,
443+
qe_ic->irqhost = irq_domain_create_linear(dev_fwnode(&pdev->dev), NR_QE_IC_INTS,
445444
&qe_ic_host_ops, qe_ic);
446445
if (qe_ic->irqhost == NULL) {
447446
dev_err(dev, "failed to add irq domain\n");

drivers/soc/tegra/pmc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2500,8 +2500,7 @@ static int tegra_pmc_irq_init(struct tegra_pmc *pmc)
25002500
pmc->irq.irq_set_type = pmc->soc->irq_set_type;
25012501
pmc->irq.irq_set_wake = pmc->soc->irq_set_wake;
25022502

2503-
pmc->domain = irq_domain_create_hierarchy(parent, 0, 96,
2504-
of_fwnode_handle(pmc->dev->of_node),
2503+
pmc->domain = irq_domain_create_hierarchy(parent, 0, 96, dev_fwnode(pmc->dev),
25052504
&tegra_pmc_irq_domain_ops, pmc);
25062505
if (!pmc->domain) {
25072506
dev_err(pmc->dev, "failed to allocate domain\n");

0 commit comments

Comments
 (0)