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

Merge tag 'davinci-for-v4.10/cleanup' of... 

Merge tag 'davinci-for-v4.10/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

Clean-up some unnecessary code from mach-davinci.

- Remove now unneeded dma resources where drivers
  are already converted to use the dma_slave_map[]
  structure.

- Remove some duplicated defines related to USB support.

* tag 'davinci-for-v4.10/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: da8xx: Remove duplicated defines
  ARM: davinci: dm365: Remove DMA resources for SPI
  ARM: davinci: dm355: Remove DMA resources for SPI
  ARM: davinci: devices: Remove DMA resources for MMC
  ARM: davinci: devices-da8xx: Remove DMA resources for MMC and SPI

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 21dbf0b3 766763db

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

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/i2c.h>

#include <linux/i2c/pcf857x.h>

#include <linux/platform_data/at24.h>

#include <linux/mfd/da8xx-cfgchip.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/spi/spi.h>
@@ -116,7 +117,7 @@ static __init void da830_evm_usb_init(void) 
	cfgchip2 = __raw_readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));



	/* USB2.0 PHY reference clock is 24 MHz */

	cfgchip2 &= ~CFGCHIP2_REFFREQ;

	cfgchip2 &= ~CFGCHIP2_REFFREQ_MASK;

	cfgchip2 |=  CFGCHIP2_REFFREQ_24MHZ;



	/*
@@ -133,7 +134,7 @@ static __init void da830_evm_usb_init(void) 
	 * controller won't be able to drive VBUS thinking that it's a B-device.

	 * Otherwise, we want to use the OTG mode and enable VBUS comparators.

	 */

	cfgchip2 &= ~CFGCHIP2_OTGMODE;

	cfgchip2 &= ~CFGCHIP2_OTGMODE_MASK;

#ifdef	CONFIG_USB_MUSB_HOST

	cfgchip2 |=  CFGCHIP2_FORCE_HOST;

#else

arch/arm/mach-davinci/board-omapl138-hawk.c

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/init.h>

#include <linux/console.h>

#include <linux/gpio.h>

#include <linux/mfd/da8xx-cfgchip.h>

#include <linux/platform_data/gpio-davinci.h>



#include <asm/mach-types.h>
@@ -254,7 +255,7 @@ static __init void omapl138_hawk_usb_init(void) 
	/* Setup the Ref. clock frequency for the HAWK at 24 MHz. */



	cfgchip2 = __raw_readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));

	cfgchip2 &= ~CFGCHIP2_REFFREQ;

	cfgchip2 &= ~CFGCHIP2_REFFREQ_MASK;

	cfgchip2 |=  CFGCHIP2_REFFREQ_24MHZ;

	__raw_writel(cfgchip2, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));

arch/arm/mach-davinci/devices-da8xx.c

+0 −29
Original line number Diff line number Diff line
@@ -57,15 +57,6 @@ 
#define DA8XX_EMAC_RAM_OFFSET		0x0000

#define DA8XX_EMAC_CTRL_RAM_SIZE	SZ_8K



#define DA8XX_DMA_SPI0_RX	EDMA_CTLR_CHAN(0, 14)

#define DA8XX_DMA_SPI0_TX	EDMA_CTLR_CHAN(0, 15)

#define DA8XX_DMA_MMCSD0_RX	EDMA_CTLR_CHAN(0, 16)

#define DA8XX_DMA_MMCSD0_TX	EDMA_CTLR_CHAN(0, 17)

#define DA8XX_DMA_SPI1_RX	EDMA_CTLR_CHAN(0, 18)

#define DA8XX_DMA_SPI1_TX	EDMA_CTLR_CHAN(0, 19)

#define DA850_DMA_MMCSD1_RX	EDMA_CTLR_CHAN(1, 28)

#define DA850_DMA_MMCSD1_TX	EDMA_CTLR_CHAN(1, 29)



void __iomem *da8xx_syscfg0_base;

void __iomem *da8xx_syscfg1_base;
@@ -964,16 +955,6 @@ static struct resource da8xx_spi0_resources[] = { 
		.end	= IRQ_DA8XX_SPINT0,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= DA8XX_DMA_SPI0_RX,

		.end	= DA8XX_DMA_SPI0_RX,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		.start	= DA8XX_DMA_SPI0_TX,

		.end	= DA8XX_DMA_SPI0_TX,

		.flags	= IORESOURCE_DMA,

	},

};



static struct resource da8xx_spi1_resources[] = {
@@ -987,16 +968,6 @@ static struct resource da8xx_spi1_resources[] = { 
		.end	= IRQ_DA8XX_SPINT1,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= DA8XX_DMA_SPI1_RX,

		.end	= DA8XX_DMA_SPI1_RX,

		.flags	= IORESOURCE_DMA,

	},

	[3] = {

		.start	= DA8XX_DMA_SPI1_TX,

		.end	= DA8XX_DMA_SPI1_TX,

		.flags	= IORESOURCE_DMA,

	},

};



static struct davinci_spi_platform_data da8xx_spi_pdata[] = {

arch/arm/mach-davinci/devices.c

+0 −3
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ 
#define DM365_MMCSD0_BASE	     0x01D11000

#define DM365_MMCSD1_BASE	     0x01D00000



#define DAVINCI_DMA_MMCRXEVT	26

#define DAVINCI_DMA_MMCTXEVT	27



void __iomem  *davinci_sysmod_base;



void davinci_map_sysmod(void)

arch/arm/mach-davinci/dm355.c

+0 −8
Original line number Diff line number Diff line
@@ -397,14 +397,6 @@ static struct resource dm355_spi0_resources[] = { 
		.start = IRQ_DM355_SPINT0_0,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = 17,

		.flags = IORESOURCE_DMA,

	},

	{

		.start = 16,

		.flags = IORESOURCE_DMA,

	},

};



static struct davinci_spi_platform_data dm355_spi0_pdata = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE