Merge branch 'topic/ocp' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-qcom-spmi

2026-11-13 07:31:07 +00:00 · 2015-07-24 18:29:31 +01:00 · 2015-07-24 18:29:31 +01:00 · 41dae91a72
commit 41dae91a72
parent 5d506a5ad4 3a003baeec
250 changed files with 5786 additions and 1912 deletions
--- a/Documentation/arm/sunxi/README
+++ b/Documentation/arm/sunxi/README
--- a/Documentation/devicetree/bindings/arm/sunxi.txt
+++ b/Documentation/devicetree/bindings/arm/sunxi.txt
--- a/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
+++ b/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
--- a/Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/regulator.txt
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
--- a/26
+++ b/26
--- a/2
+++ b/2
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
--- a/arch/arm/boot/dts/atlas7.dtsi
+++ b/arch/arm/boot/dts/atlas7.dtsi
--- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
--- a/arch/arm/include/asm/pgtable-2level.h
+++ b/arch/arm/include/asm/pgtable-2level.h
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/lib/memcpy.S
+++ b/arch/arm/lib/memcpy.S
--- a/arch/arm/lib/memset.S
+++ b/arch/arm/lib/memset.S
--- a/arch/arm/mach-omap2/dma.c
+++ b/arch/arm/mach-omap2/dma.c
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
--- a/arch/arm/mach-prima2/rtciobrg.c
+++ b/arch/arm/mach-prima2/rtciobrg.c
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
--- a/arch/arm/mm/nommu.c
+++ b/arch/arm/mm/nommu.c
--- a/arch/arm/vdso/vdsomunge.c
+++ b/arch/arm/vdso/vdsomunge.c
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
--- a/arch/arm64/boot/dts/apm/apm-mustang.dts
+++ b/arch/arm64/boot/dts/apm/apm-mustang.dts
--- a/arch/arm64/boot/dts/arm/Makefile
+++ b/arch/arm64/boot/dts/arm/Makefile
--- a/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
+++ b/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
--- a/arch/arm64/boot/dts/cavium/thunder-88xx.dtsi
+++ b/arch/arm64/boot/dts/cavium/thunder-88xx.dtsi
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
--- a/arch/arm64/include/asm/acpi.h
+++ b/arch/arm64/include/asm/acpi.h
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
--- a/arch/arm64/kernel/entry32.S
+++ b/arch/arm64/kernel/entry32.S
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
--- a/arch/arm64/mm/Makefile
+++ b/arch/arm64/mm/Makefile
--- a/arch/cris/arch-v32/drivers/sync_serial.c
+++ b/arch/cris/arch-v32/drivers/sync_serial.c
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/include/asm/mach-loongson64/mmzone.h
+++ b/arch/mips/include/asm/mach-loongson64/mmzone.h
--- a/arch/mips/include/asm/smp.h
+++ b/arch/mips/include/asm/smp.h
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
--- a/arch/mips/kernel/cps-vec.S
+++ b/arch/mips/kernel/cps-vec.S
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
--- a/arch/mips/kernel/smp-cps.c
+++ b/arch/mips/kernel/smp-cps.c
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
--- a/arch/mips/loongson64/common/bonito-irq.c
+++ b/arch/mips/loongson64/common/bonito-irq.c
--- a/arch/mips/loongson64/common/cmdline.c
+++ b/arch/mips/loongson64/common/cmdline.c
--- a/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
--- a/arch/mips/loongson64/common/env.c
+++ b/arch/mips/loongson64/common/env.c
--- a/arch/mips/loongson64/common/irq.c
+++ b/arch/mips/loongson64/common/irq.c
--- a/arch/mips/loongson64/common/setup.c
+++ b/arch/mips/loongson64/common/setup.c
--- a/arch/mips/loongson64/fuloong-2e/irq.c
+++ b/arch/mips/loongson64/fuloong-2e/irq.c
--- a/arch/mips/loongson64/lemote-2f/clock.c
+++ b/arch/mips/loongson64/lemote-2f/clock.c
--- a/arch/mips/loongson64/loongson-3/numa.c
+++ b/arch/mips/loongson64/loongson-3/numa.c
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
--- a/arch/mips/mti-malta/malta-time.c
+++ b/arch/mips/mti-malta/malta-time.c
--- a/arch/mips/pistachio/init.c
+++ b/arch/mips/pistachio/init.c
--- a/arch/mips/pistachio/time.c
+++ b/arch/mips/pistachio/time.c
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
--- a/arch/parisc/include/asm/tlbflush.h
+++ b/arch/parisc/include/asm/tlbflush.h
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
--- a/arch/powerpc/kernel/idle_power7.S
+++ b/arch/powerpc/kernel/idle_power7.S
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
--- a/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
--- a/arch/powerpc/platforms/powernv/opal-elog.c
+++ b/arch/powerpc/platforms/powernv/opal-elog.c
--- a/arch/powerpc/platforms/powernv/opal-prd.c
+++ b/arch/powerpc/platforms/powernv/opal-prd.c
--- a/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_hsta_msi.c
--- a/arch/tile/lib/memcpy_user_64.c
+++ b/arch/tile/lib/memcpy_user_64.c
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/include/asm/espfix.h
+++ b/arch/x86/include/asm/espfix.h
--- a/arch/x86/include/asm/kasan.h
+++ b/arch/x86/include/asm/kasan.h
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
--- a/arch/x86/kernel/espfix_64.c
+++ b/arch/x86/kernel/espfix_64.c
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
--- a/arch/x86/lib/usercopy.c
+++ b/arch/x86/lib/usercopy.c
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
--- a/drivers/acpi/nfit.c
+++ b/drivers/acpi/nfit.c
--- a/drivers/acpi/nfit.h
+++ b/drivers/acpi/nfit.h
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
--- a/Show more
+++ b/Show more