From fd1f217ccf22202a575cdb84daad4e64b8c8426e Mon Sep 17 00:00:00 2001 From: Vivi Li Date: Wed, 4 Jul 2012 14:20:33 +0800 Subject: [PATCH] --- yaml --- r: 313839 b: refs/heads/master c: 00afdbbfaf07baf62a31920862128e55842f07dc h: refs/heads/master i: 313837: 3d1c914b8dd43c44ff46f7b0f951f11043e47fba 313835: f8dcdde718b9b0a9690ce79141fae3410e80836c 313831: 17d7a518375ccacaf82d7c07ba6d90e7c17c3a34 313823: 35cfb71028db95ef469619968bbe8303e4284f23 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/mach-bf609/boards/ezkit.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 32c4b50ca16a..4eb49c2d9561 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 507e20b3e10d852e874df794852bea504c39eb8b +refs/heads/master: 00afdbbfaf07baf62a31920862128e55842f07dc diff --git a/trunk/arch/blackfin/mach-bf609/boards/ezkit.c b/trunk/arch/blackfin/mach-bf609/boards/ezkit.c index ff2bc19975f1..0d8aa11b8950 100644 --- a/trunk/arch/blackfin/mach-bf609/boards/ezkit.c +++ b/trunk/arch/blackfin/mach-bf609/boards/ezkit.c @@ -830,8 +830,10 @@ static const unsigned short ppi_req[] = { P_PPI0_D4, P_PPI0_D5, P_PPI0_D6, P_PPI0_D7, P_PPI0_D8, P_PPI0_D9, P_PPI0_D10, P_PPI0_D11, P_PPI0_D12, P_PPI0_D13, P_PPI0_D14, P_PPI0_D15, +#if !defined(CONFIG_VIDEO_VS6624) && !defined(CONFIG_VIDEO_VS6624_MODULE) P_PPI0_D16, P_PPI0_D17, P_PPI0_D18, P_PPI0_D19, P_PPI0_D20, P_PPI0_D21, P_PPI0_D22, P_PPI0_D23, +#endif P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2, 0, }; @@ -862,7 +864,7 @@ static struct bcap_route vs6624_routes[] = { }, }; -static const unsigned vs6624_ce_pin = GPIO_PD1; +static const unsigned vs6624_ce_pin = GPIO_PE4; static struct bfin_capture_config bfin_capture_data = { .card_name = "BF609",