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

ebc8eca1 · Linus Torvalds <[email protected]> · 2009-03-30 10:23:53 -07:00

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (180 commits)
  powerpc: clean up ssi.txt, add definition for fsl,ssi-asynchronous
  powerpc/85xx: Add support for the "socrates" board (MPC8544).
  powerpc: Fix bugs introduced by sysfs changes
  powerpc: Sanitize stack pointer in signal handling code
  powerpc: Add write barrier before enabling DTL flags
  powerpc/83xx: Update ranges in gianfar node to match other dts
  powerpc/86xx: Move gianfar mdio nodes under the ethernet nodes
  powerpc/85xx: Move gianfar mdio nodes under the ethernet nodes
  powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes
  powerpc/83xx: Add power management support for MPC837x boards
  powerpc/mm: Introduce early_init_mmu() on 64-bit
  powerpc/mm: Add option for non-atomic PTE updates to ppc64
  powerpc/mm: Fix printk type warning in mmu_context_nohash
  powerpc/mm: Rename arch/powerpc/kernel/mmap.c to mmap_64.c
  powerpc/mm: Merge various PTE bits and accessors definitions
  powerpc/mm: Tweak PTE bit combination definitions
  powerpc/cell: Fix iommu exception reporting
  powerpc/mm: e300c2/c3/c4 TLB errata workaround
  powerpc/mm: Used free register to save a few cycles in SW TLB miss handling
  powerpc/mm: Remove unused register usage in SW TLB miss handling
  ...

Commit: ebc8eca169be0283d5a7ab54c4411dd59cfb0f27
Parents: 25c1a411 · 9ff9a26b

Merge commit. Changes below are compared with the first parent: 25c1a411.

Changes

284 files changed · +20089 −4620

