arm: tegra: vcm30_t124: Fix build errors for K3.10
Ashwin Joshi [Wed, 25 Sep 2013 06:15:27 +0000 (11:15 +0530)]
Fix build errors in vcm30_t124 board files for K3.10

Bug 1371545
Signed-off-by: Ashwin Joshi <asjoshi@nvidia.com>

Change-Id: I0cc488cb16f66b1a22107b634eb585db191080b3
Reviewed-on: http://git-master/r/278776
Reviewed-by: Automatic_Commit_Validation_User
Tested-by: Ashwin Joshi <asjoshi@nvidia.com>
Reviewed-by: Sumeet Gupta <sumeetg@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

arch/arm/mach-tegra/board-vcm30_t124-sdhci.c
arch/arm/mach-tegra/board-vcm30_t124.c
arch/arm/mach-tegra/board-vcm30_t124.h

index 601c897..fe6d12f 100644 (file)
 
 #include <asm/mach-types.h>
 #include <mach/irqs.h>
-#include <mach/iomap.h>
-#include <mach/sdhci.h>
 #include <mach/board_id.h>
 #include <linux/i2c.h>
 
+#include "iomap.h"
 #include "gpio-names.h"
 #include "board.h"
 #include "board-vcm30_t124.h"
index 88823c1..0d9ef4b 100644 (file)
 
 #include <mach/tegra_asoc_pdata.h>
 #include <mach/pci.h>
-#include <mach/iomap.h>
 #include <mach/io_dpd.h>
 #include <asm/mach/arch.h>
 #include <mach/isomgr.h>
-#include <asm/hardware/gic.h>
 
+#include "iomap.h"
 #include "board.h"
 #include "clock.h"
 #include "board-vcm30_t124.h"
@@ -250,30 +249,6 @@ static struct platform_device *vcm30_t124_devices[] __initdata = {
        &tegra_hda_device,
 };
 
-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,
@@ -362,13 +337,6 @@ static void vcm30_t124_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_ehci2_device.dev.platform_data = &tegra_ehci2_utmi_pdata;
                platform_device_register(&tegra_ehci2_device);
@@ -447,7 +415,6 @@ static void __init tegra_vcm30_t124_late_init(void)
        vcm30_t124_uart_init();
        platform_add_devices(vcm30_t124_devices,
                        ARRAY_SIZE(vcm30_t124_devices));
-       tegra_ram_console_debug_init();
        tegra_io_dpd_init();
        /* vcm30_t124_sdhci_init(); */
        vcm30_t124_regulator_init();
@@ -516,9 +483,9 @@ DT_MACHINE_START(VCM30_T124, "vcm30_t124")
        .reserve        = tegra_vcm30_t124_reserve,
        .init_early     = tegra12x_init_early,
        .init_irq       = tegra_dt_init_irq,
-       .handle_irq     = gic_handle_irq,
-       .timer          = &tegra_sys_timer,
+        .init_time      = tegra_init_timer,
        .init_machine   = tegra_vcm30_t124_dt_init,
        .restart        = tegra_assert_system_reset,
        .dt_compat      = vcm30_t124_dt_board_compat,
+        .init_late      = tegra_init_late
 MACHINE_END
index cda5a1f..9889ca8 100644 (file)
@@ -21,7 +21,6 @@
 
 #include <linux/mfd/as3722-reg.h>
 #include <mach/gpio-tegra.h>
-#include <mach/gpio.h>
 #include <mach/irqs.h>
 #include <linux/mfd/max77663-core.h>
 #include "gpio-names.h"