Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f909f106 authored by Kumar Gala's avatar Kumar Gala
Browse files

Merge branch '83xx' into for_paulus

parents a28cfb84 a20d0ce6

arch/powerpc/boot/dts/mpc8349emitxgp.dts

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

 * MPC8349E-mITX-GP Device Tree Source

 *

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

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

 * option) any later version.

 */

/ {

	model = "MPC8349EMITXGP";

	compatible = "MPC834xMITXGP";

	#address-cells = <1>;

	#size-cells = <1>;



	cpus {

		#cpus = <1>;

		#address-cells = <1>;

		#size-cells = <0>;



		PowerPC,8349@0 {

			device_type = "cpu";

			reg = <0>;

			d-cache-line-size = <20>;

			i-cache-line-size = <20>;

			d-cache-size = <8000>;

			i-cache-size = <8000>;

			timebase-frequency = <0>;	// from bootloader

			bus-frequency = <0>;		// from bootloader

			clock-frequency = <0>;		// from bootloader

			32-bit;

		};

	};



	memory {

		device_type = "memory";

		reg = <00000000 10000000>;

	};



	soc8349@e0000000 {

		#address-cells = <1>;

		#size-cells = <1>;

		#interrupt-cells = <2>;

		device_type = "soc";

		ranges = <0 e0000000 00100000>;

		reg = <e0000000 00000200>;

		bus-frequency = <0>;                    // from bootloader



		wdt@200 {

			device_type = "watchdog";

			compatible = "mpc83xx_wdt";

			reg = <200 100>;

		};



		i2c@3000 {

			device_type = "i2c";

			compatible = "fsl-i2c";

			reg = <3000 100>;

			interrupts = <e 8>;

			interrupt-parent = <700>;

			dfsrr;

		};



		i2c@3100 {

			device_type = "i2c";

			compatible = "fsl-i2c";

			reg = <3100 100>;

			interrupts = <f 8>;

			interrupt-parent = <700>;

			dfsrr;

		};



		spi@7000 {

			device_type = "spi";

			compatible = "mpc83xx_spi";

			reg = <7000 1000>;

			interrupts = <10 8>;

			interrupt-parent = <700>;

			mode = <0>;

		};



		usb@23000 {

			device_type = "usb";

			compatible = "fsl-usb2-dr";

			reg = <23000 1000>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupt-parent = <700>;

			interrupts = <26 2>;

			dr_mode = "otg";

			phy_type = "ulpi";

		};



		mdio@24520 {

			device_type = "mdio";

			compatible = "gianfar";

			reg = <24520 20>;

			#address-cells = <1>;

			#size-cells = <0>;

			linux,phandle = <24520>;



			/* Vitesse 8201 */

			ethernet-phy@1c {

				linux,phandle = <245201c>;

				interrupt-parent = <700>;

				interrupts = <12 2>;

				reg = <1c>;

				device_type = "ethernet-phy";

			};

		};



		ethernet@24000 {

			device_type = "network";

			model = "TSEC";

			compatible = "gianfar";

			reg = <24000 1000>;

			local-mac-address = [ 00 00 00 00 00 00 ];

			interrupts = <20 8 21 8 22 8>;

			interrupt-parent = <700>;

			phy-handle = <245201c>;

		};



		serial@4500 {

			device_type = "serial";

			compatible = "ns16550";

			reg = <4500 100>;

			clock-frequency = <0>;		// from bootloader

			interrupts = <9 8>;

			interrupt-parent = <700>;

		};



		serial@4600 {

			device_type = "serial";

			compatible = "ns16550";

			reg = <4600 100>;

			clock-frequency = <0>;		// from bootloader

			interrupts = <a 8>;

			interrupt-parent = <700>;

		};



		pci@8600 {

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

			interrupt-map = <

					/* IDSEL 0x0F - PCI Slot */

					7800 0 0 1 700 14 8 /* PCI_INTA */

					7800 0 0 2 700 15 8 /* PCI_INTB */

					 >;

			interrupt-parent = <700>;

			interrupts = <43 8>;

			bus-range = <1 1>;

			ranges = <42000000 0 a0000000 a0000000 0 10000000

				  02000000 0 b0000000 b0000000 0 10000000

				  01000000 0 00000000 e3000000 0 01000000>;

			clock-frequency = <3f940aa>;

			#interrupt-cells = <1>;

			#size-cells = <2>;

			#address-cells = <3>;

			reg = <8600 100>;

			compatible = "83xx";

			device_type = "pci";

		};



		crypto@30000 {

			device_type = "crypto";

			model = "SEC2";

			compatible = "talitos";

			reg = <30000 10000>;

			interrupts = <b 8>;

			interrupt-parent = <700>;

			num-channels = <4>;

			channel-fifo-len = <18>;

			exec-units-mask = <0000007e>;

			descriptor-types-mask = <01010ebf>;

		};



		pic@700 {

			linux,phandle = <700>;

			interrupt-controller;

			#address-cells = <0>;

			#interrupt-cells = <2>;

			reg = <700 100>;

			built-in;

			device_type = "ipic";

		};

	};

};

