diff options
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8349emitx.dts | 16 | ||||
| -rw-r--r-- | arch/powerpc/kernel/dma.c | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index 2c9d54a35bc3..4bdbaf4993a1 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts | |||
| @@ -91,6 +91,14 @@ | |||
| 91 | interrupts = <18 0x8>; | 91 | interrupts = <18 0x8>; |
| 92 | interrupt-parent = <&ipic>; | 92 | interrupt-parent = <&ipic>; |
| 93 | }; | 93 | }; |
| 94 | |||
| 95 | mcu_pio: mcu@a { | ||
| 96 | #gpio-cells = <2>; | ||
| 97 | compatible = "fsl,mc9s08qg8-mpc8349emitx", | ||
| 98 | "fsl,mcu-mpc8349emitx"; | ||
| 99 | reg = <0x0a>; | ||
| 100 | gpio-controller; | ||
| 101 | }; | ||
| 94 | }; | 102 | }; |
| 95 | 103 | ||
| 96 | spi@7000 { | 104 | spi@7000 { |
| @@ -139,14 +147,6 @@ | |||
| 139 | interrupt-parent = <&ipic>; | 147 | interrupt-parent = <&ipic>; |
| 140 | interrupts = <71 8>; | 148 | interrupts = <71 8>; |
| 141 | }; | 149 | }; |
| 142 | |||
| 143 | mcu_pio: mcu@a { | ||
| 144 | #gpio-cells = <2>; | ||
| 145 | compatible = "fsl,mc9s08qg8-mpc8349emitx", | ||
| 146 | "fsl,mcu-mpc8349emitx"; | ||
| 147 | reg = <0x0a>; | ||
| 148 | gpio-controller; | ||
| 149 | }; | ||
| 150 | }; | 150 | }; |
| 151 | 151 | ||
| 152 | usb@22000 { | 152 | usb@22000 { |
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 1562daf8839a..3a6eaa876ee1 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c | |||
| @@ -75,6 +75,7 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, | |||
| 75 | for_each_sg(sgl, sg, nents, i) { | 75 | for_each_sg(sgl, sg, nents, i) { |
| 76 | sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev); | 76 | sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev); |
| 77 | sg->dma_length = sg->length; | 77 | sg->dma_length = sg->length; |
| 78 | __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction); | ||
| 78 | } | 79 | } |
| 79 | 80 | ||
| 80 | return nents; | 81 | return nents; |
