commit f8787fdcf6f46d6a65a42dbddb70cd7e4dc5b741 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

[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: Stanislav Brabec <utx@penguin.cz>

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by Mark Brown and committed by Russell King 17 years ago f8787fdc b8e6c91c

3 changed files

expand all

unified split

arch

arm

mach-pxa

corgi.c

poodle.c

spitz.c

arch/arm/mach-pxa/corgi.c

··· 38 38 #include <mach/pxa-regs.h> 39 39 #include <mach/pxa2xx-regs.h> 40 40 #include <mach/pxa2xx-gpio.h> 41 + #include <mach/i2c.h> 41 42 #include <mach/irda.h> 42 43 #include <mach/mmc.h> 43 44 #include <mach/udc.h> ··· 533 532 pxa_set_udc_info(&udc_info); 534 533 pxa_set_mci_info(&corgi_mci_platform_data); 535 534 pxa_set_ficp_info(&corgi_ficp_platform_data); 535 + pxa_set_i2c_info(NULL); 536 536 537 537 platform_scoop_config = &corgi_pcmcia_config; 538 538

arch/arm/mach-pxa/poodle.c

··· 36 36 #include <mach/pxa2xx-gpio.h> 37 37 #include <mach/mmc.h> 38 38 #include <mach/udc.h> 39 + #include <mach/i2c.h> 39 40 #include <mach/irda.h> 40 41 #include <mach/poodle.h> 41 42 #include <mach/pxafb.h> ··· 388 387 pxa_set_udc_info(&udc_info); 389 388 pxa_set_mci_info(&poodle_mci_platform_data); 390 389 pxa_set_ficp_info(&poodle_ficp_platform_data); 390 + pxa_set_i2c_info(NULL); 391 391 392 392 platform_scoop_config = &poodle_pcmcia_config; 393 393

arch/arm/mach-pxa/spitz.c

··· 40 40 #include <mach/pxa2xx-gpio.h> 41 41 #include <mach/pxa27x-udc.h> 42 42 #include <mach/reset.h> 43 + #include <mach/i2c.h> 43 44 #include <mach/irda.h> 44 45 #include <mach/mmc.h> 45 46 #include <mach/ohci.h> ··· 575 574 pxa_set_ficp_info(&spitz_ficp_platform_data); 576 575 set_pxa_fb_parent(&spitzssp_device.dev); 577 576 set_pxa_fb_info(&spitz_pxafb_info); 577 + pxa_set_i2c_info(NULL); 578 578 } 579 579 580 580 #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI)