Merge branch 'torvalds/master'
[firefly-linux-kernel-4.4.55.git] / arch / blackfin / mach-bf548 / boards / ezkit.c
index c4d07f040947cba025c1df2d87d9431c7bc2fd36..4204b9842532134e7a657bd0d7f9b5c8f1aeb7d7 100644 (file)
@@ -17,6 +17,9 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/usb/musb.h>
+#include <linux/pinctrl/machine.h>
+#include <linux/pinctrl/pinconf-generic.h>
+#include <linux/platform_data/pinctrl-adi2.h>
 #include <asm/bfin5xx_spi.h>
 #include <asm/dma.h>
 #include <asm/gpio.h>
@@ -38,7 +41,7 @@ const char bfin_board_name[] = "ADI BF548-EZKIT";
  *  Driver needs to know address, irq and flag pin.
  */
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
 #include <linux/usb/isp1760.h>
 static struct resource bfin_isp1760_resources[] = {
        [0] = {
@@ -73,7 +76,7 @@ static struct platform_device bfin_isp1760_device = {
 };
 #endif
 
-#if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
+#if IS_ENABLED(CONFIG_FB_BF54X_LQ043)
 
 #include <mach/bf54x-lq043.h>
 
@@ -105,7 +108,7 @@ static struct platform_device bf54x_lq043_device = {
 };
 #endif
 
-#if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_BFIN)
 static const unsigned int bf548_keymap[] = {
        KEYVAL(0, 0, KEY_ENTER),
        KEYVAL(0, 1, KEY_HELP),
@@ -155,8 +158,8 @@ static struct platform_device bf54x_kpad_device = {
 };
 #endif
 
-#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
-#include <asm/bfin_rotary.h>
+#if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
+#include <linux/platform_data/bfin_rotary.h>
 
 static struct bfin_rotary_platform_data bfin_rotary_data = {
        /*.rotary_up_key     = KEY_UP,*/
@@ -169,6 +172,11 @@ static struct bfin_rotary_platform_data bfin_rotary_data = {
 };
 
 static struct resource bfin_rotary_resources[] = {
+       {
+               .start = CNT_CONFIG,
+               .end   = CNT_CONFIG + 0xff,
+               .flags = IORESOURCE_MEM,
+       },
        {
                .start = IRQ_CNT,
                .end = IRQ_CNT,
@@ -187,7 +195,7 @@ static struct platform_device bfin_rotary_device = {
 };
 #endif
 
-#if defined(CONFIG_INPUT_ADXL34X) || defined(CONFIG_INPUT_ADXL34X_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X)
 #include <linux/input/adxl34x.h>
 static const struct adxl34x_platform_data adxl34x_info = {
        .x_axis_offset = 0,
@@ -226,14 +234,14 @@ static const struct adxl34x_platform_data adxl34x_info = {
 };
 #endif
 
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
 static struct platform_device rtc_device = {
        .name = "rtc-bfin",
        .id   = -1,
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
 static struct resource bfin_uart0_resources[] = {
        {
@@ -241,6 +249,13 @@ static struct resource bfin_uart0_resources[] = {
                .end = UART0_RBR+2,
                .flags = IORESOURCE_MEM,
        },
+#ifdef CONFIG_EARLY_PRINTK
+       {
+               .start = PORTE_FER,
+               .end = PORTE_FER+2,
+               .flags = IORESOURCE_REG,
+       },
+#endif
        {
                .start = IRQ_UART0_TX,
                .end = IRQ_UART0_TX,
@@ -289,6 +304,13 @@ static struct resource bfin_uart1_resources[] = {
                .end = UART1_RBR+2,
                .flags = IORESOURCE_MEM,
        },
+#ifdef CONFIG_EARLY_PRINTK
+       {
+               .start = PORTH_FER,
+               .end = PORTH_FER+2,
+               .flags = IORESOURCE_REG,
+       },
+#endif
        {
                .start = IRQ_UART1_TX,
                .end = IRQ_UART1_TX,
@@ -353,6 +375,13 @@ static struct resource bfin_uart2_resources[] = {
                .end = UART2_RBR+2,
                .flags = IORESOURCE_MEM,
        },
+#ifdef CONFIG_EARLY_PRINTK
+       {
+               .start = PORTB_FER,
+               .end = PORTB_FER+2,
+               .flags = IORESOURCE_REG,
+       },
+#endif
        {
                .start = IRQ_UART2_TX,
                .end = IRQ_UART2_TX,
@@ -401,6 +430,13 @@ static struct resource bfin_uart3_resources[] = {
                .end = UART3_RBR+2,
                .flags = IORESOURCE_MEM,
        },
+#ifdef CONFIG_EARLY_PRINTK
+       {
+               .start = PORTB_FER,
+               .end = PORTB_FER+2,
+               .flags = IORESOURCE_REG,
+       },
+#endif
        {
                .start = IRQ_UART3_TX,
                .end = IRQ_UART3_TX,
@@ -460,7 +496,7 @@ static struct platform_device bfin_uart3_device = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
 static struct resource bfin_sir0_resources[] = {
        {
@@ -563,7 +599,7 @@ static struct platform_device bfin_sir3_device = {
 #endif
 #endif
 
-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#if IS_ENABLED(CONFIG_SMSC911X)
 #include <linux/smsc911x.h>
 
 static struct resource smsc911x_resources[] = {
@@ -598,7 +634,7 @@ static struct platform_device smsc911x_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
 static struct resource musb_resources[] = {
        [0] = {
                .start  = 0xFFC03C00,
@@ -660,7 +696,7 @@ static struct platform_device musb_device = {
 };
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
 static struct resource bfin_sport0_uart_resources[] = {
        {
@@ -799,7 +835,7 @@ static struct platform_device bfin_sport3_uart_device = {
 #endif
 #endif
 
-#if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_CAN_BFIN)
 
 static unsigned short bfin_can0_peripherals[] = {
        P_CAN0_RX, P_CAN0_TX, 0
@@ -877,7 +913,7 @@ static struct platform_device bfin_can1_device = {
 
 #endif
 
-#if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE)
+#if IS_ENABLED(CONFIG_PATA_BF54X)
 static struct resource bfin_atapi_resources[] = {
        {
                .start = 0xFFC03800,
@@ -899,7 +935,7 @@ static struct platform_device bfin_atapi_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
 static struct mtd_partition partition_info[] = {
        {
                .name = "bootloader(nand)",
@@ -949,7 +985,7 @@ static struct platform_device bf5xx_nand_device = {
 };
 #endif
 
-#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SDH_BFIN)
 
 static struct bfin_sd_host bfin_sdh_data = {
        .dma_chan = CH_SDH,
@@ -966,7 +1002,7 @@ static struct platform_device bf54x_sdh_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
 static struct mtd_partition ezkit_partitions[] = {
        {
                .name       = "bootloader(nor)",
@@ -1014,8 +1050,7 @@ static struct platform_device ezkit_flash_device = {
 };
 #endif
 
-#if defined(CONFIG_MTD_M25P80) \
-       || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
 /* SPI flash chip (m25p16) */
 static struct mtd_partition bfin_spi_flash_partitions[] = {
        {
@@ -1042,7 +1077,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
 static const struct ad7877_platform_data bfin_ad7877_ts_info = {
        .model                  = 7877,
        .vref_delay_usecs       = 50,   /* internal, no capacitor */
@@ -1058,60 +1093,463 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
 };
 #endif
 
+#ifdef CONFIG_PINCTRL_ADI2
+
+# define ADI_PINT_DEVNAME "adi-gpio-pint"
+# define ADI_GPIO_DEVNAME "adi-gpio"
+# define ADI_PINCTRL_DEVNAME "pinctrl-adi2"
+
+static struct platform_device bfin_pinctrl_device = {
+       .name = ADI_PINCTRL_DEVNAME,
+       .id = 0,
+};
+
+static struct resource bfin_pint0_resources[] = {
+       {
+               .start = PINT0_MASK_SET,
+               .end = PINT0_LATCH + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PINT0,
+               .end = IRQ_PINT0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device bfin_pint0_device = {
+       .name = ADI_PINT_DEVNAME,
+       .id = 0,
+       .num_resources = ARRAY_SIZE(bfin_pint0_resources),
+       .resource = bfin_pint0_resources,
+};
+
+static struct resource bfin_pint1_resources[] = {
+       {
+               .start = PINT1_MASK_SET,
+               .end = PINT1_LATCH + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PINT1,
+               .end = IRQ_PINT1,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device bfin_pint1_device = {
+       .name = ADI_PINT_DEVNAME,
+       .id = 1,
+       .num_resources = ARRAY_SIZE(bfin_pint1_resources),
+       .resource = bfin_pint1_resources,
+};
+
+static struct resource bfin_pint2_resources[] = {
+       {
+               .start = PINT2_MASK_SET,
+               .end = PINT2_LATCH + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PINT2,
+               .end = IRQ_PINT2,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device bfin_pint2_device = {
+       .name = ADI_PINT_DEVNAME,
+       .id = 2,
+       .num_resources = ARRAY_SIZE(bfin_pint2_resources),
+       .resource = bfin_pint2_resources,
+};
+
+static struct resource bfin_pint3_resources[] = {
+       {
+               .start = PINT3_MASK_SET,
+               .end = PINT3_LATCH + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PINT3,
+               .end = IRQ_PINT3,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device bfin_pint3_device = {
+       .name = ADI_PINT_DEVNAME,
+       .id = 3,
+       .num_resources = ARRAY_SIZE(bfin_pint3_resources),
+       .resource = bfin_pint3_resources,
+};
+
+static struct resource bfin_gpa_resources[] = {
+       {
+               .start = PORTA_FER,
+               .end = PORTA_MUX + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {       /* optional */
+               .start = IRQ_PA0,
+               .end = IRQ_PA0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct adi_pinctrl_gpio_platform_data bfin_gpa_pdata = {
+       .port_gpio_base = GPIO_PA0,     /* Optional */
+       .port_pin_base  = GPIO_PA0,
+       .port_width     = GPIO_BANKSIZE,
+       .pint_id        = 0,            /* PINT0 */
+       .pint_assign    = true,         /* PINT upper 16 bit */
+       .pint_map       = 0,            /* mapping mask in PINT */
+};
+
+static struct platform_device bfin_gpa_device = {
+       .name = ADI_GPIO_DEVNAME,
+       .id = 0,
+       .num_resources = ARRAY_SIZE(bfin_gpa_resources),
+       .resource = bfin_gpa_resources,
+       .dev = {
+               .platform_data = &bfin_gpa_pdata, /* Passed to driver */
+       },
+};
+
+static struct resource bfin_gpb_resources[] = {
+       {
+               .start = PORTB_FER,
+               .end = PORTB_MUX + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PB0,
+               .end = IRQ_PB0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct adi_pinctrl_gpio_platform_data bfin_gpb_pdata = {
+       .port_gpio_base = GPIO_PB0,
+       .port_pin_base  = GPIO_PB0,
+       .port_width     = 15,
+       .pint_id        = 0,
+       .pint_assign    = true,
+       .pint_map       = 1,
+};
+
+static struct platform_device bfin_gpb_device = {
+       .name = ADI_GPIO_DEVNAME,
+       .id = 1,
+       .num_resources = ARRAY_SIZE(bfin_gpb_resources),
+       .resource = bfin_gpb_resources,
+       .dev = {
+               .platform_data = &bfin_gpb_pdata, /* Passed to driver */
+       },
+};
+
+static struct resource bfin_gpc_resources[] = {
+       {
+               .start = PORTC_FER,
+               .end = PORTC_MUX + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PC0,
+               .end = IRQ_PC0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct adi_pinctrl_gpio_platform_data bfin_gpc_pdata = {
+       .port_gpio_base = GPIO_PC0,
+       .port_pin_base  = GPIO_PC0,
+       .port_width     = 14,
+       .pint_id        = 2,
+       .pint_assign    = true,
+       .pint_map       = 0,
+};
+
+static struct platform_device bfin_gpc_device = {
+       .name = ADI_GPIO_DEVNAME,
+       .id = 2,
+       .num_resources = ARRAY_SIZE(bfin_gpc_resources),
+       .resource = bfin_gpc_resources,
+       .dev = {
+               .platform_data = &bfin_gpc_pdata, /* Passed to driver */
+       },
+};
+
+static struct resource bfin_gpd_resources[] = {
+       {
+               .start = PORTD_FER,
+               .end = PORTD_MUX + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PD0,
+               .end = IRQ_PD0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct adi_pinctrl_gpio_platform_data bfin_gpd_pdata = {
+       .port_gpio_base = GPIO_PD0,
+       .port_pin_base  = GPIO_PD0,
+       .port_width     = GPIO_BANKSIZE,
+       .pint_id        = 2,
+       .pint_assign    = false,
+       .pint_map       = 1,
+};
+
+static struct platform_device bfin_gpd_device = {
+       .name = ADI_GPIO_DEVNAME,
+       .id = 3,
+       .num_resources = ARRAY_SIZE(bfin_gpd_resources),
+       .resource = bfin_gpd_resources,
+       .dev = {
+               .platform_data = &bfin_gpd_pdata, /* Passed to driver */
+       },
+};
+
+static struct resource bfin_gpe_resources[] = {
+       {
+               .start = PORTE_FER,
+               .end = PORTE_MUX + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PE0,
+               .end = IRQ_PE0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct adi_pinctrl_gpio_platform_data bfin_gpe_pdata = {
+       .port_gpio_base = GPIO_PE0,
+       .port_pin_base  = GPIO_PE0,
+       .port_width     = GPIO_BANKSIZE,
+       .pint_id        = 3,
+       .pint_assign    = true,
+       .pint_map       = 2,
+};
+
+static struct platform_device bfin_gpe_device = {
+       .name = ADI_GPIO_DEVNAME,
+       .id = 4,
+       .num_resources = ARRAY_SIZE(bfin_gpe_resources),
+       .resource = bfin_gpe_resources,
+       .dev = {
+               .platform_data = &bfin_gpe_pdata, /* Passed to driver */
+       },
+};
+
+static struct resource bfin_gpf_resources[] = {
+       {
+               .start = PORTF_FER,
+               .end = PORTF_MUX + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PF0,
+               .end = IRQ_PF0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct adi_pinctrl_gpio_platform_data bfin_gpf_pdata = {
+       .port_gpio_base = GPIO_PF0,
+       .port_pin_base  = GPIO_PF0,
+       .port_width     = GPIO_BANKSIZE,
+       .pint_id        = 3,
+       .pint_assign    = false,
+       .pint_map       = 3,
+};
+
+static struct platform_device bfin_gpf_device = {
+       .name = ADI_GPIO_DEVNAME,
+       .id = 5,
+       .num_resources = ARRAY_SIZE(bfin_gpf_resources),
+       .resource = bfin_gpf_resources,
+       .dev = {
+               .platform_data = &bfin_gpf_pdata, /* Passed to driver */
+       },
+};
+
+static struct resource bfin_gpg_resources[] = {
+       {
+               .start = PORTG_FER,
+               .end = PORTG_MUX + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PG0,
+               .end = IRQ_PG0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct adi_pinctrl_gpio_platform_data bfin_gpg_pdata = {
+       .port_gpio_base = GPIO_PG0,
+       .port_pin_base  = GPIO_PG0,
+       .port_width     = GPIO_BANKSIZE,
+       .pint_id        = -1,
+};
+
+static struct platform_device bfin_gpg_device = {
+       .name = ADI_GPIO_DEVNAME,
+       .id = 6,
+       .num_resources = ARRAY_SIZE(bfin_gpg_resources),
+       .resource = bfin_gpg_resources,
+       .dev = {
+               .platform_data = &bfin_gpg_pdata, /* Passed to driver */
+       },
+};
+
+static struct resource bfin_gph_resources[] = {
+       {
+               .start = PORTH_FER,
+               .end = PORTH_MUX + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PH0,
+               .end = IRQ_PH0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct adi_pinctrl_gpio_platform_data bfin_gph_pdata = {
+       .port_gpio_base = GPIO_PH0,
+       .port_pin_base  = GPIO_PH0,
+       .port_width     = 14,
+       .pint_id        = -1,
+};
+
+static struct platform_device bfin_gph_device = {
+       .name = ADI_GPIO_DEVNAME,
+       .id = 7,
+       .num_resources = ARRAY_SIZE(bfin_gph_resources),
+       .resource = bfin_gph_resources,
+       .dev = {
+               .platform_data = &bfin_gph_pdata, /* Passed to driver */
+       },
+};
+
+static struct resource bfin_gpi_resources[] = {
+       {
+               .start = PORTI_FER,
+               .end = PORTI_MUX + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PI0,
+               .end = IRQ_PI0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct adi_pinctrl_gpio_platform_data bfin_gpi_pdata = {
+       .port_gpio_base = GPIO_PI0,
+       .port_pin_base  = GPIO_PI0,
+       .port_width     = GPIO_BANKSIZE,
+       .pint_id        = -1,
+};
+
+static struct platform_device bfin_gpi_device = {
+       .name = ADI_GPIO_DEVNAME,
+       .id = 8,
+       .num_resources = ARRAY_SIZE(bfin_gpi_resources),
+       .resource = bfin_gpi_resources,
+       .dev = {
+               .platform_data = &bfin_gpi_pdata, /* Passed to driver */
+       },
+};
+
+static struct resource bfin_gpj_resources[] = {
+       {
+               .start = PORTJ_FER,
+               .end = PORTJ_MUX + 3,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_PJ0,
+               .end = IRQ_PJ0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct adi_pinctrl_gpio_platform_data bfin_gpj_pdata = {
+       .port_gpio_base = GPIO_PJ0,
+       .port_pin_base  = GPIO_PJ0,
+       .port_width     = 14,
+       .pint_id        = -1,
+};
+
+static struct platform_device bfin_gpj_device = {
+       .name = ADI_GPIO_DEVNAME,
+       .id = 9,
+       .num_resources = ARRAY_SIZE(bfin_gpj_resources),
+       .resource = bfin_gpj_resources,
+       .dev = {
+               .platform_data = &bfin_gpj_pdata, /* Passed to driver */
+       },
+};
+
+#endif
+
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) \
-       || defined(CONFIG_MTD_M25P80_MODULE)
+#if IS_ENABLED(CONFIG_MTD_M25P80)
        {
                /* the modalias must be the same as spi device driver name */
                .modalias = "m25p80", /* Name of spi_driver for this device */
                .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
                .bus_num = 0, /* Framework bus number */
-               .chip_select = 1, /* SPI_SSEL1*/
+               .chip_select = MAX_CTRL_CS + GPIO_PE4, /* SPI_SSEL1*/
                .platform_data = &bfin_spi_flash_data,
                .controller_data = &spi_flash_chip_info,
                .mode = SPI_MODE_3,
        },
 #endif
-#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \
-       || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
        {
                .modalias = "ad183x",
                .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
                .bus_num = 1,
-               .chip_select = 4,
+               .chip_select = MAX_CTRL_CS + GPIO_PG6, /* SPI_SSEL2 */
        },
 #endif
-#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
        {
                .modalias               = "ad7877",
                .platform_data          = &bfin_ad7877_ts_info,
                .irq                    = IRQ_PB4,      /* old boards (<=Rev 1.3) use IRQ_PJ11 */
                .max_speed_hz           = 12500000,     /* max spi clock (SCK) speed in HZ */
                .bus_num                = 0,
-               .chip_select            = 2,
+               .chip_select            = MAX_CTRL_CS + GPIO_PE5, /* SPI_SSEL2 */
        },
 #endif
-#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
+#if IS_ENABLED(CONFIG_SPI_SPIDEV)
        {
                .modalias = "spidev",
                .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
                .bus_num = 0,
-               .chip_select = 1,
+               .chip_select = MAX_CTRL_CS + GPIO_PE4, /* SPI_SSEL1 */
        },
 #endif
-#if defined(CONFIG_INPUT_ADXL34X_SPI) || defined(CONFIG_INPUT_ADXL34X_SPI_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X_SPI)
        {
                .modalias               = "adxl34x",
                .platform_data          = &adxl34x_info,
                .irq                    = IRQ_PC5,
                .max_speed_hz           = 5000000,     /* max spi clock (SCK) speed in HZ */
                .bus_num                = 1,
-               .chip_select            = 2,
+               .chip_select            = MAX_CTRL_CS + GPIO_PG6, /* SPI_SSEL2 */
                .mode = SPI_MODE_3,
        },
 #endif
 };
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
 /* SPI (0) */
 static struct resource bfin_spi0_resource[] = {
        [0] = {
@@ -1152,7 +1590,7 @@ static struct resource bfin_spi1_resource[] = {
 
 /* SPI controller data */
 static struct bfin5xx_spi_master bf54x_spi_master_info0 = {
-       .num_chipselect = 4,
+       .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,
        .enable_dma = 1,  /* master has the ability to do dma transfer */
        .pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
 };
@@ -1168,7 +1606,7 @@ static struct platform_device bf54x_spi_master0 = {
 };
 
 static struct bfin5xx_spi_master bf54x_spi_master_info1 = {
-       .num_chipselect = 4,
+       .num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,
        .enable_dma = 1,  /* master has the ability to do dma transfer */
        .pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0},
 };
@@ -1184,8 +1622,7 @@ static struct platform_device bf54x_spi_master1 = {
 };
 #endif  /* spi master and devices */
 
-#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \
-       || defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_BLACKFIN_CAPTURE)
 #include <linux/videodev2.h>
 #include <media/blackfin/bfin_capture.h>
 #include <media/blackfin/ppi.h>
@@ -1205,8 +1642,7 @@ static const struct ppi_info ppi_info = {
        .pin_req = ppi_req,
 };
 
-#if defined(CONFIG_VIDEO_VS6624) \
-       || defined(CONFIG_VIDEO_VS6624_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_VS6624)
 static struct v4l2_input vs6624_inputs[] = {
        {
                .index = 0,
@@ -1251,7 +1687,7 @@ static struct platform_device bfin_capture_device = {
 };
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
 static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};
 
 static struct resource bfin_twi0_resource[] = {
@@ -1306,7 +1742,7 @@ static struct platform_device i2c_bfin_twi1_device = {
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info0[] = {
-#if defined(CONFIG_SND_SOC_SSM2602) || defined(CONFIG_SND_SOC_SSM2602_MODULE)
+#if IS_ENABLED(CONFIG_SND_SOC_SSM2602)
        {
                I2C_BOARD_INFO("ssm2602", 0x1b),
        },
@@ -1315,25 +1751,25 @@ static struct i2c_board_info __initdata bfin_i2c_board_info0[] = {
 
 #if !defined(CONFIG_BF542)     /* The BF542 only has 1 TWI */
 static struct i2c_board_info __initdata bfin_i2c_board_info1[] = {
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
        {
                I2C_BOARD_INFO("pcf8574_lcd", 0x22),
        },
 #endif
-#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_PCF8574)
        {
                I2C_BOARD_INFO("pcf8574_keypad", 0x27),
                .irq = 212,
        },
 #endif
-#if defined(CONFIG_INPUT_ADXL34X_I2C) || defined(CONFIG_INPUT_ADXL34X_I2C_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_ADXL34X_I2C)
        {
                I2C_BOARD_INFO("adxl34x", 0x53),
                .irq = IRQ_PC5,
                .platform_data = (void *)&adxl34x_info,
        },
 #endif
-#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
        {
                I2C_BOARD_INFO("ad5252", 0x2f),
        },
@@ -1341,7 +1777,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info1[] = {
 };
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
 #include <linux/gpio_keys.h>
 
 static struct gpio_keys_button bfin_gpio_keys_table[] = {
@@ -1392,9 +1828,8 @@ static struct platform_device bfin_dpmc = {
        },
 };
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
-       defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) || \
-       defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S) || \
+       IS_ENABLED(CONFIG_SND_BF5XX_AC97)
 
 #define SPORT_REQ(x) \
        [x] = {P_SPORT##x##_TFS, P_SPORT##x##_DTPRI, P_SPORT##x##_TSCLK, \
@@ -1454,42 +1889,35 @@ static struct resource bfin_snd_resources[][4] = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
 static struct platform_device bfin_i2s_pcm = {
        .name = "bfin-i2s-pcm-audio",
        .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)
-static struct platform_device bfin_tdm_pcm = {
-       .name = "bfin-tdm-pcm-audio",
-       .id = -1,
-};
-#endif
-
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
 static struct platform_device bfin_ac97_pcm = {
        .name = "bfin-ac97-pcm-audio",
        .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD73311)
 static struct platform_device bfin_ad73311_codec_device = {
        .name = "ad73311",
        .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1980) || defined(CONFIG_SND_BF5XX_SOC_AD1980_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1980)
 static struct platform_device bfin_ad1980_codec_device = {
        .name = "ad1980",
        .id = -1,
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_I2S) || defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_I2S)
 static struct platform_device bfin_i2s = {
        .name = "bfin-i2s",
        .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -1501,19 +1929,7 @@ static struct platform_device bfin_i2s = {
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_TDM) || defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE)
-static struct platform_device bfin_tdm = {
-       .name = "bfin-tdm",
-       .id = CONFIG_SND_BF5XX_SPORT_NUM,
-       .num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),
-       .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],
-       .dev = {
-               .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],
-       },
-};
-#endif
-
-#if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AC97)
 static struct platform_device bfin_ac97 = {
        .name = "bfin-ac97",
        .id = CONFIG_SND_BF5XX_SPORT_NUM,
@@ -1528,12 +1944,29 @@ static struct platform_device bfin_ac97 = {
 static struct platform_device *ezkit_devices[] __initdata = {
 
        &bfin_dpmc,
-
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+#if defined(CONFIG_PINCTRL_ADI2)
+       &bfin_pinctrl_device,
+       &bfin_pint0_device,
+       &bfin_pint1_device,
+       &bfin_pint2_device,
+       &bfin_pint3_device,
+       &bfin_gpa_device,
+       &bfin_gpb_device,
+       &bfin_gpc_device,
+       &bfin_gpd_device,
+       &bfin_gpe_device,
+       &bfin_gpf_device,
+       &bfin_gpg_device,
+       &bfin_gph_device,
+       &bfin_gpi_device,
+       &bfin_gpj_device,
+#endif
+
+#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
        &rtc_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN)
 #ifdef CONFIG_SERIAL_BFIN_UART0
        &bfin_uart0_device,
 #endif
@@ -1548,7 +1981,7 @@ static struct platform_device *ezkit_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
+#if IS_ENABLED(CONFIG_BFIN_SIR)
 #ifdef CONFIG_BFIN_SIR0
        &bfin_sir0_device,
 #endif
@@ -1563,23 +1996,23 @@ static struct platform_device *ezkit_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
+#if IS_ENABLED(CONFIG_FB_BF54X_LQ043)
        &bf54x_lq043_device,
 #endif
 
-#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+#if IS_ENABLED(CONFIG_SMSC911X)
        &smsc911x_device,
 #endif
 
-#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
        &musb_device,
 #endif
 
-#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+#if IS_ENABLED(CONFIG_USB_ISP1760_HCD)
        &bfin_isp1760_device,
 #endif
 
-#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
 #ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
        &bfin_sport0_uart_device,
 #endif
@@ -1594,86 +2027,137 @@ static struct platform_device *ezkit_devices[] __initdata = {
 #endif
 #endif
 
-#if defined(CONFIG_CAN_BFIN) || defined(CONFIG_CAN_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_CAN_BFIN)
        &bfin_can0_device,
        &bfin_can1_device,
 #endif
 
-#if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE)
+#if IS_ENABLED(CONFIG_PATA_BF54X)
        &bfin_atapi_device,
 #endif
 
-#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
        &bf5xx_nand_device,
 #endif
 
-#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_SDH_BFIN)
        &bf54x_sdh_device,
 #endif
 
-#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE)
+#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
        &bf54x_spi_master0,
        &bf54x_spi_master1,
 #endif
-#if defined(CONFIG_VIDEO_BLACKFIN_CAPTURE) \
-       || defined(CONFIG_VIDEO_BLACKFIN_CAPTURE_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_BLACKFIN_CAPTURE)
        &bfin_capture_device,
 #endif
 
-#if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_BFIN)
        &bf54x_kpad_device,
 #endif
 
-#if defined(CONFIG_INPUT_BFIN_ROTARY) || defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
        &bfin_rotary_device,
 #endif
 
-#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
        &i2c_bfin_twi0_device,
 #if !defined(CONFIG_BF542)
        &i2c_bfin_twi1_device,
 #endif
 #endif
 
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
        &bfin_device_gpiokeys,
 #endif
 
-#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
+#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
        &ezkit_flash_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
        &bfin_i2s_pcm,
 #endif
-#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)
-       &bfin_tdm_pcm,
-#endif
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
        &bfin_ac97_pcm,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_SOC_AD1980) || defined(CONFIG_SND_BF5XX_SOC_AD1980_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD1980)
        &bfin_ad1980_codec_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
        &bfin_i2s,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)
-       &bfin_tdm,
+#if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
+       &bfin_ac97,
 #endif
+};
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
-       &bfin_ac97,
+/* Pin control settings */
+static struct pinctrl_map __initdata bfin_pinmux_map[] = {
+       /* per-device maps */
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-uart.0",  "pinctrl-adi2.0", NULL, "uart0"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-uart.1",  "pinctrl-adi2.0", NULL, "uart1"),
+#ifdef CONFIG_BFIN_UART1_CTSRTS
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-uart.1",  "pinctrl-adi2.0", NULL, "uart1_ctsrts"),
 #endif
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-uart.2",  "pinctrl-adi2.0", NULL, "uart2"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-uart.3",  "pinctrl-adi2.0", NULL, "uart3"),
+#ifdef CONFIG_BFIN_UART3_CTSRTS
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-uart.3",  "pinctrl-adi2.0", NULL, "uart3_ctsrts"),
+#endif
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin_sir.0",  "pinctrl-adi2.0", NULL, "uart0"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin_sir.1",  "pinctrl-adi2.0", NULL, "uart1"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin_sir.2",  "pinctrl-adi2.0", NULL, "uart2"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin_sir.3",  "pinctrl-adi2.0", NULL, "uart3"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-sdh.0",  "pinctrl-adi2.0", NULL, "rsi0"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-spi.0",  "pinctrl-adi2.0", NULL, "spi0"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-spi.1",  "pinctrl-adi2.0", NULL, "spi1"),
+       PIN_MAP_MUX_GROUP_DEFAULT("i2c-bfin-twi.0",  "pinctrl-adi2.0", NULL, "twi0"),
+#if !defined(CONFIG_BF542)     /* The BF542 only has 1 TWI */
+       PIN_MAP_MUX_GROUP_DEFAULT("i2c-bfin-twi.1",  "pinctrl-adi2.0", NULL, "twi1"),
+#endif
+       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", "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"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-i2s.1",  "pinctrl-adi2.0", NULL, "sport1"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-tdm.1",  "pinctrl-adi2.0", NULL, "sport1"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-ac97.1",  "pinctrl-adi2.0", NULL, "sport1"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-i2s.2",  "pinctrl-adi2.0", NULL, "sport2"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-tdm.2",  "pinctrl-adi2.0", NULL, "sport2"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-ac97.2",  "pinctrl-adi2.0", NULL, "sport2"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-i2s.3",  "pinctrl-adi2.0", NULL, "sport3"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-tdm.3",  "pinctrl-adi2.0", NULL, "sport3"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-ac97.3",  "pinctrl-adi2.0", NULL, "sport3"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-sport-uart.0",  "pinctrl-adi2.0", NULL, "sport0"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-sport-uart.1",  "pinctrl-adi2.0", NULL, "sport1"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-sport-uart.2",  "pinctrl-adi2.0", NULL, "sport2"),
+       PIN_MAP_MUX_GROUP_DEFAULT("bfin-sport-uart.3",  "pinctrl-adi2.0", NULL, "sport3"),
+       PIN_MAP_MUX_GROUP_DEFAULT("pata-bf54x",  "pinctrl-adi2.0", NULL, "atapi"),
+#ifdef CONFIG_BF548_ATAPI_ALTERNATIVE_PORT
+       PIN_MAP_MUX_GROUP_DEFAULT("pata-bf54x",  "pinctrl-adi2.0", NULL, "atapi_alter"),
+#endif
+       PIN_MAP_MUX_GROUP_DEFAULT("bf5xx-nand.0",  "pinctrl-adi2.0", NULL, "nfc0"),
+       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)
 {
        printk(KERN_INFO "%s(): registering device resources\n", __func__);
 
+       /* Initialize pinmuxing */
+       pinctrl_register_mappings(bfin_pinmux_map,
+                               ARRAY_SIZE(bfin_pinmux_map));
+
        i2c_register_board_info(0, bfin_i2c_board_info0,
                                ARRAY_SIZE(bfin_i2c_board_info0));
 #if !defined(CONFIG_BF542)     /* The BF542 only has 1 TWI */
@@ -1705,21 +2189,6 @@ static struct platform_device *ezkit_early_devices[] __initdata = {
        &bfin_uart3_device,
 #endif
 #endif
-
-#if defined(CONFIG_SERIAL_BFIN_SPORT_CONSOLE)
-#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
-       &bfin_sport0_uart_device,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_SPORT1_UART
-       &bfin_sport1_uart_device,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_SPORT2_UART
-       &bfin_sport2_uart_device,
-#endif
-#ifdef CONFIG_SERIAL_BFIN_SPORT3_UART
-       &bfin_sport3_uart_device,
-#endif
-#endif
 };
 
 void __init native_machine_early_platform_add_devices(void)