Merge tag 'davinci-for-v3.10/board-2-v2' of git://git.kernel.org/pub/scm/linux/kernel...

From Sekhar Nori:
v3.10 board updates for DaVinci

This set of patches enables remoteproc support
on DA850 EVM and fixes some sparse warnings for
the same board.

* tag 'davinci-for-v3.10/board-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: da850 evm: fix const qualifier placement
  ARM: davinci: da850 board: add remoteproc support
  ARM: davinci: ensure global variables are declared
  ARM: davinci: sram.c: fix incorrect type in assignment
  ARM: davinci: da8xx dt: make file local symbols static
  ARM: davinci: da8xx: add remoteproc support
  ARM: davinci: remove test for undefined Kconfig macro
  ARM: davinci: mmc: derive version information from device name
  ARM: davinci: da850: add ECAP & EHRPWM clock nodes
  ARM: davinci: clk framework support for enable/disable functionality

diff --combined arch/arm/mach-davinci/board-da830-evm.c
index b348e44,12e6f75..1332de8
--- 1/arch/arm/mach-davinci/board-da830-evm.c
--- 2/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@@ -246,7 -246,6 +246,6 @@@ static struct davinci_mmc_config da830_
        .wires                  = 8,
        .max_freq               = 50000000,
        .caps                   = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
-       .version                = MMC_CTLR_VERSION_2,
  };
  
  static inline void da830_evm_init_mmc(void)