arch/powerpc/configs/mpc834x_itx_defconfig

+60 −172
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.20-rc5

# Fri Jan 26 00:19:02 2007

# Linux kernel version: 2.6.20

# Wed Feb  7 13:12:18 2007

#

# CONFIG_PPC64 is not set

CONFIG_PPC32=y
@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y 
CONFIG_PPC_83xx=y

# CONFIG_PPC_85xx is not set

# CONFIG_PPC_86xx is not set

# CONFIG_PPC_8xx is not set

# CONFIG_40x is not set

# CONFIG_44x is not set

# CONFIG_8xx is not set

# CONFIG_E200 is not set

CONFIG_6xx=y

CONFIG_83xx=y
@@ -178,7 +178,6 @@ CONFIG_FSL_SOC=y 
CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

# CONFIG_PCIEPORTBUS is not set

# CONFIG_PCI_DEBUG is not set



#

# PCCARD (PCMCIA/CardBus) support
@@ -303,7 +302,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set

# CONFIG_DEBUG_DRIVER is not set

# CONFIG_SYS_HYPERVISOR is not set



#
@@ -523,6 +521,7 @@ CONFIG_SCSI_SPI_ATTRS=y 
# Serial ATA (prod) and Parallel ATA (experimental) drivers

#

CONFIG_ATA=y

# CONFIG_ATA_NONSTANDARD is not set

# CONFIG_SATA_AHCI is not set

# CONFIG_SATA_SVW is not set

# CONFIG_ATA_PIIX is not set
@@ -647,37 +646,7 @@ CONFIG_CICADA_PHY=y 
#

# Ethernet (10 or 100Mbit)

#

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

# CONFIG_HAPPYMEAL is not set

# CONFIG_SUNGEM is not set

# CONFIG_CASSINI is not set

# CONFIG_NET_VENDOR_3COM is not set



#

# Tulip family network device support

#

# CONFIG_NET_TULIP is not set

# CONFIG_HP100 is not set

CONFIG_NET_PCI=y

# CONFIG_PCNET32 is not set

# CONFIG_AMD8111_ETH is not set

# CONFIG_ADAPTEC_STARFIRE is not set

# CONFIG_B44 is not set

# CONFIG_FORCEDETH is not set

# CONFIG_DGRS is not set

# CONFIG_EEPRO100 is not set

CONFIG_E100=y

# CONFIG_FEALNX is not set

# CONFIG_NATSEMI is not set

# CONFIG_NE2K_PCI is not set

# CONFIG_8139CP is not set

# CONFIG_8139TOO is not set

# CONFIG_SIS900 is not set

# CONFIG_EPIC100 is not set

# CONFIG_SUNDANCE is not set

# CONFIG_TLAN is not set

# CONFIG_VIA_RHINE is not set

# CONFIG_NET_ETHERNET is not set



#

# Ethernet (1000 Mbit)
@@ -693,7 +662,6 @@ CONFIG_E100=y 
# CONFIG_SKGE is not set

# CONFIG_SKY2 is not set

# CONFIG_SK98LIN is not set

# CONFIG_VIA_VELOCITY is not set

# CONFIG_TIGON3 is not set

# CONFIG_BNX2 is not set

CONFIG_GIANFAR=y
@@ -746,26 +714,7 @@ CONFIG_GFAR_NAPI=y 
#

# Input device support

#

CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set



#

# Userland interfaces

#

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_JOYDEV is not set

# CONFIG_INPUT_TSDEV is not set

# CONFIG_INPUT_EVDEV is not set

# CONFIG_INPUT_EVBUG is not set



#

# Input Device Drivers

#

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_MISC is not set

# CONFIG_INPUT is not set



#

# Hardware I/O ports
@@ -784,7 +733,7 @@ CONFIG_INPUT=y 
#

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_PCI=y

# CONFIG_SERIAL_8250_PCI is not set

