diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-25 17:23:57 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-25 17:23:57 -0500 |
| commit | 2a859ab07b6ab66f4134c4fffc341398bd3d328c (patch) | |
| tree | c5e7eaf3bffbc18feb326940e39794328d98dc07 /arch/powerpc | |
| parent | cedddd812a79a4fda3885a15711aee3de78c4a24 (diff) | |
| parent | e716e014384688d1a50d1aa5213ee74748c6d4e0 (diff) | |
Merge branch 'merge' into next
Merge my own merge branch to get various fixes from there
and upstream, especially the hvc console tty refcouting fixes
which which testing is quite a bit harder...
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc5200b.dtsi | 6 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/o2d.dtsi | 6 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/pcm030.dts | 7 | ||||
| -rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_pic.c | 9 | ||||
| -rw-r--r-- | arch/powerpc/platforms/pseries/eeh_pe.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/pseries/msi.c | 3 |
6 files changed, 20 insertions, 13 deletions
diff --git a/arch/powerpc/boot/dts/mpc5200b.dtsi b/arch/powerpc/boot/dts/mpc5200b.dtsi index 7ab286ab5300..39ed65a44c5f 100644 --- a/arch/powerpc/boot/dts/mpc5200b.dtsi +++ b/arch/powerpc/boot/dts/mpc5200b.dtsi | |||
| @@ -231,6 +231,12 @@ | |||
| 231 | interrupts = <2 7 0>; | 231 | interrupts = <2 7 0>; |
| 232 | }; | 232 | }; |
| 233 | 233 | ||
| 234 | sclpc@3c00 { | ||
| 235 | compatible = "fsl,mpc5200-lpbfifo"; | ||
| 236 | reg = <0x3c00 0x60>; | ||
| 237 | interrupts = <2 23 0>; | ||
| 238 | }; | ||
| 239 | |||
| 234 | i2c@3d00 { | 240 | i2c@3d00 { |
| 235 | #address-cells = <1>; | 241 | #address-cells = <1>; |
| 236 | #size-cells = <0>; | 242 | #size-cells = <0>; |
diff --git a/arch/powerpc/boot/dts/o2d.dtsi b/arch/powerpc/boot/dts/o2d.dtsi index 3444eb8f0ade..24f668039295 100644 --- a/arch/powerpc/boot/dts/o2d.dtsi +++ b/arch/powerpc/boot/dts/o2d.dtsi | |||
| @@ -86,12 +86,6 @@ | |||
| 86 | reg = <0>; | 86 | reg = <0>; |
| 87 | }; | 87 | }; |
| 88 | }; | 88 | }; |
| 89 | |||
| 90 | sclpc@3c00 { | ||
| 91 | compatible = "fsl,mpc5200-lpbfifo"; | ||
| 92 | reg = <0x3c00 0x60>; | ||
| 93 | interrupts = <3 23 0>; | ||
| 94 | }; | ||
| 95 | }; | 89 | }; |
| 96 | 90 | ||
| 97 | localbus { | 91 | localbus { |
diff --git a/arch/powerpc/boot/dts/pcm030.dts b/arch/powerpc/boot/dts/pcm030.dts index 9e354997eb7e..96512c058033 100644 --- a/arch/powerpc/boot/dts/pcm030.dts +++ b/arch/powerpc/boot/dts/pcm030.dts | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | #gpio-cells = <2>; | 59 | #gpio-cells = <2>; |
| 60 | }; | 60 | }; |
| 61 | 61 | ||
| 62 | psc@2000 { /* PSC1 in ac97 mode */ | 62 | audioplatform: psc@2000 { /* PSC1 in ac97 mode */ |
| 63 | compatible = "mpc5200b-psc-ac97","fsl,mpc5200b-psc-ac97"; | 63 | compatible = "mpc5200b-psc-ac97","fsl,mpc5200b-psc-ac97"; |
| 64 | cell-index = <0>; | 64 | cell-index = <0>; |
| 65 | }; | 65 | }; |
| @@ -134,4 +134,9 @@ | |||
| 134 | localbus { | 134 | localbus { |
| 135 | status = "disabled"; | 135 | status = "disabled"; |
| 136 | }; | 136 | }; |
| 137 | |||
| 138 | sound { | ||
| 139 | compatible = "phytec,pcm030-audio-fabric"; | ||
| 140 | asoc-platform = <&audioplatform>; | ||
| 141 | }; | ||
| 137 | }; | 142 | }; |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c index 8520b58a5e9a..b89ef65392dc 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c | |||
| @@ -372,10 +372,11 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq, | |||
| 372 | case MPC52xx_IRQ_L1_MAIN: irqchip = &mpc52xx_main_irqchip; break; | 372 | case MPC52xx_IRQ_L1_MAIN: irqchip = &mpc52xx_main_irqchip; break; |
| 373 | case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break; | 373 | case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break; |
| 374 | case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break; | 374 | case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break; |
| 375 | default: | 375 | case MPC52xx_IRQ_L1_CRIT: |
| 376 | pr_err("%s: invalid irq: virq=%i, l1=%i, l2=%i\n", | 376 | pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n", |
| 377 | __func__, virq, l1irq, l2irq); | 377 | __func__, l2irq); |
| 378 | return -EINVAL; | 378 | irq_set_chip(virq, &no_irq_chip); |
| 379 | return 0; | ||
| 379 | } | 380 | } |
| 380 | 381 | ||
| 381 | irq_set_chip_and_handler(virq, irqchip, handle_level_irq); | 382 | irq_set_chip_and_handler(virq, irqchip, handle_level_irq); |
diff --git a/arch/powerpc/platforms/pseries/eeh_pe.c b/arch/powerpc/platforms/pseries/eeh_pe.c index 797cd181dc3f..d16c8ded1084 100644 --- a/arch/powerpc/platforms/pseries/eeh_pe.c +++ b/arch/powerpc/platforms/pseries/eeh_pe.c | |||
| @@ -449,7 +449,7 @@ int eeh_rmv_from_parent_pe(struct eeh_dev *edev, int purge_pe) | |||
| 449 | if (list_empty(&pe->edevs)) { | 449 | if (list_empty(&pe->edevs)) { |
| 450 | cnt = 0; | 450 | cnt = 0; |
| 451 | list_for_each_entry(child, &pe->child_list, child) { | 451 | list_for_each_entry(child, &pe->child_list, child) { |
| 452 | if (!(pe->type & EEH_PE_INVALID)) { | 452 | if (!(child->type & EEH_PE_INVALID)) { |
| 453 | cnt++; | 453 | cnt++; |
| 454 | break; | 454 | break; |
| 455 | } | 455 | } |
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c index d19f4977c834..e5b084723131 100644 --- a/arch/powerpc/platforms/pseries/msi.c +++ b/arch/powerpc/platforms/pseries/msi.c | |||
| @@ -220,7 +220,8 @@ static struct device_node *find_pe_dn(struct pci_dev *dev, int *total) | |||
| 220 | 220 | ||
| 221 | /* Get the top level device in the PE */ | 221 | /* Get the top level device in the PE */ |
| 222 | edev = of_node_to_eeh_dev(dn); | 222 | edev = of_node_to_eeh_dev(dn); |
| 223 | edev = list_first_entry(&edev->pe->edevs, struct eeh_dev, list); | 223 | if (edev->pe) |
| 224 | edev = list_first_entry(&edev->pe->edevs, struct eeh_dev, list); | ||
| 224 | dn = eeh_dev_to_of_node(edev); | 225 | dn = eeh_dev_to_of_node(edev); |
| 225 | if (!dn) | 226 | if (!dn) |
| 226 | return NULL; | 227 | return NULL; |