Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci

* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (69 commits)
  davinci: Initial support for Neuros OSD2 platform.
  davinci: remove unused variable in arch/arm/mach-davinci/board-sffsdr.c
  davinci: fix section mismatch warning in arch/arm/mach-davinci/board-dm646x-evm.c
  DaVinci: DM365: Enable DaVinci RTC support for DM365 EVM
  DA8xx/OMAP-L1xx: Add high speed SD/MMC capabilities
  davinci: DA8XX/OMAP-L1XX: enable cpuidle and regulator in defconfig
  davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator
  davinci: DA850/OMAP-L138 EVM: register for cpuidle support
  davinci: DA8XX/OMAP-L1XX: add support for cpuidle driver register
  davinci: add CPU idle driver
  davinci: DA8XX/OMAP-L1XX: fix compiler warning
  davinci: DA850/OMAP-L138: eliminate static function declaration
  davinci: DA850/OMAP-L138 EVM: simplify configuration of emac in MII/RMII mode
  davinci: DA850/OMAP-L138 EVM: get rid of DA850_UI_EXP config option
  davinci: DA850/OMAP-L138 EVM: implement autodetect of RMII PHY
  davinci: DA830/OMAP-L137 EVM: do not configure NAND on UI card when MMC/SD is selected
  davinci: DA830/OMAP-L137 EVM: use runtime detection for UI card
  davinci: DA830/OMAP-L137 EVM: remove ifdefs inside da830_evm_init()
  davinci: DA830/OMAP-L137 EVM: fix warning with default config
  davinci: Add NAND support for DA830/OMAP-L137 EVM platform
  ...

1 files changed, 374 insertions, 63 deletions

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index c759d72494e..62b98bffc15 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -12,36 +12,38 @@
  * or implied.
  */
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/console.h>
 #include <linux/i2c.h>
 #include <linux/i2c/at24.h>
+#include <linux/i2c/pca953x.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
+#include <linux/regulator/machine.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/common.h>
-#include <mach/irqs.h>
 #include <mach/cp_intc.h>
 #include <mach/da8xx.h>
 #include <mach/nand.h>
+#include <mach/mux.h>
 
 #define DA850_EVM_PHY_MASK              0x1
 #define DA850_EVM_MDIO_FREQUENCY        2200000 /* PHY bus frequency */
 
+#define DA850_LCD_PWR_PIN               GPIO_TO_PIN(2, 8)
 #define DA850_LCD_BL_PIN                GPIO_TO_PIN(2, 15)
-#define DA850_LCD_PWR_PIN               GPIO_TO_PIN(8, 10)
 
 #define DA850_MMCSD_CD_PIN              GPIO_TO_PIN(4, 0)
 #define DA850_MMCSD_WP_PIN              GPIO_TO_PIN(4, 1)
 
