Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM i.MX board updates

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABCAAGBQJQUG2CAAoJEPFlmONMx+ez7Y8QAIIeuG0S9irIeA4BM0BJm5Hg
 oShi4dvMEaTGztcLiWzISl9Kiln8BHyvRMeqwLwWs/UWiD0WfspxuM8g1XgplEOb
 9eOU/t1GN42FZeAkssUv+1A1neSxqyLt8PIAjN46qVH+ZABwalaYYzkX+HFel9w0
 gtJh46t5jYtb7uuz913Fo4eBaoVOMw8VCFy4LXVp8lH3kt/tn61OkYFJ8t3Xu9BI
 XuwDTj4Tvy5wfRXzFwWCKTj1fpgHXi3WO/vhR5EivAQ8MDSIqh9fYLe7pyYVMJt2
 vPhDziXGd11fjNHy8kkNbdGniOWpT551WTeOQ2EO3QmXFChuPNhTsGYNLg7vD1/Y
 /jS6qJIJh78yMPQY5moNog9eu3GnFsMKSJYMliKgKYcOeLmDZb8g4tTpzfQYHLgp
 h4AMMllx4PhhFJAk3Kok2lH/5UxstkcgL+Bjrft6P3xuTJSSJihn7kJpFBnm/8Wk
 cjnpu4+Ptnd3rDr0GW8zreDw2KSEIDsJVxisFvq0CcK0gbcnp9lQrxWjFpMnQ6p/
 UgV1zZ9X2vhl+AEzGQBqdZ96QiqgVsXx9AgJIHXQE84I7bM328DiVd8naTbh0KvV
 eQIfibInkAT/XNb/hhB/wakjLLBFaj8W/0zERIP8GqLHmHwxBWcY7kY2nANNXTGN
 zUsQ2/dxX6MAbVCUiE03
 =53PN
 -----END PGP SIGNATURE-----

Merge tag 'imx-boards' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards

ARM i.MX board updates

* tag 'imx-boards' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: mx27pdk: Add audio support
This commit is contained in:
Olof Johansson 2012-09-16 16:52:14 -07:00
commit a838ef7c0e
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-imx/Kconfig
View file

@ -303,6 +303,7 @@ config MACH_MX27_3DS
select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_FB
select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_IMX_KEYPAD select IMX_HAVE_PLATFORM_IMX_KEYPAD
select IMX_HAVE_PLATFORM_IMX_SSI
select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_MX2_CAMERA select IMX_HAVE_PLATFORM_MX2_CAMERA
select IMX_HAVE_PLATFORM_MXC_EHCI select IMX_HAVE_PLATFORM_MXC_EHCI

21
arch/arm/mach-imx/mach-mx27_3ds.c
View file

@ -158,6 +158,11 @@ static const int mx27pdk_pins[] __initconst = {
PB21_PF_CSI_HSYNC, PB21_PF_CSI_HSYNC,
CSI_PWRDWN | GPIO_GPIO | GPIO_OUT, CSI_PWRDWN | GPIO_GPIO | GPIO_OUT,
CSI_RESET | GPIO_GPIO | GPIO_OUT, CSI_RESET | GPIO_GPIO | GPIO_OUT,
/* SSI4 */
PC16_PF_SSI4_FS,
PC17_PF_SSI4_RXD,
PC18_PF_SSI4_TXD,
PC19_PF_SSI4_CLK,
}; };
static struct gpio mx27_3ds_camera_gpios[] = { static struct gpio mx27_3ds_camera_gpios[] = {
@ -329,13 +334,24 @@ static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = {
}; };
/* MC13783 */ /* MC13783 */
static struct mc13xxx_codec_platform_data mx27_3ds_codec = {
.dac_ssi_port = MC13783_SSI1_PORT,
.adc_ssi_port = MC13783_SSI1_PORT,
};
static struct mc13xxx_platform_data mc13783_pdata = { static struct mc13xxx_platform_data mc13783_pdata = {
.regulators = { .regulators = {
.regulators = mx27_3ds_regulators, .regulators = mx27_3ds_regulators,
.num_regulators = ARRAY_SIZE(mx27_3ds_regulators), .num_regulators = ARRAY_SIZE(mx27_3ds_regulators),
}, },
.flags = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC, .flags = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC |
MC13XXX_USE_CODEC,
.codec = &mx27_3ds_codec,
};
static struct imx_ssi_platform_data mx27_3ds_ssi_pdata = {
.flags = IMX_SSI_DMA | IMX_SSI_NET,
}; };
/* SPI */ /* SPI */
@ -512,6 +528,9 @@ static void __init mx27pdk_init(void)
} }
imx27_add_mx2_camera(&mx27_3ds_cam_pdata); imx27_add_mx2_camera(&mx27_3ds_cam_pdata);
imx27_add_imx_ssi(0, &mx27_3ds_ssi_pdata);
imx_add_platform_device("imx_mc13783", 0, NULL, 0, NULL, 0);
} }
static void __init mx27pdk_timer_init(void) static void __init mx27pdk_timer_init(void)