File	Status	Add	Del	Content
Documentation/powerpc/dts-bindings/fsl/dma.txt	modified	+17	−17	View file
Documentation/powerpc/dts-bindings/fsl/esdhc.txt	added	+24	−0	View file
Documentation/powerpc/dts-bindings/fsl/ssi.txt	modified	+40	−28	View file
arch/powerpc/Kconfig	modified	+47	−27	View file
arch/powerpc/Kconfig.debug	modified	+1	−1	View file
arch/powerpc/Makefile	modified	+2	−2	View file
arch/powerpc/boot/Makefile	modified	+7	−2	View file
arch/powerpc/boot/cuboot-amigaone.c	added	+35	−0	View file
arch/powerpc/boot/dts/amigaone.dts	added	+173	−0	View file
arch/powerpc/boot/dts/asp834x-redboot.dts	modified	+44	−38	View file
arch/powerpc/boot/dts/canyonlands.dts	modified	+28	−0	View file
arch/powerpc/boot/dts/cm5200.dts	modified	+11	−38	View file
arch/powerpc/boot/dts/digsy_mtc.dts	added	+254	−0	View file
arch/powerpc/boot/dts/gef_ppc9a.dts	added	+367	−0	View file
arch/powerpc/boot/dts/gef_sbc310.dts	added	+367	−0	View file
arch/powerpc/boot/dts/gef_sbc610.dts	modified	+22	−19	View file
arch/powerpc/boot/dts/ksi8560.dts	modified	+42	−37	View file
arch/powerpc/boot/dts/lite5200.dts	modified	+2	−50	View file
arch/powerpc/boot/dts/lite5200b.dts	modified	+10	−53	View file
arch/powerpc/boot/dts/media5200.dts	added	+318	−0	View file
arch/powerpc/boot/dts/motionpro.dts	modified	+9	−33	View file
arch/powerpc/boot/dts/mpc8313erdb.dts	modified	+6	−5	View file
arch/powerpc/boot/dts/mpc8315erdb.dts	modified	+108	−36	View file
arch/powerpc/boot/dts/mpc8349emitx.dts	modified	+38	−31	View file
arch/powerpc/boot/dts/mpc8349emitxgp.dts	modified	+23	−19	View file
arch/powerpc/boot/dts/mpc834x_mds.dts	modified	+44	−37	View file
arch/powerpc/boot/dts/mpc8377_mds.dts	modified	+155	−56	View file
arch/powerpc/boot/dts/mpc8377_rdb.dts	modified	+182	−47	View file
arch/powerpc/boot/dts/mpc8378_mds.dts	modified	+153	−56	View file
arch/powerpc/boot/dts/mpc8378_rdb.dts	modified	+182	−47	View file
arch/powerpc/boot/dts/mpc8379_mds.dts	modified	+91	−55	View file
arch/powerpc/boot/dts/mpc8379_rdb.dts	modified	+118	−46	View file
arch/powerpc/boot/dts/mpc8536ds.dts	modified	+42	−36	View file
arch/powerpc/boot/dts/mpc8540ads.dts	modified	+63	−54	View file
arch/powerpc/boot/dts/mpc8541cds.dts	modified	+42	−36	View file
arch/powerpc/boot/dts/mpc8544ds.dts	modified	+43	−38	View file
arch/powerpc/boot/dts/mpc8548cds.dts	modified	+84	−72	View file
arch/powerpc/boot/dts/mpc8555cds.dts	modified	+42	−36	View file
arch/powerpc/boot/dts/mpc8560ads.dts	modified	+54	−48	View file
arch/powerpc/boot/dts/mpc8568mds.dts	modified	+54	−48	View file
arch/powerpc/boot/dts/mpc8572ds.dts	modified	+86	−74	View file
arch/powerpc/boot/dts/mpc8572ds_36b.dts	added	+799	−0	View file
arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts	modified	+26	−23	View file
arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts	modified	+3	−3	View file
arch/powerpc/boot/dts/mpc8610_hpcd.dts	modified	+2	−0	View file
arch/powerpc/boot/dts/mpc8641_hpcn.dts	modified	+84	−73	View file
arch/powerpc/boot/dts/pcm030.dts	modified	+68	−114	View file
arch/powerpc/boot/dts/pcm032.dts	added	+392	−0	View file
arch/powerpc/boot/dts/redwood.dts	added	+244	−0	View file
arch/powerpc/boot/dts/sbc8349.dts	modified	+44	−36	View file
arch/powerpc/boot/dts/sbc8548.dts	modified	+42	−36	View file
arch/powerpc/boot/dts/sbc8560.dts	modified	+53	−47	View file
arch/powerpc/boot/dts/sbc8641d.dts	modified	+84	−72	View file
arch/powerpc/boot/dts/socrates.dts	added	+338	−0	View file
arch/powerpc/boot/dts/stx_gp3_8560.dts	modified	+42	−36	View file
arch/powerpc/boot/dts/tqm5200.dts	modified	+6	−26	View file
arch/powerpc/boot/dts/tqm8540.dts	modified	+68	−54	View file
arch/powerpc/boot/dts/tqm8541.dts	modified	+53	−42	View file
arch/powerpc/boot/dts/tqm8548-bigflash.dts	modified	+97	−80	View file
arch/powerpc/boot/dts/tqm8548.dts	modified	+97	−80	View file
arch/powerpc/boot/dts/tqm8555.dts	modified	+53	−42	View file
arch/powerpc/boot/dts/tqm8560.dts	modified	+55	−44	View file
arch/powerpc/boot/dts/virtex440-ml507.dts	modified	+113	−11	View file
arch/powerpc/boot/serial.c	modified	+2	−1	View file
arch/powerpc/boot/wrapper	modified	+5	−2	View file
arch/powerpc/configs/44x/canyonlands_defconfig	modified	+256	−10	View file
arch/powerpc/configs/44x/redwood_defconfig	added	+1176	−0	View file
arch/powerpc/configs/85xx/socrates_defconfig	added	+1410	−0	View file
arch/powerpc/configs/86xx/gef_ppc9a_defconfig	added	+1889	−0	View file
arch/powerpc/configs/86xx/gef_sbc310_defconfig	added	+1613	−0	View file
arch/powerpc/configs/amigaone_defconfig	added	+1636	−0	View file
arch/powerpc/configs/mpc5200_defconfig	modified	+63	−8	View file
arch/powerpc/configs/ppc64_defconfig	modified	+3	−3	View file
arch/powerpc/include/asm/code-patching.h	modified	+1	−3	View file
arch/powerpc/include/asm/cputable.h	modified	+3	−1	View file
arch/powerpc/include/asm/dbell.h	added	+43	−0	View file
arch/powerpc/include/asm/dma-mapping.h	modified	+1	−11	View file
arch/powerpc/include/asm/elf.h	modified	+11	−1	View file
arch/powerpc/include/asm/fixmap.h	modified	+1	−1	View file
arch/powerpc/include/asm/ftrace.h	modified	+38	−1	View file
arch/powerpc/include/asm/highmem.h	modified	+6	−6	View file
arch/powerpc/include/asm/hw_irq.h	modified	+1	−1	View file
arch/powerpc/include/asm/io.h	modified	+6	−0	View file
arch/powerpc/include/asm/lppaca.h	modified	+5	−3	View file
arch/powerpc/include/asm/machdep.h	modified	+1	−3	View file
arch/powerpc/include/asm/mmu-44x.h	modified	+2	−0	View file
arch/powerpc/include/asm/mmu-fsl-booke.h → arch/powerpc/include/asm/mmu-book3e.h	renamed	+42	−24	View file
arch/powerpc/include/asm/mmu-hash64.h	modified	+0	−2	View file
arch/powerpc/include/asm/mmu.h	modified	+15	−5	View file
arch/powerpc/include/asm/mmu_context.h	modified	+1	−1	View file
arch/powerpc/include/asm/mpc52xx.h	modified	+1	−0	View file
arch/powerpc/include/asm/page.h	modified	+4	−2	View file
arch/powerpc/include/asm/page_32.h	modified	+4	−0	View file
arch/powerpc/include/asm/pgtable-ppc32.h	modified	+22	−535	View file
arch/powerpc/include/asm/pgtable-4k.h → arch/powerpc/include/asm/pgtable-ppc64-4k.h	renamed	+6	−49	View file
arch/powerpc/include/asm/pgtable-ppc64-64k.h	added	+42	−0	View file
arch/powerpc/include/asm/pgtable-ppc64.h	modified	+48	−148	View file
arch/powerpc/include/asm/pgtable.h	modified	+134	−0	View file
arch/powerpc/include/asm/ppc-opcode.h	added	+73	−0	View file
arch/powerpc/include/asm/ppc_asm.h	modified	+1	−5	View file
arch/powerpc/include/asm/processor.h	modified	+19	−0	View file
arch/powerpc/include/asm/ps3av.h	modified	+1	−1	View file
arch/powerpc/include/asm/ps3fb.h	modified	+1	−0	View file
arch/powerpc/include/asm/pte-40x.h	added	+64	−0	View file
arch/powerpc/include/asm/pte-44x.h	added	+102	−0	View file
arch/powerpc/include/asm/pte-8xx.h	added	+67	−0	View file
arch/powerpc/include/asm/pte-common.h	added	+180	−0	View file
arch/powerpc/include/asm/pte-fsl-booke.h	added	+48	−0	View file
arch/powerpc/include/asm/pte-hash32.h	added	+48	−0	View file
arch/powerpc/include/asm/pte-hash64-4k.h	added	+17	−0	View file
arch/powerpc/include/asm/pgtable-64k.h → arch/powerpc/include/asm/pte-hash64-64k.h	renamed	+46	−86	View file
arch/powerpc/include/asm/pte-hash64.h	added	+54	−0	View file
arch/powerpc/include/asm/reg.h	modified	+2	−0	View file
arch/powerpc/include/asm/reg_booke.h	modified	+2	−0	View file
arch/powerpc/include/asm/system.h	modified	+1	−1	View file
arch/powerpc/include/asm/thread_info.h	modified	+10	−1	View file
arch/powerpc/include/asm/udbg.h	modified	+1	−0	View file
arch/powerpc/kernel/Makefile	modified	+6	−6	View file
arch/powerpc/kernel/align.c	modified	+1	−1	View file
arch/powerpc/kernel/asm-offsets.c	modified	+0	−3	View file
arch/powerpc/kernel/cpu_setup_44x.S	modified	+1	−0	View file
arch/powerpc/kernel/cpu_setup_6xx.S	modified	+5	−0	View file
arch/powerpc/kernel/cpu_setup_fsl_booke.S	added	+31	−0	View file
arch/powerpc/kernel/cputable.c	modified	+105	−61	View file
arch/powerpc/kernel/crash_dump.c	modified	+1	−1	View file
arch/powerpc/kernel/dbell.c	added	+44	−0	View file
arch/powerpc/kernel/entry_32.S	modified	+62	−67	View file
arch/powerpc/kernel/entry_64.S	modified	+86	−3	View file
arch/powerpc/kernel/ftrace.c	modified	+164	−58	View file
arch/powerpc/kernel/head_32.S	modified	+60	−41	View file
arch/powerpc/kernel/head_64.S	modified	+5	−1	View file
arch/powerpc/kernel/head_booke.h	modified	+14	−5	View file
arch/powerpc/kernel/head_fsl_booke.S	modified	+66	−35	View file
arch/powerpc/kernel/irq.c	modified	+2	−2	View file
arch/powerpc/kernel/module_64.c	modified	+1	−1	View file
arch/powerpc/kernel/pci-common.c	modified	+37	−8	View file
arch/powerpc/kernel/pci_32.c	modified	+12	−24	View file
arch/powerpc/kernel/pci_64.c	modified	+0	−19	View file
arch/powerpc/kernel/process.c	modified	+58	−0	View file
arch/powerpc/kernel/prom.c	modified	+1	−5	View file
arch/powerpc/kernel/prom_init.c	modified	+2	−0	View file
arch/powerpc/kernel/prom_init_check.sh	modified	+1	−1	View file
arch/powerpc/kernel/rtas.c	modified	+8	−2	View file
arch/powerpc/kernel/setup-common.c	modified	+36	−0	View file
arch/powerpc/kernel/setup_64.c	modified	+5	−37	View file
arch/powerpc/kernel/signal.c	modified	+2	−2	View file
arch/powerpc/kernel/signal.h	modified	+1	−11	View file
arch/powerpc/kernel/signal_32.c	modified	+2	−2	View file
arch/powerpc/kernel/signal_64.c	modified	+1	−1	View file
arch/powerpc/kernel/sysfs.c	modified	+7	−28	View file
arch/powerpc/kernel/traps.c	modified	+39	−40	View file
arch/powerpc/kernel/udbg.c	modified	+7	−0	View file
arch/powerpc/kernel/udbg_16550.c	modified	+50	−10	View file
arch/powerpc/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/powerpc/lib/dma-noncoherent.c	modified	+57	−246	View file
arch/powerpc/lib/feature-fixups.c	modified	+2	−2	View file
arch/powerpc/math-emu/Makefile	modified	+2	−3	View file
arch/powerpc/mm/Makefile	modified	+2	−2	View file
arch/powerpc/mm/fault.c	modified	+17	−29	View file
arch/powerpc/mm/fsl_booke_mmu.c	modified	+47	−48	View file
arch/powerpc/mm/gup.c	modified	+15	−1	View file
arch/powerpc/mm/hash_utils_64.c	modified	+41	−10	View file
arch/powerpc/mm/mem.c	modified	+0	−33	View file
arch/powerpc/mm/mmap.c → arch/powerpc/mm/mmap_64.c	renamed	+44	−20	View file
arch/powerpc/mm/mmu_context_nohash.c	modified	+2	−2	View file
arch/powerpc/mm/numa.c	modified	+76	−98	View file
arch/powerpc/mm/pgtable.c	modified	+132	−2	View file
arch/powerpc/mm/pgtable_32.c	modified	+13	−5	View file
arch/powerpc/mm/pgtable_64.c	modified	+17	−8	View file
arch/powerpc/mm/ppc_mmu_32.c	modified	+2	−8	View file
arch/powerpc/mm/tlb_hash64.c	modified	+3	−3	View file
arch/powerpc/mm/tlb_nohash.c	modified	+9	−9	View file
arch/powerpc/mm/tlb_nohash_low.S	modified	+37	−7	View file
arch/powerpc/oprofile/op_model_7450.c	modified	+11	−10	View file
arch/powerpc/platforms/44x/Kconfig	modified	+19	−0	View file
arch/powerpc/platforms/44x/ppc44x_simple.c	modified	+1	−0	View file
arch/powerpc/platforms/512x/Kconfig	modified	+2	−2	View file
arch/powerpc/platforms/52xx/Kconfig	modified	+13	−2	View file
arch/powerpc/platforms/52xx/Makefile	modified	+2	−1	View file
arch/powerpc/platforms/52xx/media5200.c	added	+273	−0	View file
arch/powerpc/platforms/52xx/mpc5200_simple.c	modified	+3	−1	View file
arch/powerpc/platforms/52xx/mpc52xx_common.c	modified	+39	−1	View file
arch/powerpc/platforms/52xx/mpc52xx_gpio.c	modified	+0	−85	View file
arch/powerpc/platforms/52xx/mpc52xx_gpt.c	added	+396	−0	View file
arch/powerpc/platforms/52xx/mpc52xx_pic.c	modified	+59	−111	View file
arch/powerpc/platforms/82xx/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/83xx/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/83xx/asp834x.c	modified	+1	−0	View file
arch/powerpc/platforms/83xx/mpc831x_rdb.c	modified	+2	−0	View file
arch/powerpc/platforms/83xx/mpc834x_itx.c	modified	+1	−0	View file
arch/powerpc/platforms/83xx/mpc834x_mds.c	modified	+1	−0	View file
arch/powerpc/platforms/83xx/mpc837x_mds.c	modified	+4	−7	View file
arch/powerpc/platforms/83xx/mpc837x_rdb.c	modified	+3	−0	View file
arch/powerpc/platforms/83xx/sbc834x.c	modified	+1	−0	View file
arch/powerpc/platforms/83xx/usb.c	modified	+2	−1	View file
arch/powerpc/platforms/85xx/Kconfig	modified	+6	−0	View file
arch/powerpc/platforms/85xx/Makefile	modified	+1	−0	View file
arch/powerpc/platforms/85xx/ksi8560.c	modified	+1	−2	View file
arch/powerpc/platforms/85xx/mpc8536_ds.c	modified	+1	−0	View file
arch/powerpc/platforms/85xx/mpc85xx_ads.c	modified	+1	−0	View file
arch/powerpc/platforms/85xx/mpc85xx_cds.c	modified	+1	−0	View file
arch/powerpc/platforms/85xx/mpc85xx_ds.c	modified	+1	−0	View file
arch/powerpc/platforms/85xx/mpc85xx_mds.c	modified	+1	−0	View file
arch/powerpc/platforms/85xx/sbc8548.c	modified	+1	−0	View file
arch/powerpc/platforms/85xx/sbc8560.c	modified	+1	−0	View file
arch/powerpc/platforms/85xx/smp.c	modified	+35	−8	View file
arch/powerpc/platforms/85xx/socrates.c	added	+133	−0	View file
arch/powerpc/platforms/85xx/socrates_fpga_pic.c	added	+327	−0	View file
arch/powerpc/platforms/85xx/socrates_fpga_pic.h	added	+16	−0	View file
arch/powerpc/platforms/85xx/stx_gp3.c	modified	+1	−0	View file
arch/powerpc/platforms/85xx/tqm85xx.c	modified	+1	−0	View file
arch/powerpc/platforms/86xx/Kconfig	modified	+18	−2	View file
arch/powerpc/platforms/86xx/Makefile	modified	+2	−0	View file
arch/powerpc/platforms/86xx/gef_gpio.c	modified	+31	−5	View file
arch/powerpc/platforms/86xx/gef_ppc9a.c	added	+224	−0	View file
arch/powerpc/platforms/86xx/gef_sbc310.c	added	+235	−0	View file
arch/powerpc/platforms/86xx/gef_sbc610.c	modified	+1	−0	View file
arch/powerpc/platforms/86xx/mpc8610_hpcd.c	modified	+1	−0	View file
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c	modified	+1	−0	View file
arch/powerpc/platforms/86xx/sbc8641d.c	modified	+1	−0	View file
arch/powerpc/platforms/Kconfig	modified	+17	−22	View file
arch/powerpc/platforms/Kconfig.cputype	modified	+17	−5	View file
arch/powerpc/platforms/Makefile	modified	+1	−0	View file
arch/powerpc/platforms/amigaone/Kconfig	added	+18	−0	View file
arch/powerpc/platforms/amigaone/Makefile	added	+1	−0	View file
arch/powerpc/platforms/amigaone/setup.c	added	+170	−0	View file
arch/powerpc/platforms/cell/Kconfig	modified	+26	−7	View file
arch/powerpc/platforms/cell/Makefile	modified	+1	−1	View file
arch/powerpc/platforms/cell/io-workarounds.c	modified	+2	−2	View file
arch/powerpc/platforms/cell/iommu.c	modified	+5	−4	View file
arch/powerpc/platforms/cell/qpace_setup.c	modified	+2	−13	View file
arch/powerpc/platforms/cell/spu_base.c	modified	+1	−1	View file
arch/powerpc/platforms/cell/spu_fault.c	modified	+22	−26	View file
arch/powerpc/platforms/cell/spufs/context.c	modified	+4	−0	View file
arch/powerpc/platforms/cell/spufs/file.c	modified	+11	−9	View file
arch/powerpc/platforms/cell/spufs/inode.c	modified	+3	−2	View file
arch/powerpc/platforms/cell/spufs/run.c	modified	+3	−0	View file
arch/powerpc/platforms/cell/spufs/spufs.h	modified	+4	−4	View file
arch/powerpc/platforms/chrp/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/chrp/pegasos_eth.c	modified	+17	−55	View file
arch/powerpc/platforms/embedded6xx/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/iseries/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/iseries/irq.c	modified	+1	−1	View file
arch/powerpc/platforms/iseries/setup.c	modified	+1	−1	View file
arch/powerpc/platforms/maple/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/pasemi/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/powermac/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/powermac/cpufreq_64.c	modified	+4	−1	View file
arch/powerpc/platforms/powermac/pic.h	modified	+1	−1	View file
arch/powerpc/platforms/powermac/setup.c	modified	+3	−0	View file
arch/powerpc/platforms/prep/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/ps3/Kconfig	modified	+1	−1	View file
arch/powerpc/platforms/ps3/mm.c	modified	+2	−2	View file
arch/powerpc/platforms/pseries/Kconfig	modified	+16	−1	View file
arch/powerpc/platforms/pseries/Makefile	modified	+2	−1	View file
arch/powerpc/platforms/pseries/dtl.c	added	+278	−0	View file
arch/powerpc/platforms/pseries/eeh_driver.c	modified	+45	−23	View file
arch/powerpc/platforms/pseries/msi.c	modified	+231	−17	View file
arch/powerpc/platforms/pseries/pci_dlpar.c	modified	+0	−2	View file
arch/powerpc/platforms/pseries/plpar_wrappers.h	modified	+10	−0	View file
arch/powerpc/platforms/pseries/reconfig.c	modified	+5	−1	View file
arch/powerpc/sysdev/cpm2.c	modified	+3	−1	View file
arch/powerpc/sysdev/cpm_common.c	modified	+1	−1	View file
arch/powerpc/sysdev/fsl_pci.c	modified	+220	−24	View file
arch/powerpc/sysdev/fsl_soc.c	modified	+4	−0	View file
arch/powerpc/sysdev/ipic.c	modified	+2	−4	View file
arch/powerpc/sysdev/msi_bitmap.c	modified	+3	−3	View file
arch/powerpc/sysdev/pmi.c	modified	+1	−1	View file
arch/powerpc/sysdev/ppc4xx_pci.c	modified	+2	−0	View file
arch/x86/include/asm/ftrace.h	modified	+0	−25	View file
arch/x86/kernel/dumpstack.c	modified	+1	−0	View file
arch/x86/kernel/ftrace.c	modified	+1	−74	View file
drivers/i2c/busses/i2c-mpc.c	modified	+3	−6	View file
drivers/macintosh/therm_adt746x.c	modified	+2	−2	View file
drivers/net/fec_mpc52xx.c	modified	+3	−3	View file
drivers/ps3/ps3av.c	modified	+12	−4	View file
drivers/serial/cpm_uart/cpm_uart_core.c	modified	+12	−2	View file
drivers/serial/mpc52xx_uart.c	modified	+11	−29	View file
drivers/spi/xilinx_spi.c	modified	+7	−2	View file
drivers/watchdog/Kconfig	modified	+1	−1	View file
include/linux/ftrace.h	modified	+24	−0	View file
include/linux/pci_ids.h	modified	+8	−0	View file
kernel/trace/trace_functions_graph.c	modified	+75	−0	View file
lib/lmb.c	modified	+21	−21	View file

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