+#define DA850_MII_MDIO_CLKEN_PIN        GPIO_TO_PIN(2, 6)
+
 static struct mtd_partition da850_evm_norflash_partition[] = {
         {
                 .name           = "NOR filesystem",
@@ -143,10 +145,149 @@ static struct platform_device da850_evm_nandflash_device = {
         .resource       = da850_evm_nandflash_resource,
 };
 
+static struct platform_device *da850_evm_devices[] __initdata = {
+        &da850_evm_nandflash_device,
+        &da850_evm_norflash_device,
+};
+
+#define DA8XX_AEMIF_CE2CFG_OFFSET       0x10
+#define DA8XX_AEMIF_ASIZE_16BIT         0x1
+
+static void __init da850_evm_init_nor(void)
+{
+        void __iomem *aemif_addr;
+
+        aemif_addr = ioremap(DA8XX_AEMIF_CTL_BASE, SZ_32K);
+
+        /* Configure data bus width of CS2 to 16 bit */
+        writel(readl(aemif_addr + DA8XX_AEMIF_CE2CFG_OFFSET) |
+                DA8XX_AEMIF_ASIZE_16BIT,
+                aemif_addr + DA8XX_AEMIF_CE2CFG_OFFSET);
+
+        iounmap(aemif_addr);
+}
+
+static u32 ui_card_detected;
+
+#if defined(CONFIG_MMC_DAVINCI) || \
+    defined(CONFIG_MMC_DAVINCI_MODULE)
+#define HAS_MMC 1
+#else
+#define HAS_MMC 0
+#endif
+
+static __init void da850_evm_setup_nor_nand(void)
+{
+        int ret = 0;
+
+        if (ui_card_detected & !HAS_MMC) {
+                ret = da8xx_pinmux_setup(da850_nand_pins);
+                if (ret)
+                        pr_warning("da850_evm_init: nand mux setup failed: "
+                                        "%d\n", ret);
+
+                ret = da8xx_pinmux_setup(da850_nor_pins);
+                if (ret)
+                        pr_warning("da850_evm_init: nor mux setup failed: %d\n",
+                                ret);
+
+                da850_evm_init_nor();
+
+                platform_add_devices(da850_evm_devices,
+                                        ARRAY_SIZE(da850_evm_devices));
+        }
+}
+
+#ifdef CONFIG_DA850_UI_RMII
+static inline void da850_evm_setup_emac_rmii(int rmii_sel)
+{
+        struct davinci_soc_info *soc_info = &davinci_soc_info;
+
+        soc_info->emac_pdata->rmii_en = 1;
+        gpio_set_value(rmii_sel, 0);
+}
+#else
+static inline void da850_evm_setup_emac_rmii(int rmii_sel) { }
+#endif
+
+static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio,
+                                                unsigned ngpio, void *c)
+{
+        int sel_a, sel_b, sel_c, ret;
+
+        sel_a = gpio + 7;
+        sel_b = gpio + 6;
+        sel_c = gpio + 5;
+
+        ret = gpio_request(sel_a, "sel_a");
+        if (ret) {
+                pr_warning("Cannot open UI expander pin %d\n", sel_a);
+                goto exp_setup_sela_fail;
+        }
+
+        ret = gpio_request(sel_b, "sel_b");
+        if (ret) {
+                pr_warning("Cannot open UI expander pin %d\n", sel_b);
+                goto exp_setup_selb_fail;
+        }
+
+        ret = gpio_request(sel_c, "sel_c");
+        if (ret) {
+                pr_warning("Cannot open UI expander pin %d\n", sel_c);
+                goto exp_setup_selc_fail;
+        }
+
+        /* deselect all functionalities */
+        gpio_direction_output(sel_a, 1);
+        gpio_direction_output(sel_b, 1);
+        gpio_direction_output(sel_c, 1);
+
+        ui_card_detected = 1;
+        pr_info("DA850/OMAP-L138 EVM UI card detected\n");
+
+        da850_evm_setup_nor_nand();
+
+        da850_evm_setup_emac_rmii(sel_a);
+
+        return 0;
+
+exp_setup_selc_fail:
+        gpio_free(sel_b);
+exp_setup_selb_fail:
+        gpio_free(sel_a);
+exp_setup_sela_fail:
+        return ret;
+}
+
+static int da850_evm_ui_expander_teardown(struct i2c_client *client,
+                                        unsigned gpio, unsigned ngpio, void *c)
+{
+        /* deselect all functionalities */
+        gpio_set_value(gpio + 5, 1);
+        gpio_set_value(gpio + 6, 1);
+        gpio_set_value(gpio + 7, 1);
+
+        gpio_free(gpio + 5);
+        gpio_free(gpio + 6);
+        gpio_free(gpio + 7);
+
+        return 0;
+}
+
+static struct pca953x_platform_data da850_evm_ui_expander_info = {
+        .gpio_base      = DAVINCI_N_GPIO,
+        .setup          = da850_evm_ui_expander_setup,
+        .teardown       = da850_evm_ui_expander_teardown,
+};
+
 static struct i2c_board_info __initdata da850_evm_i2c_devices[] = {
         {
                 I2C_BOARD_INFO("tlv320aic3x", 0x18),
-        }
+        },
+        {
+                I2C_BOARD_INFO("tca6416", 0x20),
+                .platform_data = &da850_evm_ui_expander_info,
+        },
 };
 
 static struct davinci_i2c_platform_data da850_evm_i2c_0_pdata = {
@@ -158,11 +299,6 @@ static struct davinci_uart_config da850_evm_uart_config __initdata = {
         .enabled_uarts = 0x7,
 };
 
-static struct platform_device *da850_evm_devices[] __initdata = {
-        &da850_evm_nandflash_device,
-        &da850_evm_norflash_device,
-};
-
 /* davinci da850 evm audio machine driver */
 static u8 da850_iis_serializer_direction[] = {
         INACTIVE_MODE,  INACTIVE_MODE,  INACTIVE_MODE,  INACTIVE_MODE,
@@ -198,6 +334,8 @@ static struct davinci_mmc_config da850_mmc_config = {
         .get_ro         = da850_evm_mmc_get_ro,
         .get_cd         = da850_evm_mmc_get_cd,
         .wires          = 4,
+        .max_freq       = 50000000,
+        .caps           = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
         .version        = MMC_CTLR_VERSION_2,
 };
 
@@ -233,56 +371,227 @@ static int da850_lcd_hw_init(void)
         return 0;
 }
 
-#define DA8XX_AEMIF_CE2CFG_OFFSET       0x10
-#define DA8XX_AEMIF_ASIZE_16BIT         0x1
+/* TPS65070 voltage regulator support */
 
-static void __init da850_evm_init_nor(void)
-{
-        void __iomem *aemif_addr;
+/* 3.3V */
+struct regulator_consumer_supply tps65070_dcdc1_consumers[] = {
+        {
+                .supply = "usb0_vdda33",
+        },
+        {
+                .supply = "usb1_vdda33",
+        },
+};
 
-        aemif_addr = ioremap(DA8XX_AEMIF_CTL_BASE, SZ_32K);
+/* 3.3V or 1.8V */
+struct regulator_consumer_supply tps65070_dcdc2_consumers[] = {
+        {
+                .supply = "dvdd3318_a",
+        },
+        {
+                .supply = "dvdd3318_b",
+        },
+        {
+                .supply = "dvdd3318_c",
+        },
+};
 
-        /* Configure data bus width of CS2 to 16 bit */
-        writel(readl(aemif_addr + DA8XX_AEMIF_CE2CFG_OFFSET) |
-                DA8XX_AEMIF_ASIZE_16BIT,
-                aemif_addr + DA8XX_AEMIF_CE2CFG_OFFSET);
+/* 1.2V */
+struct regulator_consumer_supply tps65070_dcdc3_consumers[] = {
+        {
+                .supply = "cvdd",
+        },
+};
 
-        iounmap(aemif_addr);
-}
+/* 1.8V LDO */
+struct regulator_consumer_supply tps65070_ldo1_consumers[] = {
+        {
+                .supply = "sata_vddr",
+        },
+        {
+                .supply = "usb0_vdda18",
+        },
+        {
+                .supply = "usb1_vdda18",
+        },
+        {
+                .supply = "ddr_dvdd18",
+        },
+};
 
-#if defined(CONFIG_MTD_PHYSMAP) || \
-    defined(CONFIG_MTD_PHYSMAP_MODULE)
-#define HAS_NOR 1
-#else
-#define HAS_NOR 0
-#endif
+/* 1.2V LDO */
+struct regulator_consumer_supply tps65070_ldo2_consumers[] = {
+        {
+                .supply = "sata_vdd",
+        },
+        {
+                .supply = "pll0_vdda",
+        },
+        {
+                .supply = "pll1_vdda",
+        },
+        {
+                .supply = "usbs_cvdd",
+        },
+        {
+                .supply = "vddarnwa1",
+        },
+};
 
-#if defined(CONFIG_MMC_DAVINCI) || \
-    defined(CONFIG_MMC_DAVINCI_MODULE)
-#define HAS_MMC 1
-#else
-#define HAS_MMC 0
-#endif
+struct regulator_init_data tps65070_regulator_data[] = {
+        /* dcdc1 */
+        {
+                .constraints = {
+                        .min_uV = 3150000,
+                        .max_uV = 3450000,
+                        .valid_ops_mask = (REGULATOR_CHANGE_VOLTAGE |
+                                REGULATOR_CHANGE_STATUS),
+                        .boot_on = 1,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(tps65070_dcdc1_consumers),
+                .consumer_supplies = tps65070_dcdc1_consumers,
+        },
 
-static __init void da850_evm_init(void)
+        /* dcdc2 */
+        {
+                .constraints = {
+                        .min_uV = 1710000,
+                        .max_uV = 3450000,
+                        .valid_ops_mask = (REGULATOR_CHANGE_VOLTAGE |
+                                REGULATOR_CHANGE_STATUS),
+                        .boot_on = 1,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(tps65070_dcdc2_consumers),
+                .consumer_supplies = tps65070_dcdc2_consumers,
+        },
+
+        /* dcdc3 */
+        {
+                .constraints = {
+                        .min_uV = 950000,
+                        .max_uV = 1320000,
+                        .valid_ops_mask = (REGULATOR_CHANGE_VOLTAGE |
+                                REGULATOR_CHANGE_STATUS),
+                        .boot_on = 1,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(tps65070_dcdc3_consumers),
+                .consumer_supplies = tps65070_dcdc3_consumers,
+        },
+
+        /* ldo1 */
+        {
+                .constraints = {
+                        .min_uV = 1710000,
+                        .max_uV = 1890000,
+                        .valid_ops_mask = (REGULATOR_CHANGE_VOLTAGE |
+                                REGULATOR_CHANGE_STATUS),
+                        .boot_on = 1,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(tps65070_ldo1_consumers),
+                .consumer_supplies = tps65070_ldo1_consumers,
+        },
+
+        /* ldo2 */
+        {
+                .constraints = {
+                        .min_uV = 1140000,
+                        .max_uV = 1320000,
+                        .valid_ops_mask = (REGULATOR_CHANGE_VOLTAGE |
+                                REGULATOR_CHANGE_STATUS),
+                        .boot_on = 1,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(tps65070_ldo2_consumers),
+                .consumer_supplies = tps65070_ldo2_consumers,
+        },
+};
+
+static struct i2c_board_info __initdata da850evm_tps65070_info[] = {
+        {
+                I2C_BOARD_INFO("tps6507x", 0x48),
+                .platform_data = &tps65070_regulator_data[0],
+        },
+};
+
+static int __init pmic_tps65070_init(void)
 {
-        struct davinci_soc_info *soc_info = &davinci_soc_info;
+        return i2c_register_board_info(1, da850evm_tps65070_info,
+                                        ARRAY_SIZE(da850evm_tps65070_info));
+}
+
+static const short da850_evm_lcdc_pins[] = {
+        DA850_GPIO2_8, DA850_GPIO2_15,
+        -1
+};
+
+static int __init da850_evm_config_emac(void)
+{
+        void __iomem *cfg_chip3_base;
         int ret;
+        u32 val;
+        struct davinci_soc_info *soc_info = &davinci_soc_info;
+        u8 rmii_en = soc_info->emac_pdata->rmii_en;
+
+        if (!machine_is_davinci_da850_evm())
+                return 0;
+
+        cfg_chip3_base = DA8XX_SYSCFG_VIRT(DA8XX_CFGCHIP3_REG);
+
+        val = __raw_readl(cfg_chip3_base);
+
+        if (rmii_en) {
+                val |= BIT(8);
+                ret = da8xx_pinmux_setup(da850_rmii_pins);
+                pr_info("EMAC: RMII PHY configured, MII PHY will not be"
+                                                        " functional\n");
+        } else {
+                val &= ~BIT(8);
+                ret = da8xx_pinmux_setup(da850_cpgmac_pins);
+                pr_info("EMAC: MII PHY configured, RMII PHY will not be"
+                                                        " functional\n");
+        }
 
-        ret = da8xx_pinmux_setup(da850_nand_pins);
         if (ret)
-                pr_warning("da850_evm_init: nand mux setup failed: %d\n",
+                pr_warning("da850_evm_init: cpgmac/rmii mux setup failed: %d\n",
                                 ret);
 
-        ret = da8xx_pinmux_setup(da850_nor_pins);
+        /* configure the CFGCHIP3 register for RMII or MII */
+        __raw_writel(val, cfg_chip3_base);
+
+        ret = davinci_cfg_reg(DA850_GPIO2_6);
         if (ret)
-                pr_warning("da850_evm_init: nor mux setup failed: %d\n",
+                pr_warning("da850_evm_init:GPIO(2,6) mux setup "
+                                                        "failed\n");
+
+        ret = gpio_request(DA850_MII_MDIO_CLKEN_PIN, "mdio_clk_en");
+        if (ret) {
+                pr_warning("Cannot open GPIO %d\n",
+                                        DA850_MII_MDIO_CLKEN_PIN);
+                return ret;
+        }
+
+        /* Enable/Disable MII MDIO clock */
+        gpio_direction_output(DA850_MII_MDIO_CLKEN_PIN, rmii_en);
+
+        soc_info->emac_pdata->phy_mask = DA850_EVM_PHY_MASK;
+        soc_info->emac_pdata->mdio_max_freq = DA850_EVM_MDIO_FREQUENCY;
+
+        ret = da8xx_register_emac();
+        if (ret)
+                pr_warning("da850_evm_init: emac registration failed: %d\n",
                                 ret);
 
-        da850_evm_init_nor();
+        return 0;
+}
+device_initcall(da850_evm_config_emac);
+
+static __init void da850_evm_init(void)
+{
+        int ret;
 
-        platform_add_devices(da850_evm_devices,
-                                ARRAY_SIZE(da850_evm_devices));
+        ret = pmic_tps65070_init();
+        if (ret)
+                pr_warning("da850_evm_init: TPS65070 PMIC init failed: %d\n",
+                                ret);
 
         ret = da8xx_register_edma();
         if (ret)
@@ -299,19 +608,6 @@ static __init void da850_evm_init(void)
                 pr_warning("da850_evm_init: i2c0 registration failed: %d\n",
                                 ret);
 
-        soc_info->emac_pdata->phy_mask = DA850_EVM_PHY_MASK;
-        soc_info->emac_pdata->mdio_max_freq = DA850_EVM_MDIO_FREQUENCY;
-        soc_info->emac_pdata->rmii_en = 0;
-
-        ret = da8xx_pinmux_setup(da850_cpgmac_pins);
-        if (ret)
-                pr_warning("da850_evm_init: cpgmac mux setup failed: %d\n",
-                                ret);
-
-        ret = da8xx_register_emac();
-        if (ret)
-                pr_warning("da850_evm_init: emac registration failed: %d\n",
-                                ret);
 
         ret = da8xx_register_watchdog();
         if (ret)
@@ -319,11 +615,6 @@ static __init void da850_evm_init(void)
                                 ret);
 
         if (HAS_MMC) {
-                if (HAS_NOR)
-                        pr_warning("WARNING: both NOR Flash and MMC/SD are "
-                                "enabled, but they share AEMIF pins.\n"
-                                "\tDisable one of them.\n");
-
                 ret = da8xx_pinmux_setup(da850_mmcsd0_pins);
                 if (ret)
                         pr_warning("da850_evm_init: mmcsd0 mux setup failed:"
@@ -365,22 +656,42 @@ static __init void da850_evm_init(void)
                 pr_warning("da850_evm_init: mcasp mux setup failed: %d\n",
                                 ret);
 
-        da8xx_init_mcasp(0, &da850_evm_snd_data);
+        da8xx_register_mcasp(0, &da850_evm_snd_data);
 
         ret = da8xx_pinmux_setup(da850_lcdcntl_pins);
         if (ret)
                 pr_warning("da850_evm_init: lcdcntl mux setup failed: %d\n",
                                 ret);
 
+        /* Handle board specific muxing for LCD here */
+        ret = da8xx_pinmux_setup(da850_evm_lcdc_pins);
+        if (ret)
+                pr_warning("da850_evm_init: evm specific lcd mux setup "
+                                "failed: %d\n", ret);
+
         ret = da850_lcd_hw_init();
         if (ret)
                 pr_warning("da850_evm_init: lcd initialization failed: %d\n",
                                 ret);
 
-        ret = da8xx_register_lcdc();
+        ret = da8xx_register_lcdc(&sharp_lk043t1dg01_pdata);
         if (ret)
                 pr_warning("da850_evm_init: lcdc registration failed: %d\n",
                                 ret);
+
+        ret = da8xx_register_rtc();
+        if (ret)
+                pr_warning("da850_evm_init: rtc setup failed: %d\n", ret);
+
+        ret = da850_register_cpufreq();
+        if (ret)
+                pr_warning("da850_evm_init: cpufreq registration failed: %d\n",
+                                ret);
+
+        ret = da8xx_register_cpuidle();
+        if (ret)
+                pr_warning("da850_evm_init: cpuidle registration failed: %d\n",
+                                ret);
 }
 
 #ifdef CONFIG_SERIAL_8250_CONSOLE