diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 21:19:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 21:19:05 -0400 |
commit | 61464c8357c8f6b780e4c44f5c79471799c51ca7 (patch) | |
tree | 4509cf075403965528f380f2f825c46908fb7d4e /drivers/staging/tidspbridge/core | |
parent | 47061eda2584b9e4516d1e3a9713406a3a559ac8 (diff) | |
parent | 9cf1c871526cf6bfec2a653e1e068ee72592542c (diff) |
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc general cleanups from Olof Johansson:
"This is a large branch that contains a handful of different cleanups:
- Fixing up the I/O space remapping on PCI on ARM. This is a series
from Rob Herring that restructures how all pci devices allocate I/O
space, and it's part of the work to allow multiplatform kernels.
- A number of cleanup series for OMAP, moving and removing some
headers, sparse irq rework and in general preparation for
multiplatform.
- Final removal of all non-DT boards for Tegra, it is now
device-tree-only!
- Removal of a stale platform, nxp4008. It's an old mobile chipset
that is no longer in use, and was very likely never really used
with a mainline kernel. We have not been able to find anyone
interested in keeping it around in the kernel.
- Removal of the legacy dmaengine driver on tegra
+ A handful of other things that I haven't described above."
Fix up some conflicts with the staging tree (and because nxp4008 was
removed)
* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (184 commits)
ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
ARM: mmp: using for_each_set_bit to simplify the code
ARM: tegra: harmony: fix ldo7 regulator-name
ARM: OMAP2+: Make omap4-keypad.h local
ARM: OMAP2+: Make l4_3xxx.h local
ARM: OMAP2+: Make l4_2xxx.h local
ARM: OMAP2+: Make l3_3xxx.h local
ARM: OMAP2+: Make l3_2xxx.h local
ARM: OMAP1: Move irda.h from plat to mach
ARM: OMAP2+: Make hdq1w.h local
ARM: OMAP2+: Make gpmc-smsc911x.h local
ARM: OMAP2+: Make gpmc-smc91x.h local
ARM: OMAP1: Move flash.h from plat to mach
ARM: OMAP2+: Make debug-devices.h local
ARM: OMAP1: Move board-voiceblue.h from plat to mach
ARM: OMAP1: Move board-sx1.h from plat to mach
ARM: OMAP2+: Make omap-wakeupgen.h local
ARM: OMAP2+: Make omap-secure.h local
ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
...
Diffstat (limited to 'drivers/staging/tidspbridge/core')
-rw-r--r-- | drivers/staging/tidspbridge/core/dsp-clock.c | 2 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/core/tiomap3430.c | 2 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 2 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/core/tiomap_io.c | 2 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/core/wdt.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/tidspbridge/core/dsp-clock.c b/drivers/staging/tidspbridge/core/dsp-clock.c index 7eac01e5fe0..b647207928b 100644 --- a/drivers/staging/tidspbridge/core/dsp-clock.c +++ b/drivers/staging/tidspbridge/core/dsp-clock.c | |||
@@ -23,7 +23,7 @@ | |||
23 | /* ----------------------------------- Host OS */ | 23 | /* ----------------------------------- Host OS */ |
24 | #include <dspbridge/host_os.h> | 24 | #include <dspbridge/host_os.h> |
25 | #include <plat/dmtimer.h> | 25 | #include <plat/dmtimer.h> |
26 | #include <plat/mcbsp.h> | 26 | #include <linux/platform_data/asoc-ti-mcbsp.h> |
27 | 27 | ||
28 | /* ----------------------------------- DSP/BIOS Bridge */ | 28 | /* ----------------------------------- DSP/BIOS Bridge */ |
29 | #include <dspbridge/dbdefs.h> | 29 | #include <dspbridge/dbdefs.h> |
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c index 012c5a0cc6c..066a3ceec65 100644 --- a/drivers/staging/tidspbridge/core/tiomap3430.c +++ b/drivers/staging/tidspbridge/core/tiomap3430.c | |||
@@ -16,7 +16,7 @@ | |||
16 | * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 16 | * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <plat/dsp.h> | 19 | #include <linux/platform_data/dsp-omap.h> |
20 | 20 | ||
21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
22 | /* ----------------------------------- Host OS */ | 22 | /* ----------------------------------- Host OS */ |
diff --git a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c index 58a1d6dcf09..dafa6d9b294 100644 --- a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c +++ b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c | |||
@@ -19,7 +19,7 @@ | |||
19 | /* ----------------------------------- Host OS */ | 19 | /* ----------------------------------- Host OS */ |
20 | #include <dspbridge/host_os.h> | 20 | #include <dspbridge/host_os.h> |
21 | 21 | ||
22 | #include <plat/dsp.h> | 22 | #include <linux/platform_data/dsp-omap.h> |
23 | 23 | ||
24 | /* ----------------------------------- DSP/BIOS Bridge */ | 24 | /* ----------------------------------- DSP/BIOS Bridge */ |
25 | #include <dspbridge/dbdefs.h> | 25 | #include <dspbridge/dbdefs.h> |
diff --git a/drivers/staging/tidspbridge/core/tiomap_io.c b/drivers/staging/tidspbridge/core/tiomap_io.c index 7fda10c3686..f53ed98d18c 100644 --- a/drivers/staging/tidspbridge/core/tiomap_io.c +++ b/drivers/staging/tidspbridge/core/tiomap_io.c | |||
@@ -16,7 +16,7 @@ | |||
16 | * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 16 | * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <plat/dsp.h> | 19 | #include <linux/platform_data/dsp-omap.h> |
20 | 20 | ||
21 | /* ----------------------------------- DSP/BIOS Bridge */ | 21 | /* ----------------------------------- DSP/BIOS Bridge */ |
22 | #include <dspbridge/dbdefs.h> | 22 | #include <dspbridge/dbdefs.h> |
diff --git a/drivers/staging/tidspbridge/core/wdt.c b/drivers/staging/tidspbridge/core/wdt.c index e5adad08f1c..1dce36fb828 100644 --- a/drivers/staging/tidspbridge/core/wdt.c +++ b/drivers/staging/tidspbridge/core/wdt.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | 27 | ||
28 | #define OMAP34XX_WDT3_BASE (0x49000000 + 0x30000) | 28 | #define OMAP34XX_WDT3_BASE (0x49000000 + 0x30000) |
29 | #define INT_34XX_WDT3_IRQ 36 | 29 | #define INT_34XX_WDT3_IRQ (36 + NR_IRQS) |
30 | 30 | ||
31 | static struct dsp_wdt_setting dsp_wdt; | 31 | static struct dsp_wdt_setting dsp_wdt; |
32 | 32 | ||