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

Commit cc23ee49 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-fixes-for-v3.11-rc2' of... 

Merge tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

From Sekhar Nori:
DaVinci fixes for v3.11-rc2

The pull request includes fixes for sparse warnings, defconfig changes to
enable DMA usage on peripherals and removal of a duplicated include file.

* tag 'davinci-fixes-for-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: defconfig: enable EDMA driver
  ARM: davinci: make file local variables static
  ARM: edma: remove duplicated include from edma.c

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ab116a4d cf690331

arch/arm/common/edma.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/io.h>

#include <linux/slab.h>

#include <linux/edma.h>

#include <linux/err.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of_dma.h>

arch/arm/configs/da8xx_omapl_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ CONFIG_SND_SOC=m 
CONFIG_SND_DAVINCI_SOC=m

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_DMADEVICES=y

CONFIG_TI_EDMA=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_XFS_FS=m

arch/arm/configs/davinci_all_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ CONFIG_LEDS_TRIGGERS=y 
CONFIG_LEDS_TRIGGER_TIMER=m

CONFIG_LEDS_TRIGGER_HEARTBEAT=m

CONFIG_RTC_CLASS=y

CONFIG_DMADEVICES=y

CONFIG_TI_EDMA=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_XFS_FS=m

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

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ static struct vpbe_output dm365evm_vpbe_outputs[] = { 
/*

 * Amplifiers on the board

 */

struct ths7303_platform_data ths7303_pdata = {

static struct ths7303_platform_data ths7303_pdata = {

	.ch_1 = 3,

	.ch_2 = 3,

	.ch_3 = 3,

arch/arm/mach-davinci/dm355.c

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ static struct platform_device dm355_vpbe_display = { 
	},

};



struct venc_platform_data dm355_venc_pdata = {

static struct venc_platform_data dm355_venc_pdata = {

	.setup_pinmux	= dm355_vpbe_setup_pinmux,

	.setup_clock	= dm355_venc_setup_clock,

};