@@@ -298,7 -297,11 +297,7 @@@ static const short da830_evm_emif25_pin
        -1
  };
  
 -#if defined(CONFIG_MMC_DAVINCI) || defined(CONFIG_MMC_DAVINCI_MODULE)
 -#define HAS_MMC       1
 -#else
 -#define HAS_MMC       0
 -#endif
 +#define HAS_MMC               IS_ENABLED(CONFIG_MMC_DAVINCI)
  
  #ifdef CONFIG_DA830_UI_NAND
  static struct mtd_partition da830_evm_nand_partitions[] = {

diff --combined arch/arm/mach-davinci/board-da850-evm.c
index a74dec7,ba739e5..8a24b6c
--- 1/arch/arm/mach-davinci/board-da850-evm.c
--- 2/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@@ -335,7 -335,12 +335,7 @@@ static const short da850_evm_nor_pins[
        -1
  };
  
 -#if defined(CONFIG_MMC_DAVINCI) || \
 -    defined(CONFIG_MMC_DAVINCI_MODULE)
 -#define HAS_MMC 1
 -#else
 -#define HAS_MMC 0
 -#endif
 +#define HAS_MMC               IS_ENABLED(CONFIG_MMC_DAVINCI)
  
  static inline void da850_evm_setup_nor_nand(void)
  {
@@@ -396,7 -401,7 +396,7 @@@ enum da850_evm_ui_exp_pins 
        DA850_EVM_UI_EXP_PB1,
  };
  
- static const char const *da850_evm_ui_exp[] = {
+ static const char * const da850_evm_ui_exp[] = {
        [DA850_EVM_UI_EXP_SEL_C]        = "sel_c",
        [DA850_EVM_UI_EXP_SEL_B]        = "sel_b",
        [DA850_EVM_UI_EXP_SEL_A]        = "sel_a",
@@@ -560,7 -565,7 +560,7 @@@ enum da850_evm_bb_exp_pins 
        DA850_EVM_BB_EXP_USER_SW8
  };
  
- static const char const *da850_evm_bb_exp[] = {
+ static const char * const da850_evm_bb_exp[] = {
        [DA850_EVM_BB_EXP_DEEP_SLEEP_EN]        = "deep_sleep_en",
        [DA850_EVM_BB_EXP_SW_RST]               = "sw_rst",
        [DA850_EVM_BB_EXP_TP_23]                = "tp_23",
@@@ -797,7 -802,6 +797,6 @@@ static struct davinci_mmc_config da850_
        .wires          = 4,
        .max_freq       = 50000000,
        .caps           = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
-       .version        = MMC_CTLR_VERSION_2,
  };
  
  static const short da850_evm_mmcsd0_pins[] __initconst = {
@@@ -1367,7 -1371,6 +1366,6 @@@ static struct davinci_mmc_config da850_
        .max_freq       = 25000000,
        .caps           = MMC_CAP_4_BIT_DATA | MMC_CAP_NONREMOVABLE |
                          MMC_CAP_POWER_OFF_CARD,
-       .version        = MMC_CTLR_VERSION_2,
  };
  
  static const short da850_wl12xx_pins[] __initconst = {
@@@ -1574,6 -1577,11 +1572,11 @@@ static __init void da850_evm_init(void
                pr_warn("%s: SATA registration failed: %d\n", __func__, ret);
  
        da850_evm_setup_mac_addr();
+ 
+       ret = da8xx_register_rproc();
+       if (ret)
+               pr_warn("%s: dsp/rproc registration failed: %d\n",
+                       __func__, ret);
  }
  
  #ifdef CONFIG_SERIAL_8250_CONSOLE
@@@ -1601,4 -1609,5 +1604,5 @@@ MACHINE_START(DAVINCI_DA850_EVM, "DaVin
        .init_late      = davinci_init_late,
        .dma_zone_size  = SZ_128M,
        .restart        = da8xx_restart,
+       .reserve        = da8xx_rproc_reserve_cma,
  MACHINE_END

diff --combined arch/arm/mach-davinci/board-dm644x-evm.c
index a042f27,c0206d5..fc8e38e
--- 1/arch/arm/mach-davinci/board-dm644x-evm.c
--- 2/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@@ -570,7 -570,6 +570,6 @@@ static struct davinci_mmc_config dm6446
        .get_cd         = dm6444evm_mmc_get_cd,
        .get_ro         = dm6444evm_mmc_get_ro,
        .wires          = 4,
-       .version        = MMC_CTLR_VERSION_1
  };
  
  static struct i2c_board_info __initdata i2c_info[] =  {
@@@ -750,11 -749,26 +749,11 @@@ static int davinci_phy_fixup(struct phy
        return 0;
  }
  
 -#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \
 -    defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE)
 -#define HAS_ATA 1
 -#else
 -#define HAS_ATA 0
 -#endif
 -
 -#if defined(CONFIG_MTD_PHYSMAP) || \
 -    defined(CONFIG_MTD_PHYSMAP_MODULE)
 -#define HAS_NOR 1
 -#else
 -#define HAS_NOR 0
 -#endif
 -
 -#if defined(CONFIG_MTD_NAND_DAVINCI) || \
 -    defined(CONFIG_MTD_NAND_DAVINCI_MODULE)
 -#define HAS_NAND 1
 -#else
 -#define HAS_NAND 0
 -#endif
 +#define HAS_ATA               IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710)
 +
 +#define HAS_NOR               IS_ENABLED(CONFIG_MTD_PHYSMAP)
 +
 +#define HAS_NAND      IS_ENABLED(CONFIG_MTD_NAND_DAVINCI)
  
  static __init void davinci_evm_init(void)
  {

diff --combined arch/arm/mach-davinci/board-neuros-osd2.c
index ea6728b,b70e83c..2bc112a
--- 1/arch/arm/mach-davinci/board-neuros-osd2.c
--- 2/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@@ -164,12 -164,22 +164,11 @@@ static void __init davinci_ntosd2_map_i
  
  static struct davinci_mmc_config davinci_ntosd2_mmc_config = {
        .wires          = 4,
-       .version        = MMC_CTLR_VERSION_1
  };
  
 +#define HAS_ATA               IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710)
  
 -#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \
 -      defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE)
 -#define HAS_ATA 1
 -#else
 -#define HAS_ATA 0
 -#endif
 -
 -#if defined(CONFIG_MTD_NAND_DAVINCI) || \
 -      defined(CONFIG_MTD_NAND_DAVINCI_MODULE)
 -#define HAS_NAND 1
 -#else
 -#define HAS_NAND 0
 -#endif
 +#define HAS_NAND      IS_ENABLED(CONFIG_MTD_NAND_DAVINCI)
  
  static __init void davinci_ntosd2_init(void)
  {

diff --combined arch/arm/mach-davinci/devices.c
index df135de,f6927df..a7068a3
--- 1/arch/arm/mach-davinci/devices.c
--- 2/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@@ -119,7 -119,7 +119,7 @@@ void __init davinci_init_ide(void
        platform_device_register(&ide_device);
  }
  
 -#if   defined(CONFIG_MMC_DAVINCI) || defined(CONFIG_MMC_DAVINCI_MODULE)
 +#if IS_ENABLED(CONFIG_MMC_DAVINCI)
  
  static u64 mmcsd0_dma_mask = DMA_BIT_MASK(32);
  
@@@ -150,7 -150,7 +150,7 @@@ static struct resource mmcsd0_resources
  };
  
  static struct platform_device davinci_mmcsd0_device = {
-       .name = "davinci_mmc",
+       .name = "dm6441-mmc",
        .id = 0,
        .dev = {
                .dma_mask = &mmcsd0_dma_mask,
@@@ -187,7 -187,7 +187,7 @@@ static struct resource mmcsd1_resources
  };
  
  static struct platform_device davinci_mmcsd1_device = {
-       .name = "davinci_mmc",
+       .name = "dm6441-mmc",
        .id = 1,
        .dev = {
                .dma_mask = &mmcsd1_dma_mask,
@@@ -235,6 -235,7 +235,7 @@@ void __init davinci_setup_mmc(int modul
                        mmcsd1_resources[0].end = DM365_MMCSD1_BASE +
                                                        SZ_4K - 1;
                        mmcsd1_resources[2].start = IRQ_DM365_SDIOINT1;
+                       davinci_mmcsd1_device.name = "da830-mmc";
                } else
                        break;
  
@@@ -256,6 -257,7 +257,7 @@@
                        mmcsd0_resources[0].end = DM365_MMCSD0_BASE +
                                                        SZ_4K - 1;
                        mmcsd0_resources[2].start = IRQ_DM365_SDIOINT0;
+                       davinci_mmcsd0_device.name = "da830-mmc";
                } else if (cpu_is_davinci_dm644x()) {
                        /* REVISIT: should this be in board-init code? */
                        /* Power-on 3.3V IO cells */

diff --combined arch/arm/mach-davinci/usb.c
index 5764d65,2b4c648..b0a6b52
--- 1/arch/arm/mach-davinci/usb.c
--- 2/arch/arm/mach-davinci/usb.c
+++ b/arch/arm/mach-davinci/usb.c
@@@ -10,6 -10,7 +10,7 @@@
  #include <mach/common.h>
  #include <mach/irqs.h>
  #include <mach/cputype.h>
+ #include <mach/da8xx.h>
  #include <linux/platform_data/usb-davinci.h>
  
  #define DAVINCI_USB_OTG_BASE  0x01c64000
@@@ -17,7 -18,7 +18,7 @@@
  #define DA8XX_USB0_BASE       0x01e00000
  #define DA8XX_USB1_BASE       0x01e25000
  
 -#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
 +#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
  static struct musb_hdrc_eps_bits musb_eps[] = {
        { "ep1_tx", 8, },
        { "ep1_rx", 8, },