Commit ed0da6fc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

parents 774bd861 9e8a9bc2

Documentation/powerpc/booting-without-of.txt

+5 −5
Original line number Diff line number Diff line
@@ -1196,7 +1196,7 @@ platforms are moved over to use the flattened-device-tree model. 
    - model : Model of the device.  Can be "TSEC", "eTSEC", or "FEC"

    - compatible : Should be "gianfar"

    - reg : Offset and length of the register set for the device

    - address : List of bytes representing the ethernet address of

    - mac-address : List of bytes representing the ethernet address of

      this controller

    - interrupts : <a b> where a is the interrupt number and b is a

      field that represents an encoding of the sense and level
@@ -1216,7 +1216,7 @@ platforms are moved over to use the flattened-device-tree model. 
		model = "TSEC";

		compatible = "gianfar";

		reg = <24000 1000>;

		address = [ 00 E0 0C 00 73 00 ];

		mac-address = [ 00 E0 0C 00 73 00 ];

		interrupts = <d 3 e 3 12 3>;

		interrupt-parent = <40000>;

		phy-handle = <2452000>
@@ -1498,7 +1498,7 @@ not necessary as they are usually the same as the root node. 
			model = "TSEC";

			compatible = "gianfar";

			reg = <24000 1000>;

			address = [ 00 E0 0C 00 73 00 ];

			mac-address = [ 00 E0 0C 00 73 00 ];

			interrupts = <d 3 e 3 12 3>;

			interrupt-parent = <40000>;

			phy-handle = <2452000>;
@@ -1511,7 +1511,7 @@ not necessary as they are usually the same as the root node. 
			model = "TSEC";

			compatible = "gianfar";

			reg = <25000 1000>;

			address = [ 00 E0 0C 00 73 01 ];

			mac-address = [ 00 E0 0C 00 73 01 ];

			interrupts = <13 3 14 3 18 3>;

			interrupt-parent = <40000>;

			phy-handle = <2452001>;
@@ -1524,7 +1524,7 @@ not necessary as they are usually the same as the root node. 
			model = "FEC";

			compatible = "gianfar";

			reg = <26000 1000>;

			address = [ 00 E0 0C 00 73 02 ];

			mac-address = [ 00 E0 0C 00 73 02 ];

			interrupts = <19 3>;

			interrupt-parent = <40000>;

			phy-handle = <2452002>;

arch/powerpc/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -836,9 +836,10 @@ config MCA 
	bool



config PCI

	bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) \

				  || MPC7448HPC2

	default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx && !PPC_85xx && !PPC_86xx

	bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \

		|| PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) || MPC7448HPC2

	default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \

		&& !PPC_85xx && !PPC_86xx

	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS

	default PCI_QSPAN if !4xx && !CPM2 && 8xx

	help

arch/powerpc/boot/dts/mpc8641_hpcn.dts

0 → 100644
+339 −0
Original line number Diff line number Diff line 
/*

 * MPC8641 HPCN Device Tree Source

 *

 * Copyright 2006 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 as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */





/ {

	model = "MPC8641HPCN";

	compatible = "mpc86xx";

	#address-cells = <1>;

	#size-cells = <1>;



	cpus {

		#cpus = <2>;

		#address-cells = <1>;

		#size-cells = <0>;



		PowerPC,8641@0 {

			device_type = "cpu";

			reg = <0>;

			d-cache-line-size = <20>;	// 32 bytes

			i-cache-line-size = <20>;	// 32 bytes

			d-cache-size = <8000>;		// L1, 32K

			i-cache-size = <8000>;		// L1, 32K

			timebase-frequency = <0>;	// 33 MHz, from uboot

			bus-frequency = <0>;		// From uboot

			clock-frequency = <0>;		// From uboot

			32-bit;

			linux,boot-cpu;

		};

		PowerPC,8641@1 {

			device_type = "cpu";

			reg = <1>;

			d-cache-line-size = <20>;	// 32 bytes

			i-cache-line-size = <20>;	// 32 bytes

			d-cache-size = <8000>;		// L1, 32K

			i-cache-size = <8000>;		// L1, 32K

			timebase-frequency = <0>;	// 33 MHz, from uboot

			bus-frequency = <0>;		// From uboot

			clock-frequency = <0>;		// From uboot

			32-bit;

		};

	};



	memory {

		device_type = "memory";

		reg = <00000000 40000000>;	// 1G at 0x0

	};



	soc8641@f8000000 {

		#address-cells = <1>;

		#size-cells = <1>;

		#interrupt-cells = <2>;

		device_type = "soc";

		ranges = <0 f8000000 00100000>;

		reg = <f8000000 00100000>;	// CCSRBAR 1M

		bus-frequency = <0>;



		i2c@3000 {

			device_type = "i2c";

			compatible = "fsl-i2c";

			reg = <3000 100>;

			interrupts = <2b 2>;

			interrupt-parent = <40000>;

			dfsrr;

		};



		i2c@3100 {

			device_type = "i2c";

			compatible = "fsl-i2c";

			reg = <3100 100>;

			interrupts = <2b 2>;

			interrupt-parent = <40000>;

			dfsrr;

		};



		mdio@24520 {

			#address-cells = <1>;

			#size-cells = <0>;

			device_type = "mdio";

			compatible = "gianfar";

			reg = <24520 20>;

			linux,phandle = <24520>;

			ethernet-phy@0 {

				linux,phandle = <2452000>;

				interrupt-parent = <40000>;

				interrupts = <4a 1>;

				reg = <0>;

				device_type = "ethernet-phy";

			};

			ethernet-phy@1 {

				linux,phandle = <2452001>;

				interrupt-parent = <40000>;

				interrupts = <4a 1>;

				reg = <1>;

				device_type = "ethernet-phy";

			};

			ethernet-phy@2 {

				linux,phandle = <2452002>;

				interrupt-parent = <40000>;

				interrupts = <4a 1>;

				reg = <2>;

				device_type = "ethernet-phy";

			};

			ethernet-phy@3 {

				linux,phandle = <2452003>;

				interrupt-parent = <40000>;

				interrupts = <4a 1>;

				reg = <3>;

				device_type = "ethernet-phy";

			};

		};



		ethernet@24000 {

			#address-cells = <1>;

			#size-cells = <0>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <24000 1000>;

			mac-address = [ 00 E0 0C 00 73 00 ];

			interrupts = <1d 2 1e 2 22 2>;

			interrupt-parent = <40000>;

			phy-handle = <2452000>;

		};



		ethernet@25000 {

			#address-cells = <1>;

			#size-cells = <0>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <25000 1000>;

			mac-address = [ 00 E0 0C 00 73 01 ];

			interrupts = <23 2 24 2 28 2>;

			interrupt-parent = <40000>;

			phy-handle = <2452001>;

		};

		

		ethernet@26000 {

			#address-cells = <1>;

			#size-cells = <0>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <26000 1000>;

			mac-address = [ 00 E0 0C 00 02 FD ];

			interrupts = <1F 2 20 2 21 2>;

			interrupt-parent = <40000>;

			phy-handle = <2452002>;

		};



		ethernet@27000 {

			#address-cells = <1>;

			#size-cells = <0>;

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <27000 1000>;

			mac-address = [ 00 E0 0C 00 03 FD ];

			interrupts = <25 2 26 2 27 2>;

			interrupt-parent = <40000>;

			phy-handle = <2452003>;

		};

		serial@4500 {

			device_type = "serial";

			compatible = "ns16550";

			reg = <4500 100>;

			clock-frequency = <0>;

			interrupts = <2a 2>;

			interrupt-parent = <40000>;

		};



		serial@4600 {

			device_type = "serial";

			compatible = "ns16550";

			reg = <4600 100>;

			clock-frequency = <0>;

			interrupts = <1c 2>;

			interrupt-parent = <40000>;

		};



		pci@8000 {

			compatible = "86xx";

			device_type = "pci";

			#interrupt-cells = <1>;

			#size-cells = <2>;

			#address-cells = <3>;

			reg = <8000 1000>;

			bus-range = <0 fe>;

			ranges = <02000000 0 80000000 80000000 0 20000000

				  01000000 0 00000000 e2000000 0 00100000>;

			clock-frequency = <1fca055>;

			interrupt-parent = <40000>;

			interrupts = <18 2>;

			interrupt-map-mask = <f800 0 0 7>;

			interrupt-map = <

				/* IDSEL 0x11 */

				8800 0 0 1 4d0 3 2

				8800 0 0 2 4d0 4 2

				8800 0 0 3 4d0 5 2

				8800 0 0 4 4d0 6 2



				/* IDSEL 0x12 */

				9000 0 0 1 4d0 4 2

				9000 0 0 2 4d0 5 2

				9000 0 0 3 4d0 6 2

				9000 0 0 4 4d0 3 2



				/* IDSEL 0x13 */

				9800 0 0 1 4d0 0 0

				9800 0 0 2 4d0 0 0

				9800 0 0 3 4d0 0 0

				9800 0 0 4 4d0 0 0



				/* IDSEL 0x14 */

				a000 0 0 1 4d0 0 0

				a000 0 0 2 4d0 0 0

				a000 0 0 3 4d0 0 0

				a000 0 0 4 4d0 0 0



				/* IDSEL 0x15 */

				a800 0 0 1 4d0 0 0

				a800 0 0 2 4d0 0 0

				a800 0 0 3 4d0 0 0

				a800 0 0 4 4d0 0 0



				/* IDSEL 0x16 */

				b000 0 0 1 4d0 0 0

				b000 0 0 2 4d0 0 0

				b000 0 0 3 4d0 0 0

				b000 0 0 4 4d0 0 0



				/* IDSEL 0x17 */

				b800 0 0 1 4d0 0 0

				b800 0 0 2 4d0 0 0

				b800 0 0 3 4d0 0 0

				b800 0 0 4 4d0 0 0



				/* IDSEL 0x18 */

				c000 0 0 1 4d0 0 0

				c000 0 0 2 4d0 0 0

				c000 0 0 3 4d0 0 0

				c000 0 0 4 4d0 0 0



				/* IDSEL 0x19 */

				c800 0 0 1 4d0 0 0

				c800 0 0 2 4d0 0 0

				c800 0 0 3 4d0 0 0

				c800 0 0 4 4d0 0 0



				/* IDSEL 0x1a */

				d000 0 0 1 4d0 6 2

				d000 0 0 2 4d0 3 2

				d000 0 0 3 4d0 4 2

				d000 0 0 4 4d0 5 2





				/* IDSEL 0x1b */

				d800 0 0 1 4d0 5 2

				d800 0 0 2 4d0 0 0

				d800 0 0 3 4d0 0 0

				d800 0 0 4 4d0 0 0



				/* IDSEL 0x1c */

				e000 0 0 1 4d0 9 2

				e000 0 0 2 4d0 a 2

				e000 0 0 3 4d0 c 2

				e000 0 0 4 4d0 7 2



				/* IDSEL 0x1d */

				e800 0 0 1 4d0 9 2

				e800 0 0 2 4d0 a 2

				e800 0 0 3 4d0 b 2

				e800 0 0 4 4d0 0 0



				/* IDSEL 0x1e */

				f000 0 0 1 4d0 c 2

				f000 0 0 2 4d0 0 0

				f000 0 0 3 4d0 0 0

				f000 0 0 4 4d0 0 0



				/* IDSEL 0x1f */

				f800 0 0 1 4d0 6 2

				f800 0 0 2 4d0 0 0

				f800 0 0 3 4d0 0 0

				f800 0 0 4 4d0 0 0

				>;

			i8259@4d0 {

				linux,phandle = <4d0>;

				clock-frequency = <0>;

				interrupt-controller;

				device_type = "interrupt-controller";

				#address-cells = <0>;

				#interrupt-cells = <2>;

				built-in;

				compatible = "chrp,iic";

                	        big-endian;

				interrupts = <49 2>;

				interrupt-parent = <40000>;

			};



		};

		pic@40000 {

			linux,phandle = <40000>;

			clock-frequency = <0>;

			interrupt-controller;

			#address-cells = <0>;

			#interrupt-cells = <2>;

			reg = <40000 40000>;

			built-in;

			compatible = "chrp,open-pic";

			device_type = "open-pic";

                        big-endian;

			interrupts = <

				10 2 11 2 12 2 13 2

				14 2 15 2 16 2 17 2

				18 2 19 2 1a 2 1b 2

				1c 2 1d 2 1e 2 1f 2

				20 2 21 2 22 2 23 2

				24 2 25 2 26 2 27 2

				28 2 29 2 2a 2 2b 2

				2c 2 2d 2 2e 2 2f 2

				30 2 31 2 32 2 33 2

				34 2 35 2 36 2 37 2

				38 2 39 2 2a 2 3b 2

				3c 2 3d 2 3e 2 3f 2

				48 1 49 2 4a 1

				>;

			interrupt-parent = <40000>;

		};

	};

};

