ARM: tegra: unified board file
Bibek Basu [Sat, 1 Jun 2013 00:37:22 +0000 (17:37 -0700)]
Patch tries to get unfied board file for T124
platforms.

Bug 1275005

Change-Id: I7e71579670e0959f059646369d2552ec2b3280f4
Signed-off-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-on: http://git-master/r/236732
Reviewed-by: Seema Khowala <seemaj@nvidia.com>
Tested-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Chao Xu <cxu@nvidia.com>

13 files changed:
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-ardbeg-panel.c
arch/arm/mach-tegra/board-ardbeg.c
arch/arm/mach-tegra/board-ardbeg.h
arch/arm/mach-tegra/board-laguna-kbc.c [deleted file]
arch/arm/mach-tegra/board-laguna-panel.c [deleted file]
arch/arm/mach-tegra/board-laguna-pinmux.c
arch/arm/mach-tegra/board-laguna-power.c
arch/arm/mach-tegra/board-laguna-sdhci.c [deleted file]
arch/arm/mach-tegra/board-laguna.c [deleted file]
arch/arm/mach-tegra/board-laguna.h [deleted file]
arch/arm/mach-tegra/panel-a-1080p-14-0.c
arch/arm/mach-tegra/tegra-board-id.h

index 29bf3a0..178ecf6 100644 (file)
@@ -274,10 +274,11 @@ obj-${CONFIG_MACH_ARDBEG}               += panel-a-1080p-11-6.o
 obj-${CONFIG_MACH_ARDBEG}               += panel-p-wuxga-10-1.o
 obj-${CONFIG_MACH_ARDBEG}               += panel-s-wqxga-10-1.o
 
-obj-${CONFIG_MACH_LAGUNA}               += board-laguna.o
-obj-${CONFIG_MACH_LAGUNA}               += board-laguna-kbc.o
-obj-${CONFIG_MACH_LAGUNA}               += board-laguna-sdhci.o
-obj-${CONFIG_MACH_LAGUNA}               += board-laguna-panel.o
+obj-${CONFIG_MACH_LAGUNA}               += board-ardbeg.o
+obj-${CONFIG_MACH_LAGUNA}               += board-ardbeg-kbc.o
+obj-${CONFIG_MACH_LAGUNA}               += board-ardbeg-sdhci.o
+obj-${CONFIG_MACH_LAGUNA}               += board-ardbeg-sensors.o
+obj-${CONFIG_MACH_LAGUNA}               += board-ardbeg-panel.o
 obj-${CONFIG_MACH_LAGUNA}               += board-laguna-pinmux.o
 obj-${CONFIG_MACH_LAGUNA}               += board-laguna-power.o
 obj-${CONFIG_MACH_LAGUNA}               += panel-a-1080p-11-6.o
index 56be9b3..d1292b3 100644 (file)
@@ -379,6 +379,10 @@ static void ardbeg_panel_select(void)
                panel = &dsi_s_wqxga_10_1;
                dsi_instance = DSI_INSTANCE_0;
                break;
+       case BOARD_PM354:
+               panel = &dsi_a_1080p_14_0;
+               dsi_instance = DSI_INSTANCE_0;
+               break;
        case BOARD_E1627:
        /* fall through */
        default:
