Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

5f3d2f2e · Linus Torvalds <[email protected]> · 2012-10-06 03:16:12 +09:00

Pull powerpc updates from Benjamin Herrenschmidt:
 "Some highlights in addition to the usual batch of fixes:

   - 64TB address space support for 64-bit processes by Aneesh Kumar

   - Gavin Shan did a major cleanup & re-organization of our EEH support
     code (IBM fancy PCI error handling & recovery infrastructure) which
     paves the way for supporting different platform backends, along
     with some rework of the PCIe code for the PowerNV platform in order
     to remove home made resource allocations and instead use the
     generic code (which is possible after some small improvements to it
     done by Gavin).

   - Uprobes support by Ananth N Mavinakayanahalli

   - A pile of embedded updates from Freescale folks, including new SoC
     and board supports, more KVM stuff including preparing for 64-bit
     BookE KVM support, ePAPR 1.1 updates, etc..."

Fixup trivial conflicts in drivers/scsi/ipr.c

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (146 commits)
  powerpc/iommu: Fix multiple issues with IOMMU pools code
  powerpc: Fix VMX fix for memcpy case
  driver/mtd:IFC NAND:Initialise internal SRAM before any write
  powerpc/fsl-pci: use 'Header Type' to identify PCIE mode
  powerpc/eeh: Don't release eeh_mutex in eeh_phb_pe_get
  powerpc: Remove tlb batching hack for nighthawk
  powerpc: Set paca->data_offset = 0 for boot cpu
  powerpc/perf: Sample only if SIAR-Valid bit is set in P7+
  powerpc/fsl-pci: fix warning when CONFIG_SWIOTLB is disabled
  powerpc/mpc85xx: Update interrupt handling for IFC controller
  powerpc/85xx: Enable USB support in p1023rds_defconfig
  powerpc/smp: Do not disable IPI interrupts during suspend
  powerpc/eeh: Fix crash on converting OF node to edev
  powerpc/eeh: Lock module while handling EEH event
  powerpc/kprobe: Don't emulate store when kprobe stwu r1
  powerpc/kprobe: Complete kprobe and migrate exception frame
  powerpc/kprobe: Introduce a new thread flag
  powerpc: Remove unused __get_user64() and __put_user64()
  powerpc/eeh: Global mutex to protect PE tree
  powerpc/eeh: Remove EEH PE for normal PCI hotplug
  ...

Commit: 5f3d2f2e1a63679cf1c4a4210f2f1cc2f335bef6
Parents: 283dbd82 · d900bd73

Merge commit. Changes below are compared with the first parent: 283dbd82.

Changes

249 files changed · +6423 −3240