arch/powerpc/configs/g5_defconfig

+98 −24
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.17-rc1

# Wed Apr 19 13:24:37 2006

# Linux kernel version: 2.6.18-rc3

# Tue Aug  8 09:12:29 2006

#

CONFIG_PPC64=y

CONFIG_64BIT=y

CONFIG_PPC_MERGE=y

CONFIG_MMU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_IRQ_PER_CPU=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_PPC=y

CONFIG_EARLY_PRINTK=y

CONFIG_COMPAT=y
@@ -33,6 +35,7 @@ CONFIG_PPC_STD_MMU=y 
CONFIG_VIRT_CPU_ACCOUNTING=y

CONFIG_SMP=y

CONFIG_NR_CPUS=4

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#

# Code maturity level options
@@ -50,6 +53,7 @@ CONFIG_SWAP=y 
CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

CONFIG_IKCONFIG=y
@@ -67,10 +71,12 @@ CONFIG_PRINTK=y 
CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_RT_MUTEXES=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_SLAB=y

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set
@@ -116,12 +122,16 @@ CONFIG_PPC_PMAC=y 
CONFIG_PPC_PMAC64=y

# CONFIG_PPC_MAPLE is not set

# CONFIG_PPC_CELL is not set

# CONFIG_PPC_CELL_NATIVE is not set

