Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (62 commits) powerpc/85xx: Fix signedness bug in cache-sram powerpc/fsl: 85xx: document cache sram bindings powerpc/fsl: define binding for fsl mpic interrupt controllers powerpc/fsl_msi: Handle msi-available-ranges better drivers/serial/ucc_uart.c: Add of_node_put to avoid memory leak powerpc/85xx: Fix SPE float to integer conversion failure powerpc/85xx: Update sata controller compatible for p1022ds board ATA: Add FSL sata v2 controller support powerpc/mpc8xxx_gpio: simplify searching for 'fsl, qoriq-gpio' compatiable powerpc/8xx: remove obsolete mgsuvd board powerpc/82xx: rename and update mgcoge board support powerpc/83xx: rename and update kmeter1 powerpc/85xx: Workaroudn e500 CPU erratum A005 powerpc/fsl_pci: Add support for FSL PCIe controllers v2.x powerpc/85xx: Fix writing to spin table 'cpu-release-addr' on ppc64e powerpc/pseries: Disable MSI using new interface if possible powerpc: Enable GENERIC_HARDIRQS_NO_DEPRECATED. powerpc: core irq_data conversion. powerpc: sysdev/xilinx_intc irq_data conversion. powerpc: sysdev/uic irq_data conversion. ... Fix up conflicts in arch/powerpc/sysdev/fsl_msi.c (due to getting rid of of_platform_driver in arch/powerpc)
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/powerpc/fsl/cache_sram.txt 20 additions, 0 deletionsDocumentation/devicetree/bindings/powerpc/fsl/cache_sram.txt
- Documentation/devicetree/bindings/powerpc/fsl/mpic.txt 211 additions, 42 deletionsDocumentation/devicetree/bindings/powerpc/fsl/mpic.txt
- Documentation/devicetree/bindings/powerpc/fsl/msi-pic.txt 8 additions, 1 deletionDocumentation/devicetree/bindings/powerpc/fsl/msi-pic.txt
- Documentation/kernel-parameters.txt 4 additions, 0 deletionsDocumentation/kernel-parameters.txt
- arch/powerpc/Kconfig 1 addition, 0 deletionsarch/powerpc/Kconfig
- arch/powerpc/boot/dts/canyonlands.dts 24 additions, 0 deletionsarch/powerpc/boot/dts/canyonlands.dts
- arch/powerpc/boot/dts/kmeter1.dts 37 additions, 32 deletionsarch/powerpc/boot/dts/kmeter1.dts
- arch/powerpc/boot/dts/mgcoge.dts 26 additions, 21 deletionsarch/powerpc/boot/dts/mgcoge.dts
- arch/powerpc/boot/dts/mgsuvd.dts 0 additions, 163 deletionsarch/powerpc/boot/dts/mgsuvd.dts
- arch/powerpc/boot/dts/p1022ds.dts 2 additions, 2 deletionsarch/powerpc/boot/dts/p1022ds.dts
- arch/powerpc/configs/83xx/kmeter1_defconfig 2 additions, 5 deletionsarch/powerpc/configs/83xx/kmeter1_defconfig
- arch/powerpc/configs/mgcoge_defconfig 1 addition, 8 deletionsarch/powerpc/configs/mgcoge_defconfig
- arch/powerpc/configs/mgsuvd_defconfig 0 additions, 81 deletionsarch/powerpc/configs/mgsuvd_defconfig
- arch/powerpc/include/asm/cputable.h 2 additions, 1 deletionarch/powerpc/include/asm/cputable.h
- arch/powerpc/include/asm/hw_irq.h 2 additions, 0 deletionsarch/powerpc/include/asm/hw_irq.h
- arch/powerpc/include/asm/mpic.h 3 additions, 3 deletionsarch/powerpc/include/asm/mpic.h
- arch/powerpc/include/asm/nvram.h 2 additions, 1 deletionarch/powerpc/include/asm/nvram.h
- arch/powerpc/include/asm/pgtable.h 1 addition, 0 deletionsarch/powerpc/include/asm/pgtable.h
- arch/powerpc/include/asm/qe_ic.h 11 additions, 8 deletionsarch/powerpc/include/asm/qe_ic.h
- arch/powerpc/include/asm/reg.h 12 additions, 0 deletionsarch/powerpc/include/asm/reg.h
Loading
Please register or sign in to comment