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

Commit 1556f4b4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-for-v3.10/board-2-v2' of... 

Merge tag 'davinci-for-v3.10/board-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/boards

From Sekhar Nori:
v3.10 board updates for DaVinci

This set of patches enables remoteproc support
on DA850 EVM and fixes some sparse warnings for
the same board.

* tag 'davinci-for-v3.10/board-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: da850 evm: fix const qualifier placement
  ARM: davinci: da850 board: add remoteproc support
  ARM: davinci: ensure global variables are declared
  ARM: davinci: sram.c: fix incorrect type in assignment
  ARM: davinci: da8xx dt: make file local symbols static
  ARM: davinci: da8xx: add remoteproc support
  ARM: davinci: remove test for undefined Kconfig macro
  ARM: davinci: mmc: derive version information from device name
  ARM: davinci: da850: add ECAP & EHRPWM clock nodes
  ARM: davinci: clk framework support for enable/disable functionality
parents 392f9195 58b6c5a1

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ parameter is applicable: 
	AVR32	AVR32 architecture is enabled.

	AX25	Appropriate AX.25 support is enabled.

	BLACKFIN Blackfin architecture is enabled.

	CMA	Contiguous Memory Area support is enabled.

	DRM	Direct Rendering Management support is enabled.

	DYNAMIC_DEBUG Build in debug messages and enable them at runtime

	EDD	BIOS Enhanced Disk Drive Services (EDD) is enabled
@@ -2663,6 +2664,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			Useful for devices that are detected asynchronously

			(e.g. USB and MMC devices).



	rproc_mem=nn[KMG][@address]

			[KNL,ARM,CMA] Remoteproc physical memory block.

			Memory area to be used by remote processor image,

			managed by CMA.



	rw		[KNL] Mount root device read-write on boot



	S		[KNL] Run init in single mode

arch/arm/mach-davinci/board-da830-evm.c

+0 −1
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ static struct davinci_mmc_config da830_evm_mmc_config = { 
	.wires			= 8,

	.max_freq		= 50000000,

	.caps			= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.version		= MMC_CTLR_VERSION_2,

};



static inline void da830_evm_init_mmc(void)

arch/arm/mach-davinci/board-da850-evm.c

+8 −4
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ enum da850_evm_ui_exp_pins { 
	DA850_EVM_UI_EXP_PB1,

};



static const char const *da850_evm_ui_exp[] = {

static const char * const da850_evm_ui_exp[] = {

	[DA850_EVM_UI_EXP_SEL_C]        = "sel_c",

	[DA850_EVM_UI_EXP_SEL_B]        = "sel_b",

	[DA850_EVM_UI_EXP_SEL_A]        = "sel_a",
@@ -560,7 +560,7 @@ enum da850_evm_bb_exp_pins { 
	DA850_EVM_BB_EXP_USER_SW8

};



static const char const *da850_evm_bb_exp[] = {

static const char * const da850_evm_bb_exp[] = {

	[DA850_EVM_BB_EXP_DEEP_SLEEP_EN]	= "deep_sleep_en",

	[DA850_EVM_BB_EXP_SW_RST]		= "sw_rst",

	[DA850_EVM_BB_EXP_TP_23]		= "tp_23",
@@ -797,7 +797,6 @@ static struct davinci_mmc_config da850_mmc_config = { 
	.wires		= 4,

	.max_freq	= 50000000,

	.caps		= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.version	= MMC_CTLR_VERSION_2,

};



static const short da850_evm_mmcsd0_pins[] __initconst = {
@@ -1367,7 +1366,6 @@ static struct davinci_mmc_config da850_wl12xx_mmc_config = { 
	.max_freq	= 25000000,

	.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_NONREMOVABLE |

			  MMC_CAP_POWER_OFF_CARD,

	.version	= MMC_CTLR_VERSION_2,

};



static const short da850_wl12xx_pins[] __initconst = {
@@ -1574,6 +1572,11 @@ static __init void da850_evm_init(void) 
		pr_warn("%s: SATA registration failed: %d\n", __func__, ret);



	da850_evm_setup_mac_addr();



	ret = da8xx_register_rproc();

	if (ret)

		pr_warn("%s: dsp/rproc registration failed: %d\n",

			__func__, ret);

}



#ifdef CONFIG_SERIAL_8250_CONSOLE
@@ -1601,4 +1604,5 @@ MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM") 
	.init_late	= davinci_init_late,

	.dma_zone_size	= SZ_128M,

	.restart	= da8xx_restart,

	.reserve	= da8xx_rproc_reserve_cma,

MACHINE_END

arch/arm/mach-davinci/board-dm355-evm.c

+0 −1
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ static struct davinci_mmc_config dm355evm_mmc_config = { 
	.wires		= 4,

	.max_freq       = 50000000,

	.caps           = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.version	= MMC_CTLR_VERSION_1,

};



/* Don't connect anything to J10 unless you're only using USB host

arch/arm/mach-davinci/board-dm365-evm.c

+0 −1
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ static struct davinci_mmc_config dm365evm_mmc_config = { 
	.wires		= 4,

	.max_freq	= 50000000,

	.caps		= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.version	= MMC_CTLR_VERSION_2,

};



static void dm365evm_emac_configure(void)