# CONFIG_PPC_IBM_CELL_BLADE is not set

# CONFIG_UDBG_RTAS_CONSOLE is not set

CONFIG_U3_DART=y

CONFIG_MPIC=y

# CONFIG_PPC_RTAS is not set

# CONFIG_MMIO_NVRAM is not set

CONFIG_MPIC_BROKEN_U3=y

# CONFIG_PPC_MPC106 is not set

CONFIG_PPC_970_NAP=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_TABLE=y

# CONFIG_CPU_FREQ_DEBUG is not set
@@ -153,6 +163,7 @@ CONFIG_BINFMT_ELF=y 
CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_IOMMU_VMERGE=y

# CONFIG_HOTPLUG_CPU is not set

CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

CONFIG_KEXEC=y

# CONFIG_CRASH_DUMP is not set

CONFIG_IRQ_ALL_CPUS=y
@@ -168,6 +179,7 @@ CONFIG_FLATMEM=y 
CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_RESOURCES_64BIT=y

# CONFIG_PPC_64K_PAGES is not set

# CONFIG_SCHED_SMT is not set

CONFIG_PROC_DEVICETREE=y
@@ -184,6 +196,7 @@ CONFIG_GENERIC_ISA_DMA=y 
# CONFIG_PPC_INDIRECT_PCI is not set

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

# CONFIG_PCIEPORTBUS is not set

# CONFIG_PCI_DEBUG is not set



#
@@ -227,6 +240,8 @@ CONFIG_INET_ESP=m 
CONFIG_INET_IPCOMP=m

CONFIG_INET_XFRM_TUNNEL=m

CONFIG_INET_TUNNEL=y

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -239,6 +254,7 @@ CONFIG_TCP_CONG_BIC=y 
# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETWORK_SECMARK is not set

CONFIG_NETFILTER=y

# CONFIG_NETFILTER_DEBUG is not set
@@ -263,6 +279,7 @@ CONFIG_IP_NF_TFTP=m 
CONFIG_IP_NF_AMANDA=m

# CONFIG_IP_NF_PPTP is not set

# CONFIG_IP_NF_H323 is not set

# CONFIG_IP_NF_SIP is not set

CONFIG_IP_NF_QUEUE=m



#
@@ -318,6 +335,7 @@ CONFIG_STANDALONE=y 
CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=y

# CONFIG_DEBUG_DRIVER is not set

# CONFIG_SYS_HYPERVISOR is not set



#

# Connector - unified userspace <-> kernelspace linker
@@ -355,6 +373,7 @@ CONFIG_BLK_DEV_NBD=m 
CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

