Commit 8056fb32 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-soc-4.6-1' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical 

Merge "mvebu soc for 4.6 (part 1)" from Gregory CLEMENT:

randconfig warning fixes for mvebu SoCs

* tag 'mvebu-soc-4.6-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: mark mvebu_hwcc_pci_nb as __maybe_unused
  ARM: mv78xx0: avoid unused function warning
  ARM: orion: only select I2C_BOARDINFO when using I2C
parents cc0336ec 60f23952

arch/arm/mach-dove/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ config DOVE_LEGACY 
config MACH_DOVE_DB

	bool "Marvell DB-MV88AP510 Development Board"

	select DOVE_LEGACY

	select I2C_BOARDINFO

	select I2C_BOARDINFO if I2C

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell DB-MV88AP510 Development Board.

arch/arm/mach-mv78xx0/common.c

+2 −3
Original line number Diff line number Diff line
@@ -405,9 +405,8 @@ void __init mv78xx0_init(void) 
	printk("HCLK = %dMHz, ", (hclk + 499999) / 1000000);

	printk("TCLK = %dMHz\n", (get_tclk() + 499999) / 1000000);



#ifdef CONFIG_CACHE_FEROCEON_L2

	if (IS_ENABLED(CONFIG_CACHE_FEROCEON_L2))

		feroceon_l2_init(is_l2_writethrough());

#endif



	/* Setup root of clk tree */

	clk_init();

arch/arm/mach-mvebu/coherency.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static struct notifier_block mvebu_hwcc_nb = { 
	.notifier_call = mvebu_hwcc_notifier,

};



static struct notifier_block mvebu_hwcc_pci_nb = {

static struct notifier_block mvebu_hwcc_pci_nb __maybe_unused = {

	.notifier_call = mvebu_hwcc_notifier,

};

arch/arm/mach-orion5x/Kconfig

+9 −9
Original line number Diff line number Diff line
@@ -28,14 +28,14 @@ config ARCH_ORION5X_DT 


config MACH_DB88F5281

	bool "Marvell Orion-2 Development Board"

	select I2C_BOARDINFO

	select I2C_BOARDINFO if I2C

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell Orion-2 (88F5281) Development Board



config MACH_RD88F5182

	bool "Marvell Orion-NAS Reference Design"

	select I2C_BOARDINFO

	select I2C_BOARDINFO if I2C

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell Orion-NAS (88F5182) RD2
@@ -43,14 +43,14 @@ config MACH_RD88F5182 
config MACH_RD88F5182_DT

	bool "Marvell Orion-NAS Reference Design (Flattened Device Tree)"

	select ARCH_ORION5X_DT

	select I2C_BOARDINFO

	select I2C_BOARDINFO if I2C

	help

	  Say 'Y' here if you want your kernel to support the Marvell

	  Orion-NAS (88F5182) RD2, Flattened Device Tree.



config MACH_KUROBOX_PRO

	bool "KuroBox Pro"

	select I2C_BOARDINFO

	select I2C_BOARDINFO if I2C

	help

	  Say 'Y' here if you want your kernel to support the

	  KuroBox Pro platform.
@@ -58,7 +58,7 @@ config MACH_KUROBOX_PRO 
config MACH_DNS323

	bool "D-Link DNS-323"

	select GENERIC_NET_UTILS

	select I2C_BOARDINFO

	select I2C_BOARDINFO if I2C

	help

	  Say 'Y' here if you want your kernel to support the

	  D-Link DNS-323 platform.
@@ -78,7 +78,7 @@ config MACH_TERASTATION_PRO2 


config MACH_LINKSTATION_PRO

	bool "Buffalo Linkstation Pro/Live"

	select I2C_BOARDINFO

	select I2C_BOARDINFO if I2C

	help

	  Say 'Y' here if you want your kernel to support the

	  Buffalo Linkstation Pro/Live platform. Both v1 and
@@ -86,7 +86,7 @@ config MACH_LINKSTATION_PRO 


config MACH_LINKSTATION_LSCHL

	bool "Buffalo Linkstation Live v3 (LS-CHL)"

	select I2C_BOARDINFO

	select I2C_BOARDINFO if I2C

	help

	  Say 'Y' here if you want your kernel to support the

	  Buffalo Linkstation Live v3 (LS-CHL) platform.
@@ -100,7 +100,7 @@ config MACH_LINKSTATION_MINI 


config MACH_LINKSTATION_LS_HGL

	bool "Buffalo Linkstation LS-HGL"

	select I2C_BOARDINFO

	select I2C_BOARDINFO if I2C

	help

	  Say 'Y' here if you want your kernel to support the

	  Buffalo Linkstation LS-HGL platform.
@@ -139,7 +139,7 @@ config MACH_D2NET_DT 


config MACH_NET2BIG

	bool "LaCie 2Big Network"

	select I2C_BOARDINFO

	select I2C_BOARDINFO if I2C

	help

	  Say 'Y' here if you want your kernel to support the

	  LaCie 2Big Network NAS.

CRA Git | Maintained and supported by SUSTech CRA and CCSE