File	Status	Add	Del	Content
Documentation/devicetree/bindings/misc/ifm-csi.txt	added	+41	−0	View file
Documentation/devicetree/bindings/powerpc/fsl/ifc.txt	modified	+6	−3	View file
arch/powerpc/Kconfig	modified	+15	−2	View file
arch/powerpc/boot/Makefile	modified	+1	−0	View file
arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi	added	+58	−0	View file
arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi	added	+52	−0	View file
arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi	added	+59	−0	View file
arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi	modified	+3	−0	View file
arch/powerpc/boot/dts/fsl/p5040si-post.dtsi	added	+320	−0	View file
arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi	added	+114	−0	View file
arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi	added	+118	−0	View file
arch/powerpc/boot/dts/mpc8536ds.dtsi	modified	+4	−0	View file
arch/powerpc/boot/dts/mpc8540ads.dts	modified	+2	−0	View file
arch/powerpc/boot/dts/mpc8541cds.dts	modified	+2	−0	View file
arch/powerpc/boot/dts/mpc8544ds.dts	modified	+3	−1	View file
arch/powerpc/boot/dts/mpc8544ds.dtsi	modified	+39	−0	View file
arch/powerpc/boot/dts/mpc8555cds.dts	modified	+2	−0	View file
arch/powerpc/boot/dts/mpc8560ads.dts	modified	+2	−0	View file
arch/powerpc/boot/dts/o2d.dts	added	+47	−0	View file
arch/powerpc/boot/dts/o2d.dtsi	added	+139	−0	View file
arch/powerpc/boot/dts/o2d300.dts	added	+52	−0	View file
arch/powerpc/boot/dts/o2dnt2.dts	added	+48	−0	View file
arch/powerpc/boot/dts/o2i.dts	added	+33	−0	View file
arch/powerpc/boot/dts/o2mnt.dts	added	+33	−0	View file
arch/powerpc/boot/dts/o3dnt.dts	added	+48	−0	View file
arch/powerpc/boot/dts/p1020rdb_camp_core0.dts	deleted	+0	−63	View before deletion
arch/powerpc/boot/dts/p1020rdb_camp_core1.dts	deleted	+0	−141	View before deletion
arch/powerpc/boot/dts/p1022ds.dtsi	modified	+4	−0	View file
arch/powerpc/boot/dts/p1022rdk.dts	added	+188	−0	View file
arch/powerpc/boot/dts/p2020rdb_camp_core0.dts	deleted	+0	−67	View before deletion
arch/powerpc/boot/dts/p2020rdb_camp_core1.dts	deleted	+0	−125	View before deletion
arch/powerpc/boot/dts/p2041rdb.dts	modified	+4	−0	View file
arch/powerpc/boot/dts/p3041ds.dts	modified	+4	−0	View file
arch/powerpc/boot/dts/p4080ds.dts	modified	+4	−0	View file
arch/powerpc/boot/dts/p5020ds.dts	modified	+4	−0	View file
arch/powerpc/boot/dts/p5040ds.dts	added	+207	−0	View file
arch/powerpc/configs/85xx/p1023rds_defconfig	modified	+6	−0	View file
arch/powerpc/configs/corenet32_smp_defconfig	modified	+1	−0	View file
arch/powerpc/configs/corenet64_smp_defconfig	modified	+1	−0	View file
arch/powerpc/configs/mpc85xx_defconfig	modified	+1	−0	View file
arch/powerpc/configs/mpc85xx_smp_defconfig	modified	+1	−0	View file
arch/powerpc/configs/ppc64_defconfig	modified	+1	−0	View file
arch/powerpc/configs/pseries_defconfig	modified	+1	−0	View file
arch/powerpc/include/asm/abs_addr.h	deleted	+0	−56	View before deletion
arch/powerpc/include/asm/cacheflush.h	modified	+2	−0	View file
arch/powerpc/include/asm/debug.h	modified	+1	−1	View file
arch/powerpc/include/asm/eeh.h	modified	+101	−40	View file
arch/powerpc/include/asm/eeh_event.h	modified	+3	−3	View file
arch/powerpc/include/asm/exception-64e.h	modified	+4	−2	View file
arch/powerpc/include/asm/fsl_guts.h	modified	+2	−0	View file
arch/powerpc/include/asm/fsl_ifc.h	modified	+8	−6	View file
arch/powerpc/include/asm/hvcall.h	modified	+0	−5	View file
arch/powerpc/include/asm/hw_breakpoint.h	modified	+5	−4	View file
arch/powerpc/include/asm/kprobes.h	modified	+2	−13	View file
arch/powerpc/include/asm/kvm_book3s.h	modified	+1	−1	View file
arch/powerpc/include/asm/kvm_book3s_asm.h	modified	+0	−1	View file
arch/powerpc/include/asm/machdep.h	modified	+5	−4	View file
arch/powerpc/include/asm/mmu-hash64.h	modified	+120	−49	View file
arch/powerpc/include/asm/mmu.h	modified	+9	−0	View file
arch/powerpc/include/asm/mpc52xx.h	modified	+2	−0	View file
arch/powerpc/include/asm/mpic.h	modified	+19	−0	View file
arch/powerpc/include/asm/paca.h	modified	+2	−1	View file
arch/powerpc/include/asm/page_64.h	modified	+9	−1	View file
arch/powerpc/include/asm/pci-bridge.h	modified	+11	−0	View file
arch/powerpc/include/asm/perf_event_server.h	modified	+1	−0	View file
arch/powerpc/include/asm/pgtable-ppc64-4k.h	modified	+2	−2	View file
arch/powerpc/include/asm/pgtable-ppc64-64k.h	modified	+1	−1	View file
arch/powerpc/include/asm/pgtable-ppc64.h	modified	+3	−16	View file
arch/powerpc/include/asm/pgtable.h	modified	+2	−8	View file
arch/powerpc/include/asm/ppc-opcode.h	modified	+3	−0	View file
arch/powerpc/include/asm/ppc-pci.h	modified	+9	−11	View file
arch/powerpc/include/asm/probes.h	added	+42	−0	View file
arch/powerpc/include/asm/processor.h	modified	+4	−2	View file
arch/powerpc/include/asm/pte-hash64-64k.h	modified	+10	−8	View file
arch/powerpc/include/asm/reg.h	modified	+32	−22	View file
arch/powerpc/include/asm/setup.h	modified	+1	−1	View file
arch/powerpc/include/asm/smp.h	modified	+2	−0	View file
arch/powerpc/include/asm/sparsemem.h	modified	+2	−2	View file
arch/powerpc/include/asm/swiotlb.h	modified	+6	−0	View file
arch/powerpc/include/asm/thread_info.h	modified	+6	−1	View file
arch/powerpc/include/asm/tlbflush.h	modified	+2	−5	View file
arch/powerpc/include/asm/uaccess.h	modified	+0	−11	View file
arch/powerpc/include/asm/uprobes.h	added	+54	−0	View file
arch/powerpc/kernel/Makefile	modified	+1	−0	View file
arch/powerpc/kernel/asm-offsets.c	modified	+1	−1	View file
arch/powerpc/kernel/cpu_setup_fsl_booke.S	modified	+65	−9	View file
arch/powerpc/kernel/cputable.c	modified	+4	−0	View file
arch/powerpc/kernel/dma-swiotlb.c	modified	+21	−1	View file
arch/powerpc/kernel/dma.c	modified	+1	−2	View file
arch/powerpc/kernel/entry_32.S	modified	+41	−6	View file
arch/powerpc/kernel/entry_64.S	modified	+35	−0	View file
arch/powerpc/kernel/exceptions-64e.S	modified	+126	−86	View file
arch/powerpc/kernel/exceptions-64s.S	modified	+126	−1	View file
arch/powerpc/kernel/fadump.c	modified	+1	−2	View file
arch/powerpc/kernel/head_fsl_booke.S	modified	+32	−14	View file
arch/powerpc/kernel/hw_breakpoint.c	modified	+16	−9	View file
arch/powerpc/kernel/ibmebus.c	modified	+0	−1	View file
arch/powerpc/kernel/iommu.c	modified	+4	−1	View file
arch/powerpc/kernel/irq.c	modified	+4	−4	View file
arch/powerpc/kernel/machine_kexec.c	modified	+13	−1	View file
arch/powerpc/kernel/paca.c	modified	+1	−0	View file
arch/powerpc/kernel/pci-common.c	modified	+12	−4	View file
arch/powerpc/kernel/process.c	modified	+9	−7	View file
arch/powerpc/kernel/prom.c	modified	+2	−2	View file
arch/powerpc/kernel/prom_init.c	modified	+1	−1	View file
arch/powerpc/kernel/ptrace.c	modified	+3	−0	View file
arch/powerpc/kernel/rtas_flash.c	modified	+3	−4	View file
arch/powerpc/kernel/rtas_pci.c	modified	+1	−4	View file
arch/powerpc/kernel/setup_64.c	modified	+2	−0	View file
arch/powerpc/kernel/signal.c	modified	+7	−1	View file
arch/powerpc/kernel/smp.c	modified	+12	−2	View file
arch/powerpc/kernel/time.c	modified	+4	−4	View file
arch/powerpc/kernel/traps.c	modified	+1	−0	View file
arch/powerpc/kernel/uprobes.c	added	+184	−0	View file
arch/powerpc/kernel/vdso.c	modified	+1	−3	View file
arch/powerpc/kernel/vio.c	modified	+0	−1	View file
arch/powerpc/kvm/book3s_32_mmu_host.c	modified	+4	−4	View file
arch/powerpc/kvm/book3s_64_mmu_host.c	modified	+10	−7	View file
arch/powerpc/kvm/book3s_hv_rmhandlers.S	modified	+1	−1	View file
arch/powerpc/kvm/trace.h	modified	+7	−7	View file
arch/powerpc/lib/memcpy_power7.S	modified	+2	−2	View file
arch/powerpc/lib/sstep.c	modified	+34	−2	View file
arch/powerpc/mm/fault.c	modified	+1	−0	View file
arch/powerpc/mm/hash_low_64.S	modified	+60	−37	View file
arch/powerpc/mm/hash_native_64.c	modified	+99	−93	View file
arch/powerpc/mm/hash_utils_64.c	modified	+25	−23	View file
arch/powerpc/mm/hugetlbpage-hash64.c	modified	+8	−7	View file
arch/powerpc/mm/init_64.c	modified	+0	−1	View file
arch/powerpc/mm/mem.c	modified	+2	−3	View file
arch/powerpc/mm/mmu_context_hash64.c	modified	+6	−4	View file
arch/powerpc/mm/pgtable_64.c	modified	+11	−2	View file
arch/powerpc/mm/slb_low.S	modified	+48	−14	View file
arch/powerpc/mm/slice.c	modified	+73	−39	View file
arch/powerpc/mm/stab.c	modified	+1	−2	View file
arch/powerpc/mm/subpage-prot.c	modified	+4	−2	View file
arch/powerpc/mm/tlb_hash64.c	modified	+6	−5	View file
arch/powerpc/mm/tlb_low_64e.S	modified	+13	−5	View file
arch/powerpc/oprofile/op_model_power4.c	modified	+107	−9	View file
arch/powerpc/perf/core-book3s.c	modified	+39	−7	View file
arch/powerpc/perf/power7-pmu.c	modified	+3	−0	View file
arch/powerpc/platforms/44x/currituck.c	modified	+2	−8	View file
arch/powerpc/platforms/512x/Kconfig	modified	+1	−0	View file
arch/powerpc/platforms/512x/clock.c	modified	+4	−2	View file
arch/powerpc/platforms/512x/mpc512x_shared.c	modified	+0	−6	View file
arch/powerpc/platforms/52xx/mpc5200_simple.c	modified	+1	−0	View file
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c	modified	+34	−1	View file
arch/powerpc/platforms/85xx/Kconfig	modified	+21	−0	View file
arch/powerpc/platforms/85xx/Makefile	modified	+2	−0	View file
arch/powerpc/platforms/85xx/common.c	modified	+10	−0	View file
arch/powerpc/platforms/85xx/corenet_ds.c	modified	+11	−27	View file
arch/powerpc/platforms/85xx/ge_imp3a.c	modified	+20	−42	View file
arch/powerpc/platforms/85xx/mpc8536_ds.c	modified	+3	−33	View file
arch/powerpc/platforms/85xx/mpc85xx_ads.c	modified	+3	−8	View file
arch/powerpc/platforms/85xx/mpc85xx_cds.c	modified	+31	−13	View file
arch/powerpc/platforms/85xx/mpc85xx_ds.c	modified	+7	−8	View file
arch/powerpc/platforms/85xx/mpc85xx_mds.c	modified	+6	−34	View file
arch/powerpc/platforms/85xx/mpc85xx_rdb.c	modified	+12	−18	View file
arch/powerpc/platforms/85xx/p1010rdb.c	modified	+2	−12	View file
arch/powerpc/platforms/85xx/p1022_ds.c	modified	+4	−32	View file
arch/powerpc/platforms/85xx/p1022_rdk.c	added	+167	−0	View file
arch/powerpc/platforms/85xx/p1023_rds.c	modified	+3	−6	View file
arch/powerpc/platforms/85xx/p2041_rdb.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/p3041_ds.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/p4080_ds.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/p5020_ds.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/p5040_ds.c	added	+89	−0	View file
arch/powerpc/platforms/85xx/qemu_e500.c	modified	+3	−2	View file
arch/powerpc/platforms/85xx/sbc8548.c	modified	+3	−18	View file
arch/powerpc/platforms/85xx/smp.c	modified	+183	−37	View file
arch/powerpc/platforms/85xx/socrates.c	modified	+2	−9	View file
arch/powerpc/platforms/85xx/stx_gp3.c	modified	+3	−10	View file
arch/powerpc/platforms/85xx/tqm85xx.c	modified	+2	−19	View file
arch/powerpc/platforms/85xx/xes_mpc85xx.c	modified	+8	−48	View file
arch/powerpc/platforms/86xx/gef_ppc9a.c	modified	+4	−8	View file
arch/powerpc/platforms/86xx/gef_sbc310.c	modified	+4	−9	View file
arch/powerpc/platforms/86xx/gef_sbc610.c	modified	+4	−8	View file
arch/powerpc/platforms/86xx/mpc8610_hpcd.c	modified	+6	−15	View file
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c	modified	+6	−36	View file
arch/powerpc/platforms/86xx/sbc8641d.c	modified	+4	−10	View file
arch/powerpc/platforms/cell/beat.c	modified	+2	−2	View file
arch/powerpc/platforms/cell/beat.h	modified	+1	−1	View file
arch/powerpc/platforms/cell/beat_htab.c	modified	+23	−22	View file
arch/powerpc/platforms/pasemi/iommu.c	modified	+3	−3	View file
arch/powerpc/platforms/powernv/pci-ioda.c	modified	+181	−514	View file
arch/powerpc/platforms/powernv/pci-p5ioc2.c	modified	+0	−1	View file
arch/powerpc/platforms/powernv/pci.c	modified	+6	−1	View file
arch/powerpc/platforms/powernv/pci.h	modified	+14	−7	View file
arch/powerpc/platforms/ps3/htab.c	modified	+11	−11	View file
arch/powerpc/platforms/ps3/setup.c	modified	+7	−3	View file
arch/powerpc/platforms/pseries/Makefile	modified	+3	−2	View file
arch/powerpc/platforms/pseries/eeh.c	modified	+123	−420	View file
arch/powerpc/platforms/pseries/eeh_cache.c	modified	+30	−29	View file
arch/powerpc/platforms/pseries/eeh_dev.c	modified	+12	−2	View file
arch/powerpc/platforms/pseries/eeh_driver.c	modified	+162	−148	View file
arch/powerpc/platforms/pseries/eeh_event.c	modified	+18	−36	View file
arch/powerpc/platforms/pseries/eeh_pe.c	added	+652	−0	View file
arch/powerpc/platforms/pseries/eeh_pseries.c	modified	+169	−78	View file
arch/powerpc/platforms/pseries/eeh_sysfs.c	modified	+0	−9	View file
arch/powerpc/platforms/pseries/iommu.c	modified	+6	−6	View file
arch/powerpc/platforms/pseries/lpar.c	modified	+31	−46	View file
arch/powerpc/platforms/pseries/msi.c	modified	+24	−2	View file
arch/powerpc/platforms/pseries/pci.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/pci_dlpar.c	modified	+24	−8	View file
arch/powerpc/platforms/pseries/setup.c	modified	+12	−10	View file
arch/powerpc/sysdev/Makefile	modified	+1	−1	View file
arch/powerpc/sysdev/dart_iommu.c	modified	+15	−4	View file
arch/powerpc/sysdev/fsl_85xx_l2ctlr.c	modified	+10	−0	View file
arch/powerpc/sysdev/fsl_ifc.c	modified	+8	−12	View file
arch/powerpc/sysdev/fsl_mpic_err.c	added	+149	−0	View file
arch/powerpc/sysdev/fsl_pci.c	modified	+97	−60	View file
arch/powerpc/sysdev/fsl_pci.h	modified	+16	−4	View file
arch/powerpc/sysdev/mpic.c	modified	+85	−17	View file
arch/powerpc/sysdev/mpic.h	modified	+22	−0	View file
arch/powerpc/xmon/xmon.c	modified	+108	−3	View file
drivers/crypto/nx/nx.c	modified	+8	−9	View file
drivers/edac/mpc85xx_edac.c	modified	+12	−31	View file
drivers/infiniband/hw/ehca/ehca_cq.c	modified	+1	−1	View file
drivers/infiniband/hw/ehca/ehca_eq.c	modified	+1	−1	View file
drivers/infiniband/hw/ehca/ehca_mrmw.c	modified	+20	−25	View file
drivers/infiniband/hw/ehca/ehca_qp.c	modified	+3	−3	View file
drivers/infiniband/hw/ehca/ehca_reqs.c	modified	+1	−1	View file
drivers/infiniband/hw/ehca/ehca_tools.h	modified	+0	−1	View file
drivers/infiniband/hw/ehca/hcp_if.c	modified	+6	−6	View file
drivers/infiniband/hw/ehca/ipz_pt_fn.c	modified	+1	−1	View file
drivers/macintosh/smu.c	modified	+1	−2	View file
drivers/mtd/nand/fsl_ifc_nand.c	modified	+55	−1	View file
drivers/net/ethernet/ibm/ehea/ehea.h	modified	+0	−1	View file
drivers/net/ethernet/ibm/ehea/ehea_phyp.c	modified	+6	−6	View file
drivers/net/ethernet/ibm/ehea/ehea_qmr.c	modified	+7	−7	View file
drivers/pci/hotplug/rpadlpar_core.c	modified	+1	−1	View file
drivers/scsi/ipr.c	modified	+9	−9	View file
drivers/tty/hvc/hvc_console.c	modified	+26	−7	View file
drivers/tty/hvc/hvc_vio.c	modified	+70	−53	View file
drivers/video/ps3fb.c	modified	+1	−2	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/misc/ifm-csi.txt