CONFIG_BLK_DEV_INITRD=y

CONFIG_CDROM_PKTCDVD=m

CONFIG_CDROM_PKTCDVD_BUFFERS=8
@@ -417,7 +436,6 @@ CONFIG_IDEDMA_PCI_AUTO=y 
CONFIG_BLK_DEV_IDE_PMAC=y

CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y

CONFIG_BLK_DEV_IDEDMA_PMAC=y

# CONFIG_BLK_DEV_IDE_PMAC_BLINK is not set

# CONFIG_IDE_ARM is not set

CONFIG_BLK_DEV_IDEDMA=y

# CONFIG_IDEDMA_IVB is not set
@@ -478,6 +496,7 @@ CONFIG_SCSI_SATA_SVW=y 
# CONFIG_SCSI_SATA_MV is not set

# CONFIG_SCSI_SATA_NV is not set

# CONFIG_SCSI_PDC_ADMA is not set

# CONFIG_SCSI_HPTIOP is not set

# CONFIG_SCSI_SATA_QSTOR is not set

# CONFIG_SCSI_SATA_PROMISE is not set

# CONFIG_SCSI_SATA_SX4 is not set
@@ -497,7 +516,6 @@ CONFIG_SCSI_SATA_SVW=y 
# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_SYM53C8XX_2 is not set

# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_QLOGIC_FC is not set

# CONFIG_SCSI_QLOGIC_1280 is not set

# CONFIG_SCSI_QLA_FC is not set

# CONFIG_SCSI_LPFC is not set
@@ -514,9 +532,7 @@ CONFIG_MD_LINEAR=y 
CONFIG_MD_RAID0=y

CONFIG_MD_RAID1=y

CONFIG_MD_RAID10=m

CONFIG_MD_RAID5=y

# CONFIG_MD_RAID5_RESHAPE is not set

CONFIG_MD_RAID6=m

# CONFIG_MD_RAID456 is not set

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m

CONFIG_BLK_DEV_DM=y
@@ -559,7 +575,6 @@ CONFIG_IEEE1394_OHCI1394=y 
#

CONFIG_IEEE1394_VIDEO1394=m

CONFIG_IEEE1394_SBP2=m

# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set

CONFIG_IEEE1394_ETH1394=m

CONFIG_IEEE1394_DV1394=m

CONFIG_IEEE1394_RAWIO=y
@@ -573,6 +588,7 @@ CONFIG_IEEE1394_RAWIO=y 
# Macintosh device drivers

#

CONFIG_ADB_PMU=y

# CONFIG_ADB_PMU_LED is not set

CONFIG_PMAC_SMU=y

CONFIG_THERM_PM72=y

CONFIG_WINDFARM=y
@@ -643,6 +659,7 @@ CONFIG_TIGON3=y 
# CONFIG_CHELSIO_T1 is not set

# CONFIG_IXGB is not set

# CONFIG_S2IO is not set

# CONFIG_MYRI10GE is not set



#

# Token Ring devices
@@ -739,6 +756,7 @@ CONFIG_SERIO=y 
CONFIG_VT=y

CONFIG_VT_CONSOLE=y

CONFIG_HW_CONSOLE=y

# CONFIG_VT_HW_CONSOLE_BINDING is not set

# CONFIG_SERIAL_NONSTANDARD is not set



#
@@ -754,6 +772,7 @@ CONFIG_HW_CONSOLE=y 
CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

# CONFIG_BRIQ_PANEL is not set



#

# IPMI
@@ -764,6 +783,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# Watchdog Cards

#

# CONFIG_WATCHDOG is not set

# CONFIG_HW_RANDOM is not set

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set

# CONFIG_DTLK is not set
@@ -774,6 +794,7 @@ CONFIG_GEN_RTC=y 
# Ftape, the floppy tape device driver

#

CONFIG_AGP=m

# CONFIG_AGP_SIS is not set

# CONFIG_AGP_VIA is not set

CONFIG_AGP_UNINORTH=m

# CONFIG_DRM is not set
@@ -813,6 +834,7 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_I2C_PIIX4 is not set

CONFIG_I2C_POWERMAC=y

# CONFIG_I2C_NFORCE2 is not set

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_SAVAGE4 is not set
@@ -849,7 +871,6 @@ CONFIG_I2C_POWERMAC=y 
#