index 865b171..87018c8 100644 (file)
@@ -633,8 +633,19 @@ static void __init tegra_ardbeg_early_init(void)
 
 static void __init tegra_ardbeg_late_init(void)
 {
+       struct board_info board_info;
+       tegra_get_board_info(&board_info);
+       pr_info("board_info: id:sku:fab:major:minor = 0x%04x:0x%04x:0x%02x:0x%02x:0x%02x\n",
+               board_info.board_id, board_info.sku,
+               board_info.fab, board_info.major_revision,
+               board_info.minor_revision);
        platform_device_register(&tegra_pinmux_device);
-       ardbeg_pinmux_init();
+       if (board_info.board_id == BOARD_PM359 ||
+                       board_info.board_id == BOARD_PM358 ||
+                       board_info.board_id == BOARD_PM363)
+               laguna_pinmux_init();
+       else
+               ardbeg_pinmux_init();
        ardbeg_usb_init();
        ardbeg_modem_init();
        ardbeg_i2c_init();
@@ -648,7 +659,12 @@ static void __init tegra_ardbeg_late_init(void)
        //tegra_ram_console_debug_init();
        tegra_io_dpd_init();
        ardbeg_sdhci_init();
-       ardbeg_regulator_init();
+       if (board_info.board_id == BOARD_PM359 ||
+                       board_info.board_id == BOARD_PM358 ||
+                       board_info.board_id == BOARD_PM363)
+               laguna_regulator_init();
+       else
+               ardbeg_regulator_init();
        ardbeg_suspend_init();
 #if 0
        ardbeg_emc_init();
index ccfce3d..e534a25 100644 (file)
@@ -20,6 +20,7 @@
 #ifndef _MACH_TEGRA_BOARD_ARDBEG_H
 #define _MACH_TEGRA_BOARD_ARDBEG_H
 
+#include <linux/mfd/as3722-reg.h>
 #include <mach/gpio-tegra.h>
 #include <mach/irqs.h>
 #include "gpio-names.h"
@@ -90,4 +91,42 @@ enum tegra_bb_type {
 #define TEGRA_GPIO_EXT_MIC_EN -1
 #endif
 
+
+/* Laguna specific */
+/* External peripheral act as gpio */
+/* AS3720 GPIO */
+#define AS3722_GPIO_BASE        TEGRA_NR_GPIOS
+#define AS3722_GPIO_END         (AS3722_GPIO_BASE + AS3722_NUM_GPIO)
+/* PMU_TCA6416 GPIOs */
+#define PMU_TCA6416_GPIO_BASE   (AS3722_GPIO_END)
+/* External peripheral act as interrupt controller */
+/* AS3720 IRQs */
+#define AS3722_IRQ_BASE         TEGRA_NR_IRQS
+
+int laguna_pinmux_init(void);
+int laguna_regulator_init(void);
+
+
+/* Display related GPIO */
+#ifdef CONFIG_ARCH_TEGRA_11x_SOC
+#define DSI_PANEL_RST_GPIO      TEGRA_GPIO_PH3 /* GMI_AD11 */
+#define LCD_RST_L               TEGRA_GPIO_PH5 /* GMI_AD13 */
+#define LCD_LR                  TEGRA_GPIO_PH6 /* GMI_AD14 */
+#define LCD_TE                  TEGRA_GPIO_PI4 /* GMI_RST_N */
+#define DSI_PANEL_BL_PWM        TEGRA_GPIO_PH1 /*GMI_AD9 */
+#define en_vdd_bl       TEGRA_GPIO_PP2 /* DAP3_DOUT */
+#define lvds_en         TEGRA_GPIO_PI0 /* GMI_WR_N */
+#define refclk_en       TEGRA_GPIO_PG4 /* GMI_AD4 */
+#else
+#define DSI_PANEL_RST_GPIO      TEGRA_GPIO_PH3 /* GMI_AD11 */
+#define LCD_RST_L               TEGRA_GPIO_PH5 /* GMI_AD13 */
+#define LCD_LR                  TEGRA_GPIO_PH6 /* GMI_AD14 */
+#define LCD_TE                  TEGRA_GPIO_PI4 /* GMI_RST_N */
+#define DSI_PANEL_BL_PWM        TEGRA_GPIO_PH1 /*GMI_AD9 */
+#define en_vdd_bl       TEGRA_GPIO_PP2 /* DAP3_DOUT */
+#define lvds_en         TEGRA_GPIO_PI0 /* GMI_WR_N */
+#define refclk_en       TEGRA_GPIO_PG4 /* GMI_AD4 */
+#endif
+
+
 #endif
diff --git a/arch/arm/mach-tegra/board-laguna-kbc.c b/arch/arm/mach-tegra/board-laguna-kbc.c
deleted file mode 100644 (file)
index 46206ab..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-laguna-kbc.c
- *
- * Copyright (c) 2013, 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 version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307, USA
- */
-
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/input.h>
-#include <linux/io.h>
-#include <mach/io.h>
-#include <mach/iomap.h>
-#include <mach/kbc.h>
-#include <linux/gpio.h>
-#include <linux/gpio_keys.h>
-#include <linux/mfd/palmas.h>
-
-#include "tegra-board-id.h"
-#include "board.h"
-#include "board-laguna.h"
-#include "devices.h"
-
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#include "wakeups-t11x.h"
-#else
-/* FIXME: update with wakeups-t12x.h */
-#endif
-
-/*
-static const u32 kbd_keymap[] = {
-       KEY(0, 0, KEY_POWER),
-       KEY(0, 1, KEY_HOME),
-
-       KEY(1, 0, KEY_RESERVED),
-       KEY(1, 1, KEY_VOLUMEDOWN),
-
-       KEY(2, 0, KEY_CAMERA),
-       KEY(2, 1, KEY_VOLUMEUP),
-       KEY(2, 2, KEY_2),
-};
-
-static const struct matrix_keymap_data keymap_data = {
-       .keymap         = kbd_keymap,
-       .keymap_size    = ARRAY_SIZE(kbd_keymap),
-};
-
-static struct tegra_kbc_wake_key laguna_wake_cfg[] = {
-       [0] = {
-               .row = 0,
-               .col = 0,
-       },
-};
-
-static struct tegra_kbc_platform_data laguna_kbc_platform_data = {
-       .debounce_cnt = 20 * 32,
-       .repeat_cnt = 1,
-       .scan_count = 30,
-       .wakeup = true,
-       .keymap_data = &keymap_data,
-       .wake_cnt = 1,
-       .wake_cfg = &laguna_wake_cfg[0],
-       .wakeup_key = KEY_POWER,
-#ifdef CONFIG_ANDROID
-       .disable_ev_rep = true,
-#endif
-};
-
-#define GPIO_KEY(_id, _gpio, _iswake)           \
-       {                                       \
-               .code = _id,                    \
-               .gpio = TEGRA_GPIO_##_gpio,     \
-               .active_low = 1,                \
-               .desc = #_id,                   \
-               .type = EV_KEY,                 \
-               .wakeup = _iswake,              \
-               .debounce_interval = 10,        \
-       }
-*/
-
-#define GPIO_IKEY(_id, _irq, _iswake, _deb)    \
-       {                                       \
-               .code = _id,                    \
-               .gpio = -1,                     \
-               .irq = _irq,                    \
-               .desc = #_id,                   \
-               .type = EV_KEY,                 \
-               .wakeup = _iswake,              \
-               .debounce_interval = _deb,      \
-       }
-
-static struct gpio_keys_button laguna_int_keys[] = {
-       /* FIXME: add laguna keys */
-};
-
-static struct gpio_keys_platform_data laguna_int_keys_pdata = {
-       .buttons        = laguna_int_keys,
-       .nbuttons       = ARRAY_SIZE(laguna_int_keys),
-};
-
-static struct platform_device laguna_int_keys_device = {
-       .name   = "gpio-keys",
-       .id     = 0,
-       .dev    = {
-               .platform_data  = &laguna_int_keys_pdata,
-       },
-};
-
-int __init laguna_kbc_init(void)
-{
-       platform_device_register(&laguna_int_keys_device);
-
-       return 0;
-}
-
diff --git a/arch/arm/mach-tegra/board-laguna-panel.c b/arch/arm/mach-tegra/board-laguna-panel.c
deleted file mode 100644 (file)
index 8a3e0d6..0000000
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-laguna-panel.c
- *
- * Copyright (c) 2013, 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-#include <linux/ioport.h>
-#include <linux/fb.h>
-#include <linux/nvmap.h>
-#include <linux/nvhost.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/gpio.h>
-#include <linux/tegra_pwm_bl.h>
-#include <linux/regulator/consumer.h>
-#include <linux/pwm_backlight.h>
-#include <linux/of.h>
-
-#include <mach/irqs.h>
-#include <mach/iomap.h>
-#include <mach/dc.h>
-
-#include "board.h"
-#include "devices.h"
-#include "gpio-names.h"
-#include "board-laguna.h"
-#include "board-panel.h"
-#include "common.h"
-
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#include "tegra11_host1x_devices.h"
-#else
-#include "tegra12_host1x_devices.h"
-#endif
-
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#define DSI_PANEL_RST_GPIO      TEGRA_GPIO_PH3
-#define DSI_PANEL_BL_PWM_GPIO   TEGRA_GPIO_PH1
-#else
-/* TODO: update gpio for t124 laguna */
-#define DSI_PANEL_RST_GPIO      TEGRA_GPIO_PH3
-#define DSI_PANEL_BL_PWM_GPIO   TEGRA_GPIO_PH1
-#endif
-
-struct platform_device * __init laguna_host1x_init(void)
-{
-       struct platform_device *pdev = NULL;
-
-#ifdef CONFIG_TEGRA_GRHOST
-       if (!of_have_populated_dt()) {
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-               pdev = tegra11_register_host1x_devices();
-#else
-               pdev = tegra12_register_host1x_devices();
-#endif
-       } else {
-               pdev = to_platform_device(bus_find_device_by_name(
-                       &platform_bus_type, NULL, "host1x"));
-       }
-
-       if (!pdev) {
-               pr_err("host1x devices registration failed\n");
-               return NULL;
-       }
-#endif
-       return pdev;
-}
-
-#ifdef CONFIG_TEGRA_DC
-
-/* HDMI Hotplug detection pin */
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#define laguna_hdmi_hpd        TEGRA_GPIO_PN7
-#else
-/* TODO: update for t124 laguna */
-#define laguna_hdmi_hpd        TEGRA_GPIO_PN7
-#endif
-
-/* hdmi related regulators */
-static struct regulator *laguna_hdmi_vddio;
-
-static struct resource laguna_disp1_resources[] = {
-       {
-               .name   = "irq",
-               .start  = INT_DISPLAY_GENERAL,
-               .end    = INT_DISPLAY_GENERAL,
-               .flags  = IORESOURCE_IRQ,
-       },
-       {
-               .name   = "regs",
-               .start  = TEGRA_DISPLAY_BASE,
-               .end    = TEGRA_DISPLAY_BASE + TEGRA_DISPLAY_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "fbmem",
-               .start  = 0, /* Filled in by laguna_panel_init() */
-               .end    = 0, /* Filled in by laguna_panel_init() */
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "ganged_dsia_regs",
-               .start  = 0, /* Filled in the panel file by init_resources() */
-               .end    = 0, /* Filled in the panel file by init_resources() */
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "ganged_dsib_regs",
-               .start  = 0, /* Filled in the panel file by init_resources() */
-               .end    = 0, /* Filled in the panel file by init_resources() */
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "dsi_regs",
-               .start  = 0, /* Filled in the panel file by init_resources() */
-               .end    = 0, /* Filled in the panel file by init_resources() */
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "mipi_cal",
-               .start  = TEGRA_MIPI_CAL_BASE,
-               .end    = TEGRA_MIPI_CAL_BASE + TEGRA_MIPI_CAL_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct resource laguna_disp2_resources[] = {
-       {
-               .name   = "irq",
-               .start  = INT_DISPLAY_B_GENERAL,
-               .end    = INT_DISPLAY_B_GENERAL,
-               .flags  = IORESOURCE_IRQ,
-       },
-       {
-               .name   = "regs",
-               .start  = TEGRA_DISPLAY2_BASE,
-               .end    = TEGRA_DISPLAY2_BASE + TEGRA_DISPLAY2_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "fbmem",
-               .start  = 0, /* Filled in by laguna_panel_init() */
-               .end    = 0, /* Filled in by laguna_panel_init() */
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "hdmi_regs",
-               .start  = TEGRA_HDMI_BASE,
-               .end    = TEGRA_HDMI_BASE + TEGRA_HDMI_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-
-static struct tegra_dc_sd_settings sd_settings;
-
-static struct tegra_dc_out laguna_disp1_out = {
-       .type           = TEGRA_DC_OUT_DSI,
-       .sd_settings    = &sd_settings,
-};
-
-static int laguna_hdmi_enable(struct device *dev)
-{
-       /* TODO */
-       return 0;
-}
-
-static int laguna_hdmi_disable(void)
-{
-       /* TODO */
-       return 0;
-}
-
-static int laguna_hdmi_postsuspend(void)
-{
-       if (laguna_hdmi_vddio) {
-               regulator_disable(laguna_hdmi_vddio);
-               regulator_put(laguna_hdmi_vddio);
-               laguna_hdmi_vddio = NULL;
-       }
-       return 0;
-}
-
-static int laguna_hdmi_hotplug_init(struct device *dev)
-{
-       if (!laguna_hdmi_vddio) {
-               laguna_hdmi_vddio = regulator_get(dev, "vdd_hdmi_5v0");
-               if (WARN_ON(IS_ERR(laguna_hdmi_vddio))) {
-                       pr_err("%s: couldn't get regulator vdd_hdmi_5v0: %ld\n",
-                               __func__, PTR_ERR(laguna_hdmi_vddio));
-                               laguna_hdmi_vddio = NULL;
-               } else {
-                       regulator_enable(laguna_hdmi_vddio);
-               }
-       }
-
-       return 0;
-}
-
-static struct tegra_dc_out laguna_disp2_out = {
-       .type           = TEGRA_DC_OUT_HDMI,
-       .flags          = TEGRA_DC_OUT_HOTPLUG_HIGH,
-       .parent_clk     = "pll_d2_out0",
-
-       .dcc_bus        = 3,
-       .hotplug_gpio   = laguna_hdmi_hpd,
-
-       /* TODO: update max pclk to POR */
-       .max_pixclock   = KHZ2PICOS(297000),
-
-       .align          = TEGRA_DC_ALIGN_MSB,
-       .order          = TEGRA_DC_ORDER_RED_BLUE,
-
-       .enable         = laguna_hdmi_enable,
-       .disable        = laguna_hdmi_disable,
-       .postsuspend    = laguna_hdmi_postsuspend,
-       .hotplug_init   = laguna_hdmi_hotplug_init,
-};
-
-static struct tegra_fb_data laguna_disp1_fb_data = {
-       .win            = 0,
-       .bits_per_pixel = 32,
-       .flags          = TEGRA_FB_FLIP_ON_PROBE,
-};
-
-static struct tegra_dc_platform_data laguna_disp1_pdata = {
-       .flags          = TEGRA_DC_FLAG_ENABLED,
-       .default_out    = &laguna_disp1_out,
-       .fb             = &laguna_disp1_fb_data,
-       .emc_clk_rate   = 204000000,
-#ifdef CONFIG_TEGRA_DC_CMU
-       .cmu_enable     = 1,
-#endif
-};
-
-static struct tegra_fb_data laguna_disp2_fb_data = {
-       .win            = 0,
-       .xres           = 1280,
-       .yres           = 720,
-       .bits_per_pixel = 32,
-       .flags          = TEGRA_FB_FLIP_ON_PROBE,
-};
-
-static struct tegra_dc_platform_data laguna_disp2_pdata = {
-       .flags          = TEGRA_DC_FLAG_ENABLED,
-       .default_out    = &laguna_disp2_out,
-       .fb             = &laguna_disp2_fb_data,
-       .emc_clk_rate   = 300000000,
-};
-
-static struct platform_device laguna_disp2_device = {
-       .name           = "tegradc",
-       .id             = 1,
-       .resource       = laguna_disp2_resources,
-       .num_resources  = ARRAY_SIZE(laguna_disp2_resources),
-       .dev = {
-               .platform_data = &laguna_disp2_pdata,
-       },
-};
-
-static struct platform_device laguna_disp1_device = {
-       .name           = "tegradc",
-       .id             = 0,
-       .resource       = laguna_disp1_resources,
-       .num_resources  = ARRAY_SIZE(laguna_disp1_resources),
-       .dev = {
-               .platform_data = &laguna_disp1_pdata,
-       },
-};
-
-static struct nvmap_platform_carveout laguna_carveouts[] = {
-       [0] = {
-               .name           = "iram",
-               .usage_mask     = NVMAP_HEAP_CARVEOUT_IRAM,
-               .base           = TEGRA_IRAM_BASE + TEGRA_RESET_HANDLER_SIZE,
-               .size           = TEGRA_IRAM_SIZE - TEGRA_RESET_HANDLER_SIZE,
-               .buddy_size     = 0, /* no buddy allocation for IRAM */
-       },
-       [1] = {
-               .name           = "generic-0",
-               .usage_mask     = NVMAP_HEAP_CARVEOUT_GENERIC,
-               .base           = 0, /* Filled in by laguna_panel_init() */
-               .size           = 0, /* Filled in by laguna_panel_init() */
-               .buddy_size     = SZ_32K,
-       },
-       [2] = {
-               .name           = "vpr",
-               .usage_mask     = NVMAP_HEAP_CARVEOUT_VPR,
-               .base           = 0, /* Filled in by laguna_panel_init() */
-               .size           = 0, /* Filled in by laguna_panel_init() */
-               .buddy_size     = SZ_32K,
-       },
-};
-
-static struct nvmap_platform_data laguna_nvmap_data = {
-       .carveouts      = laguna_carveouts,
-       .nr_carveouts   = ARRAY_SIZE(laguna_carveouts),
-};
-static struct platform_device laguna_nvmap_device  = {
-       .name   = "tegra-nvmap",
-       .id     = -1,
-       .dev    = {
-               .platform_data = &laguna_nvmap_data,
-       },
-};
-
-static struct tegra_dc_sd_settings laguna_sd_settings = {
-       .enable = 1, /* enabled by default. */
-       .use_auto_pwm = false,
-       .hw_update_delay = 0,
-       .bin_width = -1,
-       .aggressiveness = 5,
-       .use_vid_luma = false,
-       .phase_in_adjustments = 0,
-       .k_limit_enable = true,
-       .k_limit = 200,
-       .sd_window_enable = false,
-       .soft_clipping_enable = true,
-       /* Low soft clipping threshold to compensate for aggressive k_limit */
-       .soft_clipping_threshold = 128,
-       .smooth_k_enable = false,
-       .smooth_k_incr = 64,
-       /* Default video coefficients */
-       .coeff = {5, 9, 2},
-       .fc = {0, 0},
-       /* Immediate backlight changes */
-       .blp = {1024, 255},
-       /* Gammas: R: 2.2 G: 2.2 B: 2.2 */
-       /* Default BL TF */
-       .bltf = {
-                       {
-                               {57, 65, 73, 82},
-                               {92, 103, 114, 125},
-                               {138, 150, 164, 178},
-                               {193, 208, 224, 241},
-                       },
-               },
-       /* Default LUT */
-       .lut = {
-                       {
-                               {255, 255, 255},
-                               {199, 199, 199},
-                               {153, 153, 153},
-                               {116, 116, 116},
-                               {85, 85, 85},
-                               {59, 59, 59},
-                               {36, 36, 36},
-                               {17, 17, 17},
-                               {0, 0, 0},
-                       },
-               },
-       .sd_brightness = &sd_brightness,
-       .use_vpulse2 = true,
-};
-
-static void laguna_panel_select(void)
-{
-       struct tegra_panel *panel = NULL;
-       struct board_info board;
-       u8 dsi_instance;
-
-       tegra_get_display_board_info(&board);
-
-       switch (board.board_id) {
-       /* fall through */
-       default:
-               panel = &dsi_a_1080p_14_0;
-               dsi_instance = DSI_INSTANCE_0;
-               break;
-       }
-
-       if (panel) {
-               if (panel->init_sd_settings)
-                       panel->init_sd_settings(&sd_settings);
-
-               if (panel->init_dc_out) {
-                       panel->init_dc_out(&laguna_disp1_out);
-                       laguna_disp1_out.dsi->dsi_instance = dsi_instance;
-                       laguna_disp1_out.dsi->dsi_panel_rst_gpio =
-                               DSI_PANEL_RST_GPIO;
-                       laguna_disp1_out.dsi->dsi_panel_bl_pwm_gpio =
-                               DSI_PANEL_BL_PWM_GPIO;
-               }
-
-               if (panel->init_fb_data)
-                       panel->init_fb_data(&laguna_disp1_fb_data);
-
-               if (panel->init_cmu_data)
-                       panel->init_cmu_data(&laguna_disp1_pdata);
-
-               if (panel->set_disp_device)
-                       panel->set_disp_device(&laguna_disp1_device);
-
-               tegra_dsi_resources_init(dsi_instance, laguna_disp1_resources,
-                       ARRAY_SIZE(laguna_disp1_resources));
-
-               if (panel->register_bl_dev)
-                       panel->register_bl_dev();
-
-               if (panel->register_i2c_bridge)
-                       panel->register_i2c_bridge();
-       }
-
-}
-int __init laguna_panel_init(void)
-{
-       int err = 0;
-       struct resource __maybe_unused *res;
-       struct platform_device *phost1x = NULL;
-
-       sd_settings = laguna_sd_settings;
-
-       laguna_panel_select();
-
-#ifdef CONFIG_TEGRA_NVMAP
-       laguna_carveouts[1].base = tegra_carveout_start;
-       laguna_carveouts[1].size = tegra_carveout_size;
-       laguna_carveouts[2].base = tegra_vpr_start;
-       laguna_carveouts[2].size = tegra_vpr_size;
-
-       err = platform_device_register(&laguna_nvmap_device);
-       if (err) {
-               pr_err("nvmap device registration failed\n");
-               return err;
-       }
-#endif
-
-       phost1x = laguna_host1x_init();
-       if (!phost1x) {
-               pr_err("host1x devices registration failed\n");
-               return -EINVAL;
-       }
-
-       res = platform_get_resource_byname(&laguna_disp1_device,
-                                        IORESOURCE_MEM, "fbmem");
-       res->start = tegra_fb_start;
-       res->end = tegra_fb_start + tegra_fb_size - 1;
-
-       /* Copy the bootloader fb to the fb. */
-       __tegra_move_framebuffer(&laguna_nvmap_device,
-               tegra_fb_start, tegra_bootloader_fb_start,
-                       min(tegra_fb_size, tegra_bootloader_fb_size));
-
-       res = platform_get_resource_byname(&laguna_disp2_device,
-                                        IORESOURCE_MEM, "fbmem");
-
-       res->start = tegra_fb2_start;
-       res->end = tegra_fb2_start + tegra_fb2_size - 1;
-
-       laguna_disp1_device.dev.parent = &phost1x->dev;
-       err = platform_device_register(&laguna_disp1_device);
-       if (err) {
-               pr_err("disp1 device registration failed\n");
-               return err;
-       }
-
-       laguna_disp2_device.dev.parent = &phost1x->dev;
-       err = platform_device_register(&laguna_disp2_device);
-       if (err) {
-               pr_err("disp2 device registration failed\n");
-               return err;
-       }
-
-#ifdef CONFIG_TEGRA_NVAVP
-       nvavp_device.dev.parent = &phost1x->dev;
-       err = platform_device_register(&nvavp_device);
-       if (err) {
-               pr_err("nvavp device registration failed\n");
-               return err;
-       }
-#endif
-       return err;
-}
-#else
-int __init laguna_panel_init(void)
-{
-       if (laguna_host1x_init())
-               return 0;
-       else
-               return -EINVAL;
-}
-#endif
index 3051b9b..2eac4f9 100644 (file)
@@ -21,7 +21,7 @@
 #include <mach/gpio-tegra.h>
 
 #include "board.h"
-#include "board-laguna.h"
+#include "board-ardbeg.h"
 #include "devices.h"
 #include "gpio-names.h"
 
index d5c7378..1f59a74 100644 (file)
@@ -44,7 +44,7 @@
 #include "board.h"
 #include "gpio-names.h"
 #include "board-common.h"
-#include "board-laguna.h"
+#include "board-ardbeg.h"
 #include "tegra_cl_dvfs.h"
 #include "devices.h"
 #include "tegra11_soctherm.h"
diff --git a/arch/arm/mach-tegra/board-laguna-sdhci.c b/arch/arm/mach-tegra/board-laguna-sdhci.c
deleted file mode 100644 (file)
index 90b6d24..0000000
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-laguna-sdhci.c
- *
- * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/resource.h>
-#include <linux/platform_device.h>
-#include <linux/wlan_plat.h>
-#include <linux/delay.h>
-#include <linux/gpio.h>
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/mmc/host.h>
-#include <linux/wl12xx.h>
-#include <linux/platform_data/mmc-sdhci-tegra.h>
-#include <linux/mfd/max77660/max77660-core.h>
-
-#include <asm/mach-types.h>
-#include <mach/irqs.h>
-#include <mach/iomap.h>
-#include <mach/sdhci.h>
-#include<mach/gpio-tegra.h>
-
-#include "gpio-names.h"
-#include "board.h"
-#include "board-laguna.h"
-
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#define LAGUNA_WLAN_PWR        TEGRA_GPIO_PCC5
-#define LAGUNA_WLAN_WOW        TEGRA_GPIO_PU5
-#else
-/* FIXME: update GPIO's for 124 */
-#define LAGUNA_WLAN_PWR  TEGRA_GPIO_PL7
-#define LAGUNA_WLAN_WOW  TEGRA_GPIO_PO2
-#endif
-
-#define LAGUNA_SD_CD   (MAX77660_GPIO_BASE + MAX77660_GPIO9)
-
-static void (*wifi_status_cb)(int card_present, void *dev_id);
-static void *wifi_status_cb_devid;
-static int laguna_wifi_status_register(void (*callback)(int , void *), void *);
-
-static int laguna_wifi_reset(int on);
-static int laguna_wifi_power(int on);
-static int laguna_wifi_set_carddetect(int val);
-
-static struct wifi_platform_data laguna_wifi_control = {
-       .set_power      = laguna_wifi_power,
-       .set_reset      = laguna_wifi_reset,
-       .set_carddetect = laguna_wifi_set_carddetect,
-};
-
-static struct resource wifi_resource[] = {
-       [0] = {
-               .name   = "bcm4329_wlan_irq",
-               .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL
-                               | IORESOURCE_IRQ_SHAREABLE,
-       },
-};
-
-static struct platform_device laguna_wifi_device = {
-       .name           = "bcm4329_wlan",
-       .id             = 1,
-       .num_resources  = 1,
-       .resource       = wifi_resource,
-       .dev            = {
-               .platform_data = &laguna_wifi_control,
-       },
-};
-
-static struct resource sdhci_resource0[] = {
-       [0] = {
-               .start  = INT_SDMMC1,
-               .end    = INT_SDMMC1,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [1] = {
-               .start  = TEGRA_SDMMC1_BASE,
-               .end    = TEGRA_SDMMC1_BASE + TEGRA_SDMMC1_SIZE-1,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct resource sdhci_resource2[] = {
-       [0] = {
-               .start  = INT_SDMMC3,
-               .end    = INT_SDMMC3,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [1] = {
-               .start  = TEGRA_SDMMC3_BASE,
-               .end    = TEGRA_SDMMC3_BASE + TEGRA_SDMMC3_SIZE-1,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct resource sdhci_resource3[] = {
-       [0] = {
-               .start  = INT_SDMMC4,
-               .end    = INT_SDMMC4,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [1] = {
-               .start  = TEGRA_SDMMC4_BASE,
-               .end    = TEGRA_SDMMC4_BASE + TEGRA_SDMMC4_SIZE-1,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-#ifdef CONFIG_MMC_EMBEDDED_SDIO
-static struct embedded_sdio_data embedded_sdio_data0 = {
-       .cccr   = {
-               .sdio_vsn       = 2,
-               .multi_block    = 1,
-               .low_speed      = 0,
-               .wide_bus       = 0,
-               .high_power     = 1,
-               .high_speed     = 1,
-       },
-       .cis  = {
-               .vendor  = 0x02d0,
-               .device  = 0x4329,
-       },
-};
-#endif
-
-static struct tegra_sdhci_platform_data tegra_sdhci_platform_data0 = {
-       .mmc_data = {
-               .register_status_notify = laguna_wifi_status_register,
-#ifdef CONFIG_MMC_EMBEDDED_SDIO
-               .embedded_sdio = &embedded_sdio_data0,
-#endif
-               .built_in = 0,
-               .ocr_mask = MMC_OCR_1V8_MASK,
-       },
-#ifndef CONFIG_MMC_EMBEDDED_SDIO
-       .pm_flags = MMC_PM_KEEP_POWER,
-#endif
-       .cd_gpio = -1,
-       .wp_gpio = -1,
-       .power_gpio = -1,
-       .tap_delay = 0x3,
-       .trim_delay = 0xA,
-       .ddr_clk_limit = 41000000,
-       /* FIXME remove uhs_mask for T148 silicon */
-       .uhs_mask = MMC_UHS_MASK_SDR104 |
-               MMC_UHS_MASK_DDR50,
-};
-
-static struct tegra_sdhci_platform_data tegra_sdhci_platform_data2 = {
-       .cd_gpio = -1,
-       .wp_gpio = -1,
-       .power_gpio = -1,
-/*     .max_clk = 12000000, */
-};
-
-static struct tegra_sdhci_platform_data tegra_sdhci_platform_data3 = {
-       .cd_gpio = -1,
-       .wp_gpio = -1,
-       .power_gpio = -1,
-       .is_8bit = 1,
-       .mmc_data = {
-               .built_in = 1,
-               .ocr_mask = MMC_OCR_1V8_MASK,
-       }
-/*     .max_clk = 12000000, */
-};
-
-static struct platform_device tegra_sdhci_device0 = {
-       .name           = "sdhci-tegra",
-       .id             = 0,
-       .resource       = sdhci_resource0,
-       .num_resources  = ARRAY_SIZE(sdhci_resource0),
-       .dev = {
-               .platform_data = &tegra_sdhci_platform_data0,
-       },
-};
-
-static struct platform_device tegra_sdhci_device2 = {
-       .name           = "sdhci-tegra",
-       .id             = 2,
-       .resource       = sdhci_resource2,
-       .num_resources  = ARRAY_SIZE(sdhci_resource2),
-       .dev = {
-               .platform_data = &tegra_sdhci_platform_data2,
-       },
-};
-
-static struct platform_device tegra_sdhci_device3 = {
-       .name           = "sdhci-tegra",
-       .id             = 3,
-       .resource       = sdhci_resource3,
-       .num_resources  = ARRAY_SIZE(sdhci_resource3),
-       .dev = {
-               .platform_data = &tegra_sdhci_platform_data3,
-       },
-};
-
-static int laguna_wifi_status_register(
-               void (*callback)(int card_present, void *dev_id),
-               void *dev_id)
-{
-       if (wifi_status_cb)
-               return -EAGAIN;
-       wifi_status_cb = callback;
-       wifi_status_cb_devid = dev_id;
-       return 0;
-}
-
-static int laguna_wifi_set_carddetect(int val)
-{
-       pr_debug("%s: %d\n", __func__, val);
-       if (wifi_status_cb)
-               wifi_status_cb(val, wifi_status_cb_devid);
-       else
-               pr_warn("%s: Nobody to notify\n", __func__);
-       return 0;
-}
-
-static int laguna_wifi_power(int on)
-{
-       pr_err("%s: %d\n", __func__, on);
-
-       gpio_set_value(LAGUNA_WLAN_PWR, on);
-       mdelay(100);
-
-       return 0;
-}
-
-static int laguna_wifi_reset(int on)
-{
-       pr_debug("%s: do nothing\n", __func__);
-       return 0;
-}
-
-static int __init laguna_wifi_init(void)
-{
-       int rc;
-
-       rc = gpio_request(LAGUNA_WLAN_PWR, "wlan_power");
-       if (rc)
-               pr_err("WLAN_PWR gpio request failed:%d\n", rc);
-       rc = gpio_request(LAGUNA_WLAN_WOW, "bcmsdh_sdmmc");
-       if (rc)
-               pr_err("WLAN_WOW gpio request failed:%d\n", rc);
-
-       rc = gpio_direction_output(LAGUNA_WLAN_PWR, 0);
-       if (rc)
-               pr_err("WLAN_PWR gpio direction configuration failed:%d\n", rc);
-       rc = gpio_direction_input(LAGUNA_WLAN_WOW);
-       if (rc)
-               pr_err("WLAN_WOW gpio direction configuration failed:%d\n", rc);
-
-       wifi_resource[0].start = wifi_resource[0].end =
-               gpio_to_irq(LAGUNA_WLAN_WOW);
-
-       platform_device_register(&laguna_wifi_device);
-       return 0;
-}
-
-#ifdef CONFIG_TEGRA_PREPOWER_WIFI
-static int __init laguna_wifi_prepower(void)
-{
-       if (!of_machine_is_compatible("nvidia,laguna"))
-               return 0;
-       laguna_wifi_power(1);
-
-       return 0;
-}
-
-subsys_initcall_sync(laguna_wifi_prepower);
-#endif
-
-int __init laguna_sdhci_init(void)
-{
-#ifndef CONFIG_USE_OF
-       platform_device_register(&tegra_sdhci_device3);
-       platform_device_register(&tegra_sdhci_device2);
-#endif
-       /* Disable SDMMC1 and WiFi
-        * platform_device_register(&tegra_sdhci_device0);
-        * laguna_wifi_init();
-        */
-       return 0;
-}
diff --git a/arch/arm/mach-tegra/board-laguna.c b/arch/arm/mach-tegra/board-laguna.c
deleted file mode 100644 (file)
index 0492503..0000000
+++ /dev/null
@@ -1,666 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-laguna.c
- *
- * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/ctype.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <linux/serial_8250.h>
-#include <linux/i2c.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-#include <linux/i2c-tegra.h>
-#include <linux/gpio.h>
-#include <linux/input.h>
-#include <linux/platform_data/tegra_usb.h>
-#include <linux/platform_data/tegra_xusb.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/rm31080a_ts.h>
-#include <linux/tegra_uart.h>
-#include <linux/memblock.h>
-#include <linux/spi/spi-tegra.h>
-#include <linux/nfc/pn544.h>
-#include <linux/rfkill-gpio.h>
-#include <linux/skbuff.h>
-#include <linux/ti_wilink_st.h>
-#include <linux/regulator/consumer.h>
-#include <linux/smb349-charger.h>
-#include <linux/max17048_battery.h>
-#include <linux/leds.h>
-#include <linux/i2c/at24.h>
-#include <linux/of_platform.h>
-#include <linux/i2c.h>
-#include <linux/i2c-tegra.h>
-#include <linux/tegra_uart.h>
-#include <linux/serial_tegra.h>
-#include <linux/edp.h>
-
-#include <asm/hardware/gic.h>
-
-#include <mach/clk.h>
-#include <mach/iomap.h>
-#include <mach/irqs.h>
-#include <mach/tegra_fiq_debugger.h>
-
-#include <mach/pinmux.h>
-#include <mach/iomap.h>
-#include <mach/io.h>
-#include <mach/io_dpd.h>
-#include <mach/i2s.h>
-#include <mach/isomgr.h>
-#include <mach/tegra_asoc_pdata.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <mach/usb_phy.h>
-#include <mach/gpio-tegra.h>
-#include <mach/tegra_fiq_debugger.h>
-#include <linux/platform_data/tegra_usb_modem_power.h>
-
-#include "board-touch-raydium.h"
-#include "board.h"
-#include "board-laguna.h"
-#include "board-common.h"
-#include "clock.h"
-#include "devices.h"
-#include "gpio-names.h"
-#include "fuse.h"
-#include "pm.h"
-#include "pm-irq.h"
-#include "common.h"
-#include "tegra-board-id.h"
-
-static struct board_info board_info, display_board_info;
-
-static struct i2c_board_info __initdata rt5645_board_info = {
-       I2C_BOARD_INFO("rt5645", 0x1a),
-};
-
-static __initdata struct tegra_clk_init_table laguna_clk_init_table[] = {
-       /* name         parent          rate            enabled */
-       { "pll_m",      NULL,           0,              false},
-       { "hda",        "pll_p",        108000000,      false},
-       { "hda2codec_2x", "pll_p",      48000000,       false},
-       { "pwm",        "pll_p",        3187500,        false},
-       { "blink",      "clk_32k",      32768,          true},
-       { "i2s1",       "pll_a_out0",   0,              false},
-       { "i2s3",       "pll_a_out0",   0,              false},
-       { "i2s4",       "pll_a_out0",   0,              false},
-       { "spdif_out",  "pll_a_out0",   0,              false},
-       { "d_audio",    "clk_m",        12000000,       false},
-       { "dam0",       "clk_m",        12000000,       false},
-       { "dam1",       "clk_m",        12000000,       false},
-       { "dam2",       "clk_m",        12000000,       false},
-       { "audio1",     "i2s1_sync",    0,              false},
-       { "audio3",     "i2s3_sync",    0,              false},
-       /* Setting vi_sensor-clk to true for validation purpose, will imapact
-        * power, later set to be false.*/
-       { "vi_sensor",  "pll_p",        150000000,      false},
-       { "cilab",      "pll_p",        150000000,      false},
-       { "cilcd",      "pll_p",        150000000,      false},
-       { "cile",       "pll_p",        150000000,      false},
-       { "i2c1",       "pll_p",        3200000,        false},
-       { "i2c2",       "pll_p",        3200000,        false},
-       { "i2c3",       "pll_p",        3200000,        false},
-       { "i2c4",       "pll_p",        3200000,        false},
-       { "i2c5",       "pll_p",        3200000,        false},
-       { "sbc1",       "pll_p",        25000000,       false},
-       { "sbc2",       "pll_p",        25000000,       false},
-       { "sbc3",       "pll_p",        25000000,       false},
-       { "sbc4",       "pll_p",        25000000,       false},
-       { "sbc5",       "pll_p",        25000000,       false},
-       { "sbc6",       "pll_p",        25000000,       false},
-       { NULL,         NULL,           0,              0},
-};
-
-#ifndef CONFIG_USE_OF
-static struct tegra_i2c_platform_data laguna_i2c1_platform_data = {
-       .bus_clk_rate   = 100000,
-       .scl_gpio       = TEGRA_GPIO_I2C1_SCL,
-       .sda_gpio       = TEGRA_GPIO_I2C1_SDA,
-};
-
-static struct tegra_i2c_platform_data laguna_i2c2_platform_data = {
-       .bus_clk_rate   = 100000,
-       .is_clkon_always = true,
-       .scl_gpio       = TEGRA_GPIO_I2C2_SCL,
-       .sda_gpio       = TEGRA_GPIO_I2C2_SDA,
-};
-
-static struct tegra_i2c_platform_data laguna_i2c3_platform_data = {
-       .bus_clk_rate   = 400000,
-       .scl_gpio       = TEGRA_GPIO_I2C3_SCL,
-       .sda_gpio       = TEGRA_GPIO_I2C3_SDA,
-};
-
-static struct tegra_i2c_platform_data laguna_i2c4_platform_data = {
-       .bus_clk_rate   = 10000,
-       .scl_gpio       = TEGRA_GPIO_I2C4_SCL,
-       .sda_gpio       = TEGRA_GPIO_I2C4_SDA,
-};
-
-static struct tegra_i2c_platform_data laguna_i2c5_platform_data = {
-       .bus_clk_rate   = 400000,
-       .scl_gpio       = TEGRA_GPIO_I2C5_SCL,
-       .sda_gpio       = TEGRA_GPIO_I2C5_SDA,
-       .needs_cl_dvfs_clock = true,
-};
-#endif
-
-static void laguna_i2c_init(void)
-{
-#ifndef CONFIG_USE_OF
-       tegra11_i2c_device1.dev.platform_data = &laguna_i2c1_platform_data;
-       tegra11_i2c_device2.dev.platform_data = &laguna_i2c2_platform_data;
-       tegra11_i2c_device3.dev.platform_data = &laguna_i2c3_platform_data;
-       tegra11_i2c_device4.dev.platform_data = &laguna_i2c4_platform_data;
-       tegra11_i2c_device5.dev.platform_data = &laguna_i2c5_platform_data;
-
-       platform_device_register(&tegra11_i2c_device5);
-       platform_device_register(&tegra11_i2c_device4);
-       platform_device_register(&tegra11_i2c_device3);
-       platform_device_register(&tegra11_i2c_device2);
-       platform_device_register(&tegra11_i2c_device1);
-#endif
-       i2c_register_board_info(0, &rt5645_board_info, 1);
-}
-
-static struct platform_device *laguna_uart_devices[] __initdata = {
-       &tegra_uarta_device,
-       &tegra_uartb_device,
-       &tegra_uartc_device,
-       &tegra_uartd_device,
-};
-
-static struct tegra_serial_platform_data laguna_uarta_pdata = {
-       .dma_req_selector = 8,
-       .modem_interrupt = false,
-};
-
-static struct tegra_serial_platform_data laguna_uartb_pdata = {
-       .dma_req_selector = 9,
-       .modem_interrupt = false,
-};
-
-static struct tegra_serial_platform_data laguna_uartc_pdata = {
-       .dma_req_selector = 10,
-       .modem_interrupt = false,
-};
-
-static struct tegra_serial_platform_data laguna_uartd_pdata = {
-       .dma_req_selector = 19,
-       .modem_interrupt = false,
-};
-
-static struct uart_clk_parent uart_parent_clk[] = {
-       [0] = {.name = "clk_m"},
-       [1] = {.name = "pll_p"},
-#ifndef CONFIG_TEGRA_PLLM_RESTRICTED
-       [2] = {.name = "pll_m"},
-#endif
-};
-
-static struct tegra_uart_platform_data laguna_uart_pdata;
-
-static struct tegra_asoc_platform_data laguna_audio_pdata = {
-       .gpio_spkr_en = TEGRA_GPIO_SPKR_EN,
-       .gpio_hp_det = TEGRA_GPIO_HP_DET,
-       .gpio_hp_mute = -1,
-       .gpio_int_mic_en = TEGRA_GPIO_INT_MIC_EN,
-       .gpio_ext_mic_en = TEGRA_GPIO_EXT_MIC_EN,
-       .gpio_ldo1_en = TEGRA_GPIO_LDO1_EN,
-       .gpio_codec1 = TEGRA_GPIO_CODEC1_EN,
-       .gpio_codec2 = TEGRA_GPIO_CODEC2_EN,
-       .gpio_codec3 = TEGRA_GPIO_CODEC3_EN,
-       .i2s_param[HIFI_CODEC]       = {
-               .audio_port_id = 1,
-               .is_i2s_master = 1,
-               .i2s_mode = TEGRA_DAIFMT_I2S,
-       },
-       .i2s_param[BT_SCO] = {
-               .audio_port_id = 3,
-               .is_i2s_master = 1,
-               .i2s_mode = TEGRA_DAIFMT_DSP_A,
-       },
-};
-
-static void laguna_audio_init(void)
-{
-       laguna_audio_pdata.codec_name = "rt5645.0-001a";
-       laguna_audio_pdata.codec_dai_name = "rt5645-aif1";
-}
-
-static struct platform_device laguna_audio_device = {
-       .name       = "tegra-snd-rt5645",
-       .id       = 0,
-       .dev       = {
-               .platform_data = &laguna_audio_pdata,
-       },
-};
-
-static struct tegra_uart_platform_data laguna_loopback_uart_pdata;
-
-static void __init uart_debug_init(void)
-{
-       int debug_port_id;
-
-       debug_port_id = uart_console_debug_init(3);
-       if (debug_port_id < 0)
-               return;
-
-       laguna_uart_devices[debug_port_id] = uart_console_debug_device;
-}
-
-static void __init laguna_uart_init(void)
-{
-       struct clk *c;
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(uart_parent_clk); ++i) {
-               c = tegra_get_clock_by_name(uart_parent_clk[i].name);
-               if (IS_ERR_OR_NULL(c)) {
-                       pr_err("Not able to get the clock for %s\n",
-                                               uart_parent_clk[i].name);
-                       continue;
-               }
-               uart_parent_clk[i].parent_clk = c;
-               uart_parent_clk[i].fixed_clk_rate = clk_get_rate(c);
-       }
-       laguna_uart_pdata.parent_clk_list = uart_parent_clk;
-       laguna_uart_pdata.parent_clk_count = ARRAY_SIZE(uart_parent_clk);
-       laguna_loopback_uart_pdata.parent_clk_list = uart_parent_clk;
-       laguna_loopback_uart_pdata.parent_clk_count =
-                                               ARRAY_SIZE(uart_parent_clk);
-       laguna_loopback_uart_pdata.is_loopback = true;
-       tegra_uarta_device.dev.platform_data = &laguna_uarta_pdata;
-       tegra_uartb_device.dev.platform_data = &laguna_uartb_pdata;
-       tegra_uartc_device.dev.platform_data = &laguna_uartc_pdata;
-       tegra_uartd_device.dev.platform_data = &laguna_uartd_pdata;
-
-       /* Register low speed only if it is selected */
-       if (!is_tegra_debug_uartport_hs())
-               uart_debug_init();
-
-       platform_add_devices(laguna_uart_devices,
-                       ARRAY_SIZE(laguna_uart_devices));
-}
-
-static struct resource tegra_rtc_resources[] = {
-       [0] = {
-               .start = TEGRA_RTC_BASE,
-               .end = TEGRA_RTC_BASE + TEGRA_RTC_SIZE - 1,
-               .flags = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start = INT_RTC,
-               .end = INT_RTC,
-               .flags = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device tegra_rtc_device = {
-       .name = "tegra_rtc",
-       .id   = -1,
-       .resource = tegra_rtc_resources,
-       .num_resources = ARRAY_SIZE(tegra_rtc_resources),
-};
-
-static struct platform_device *laguna_devices[] __initdata = {
-       &tegra_pmu_device,
-       &tegra_rtc_device,
-       &tegra_udc_device,
-#if defined(CONFIG_TEGRA_AVP)
-       &tegra_avp_device,
-#endif
-#if defined(CONFIG_CRYPTO_DEV_TEGRA_SE)
-       &tegra11_se_device,
-#endif
-       &tegra_ahub_device,
-       &tegra_dam_device0,
-       &tegra_dam_device1,
-       &tegra_dam_device2,
-       &tegra_i2s_device1,
-       &tegra_i2s_device3,
-       &tegra_i2s_device4,
-       &laguna_audio_device,
-       &tegra_spdif_device,
-       &spdif_dit_device,
-       &bluetooth_dit_device,
-       &tegra_pcm_device,
-       &tegra_hda_device,
-#if defined(CONFIG_CRYPTO_DEV_TEGRA_AES)
-       &tegra_aes_device,
-#endif
-};
-
-static struct tegra_usb_platform_data tegra_udc_pdata = {
-       .port_otg = true,
-       .has_hostpc = true,
-       .phy_intf = TEGRA_USB_PHY_INTF_UTMI,
-       .op_mode = TEGRA_USB_OPMODE_DEVICE,
-       .u_data.dev = {
-               .vbus_pmu_irq = 0,
-               .vbus_gpio = -1,
-               .charging_supported = false,
-               .remote_wakeup_supported = false,
-       },
-       .u_cfg.utmi = {
-               .hssync_start_delay = 0,
-               .elastic_limit = 16,
-               .idle_wait_delay = 17,
-               .term_range_adj = 6,
-               .xcvr_setup = 8,
-               .xcvr_lsfslew = 2,
-               .xcvr_lsrslew = 2,
-               .xcvr_setup_offset = 0,
-               .xcvr_use_fuses = 1,
-       },
-};
-
-static struct tegra_usb_platform_data tegra_ehci1_utmi_pdata = {
-       .port_otg = true,
-       .has_hostpc = true,
-       .unaligned_dma_buf_supported = true,
-       .phy_intf = TEGRA_USB_PHY_INTF_UTMI,
-       .op_mode = TEGRA_USB_OPMODE_HOST,
-       .u_data.host = {
-               .vbus_gpio = -1,
-               .hot_plug = false,
-               .remote_wakeup_supported = true,
-               .power_off_on_suspend = true,
-       },
-       .u_cfg.utmi = {
-               .hssync_start_delay = 0,
-               .elastic_limit = 16,
-               .idle_wait_delay = 17,
-               .term_range_adj = 6,
-               .xcvr_setup = 15,
-               .xcvr_lsfslew = 2,
-               .xcvr_lsrslew = 2,
-               .xcvr_setup_offset = 0,
-               .xcvr_use_fuses = 1,
-               .vbus_oc_map = 0x4,
-       },
-};
-
-static struct tegra_usb_platform_data tegra_ehci3_utmi_pdata = {
-       .port_otg = false,
-       .has_hostpc = true,
-       .unaligned_dma_buf_supported = true,
-       .phy_intf = TEGRA_USB_PHY_INTF_UTMI,
-       .op_mode = TEGRA_USB_OPMODE_HOST,
-       .u_data.host = {
-               .vbus_gpio = -1,
-               .hot_plug = false,
-               .remote_wakeup_supported = true,
-               .power_off_on_suspend = true,
-       },
-       .u_cfg.utmi = {
-       .hssync_start_delay = 0,
-               .elastic_limit = 16,
-               .idle_wait_delay = 17,
-               .term_range_adj = 6,
-               .xcvr_setup = 8,
-               .xcvr_lsfslew = 2,
-               .xcvr_lsrslew = 2,
-               .xcvr_setup_offset = 0,
-               .xcvr_use_fuses = 1,
-               .vbus_oc_map = 0x5,
-       },
-};
-
-static struct tegra_usb_platform_data tegra_ehci2_hsic_smsc_hub_pdata = {
-       .port_otg = false,
-       .has_hostpc = true,
-       .unaligned_dma_buf_supported = true,
-       .phy_intf = TEGRA_USB_PHY_INTF_HSIC,
-       .op_mode        = TEGRA_USB_OPMODE_HOST,
-       .u_data.host = {
-               .vbus_gpio = -1,
-               .hot_plug = false,
-               .remote_wakeup_supported = true,
-               .power_off_on_suspend = true,
-       },
-};
-
-
-static struct tegra_usb_otg_data tegra_otg_pdata = {
-       .ehci_device = &tegra_ehci1_device,
-       .ehci_pdata = &tegra_ehci1_utmi_pdata,
-};
-
-static void laguna_usb_init(void)
-{
-       int usb_port_owner_info = tegra_get_usb_port_owner_info();
-
-       if (!(usb_port_owner_info & UTMI1_PORT_OWNER_XUSB)) {
-               tegra_otg_device.dev.platform_data = &tegra_otg_pdata;
-               platform_device_register(&tegra_otg_device);
-               /* Setup the udc platform data */
-               tegra_udc_device.dev.platform_data = &tegra_udc_pdata;
-       }
-
-       if (!(usb_port_owner_info & UTMI2_PORT_OWNER_XUSB)) {
-               tegra_ehci3_device.dev.platform_data = &tegra_ehci3_utmi_pdata;
-               platform_device_register(&tegra_ehci3_device);
-       }
-}
-
-static void laguna_modem_init(void)
-{
-       int modem_id = tegra_get_modem_id();
-       struct board_info board_info;
-       int usb_port_owner_info = tegra_get_usb_port_owner_info();
-
-       tegra_get_board_info(&board_info);
-       pr_info("%s: modem_id = %d\n", __func__, modem_id);
-
-       switch (modem_id) {
-       case TEGRA_BB_HSIC_HUB: /* HSIC hub */
-               if (!(usb_port_owner_info & HSIC1_PORT_OWNER_XUSB)) {
-                       tegra_ehci2_device.dev.platform_data =
-                               &tegra_ehci2_hsic_smsc_hub_pdata;
-                       platform_device_register(&tegra_ehci2_device);
-               }
-               break;
-       default:
-               return;
-       }
-}
-
-#ifndef CONFIG_USE_OF
-static struct platform_device *laguna_spi_devices[] __initdata = {
-       &tegra11_spi_device4,
-};
-
-static struct tegra_spi_platform_data laguna_spi_pdata = {
-       .dma_req_sel            = 0,
-       .spi_max_frequency      = 25000000,
-       .clock_always_on        = false,
-};
-
-static void __init laguna_spi_init(void)
-{
-       tegra11_spi_device4.dev.platform_data = &laguna_spi_pdata;
-       platform_add_devices(laguna_spi_devices,
-                       ARRAY_SIZE(laguna_spi_devices));
-}
-#else
-static void __init laguna_spi_init(void)
-{
-}
-#endif
-
-#ifdef CONFIG_USE_OF
-struct of_dev_auxdata laguna_auxdata_lookup[] __initdata = {
-       OF_DEV_AUXDATA("nvidia,tegra114-sdhci", 0x78000600, "sdhci-tegra.3",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-sdhci", 0x78000400, "sdhci-tegra.2",
-                               NULL),
-#if 0
-       OF_DEV_AUXDATA("nvidia,tegra114-sdhci", 0x78000000, "sdhci-tegra.0",
-                               &laguna_tegra_sdhci_platform_data0),
-#endif
-       OF_DEV_AUXDATA("nvidia,tegra114-camera", 0x0, "tegra_camera",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-host1x", TEGRA_HOST1X_BASE, "host1x",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-gr3d", TEGRA_GR3D_BASE, "gr3d",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-gr2d", TEGRA_GR2D_BASE, "gr2d",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-msenc", TEGRA_MSENC_BASE, "msenc",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-vi", TEGRA_VI_BASE, "vi",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-isp", TEGRA_ISP_BASE, "isp",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-tsec", TEGRA_TSEC_BASE, "tsec",
-                               NULL),
-
-       OF_DEV_AUXDATA("nvidia,tegra114-i2c", 0x7000c000, "tegra11-i2c.0",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-i2c", 0x7000c400, "tegra11-i2c.1",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-i2c", 0x7000c500, "tegra11-i2c.2",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-i2c", 0x7000c700, "tegra11-i2c.3",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-i2c", 0x7000d000, "tegra11-i2c.4",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d400, "spi-tegra114.0",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d600, "spi-tegra114.1",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d800, "spi-tegra114.2",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000da00, "spi-tegra114.3",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000dc00, "spi-tegra114.4",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000de00, "spi-tegra114.5",
-                               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-apbdma", 0x6000a000, "tegra-apbdma",
-                               NULL),
-       {}
-};
-#endif
-
-static void __init tegra_laguna_early_init(void)
-{
-       tegra_clk_init_from_table(laguna_clk_init_table);
-       tegra_clk_verify_parents();
-       tegra_soc_device_init("laguna");
-}
-
-static void __init tegra_laguna_late_init(void)
-{
-       platform_device_register(&tegra_pinmux_device);
-       laguna_pinmux_init();
-       laguna_usb_init();
-       laguna_modem_init();
-       laguna_i2c_init();
-       laguna_uart_init();
-       laguna_audio_init();
-       platform_add_devices(laguna_devices, ARRAY_SIZE(laguna_devices));
-       tegra_ram_console_debug_init();
-       tegra_io_dpd_init();
-       laguna_sdhci_init();
-       laguna_regulator_init();
-       laguna_suspend_init();
-#if 0
-       laguna_emc_init();
-       laguna_edp_init();
-#endif
-       isomgr_init();
-#if 0
-       laguna_touch_init();
-#endif
-       laguna_panel_init();
-       laguna_kbc_init();
-#if 0
-       laguna_pmon_init();
-#endif
-       tegra_release_bootloader_fb();
-#ifdef CONFIG_TEGRA_WDT_RECOVERY
-       tegra_wdt_recovery_init();
-#endif
-       tegra_serial_debug_init(TEGRA_UARTD_BASE, INT_WDT_CPU, NULL, -1, -1);
-#if 0
-       laguna_sensors_init();
-       laguna_soctherm_init();
-#endif
-       tegra_register_fuse();
-       tegra_serial_debug_init(TEGRA_UARTD_BASE, INT_WDT_CPU, NULL, -1, -1);
-}
-
-static void __init laguna_ramconsole_reserve(unsigned long size)
-{
-       tegra_ram_console_debug_reserve(SZ_1M);
-}
-
-static void __init tegra_laguna_dt_init(void)
-{
-       tegra_get_board_info(&board_info);
-       tegra_get_display_board_info(&display_board_info);
-
-       tegra_laguna_early_init();
-#ifdef CONFIG_USE_OF
-       of_platform_populate(NULL,
-               of_default_bus_match_table, laguna_auxdata_lookup,
-               &platform_bus);
-#else
-       platform_device_register(&tegra_gpio_device);
-#endif
-       tegra_laguna_late_init();
-}
-
-static void __init tegra_laguna_reserve(void)
-{
-#if defined(CONFIG_NVMAP_CONVERT_CARVEOUT_TO_IOVMM)
-       /* 1920*1200*4*2 = 18432000 bytes */
-       tegra_reserve(0, SZ_16M + SZ_2M, SZ_16M);
-#else
-       tegra_reserve(SZ_128M, SZ_16M + SZ_2M, SZ_4M);
-#endif
-       laguna_ramconsole_reserve(SZ_1M);
-}
-
-static const char * const laguna_dt_board_compat[] = {
-       "nvidia,laguna",
-       NULL
-};
-
-DT_MACHINE_START(LAGUNA, "laguna")
-       .atag_offset            = 0x100,
-       .smp                    = smp_ops(tegra_smp_ops),
-       .map_io                 = tegra_map_common_io,
-       .reserve                = tegra_laguna_reserve,
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-       .init_early             = tegra11x_init_early,
-#else
-       .init_early             = tegra12x_init_early,
-#endif
-       .init_irq               = tegra_dt_init_irq,
-       .handle_irq             = gic_handle_irq,
-       .timer                  = &tegra_sys_timer,
-       .init_machine           = tegra_laguna_dt_init,
-       .restart                = tegra_assert_system_reset,
-       .dt_compat              = laguna_dt_board_compat,
-MACHINE_END
diff --git a/arch/arm/mach-tegra/board-laguna.h b/arch/arm/mach-tegra/board-laguna.h
deleted file mode 100644 (file)
index 46d99b6..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-laguna.h
- *
- * Copyright (c) 2013, 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 version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#ifndef _MACH_TEGRA_BOARD_LAGUNA_H
-#define _MACH_TEGRA_BOARD_LAGUNA_H
-
-#include <linux/mfd/as3722-reg.h>
-#include <mach/gpio-tegra.h>
-#include <mach/gpio.h>
-#include <mach/irqs.h>
-#include "gpio-names.h"
-
-/* External peripheral act as gpio */
-/* AS3720 GPIO */
-#define AS3722_GPIO_BASE        TEGRA_NR_GPIOS
-#define AS3722_GPIO_END                (AS3722_GPIO_BASE + AS3722_NUM_GPIO)
-/* PMU_TCA6416 GPIOs */
-#define PMU_TCA6416_GPIO_BASE   (AS3722_GPIO_END)
-/* External peripheral act as interrupt controller */
-/* AS3720 IRQs */
-#define AS3722_IRQ_BASE                TEGRA_NR_IRQS
-
-int laguna_pinmux_init(void);
-int laguna_panel_init(void);
-int laguna_kbc_init(void);
-int laguna_sdhci_init(void);
-int laguna_sensors_init(void);
-int laguna_regulator_init(void);
-int laguna_suspend_init(void);
-
-/* Baseband IDs */
-enum tegra_bb_type {
-       TEGRA_BB_NEMO = 1,
-       TEGRA_BB_HSIC_HUB = 6,
-};
-
-#define UTMI1_PORT_OWNER_XUSB   0x1
-#define UTMI2_PORT_OWNER_XUSB   0x2
-#define HSIC1_PORT_OWNER_XUSB   0x4
-
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-/* Audio-related GPIOs */
-#define TEGRA_GPIO_CDC_IRQ TEGRA_GPIO_PW3
-#define TEGRA_GPIO_LDO1_EN TEGRA_GPIO_PV3
-#define TEGRA_GPIO_HP_DET  TEGRA_GPIO_PR7
-#define TEGRA_GPIO_CODEC1_EN  -1 /*TEGRA_GPIO_PP3*/
-#define TEGRA_GPIO_CODEC2_EN  -1 /*TEGRA_GPIO_PP1*/
-#define TEGRA_GPIO_CODEC3_EN  -1 /*TEGRA_GPIO_PV0*/
-#define TEGRA_GPIO_INT_MIC_EN -1 /*TEGRA_GPIO_PK3*/
-#define TEGRA_GPIO_SPKR_EN    -1
-#define TEGRA_GPIO_EXT_MIC_EN -1
-
-/* Display related GPIO */
-#define DSI_PANEL_RST_GPIO     TEGRA_GPIO_PH3 /* GMI_AD11 */
-#define LCD_RST_L              TEGRA_GPIO_PH5 /* GMI_AD13 */
-#define LCD_LR                 TEGRA_GPIO_PH6 /* GMI_AD14 */
-#define LCD_TE                 TEGRA_GPIO_PI4 /* GMI_RST_N */
-#define DSI_PANEL_BL_PWM       TEGRA_GPIO_PH1 /*GMI_AD9 */
-#define en_vdd_bl       TEGRA_GPIO_PP2 /* DAP3_DOUT */
-#define lvds_en                TEGRA_GPIO_PI0 /* GMI_WR_N */
-#define refclk_en      TEGRA_GPIO_PG4 /* GMI_AD4 */
-
-#else
-/*for t124 ardbeg */
-#define TEGRA_GPIO_CDC_IRQ TEGRA_GPIO_PH4
-#define TEGRA_GPIO_LDO1_EN TEGRA_GPIO_PR2
-#define TEGRA_GPIO_HP_DET  TEGRA_GPIO_PR7
-#define TEGRA_GPIO_CODEC1_EN  -1 /*TEGRA_GPIO_PP3*/
-#define TEGRA_GPIO_CODEC2_EN  -1 /*TEGRA_GPIO_PP1*/
-#define TEGRA_GPIO_CODEC3_EN  -1 /*TEGRA_GPIO_PV0*/
-#define TEGRA_GPIO_INT_MIC_EN -1 /*TEGRA_GPIO_PK3*/
-#define TEGRA_GPIO_SPKR_EN    -1
-#define TEGRA_GPIO_EXT_MIC_EN -1
-/* Display related GPIO */
-#define DSI_PANEL_RST_GPIO     TEGRA_GPIO_PH3 /* GMI_AD11 */
-#define LCD_RST_L              TEGRA_GPIO_PH5 /* GMI_AD13 */
-#define LCD_LR                 TEGRA_GPIO_PH6 /* GMI_AD14 */
-#define LCD_TE                 TEGRA_GPIO_PI4 /* GMI_RST_N */
-#define DSI_PANEL_BL_PWM       TEGRA_GPIO_PH1 /*GMI_AD9 */
-#define en_vdd_bl       TEGRA_GPIO_PP2 /* DAP3_DOUT */
-#define lvds_en                TEGRA_GPIO_PI0 /* GMI_WR_N */
-#define refclk_en      TEGRA_GPIO_PG4 /* GMI_AD4 */
-#endif
-
-#endif
index d4981d3..b2fd937 100644 (file)
@@ -27,7 +27,7 @@
 #include <linux/ioport.h>
 #include "board.h"
 #include "board-panel.h"
-#include "board-laguna.h"
+#include "board-ardbeg.h"
 #include "devices.h"
 #include "gpio-names.h"
 #include "tegra11_host1x_devices.h"
index 46b2942..5a12e4d 100644 (file)
 #define BOARD_E1690   0x069A
 #define BOARD_E1740   0x06CC
 #define BOARD_P2560   0x0A00
+#define BOARD_E1780   0x06F4
+#define BOARD_PM358   0x0166
+#define BOARD_PM359   0x0167
+#define BOARD_PM363   0x016B
 
 /* Panel board ID */
 #define    BOARD_E1582    0x062e