Merge branch 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

24a77daf · Linus Torvalds <[email protected]> · 2007-04-30 08:10:12 -07:00

* 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (255 commits)
  [POWERPC] Remove dev_dbg redefinition in drivers/ps3/vuart.c
  [POWERPC] remove kernel module option for booke wdt
  [POWERPC] Avoid putting cpu node twice
  [POWERPC] Spinlock initializer cleanup
  [POWERPC] ppc4xx_sgdma needs dma-mapping.h
  [POWERPC] arch/powerpc/sysdev/timer.c build fix
  [POWERPC] get_property cleanups
  [POWERPC] Remove the unused HTDMSOUND driver
  [POWERPC] cell: cbe_cpufreq cleanup and crash fix
  [POWERPC] Declare enable_kernel_spe in a header
  [POWERPC] Add dt_xlate_addr() to bootwrapper
  [POWERPC] bootwrapper: CONFIG_ -> CONFIG_DEVICE_TREE
  [POWERPC] Don't define a custom bd_t for Xilixn Virtex based boards.
  [POWERPC] Add sane defaults for Xilinx EDK generated xparameters files
  [POWERPC] Add uartlite boot console driver for the zImage wrapper
  [POWERPC] Stop using ppc_sys for Xilinx Virtex boards
  [POWERPC] New registration for common Xilinx Virtex ppc405 platform devices
  [POWERPC] Merge common virtex header files
  [POWERPC] Rework Kconfig dependancies for Xilinx Virtex ppc405 platform
  [POWERPC] Clean up cpufreq Kconfig dependencies
  ...

Commit: 24a77daf3d80bddcece044e6dc3675e427eef3f3
Parents: e389f9ae · f900e977

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

Changes

375 files changed · +11535 −7881