Documentation/powerpc/dts-bindings/fsl/dma.txt

View file

diff --git a/Documentation/powerpc/dts-bindings/fsl/dma.txt b/Documentation/powerpc/dts-bindings/fsl/dma.txt
index cc45311..0732cdd 100644
--- a/Documentation/powerpc/dts-bindings/fsl/dma.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/dma.txt
@@ -35,30 +35,30 @@ Example:
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
-		reg = <82a8 4>;
-		ranges = <0 8100 1a4>;
+		reg = <0x82a8 4>;
+		ranges = <0 0x8100 0x1a4>;
 		interrupt-parent = <&ipic>;
-		interrupts = <47 8>;
+		interrupts = <71 8>;
 		cell-index = <0>;
 		dma-channel@0 {
 			compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
 			cell-index = <0>;
-			reg = <0 80>;
+			reg = <0 0x80>;
 		};
 		dma-channel@80 {
 			compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
 			cell-index = <1>;
-			reg = <80 80>;
+			reg = <0x80 0x80>;
 		};
 		dma-channel@100 {
 			compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
 			cell-index = <2>;
-			reg = <100 80>;
+			reg = <0x100 0x80>;
 		};
 		dma-channel@180 {
 			compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
 			cell-index = <3>;
-			reg = <180 80>;
+			reg = <0x180 0x80>;
 		};
 	};
 
