blackfin: Remove non-existed Kconfig symbol VIDEO_MT9M114
PATCH 1/1 blackfin: Remove non-existed Kconfig symbol VIDEO_MT9M114
From: Sonic Zhang <[email protected]>
Bind different groups of one pinmux function to respective state names. Add all states at once, no need to exclude each other by Kconfig symbol.
Signed-off-by Sonic Zhang <[email protected]>
--- arch/blackfin/mach-bf548/boards/ezkit.c | 6 ++++-- arch/blackfin/mach-bf609/boards/ezkit.c | 17 ++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-)
arch/blackfin/mach-bf548/boards/ezkit.c +4 -2
@@ -2124,7 +2124,7 @@ static struct pinctrl_map __initdata bfin_pinmux_map[] = {PIN_MAP_MUX_GROUP_DEFAULT ("bfin-rotary" ,"pinctrl-adi2.0" ,NULL ,"rotary" ),PIN_MAP_MUX_GROUP_DEFAULT ("bfin_can.0" ,"pinctrl-adi2.0" ,NULL ,"can0" ),PIN_MAP_MUX_GROUP_DEFAULT ("bfin_can.1" ,"pinctrl-adi2.0" ,NULL ,"can1" ), -PIN_MAP_MUX_GROUP_DEFAULT ("bf54x-lq043" ,"pinctrl-adi2.0" ,NULL ,"ppi0_24b" ), +PIN_MAP_MUX_GROUP_DEFAULT ("bf54x-lq043" ,"pinctrl-adi2.0" ,"ppi0_24bgrp" ,"ppi0" ),PIN_MAP_MUX_GROUP_DEFAULT ("bfin-i2s.0" ,"pinctrl-adi2.0" ,NULL ,"sport0" ),PIN_MAP_MUX_GROUP_DEFAULT ("bfin-tdm.0" ,"pinctrl-adi2.0" ,NULL ,"sport0" ), PIN_MAP_MUX_GROUP_DEFAULT("bfin-ac97.0", "pinctrl-adi2.0", NULL, "sport0"),
@@ -2146,7 +2146,9 @@ static struct pinctrl_map __initdata bfin_pinmux_map[] = {PIN_MAP_MUX_GROUP_DEFAULT ("pata-bf54x" ,"pinctrl-adi2.0" ,NULL ,"atapi_alter" ), #endifPIN_MAP_MUX_GROUP_DEFAULT ("bf5xx-nand.0" ,"pinctrl-adi2.0" ,NULL ,"nfc0" ), - PIN_MAP_MUX_GROUP_DEFAULT("bf54x-keys", "pinctrl-adi2.0", NULL, "keys_4x4"), +PIN_MAP_MUX_GROUP_DEFAULT ("bf54x-keys" ,"pinctrl-adi2.0" ,"keys_4x4grp" ,"keys" ), +PIN_MAP_MUX_GROUP ("bf54x-keys" ,"4bit" ,"pinctrl-adi2.0" ,"keys_4x4grp" ,"keys" ), + PIN_MAP_MUX_GROUP("bf54x-keys", "8bit", "pinctrl-adi2.0", "keys_8x8grp", "keys"), };static int __init ezkit_init (void )
arch/blackfin/mach-bf609/boards/ezkit.c +8 -9
@@ -2073,15 +2073,14 @@ static struct pinctrl_map __initdata bfin_pinmux_map[] = {PIN_MAP_MUX_GROUP_DEFAULT ("bfin-rotary" ,"pinctrl-adi2.0" ,NULL ,"rotary" ),PIN_MAP_MUX_GROUP_DEFAULT ("bfin_can.0" ,"pinctrl-adi2.0" ,NULL ,"can0" ),PIN_MAP_MUX_GROUP_DEFAULT ("physmap-flash.0" ,"pinctrl-adi2.0" ,NULL ,"smc0" ), - PIN_MAP_MUX_GROUP_DEFAULT("bf609_nl8048.2", "pinctrl-adi2.0", NULL, "ppi2_16b"), - PIN_MAP_MUX_GROUP_DEFAULT("bfin_display.0", "pinctrl-adi2.0", NULL, "ppi0_16b"), -#if defined(CONFIG_VIDEO_MT9M114 ) || defined(CONFIG_VIDEO_MT9M114_MODULE ) - PIN_MAP_MUX_GROUP_DEFAULT("bfin_capture.0", "pinctrl-adi2.0", NULL, "ppi0_8b"), -#elif defined(CONFIG_VIDEO_VS6624 ) || defined(CONFIG_VIDEO_VS6624_MODULE ) -PIN_MAP_MUX_GROUP_DEFAULT ("bfin_capture.0" ,"pinctrl-adi2.0" ,NULL ,"ppi0_16b" ), -#else -PIN_MAP_MUX_GROUP_DEFAULT ("bfin_capture.0" ,"pinctrl-adi2.0" ,NULL ,"ppi0_24b" ), -#endif +PIN_MAP_MUX_GROUP_DEFAULT ("bf609_nl8048.2" ,"pinctrl-adi2.0" ,"ppi2_16bgrp" ,"ppi2" ), +PIN_MAP_MUX_GROUP ("bfin_display.0" ,"8bit" ,"pinctrl-adi2.0" ,"ppi2_8bgrp" ,"ppi2" ), +PIN_MAP_MUX_GROUP_DEFAULT ("bfin_display.0" ,"pinctrl-adi2.0" ,"ppi2_16bgrp" ,"ppi2" ), +PIN_MAP_MUX_GROUP ("bfin_display.0" ,"16bit" ,"pinctrl-adi2.0" ,"ppi2_16bgrp" ,"ppi2" ), +PIN_MAP_MUX_GROUP ("bfin_capture.0" ,"8bit" ,"pinctrl-adi2.0" ,"ppi0_8bgrp" ,"ppi0" ), +PIN_MAP_MUX_GROUP_DEFAULT ("bfin_capture.0" ,"pinctrl-adi2.0" ,"ppi0_16bgrp" ,"ppi0" ), +PIN_MAP_MUX_GROUP ("bfin_capture.0" ,"16bit" ,"pinctrl-adi2.0" ,"ppi0_16bgrp" ,"ppi0" ), +PIN_MAP_MUX_GROUP ("bfin_capture.0" ,"24bit" ,"pinctrl-adi2.0" ,"ppi0_24bgrp" ,"ppi0" ),PIN_MAP_MUX_GROUP_DEFAULT ("bfin-i2s.0" ,"pinctrl-adi2.0" ,NULL ,"sport0" ),PIN_MAP_MUX_GROUP_DEFAULT ("bfin-tdm.0" ,"pinctrl-adi2.0" ,NULL ,"sport0" ), PIN_MAP_MUX_GROUP_DEFAULT("bfin-i2s.1", "pinctrl-adi2.0", NULL, "sport1"),
Signature · 1 line
1.8.2.3