View file

diff --git a/Documentation/devicetree/bindings/misc/ifm-csi.txt b/Documentation/devicetree/bindings/misc/ifm-csi.txt
new file mode 100644
index 0000000..5bdfffb
--- /dev/null
+++ b/Documentation/devicetree/bindings/misc/ifm-csi.txt
@@ -0,0 +1,41 @@
+IFM camera sensor interface on mpc5200 LocalPlus bus
+
+Required properties:
+- compatible: "ifm,o2d-csi"
+- reg: specifies sensor chip select number and associated address range
+- interrupts: external interrupt line number and interrupt sense mode
+  of the interrupt line signaling frame valid events
+- gpios: three gpio-specifiers for "capture", "reset" and "master enable"
+  GPIOs (strictly in this order).
+- ifm,csi-clk-handle: the phandle to a node in the DT describing the sensor
+  clock generator. This node is usually a general purpose timer controller.
+- ifm,csi-addr-bus-width: address bus width (valid values are 16, 24, 25)
+- ifm,csi-data-bus-width: data bus width (valid values are 8 and 16)
+- ifm,csi-wait-cycles: sensor bus wait cycles
+
+Optional properties:
+- ifm,csi-byte-swap: if this property is present, the byte swapping on
+  the bus will be enabled.
+
+Example:
+
+	csi@3,0 {
+		compatible = "ifm,o2d-csi";
+		reg = <3 0 0x00100000>;		/* CS 3, 1 MiB range */
+		interrupts = <1 1 2>;		/* IRQ1, edge falling */
+
+		ifm,csi-clk-handle = <&timer7>;
+		gpios = <&gpio_simple 23 0	/* image_capture */
+			 &gpio_simple 26 0	/* image_reset */
+			 &gpio_simple 29 0>;	/* image_master_en */
+
+		ifm,csi-addr-bus-width = <24>;
+		ifm,csi-data-bus-width = <8>;
+		ifm,csi-wait-cycles = <0>;
+	};
+
+The base address of the used chip select is specified in the
+ranges property of the parent localbus node, for example:
+
+	ranges = <0 0 0xff000000 0x01000000
+		  3 0 0xe3000000 0x00100000>;