@@ -93,36 +93,36 @@ Example:
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "fsl,mpc8540-dma", "fsl,eloplus-dma";
-		reg = <21300 4>;
-		ranges = <0 21100 200>;
+		reg = <0x21300 4>;
+		ranges = <0 0x21100 0x200>;
 		cell-index = <0>;
 		dma-channel@0 {
 			compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
-			reg = <0 80>;
+			reg = <0 0x80>;
 			cell-index = <0>;
 			interrupt-parent = <&mpic>;
-			interrupts = <14 2>;
+			interrupts = <20 2>;
 		};
 		dma-channel@80 {
 			compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
-			reg = <80 80>;
+			reg = <0x80 0x80>;
 			cell-index = <1>;
 			interrupt-parent = <&mpic>;
-			interrupts = <15 2>;
+			interrupts = <21 2>;
 		};
 		dma-channel@100 {
 			compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
-			reg = <100 80>;
+			reg = <0x100 0x80>;
 			cell-index = <2>;
 			interrupt-parent = <&mpic>;
-			interrupts = <16 2>;
+			interrupts = <22 2>;
 		};
 		dma-channel@180 {
 			compatible = "fsl,mpc8540-dma-channel", "fsl,eloplus-dma-channel";
-			reg = <180 80>;
+			reg = <0x180 0x80>;
 			cell-index = <3>;
 			interrupt-parent = <&mpic>;
-			interrupts = <17 2>;
+			interrupts = <23 2>;
 		};
 	};
 

