aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorVivi Li <vivi.li@analog.com>2012-07-04 02:20:33 -0400
committerBob Liu <lliubbo@gmail.com>2012-07-24 01:39:52 -0400
commit00afdbbfaf07baf62a31920862128e55842f07dc (patch)
tree06db24e2fcd56d2f7b159919f43f497f71c4fa2a /arch/blackfin
parent507e20b3e10d852e874df794852bea504c39eb8b (diff)
bf60x: vs6624 pin update
Change ce pin to PE4 according to new adaptor board and re-define ppi for vs6624 to avoid gpio conflict. Signed-off-by: Vivi Li <vivi.li@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/mach-bf609/boards/ezkit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
index ff2bc19975f1..0d8aa11b8950 100644
--- a/arch/blackfin/mach-bf609/boards/ezkit.c
+++ b/arch/blackfin/mach-bf609/boards/ezkit.c
@@ -830,8 +830,10 @@ static const unsigned short ppi_req[] = {
830 P_PPI0_D4, P_PPI0_D5, P_PPI0_D6, P_PPI0_D7, 830 P_PPI0_D4, P_PPI0_D5, P_PPI0_D6, P_PPI0_D7,
831 P_PPI0_D8, P_PPI0_D9, P_PPI0_D10, P_PPI0_D11, 831 P_PPI0_D8, P_PPI0_D9, P_PPI0_D10, P_PPI0_D11,
832 P_PPI0_D12, P_PPI0_D13, P_PPI0_D14, P_PPI0_D15, 832 P_PPI0_D12, P_PPI0_D13, P_PPI0_D14, P_PPI0_D15,
833#if !defined(CONFIG_VIDEO_VS6624) && !defined(CONFIG_VIDEO_VS6624_MODULE)
833 P_PPI0_D16, P_PPI0_D17, P_PPI0_D18, P_PPI0_D19, 834 P_PPI0_D16, P_PPI0_D17, P_PPI0_D18, P_PPI0_D19,
834 P_PPI0_D20, P_PPI0_D21, P_PPI0_D22, P_PPI0_D23, 835 P_PPI0_D20, P_PPI0_D21, P_PPI0_D22, P_PPI0_D23,
836#endif
835 P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2, 837 P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,
836 0, 838 0,
837}; 839};
@@ -862,7 +864,7 @@ static struct bcap_route vs6624_routes[] = {
862 }, 864 },
863}; 865};
864 866
865static const unsigned vs6624_ce_pin = GPIO_PD1; 867static const unsigned vs6624_ce_pin = GPIO_PE4;
866 868
867static struct bfin_capture_config bfin_capture_data = { 869static struct bfin_capture_config bfin_capture_data = {
868 .card_name = "BF609", 870 .card_name = "BF609",