mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 00:22:00 +02:00
FSL SOC Changes for 6.17:
- Use dev_fwnode() instead of of_fwnode_handle() - Use new GPIO line value setter callbacks -----BEGIN PGP SIGNATURE----- iJIEABYKADoWIQQQ/+b4s5DeF6zCYyNoqS/rAbjdeAUCaG9cHRwcY2hyaXN0b3Bo ZS5sZXJveUBjc2dyb3VwLmV1AAoJEGipL+sBuN14RH0A/RtUuPKD0WO77GCuKyWm /k0NfZn/QnpR2m1+WPQ5EjRwAP4qsR5bEAM7OY8m+BBdZPgWR3Si5l3zH11KEm8p RlpECw== =ehqy -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmh+Uo0ACgkQmmx57+YA GNlnVA//Wn6thIIadTjlVarRQ8uV5V3ATR0ipKpP1bNSJA46EMj5fG32w02iD3P2 h5OgJ8xQUlnxMrbDIfctPEtF7N0uodE/KfW3d4Cgl5jHYS1QVZUFDHIkMD2QZy0j yuz265Cpv4jRIQBQP6d+2dEVY+hHF499hIUMKa33k7zf+X2zxLl07iYbjEvTQ5a7 26K7HHNDJg+AgjzPzfmCkXiz8bM8/bKZ45UvwaWU/jr4U/cdrWl/1KCUKWqupDol wW7EDO8XVKxsbUpqV9Nknh9vFZJxhDVlIxP6Pkwa671vuzedm4faeXIL3P/dc6OB 0JA3wgPLlEJ248xdkAr3EbIvEeoE60VISHFobkks4juY573G2GGRnStVBjukDSMY fKMDEAXu6yAhB7evvyh+lI+thhNYxxYJLb3aX6xL27zR28qpWdA7uHFCGHsB8IP/ 2Pt7hBVu4sXNeas/a/zXMwZkSe2L5LNYUKOIT6aQMrp3Dq9+okBezkHsbVR2K3I2 Ehr1TQYPUw9XVoze1hvceTfCYa+tLkPkA815qYGSD+jE5h/5BRYvDETOol6Aw1wU rzo0x4ZBQ6RcHffzZFfWk/xHk1fyejjS+zJ6Glk2uapsI5UKGHXtoZMpUczfJJ86 qDAQGpllNMItjatVwvLVXUBChebDeTEazHnUhdYo1Rin5G3+GI8= =pjEW -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
d60b1224b9
|
|
@ -57,7 +57,7 @@ static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio)
|
|||
return !!(ioread32be(®s->cpdata) & pin_mask);
|
||||
}
|
||||
|
||||
static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
|
||||
static int qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
|
||||
{
|
||||
struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
|
||||
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)
|
|||
iowrite32be(qe_gc->cpdata, ®s->cpdata);
|
||||
|
||||
spin_unlock_irqrestore(&qe_gc->lock, flags);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void qe_gpio_set_multiple(struct gpio_chip *gc,
|
||||
|
|
@ -317,7 +319,7 @@ static int __init qe_add_gpiochips(void)
|
|||
gc->direction_input = qe_gpio_dir_in;
|
||||
gc->direction_output = qe_gpio_dir_out;
|
||||
gc->get = qe_gpio_get;
|
||||
gc->set = qe_gpio_set;
|
||||
gc->set_rv = qe_gpio_set;
|
||||
gc->set_multiple = qe_gpio_set_multiple;
|
||||
|
||||
ret = of_mm_gpiochip_add_data(np, mm_gc, qe_gc);
|
||||
|
|
|
|||
|
|
@ -407,7 +407,6 @@ static int qe_ic_init(struct platform_device *pdev)
|
|||
void (*high_handler)(struct irq_desc *desc);
|
||||
struct qe_ic *qe_ic;
|
||||
struct resource *res;
|
||||
struct device_node *node = pdev->dev.of_node;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (res == NULL) {
|
||||
|
|
@ -441,7 +440,7 @@ static int qe_ic_init(struct platform_device *pdev)
|
|||
high_handler = NULL;
|
||||
}
|
||||
|
||||
qe_ic->irqhost = irq_domain_create_linear(of_fwnode_handle(node), NR_QE_IC_INTS,
|
||||
qe_ic->irqhost = irq_domain_create_linear(dev_fwnode(&pdev->dev), NR_QE_IC_INTS,
|
||||
&qe_ic_host_ops, qe_ic);
|
||||
if (qe_ic->irqhost == NULL) {
|
||||
dev_err(dev, "failed to add irq domain\n");
|
||||
|
|
|
|||
|
|
@ -2500,8 +2500,7 @@ static int tegra_pmc_irq_init(struct tegra_pmc *pmc)
|
|||
pmc->irq.irq_set_type = pmc->soc->irq_set_type;
|
||||
pmc->irq.irq_set_wake = pmc->soc->irq_set_wake;
|
||||
|
||||
pmc->domain = irq_domain_create_hierarchy(parent, 0, 96,
|
||||
of_fwnode_handle(pmc->dev->of_node),
|
||||
pmc->domain = irq_domain_create_hierarchy(parent, 0, 96, dev_fwnode(pmc->dev),
|
||||
&tegra_pmc_irq_domain_ops, pmc);
|
||||
if (!pmc->domain) {
|
||||
dev_err(pmc->dev, "failed to allocate domain\n");
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user