Documentation/powerpc/dts-bindings/fsl/esdhc.txt

View file

diff --git a/Documentation/powerpc/dts-bindings/fsl/esdhc.txt b/Documentation/powerpc/dts-bindings/fsl/esdhc.txt
new file mode 100644
index 0000000..6008465
--- /dev/null
+++ b/Documentation/powerpc/dts-bindings/fsl/esdhc.txt
@@ -0,0 +1,24 @@
+* Freescale Enhanced Secure Digital Host Controller (eSDHC)
+
+The Enhanced Secure Digital Host Controller provides an interface
+for MMC, SD, and SDIO types of memory cards.
+
+Required properties:
+  - compatible : should be
+    "fsl,<chip>-esdhc", "fsl,mpc8379-esdhc" for MPC83xx processors.
+    "fsl,<chip>-esdhc", "fsl,mpc8536-esdhc" for MPC85xx processors.
+  - reg : should contain eSDHC registers location and length.
+  - interrupts : should contain eSDHC interrupt.
+  - interrupt-parent : interrupt source phandle.
+  - clock-frequency : specifies eSDHC base clock frequency.
+
+Example:
+
+sdhci@2e000 {
+	compatible = "fsl,mpc8378-esdhc", "fsl,mpc8379-esdhc";
+	reg = <0x2e000 0x1000>;
+	interrupts = <42 0x8>;
+	interrupt-parent = <&ipic>;
+	/* Filled in by U-Boot */
+	clock-frequency = <0>;
+};

Documentation/powerpc/dts-bindings/fsl/ssi.txt

View file

diff --git a/Documentation/powerpc/dts-bindings/fsl/ssi.txt b/Documentation/powerpc/dts-bindings/fsl/ssi.txt
index a2d9639..5ff76c9 100644
--- a/Documentation/powerpc/dts-bindings/fsl/ssi.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/ssi.txt
@@ -4,44 +4,56 @@ The SSI is a serial device that communicates with audio codecs.  It can
 be programmed in AC97, I2S, left-justified, or right-justified modes.
 
 Required properties:
