Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next

Cavium, Inc. OCTEON SOC SPI master controller.

Required properties:

- compatible : "cavium,octeon-3010-spi"

- reg : The register base for the controller.

- interrupts : One interrupt, used by the controller.

- #address-cells : <1>, as required by generic SPI binding.

- #size-cells : <0>, also as required by generic SPI binding.

Child nodes as per the generic SPI binding.

Example:

	spi@1070000001000 {

		compatible = "cavium,octeon-3010-spi";

		reg = <0x10700 0x00001000 0x0 0x100>;

		interrupts = <0 58>;

		#address-cells = <1>;

		#size-cells = <0>;

		eeprom@0 {

			compatible = "st,m95256", "atmel,at25";

			reg = <0>;

			spi-max-frequency = <5000000>;

			spi-cpha;

			spi-cpol;

			pagesize = <64>;

			size = <32768>;

			address-width = <16>;

		};

	};

	select ZONE_DMA if 64BIT

	select SYNC_R4K

	select SYS_HAS_EARLY_PRINTK

	select USE_OF

	help

	  This board is based on Netlogic XLP Processor.

	  Say Y here if you have a XLP based board.

config CPU_HAS_PREFETCH

	bool

config CPU_GENERIC_DUMP_TLB

	bool

	default y if !(CPU_R3000 || CPU_R6000 || CPU_R8000 || CPU_TX39XX)

config CPU_R4K_FPU

	bool

	default y if !(CPU_R3000 || CPU_R6000 || CPU_TX39XX || CPU_CAVIUM_OCTEON)

config CPU_R4K_CACHE_TLB

	bool

	default y if !(CPU_R3000 || CPU_R8000 || CPU_SB1 || CPU_TX39XX || CPU_CAVIUM_OCTEON)

choice

	prompt "MIPS MT options"

#define is_ext_irq_cascaded	0

#define ext_irq_start		0

#define ext_irq_end		0

#define ext_irq_count		0

#define ext_irq_cfg_reg1	0

#define ext_irq_count		4

#define ext_irq_cfg_reg1	PERF_EXTIRQ_CFG_REG_6345

#define ext_irq_cfg_reg2	0

#endif

