|
@@ -632,7 +632,7 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr,
|
|
|
unsigned long size,
|
|
|
const struct physmap_flash_data *pdata)
|
|
|
{
|
|
|
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
|
|
|
struct resource res = {
|
|
|
.start = addr,
|
|
|
.end = addr + size - 1,
|
|
@@ -670,8 +670,7 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr,
|
|
|
void __init txx9_ndfmc_init(unsigned long baseaddr,
|
|
|
const struct txx9ndfmc_platform_data *pdata)
|
|
|
{
|
|
|
-#if defined(CONFIG_MTD_NAND_TXX9NDFMC) || \
|
|
|
- defined(CONFIG_MTD_NAND_TXX9NDFMC_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_MTD_NAND_TXX9NDFMC)
|
|
|
struct resource res = {
|
|
|
.start = baseaddr,
|
|
|
.end = baseaddr + 0x1000 - 1,
|
|
@@ -687,7 +686,7 @@ void __init txx9_ndfmc_init(unsigned long baseaddr,
|
|
|
#endif
|
|
|
}
|
|
|
|
|
|
-#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_LEDS_GPIO)
|
|
|
static DEFINE_SPINLOCK(txx9_iocled_lock);
|
|
|
|
|
|
#define TXX9_IOCLED_MAXLEDS 8
|
|
@@ -810,7 +809,7 @@ void __init txx9_iocled_init(unsigned long baseaddr,
|
|
|
void __init txx9_dmac_init(int id, unsigned long baseaddr, int irq,
|
|
|
const struct txx9dmac_platform_data *pdata)
|
|
|
{
|
|
|
-#if defined(CONFIG_TXX9_DMAC) || defined(CONFIG_TXX9_DMAC_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_TXX9_DMAC)
|
|
|
struct resource res[] = {
|
|
|
{
|
|
|
.start = baseaddr,
|
|
@@ -866,8 +865,7 @@ void __init txx9_aclc_init(unsigned long baseaddr, int irq,
|
|
|
unsigned int dma_chan_out,
|
|
|
unsigned int dma_chan_in)
|
|
|
{
|
|
|
-#if defined(CONFIG_SND_SOC_TXX9ACLC) || \
|
|
|
- defined(CONFIG_SND_SOC_TXX9ACLC_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_SND_SOC_TXX9ACLC)
|
|
|
unsigned int dma_base = dmac_id * TXX9_DMA_MAX_NR_CHANNELS;
|
|
|
struct resource res[] = {
|
|
|
{
|