Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 34641de2ef118b9c78a842fb75e6d3cc49c1de31

Authored by Axel Lin
Committed by Arnd Bergmann
1 parent e0bf102e1d
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq() 

Since commit 6384fd "ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ",
I got buid errors due to implicit declaration of function 'IRQ_GPIO'.

Use common gpio_to_irq() to replace machine dependant macro IRQ_GPIO().

Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Ian Molton <spyro@f2s.com>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Zhuang <haojian.zhuang@marvell.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Showing 6 changed files with 18 additions and 12 deletions Side-by-side Diff

drivers/pcmcia/pxa2xx_e740.c
Diff comments   View file @ 34641de
... ... @@ -26,20 +26,23 @@
26 26 static struct pcmcia_irqs cd_irqs[] = {
27 27 {
28 28 .sock = 0,
29   - .irq = IRQ_GPIO(GPIO_E740_PCMCIA_CD0),
30 29 .str = "CF card detect"
31 30 },
32 31 {
33 32 .sock = 1,
34   - .irq = IRQ_GPIO(GPIO_E740_PCMCIA_CD1),
35 33 .str = "Wifi switch"
36 34 },
37 35 };
38 36  
39 37 static int e740_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
40 38 {
41   - skt->socket.pci_irq = skt->nr == 0 ? IRQ_GPIO(GPIO_E740_PCMCIA_RDY0) :
42   - IRQ_GPIO(GPIO_E740_PCMCIA_RDY1);
  39 + if (skt->nr == 0)
  40 + skt->socket.pci_irq = gpio_to_irq(GPIO_E740_PCMCIA_RDY0);
  41 + else
  42 + skt->socket.pci_irq = gpio_to_irq(GPIO_E740_PCMCIA_RDY1);
  43 +
  44 + cd_irqs[0].irq = gpio_to_irq(GPIO_E740_PCMCIA_CD0);
  45 + cd_irqs[1].irq = gpio_to_irq(GPIO_E740_PCMCIA_CD1);
43 46  
44 47 return soc_pcmcia_request_irqs(skt, &cd_irqs[skt->nr], 1);
45 48 }
drivers/pcmcia/pxa2xx_palmld.c
Diff comments   View file @ 34641de
... ... @@ -33,7 +33,7 @@
33 33 ret = gpio_request_array(palmld_pcmcia_gpios,
34 34 ARRAY_SIZE(palmld_pcmcia_gpios));
35 35  
36   - skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY);
  36 + skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMLD_PCMCIA_READY);
37 37  
38 38 return ret;
39 39 }
drivers/pcmcia/pxa2xx_palmtc.c
Diff comments   View file @ 34641de
... ... @@ -37,7 +37,7 @@
37 37 ret = gpio_request_array(palmtc_pcmcia_gpios,
38 38 ARRAY_SIZE(palmtc_pcmcia_gpios));
39 39  
40   - skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMTC_PCMCIA_READY);
  40 + skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMTC_PCMCIA_READY);
41 41  
42 42 return ret;
43 43 }
drivers/pcmcia/pxa2xx_stargate2.c
Diff comments   View file @ 34641de
... ... @@ -34,7 +34,7 @@
34 34 #define SG2_S0_GPIO_READY 81
35 35  
36 36 static struct pcmcia_irqs irqs[] = {
37   - { 0, IRQ_GPIO(SG2_S0_GPIO_DETECT), "PCMCIA0 CD" },
  37 + {.sock = 0, .str = "PCMCIA0 CD" },
38 38 };
39 39  
40 40 static struct gpio sg2_pcmcia_gpios[] = {
... ... @@ -44,7 +44,9 @@
44 44  
45 45 static int sg2_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
46 46 {
47   - skt->socket.pci_irq = IRQ_GPIO(SG2_S0_GPIO_READY);
  47 + skt->socket.pci_irq = gpio_to_irq(SG2_S0_GPIO_READY);
  48 + irqs[0].irq = gpio_to_irq(SG2_S0_GPIO_DETECT);
  49 +
48 50 return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
49 51 }
50 52  
drivers/pcmcia/pxa2xx_trizeps4.c
Diff comments   View file @ 34641de
... ... @@ -30,7 +30,7 @@
30 30 extern void board_pcmcia_power(int power);
31 31  
32 32 static struct pcmcia_irqs irqs[] = {
33   - { 0, IRQ_GPIO(GPIO_PCD), "cs0_cd" }
  33 + { .sock = 0, .str = "cs0_cd" }
34 34 /* on other baseboards we can have more inputs */
35 35 };
36 36  
... ... @@ -53,7 +53,8 @@
53 53 gpio_free(GPIO_PRDY);
54 54 return -EINVAL;
55 55 }
56   - skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY);
  56 + skt->socket.pci_irq = gpio_to_irq(GPIO_PRDY);
  57 + irqs[0].irq = gpio_to_irq(GPIO_PCD);
57 58 break;
58 59 default:
59 60 break;
drivers/pcmcia/pxa2xx_vpac270.c
Diff comments   View file @ 34641de
... ... @@ -38,12 +38,10 @@
38 38 static struct pcmcia_irqs cd_irqs[] = {
39 39 {
40 40 .sock = 0,
41   - .irq = IRQ_GPIO(GPIO84_VPAC270_PCMCIA_CD),
42 41 .str = "PCMCIA CD"
43 42 },
44 43 {
45 44 .sock = 1,
46   - .irq = IRQ_GPIO(GPIO17_VPAC270_CF_CD),
47 45 .str = "CF CD"
48 46 },
49 47 };
... ... @@ -57,6 +55,7 @@
57 55 ARRAY_SIZE(vpac270_pcmcia_gpios));
58 56  
59 57 skt->socket.pci_irq = gpio_to_irq(GPIO35_VPAC270_PCMCIA_RDY);
  58 + cd_irqs[0].irq = gpio_to_irq(GPIO84_VPAC270_PCMCIA_CD);
60 59  
61 60 if (!ret)
62 61 ret = soc_pcmcia_request_irqs(skt, &cd_irqs[0], 1);
... ... @@ -65,6 +64,7 @@
65 64 ARRAY_SIZE(vpac270_cf_gpios));
66 65  
67 66 skt->socket.pci_irq = gpio_to_irq(GPIO12_VPAC270_CF_RDY);
  67 + cd_irqs[1].irq = gpio_to_irq(GPIO17_VPAC270_CF_CD);
68 68  
69 69 if (!ret)
70 70 ret = soc_pcmcia_request_irqs(skt, &cd_irqs[1], 1);