Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts powerpc: Fix dma_map_sg() cache flushing on non coherent platforms
This commit is contained in:
commit
a771132783
2 changed files with 9 additions and 8 deletions
|
@ -91,6 +91,14 @@
|
||||||
interrupts = <18 0x8>;
|
interrupts = <18 0x8>;
|
||||||
interrupt-parent = <&ipic>;
|
interrupt-parent = <&ipic>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
mcu_pio: mcu@a {
|
||||||
|
#gpio-cells = <2>;
|
||||||
|
compatible = "fsl,mc9s08qg8-mpc8349emitx",
|
||||||
|
"fsl,mcu-mpc8349emitx";
|
||||||
|
reg = <0x0a>;
|
||||||
|
gpio-controller;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
spi@7000 {
|
spi@7000 {
|
||||||
|
@ -139,14 +147,6 @@
|
||||||
interrupt-parent = <&ipic>;
|
interrupt-parent = <&ipic>;
|
||||||
interrupts = <71 8>;
|
interrupts = <71 8>;
|
||||||
};
|
};
|
||||||
|
|
||||||
mcu_pio: mcu@a {
|
|
||||||
#gpio-cells = <2>;
|
|
||||||
compatible = "fsl,mc9s08qg8-mpc8349emitx",
|
|
||||||
"fsl,mcu-mpc8349emitx";
|
|
||||||
reg = <0x0a>;
|
|
||||||
gpio-controller;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
usb@22000 {
|
usb@22000 {
|
||||||
|
|
|
@ -75,6 +75,7 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
|
||||||
for_each_sg(sgl, sg, nents, i) {
|
for_each_sg(sgl, sg, nents, i) {
|
||||||
sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev);
|
sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev);
|
||||||
sg->dma_length = sg->length;
|
sg->dma_length = sg->length;
|
||||||
|
__dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);
|
||||||
}
|
}
|
||||||
|
|
||||||
return nents;
|
return nents;
|
||||||
|
|
Reference in a new issue