# Dallas's 1-wire bus

#

# CONFIG_W1 is not set



#

# Hardware Monitoring support
@@ -865,6 +886,7 @@ CONFIG_I2C_POWERMAC=y 
# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set

CONFIG_VIDEO_V4L2=y



#

# Digital Video Broadcasting Devices
@@ -875,22 +897,19 @@ CONFIG_I2C_POWERMAC=y 
#

# Graphics support

#

CONFIG_FIRMWARE_EDID=y

CONFIG_FB=y

CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

CONFIG_FB_MACMODES=y

CONFIG_FB_FIRMWARE_EDID=y

# CONFIG_FB_BACKLIGHT is not set

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

# CONFIG_FB_CIRRUS is not set

# CONFIG_FB_PM2 is not set

# CONFIG_FB_CYBER2000 is not set

CONFIG_FB_OF=y

# CONFIG_FB_CONTROL is not set

# CONFIG_FB_PLATINUM is not set

# CONFIG_FB_VALKYRIE is not set

# CONFIG_FB_CT65550 is not set

# CONFIG_FB_ASILIANT is not set

# CONFIG_FB_IMSTT is not set

# CONFIG_FB_VGA16 is not set
@@ -990,6 +1009,18 @@ CONFIG_SND_VERBOSE_PROCFS=y 
# CONFIG_SND_CMIPCI is not set

# CONFIG_SND_CS4281 is not set

# CONFIG_SND_CS46XX is not set

# CONFIG_SND_DARLA20 is not set

# CONFIG_SND_GINA20 is not set

# CONFIG_SND_LAYLA20 is not set

# CONFIG_SND_DARLA24 is not set

# CONFIG_SND_GINA24 is not set

# CONFIG_SND_LAYLA24 is not set

# CONFIG_SND_MONA is not set

# CONFIG_SND_MIA is not set

# CONFIG_SND_ECHO3G is not set

# CONFIG_SND_INDIGO is not set

# CONFIG_SND_INDIGOIO is not set

# CONFIG_SND_INDIGODJ is not set

# CONFIG_SND_EMU10K1 is not set

# CONFIG_SND_EMU10K1X is not set

# CONFIG_SND_ENS1370 is not set
@@ -1026,6 +1057,17 @@ CONFIG_SND_VERBOSE_PROCFS=y 
CONFIG_SND_POWERMAC=m

CONFIG_SND_POWERMAC_AUTO_DRC=y



#

# Apple Onboard Audio driver

#

CONFIG_SND_AOA=m

CONFIG_SND_AOA_FABRIC_LAYOUT=m

CONFIG_SND_AOA_ONYX=m

CONFIG_SND_AOA_TAS=m

CONFIG_SND_AOA_TOONIE=m

CONFIG_SND_AOA_SOUNDBUS=m

CONFIG_SND_AOA_SOUNDBUS_I2S=m



#

# USB devices

#
@@ -1060,6 +1102,7 @@ CONFIG_USB_DEVICEFS=y 
CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_SPLIT_ISO is not set

# CONFIG_USB_EHCI_ROOT_HUB_TT is not set

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

# CONFIG_USB_ISP116X_HCD is not set

CONFIG_USB_OHCI_HCD=y

# CONFIG_USB_OHCI_BIG_ENDIAN is not set
@@ -1110,9 +1153,7 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_ACECAD is not set

# CONFIG_USB_KBTAB is not set

# CONFIG_USB_POWERMATE is not set

# CONFIG_USB_MTOUCH is not set

# CONFIG_USB_ITMTOUCH is not set

# CONFIG_USB_EGALAX is not set

# CONFIG_USB_TOUCHSCREEN is not set

# CONFIG_USB_YEALINK is not set

# CONFIG_USB_XPAD is not set

# CONFIG_USB_ATI_REMOTE is not set
@@ -1155,6 +1196,7 @@ CONFIG_USB_SERIAL=m 
CONFIG_USB_SERIAL_GENERIC=y

# CONFIG_USB_SERIAL_AIRPRIME is not set

# CONFIG_USB_SERIAL_ANYDATA is not set

# CONFIG_USB_SERIAL_ARK3116 is not set

CONFIG_USB_SERIAL_BELKIN=m