Documentation/devicetree/bindings/powerpc/fsl/ifc.txt

View file

diff --git a/Documentation/devicetree/bindings/powerpc/fsl/ifc.txt b/Documentation/devicetree/bindings/powerpc/fsl/ifc.txt
index 939a26d..d5e3704 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/ifc.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/ifc.txt
@@ -12,9 +12,12 @@ Properties:
 - #size-cells : Either one or two, depending on how large each chipselect
                 can be.
 - reg : Offset and length of the register set for the device
-- interrupts : IFC has two interrupts. The first one is the "common"
-               interrupt(CM_EVTER_STAT), and second is the NAND interrupt
-               (NAND_EVTER_STAT).
+- interrupts: IFC may have one or two interrupts.  If two interrupt
+              specifiers are present, the first is the "common"
+              interrupt (CM_EVTER_STAT), and the second is the NAND
+              interrupt (NAND_EVTER_STAT).  If there is only one,
+              that interrupt reports both types of event.
+
 
 - ranges : Each range corresponds to a single chipselect, and covers
            the entire access window as configured.

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 352f416..4ce0be3 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -215,7 +215,8 @@ config ARCH_HIBERNATION_POSSIBLE
 config ARCH_SUSPEND_POSSIBLE
 	def_bool y
 	depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \
-		   (PPC_85xx && !SMP) || PPC_86xx || PPC_PSERIES || 44x || 40x
+		   (PPC_85xx && !PPC_E500MC) || PPC_86xx || PPC_PSERIES \
+		   || 44x || 40x
 
 config PPC_DCR_NATIVE
 	bool
@@ -239,6 +240,9 @@ config PPC_OF_PLATFORM_PCI
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
 	def_bool y
 
+config ARCH_SUPPORTS_UPROBES
+	def_bool y
+
 config PPC_ADV_DEBUG_REGS
 	bool
 	depends on 40x || BOOKE
@@ -325,7 +329,8 @@ config SWIOTLB
 
 config HOTPLUG_CPU
 	bool "Support for enabling/disabling CPUs"
-	depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || PPC_PMAC || PPC_POWERNV)
+	depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || \
+	PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC))
 	---help---
 	  Say Y here to be able to disable and re-enable individual
 	  CPUs at runtime on SMP machines.
@@ -557,6 +562,14 @@ config SCHED_SMT
 	  when dealing with POWER5 cpus at a cost of slightly increased
 	  overhead in some places. If unsure say N here.
 
+config PPC_DENORMALISATION
+	bool "PowerPC denormalisation exception handling"
+	depends on PPC_BOOK3S_64
+	default "n"
+	---help---
+	  Add support for handling denormalisation of single precision
+	  values.  Useful for bare metal only.  If unsure say Y here.
+
 config CMDLINE_BOOL
 	bool "Default bootloader kernel arguments"
 

