Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Blackfin: bf537: rename ad2s120x ->ad2s1200
In v3.2 the Analog Devices ad2s1200/ad2s1205 driver was renamed from
ad2s120x to ad2s1200. But it apparently forgot to rename the references
to this driver in the BF537-STAMP code. Rename these now, and use the
IS_ENABLED() macro, while we're at it.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
authored by Paul Bolle and committed by Steven Miao 6ffe3463 cb8f05f7
+7
-7
arch/blackfin/mach-bf537/boards/stamp.c
+7
-7
arch/blackfin/mach-bf537/boards/stamp.c
···
655
};
656
#endif
657
658
-
#if defined(CONFIG_AD2S120X) || defined(CONFIG_AD2S120X_MODULE)
659
-
static unsigned short ad2s120x_platform_data[] = {
660
/* used as SAMPLE and RDVEL */
661
GPIO_PF5, GPIO_PF6, 0
662
};
663
664
-
static struct bfin5xx_spi_chip ad2s120x_spi_chip_info = {
665
.enable_dma = 0,
666
};
667
#endif
···
1019
},
1020
#endif
1021
1022
-
#if defined(CONFIG_AD2S120X) || defined(CONFIG_AD2S120X_MODULE)
1023
{
1024
-
.modalias = "ad2s120x",
1025
.bus_num = 0,
1026
.chip_select = 4, /* CS, change it for your board */
1027
-
.platform_data = ad2s120x_platform_data,
1028
-
.controller_data = &ad2s120x_spi_chip_info,
1029
},
1030
#endif
1031
···
655
};
656
#endif
657
658
+
#if IS_ENABLED(CONFIG_AD2S1200)
659
+
static unsigned short ad2s1200_platform_data[] = {
660
/* used as SAMPLE and RDVEL */
661
GPIO_PF5, GPIO_PF6, 0
662
};
663
664
+
static struct bfin5xx_spi_chip ad2s1200_spi_chip_info = {
665
.enable_dma = 0,
666
};
667
#endif
···
1019
},
1020
#endif
1021
1022
+
#if IS_ENABLED(CONFIG_AD2S1200)
1023
{
1024
+
.modalias = "ad2s1200",
1025
.bus_num = 0,
1026
.chip_select = 4, /* CS, change it for your board */
1027
+
.platform_data = ad2s1200_platform_data,
1028
+
.controller_data = &ad2s1200_spi_chip_info,
1029
},
1030
#endif
1031