#ifdef CONFIG_BCM63XX_CPU_6348

		irq_stat_addr += PERF_IRQSTAT_6338_REG;

		irq_mask_addr += PERF_IRQMASK_6338_REG;

		irq_bits = 32;

		ext_irq_count = 4;

		ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6338;

		break;

	case BCM6345_CPU_ID:

		irq_stat_addr += PERF_IRQSTAT_6345_REG;

		irq_mask_addr += PERF_IRQMASK_6345_REG;

		irq_bits = 32;

		ext_irq_count = 4;

		ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6345;

		break;

	case BCM6348_CPU_ID:

		irq_stat_addr += PERF_IRQSTAT_6348_REG;

	reg = bcm_perf_readl(regaddr);

	irq %= 4;

	if (BCMCPU_IS_6348()) {

	switch (bcm63xx_get_cpu_id()) {

	case BCM6348_CPU_ID:

		if (levelsense)

			reg |= EXTIRQ_CFG_LEVELSENSE_6348(irq);

		else

			reg |= EXTIRQ_CFG_BOTHEDGE_6348(irq);

		else

			reg &= ~EXTIRQ_CFG_BOTHEDGE_6348(irq);

	}

		break;

	if (BCMCPU_IS_6338() || BCMCPU_IS_6358() || BCMCPU_IS_6368()) {

	case BCM6328_CPU_ID:

	case BCM6338_CPU_ID:

	case BCM6345_CPU_ID:

	case BCM6358_CPU_ID:

	case BCM6368_CPU_ID:

		if (levelsense)

			reg |= EXTIRQ_CFG_LEVELSENSE(irq);

		else

			reg |= EXTIRQ_CFG_BOTHEDGE(irq);

		else

			reg &= ~EXTIRQ_CFG_BOTHEDGE(irq);

		break;

	default:

		BUG();

	}

	bcm_perf_writel(reg, regaddr);

	case BCM6338_CPU_ID:

		perf_regs[0] = PERF_EXTIRQ_CFG_REG_6338;

		break;

	case BCM6345_CPU_ID:

		perf_regs[0] = PERF_EXTIRQ_CFG_REG_6345;

		break;

	case BCM6348_CPU_ID:

		perf_regs[0] = PERF_EXTIRQ_CFG_REG_6348;

		break;

	}

	for (i = 0; i < 2; i++) {

		if (!perf_regs[i])

			break;

		reg = bcm_perf_readl(perf_regs[i]);

		if (BCMCPU_IS_6348()) {

			reg &= ~EXTIRQ_CFG_MASK_ALL_6348;

CONFIG_NLM_XLP_BOARD=y

CONFIG_64BIT=y

CONFIG_PAGE_SIZE_16KB=y

# CONFIG_HW_PERF_EVENTS is not set

CONFIG_KSM=y

CONFIG_DEFAULT_MMAP_MIN_ADDR=65536

CONFIG_SMP=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

# CONFIG_SECCOMP is not set

CONFIG_USE_OF=y

CONFIG_EXPERIMENTAL=y

CONFIG_CROSS_COMPILE=""

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_CGROUPS=y

CONFIG_NAMESPACES=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_RD_BZIP2=y

CONFIG_RD_LZMA=y

CONFIG_INITRAMFS_COMPRESSION_LZMA=y

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_BLK_DEV_INTEGRITY=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ACORN_PARTITION=y

CONFIG_ACORN_PARTITION_ICS=y

CONFIG_ACORN_PARTITION_RISCIX=y

CONFIG_OSF_PARTITION=y

CONFIG_AMIGA_PARTITION=y

CONFIG_ATARI_PARTITION=y

CONFIG_MAC_PARTITION=y

CONFIG_BSD_DISKLABEL=y

CONFIG_MINIX_SUBPARTITION=y

CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_LDM_PARTITION=y

CONFIG_SGI_PARTITION=y

CONFIG_ULTRIX_PARTITION=y

CONFIG_SUN_PARTITION=y

CONFIG_KARMA_PARTITION=y

CONFIG_EFI_PARTITION=y

CONFIG_SYSV68_PARTITION=y

CONFIG_PCI=y

CONFIG_PCI_DEBUG=y

CONFIG_PCI_REALLOC_ENABLE_AUTO=y

CONFIG_PCI_STUB=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=y

CONFIG_MIPS32_COMPAT=y

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_LOG=m

CONFIG_IP_NF_TARGET_ULOG=m

CONFIG_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_IP6_NF_QUEUE=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m

CONFIG_IP6_NF_MATCH_MH=m

CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_TARGET_LOG=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IPDDP_DECAP=y

CONFIG_X25=m

CONFIG_LAPB=m

CONFIG_ECONET=m

CONFIG_ECONET_AUNUDP=y

CONFIG_ECONET_NATIVE=y

CONFIG_WAN_ROUTER=m

CONFIG_PHONET=m

CONFIG_IEEE802154=m

CONFIG_NET_ACT_SKBEDIT=m

CONFIG_DCB=y

CONFIG_NET_PKTGEN=m

# CONFIG_WIRELESS is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

CONFIG_CONNECTOR=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_LE_BYTE_SWAP=y

CONFIG_MTD_CFI_GEOMETRY=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PHYSMAP_OF=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_CDROM_PKTCDVD=y

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

CONFIG_SCSI_TGT=m

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_SCSI_DH_ALUA=m

CONFIG_SCSI_OSD_INITIATOR=m

CONFIG_SCSI_OSD_ULD=m

CONFIG_ATA=y

CONFIG_SATA_AHCI=y

CONFIG_SATA_SIL24=y

# CONFIG_ATA_SFF is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_ADAPTEC is not set

# CONFIG_NET_VENDOR_ALTEON is not set

# CONFIG_NET_VENDOR_AMD is not set

# CONFIG_NET_VENDOR_ATHEROS is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_DEC is not set

# CONFIG_NET_VENDOR_DLINK is not set

# CONFIG_NET_VENDOR_EMULEX is not set

# CONFIG_NET_VENDOR_EXAR is not set

# CONFIG_NET_VENDOR_HP is not set

CONFIG_E1000E=y

# CONFIG_NET_VENDOR_I825XX is not set

CONFIG_SKY2=y

# CONFIG_NET_VENDOR_MELLANOX is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MYRI is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NVIDIA is not set

# CONFIG_NET_VENDOR_OKI is not set

# CONFIG_NET_PACKET_ENGINE is not set

# CONFIG_NET_VENDOR_QLOGIC is not set

# CONFIG_NET_VENDOR_REALTEK is not set

# CONFIG_NET_VENDOR_RDC is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SILAN is not set

# CONFIG_NET_VENDOR_SIS is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_SUN is not set

# CONFIG_NET_VENDOR_TEHUTI is not set

# CONFIG_NET_VENDOR_TI is not set

# CONFIG_NET_VENDOR_TOSHIBA is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVBUG=m

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_8250_RSA=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_TIMERIOMEM=m

CONFIG_RAW_DRIVER=m

# CONFIG_HWMON is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_OCORES=y

CONFIG_SENSORS_LM90=y

CONFIG_THERMAL=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1374=y

CONFIG_UIO=y

CONFIG_UIO_PDRV=m

CONFIG_UIO_PDRV_GENIRQ=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_GFS2_FS=m

CONFIG_GFS2_FS_LOCKING_DLM=y

CONFIG_OCFS2_FS=m

CONFIG_BTRFS_FS=m

CONFIG_BTRFS_FS_POSIX_ACL=y

CONFIG_NILFS2_FS=m

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_QFMT_V1=m

CONFIG_QFMT_V2=m

CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_BEFS_FS=m

CONFIG_BFS_FS=m

CONFIG_EFS_FS=m

CONFIG_JFFS2_FS=y

CONFIG_CRAMFS=m

CONFIG_SQUASHFS=m

CONFIG_VXFS_FS=m

CONFIG_UFS_FS=m

CONFIG_EXOFS_FS=m

CONFIG_NFS_FS=m

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFS_FSCACHE=y

CONFIG_NCPFS_EXTRAS=y

CONFIG_CODA_FS=m

CONFIG_AFS_FS=m

CONFIG_PARTITION_ADVANCED=y

CONFIG_ACORN_PARTITION=y

CONFIG_ACORN_PARTITION_ICS=y

CONFIG_ACORN_PARTITION_RISCIX=y

CONFIG_OSF_PARTITION=y

CONFIG_AMIGA_PARTITION=y

CONFIG_ATARI_PARTITION=y

CONFIG_MAC_PARTITION=y

CONFIG_BSD_DISKLABEL=y

CONFIG_MINIX_SUBPARTITION=y

CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_LDM_PARTITION=y

CONFIG_SGI_PARTITION=y

CONFIG_ULTRIX_PARTITION=y

CONFIG_SUN_PARTITION=y

CONFIG_KARMA_PARTITION=y

CONFIG_EFI_PARTITION=y

CONFIG_SYSV68_PARTITION=y

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="cp437"

CONFIG_NLS_CODEPAGE_437=m

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_SCHED_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_KGDB=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=0

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y