-- compatible	  : compatible list, containing "fsl,ssi"
-- cell-index	  : the SSI, <0> = SSI1, <1> = SSI2, and so on
-- reg		  : offset and length of the register set for the device
-- interrupts	  : <a b> where a is the interrupt number and b is a
-                     field that represents an encoding of the sense and
-		    level information for the interrupt.  This should be
-		    encoded based on the information in section 2)
-		    depending on the type of interrupt controller you
-		    have.
-- interrupt-parent : the phandle for the interrupt controller that
-                     services interrupts for this device.
-- fsl,mode	  : the operating mode for the SSI interface
-		    "i2s-slave" - I2S mode, SSI is clock slave
-		    "i2s-master" - I2S mode, SSI is clock master
-		    "lj-slave" - left-justified mode, SSI is clock slave
-		    "lj-master" - l.j. mode, SSI is clock master
-		    "rj-slave" - right-justified mode, SSI is clock slave
-		    "rj-master" - r.j., SSI is clock master
-		    "ac97-slave" - AC97 mode, SSI is clock slave
-		    "ac97-master" - AC97 mode, SSI is clock master
-- fsl,playback-dma: phandle to a node for the DMA channel to use for
+- compatible:       Compatible list, contains "fsl,ssi".
+- cell-index:       The SSI, <0> = SSI1, <1> = SSI2, and so on.
+- reg:              Offset and length of the register set for the device.
+- interrupts:       <a b> where a is the interrupt number and b is a
+                    field that represents an encoding of the sense and
+                    level information for the interrupt.  This should be
+                    encoded based on the information in section 2)
+                    depending on the type of interrupt controller you
+                    have.
+- interrupt-parent: The phandle for the interrupt controller that
+                    services interrupts for this device.
+- fsl,mode:         The operating mode for the SSI interface.
+                    "i2s-slave" - I2S mode, SSI is clock slave
+                    "i2s-master" - I2S mode, SSI is clock master
+                    "lj-slave" - left-justified mode, SSI is clock slave
+                    "lj-master" - l.j. mode, SSI is clock master
+                    "rj-slave" - right-justified mode, SSI is clock slave
+                    "rj-master" - r.j., SSI is clock master
+                    "ac97-slave" - AC97 mode, SSI is clock slave
+                    "ac97-master" - AC97 mode, SSI is clock master
+- fsl,playback-dma: Phandle to a node for the DMA channel to use for
                     playback of audio.  This is typically dictated by SOC
                     design.  See the notes below.
-- fsl,capture-dma:  phandle to a node for the DMA channel to use for
+- fsl,capture-dma:  Phandle to a node for the DMA channel to use for
                     capture (recording) of audio.  This is typically dictated
                     by SOC design.  See the notes below.
+- fsl,fifo-depth:   The number of elements in the transmit and receive FIFOs.
+                    This number is the maximum allowed value for SFCSR[TFWM0].
+- fsl,ssi-asynchronous:
+                    If specified, the SSI is to be programmed in asynchronous
+                    mode.  In this mode, pins SRCK, STCK, SRFS, and STFS must
+                    all be connected to valid signals.  In synchronous mode,
+                    SRCK and SRFS are ignored.  Asynchronous mode allows
+                    playback and capture to use different sample sizes and
+                    sample rates.  Some drivers may require that SRCK and STCK
+                    be connected together, and SRFS and STFS be connected
+                    together.  This would still allow different sample sizes,
+                    but not different sample rates.
 
 Optional properties:
-- codec-handle	  : phandle to a 'codec' node that defines an audio
-		    codec connected to this SSI.  This node is typically
-		    a child of an I2C or other control node.
+- codec-handle:     Phandle to a 'codec' node that defines an audio
+                    codec connected to this SSI.  This node is typically
+                    a child of an I2C or other control node.
 
 Child 'codec' node required properties:
-- compatible	  : compatible list, contains the name of the codec
+- compatible:       Compatible list, contains the name of the codec
 
 Child 'codec' node optional properties:
-- clock-frequency  : The frequency of the input clock, which typically
-                     comes from an on-board dedicated oscillator.
+- clock-frequency:  The frequency of the input clock, which typically comes
+                    from an on-board dedicated oscillator.
 
 Notes on fsl,playback-dma and fsl,capture-dma:
 

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 74cc312..ad6b1c0 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -111,6 +111,7 @@ config PPC
 	select HAVE_FTRACE_MCOUNT_RECORD
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_FUNCTION_TRACER
+	select HAVE_FUNCTION_GRAPH_TRACER
 	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select HAVE_IDE
 	select HAVE_IOREMAP_PROT
@@ -312,7 +313,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
 
 config KEXEC
 	bool "kexec system call (EXPERIMENTAL)"
-	depends on (PPC_PRPMC2800 || PPC_MULTIPLATFORM) && EXPERIMENTAL
+	depends on BOOK3S && EXPERIMENTAL
 	help
 	  kexec is a system call that implements the ability to shutdown your
 	  current kernel, and to start another kernel.  It is like a reboot
@@ -409,6 +410,18 @@ config PPC_HAS_HASH_64K
 	depends on PPC64
 	default n
 
+config STDBINUTILS
+	bool "Using standard binutils settings"
+	depends on 44x
+	default y
+	help
+	  Turning this option off allows you to select 256KB PAGE_SIZE on 44x.
+	  Note, that kernel will be able to run only those applications,
+	  which had been compiled using binutils later than 2.17.50.0.3 with
+	  '-zmax-page-size' set to 256K (the default is 64K). Or, if using
+	  the older binutils, you can patch them with a trivial patch, which
+	  changes the ELF_MAXPAGESIZE definition from 0x10000 to 0x40000.
+
 choice
 	prompt "Page size"
 	default PPC_4K_PAGES
@@ -444,6 +457,19 @@ config PPC_64K_PAGES
 	bool "64k page size" if 44x || PPC_STD_MMU_64
 	select PPC_HAS_HASH_64K if PPC_STD_MMU_64
 
