tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds a7711327 2433c417

+9 -8
unified split
+8 -8
arch/powerpc/boot/dts/mpc8349emitx.dts
··· 91 interrupts = <18 0x8>; 92 interrupt-parent = <&ipic>; 93 }; 94 }; 95 96 spi@7000 { ··· 146 cell-index = <3>; 147 interrupt-parent = <&ipic>; 148 interrupts = <71 8>; 149 - }; 150 - 151 - mcu_pio: mcu@a { 152 - #gpio-cells = <2>; 153 - compatible = "fsl,mc9s08qg8-mpc8349emitx", 154 - "fsl,mcu-mpc8349emitx"; 155 - reg = <0x0a>; 156 - gpio-controller; 157 }; 158 }; 159
··· 91 interrupts = <18 0x8>; 92 interrupt-parent = <&ipic>; 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 + }; 102 }; 103 104 spi@7000 { ··· 138 cell-index = <3>; 139 interrupt-parent = <&ipic>; 140 interrupts = <71 8>; 141 }; 142 }; 143
+1
arch/powerpc/kernel/dma.c
··· 75 for_each_sg(sgl, sg, nents, i) { 76 sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev); 77 sg->dma_length = sg->length; 78 } 79 80 return nents;
··· 75 for_each_sg(sgl, sg, nents, i) { 76 sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev); 77 sg->dma_length = sg->length; 78 + __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction); 79 } 80 81 return nents;