File	Status	Add	Del	Content
Documentation/powerpc/booting-without-of.txt	modified	+167	−89	View file
arch/powerpc/Kconfig	modified	+49	−423	View file
arch/powerpc/Kconfig.debug	modified	+10	−2	View file
arch/powerpc/Makefile	modified	+7	−4	View file
arch/powerpc/boot/.gitignore	modified	+3	−0	View file
arch/powerpc/boot/Makefile	modified	+62	−60	View file
arch/powerpc/boot/crt0.S	modified	+34	−3	View file
arch/powerpc/boot/cuboot-83xx.c	added	+68	−0	View file
arch/powerpc/boot/cuboot-85xx.c	added	+69	−0	View file
arch/powerpc/boot/devtree.c	added	+307	−0	View file
arch/powerpc/boot/dts/kuroboxHD.dts	modified	+3	−4	View file
arch/powerpc/boot/dts/kuroboxHG.dts	modified	+3	−4	View file
arch/powerpc/boot/dts/lite5200.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/lite5200b.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc7448hpc2.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc8272ads.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc8313erdb.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc832x_mds.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc832x_rdb.dts	added	+291	−0	View file
arch/powerpc/boot/dts/mpc8349emitx.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc8349emitxgp.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc834x_mds.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc836x_mds.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc8540ads.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc8541cds.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc8544ds.dts	added	+136	−0	View file
arch/powerpc/boot/dts/mpc8548cds.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc8555cds.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc8560ads.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc8568mds.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc8641_hpcn.dts	modified	+24	−1	View file
arch/powerpc/boot/dts/mpc866ads.dts	modified	+0	−1	View file
arch/powerpc/boot/dts/mpc885ads.dts	modified	+0	−1	View file
arch/powerpc/boot/elf.h	modified	+8	−0	View file
arch/powerpc/boot/elf_util.c	added	+76	−0	View file
arch/powerpc/boot/flatdevtree.c	modified	+159	−40	View file
arch/powerpc/boot/flatdevtree.h	modified	+7	−0	View file
arch/powerpc/boot/flatdevtree_misc.c	modified	+32	−10	View file
arch/powerpc/boot/gunzip_util.c	added	+206	−0	View file
arch/powerpc/boot/gunzip_util.h	added	+45	−0	View file
arch/powerpc/boot/main.c	modified	+118	−251	View file
arch/powerpc/boot/ns16550.c	modified	+7	−2	View file
arch/powerpc/boot/of.c	modified	+18	−3	View file
arch/powerpc/boot/ops.h	modified	+96	−7	View file
arch/powerpc/boot/ppcboot.h	added	+108	−0	View file
arch/powerpc/boot/reg.h	added	+22	−0	View file
arch/powerpc/boot/simple_alloc.c	modified	+16	−15	View file
arch/powerpc/boot/stdio.h	modified	+3	−2	View file
arch/powerpc/boot/wrapper	modified	+41	−12	View file
arch/powerpc/boot/zImage.coff.lds.S	modified	+2	−1	View file
arch/powerpc/boot/zImage.lds.S	modified	+1	−0	View file
arch/powerpc/configs/cell_defconfig	modified	+29	−28	View file
arch/powerpc/configs/g5_defconfig	modified	+1	−1	View file
arch/powerpc/configs/maple_defconfig	modified	+1	−1	View file
arch/powerpc/configs/mpc832x_rdb_defconfig	added	+1292	−0	View file
arch/powerpc/configs/mpc8544_ds_defconfig	added	+1077	−0	View file
arch/powerpc/configs/ppc64_defconfig	modified	+1	−1	View file
arch/powerpc/kernel/Makefile	modified	+2	−2	View file
arch/powerpc/kernel/align.c	modified	+31	−25	View file
arch/powerpc/kernel/asm-offsets.c	modified	+1	−1	View file
arch/powerpc/kernel/btext.c	modified	+11	−11	View file
arch/powerpc/kernel/cpu_setup_pa6t.S	modified	+1	−1	View file
arch/powerpc/kernel/cputable.c	modified	+14	−0	View file
arch/powerpc/kernel/entry_32.S	modified	+0	−1	View file
arch/powerpc/kernel/head_64.S	modified	+8	−8	View file
arch/powerpc/kernel/ibmebus.c	modified	+195	−93	View file
arch/powerpc/kernel/iommu.c	modified	+34	−1	View file
arch/powerpc/kernel/irq.c	modified	+1	−1	View file
arch/powerpc/kernel/kprobes.c	modified	+35	−1	View file
arch/powerpc/kernel/legacy_serial.c	modified	+12	−12	View file
arch/powerpc/kernel/lparcfg.c	modified	+31	−27	View file
arch/powerpc/kernel/machine_kexec_64.c	modified	+7	−7	View file
arch/powerpc/kernel/misc_32.S	modified	+0	−4	View file
arch/powerpc/kernel/of_device.c	modified	+112	−0	View file
arch/powerpc/kernel/of_platform.c	modified	+3	−2	View file
arch/powerpc/kernel/pci_32.c	modified	+26	−16	View file
arch/powerpc/kernel/pci_64.c	modified	+21	−11	View file
arch/powerpc/kernel/pci_dn.c	modified	+5	−4	View file
arch/powerpc/kernel/ppc_ksyms.c	modified	+0	−1	View file
arch/powerpc/kernel/process.c	modified	+34	−20	View file
arch/powerpc/kernel/prom.c	modified	+47	−120	View file
arch/powerpc/kernel/prom_init.c	modified	+33	−22	View file
arch/powerpc/kernel/prom_parse.c	modified	+25	−26	View file
arch/powerpc/kernel/rtas-proc.c	modified	+2	−2	View file
arch/powerpc/kernel/rtas.c	modified	+10	−9	View file
arch/powerpc/kernel/rtas_pci.c	modified	+6	−8	View file
arch/powerpc/kernel/setup-common.c	modified	+39	−29	View file
arch/powerpc/kernel/setup_32.c	modified	+11	−6	View file
arch/powerpc/kernel/setup_64.c	modified	+5	−6	View file
arch/powerpc/kernel/smp.c	modified	+0	−4	View file
arch/powerpc/kernel/sys_ppc32.c	modified	+0	−4	View file
arch/powerpc/kernel/sysfs.c	modified	+9	−8	View file
arch/powerpc/kernel/time.c	modified	+1	−1	View file
arch/powerpc/kernel/traps.c	modified	+54	−22	View file
arch/powerpc/kernel/vio.c	modified	+9	−8	View file
arch/powerpc/lib/copyuser_64.S	modified	+3	−3	View file
arch/powerpc/lib/locks.c	modified	+4	−0	View file
arch/powerpc/lib/mem_64.S	modified	+3	−3	View file
arch/powerpc/lib/memcpy_64.S	modified	+3	−3	View file
arch/powerpc/lib/sstep.c	modified	+44	−1	View file
arch/powerpc/mm/hash_low_32.S	modified	+20	−2	View file
arch/powerpc/mm/hash_low_64.S	modified	+4	−1	View file
arch/powerpc/mm/hash_native_64.c	modified	+1	−1	View file
arch/powerpc/mm/hash_utils_64.c	modified	+111	−16	View file
arch/powerpc/mm/hugetlbpage.c	modified	+5	−11	View file
arch/powerpc/mm/init_32.c	modified	+4	−0	View file
arch/powerpc/mm/lmb.c	modified	+4	−0	View file
arch/powerpc/mm/mem.c	modified	+0	−3	View file
arch/powerpc/mm/mmu_decl.h	modified	+5	−0	View file
arch/powerpc/mm/numa.c	modified	+12	−12	View file
arch/powerpc/mm/pgtable_32.c	modified	+67	−9	View file
arch/powerpc/mm/ppc_mmu_32.c	modified	+3	−1	View file
arch/powerpc/mm/tlb_64.c	modified	+43	−25	View file
arch/powerpc/oprofile/Makefile	modified	+1	−1	View file
arch/powerpc/oprofile/common.c	modified	+3	−0	View file
arch/powerpc/oprofile/op_model_cell.c	modified	+2	−1	View file
arch/powerpc/oprofile/op_model_pa6t.c	added	+234	−0	View file
arch/powerpc/platforms/4xx/Kconfig	modified	+150	−222	View file
arch/powerpc/platforms/52xx/Kconfig	added	+35	−0	View file
arch/powerpc/platforms/52xx/efika.c	modified	+7	−8	View file
arch/powerpc/platforms/52xx/lite5200.c	modified	+7	−5	View file
arch/powerpc/platforms/52xx/mpc52xx_common.c	modified	+1	−1	View file
arch/powerpc/platforms/52xx/mpc52xx_pci.c	modified	+1	−1	View file
arch/powerpc/platforms/82xx/Kconfig	modified	+30	−15	View file
arch/powerpc/platforms/82xx/mpc82xx.c	modified	+3	−3	View file
arch/powerpc/platforms/82xx/mpc82xx_ads.c	modified	+6	−6	View file
arch/powerpc/platforms/83xx/Kconfig	modified	+9	−6	View file
arch/powerpc/platforms/83xx/Makefile	modified	+1	−0	View file
arch/powerpc/platforms/83xx/mpc832x_mds.c	modified	+0	−1	View file
arch/powerpc/platforms/83xx/mpc832x_rdb.c	added	+138	−0	View file
arch/powerpc/platforms/83xx/mpc834x_itx.h	deleted	+0	−23	View before deletion
arch/powerpc/platforms/83xx/pci.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/Kconfig	modified	+12	−26	View file
arch/powerpc/platforms/85xx/Makefile	modified	+1	−0	View file
arch/powerpc/platforms/85xx/mpc8544_ds.c	added	+144	−0	View file
arch/powerpc/platforms/85xx/mpc85xx_ads.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/mpc85xx_cds.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/mpc85xx_mds.c	modified	+1	−1	View file
arch/powerpc/platforms/85xx/pci.c	modified	+1	−1	View file
arch/powerpc/platforms/86xx/Kconfig	modified	+3	−15	View file
arch/powerpc/platforms/86xx/Makefile	modified	+1	−1	View file
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c	modified	+2	−2	View file
arch/powerpc/platforms/86xx/pci.c	modified	+2	−2	View file
arch/powerpc/platforms/8xx/Kconfig	modified	+31	−36	View file
arch/powerpc/platforms/8xx/m8xx_setup.c	modified	+4	−4	View file
arch/powerpc/platforms/8xx/mpc86xads.h	modified	+1	−1	View file
arch/powerpc/platforms/8xx/mpc86xads_setup.c	modified	+2	−2	View file
arch/powerpc/platforms/8xx/mpc885ads.h	modified	+1	−1	View file
arch/powerpc/platforms/8xx/mpc885ads_setup.c	modified	+2	−2	View file
arch/powerpc/platforms/Kconfig	added	+259	−0	View file
arch/powerpc/platforms/cell/Kconfig	modified	+24	−0	View file
arch/powerpc/platforms/cell/cbe_cpufreq.c	modified	+98	−14	View file
arch/powerpc/platforms/cell/cbe_regs.c	modified	+125	−43	View file
arch/powerpc/platforms/cell/cbe_regs.h	modified	+5	−0	View file
arch/powerpc/platforms/cell/cbe_thermal.c	modified	+163	−18	View file
arch/powerpc/platforms/cell/interrupt.c	modified	+2	−2	View file
arch/powerpc/platforms/cell/io-workarounds.c	modified	+1	−1	View file
arch/powerpc/platforms/cell/iommu.c	modified	+8	−8	View file
arch/powerpc/platforms/cell/ras.c	modified	+160	−0	View file
arch/powerpc/platforms/cell/setup.c	modified	+1	−11	View file
arch/powerpc/platforms/cell/spider-pic.c	modified	+4	−4	View file
arch/powerpc/platforms/cell/spu_base.c	modified	+18	−145	View file
arch/powerpc/platforms/cell/spu_coredump.c	modified	+16	−18	View file
arch/powerpc/platforms/cell/spu_manage.c	modified	+9	−9	View file
arch/powerpc/platforms/cell/spufs/Makefile	modified	+1	−1	View file
arch/powerpc/platforms/cell/spufs/backing_ops.c	modified	+6	−0	View file
arch/powerpc/platforms/cell/spufs/context.c	modified	+4	−41	View file
arch/powerpc/platforms/cell/spufs/coredump.c	modified	+10	−9	View file
arch/powerpc/platforms/cell/spufs/fault.c	added	+211	−0	View file
arch/powerpc/platforms/cell/spufs/file.c	modified	+136	−16	View file
arch/powerpc/platforms/cell/spufs/hw_ops.c	modified	+9	−0	View file
arch/powerpc/platforms/cell/spufs/inode.c	modified	+33	−11	View file
arch/powerpc/platforms/cell/spufs/run.c	modified	+58	−65	View file
arch/powerpc/platforms/cell/spufs/sched.c	modified	+64	−49	View file
arch/powerpc/platforms/cell/spufs/spufs.h	modified	+19	−15	View file
arch/powerpc/platforms/cell/spufs/switch.c	modified	+6	−2	View file
arch/powerpc/platforms/celleb/Kconfig	added	+9	−0	View file
arch/powerpc/platforms/celleb/iommu.c	modified	+3	−3	View file
arch/powerpc/platforms/celleb/pci.c	modified	+9	−9	View file
arch/powerpc/platforms/celleb/setup.c	modified	+1	−11	View file
arch/powerpc/platforms/chrp/Kconfig	added	+11	−0	View file
arch/powerpc/platforms/chrp/nvram.c	modified	+1	−1	View file
arch/powerpc/platforms/chrp/pci.c	modified	+14	−11	View file
arch/powerpc/platforms/chrp/setup.c	modified	+30	−22	View file
arch/powerpc/platforms/chrp/time.c	modified	+9	−4	View file
arch/powerpc/platforms/embedded6xx/Kconfig	modified	+2	−262	View file
arch/powerpc/platforms/embedded6xx/linkstation.c	modified	+4	−4	View file
arch/powerpc/platforms/embedded6xx/ls_uart.c	modified	+2	−2	View file
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c	modified	+2	−13	View file
arch/powerpc/platforms/iseries/Kconfig	modified	+4	−0	View file
arch/powerpc/platforms/iseries/iommu.c	modified	+2	−2	View file
arch/powerpc/platforms/iseries/irq.c	modified	+3	−1	View file
arch/powerpc/platforms/iseries/pci.c	modified	+2	−3	View file
arch/powerpc/platforms/iseries/setup.c	modified	+0	−10	View file
arch/powerpc/platforms/iseries/viopath.c	modified	+1	−1	View file
arch/powerpc/platforms/maple/Kconfig	added	+17	−0	View file
arch/powerpc/platforms/maple/pci.c	modified	+4	−4	View file
arch/powerpc/platforms/maple/setup.c	modified	+8	−9	View file
arch/powerpc/platforms/pasemi/Kconfig	modified	+19	−0	View file
arch/powerpc/platforms/pasemi/Makefile	modified	+2	−1	View file
arch/powerpc/platforms/pasemi/cpufreq.c	added	+308	−0	View file
arch/powerpc/platforms/pasemi/gpio_mdio.c	added	+339	−0	View file
arch/powerpc/platforms/pasemi/idle.c	modified	+9	−0	View file
arch/powerpc/platforms/pasemi/iommu.c	modified	+3	−3	View file
arch/powerpc/platforms/pasemi/pasemi.h	modified	+8	−0	View file
arch/powerpc/platforms/pasemi/pci.c	modified	+13	−3	View file
arch/powerpc/platforms/pasemi/setup.c	modified	+18	−10	View file
arch/powerpc/platforms/powermac/Kconfig	added	+20	−0	View file
arch/powerpc/platforms/powermac/backlight.c	modified	+6	−3	View file
arch/powerpc/platforms/powermac/cpufreq_32.c	modified	+13	−11	View file
arch/powerpc/platforms/powermac/cpufreq_64.c	modified	+8	−8	View file
arch/powerpc/platforms/powermac/feature.c	modified	+58	−43	View file
arch/powerpc/platforms/powermac/low_i2c.c	modified	+8	−7	View file
arch/powerpc/platforms/powermac/pci.c	modified	+21	−20	View file
arch/powerpc/platforms/powermac/pfunc_base.c	modified	+1	−1	View file
arch/powerpc/platforms/powermac/pfunc_core.c	modified	+2	−3	View file
arch/powerpc/platforms/powermac/pic.c	modified	+4	−4	View file
arch/powerpc/platforms/powermac/setup.c	modified	+35	−26	View file
arch/powerpc/platforms/powermac/smp.c	modified	+7	−4	View file
arch/powerpc/platforms/powermac/time.c	modified	+0	−38	View file
arch/powerpc/platforms/powermac/udbg_scc.c	modified	+3	−3	View file
arch/powerpc/platforms/prep/Kconfig	modified	+9	−0	View file
arch/powerpc/platforms/ps3/Kconfig	modified	+16	−0	View file
arch/powerpc/platforms/ps3/htab.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/Kconfig	modified	+10	−0	View file
arch/powerpc/platforms/pseries/Makefile	modified	+3	−2	View file
arch/powerpc/platforms/pseries/eeh.c	modified	+118	−86	View file
arch/powerpc/platforms/pseries/eeh_driver.c	modified	+41	−37	View file
arch/powerpc/platforms/pseries/eeh_event.c	modified	+2	−6	View file
arch/powerpc/platforms/pseries/firmware.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/hotplug-cpu.c	modified	+2	−2	View file
arch/powerpc/platforms/pseries/iommu.c	modified	+37	−30	View file
arch/powerpc/platforms/pseries/lpar.c	modified	+3	−3	View file
arch/powerpc/platforms/pseries/nvram.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/pci.c	modified	+2	−1	View file
arch/powerpc/platforms/pseries/pci_dlpar.c	modified	+1	−0	View file
arch/powerpc/platforms/pseries/ras.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/rtasd.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/setup.c	modified	+11	−33	View file
arch/powerpc/platforms/pseries/xics.c	modified	+9	−8	View file
arch/powerpc/sysdev/Makefile	modified	+5	−0	View file
arch/powerpc/sysdev/dart_iommu.c	modified	+2	−2	View file
arch/powerpc/sysdev/dcr.c	modified	+7	−7	View file
arch/powerpc/platforms/86xx/mpc86xx_pcie.c → arch/powerpc/sysdev/fsl_pcie.c	renamed	+0	−2	View file
arch/powerpc/sysdev/fsl_pcie.h	added	+94	−0	View file
arch/powerpc/sysdev/fsl_soc.c	modified	+48	−42	View file
arch/powerpc/sysdev/mpic.c	modified	+16	−16	View file
arch/powerpc/sysdev/pmi.c	modified	+10	−19	View file
arch/powerpc/sysdev/qe_lib/Kconfig	modified	+2	−8	View file
arch/powerpc/sysdev/qe_lib/qe.c	modified	+2	−2	View file
arch/powerpc/sysdev/qe_lib/qe_io.c	modified	+3	−3	View file
arch/powerpc/sysdev/qe_lib/ucc_slow.c	modified	+2	−2	View file
arch/powerpc/sysdev/timer.c	added	+71	−0	View file
arch/powerpc/sysdev/tsi108_dev.c	modified	+8	−8	View file
arch/powerpc/sysdev/tsi108_pci.c	modified	+1	−1	View file
arch/powerpc/sysdev/uic.c	added	+342	−0	View file
arch/powerpc/xmon/xmon.c	modified	+7	−4	View file
arch/ppc/8xx_io/Kconfig	modified	+0	−4	View file
arch/ppc/8xx_io/Makefile	modified	+0	−1	View file
arch/ppc/8xx_io/cs4218.h	deleted	+0	−166	View before deletion
arch/ppc/8xx_io/cs4218_tdm.c	deleted	+0	−2833	View before deletion
arch/ppc/boot/common/misc-common.c	modified	+10	−5	View file
arch/ppc/boot/simple/Makefile	modified	+1	−0	View file
arch/ppc/boot/simple/uartlite_tty.c	added	+37	−0	View file
arch/ppc/kernel/asm-offsets.c	modified	+0	−1	View file
arch/ppc/kernel/entry.S	modified	+0	−1	View file
arch/ppc/platforms/4xx/Kconfig	modified	+7	−8	View file
arch/ppc/platforms/4xx/Makefile	modified	+0	−1	View file
arch/ppc/platforms/4xx/ocotea.c	modified	+2	−2	View file
arch/ppc/platforms/4xx/taishan.c	modified	+1	−1	View file
arch/ppc/platforms/4xx/virtex.c	deleted	+0	−56	View before deletion
arch/ppc/platforms/4xx/virtex.h	modified	+17	−17	View file
arch/ppc/platforms/4xx/xilinx_ml300.c	modified	+5	−60	View file
arch/ppc/platforms/4xx/xilinx_ml300.h	deleted	+0	−45	View before deletion
arch/ppc/platforms/4xx/xilinx_ml403.c	modified	+5	−61	View file
arch/ppc/platforms/4xx/xilinx_ml403.h	deleted	+0	−49	View before deletion
arch/ppc/platforms/4xx/xparameters/xparameters.h	modified	+60	−0	View file
arch/ppc/platforms/rpxclassic.h	modified	+0	−4	View file
arch/ppc/platforms/rpxhiox.h	deleted	+0	−41	View before deletion
arch/ppc/platforms/rpxlite.h	modified	+0	−4	View file
arch/ppc/syslib/Makefile	modified	+2	−1	View file
arch/ppc/syslib/cpc710.h	deleted	+0	−81	View before deletion
arch/ppc/syslib/m8xx_setup.c	modified	+1	−1	View file
arch/ppc/syslib/ppc4xx_sgdma.c	modified	+1	−0	View file
arch/ppc/syslib/virtex_devices.c	added	+233	−0	View file
arch/ppc/syslib/virtex_devices.h	added	+27	−0	View file
drivers/char/briq_panel.c	modified	+5	−2	View file
drivers/char/hvc_console.c	modified	+34	−15	View file
drivers/char/hvc_iseries.c	modified	+1	−1	View file
drivers/char/hvc_vio.c	modified	+1	−1	View file
drivers/char/hvsi.c	modified	+2	−2	View file
drivers/char/tpm/tpm_atmel.h	modified	+2	−2	View file
drivers/char/watchdog/Kconfig	modified	+1	−1	View file
drivers/hwmon/ams/ams-core.c	modified	+2	−2	View file
drivers/hwmon/ams/ams-i2c.c	modified	+2	−2	View file
drivers/hwmon/ams/ams-pmu.c	modified	+2	−2	View file
drivers/infiniband/hw/ehca/ehca_main.c	modified	+2	−2	View file
drivers/macintosh/adb.c	modified	+9	−33	View file
drivers/macintosh/ans-lcd.c	modified	+5	−4	View file
drivers/macintosh/apm_emu.c	modified	+4	−9	View file
drivers/macintosh/mac_hid.c	modified	+0	−2	View file
drivers/macintosh/macio-adb.c	modified	+13	−3	View file
drivers/macintosh/macio_asic.c	modified	+2	−98	View file
drivers/macintosh/macio_sysfs.c	modified	+6	−4	View file
drivers/macintosh/rack-meter.c	modified	+1	−1	View file
drivers/macintosh/smu.c	modified	+4	−4	View file
drivers/macintosh/therm_adt746x.c	modified	+4	−4	View file
drivers/macintosh/therm_pm72.c	modified	+4	−4	View file
drivers/macintosh/therm_windtunnel.c	modified	+1	−1	View file
drivers/macintosh/via-cuda.c	modified	+1	−1	View file
drivers/macintosh/via-pmu-led.c	modified	+5	−5	View file
drivers/macintosh/via-pmu.c	modified	+19	−36	View file
drivers/macintosh/windfarm_lm75_sensor.c	modified	+1	−1	View file
drivers/macintosh/windfarm_max6690_sensor.c	modified	+1	−1	View file
drivers/macintosh/windfarm_smu_controls.c	modified	+4	−4	View file
drivers/macintosh/windfarm_smu_sat.c	modified	+4	−4	View file
drivers/macintosh/windfarm_smu_sensors.c	modified	+3	−3	View file
drivers/media/video/planb.c	modified	+4	−1	View file
drivers/net/Kconfig	modified	+5	−4	View file
drivers/ps3/vuart.c	modified	+0	−8	View file
drivers/scsi/ibmvscsi/ibmvstgt.c	modified	+4	−3	View file
drivers/scsi/ibmvscsi/rpa_vscsi.c	modified	+2	−1	View file
drivers/serial/pmac_zilog.c	modified	+3	−1	View file
drivers/video/Kconfig	modified	+1	−1	View file
drivers/video/aty/radeon_pm.c	modified	+1	−1	View file
drivers/video/controlfb.c	modified	+10	−6	View file
fs/proc/proc_devtree.c	modified	+1	−1	View file
include/asm-powerpc/asm-compat.h	modified	+10	−0	View file
include/asm-powerpc/cacheflush.h	modified	+6	−0	View file
include/asm-powerpc/cell-pmu.h	modified	+0	−5	View file
include/asm-powerpc/cputable.h	modified	+8	−3	View file
include/asm-powerpc/current.h	modified	+1	−0	View file
include/asm-powerpc/edac.h	added	+40	−0	View file
include/asm-powerpc/eeh_event.h	modified	+1	−5	View file
include/asm-powerpc/ibmebus.h	modified	+22	−22	View file
include/asm-powerpc/immap_86xx.h	modified	+0	−75	View file
include/asm-powerpc/io.h	modified	+6	−1	View file
include/asm-powerpc/kprobes.h	modified	+5	−0	View file
include/asm-powerpc/machdep.h	modified	+0	−3	View file
include/asm-powerpc/mmu-hash64.h	added	+400	−0	View file
include/asm-powerpc/mmu.h	modified	+6	−399	View file
include/asm-powerpc/mpic.h	modified	+6	−6	View file
include/asm-powerpc/of_device.h	modified	+3	−0	View file
include/asm-powerpc/oprofile_impl.h	modified	+2	−0	View file
include/asm-powerpc/paca.h	modified	+2	−2	View file
include/asm-powerpc/parport.h	modified	+3	−3	View file
include/asm-powerpc/pci.h	modified	+10	−4	View file
include/asm-powerpc/pgtable-4k.h	modified	+3	−0	View file
include/asm-powerpc/pgtable-64k.h	modified	+5	−0	View file
include/asm-powerpc/pgtable.h	modified	+16	−44	View file
include/asm-powerpc/pmc.h	modified	+1	−0	View file
include/asm-powerpc/ppc-pci.h	modified	+10	−2	View file
include/asm-powerpc/processor.h	modified	+0	−1	View file
include/asm-powerpc/prom.h	modified	+21	−13	View file
include/asm-powerpc/reg.h	modified	+62	−6	View file
include/asm-powerpc/spu_csa.h	modified	+1	−0	View file
include/asm-powerpc/system.h	modified	+1	−0	View file
include/asm-powerpc/tlb.h	modified	+0	−1	View file
include/asm-powerpc/tlbflush.h	modified	+104	−68	View file
include/asm-powerpc/uaccess.h	modified	+28	−0	View file
arch/powerpc/platforms/83xx/mpc832x_mds.h → include/asm-powerpc/uic.h	renamed	+12	−8	View file
include/asm-ppc/ibm4xx.h	modified	+2	−6	View file
include/asm-ppc/ppc_sys.h	modified	+0	−2	View file
include/asm-ppc/prom.h	modified	+2	−1	View file
include/linux/pmu.h	modified	+2	−10	View file
sound/aoa/codecs/snd-aoa-codec-onyx.c	modified	+2	−2	View file
sound/aoa/codecs/snd-aoa-codec-tas.c	modified	+5	−4	View file
sound/aoa/core/snd-aoa-gpio-feature.c	modified	+4	−4	View file
sound/aoa/fabrics/snd-aoa-fabric-layout.c	modified	+4	−4	View file
sound/aoa/soundbus/core.c	modified	+2	−2	View file
sound/aoa/soundbus/i2sbus/i2sbus-core.c	modified	+4	−4	View file
sound/oss/dmasound/dmasound_awacs.c	modified	+74	−47	View file
sound/oss/dmasound/tas_common.c	modified	+5	−4	View file
sound/ppc/pmac.c	modified	+24	−17	View file
sound/ppc/tumbler.c	modified	+34	−21	View file

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

