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

Commit 7bf6612e authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips',... 

Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next
parents 7a5c3b8c f77138e8 b606d5ae b15a6d62 df0ac8a4 876f1166 d7a887a7 6457a396 5611cc45 ff5d7265 b3ea5818

arch/mips/Kconfig

+61 −23
Original line number Diff line number Diff line
@@ -716,7 +716,6 @@ config CAVIUM_OCTEON_SIMULATOR 
	select DMA_COHERENT

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_HOTPLUG_CPU

	select SYS_HAS_CPU_CAVIUM_OCTEON

	select HOLES_IN_ZONE
@@ -732,7 +731,6 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
	select DMA_COHERENT

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_HOTPLUG_CPU

	select SYS_HAS_EARLY_PRINTK

	select SYS_HAS_CPU_CAVIUM_OCTEON
@@ -761,7 +759,6 @@ config NLM_XLR_BOARD 
	depends on EXPERIMENTAL

	select BOOT_ELF32

	select NLM_COMMON

	select NLM_XLR

	select SYS_HAS_CPU_XLR

	select SYS_SUPPORTS_SMP

	select HW_HAS_PCI
@@ -776,6 +773,7 @@ config NLM_XLR_BOARD 
	select CEVT_R4K

	select CSRC_R4K

	select IRQ_CPU

	select ARCH_SUPPORTS_MSI

	select ZONE_DMA if 64BIT

	select SYNC_R4K

	select SYS_HAS_EARLY_PRINTK
@@ -783,6 +781,33 @@ config NLM_XLR_BOARD 
	  Support for systems based on Netlogic XLR and XLS processors.

	  Say Y here if you have a XLR or XLS based board.



config NLM_XLP_BOARD

	bool "Netlogic XLP based systems"

	depends on EXPERIMENTAL

	select BOOT_ELF32

	select NLM_COMMON

	select SYS_HAS_CPU_XLP

	select SYS_SUPPORTS_SMP

	select HW_HAS_PCI

	select SWAP_IO_SPACE

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select 64BIT_PHYS_ADDR

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select DMA_COHERENT

	select NR_CPUS_DEFAULT_32

	select CEVT_R4K

	select CSRC_R4K

	select IRQ_CPU

	select ZONE_DMA if 64BIT

	select SYNC_R4K

	select SYS_HAS_EARLY_PRINTK

	help

	  This board is based on Netlogic XLP Processor.

	  Say Y here if you have a XLP based board.



endchoice



source "arch/mips/alchemy/Kconfig"
@@ -1413,51 +1438,36 @@ config CPU_CAVIUM_OCTEON 
config CPU_BMIPS3300

	bool "BMIPS3300"

	depends on SYS_HAS_CPU_BMIPS3300

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SWAP_IO_SPACE

	select SYS_SUPPORTS_32BIT_KERNEL

	select WEAK_ORDERING

	select CPU_BMIPS

	help

	  Broadcom BMIPS3300 processors.



config CPU_BMIPS4350

	bool "BMIPS4350"

	depends on SYS_HAS_CPU_BMIPS4350

	select CPU_SUPPORTS_32BIT_KERNEL

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SWAP_IO_SPACE

	select CPU_BMIPS

	select SYS_SUPPORTS_SMP

	select SYS_SUPPORTS_HOTPLUG_CPU

	select WEAK_ORDERING

	help

	  Broadcom BMIPS4350 ("VIPER") processors.



config CPU_BMIPS4380

	bool "BMIPS4380"

	depends on SYS_HAS_CPU_BMIPS4380

	select CPU_SUPPORTS_32BIT_KERNEL

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SWAP_IO_SPACE

	select CPU_BMIPS

	select SYS_SUPPORTS_SMP

	select SYS_SUPPORTS_HOTPLUG_CPU

	select WEAK_ORDERING

	help

	  Broadcom BMIPS4380 processors.



config CPU_BMIPS5000

	bool "BMIPS5000"

	depends on SYS_HAS_CPU_BMIPS5000

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_BMIPS

	select CPU_SUPPORTS_HIGHMEM

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SWAP_IO_SPACE

	select MIPS_CPU_SCACHE

	select SYS_SUPPORTS_SMP

	select SYS_SUPPORTS_HOTPLUG_CPU

	select WEAK_ORDERING

	help

	  Broadcom BMIPS5000 processors.