arch/powerpc/boot/Makefile

View file

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index b7d8333..6a15c96 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -107,6 +107,7 @@ src-boot := $(addprefix $(obj)/, $(src-boot))
 obj-boot := $(addsuffix .o, $(basename $(src-boot)))
 obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib))))
 obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))
+obj-plat: $(libfdt)
 
 quiet_cmd_copy_zlib = COPY    $@
       cmd_copy_zlib = sed "s@__used@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@

arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi b/arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi
new file mode 100644
index 0000000..870c653
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi
@@ -0,0 +1,58 @@
+/*
+ * e500mc Power ISA Device Tree Source (include)
+ *
+ * Copyright 2012 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/ {
+	cpus {
+		power-isa-version = "2.06";
+		power-isa-b;		// Base
+		power-isa-e;		// Embedded
+		power-isa-atb;		// Alternate Time Base
+		power-isa-cs;		// Cache Specification
+		power-isa-ds;		// Decorated Storage
+		power-isa-e.ed;		// Embedded.Enhanced Debug
+		power-isa-e.pd;		// Embedded.External PID
+		power-isa-e.hv;		// Embedded.Hypervisor
+		power-isa-e.le;		// Embedded.Little-Endian
+		power-isa-e.pm;		// Embedded.Performance Monitor
+		power-isa-e.pc;		// Embedded.Processor Control
+		power-isa-ecl;		// Embedded Cache Locking
+		power-isa-exp;		// External Proxy
+		power-isa-fp;		// Floating Point
+		power-isa-fp.r;		// Floating Point.Record
+		power-isa-mmc;		// Memory Coherence
+		power-isa-scpm;		// Store Conditional Page Mobility
+		power-isa-wt;		// Wait
+		mmu-type = "power-embedded";
+	};
+};

arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi b/arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi
new file mode 100644
index 0000000..f492814
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi
@@ -0,0 +1,52 @@
+/*
+ * e500v2 Power ISA Device Tree Source (include)
+ *
+ * Copyright 2012 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/ {
+	cpus {
+		power-isa-version = "2.03";
+		power-isa-b;		// Base
+		power-isa-e;		// Embedded
+		power-isa-atb;		// Alternate Time Base
+		power-isa-cs;		// Cache Specification
+		power-isa-e.le;		// Embedded.Little-Endian
+		power-isa-e.pm;		// Embedded.Performance Monitor
+		power-isa-ecl;		// Embedded Cache Locking
+		power-isa-mmc;		// Memory Coherence
+		power-isa-sp;		// Signal Processing Engine
+		power-isa-sp.fd;	// SPE.Embedded Float Scalar Double
+		power-isa-sp.fs;	// SPE.Embedded Float Scalar Single
+		power-isa-sp.fv;	// SPE.Embedded Float Vector
+		mmu-type = "power-embedded";
+	};
+};

arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi b/arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi
new file mode 100644
index 0000000..3230212
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi
@@ -0,0 +1,59 @@
+/*
+ * e5500 Power ISA Device Tree Source (include)
+ *
+ * Copyright 2012 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/ {
+	cpus {
+		power-isa-version = "2.06";
+		power-isa-b;		// Base
+		power-isa-e;		// Embedded
+		power-isa-atb;		// Alternate Time Base
+		power-isa-cs;		// Cache Specification
+		power-isa-ds;		// Decorated Storage
+		power-isa-e.ed;		// Embedded.Enhanced Debug
+		power-isa-e.pd;		// Embedded.External PID
+		power-isa-e.hv;		// Embedded.Hypervisor
+		power-isa-e.le;		// Embedded.Little-Endian
+		power-isa-e.pm;		// Embedded.Performance Monitor
+		power-isa-e.pc;		// Embedded.Processor Control
+		power-isa-ecl;		// Embedded Cache Locking
+		power-isa-exp;		// External Proxy
+		power-isa-fp;		// Floating Point
+		power-isa-fp.r;		// Floating Point.Record
+		power-isa-mmc;		// Memory Coherence
+		power-isa-scpm;		// Store Conditional Page Mobility
+		power-isa-wt;		// Wait
+		power-isa-64;		// 64-bit
+		mmu-type = "power-embedded";
+	};
+};

arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi
index 7de45a7..152906f 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
 / {
 	compatible = "fsl,MPC8536";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi
index 8777f92..5a69baf 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
 / {
 	compatible = "fsl,MPC8544";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi
index 720422d..fc1ce97 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
 / {
 	compatible = "fsl,MPC8548";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi
index eacd62c..122ca3b 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
 / {
 	compatible = "fsl,MPC8568";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi
index b07064d..2cd15a2 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
 / {
 	compatible = "fsl,MPC8569";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi
index ca18832..28c2a86 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
 / {
 	compatible = "fsl,MPC8572";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi
index 7354a8f..6e76f9b 100644
--- a/arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
 / {
 	compatible = "fsl,P1010";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi
index 6f0376e..fed9c4c 100644
--- a/arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
 / {
 	compatible = "fsl,P1020";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi
index 4abd54b..36161b5 100644
--- a/arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
 / {
 	compatible = "fsl,P1021";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
index e930f4f..1956dea 100644
--- a/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
 / {
 	compatible = "fsl,P1022";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi
index ac45f6d..132a152 100644
--- a/arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
 / {
 	compatible = "fsl,P1023";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi
index 3213288..42bf3c6 100644
--- a/arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
 / {
 	compatible = "fsl,P2020";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi
index 2d0a40d..7a2697d 100644
--- a/arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500mc_power_isa.dtsi"
+
 / {
 	compatible = "fsl,P2041";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi
index 136def3..c9ca2c3 100644
--- a/arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500mc_power_isa.dtsi"
+
 / {
 	compatible = "fsl,P3041";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi
index b9556ee..493d9a0 100644
--- a/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e500mc_power_isa.dtsi"
+
 / {
 	compatible = "fsl,P4080";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi
index ae823a4..0a198b0 100644
--- a/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi
@@ -33,6 +33,9 @@
  */
 
 /dts-v1/;