+config PPC_256K_PAGES
+	bool "256k page size" if 44x
+	depends on !STDBINUTILS && (!SHMEM || BROKEN)
+	help
+	  Make the page size 256k.
+
+	  As the ELF standard only requires alignment to support page
+	  sizes up to 64k, you will need to compile all of your user
+	  space applications with a non-standard binutils settings
+	  (see the STDBINUTILS description for details).
+
+	  Say N unless you know what you are doing.
+
 endchoice
 
 config FORCE_MAX_ZONEORDER
@@ -456,6 +482,8 @@ config FORCE_MAX_ZONEORDER
 	default "9" if PPC_STD_MMU_32 && PPC_16K_PAGES
 	range 7 64 if PPC_STD_MMU_32 && PPC_64K_PAGES
 	default "7" if PPC_STD_MMU_32 && PPC_64K_PAGES
+	range 5 64 if PPC_STD_MMU_32 && PPC_256K_PAGES
+	default "5" if PPC_STD_MMU_32 && PPC_256K_PAGES
 	range 11 64
 	default "11"
 	help
@@ -594,6 +622,7 @@ config FSL_SOC
 config FSL_PCI
  	bool
 	select PPC_INDIRECT_PCI
+	select PCI_QUIRKS
 
 config 4xx_SOC
 	bool
@@ -730,6 +759,22 @@ config LOWMEM_SIZE
 	hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL
 	default "0x30000000"
 
+config LOWMEM_CAM_NUM_BOOL
+	bool "Set number of CAMs to use to map low memory"
+	depends on ADVANCED_OPTIONS && FSL_BOOKE
+	help
+	  This option allows you to set the maximum number of CAM slots that
+	  will be used to map low memory.  There are a limited number of slots
+	  available and even more limited number that will fit in the L1 MMU.
+	  However, using more entries will allow mapping more low memory.  This
+	  can be useful in optimizing the layout of kernel virtual memory.
+
+	  Say N here unless you know what you are doing.
+
+config LOWMEM_CAM_NUM
+	int "Number of CAMs to use to map low memory" if LOWMEM_CAM_NUM_BOOL
+	default 3
+
 config RELOCATABLE
 	bool "Build a relocatable kernel (EXPERIMENTAL)"
 	depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && FSL_BOOKE
@@ -794,7 +839,7 @@ config PHYSICAL_START
 
 config PHYSICAL_ALIGN
 	hex
-	default "0x10000000" if FSL_BOOKE
+	default "0x04000000" if FSL_BOOKE
 	help
 	  This value puts the alignment restrictions on physical address
 	  where kernel is loaded and run from. Kernel is compiled for an
@@ -815,31 +860,6 @@ config TASK_SIZE
 	default "0x80000000" if PPC_PREP || PPC_8xx
 	default "0xc0000000"
 
-config CONSISTENT_START_BOOL
-	bool "Set custom consistent memory pool address"
-	depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
-	help
-	  This option allows you to set the base virtual address
-	  of the consistent memory pool.  This pool of virtual
-	  memory is used to make consistent memory allocations.
-
-config CONSISTENT_START
-	hex "Base virtual address of consistent memory pool" if CONSISTENT_START_BOOL
-	default "0xfd000000" if (NOT_COHERENT_CACHE && 8xx)
-	default "0xff100000" if NOT_COHERENT_CACHE
-
-config CONSISTENT_SIZE_BOOL
-	bool "Set custom consistent memory pool size"
-	depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
-	help
-	  This option allows you to set the size of the
-	  consistent memory pool.  This pool of virtual memory
-	  is used to make consistent memory allocations.
-
-config CONSISTENT_SIZE
-	hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL
-	default "0x00200000" if NOT_COHERENT_CACHE
-
 config PIN_TLB
 	bool "Pinned Kernel TLBs (860 ONLY)"
 	depends on ADVANCED_OPTIONS && 8xx

arch/powerpc/Kconfig.debug

View file

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 08f7cc0..22091bb 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -129,7 +129,7 @@ config BDI_SWITCH
 
 config BOOTX_TEXT
 	bool "Support for early boot text console (BootX or OpenFirmware only)"
-	depends on PPC_OF && PPC_MULTIPLATFORM
+	depends on PPC_OF && PPC_BOOK3S
 	help
 	  Say Y here to see progress messages from the boot firmware in text
 	  mode. Requires either BootX or Open Firmware.

arch/powerpc/Makefile

View file

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 72d17f5..551fc58 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -147,8 +147,8 @@ core-y				+= arch/powerpc/kernel/ \
 				   arch/powerpc/mm/ \
 				   arch/powerpc/lib/ \
 				   arch/powerpc/sysdev/ \
-				   arch/powerpc/platforms/
-core-$(CONFIG_MATH_EMULATION)	+= arch/powerpc/math-emu/
+				   arch/powerpc/platforms/ \
+				   arch/powerpc/math-emu/
 core-$(CONFIG_XMON)		+= arch/powerpc/xmon/
 core-$(CONFIG_KVM) 		+= arch/powerpc/kvm/
 

arch/powerpc/boot/Makefile

View file

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index e84df33..4458abb 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -70,7 +70,7 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c
 		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
 		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
 		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
-		cuboot-acadia.c
+		cuboot-acadia.c cuboot-amigaone.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -235,7 +235,9 @@ image-$(CONFIG_PPC_ADDER875)		+= cuImage.adder875-uboot \
 					   dtbImage.adder875-redboot
 
 # Board ports in arch/powerpc/platform/52xx/Kconfig
-image-$(CONFIG_PPC_LITE5200)		+= cuImage.lite5200 cuImage.lite5200b
+image-$(CONFIG_PPC_LITE5200)		+= cuImage.lite5200 lite5200.dtb
+image-$(CONFIG_PPC_LITE5200)		+= cuImage.lite5200b lite5200b.dtb
+image-$(CONFIG_PPC_MEDIA5200)		+= cuImage.media5200 media5200.dtb
 
 # Board ports in arch/powerpc/platform/82xx/Kconfig
 image-$(CONFIG_MPC8272_ADS)		+= cuImage.mpc8272ads