# CONFIG_USB_SERIAL_WHITEHEAT is not set

CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
@@ -1162,6 +1204,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m 
CONFIG_USB_SERIAL_CYPRESS_M8=m

CONFIG_USB_SERIAL_EMPEG=m

CONFIG_USB_SERIAL_FTDI_SIO=m

# CONFIG_USB_SERIAL_FUNSOFT is not set

CONFIG_USB_SERIAL_VISOR=m

CONFIG_USB_SERIAL_IPAQ=m

CONFIG_USB_SERIAL_IR=m
@@ -1191,9 +1234,11 @@ CONFIG_USB_SERIAL_PL2303=m 
# CONFIG_USB_SERIAL_HP4X is not set

CONFIG_USB_SERIAL_SAFE=m

CONFIG_USB_SERIAL_SAFE_PADDED=y

# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set

CONFIG_USB_SERIAL_TI=m

CONFIG_USB_SERIAL_CYBERJACK=m

CONFIG_USB_SERIAL_XIRCOM=m

# CONFIG_USB_SERIAL_OPTION is not set

CONFIG_USB_SERIAL_OMNINET=m

CONFIG_USB_EZUSB=y
@@ -1207,10 +1252,12 @@ CONFIG_USB_EZUSB=y 
# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set

# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETSERVO is not set

# CONFIG_USB_IDMOUSE is not set

CONFIG_USB_APPLEDISPLAY=m

# CONFIG_USB_SISUSBVGA is not set

# CONFIG_USB_LD is not set

# CONFIG_USB_TEST is not set
@@ -1234,6 +1281,14 @@ CONFIG_USB_EZUSB=y 
#

# CONFIG_NEW_LEDS is not set



#

# LED drivers

#



#

# LED Triggers

#



#

# InfiniBand support

#
@@ -1248,6 +1303,19 @@ CONFIG_USB_EZUSB=y 
#

# CONFIG_RTC_CLASS is not set



#

# DMA Engine support

#

# CONFIG_DMA_ENGINE is not set



#

# DMA Clients

#



#

# DMA Devices

#



#

# File systems

#
@@ -1273,7 +1341,6 @@ CONFIG_REISERFS_FS_SECURITY=y 
# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

CONFIG_XFS_FS=m

CONFIG_XFS_EXPORT=y

# CONFIG_XFS_QUOTA is not set

CONFIG_XFS_SECURITY=y

CONFIG_XFS_POSIX_ACL=y
@@ -1282,6 +1349,7 @@ CONFIG_XFS_POSIX_ACL=y 
# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

CONFIG_AUTOFS_FS=m
@@ -1363,7 +1431,9 @@ CONFIG_RPCSEC_GSS_KRB5=y 
# CONFIG_SMB_FS is not set

CONFIG_CIFS=m

# CONFIG_CIFS_STATS is not set

# CONFIG_CIFS_WEAK_PW_HASH is not set

# CONFIG_CIFS_XATTR is not set

# CONFIG_CIFS_DEBUG2 is not set

# CONFIG_CIFS_EXPERIMENTAL is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set
@@ -1444,6 +1514,9 @@ CONFIG_CRC32=y 
CONFIG_LIBCRC32C=m

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=m

CONFIG_TEXTSEARCH=y

CONFIG_TEXTSEARCH_KMP=m

CONFIG_PLIST=y



#

# Instrumentation Support
@@ -1457,14 +1530,19 @@ CONFIG_OPROFILE=y 
#

# CONFIG_PRINTK_TIME is not set

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=17

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_RWSEMS is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_INFO is not set

CONFIG_DEBUG_FS=y
@@ -1476,11 +1554,7 @@ CONFIG_FORCED_INLINING=y 
# CONFIG_DEBUGGER is not set

CONFIG_IRQSTACKS=y

CONFIG_BOOTX_TEXT=y

# CONFIG_PPC_EARLY_DEBUG_LPAR is not set

# CONFIG_PPC_EARLY_DEBUG_G5 is not set

# CONFIG_PPC_EARLY_DEBUG_RTAS is not set

# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set

# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set

# CONFIG_PPC_EARLY_DEBUG is not set



#

# Security options

arch/powerpc/configs/iseries_defconfig

+64 −14

File changed.

Preview size limit exceeded, changes collapsed.