Merge tag 'davinci-for-v3.9/board' of git://gitorious.org/linux-davinci/linux-davinci into next/boards

From Sekhar Nori:
DaVinci board updates for v3.9

This pull request has defconfig changes which enable
newer filesystems to boot on DaVinci and also enable
runtime pm by default.

Another patch is included to cleanup a checkpatch error
in existing board files.

* tag 'davinci-for-v3.9/board' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: da850 board: change pr_warning() to pr_warn()
  ARM: davinci: defconfig: enable pm_runtime
  ARM: davinci: defconfig: enable devtmpfs and devtmpfs automount

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 54 insertions, 78 deletions

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 0299915575a8..fae66e37f6e6 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -349,13 +349,13 @@ static inline void da850_evm_setup_nor_nand(void)
         if (!HAS_MMC) {
                 ret = davinci_cfg_reg_list(da850_evm_nand_pins);
                 if (ret)
-                        pr_warning("da850_evm_init: nand mux setup failed: "
-                                        "%d\n", ret);
+                        pr_warn("%s: NAND mux setup failed: %d\n",
+                                __func__, ret);
 
                 ret = davinci_cfg_reg_list(da850_evm_nor_pins);
                 if (ret)
-                        pr_warning("da850_evm_init: nor mux setup failed: %d\n",
-                                ret);
+                        pr_warn("%s: NOR mux setup failed: %d\n",
+                                __func__, ret);
 
                 da850_evm_init_nor();
 
@@ -477,19 +477,19 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio,
 
         ret = gpio_request(sel_a, da850_evm_ui_exp[DA850_EVM_UI_EXP_SEL_A]);
         if (ret) {
-                pr_warning("Cannot open UI expander pin %d\n", sel_a);
+                pr_warn("Cannot open UI expander pin %d\n", sel_a);
                 goto exp_setup_sela_fail;
         }
 
         ret = gpio_request(sel_b, da850_evm_ui_exp[DA850_EVM_UI_EXP_SEL_B]);
         if (ret) {
-                pr_warning("Cannot open UI expander pin %d\n", sel_b);
+                pr_warn("Cannot open UI expander pin %d\n", sel_b);
                 goto exp_setup_selb_fail;
         }
 
         ret = gpio_request(sel_c, da850_evm_ui_exp[DA850_EVM_UI_EXP_SEL_C]);
         if (ret) {
-                pr_warning("Cannot open UI expander pin %d\n", sel_c);
+                pr_warn("Cannot open UI expander pin %d\n", sel_c);
                 goto exp_setup_selc_fail;
         }
 
@@ -501,7 +501,7 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio,
         da850_evm_ui_keys_init(gpio);
         ret = platform_device_register(&da850_evm_ui_keys_device);
         if (ret) {
-                pr_warning("Could not register UI GPIO expander push-buttons");
+                pr_warn("Could not register UI GPIO expander push-buttons");
                 goto exp_setup_keys_fail;
         }
 
@@ -690,14 +690,14 @@ static int da850_evm_bb_expander_setup(struct i2c_client *client,
         da850_evm_bb_keys_init(gpio);
         ret = platform_device_register(&da850_evm_bb_keys_device);
         if (ret) {
-                pr_warning("Could not register baseboard GPIO expander keys");
+                pr_warn("Could not register baseboard GPIO expander keys");
                 goto io_exp_setup_sw_fail;
         }
 
         da850_evm_bb_leds_init(gpio);
         ret = platform_device_register(&da850_evm_bb_leds_device);
         if (ret) {
-                pr_warning("Could not register baseboard GPIO expander LEDS");
+                pr_warn("Could not register baseboard GPIO expander LEDs");
                 goto io_exp_setup_leds_fail;
         }
 
@@ -1065,21 +1065,19 @@ static int __init da850_evm_config_emac(void)
         }
 
         if (ret)
-                pr_warning("da850_evm_init: cpgmac/rmii mux setup failed: %d\n",
-                                ret);
+                pr_warn("%s: CPGMAC/RMII mux setup failed: %d\n",
+                        __func__, ret);
 
         /* 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:GPIO(2,6) mux setup "
-                                                        "failed\n");
+                pr_warn("%s:GPIO(2,6) mux setup failed\n", __func__);
 
         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);
+                pr_warn("Cannot open GPIO %d\n", DA850_MII_MDIO_CLKEN_PIN);
                 return ret;
         }
 
@@ -1090,8 +1088,7 @@ static int __init da850_evm_config_emac(void)
 
         ret = da8xx_register_emac();
         if (ret)
-                pr_warning("da850_evm_init: emac registration failed: %d\n",
-                                ret);
+                pr_warn("%s: EMAC registration failed: %d\n", __func__, ret);
 
         return 0;
 }
@@ -1443,57 +1440,53 @@ static __init void da850_evm_init(void)
 
         ret = pmic_tps65070_init();
         if (ret)
-                pr_warning("da850_evm_init: TPS65070 PMIC init failed: %d\n",
-                                ret);
+                pr_warn("%s: TPS65070 PMIC init failed: %d\n", __func__, ret);
 
         ret = da850_register_edma(da850_edma_rsv);
         if (ret)
-                pr_warning("da850_evm_init: edma registration failed: %d\n",
-                                ret);
+                pr_warn("%s: EDMA registration failed: %d\n", __func__, ret);
 
         ret = davinci_cfg_reg_list(da850_i2c0_pins);
         if (ret)
-                pr_warning("da850_evm_init: i2c0 mux setup failed: %d\n",
-                                ret);
+                pr_warn("%s: I2C0 mux setup failed: %d\n", __func__, ret);
 
         ret = da8xx_register_i2c(0, &da850_evm_i2c_0_pdata);
         if (ret)
-                pr_warning("da850_evm_init: i2c0 registration failed: %d\n",
-                                ret);
+                pr_warn("%s: I2C0 registration failed: %d\n", __func__, ret);
 
 
         ret = da8xx_register_watchdog();
         if (ret)
-                pr_warning("da830_evm_init: watchdog registration failed: %d\n",
-                                ret);
+                pr_warn("%s: watchdog registration failed: %d\n",
+                        __func__, ret);
 
         if (HAS_MMC) {
                 ret = davinci_cfg_reg_list(da850_evm_mmcsd0_pins);
                 if (ret)
-                        pr_warning("da850_evm_init: mmcsd0 mux setup failed:"
-                                        " %d\n", ret);
+                        pr_warn("%s: MMCSD0 mux setup failed: %d\n",
+                                __func__, ret);
 
                 ret = gpio_request(DA850_MMCSD_CD_PIN, "MMC CD\n");
                 if (ret)
-                        pr_warning("da850_evm_init: can not open GPIO %d\n",
-                                        DA850_MMCSD_CD_PIN);
+                        pr_warn("%s: can not open GPIO %d\n",
+                                __func__, DA850_MMCSD_CD_PIN);
                 gpio_direction_input(DA850_MMCSD_CD_PIN);
 
                 ret = gpio_request(DA850_MMCSD_WP_PIN, "MMC WP\n");
                 if (ret)
-                        pr_warning("da850_evm_init: can not open GPIO %d\n",
-                                        DA850_MMCSD_WP_PIN);
+                        pr_warn("%s: can not open GPIO %d\n",
+                                __func__, DA850_MMCSD_WP_PIN);
                 gpio_direction_input(DA850_MMCSD_WP_PIN);
 
                 ret = da8xx_register_mmcsd0(&da850_mmc_config);
                 if (ret)
-                        pr_warning("da850_evm_init: mmcsd0 registration failed:"
-                                        " %d\n", ret);
+                        pr_warn("%s: MMCSD0 registration failed: %d\n",
+                                __func__, ret);
 
                 ret = da850_wl12xx_init();
                 if (ret)
-                        pr_warning("da850_evm_init: wl12xx initialization"
-                                   " failed: %d\n", ret);
+                        pr_warn("%s: WL12xx initialization failed: %d\n",
+                                __func__, ret);
         }
 
         davinci_serial_init(&da850_evm_uart_config);
@@ -1511,16 +1504,14 @@ static __init void da850_evm_init(void)
 
         ret = davinci_cfg_reg_list(da850_evm_mcasp_pins);
         if (ret)
-                pr_warning("da850_evm_init: mcasp mux setup failed: %d\n",
-                                ret);
+                pr_warn("%s: McASP mux setup failed: %d\n", __func__, ret);
 
         da850_evm_snd_data.sram_pool = sram_get_gen_pool();
         da8xx_register_mcasp(0, &da850_evm_snd_data);
 
         ret = davinci_cfg_reg_list(da850_lcdcntl_pins);
         if (ret)
-                pr_warning("da850_evm_init: lcdcntl mux setup failed: %d\n",
-                                ret);
+                pr_warn("%s: LCDC mux setup failed: %d\n", __func__, ret);
 
         ret = da8xx_register_uio_pruss();
         if (ret)
@@ -1530,51 +1521,44 @@ static __init void da850_evm_init(void)
         /* Handle board specific muxing for LCD here */
         ret = davinci_cfg_reg_list(da850_evm_lcdc_pins);
         if (ret)
-                pr_warning("da850_evm_init: evm specific lcd mux setup "
-                                "failed: %d\n", ret);
+                pr_warn("%s: EVM specific LCD mux setup failed: %d\n",
+                        __func__, ret);
 
         ret = da850_lcd_hw_init();
         if (ret)
-                pr_warning("da850_evm_init: lcd initialization failed: %d\n",
-                                ret);
+                pr_warn("%s: LCD initialization failed: %d\n", __func__, ret);
 
         sharp_lk043t1dg01_pdata.panel_power_ctrl = da850_panel_power_ctrl,
         ret = da8xx_register_lcdc(&sharp_lk043t1dg01_pdata);
         if (ret)
-                pr_warning("da850_evm_init: lcdc registration failed: %d\n",
-                                ret);
+                pr_warn("%s: LCDC registration failed: %d\n", __func__, ret);
 
         ret = da8xx_register_rtc();
         if (ret)
-                pr_warning("da850_evm_init: rtc setup failed: %d\n", ret);
+                pr_warn("%s: RTC setup failed: %d\n", __func__, ret);
 
         ret = da850_evm_init_cpufreq();
         if (ret)
-                pr_warning("da850_evm_init: cpufreq registration failed: %d\n",
-                                ret);
+                pr_warn("%s: cpufreq registration failed: %d\n", __func__, ret);
 
         ret = da8xx_register_cpuidle();
         if (ret)
-                pr_warning("da850_evm_init: cpuidle registration failed: %d\n",
-                                ret);
+                pr_warn("%s: cpuidle registration failed: %d\n", __func__, ret);
 
         ret = da850_register_pm(&da850_pm_device);
         if (ret)
-                pr_warning("da850_evm_init: suspend registration failed: %d\n",
-                                ret);
+                pr_warn("%s: suspend registration failed: %d\n", __func__, ret);
 
         da850_vpif_init();
 
         ret = da8xx_register_spi(1, da850evm_spi_info,
                                  ARRAY_SIZE(da850evm_spi_info));
         if (ret)
-                pr_warning("da850_evm_init: spi 1 registration failed: %d\n",
-                                ret);
+                pr_warn("%s: SPI 1 registration failed: %d\n", __func__, ret);
 
         ret = da850_register_sata(DA850EVM_SATA_REFCLKPN_RATE);
         if (ret)
-                pr_warning("da850_evm_init: sata registration failed: %d\n",
-                                ret);
+                pr_warn("%s: SATA registration failed: %d\n", __func__, ret);
 
         da850_evm_setup_mac_addr();
 }
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index dc1208e9e664..d5a6bcd38903 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -48,8 +48,7 @@ static __init void omapl138_hawk_config_emac(void)
         val &= ~BIT(8);
         ret = davinci_cfg_reg_list(omapl138_hawk_mii_pins);
         if (ret) {
-                pr_warning("%s: cpgmac/mii mux setup failed: %d\n",
-                        __func__, ret);
+                pr_warn("%s: CPGMAC/MII mux setup failed: %d\n", __func__, ret);
                 return;
         }
 