@@ -274,6 +276,9 @@ image-$(CONFIG_STORCENTER)		+= cuImage.storcenter
 image-$(CONFIG_MPC7448HPC2)		+= cuImage.mpc7448hpc2
 image-$(CONFIG_PPC_C2K)			+= cuImage.c2k
 
+# Board port in arch/powerpc/platform/amigaone/Kconfig
+image-$(CONFIG_AMIGAONE)		+= cuImage.amigaone
+
 # For 32-bit powermacs, build the COFF and miboot images
 # as well as the ELF images.
 ifeq ($(CONFIG_PPC32),y)

arch/powerpc/boot/cuboot-amigaone.c

View file

diff --git a/arch/powerpc/boot/cuboot-amigaone.c b/arch/powerpc/boot/cuboot-amigaone.c
new file mode 100644
index 0000000..d502967
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-amigaone.c
@@ -0,0 +1,35 @@
+/*
+ * Old U-boot compatibility for AmigaOne
+ *
+ * Author: Gerhard Pircher ([email protected])
+ *
+ *   Based on cuboot-83xx.c
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+#include "cuboot.h"
+
+#include "ppcboot.h"
+
+static bd_t bd;
+
+static void platform_fixups(void)
+{
+	dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
+	dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq);
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+	CUBOOT_INIT();
+	fdt_init(_dtb_start);
+	serial_console_init();
+	platform_ops.fixups = platform_fixups;
+}

arch/powerpc/boot/dts/amigaone.dts

View file

diff --git a/arch/powerpc/boot/dts/amigaone.dts b/arch/powerpc/boot/dts/amigaone.dts
new file mode 100644
index 0000000..26549fc
--- /dev/null
+++ b/arch/powerpc/boot/dts/amigaone.dts
@@ -0,0 +1,173 @@
+/*
+ * AmigaOne Device Tree Source
+ *
+ * Copyright 2008 Gerhard Pircher ([email protected])
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+	model = "AmigaOne";
+	compatible = "eyetech,amigaone";
+	coherency-off;
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#cpus = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			reg = <0>;
+			d-cache-line-size = <32>;	// 32 bytes
+			i-cache-line-size = <32>;	// 32 bytes
+			d-cache-size = <32768>;		// L1, 32K
+			i-cache-size = <32768>;		// L1, 32K
+			timebase-frequency = <0>;	// 33.3 MHz, from U-boot
+			clock-frequency = <0>;		// From U-boot
+			bus-frequency = <0>;		// From U-boot
+		};
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0 0>;				// From U-boot
+	};
+
+	pci@80000000 {
+		device_type = "pci";
+		compatible = "mai-logic,articia-s";
+		bus-frequency = <33333333>;
+		bus-range = <0 0xff>;
+		ranges = <0x01000000 0 0x00000000 0xfe000000 0 0x00c00000	// PCI I/O
+		          0x02000000 0 0x80000000 0x80000000 0 0x7d000000	// PCI memory
+		          0x02000000 0 0x00000000 0xfd000000 0 0x01000000>;	// PCI alias memory (ISA)
+		// Configuration address and data register.
+		reg = <0xfec00cf8 4
+		       0xfee00cfc 4>;
+		8259-interrupt-acknowledge = <0xfef00000>;
+		// Do not define a interrupt-parent here, if there is no
+		// interrupt-map property.
+		#address-cells = <3>;
+		#size-cells = <2>;
+
+		isa@7 {
+			device_type = "isa";
+			compatible = "pciclass,0601";
+			vendor-id = <0x00001106>;
+			device-id = <0x00000686>;
+			revision-id = <0x00000010>;
+			class-code = <0x00060100>;
+			subsystem-id = <0>;
+			subsystem-vendor-id = <0>;
+			devsel-speed = <0x00000001>;
+			min-grant = <0>;
+			max-latency = <0>;
+			/* First 64k for I/O at 0x0 on PCI mapped to 0x0 on ISA. */
+			ranges = <0x00000001 0 0x01000000 0 0x00000000 0x00010000>;
+			interrupt-parent = <&i8259>;
+			#interrupt-cells = <2>;
+			#address-cells = <2>;
+			#size-cells = <1>;
+
+			dma-controller@0 {
+				compatible = "pnpPNP,200";
+				reg = <1 0x00000000 0x00000020
+				       1 0x00000080 0x00000010
+				       1 0x000000c0 0x00000020>;
+			};
+
+			i8259: interrupt-controller@20 {
+				device_type = "interrupt-controller";
+				compatible = "pnpPNP,000";
+				interrupt-controller;
+				reg = <1 0x00000020 0x00000002
+				       1 0x000000a0 0x00000002
+				       1 0x000004d0 0x00000002>;
+				reserved-interrupts = <2>;
+				#interrupt-cells = <2>;
+			};
+
+			timer@40 {
+				// Also adds pcspkr to platform devices.
+				compatible = "pnpPNP,100";
+				reg = <1 0x00000040 0x00000020>;
+			};
+
+			8042@60 {
+				device_type = "8042";
+				reg = <1 0x00000060 0x00000001
+				       1 0x00000064 0x00000001>;
+				interrupts = <1 3 12 3>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				keyboard@0 {
+					compatible = "pnpPNP,303";
+					reg = <0>;
+				};
+
+				mouse@1 {
+					compatible = "pnpPNP,f03";
+					reg = <1>;
+				};
+			};
+
+			rtc@70 {
+				compatible = "pnpPNP,b00";
+				reg = <1 0x00000070 0x00000002>;
+				interrupts = <8 3>;
+			};
+
+			serial@3f8 {
+				device_type = "serial";
+				compatible = "pnpPNP,501","pnpPNP,500";
+				reg = <1 0x000003f8 0x00000008>;
+				interrupts = <4 3>;
+				clock-frequency = <1843200>;
+				current-speed = <115200>;
+			};
+
+			serial@2f8 {
+				device_type = "serial";
+				compatible = "pnpPNP,501","pnpPNP,500";
+				reg = <1 0x000002f8 0x00000008>;
+				interrupts = <3 3>;