ARM: OMAP: Partial revert for EAC IO address changes
Subsystems (3)
PATCH 1/1 ARM: OMAP: Partial revert for EAC IO address changes
This is partial revert for commit 3a02c1ae56a61c5249594553735ff32557e2e7ed and only purpose is to sync these lines with mainline version and to have common cleanup patch for both linux-omap and mainline.
--- arch/arm/mach-omap2/devices.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/devices.c +2 -2
@@ -369,12 +369,12 @@ static inline void omap_init_mcspi(void) {}#ifdef CONFIG_SND_OMAP24XX_EAC -#define OMAP2_EAC_BASE (L4_24XX_BASE + 0x90000) +#define OMAP2_EAC_BASE 0x48090000static struct resource omap2_eac_resources[] = { { .start =OMAP2_EAC_BASE , - .end =OMAP2_EAC_BASE +0xfff , + .end =OMAP2_EAC_BASE +0x109 , .flags =IORESOURCE_MEM , }, };
Signature · 1 line
1.6.2.1
PATCH 1/1 ARM: OMAP: Remove defines and resource init for OMAP24XX EAC
There is no anymore legacy driver for OMAP24XX Enhanced Audio Controller in linux-omap and it was newer in mainline so cleanup these unneeded defines and initialization code.
--- arch/arm/mach-omap2/devices.c | 33 ----------- arch/arm/plat-omap/include/mach/eac.h | 100 --------------------------------- 2 files changed, 0 insertions(+), 133 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/eac.h
arch/arm/mach-omap2/devices.c +0 -33
@@ -25,7 +25,6 @@#include <mach/board.h> #include <mach/mux.h> #include <mach/gpio.h> -#include <mach/eac.h> #include <mach/mmc.h> #if defined(CONFIG_VIDEO_OMAP2 ) || defined(CONFIG_VIDEO_OMAP2_MODULE )
@@ -366,38 +365,6 @@ static void omap_init_mcspi(void)static inline void omap_init_mcspi (void ) {}#endif -#ifdef CONFIG_SND_OMAP24XX_EAC - -#define OMAP2_EAC_BASE 0x48090000 - -static struct resource omap2_eac_resources[] = { - { - .start =OMAP2_EAC_BASE , - .end =OMAP2_EAC_BASE +0x109 , - .flags =IORESOURCE_MEM , - }, -}; - -static struct platform_device omap2_eac_device = { - .name ="omap24xx-eac" , - .id =-1 , - .num_resources =ARRAY_SIZE (omap2_eac_resources), - .resource = omap2_eac_resources, - .dev = { - .platform_data =NULL , - }, -}; - -void omap_init_eac (struct eac_platform_data *pdata) -{ - omap2_eac_device.dev.platform_data = pdata; -platform_device_register (&omap2_eac_device); -} - -#else -void omap_init_eac (struct eac_platform_data *pdata) {} -#endif - #ifdef CONFIG_OMAP_SHA1_MD5 static struct resource sha1_md5_resources[] = { {
arch/arm/plat-omap/include/mach/eac.h deleted +0 -100
100 lines not on this page · raw message
Signature · 1 line
1.6.2.1
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP: Remove defines and resource
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Commit: b1a91a303b74b29396ec7c28c7d70a7571f70a9d
PatchWorks
http://patchwork.kernel.org/patch/16031/
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP: Partial revert for EAC IO
In reply to Jarkko NikulaThis patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Commit: 7b4c6760b933f3209747b3d158ac4d78dcfb19d9
PatchWorks
http://patchwork.kernel.org/patch/16030/