@@ -61,8 +60,7 @@ static __init void omapl138_hawk_config_emac(void)
 
         ret = da8xx_register_emac();
         if (ret)
-                pr_warning("%s: emac registration failed: %d\n",
-                        __func__, ret);
+                pr_warn("%s: EMAC registration failed: %d\n", __func__, ret);
 }
 
 /*
@@ -147,15 +145,14 @@ static __init void omapl138_hawk_mmc_init(void)
 
         ret = davinci_cfg_reg_list(hawk_mmcsd0_pins);
         if (ret) {
-                pr_warning("%s: MMC/SD0 mux setup failed: %d\n",
-                        __func__, ret);
+                pr_warn("%s: MMC/SD0 mux setup failed: %d\n", __func__, ret);
                 return;
         }
 
         ret = gpio_request_one(DA850_HAWK_MMCSD_CD_PIN,
                         GPIOF_DIR_IN, "MMC CD");
         if (ret < 0) {
-                pr_warning("%s: can not open GPIO %d\n",
+                pr_warn("%s: can not open GPIO %d\n",
                         __func__, DA850_HAWK_MMCSD_CD_PIN);
                 return;
         }
@@ -163,15 +160,14 @@ static __init void omapl138_hawk_mmc_init(void)
         ret = gpio_request_one(DA850_HAWK_MMCSD_WP_PIN,
                         GPIOF_DIR_IN, "MMC WP");
         if (ret < 0) {
-                pr_warning("%s: can not open GPIO %d\n",
+                pr_warn("%s: can not open GPIO %d\n",
                         __func__, DA850_HAWK_MMCSD_WP_PIN);
                 goto mmc_setup_wp_fail;
         }
 
         ret = da8xx_register_mmcsd0(&da850_mmc_config);
         if (ret) {
-                pr_warning("%s: MMC/SD0 registration failed: %d\n",
-                        __func__, ret);
+                pr_warn("%s: MMC/SD0 registration failed: %d\n", __func__, ret);
                 goto mmc_setup_mmcsd_fail;
         }
 
@@ -250,8 +246,7 @@ static __init void omapl138_hawk_usb_init(void)
 
         ret = davinci_cfg_reg_list(da850_hawk_usb11_pins);
         if (ret) {
-                pr_warning("%s: USB 1.1 PinMux setup failed: %d\n",
-                        __func__, ret);
+                pr_warn("%s: USB 1.1 PinMux setup failed: %d\n", __func__, ret);
                 return;
         }
 
@@ -280,8 +275,7 @@ static __init void omapl138_hawk_usb_init(void)
 
         ret = da8xx_register_usb11(&omapl138_hawk_usb11_pdata);
         if (ret) {
-                pr_warning("%s: USB 1.1 registration failed: %d\n",
-                        __func__, ret);
+                pr_warn("%s: USB 1.1 registration failed: %d\n", __func__, ret);
                 goto usb11_setup_fail;
         }
 
@@ -307,8 +301,7 @@ static __init void omapl138_hawk_init(void)
 
         ret = da850_register_edma(da850_edma_rsv);
         if (ret)
-                pr_warning("%s: EDMA registration failed: %d\n",
-                        __func__, ret);
+                pr_warn("%s: EDMA registration failed: %d\n", __func__, ret);
 
         omapl138_hawk_mmc_init();
 
@@ -316,9 +309,8 @@ static __init void omapl138_hawk_init(void)
 
         ret = da8xx_register_watchdog();
         if (ret)
-                pr_warning("omapl138_hawk_init: "
-                        "watchdog registration failed: %d\n",
-                        ret);
+                pr_warn("%s: watchdog registration failed: %d\n",
+                        __func__, ret);
 }
 
 #ifdef CONFIG_SERIAL_8250_CONSOLE