@@ -1472,6 +1482,19 @@ config CPU_XLR 
	select CPU_SUPPORTS_HUGEPAGES

	help

	  Netlogic Microsystems XLR/XLS processors.



config CPU_XLP

	bool "Netlogic XLP SoC"

	depends on SYS_HAS_CPU_XLP

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM

	select CPU_HAS_LLSC

	select WEAK_ORDERING

	select WEAK_REORDERING_BEYOND_LLSC

	select CPU_HAS_PREFETCH

	help

	  Netlogic Microsystems XLP processors.

endchoice



if CPU_LOONGSON2F
@@ -1518,6 +1541,15 @@ config CPU_LOONGSON2 
	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM



config CPU_BMIPS

	bool

	select CPU_MIPS32

	select CPU_SUPPORTS_32BIT_KERNEL

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SWAP_IO_SPACE

	select WEAK_ORDERING



config SYS_HAS_CPU_LOONGSON2E

	bool
@@ -1605,6 +1637,9 @@ config SYS_HAS_CPU_BMIPS5000 
config SYS_HAS_CPU_XLR

	bool



config SYS_HAS_CPU_XLP

	bool



#

# CPU may reorder R->R, R->W, W->R, W->W

# Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC
@@ -1992,6 +2027,9 @@ config CPU_HAS_SMARTMIPS 
config CPU_HAS_WB

	bool



config XKS01

	bool



#

# Vectored interrupt mode is an R2 feature

#

arch/mips/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ ifeq (,$(findstring march=octeon, $(cflags-$(CONFIG_CPU_CAVIUM_OCTEON)))) 
cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon

endif

cflags-$(CONFIG_CAVIUM_CN63XXP1) += -Wa,-mfix-cn63xxp1

cflags-$(CONFIG_CPU_BMIPS)	+= -march=mips32 -Wa,-mips32 -Wa,--trap



cflags-$(CONFIG_CPU_R4000_WORKAROUNDS)	+= $(call cc-option,-mfix-r4000,)

cflags-$(CONFIG_CPU_R4400_WORKAROUNDS)	+= $(call cc-option,-mfix-r4400,)

arch/mips/ar7/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ struct titan_gpio_cfg { 
	u32 func;

};



static struct titan_gpio_cfg titan_gpio_table[] = {

static const struct titan_gpio_cfg titan_gpio_table[] = {

	/* reg, start bit, mux value */

	{4, 24, 1},

	{4, 26, 1},

arch/mips/ar7/platform.c

+37 −0
Original line number Diff line number Diff line
@@ -462,6 +462,40 @@ static struct gpio_led fb_fon_leds[] = { 
	},

};



static struct gpio_led gt701_leds[] = {

	{

		.name			= "inet:green",

		.gpio			= 13,

		.active_low		= 1,

	},

	{

		.name			= "usb",

		.gpio			= 12,

		.active_low		= 1,

	},

	{

		.name			= "inet:red",

		.gpio			= 9,

		.active_low		= 1,

	},

	{

		.name			= "power:red",

		.gpio			= 7,

		.active_low		= 1,

	},

	{

		.name			= "power:green",

		.gpio			= 8,

		.active_low		= 1,

		.default_trigger	= "default-on",

	},

        {

                .name                   = "ethernet",

                .gpio                   = 10,

                .active_low             = 1,

        },

};



static struct gpio_led_platform_data ar7_led_data;



static struct platform_device ar7_gpio_leds = {
@@ -503,6 +537,9 @@ static void __init detect_leds(void) 
	} else if (strstr(prid, "CYWM") || strstr(prid, "CYWL")) {

		ar7_led_data.num_leds = ARRAY_SIZE(titan_leds);

		ar7_led_data.leds = titan_leds;

	} else if (strstr(prid, "GT701")) {

		ar7_led_data.num_leds = ARRAY_SIZE(gt701_leds);

		ar7_led_data.leds = gt701_leds;

	}

}

arch/mips/ar7/prom.c

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ struct psbl_rec { 
	u32	ffs_size;

};



static __initdata char psp_env_version[] = "TIENV0.8";

static const char psp_env_version[] __initconst = "TIENV0.8";



struct psp_env_chunk {

	u8	num;
@@ -84,7 +84,7 @@ struct psp_var_map_entry { 
	char	*value;

};



static struct psp_var_map_entry psp_var_map[] = {

static const struct psp_var_map_entry psp_var_map[] = {

	{  1,	"cpufrequency" },

	{  2,	"memsize" },

	{  3,	"flashsize" },