Documentation/powerpc/booting-without-of.txt

View file

diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index b41397d..033a3f3 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -39,7 +39,7 @@
                            and property data. The old style variable
                            alignment would make it impossible to do
                            "simple" insertion of properties using
-                           memove (thanks Milton for
+                           memmove (thanks Milton for
                            noticing). Updated kernel patch as well
 			 - Correct a few more alignment constraints
 			 - Add a chapter about the device-tree
@@ -55,7 +55,7 @@
 
  ToDo:
 	- Add some definitions of interrupt tree (simple/complex)
-	- Add some definitions for pci host bridges
+	- Add some definitions for PCI host bridges
 	- Add some common address format examples
 	- Add definitions for standard properties and "compatible"
 	  names for cells that are not already defined by the existing
@@ -114,7 +114,7 @@ it with special cases.
         forth words isn't required), you can enter the kernel with:
 
               r5 : OF callback pointer as defined by IEEE 1275
-              bindings to powerpc. Only the 32 bit client interface
+              bindings to powerpc. Only the 32-bit client interface
               is currently supported
 
               r3, r4 : address & length of an initrd if any or 0
@@ -194,7 +194,7 @@ it with special cases.
   for this is to keep kernels on embedded systems small and efficient;
   part of this is due to the fact the code is already that way. In the
   future, a kernel may support multiple platforms, but only if the
-  platforms feature the same core architectire.  A single kernel build
+  platforms feature the same core architecture.  A single kernel build
   cannot support both configurations with Book E and configurations
   with classic Powerpc architectures.
 
@@ -215,7 +215,7 @@ of the boot sequences.... someone speak up if this is wrong!
   enable another config option to select the specific board
   supported.
 
-NOTE: If ben doesn't merge the setup files, may need to change this to
+NOTE: If Ben doesn't merge the setup files, may need to change this to
 point to setup_32.c
 
 
@@ -256,7 +256,7 @@ struct boot_param_header {
         u32     off_dt_struct;          /* offset to structure */
         u32     off_dt_strings;         /* offset to strings */
         u32     off_mem_rsvmap;         /* offset to memory reserve map
-*/
+                                           */
         u32     version;                /* format version */
         u32     last_comp_version;      /* last compatible version */
 
@@ -265,6 +265,9 @@ struct boot_param_header {
                                            booting on */
         /* version 3 fields below */
         u32     size_dt_strings;        /* size of the strings block */
+
+        /* version 17 fields below */
+        u32	size_dt_struct;		/* size of the DT structure block */
 };
 
    Along with the constants:
@@ -273,7 +276,7 @@ struct boot_param_header {
 #define OF_DT_HEADER            0xd00dfeed      /* 4: version,
 						   4: total size */
 #define OF_DT_BEGIN_NODE        0x1             /* Start node: full name
-*/
+						   */
 #define OF_DT_END_NODE          0x2             /* End node */
 #define OF_DT_PROP              0x3             /* Property: name off,
                                                    size, content */
@@ -310,9 +313,8 @@ struct boot_param_header {
    - off_mem_rsvmap
 
      This is an offset from the beginning of the header to the start
-     of the reserved memory map. This map is a list of pairs of 64
+     of the reserved memory map. This map is a list of pairs of 64-
      bit integers. Each pair is a physical address and a size. The
-
      list is terminated by an entry of size 0. This map provides the
      kernel with a list of physical memory areas that are "reserved"
      and thus not to be used for memory allocations, especially during
@@ -325,7 +327,7 @@ struct boot_param_header {
      contain _at least_ this DT block itself (header,total_size). If
      you are passing an initrd to the kernel, you should reserve it as
      well. You do not need to reserve the kernel image itself. The map
-     should be 64 bit aligned.
+     should be 64-bit aligned.
 
    - version
 
@@ -335,10 +337,13 @@ struct boot_param_header {
      to reallocate it easily at boot and free up the unused flattened
      structure after expansion. Version 16 introduces a new more
      "compact" format for the tree itself that is however not backward
-     compatible. You should always generate a structure of the highest
-     version defined at the time of your implementation. Currently
-     that is version 16, unless you explicitly aim at being backward
-     compatible.
+     compatible. Version 17 adds an additional field, size_dt_struct,
+     allowing it to be reallocated or moved more easily (this is
+     particularly useful for bootloaders which need to make
+     adjustments to a device tree based on probed information). You
+     should always generate a structure of the highest version defined
+     at the time of your implementation. Currently that is version 17,
+     unless you explicitly aim at being backward compatible.
 
    - last_comp_version
 
@@ -347,7 +352,7 @@ struct boot_param_header {
      is backward compatible with version 1 (that is, a kernel build
      for version 1 will be able to boot with a version 2 format). You
      should put a 1 in this field if you generate a device tree of
-     version 1 to 3, or 0x10 if you generate a tree of version 0x10
+     version 1 to 3, or 16 if you generate a tree of version 16 or 17
      using the new unit name format.
 
    - boot_cpuid_phys
@@ -360,6 +365,17 @@ struct boot_param_header {
      point (see further chapters for more informations on the required
      device-tree contents)
 
+   - size_dt_strings
+
+     This field only exists on version 3 and later headers.  It
+     gives the size of the "strings" section of the device tree (which
+     starts at the offset given by off_dt_strings).
+
+   - size_dt_struct
+
+     This field only exists on version 17 and later headers.  It gives
+     the size of the "structure" section of the device tree (which
+     starts at the offset given by off_dt_struct).
 
    So the typical layout of a DT block (though the various parts don't
    need to be in that order) looks like this (addresses go from top to
@@ -417,7 +433,7 @@ root node who has no parent.
 A node has 2 names. The actual node name is generally contained in a
 property of type "name" in the node property list whose value is a
 zero terminated string and is mandatory for version 1 to 3 of the
-format definition (as it is in Open Firmware). Version 0x10 makes it
+format definition (as it is in Open Firmware). Version 16 makes it
 optional as it can generate it from the unit name defined below.
 
 There is also a "unit name" that is used to differentiate nodes with
@@ -461,7 +477,7 @@ referencing another node via "phandle" is when laying out the
 interrupt tree which will be described in a further version of this
 document.
 
-This "linux, phandle" property is a 32 bit value that uniquely
+This "linux, phandle" property is a 32-bit value that uniquely
 identifies a node. You are free to use whatever values or system of
 values, internal pointers, or whatever to generate these, the only
 requirement is that every node for which you provide that property has
@@ -471,7 +487,7 @@ Here is an example of a simple device-tree. In this example, an "o"
 designates a node followed by the node unit name. Properties are
 presented with their name followed by their content. "content"
 represents an ASCII string (zero terminated) value, while <content>
-represents a 32 bit hexadecimal value. The various nodes in this
+represents a 32-bit hexadecimal value. The various nodes in this
 example will be discussed in a later chapter. At this point, it is
 only meant to give you a idea of what a device-tree looks like. I have
 purposefully kept the "name" and "linux,phandle" properties which
@@ -543,15 +559,15 @@ Here's the basic structure of a single node:
      * [align gap to next 4 bytes boundary]
      * for each property:
         * token OF_DT_PROP (that is 0x00000003)
-        * 32 bit value of property value size in bytes (or 0 of no
-     * value)
-        * 32 bit value of offset in string block of property name
+        * 32-bit value of property value size in bytes (or 0 if no
+          value)
+        * 32-bit value of offset in string block of property name
         * property value data if any
         * [align gap to next 4 bytes boundary]
      * [child nodes if any]
      * token OF_DT_END_NODE (that is 0x00000002)
 
-So the node content can be summarised as a start token, a full path,
+So the node content can be summarized as a start token, a full path,
 a list of properties, a list of child nodes, and an end token. Every
 child node is a full node structure itself as defined above.
 
@@ -583,7 +599,7 @@ provide those properties yourself.
 ----------------------------------------------
 
 The general rule is documented in the various Open Firmware
-documentations. If you chose to describe a bus with the device-tree
+documentations. If you choose to describe a bus with the device-tree
 and there exist an OF bus binding, then you should follow the
 specification. However, the kernel does not require every single
 device or bus to be described by the device tree.
@@ -596,9 +612,9 @@ those properties defining addresses format for devices directly mapped
 on the processor bus.
 
 Those 2 properties define 'cells' for representing an address and a
-size. A "cell" is a 32 bit number. For example, if both contain 2
+size. A "cell" is a 32-bit number. For example, if both contain 2
 like the example tree given above, then an address and a size are both
-composed of 2 cells, and each is a 64 bit number (cells are
+composed of 2 cells, and each is a 64-bit number (cells are
 concatenated and expected to be in big endian format). Another example
 is the way Apple firmware defines them, with 2 cells for an address
 and one cell for a size.  Most 32-bit implementations should define
@@ -632,7 +648,7 @@ prom_parse.c file of the recent kernels for your bus type.
 
 The "reg" property only defines addresses and sizes (if #size-cells
 is non-0) within a given bus. In order to translate addresses upward
-(that is into parent bus addresses, and possibly into cpu physical
+(that is into parent bus addresses, and possibly into CPU physical
 addresses), all busses must contain a "ranges" property. If the
 "ranges" property is missing at a given level, it's assumed that
 translation isn't possible. The format of the "ranges" property for a
@@ -648,9 +664,9 @@ example, for a PCI host controller, that would be a CPU address. For a
 PCI<->ISA bridge, that would be a PCI address. It defines the base
 address in the parent bus where the beginning of that range is mapped.
 
-For a new 64 bit powerpc board, I recommend either the 2/2 format or
+For a new 64-bit powerpc board, I recommend either the 2/2 format or
 Apple's 2/1 format which is slightly more compact since sizes usually
-fit in a single 32 bit word.   New 32 bit powerpc boards should use a
+fit in a single 32-bit word.   New 32-bit powerpc boards should use a
 1/1 format, unless the processor supports physical addresses greater
 than 32-bits, in which case a 2/1 format is recommended.
 
@@ -764,7 +780,7 @@ address which can extend beyond that limit.
   Required properties:
 
     - device_type : has to be "cpu"
-    - reg : This is the physical cpu number, it's a single 32 bit cell
+    - reg : This is the physical CPU number, it's a single 32-bit cell
       and is also used as-is as the unit number for constructing the
       unit name in the full path. For example, with 2 CPUs, you would
       have the full path:
@@ -785,7 +801,7 @@ address which can extend beyond that limit.
       the kernel timebase/decrementer calibration based on this
       value.
     - clock-frequency : a cell indicating the CPU core clock frequency
-      in Hz. A new property will be defined for 64 bit values, but if
+      in Hz. A new property will be defined for 64-bit values, but if
       your frequency is < 4Ghz, one cell is enough. Here as well as
       for the above, the common code doesn't use that property, but
       you are welcome to re-use the pSeries or Maple one. A future
@@ -832,8 +848,7 @@ address which can extend beyond that limit.
 
   This node is a bit "special". Normally, that's where open firmware
   puts some variable environment information, like the arguments, or
-  phandle pointers to nodes like the main interrupt controller, or the
-  default input/output devices.
+  the default input/output devices.
 
   This specification makes a few of these mandatory, but also defines
   some linux-specific properties that would be normally constructed by
@@ -853,14 +868,14 @@ address which can extend beyond that limit.
       that the kernel tries to find out the default console and has
       knowledge of various types like 8250 serial ports. You may want
       to extend this function to add your own.
-    - interrupt-controller : This is one cell containing a phandle
-      value that matches the "linux,phandle" property of your main
-      interrupt controller node. May be used for interrupt routing.
-
 
   Note that u-boot creates and fills in the chosen node for platforms
   that use it.
 
+  (Note: a practice that is now obsolete was to include a property
+  under /chosen called interrupt-controller which had a phandle value
+  that pointed to the main interrupt controller)
+
   f) the /soc<SOCname> node
 
   This node is used to represent a system-on-a-chip (SOC) and must be
@@ -908,8 +923,7 @@ address which can extend beyond that limit.
   The SOC node may contain child nodes for each SOC device that the
   platform uses.  Nodes should not be created for devices which exist
   on the SOC but are not used by a particular platform. See chapter VI
-  for more information on how to specify devices that are part of an
-SOC.
+  for more information on how to specify devices that are part of a SOC.
 
   Example SOC node for the MPC8540:
 
@@ -972,7 +986,7 @@ The syntax of the dtc tool is
         [-o output-filename] [-V output_version] input_filename
 
 
-The "output_version" defines what versio of the "blob" format will be
+The "output_version" defines what version of the "blob" format will be
 generated. Supported versions are 1,2,3 and 16. The default is
 currently version 3 but that may change in the future to version 16.
 
@@ -994,12 +1008,12 @@ supported currently at the toplevel.
 				 */
 
   property2 = <1234abcd>;	/* define a property containing a
-                                 * numerical 32 bits value (hexadecimal)
+                                 * numerical 32-bit value (hexadecimal)
 				 */
 
   property3 = <12345678 12345678 deadbeef>;
                                 /* define a property containing 3
-                                 * numerical 32 bits values (cells) in
+                                 * numerical 32-bit values (cells) in
                                  * hexadecimal
 				 */
   property4 = [0a 0b 0c 0d de ea ad be ef];
@@ -1068,7 +1082,7 @@ while all this has been defined and implemented.
     its usage in early_init_devtree(), and the corresponding various
     early_init_dt_scan_*() callbacks. That code can be re-used in a
     GPL bootloader, and as the author of that code, I would be happy
-    to discuss possible free licencing to any vendor who wishes to
+    to discuss possible free licensing to any vendor who wishes to
     integrate all or part of this code into a non-GPL bootloader.
 
 
@@ -1077,7 +1091,7 @@ VI - System-on-a-chip devices and nodes
 =======================================
 
 Many companies are now starting to develop system-on-a-chip
-processors, where the processor core (cpu) and many peripheral devices
+processors, where the processor core (CPU) and many peripheral devices
 exist on a single piece of silicon.  For these SOCs, an SOC node
 should be used that defines child nodes for the devices that make
 up the SOC. While platforms are not required to use this model in
@@ -1109,42 +1123,7 @@ See appendix A for an example partial SOC node definition for the
 MPC8540.
 
 
-2) Specifying interrupt information for SOC devices
----------------------------------------------------
-
-Each device that is part of an SOC and which generates interrupts
-should have the following properties:
-
-	- interrupt-parent : contains the phandle of the interrupt
-          controller which handles interrupts for this device
-	- interrupts : a list of tuples representing the interrupt
-          number and the interrupt sense and level for each interrupt
-          for this device.
-
-This information is used by the kernel to build the interrupt table
-for the interrupt controllers in the system.
-
-Sense and level information should be encoded as follows:
-
-   Devices connected to openPIC-compatible controllers should encode
-   sense and polarity as follows:
-
-	0 = low to high edge sensitive type enabled
-	1 = active low level sensitive type enabled
-	2 = active high level sensitive type enabled
-	3 = high to low edge sensitive type enabled
-
-   ISA PIC interrupt controllers should adhere to the ISA PIC
-   encodings listed below:
-
-	0 =  active low level sensitive type enabled
-	1 =  active high level sensitive type enabled
-	2 =  high to low edge sensitive type enabled
-	3 =  low to high edge sensitive type enabled
-
-
-
-3) Representing devices without a current OF specification
+2) Representing devices without a current OF specification
 ----------------------------------------------------------
 
 Currently, there are many devices on SOCs that do not have a standard
@@ -1201,6 +1180,13 @@ platforms are moved over to use the flattened-device-tree model.
     - phy-handle : The phandle for the PHY connected to this ethernet
       controller.
 
+  Recommended properties:
+
+    - linux,network-index : This is the intended "index" of this
+      network device.  This is used by the bootwrapper to interpret
+      MAC addresses passed by the firmware when no information other
+      than indices is available to associate an address with a device.
+
   Example:
 
 	ethernet@24000 {
@@ -1312,10 +1298,10 @@ platforms are moved over to use the flattened-device-tree model.
    and additions :  
 
    Required properties :
-    - compatible : Should be "fsl-usb2-mph" for multi port host usb
-      controllers, or "fsl-usb2-dr" for dual role usb controllers
-    - phy_type : For multi port host usb controllers, should be one of
-      "ulpi", or "serial". For dual role usb controllers, should be
+    - compatible : Should be "fsl-usb2-mph" for multi port host USB
+      controllers, or "fsl-usb2-dr" for dual role USB controllers
+    - phy_type : For multi port host USB controllers, should be one of
+      "ulpi", or "serial". For dual role USB controllers, should be
       one of "ulpi", "utmi", "utmi_wide", or "serial".
     - reg : Offset and length of the register set for the device
     - port0 : boolean; if defined, indicates port0 is connected for
@@ -1339,7 +1325,7 @@ platforms are moved over to use the flattened-device-tree model.
     - interrupt-parent : the phandle for the interrupt controller that
       services interrupts for this device.
 
-   Example multi port host usb controller device node : 
+   Example multi port host USB controller device node :
 	usb@22000 {
 	        device_type = "usb";
 		compatible = "fsl-usb2-mph";
@@ -1353,7 +1339,7 @@ platforms are moved over to use the flattened-device-tree model.
 		port1;
 	};
 
-   Example dual role usb controller device node : 
+   Example dual role USB controller device node :
 	usb@23000 {
 		device_type = "usb";
 		compatible = "fsl-usb2-dr";
@@ -1387,7 +1373,7 @@ platforms are moved over to use the flattened-device-tree model.
     - channel-fifo-len : An integer representing the number of
       descriptor pointers each channel fetch fifo can hold.
     - exec-units-mask : The bitmask representing what execution units
-      (EUs) are available. It's a single 32 bit cell. EU information
+      (EUs) are available. It's a single 32-bit cell. EU information
       should be encoded following the SEC's Descriptor Header Dword
       EU_SEL0 field documentation, i.e. as follows:
 
@@ -1403,7 +1389,7 @@ platforms are moved over to use the flattened-device-tree model.
       bits 8 through 31 are reserved for future SEC EUs.
 
     - descriptor-types-mask : The bitmask representing what descriptors
-      are available. It's a single 32 bit cell. Descriptor type
+      are available. It's a single 32-bit cell. Descriptor type
       information should be encoded following the SEC's Descriptor
       Header Dword DESC_TYPE field documentation, i.e. as follows:
 
@@ -1492,7 +1478,7 @@ platforms are moved over to use the flattened-device-tree model.
    Required properties:
    - device_type : should be "spi".
    - compatible : should be "fsl_spi".
-   - mode : the spi operation mode, it can be "cpu" or "qe".
+   - mode : the SPI operation mode, it can be "cpu" or "qe".
    - 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
@@ -1569,6 +1555,12 @@ platforms are moved over to use the flattened-device-tree model.
    - mac-address : list of bytes representing the ethernet address.
    - phy-handle : The phandle for the PHY connected to this controller.
 
+   Recommended properties:
+   - linux,network-index : This is the intended "index" of this
+     network device.  This is used by the bootwrapper to interpret
+     MAC addresses passed by the firmware when no information other
+     than indices is available to associate an address with a device.
+
    Example:
 	ucc@2000 {
 		device_type = "network";
@@ -1712,7 +1704,7 @@ platforms are moved over to use the flattened-device-tree model.
      - partitions : Several pairs of 32-bit values where the first value is
        partition's offset from the start of the device and the second one is
        partition size in bytes with LSB used to signify a read only
-       partition (so, the parition size should always be an even number).
+       partition (so, the partition size should always be an even number).
      - partition-names : The list of concatenated zero terminated strings
        representing the partition names.
      - probe-type : The type of probe which should be done for the chip
@@ -1733,6 +1725,92 @@ platforms are moved over to use the flattened-device-tree model.
 
    More devices will be defined as this spec matures.
 
+VII - Specifying interrupt information for devices
+===================================================
+
+The device tree represents the busses and devices of a hardware
+system in a form similar to the physical bus topology of the
+hardware.
+
+In addition, a logical 'interrupt tree' exists which represents the
+hierarchy and routing of interrupts in the hardware.
+
+The interrupt tree model is fully described in the
+document "Open Firmware Recommended Practice: Interrupt
+Mapping Version 0.9".  The document is available at:
+<http://playground.sun.com/1275/practice>.
+
+1) interrupts property
+----------------------
+
+Devices that generate interrupts to a single interrupt controller
+should use the conventional OF representation described in the
+OF interrupt mapping documentation.
+
+Each device which generates interrupts must have an 'interrupt'
+property.  The interrupt property value is an arbitrary number of
+of 'interrupt specifier' values which describe the interrupt or
+interrupts for the device.
+
+The encoding of an interrupt specifier is determined by the
+interrupt domain in which the device is located in the
+interrupt tree.  The root of an interrupt domain specifies in
+its #interrupt-cells property the number of 32-bit cells
+required to encode an interrupt specifier.  See the OF interrupt
+mapping documentation for a detailed description of domains.
+
+For example, the binding for the OpenPIC interrupt controller
+specifies  an #interrupt-cells value of 2 to encode the interrupt
+number and level/sense information. All interrupt children in an
+OpenPIC interrupt domain use 2 cells per interrupt in their interrupts
+property.
+
+The PCI bus binding specifies a #interrupt-cell value of 1 to encode
+which interrupt pin (INTA,INTB,INTC,INTD) is used.
+
+2) interrupt-parent property
+----------------------------
+
+The interrupt-parent property is specified to define an explicit
+link between a device node and its interrupt parent in
+the interrupt tree.  The value of interrupt-parent is the
+phandle of the parent node.
+
+If the interrupt-parent property is not defined for a node, it's
+interrupt parent is assumed to be an ancestor in the node's
+_device tree_ hierarchy.
+
+3) OpenPIC Interrupt Controllers
+--------------------------------
+
+OpenPIC interrupt controllers require 2 cells to encode
+interrupt information.  The first cell defines the interrupt
+number.  The second cell defines the sense and level
+information.
+
+Sense and level information should be encoded as follows:
+
+	0 = low to high edge sensitive type enabled
+	1 = active low level sensitive type enabled
+	2 = active high level sensitive type enabled
+	3 = high to low edge sensitive type enabled
+
+4) ISA Interrupt Controllers
+----------------------------
+
+ISA PIC interrupt controllers require 2 cells to encode
+interrupt information.  The first cell defines the interrupt
+number.  The second cell defines the sense and level
+information.
+
+ISA PIC interrupt controllers should adhere to the ISA PIC
+encodings listed below:
+
+	0 =  active low level sensitive type enabled
+	1 =  active high level sensitive type enabled
+	2 =  high to low edge sensitive type enabled
+	3 =  low to high edge sensitive type enabled
+
 
 Appendix A - Sample SOC node for MPC8540
 ========================================

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 6dfbd52..a54a9a2 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -11,6 +11,11 @@ config PPC64
 	  This option selects whether a 32-bit or a 64-bit kernel
 	  will be built.
 
+config PPC_PM_NEEDS_RTC_LIB
+	bool
+	select RTC_LIB
+	default y if PM
+
 config PPC32
 	bool
 	default y if !PPC64
@@ -89,7 +94,7 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
 
 config ARCH_MAY_HAVE_PC_FDC
 	bool
-	default y
+	default !PPC_PSERIES || PCI
 
 config PPC_OF
 	def_bool y
@@ -157,17 +162,20 @@ config PPC_83xx
 	select FSL_SOC
 	select 83xx
 	select PPC_FPU
+	select WANT_DEVICE_TREE
 
 config PPC_85xx
 	bool "Freescale 85xx"
 	select E500
 	select FSL_SOC
 	select 85xx
+	select WANT_DEVICE_TREE