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

Commit f8787fdc authored by Mark Brown's avatar Mark Brown Committed by Russell King
Browse files

[ARM] 5225/1: zaurus: Register I2C controller for audio codecs 



corgi, spitz and poodle have audio codecs on their primary I2C bus so
need to call pxa_set_i2c_info() to set it up during init. Tested on
spitz by Stanislav.

Reported-by: default avatarStanislav Brabec <utx@penguin.cz>

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b8e6c91c

arch/arm/mach-pxa/corgi.c

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <mach/pxa-regs.h>

#include <mach/pxa2xx-regs.h>

#include <mach/pxa2xx-gpio.h>

#include <mach/i2c.h>

#include <mach/irda.h>

#include <mach/mmc.h>

#include <mach/udc.h>
@@ -532,6 +533,7 @@ static void __init corgi_init(void) 
 	pxa_set_udc_info(&udc_info);

	pxa_set_mci_info(&corgi_mci_platform_data);

	pxa_set_ficp_info(&corgi_ficp_platform_data);

	pxa_set_i2c_info(NULL);



	platform_scoop_config = &corgi_pcmcia_config;

arch/arm/mach-pxa/poodle.c

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <mach/pxa2xx-gpio.h>

#include <mach/mmc.h>

#include <mach/udc.h>

#include <mach/i2c.h>

#include <mach/irda.h>

#include <mach/poodle.h>

#include <mach/pxafb.h>
@@ -387,6 +388,7 @@ static void __init poodle_init(void) 
	pxa_set_udc_info(&udc_info);

	pxa_set_mci_info(&poodle_mci_platform_data);

	pxa_set_ficp_info(&poodle_ficp_platform_data);

	pxa_set_i2c_info(NULL);



	platform_scoop_config = &poodle_pcmcia_config;

arch/arm/mach-pxa/spitz.c

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <mach/pxa2xx-gpio.h>

#include <mach/pxa27x-udc.h>

#include <mach/reset.h>

#include <mach/i2c.h>

#include <mach/irda.h>

#include <mach/mmc.h>

#include <mach/ohci.h>
@@ -574,6 +575,7 @@ static void __init common_init(void) 
	pxa_set_ficp_info(&spitz_ficp_platform_data);

	set_pxa_fb_parent(&spitzssp_device.dev);

	set_pxa_fb_info(&spitz_pxafb_info);

	pxa_set_i2c_info(NULL);

}



#if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI)