ARM: tegra12: set CPU rate to 2.2GHz for sku 0x87
[linux-3.10.git] / arch / arm / mach-tegra / board-loki-panel.c
index 8e868c7..026d8b9 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/board-loki-panel.c
  *
- * Copyright (c) 2011-2013, NVIDIA Corporation. All rights reserved.
+ * Copyright (c) 2011-2014, NVIDIA Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -210,7 +210,7 @@ static int loki_hdmi_hotplug_init(struct device *dev)
                                        __func__, PTR_ERR(loki_hdmi_vddio));
                        loki_hdmi_vddio = NULL;
                } else
-                       regulator_enable(loki_hdmi_vddio);
+                       return regulator_enable(loki_hdmi_vddio);
        }
        return 0;
 }
@@ -288,7 +288,6 @@ static struct tegra_dc_out loki_disp2_out = {
 static struct tegra_fb_data loki_disp1_fb_data = {
        .win            = 0,
        .bits_per_pixel = 32,
-       .flags          = TEGRA_FB_FLIP_ON_PROBE,
 };
 
 static struct tegra_dc_platform_data loki_disp1_pdata = {
@@ -306,7 +305,6 @@ static struct tegra_fb_data loki_disp2_fb_data = {
        .xres           = 1024,
        .yres           = 600,
        .bits_per_pixel = 32,
-       .flags          = TEGRA_FB_FLIP_ON_PROBE,
 };
 
 static struct tegra_dc_platform_data loki_disp2_pdata = {
@@ -416,10 +414,12 @@ static void loki_panel_select(void)
        case 0x0:
        default:
                panel = &dsi_l_720p_5_loki;
-               tegra_io_dpd_enable(&dsic_io);
-               tegra_io_dpd_enable(&dsid_io);
                break;
        }
+
+       tegra_io_dpd_enable(&dsic_io);
+       tegra_io_dpd_enable(&dsid_io);
+
        if (panel) {
                if (panel->init_sd_settings)
                        panel->init_sd_settings(&sd_settings);
@@ -510,6 +510,14 @@ int __init loki_panel_init(int board_id)
                tegra_fb_start, tegra_bootloader_fb_start,
                        min(tegra_fb_size, tegra_bootloader_fb_size));
 
+       if (tegra_bootloader_fb2_size)
+               __tegra_move_framebuffer(&loki_nvmap_device,
+                       tegra_fb2_start, tegra_bootloader_fb2_start,
+                       min(tegra_fb2_size, tegra_bootloader_fb2_size));
+       else
+               __tegra_clear_framebuffer(&loki_nvmap_device,
+                               tegra_fb2_start, tegra_fb2_size);
+
        res = platform_get_resource_byname(&loki_disp2_device,
                                         IORESOURCE_MEM, "fbmem");
        res->start = tegra_fb2_start;