+
+/include/ "e5500_power_isa.dtsi"
+
 / {
 	compatible = "fsl,P5020";
 	#address-cells = <2>;

arch/powerpc/boot/dts/fsl/p5040si-post.dtsi

View file

diff --git a/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi b/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
new file mode 100644
index 0000000..db2c9a7
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
@@ -0,0 +1,320 @@
+/*
+ * P5040 Silicon/SoC Device Tree Source (post include)
+ *
+ * Copyright 2012 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * This software is provided by Freescale Semiconductor "as is" and any
+ * express or implied warranties, including, but not limited to, the implied
+ * warranties of merchantability and fitness for a particular purpose are
+ * disclaimed. In no event shall Freescale Semiconductor be liable for any
+ * direct, indirect, incidental, special, exemplary, or consequential damages
+ * (including, but not limited to, procurement of substitute goods or services;
+ * loss of use, data, or profits; or business interruption) however caused and
+ * on any theory of liability, whether in contract, strict liability, or tort
+ * (including negligence or otherwise) arising in any way out of the use of this
+ * software, even if advised of the possibility of such damage.
+ */
+
+&lbc {
+	compatible = "fsl,p5040-elbc", "fsl,elbc", "simple-bus";
+	interrupts = <25 2 0 0>;
+	#address-cells = <2>;
+	#size-cells = <1>;
+};
+
+/* controller at 0x200000 */
+&pci0 {
+	compatible = "fsl,p5040-pcie", "fsl,qoriq-pcie-v2.4";
+	device_type = "pci";
+	#size-cells = <2>;
+	#address-cells = <3>;
+	bus-range = <0x0 0xff>;
+	clock-frequency = <33333333>;
+	interrupts = <16 2 1 15>;
+	pcie@0 {
+		reg = <0 0 0 0 0>;
+		#interrupt-cells = <1>;
+		#size-cells = <2>;
+		#address-cells = <3>;