1 From 5cb8ea9dfcea4092fd3710cce3980a44433dc58f Mon Sep 17 00:00:00 2001
2 From: Minghuan Lian <Minghuan.Lian@nxp.com>
3 Date: Tue, 17 Jan 2017 17:32:35 +0800
4 Subject: [PATCH 04/13] irqchip/ls-scfg-msi: fix typo of MSI compatible strings
6 Cherry-pick patchwork patch with context adjustment.
8 The patch is to fix typo of the Layerscape SCFG MSI dts compatible
9 strings. "1" is replaced by "l".
11 Signed-off-by: Minghuan Lian <Minghuan.Lian@nxp.com>
12 Acked-by: Rob Herring <robh@kernel.org>
13 Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
15 .../devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt | 6 +++---
16 drivers/irqchip/irq-ls-scfg-msi.c | 6 ++++--
17 2 files changed, 7 insertions(+), 5 deletions(-)
19 diff --git a/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt b/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt
20 index 9e38949..2755cd1 100644
21 --- a/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt
22 +++ b/Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt
23 @@ -4,8 +4,8 @@ Required properties:
25 - compatible: should be "fsl,<soc-name>-msi" to identify
26 Layerscape PCIe MSI controller block such as:
31 - msi-controller: indicates that this is a PCIe MSI controller node
32 - reg: physical base address of the controller and length of memory mapped.
33 - interrupts: an interrupt to the parent interrupt controller.
34 @@ -23,7 +23,7 @@ MSI controller node
37 msi1: msi-controller@1571000 {
38 - compatible = "fsl,1s1043a-msi";
39 + compatible = "fsl,ls1043a-msi";
40 reg = <0x0 0x1571000 0x0 0x8>,
42 interrupts = <0 116 0x4>;
43 diff --git a/drivers/irqchip/irq-ls-scfg-msi.c b/drivers/irqchip/irq-ls-scfg-msi.c
44 index 47520fa..5b16f4a 100644
45 --- a/drivers/irqchip/irq-ls-scfg-msi.c
46 +++ b/drivers/irqchip/irq-ls-scfg-msi.c
47 @@ -220,8 +220,10 @@ static int ls_scfg_msi_remove(struct platform_device *pdev)
49 static const struct of_device_id ls_scfg_msi_id[] = {
50 { .compatible = "fsl,ls1012a-msi", },
51 - { .compatible = "fsl,1s1021a-msi", },
52 - { .compatible = "fsl,1s1043a-msi", },
53 + { .compatible = "fsl,1s1021a-msi", }, /* a typo */
54 + { .compatible = "fsl,1s1043a-msi", }, /* a typo */
55 + { .compatible = "fsl,ls1021a-msi", },
56 + { .compatible = "fsl,ls1043a-msi", },
57 { .compatible = "fsl,ls1046a-msi", },