CONFIG_SERIAL_8250_NR_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -887,7 +836,7 @@ CONFIG_I2C_MPC=y 
# CONFIG_SENSORS_DS1337 is not set

# CONFIG_SENSORS_DS1374 is not set

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

CONFIG_SENSORS_PCF8574=y

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_M41T00 is not set
@@ -901,7 +850,6 @@ CONFIG_I2C_MPC=y 
# SPI support

#

CONFIG_SPI=y

# CONFIG_SPI_DEBUG is not set

CONFIG_SPI_MASTER=y



#
@@ -922,52 +870,8 @@ CONFIG_SPI_MPC83xx=y 
#

# Hardware Monitoring support

#

CONFIG_HWMON=y

# CONFIG_HWMON is not set

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set

# CONFIG_SENSORS_ADM1026 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ASB100 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_FSCHER is not set

# CONFIG_SENSORS_FSCPOS is not set

# CONFIG_SENSORS_GL518SM is not set

# CONFIG_SENSORS_GL520SM is not set

# CONFIG_SENSORS_IT87 is not set

# CONFIG_SENSORS_LM63 is not set

# CONFIG_SENSORS_LM70 is not set

# CONFIG_SENSORS_LM75 is not set

# CONFIG_SENSORS_LM77 is not set

# CONFIG_SENSORS_LM78 is not set

# CONFIG_SENSORS_LM80 is not set

# CONFIG_SENSORS_LM83 is not set

# CONFIG_SENSORS_LM85 is not set

# CONFIG_SENSORS_LM87 is not set

# CONFIG_SENSORS_LM90 is not set

# CONFIG_SENSORS_LM92 is not set

# CONFIG_SENSORS_MAX1619 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_PC87427 is not set

# CONFIG_SENSORS_SIS5595 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_VIA686A is not set

# CONFIG_SENSORS_VT1211 is not set

# CONFIG_SENSORS_VT8231 is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83791D is not set

# CONFIG_SENSORS_W83792D is not set

# CONFIG_SENSORS_W83793 is not set

# CONFIG_SENSORS_W83L785TS is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Multimedia devices
@@ -983,7 +887,7 @@ CONFIG_HWMON=y 
#

# Graphics support

#

CONFIG_FIRMWARE_EDID=y

# CONFIG_FIRMWARE_EDID is not set

# CONFIG_FB is not set

# CONFIG_FB_IBM_GXT4500 is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
@@ -993,11 +897,6 @@ CONFIG_FIRMWARE_EDID=y 
#

# CONFIG_SOUND is not set



#

# HID Devices

#

CONFIG_HID=y



#

# USB support

#
@@ -1023,10 +922,8 @@ CONFIG_USB_EHCI_HCD=y 
# 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

CONFIG_USB_OHCI_LITTLE_ENDIAN=y

CONFIG_USB_UHCI_HCD=y

# CONFIG_USB_OHCI_HCD is not set

# CONFIG_USB_UHCI_HCD is not set

# CONFIG_USB_SL811_HCD is not set



#
@@ -1058,25 +955,10 @@ CONFIG_USB_STORAGE=y 
#

# USB Input Devices

#

# CONFIG_USB_HID is not set



#

# USB HID Boot Protocol drivers

#

# CONFIG_USB_KBD is not set

# CONFIG_USB_MOUSE is not set

# CONFIG_USB_AIPTEK is not set

# CONFIG_USB_WACOM is not set

# CONFIG_USB_ACECAD is not set

# CONFIG_USB_KBTAB is not set

# CONFIG_USB_POWERMATE 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

# CONFIG_USB_ATI_REMOTE2 is not set

# CONFIG_USB_KEYSPAN_REMOTE is not set

# CONFIG_USB_APPLETOUCH is not set



#

# USB Imaging devices
@@ -1133,25 +1015,7 @@ CONFIG_USB_MON=y 
#

# USB Gadget Support

#

CONFIG_USB_GADGET=y

# CONFIG_USB_GADGET_DEBUG_FILES is not set

CONFIG_USB_GADGET_SELECTED=y

CONFIG_USB_GADGET_NET2280=y

CONFIG_USB_NET2280=y

# CONFIG_USB_GADGET_PXA2XX is not set

# CONFIG_USB_GADGET_GOKU is not set

# CONFIG_USB_GADGET_LH7A40X is not set

# CONFIG_USB_GADGET_OMAP is not set

# CONFIG_USB_GADGET_AT91 is not set

# CONFIG_USB_GADGET_DUMMY_HCD is not set

CONFIG_USB_GADGET_DUALSPEED=y

# CONFIG_USB_ZERO is not set

CONFIG_USB_ETH=y

CONFIG_USB_ETH_RNDIS=y

# CONFIG_USB_GADGETFS is not set

# CONFIG_USB_FILE_STORAGE is not set

# CONFIG_USB_G_SERIAL is not set

# CONFIG_USB_MIDI_GADGET is not set

# CONFIG_USB_GADGET is not set



#

# MMC/SD Card support
@@ -1273,8 +1137,11 @@ CONFIG_DNOTIFY=y 
#

# DOS/FAT/NT Filesystems

#

# CONFIG_MSDOS_FS is not set

# CONFIG_VFAT_FS is not set

CONFIG_FAT_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_FAT_DEFAULT_CODEPAGE=437

CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"

# CONFIG_NTFS_FS is not set



#
@@ -1340,7 +1207,7 @@ CONFIG_PARTITION_ADVANCED=y 
# CONFIG_OSF_PARTITION is not set

# CONFIG_AMIGA_PARTITION is not set

# CONFIG_ATARI_PARTITION is not set

# CONFIG_MAC_PARTITION is not set

CONFIG_MAC_PARTITION=y

CONFIG_MSDOS_PARTITION=y

# CONFIG_BSD_DISKLABEL is not set

# CONFIG_MINIX_SUBPARTITION is not set
@@ -1356,7 +1223,46 @@ CONFIG_MSDOS_PARTITION=y 
#

# Native Language Support

#

# CONFIG_NLS is not set

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="iso8859-1"

# CONFIG_NLS_CODEPAGE_437 is not set

# CONFIG_NLS_CODEPAGE_737 is not set

# CONFIG_NLS_CODEPAGE_775 is not set

# CONFIG_NLS_CODEPAGE_850 is not set

# CONFIG_NLS_CODEPAGE_852 is not set

# CONFIG_NLS_CODEPAGE_855 is not set

# CONFIG_NLS_CODEPAGE_857 is not set

# CONFIG_NLS_CODEPAGE_860 is not set

# CONFIG_NLS_CODEPAGE_861 is not set

# CONFIG_NLS_CODEPAGE_862 is not set

# CONFIG_NLS_CODEPAGE_863 is not set

# CONFIG_NLS_CODEPAGE_864 is not set

# CONFIG_NLS_CODEPAGE_865 is not set

# CONFIG_NLS_CODEPAGE_866 is not set

# CONFIG_NLS_CODEPAGE_869 is not set

# CONFIG_NLS_CODEPAGE_936 is not set

# CONFIG_NLS_CODEPAGE_950 is not set

# CONFIG_NLS_CODEPAGE_932 is not set

# CONFIG_NLS_CODEPAGE_949 is not set

# CONFIG_NLS_CODEPAGE_874 is not set

# CONFIG_NLS_ISO8859_8 is not set

# CONFIG_NLS_CODEPAGE_1250 is not set

# CONFIG_NLS_CODEPAGE_1251 is not set

# CONFIG_NLS_ASCII is not set

# CONFIG_NLS_ISO8859_1 is not set

# CONFIG_NLS_ISO8859_2 is not set

# CONFIG_NLS_ISO8859_3 is not set

# CONFIG_NLS_ISO8859_4 is not set

# CONFIG_NLS_ISO8859_5 is not set

# CONFIG_NLS_ISO8859_6 is not set

# CONFIG_NLS_ISO8859_7 is not set

# CONFIG_NLS_ISO8859_9 is not set

# CONFIG_NLS_ISO8859_13 is not set

# CONFIG_NLS_ISO8859_14 is not set

# CONFIG_NLS_ISO8859_15 is not set

# CONFIG_NLS_KOI8_R is not set

# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set



#

# Distributed Lock Manager
@@ -1388,27 +1294,9 @@ CONFIG_ENABLE_MUST_CHECK=y 
# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_HEADERS_CHECK is not set

CONFIG_DEBUG_KERNEL=y

# CONFIG_DEBUG_KERNEL is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_MUTEXES is not set

# 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_BUGVERBOSE is not set

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_DEBUGGER is not set

# CONFIG_BDI_SWITCH is not set

# CONFIG_BOOTX_TEXT is not set

# CONFIG_SERIAL_TEXT_DEBUG is not set

# CONFIG_PPC_EARLY_DEBUG is not set