apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'multiplatform/platform-data' into next/multiplatform

Browse Source 
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2012-09-22 00:22:33 -07:00
parent be2109e13f 6884b68045
commit e3a66aa33a
397 changed files with 573 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/spi/ep93xx_spi
+1 -1
View File
@@ -26,7 +26,7 @@ arch/arm/mach-ep93xx/ts72xx.c:
#include <linux/gpio.h>
#include <linux/spi/spi.h>
#include <mach/ep93xx_spi.h>
#include <linux/platform_data/spi-ep93xx.h>
/* this is our GPIO line used for chip select */
#define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO9
arch/arm/mach-at91/at91sam9g45_devices.c
+1 -1
View File
@@ -31,7 +31,7 @@
#include <mach/at91sam9g45_matrix.h>
#include <mach/at91_matrix.h>
#include <mach/at91sam9_smc.h>
#include <mach/at_hdmac.h>
#include <linux/platform_data/dma-atmel.h>
#include <mach/atmel-mci.h>
#include <media/atmel-isi.h>
arch/arm/mach-at91/at91sam9rl_devices.c
+1 -1
View File
@@ -22,7 +22,7 @@
#include <mach/at91sam9rl_matrix.h>
#include <mach/at91_matrix.h>
#include <mach/at91sam9_smc.h>
#include <mach/at_hdmac.h>
#include <linux/platform_data/dma-atmel.h>
#include "generic.h"
arch/arm/mach-at91/include/mach/atmel-mci.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef __MACH_ATMEL_MCI_H
#define __MACH_ATMEL_MCI_H
#include <mach/at_hdmac.h>
#include <linux/platform_data/dma-atmel.h>
/**
* struct mci_dma_data - DMA data for MCI interface
arch/arm/mach-davinci/aemif.c
+1 -1
View File
@@ -15,7 +15,7 @@
#include <linux/module.h>
#include <linux/time.h>
#include <mach/aemif.h>
#include <linux/platform_data/mtd-davinci-aemif.h>
/* Timing value configuration */
arch/arm/mach-davinci/board-da830-evm.c
+4 -4
View File
@@ -28,11 +28,11 @@
#include <mach/cp_intc.h>
#include <mach/mux.h>
#include <mach/nand.h>
#include <linux/platform_data/mtd-davinci.h>
#include <mach/da8xx.h>
#include <mach/usb.h>
#include <mach/aemif.h>
#include <mach/spi.h>
#include <linux/platform_data/usb-davinci.h>
#include <linux/platform_data/mtd-davinci-aemif.h>
#include <linux/platform_data/spi-davinci.h>
#define DA830_EVM_PHY_ID ""
/*
arch/arm/mach-davinci/board-da850-evm.c
+3 -3
View File
@@ -40,10 +40,10 @@
#include <mach/cp_intc.h>
#include <mach/da8xx.h>
#include <mach/nand.h>
#include <linux/platform_data/mtd-davinci.h>
#include <mach/mux.h>
#include <mach/aemif.h>
#include <mach/spi.h>
#include <linux/platform_data/mtd-davinci-aemif.h>
#include <linux/platform_data/spi-davinci.h>
#define DA850_EVM_PHY_ID "davinci_mdio-0:00"
#define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8)
arch/arm/mach-davinci/board-dm355-evm.c
+4 -4
View File
@@ -26,11 +26,11 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/i2c.h>
#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/nand.h>
#include <mach/mmc.h>
#include <mach/usb.h>
#include <linux/platform_data/mtd-davinci.h>
#include <linux/platform_data/mmc-davinci.h>
#include <linux/platform_data/usb-davinci.h>
#include "davinci.h"
arch/arm/mach-davinci/board-dm355-leopard.c
+4 -4
View File
@@ -23,11 +23,11 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/i2c.h>
#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/nand.h>
#include <mach/mmc.h>
#include <mach/usb.h>
#include <linux/platform_data/mtd-davinci.h>
#include <linux/platform_data/mmc-davinci.h>
#include <linux/platform_data/usb-davinci.h>
#include "davinci.h"
arch/arm/mach-davinci/board-dm365-evm.c
+4 -4
View File
@@ -33,11 +33,11 @@
#include <mach/mux.h>
#include <mach/common.h>
#include <mach/i2c.h>
#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mmc.h>
#include <mach/nand.h>
#include <mach/keyscan.h>
#include <linux/platform_data/mmc-davinci.h>
#include <linux/platform_data/mtd-davinci.h>
#include <linux/platform_data/keyscan-davinci.h>
#include <media/tvp514x.h>
arch/arm/mach-davinci/board-dm644x-evm.c
+5 -5
View File
@@ -31,13 +31,13 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/i2c.h>
#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mux.h>
#include <mach/nand.h>
#include <mach/mmc.h>
#include <mach/usb.h>
#include <mach/aemif.h>
#include <linux/platform_data/mtd-davinci.h>
#include <linux/platform_data/mmc-davinci.h>
#include <linux/platform_data/usb-davinci.h>
#include <linux/platform_data/mtd-davinci-aemif.h>
#include "davinci.h"
arch/arm/mach-davinci/board-dm646x-evm.c
+3 -3
View File
@@ -38,11 +38,11 @@
#include <mach/common.h>
#include <mach/serial.h>
#include <mach/i2c.h>
#include <mach/nand.h>
#include <linux/platform_data/i2c-davinci.h>
#include <linux/platform_data/mtd-davinci.h>
#include <mach/clock.h>
#include <mach/cdce949.h>
#include <mach/aemif.h>
#include <linux/platform_data/mtd-davinci-aemif.h>
#include "davinci.h"
#include "clock.h"
arch/arm/mach-davinci/board-mityomapl138.c
+2 -2
View File
@@ -26,9 +26,9 @@
#include <mach/common.h>
#include <mach/cp_intc.h>
#include <mach/da8xx.h>
#include <mach/nand.h>
#include <linux/platform_data/mtd-davinci.h>
#include <mach/mux.h>
#include <mach/spi.h>
#include <linux/platform_data/spi-davinci.h>
#define MITYOMAPL138_PHY_ID ""
arch/arm/mach-davinci/board-neuros-osd2.c
+4 -4
View File
@@ -31,12 +31,12 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
#include <mach/i2c.h>
#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mux.h>
#include <mach/nand.h>
#include <mach/mmc.h>
#include <mach/usb.h>
#include <linux/platform_data/mtd-davinci.h>
#include <linux/platform_data/mmc-davinci.h>
#include <linux/platform_data/usb-davinci.h>
#include "davinci.h"
arch/arm/mach-davinci/board-sffsdr.c
+2 -2
View File
@@ -36,10 +36,10 @@
#include <asm/mach/flash.h>
#include <mach/common.h>
#include <mach/i2c.h>
#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mux.h>
#include <mach/usb.h>
#include <linux/platform_data/usb-davinci.h>
#include "davinci.h"
arch/arm/mach-davinci/davinci.h
+1 -1
View File
@@ -24,7 +24,7 @@
#include <linux/spi/spi.h>
#include <mach/asp.h>
#include <mach/keyscan.h>
#include <linux/platform_data/keyscan-davinci.h>
#include <mach/hardware.h>
#include <media/davinci/vpfe_capture.h>
arch/arm/mach-davinci/devices.c
+2 -2
View File
@@ -15,12 +15,12 @@
#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/i2c.h>
#include <linux/platform_data/i2c-davinci.h>
#include <mach/irqs.h>
#include <mach/cputype.h>
#include <mach/mux.h>
#include <mach/edma.h>
#include <mach/mmc.h>
#include <linux/platform_data/mmc-davinci.h>
#include <mach/time.h>
#include "davinci.h"
arch/arm/mach-davinci/dm355.c
+1 -1
View File
@@ -27,7 +27,7 @@
#include <mach/serial.h>
#include <mach/common.h>
#include <mach/asp.h>
#include <mach/spi.h>
#include <linux/platform_data/spi-davinci.h>
#include <mach/gpio-davinci.h>
#include "davinci.h"
arch/arm/mach-davinci/dm365.c
+2 -2
View File
@@ -30,8 +30,8 @@
#include <mach/serial.h>
#include <mach/common.h>
#include <mach/asp.h>
#include <mach/keyscan.h>
#include <mach/spi.h>
#include <linux/platform_data/keyscan-davinci.h>
#include <linux/platform_data/spi-davinci.h>
#include <mach/gpio-davinci.h>
#include "davinci.h"
arch/arm/mach-davinci/include/mach/da8xx.h
+4 -4
View File
@@ -19,12 +19,12 @@
#include <mach/serial.h>
#include <mach/edma.h>
#include <mach/i2c.h>
#include <mach/asp.h>
#include <mach/mmc.h>
#include <mach/usb.h>
#include <mach/pm.h>
#include <mach/spi.h>
#include <linux/platform_data/i2c-davinci.h>
#include <linux/platform_data/mmc-davinci.h>
#include <linux/platform_data/usb-davinci.h>
#include <linux/platform_data/spi-davinci.h>
extern void __iomem *da8xx_syscfg0_base;
extern void __iomem *da8xx_syscfg1_base;

Some files were not shown because too many files have changed in this diff Show More