ARM: DT: Add DT entry for PWMs and Backlight
[linux-3.10.git] / arch / arm / mach-tegra / board-roth.c
index 3dde4fd..2c6e333 100644 (file)
@@ -47,6 +47,8 @@
 #include <linux/of_platform.h>
 #include <linux/usb/tegra_usb_phy.h>
 #include <linux/clk/tegra.h>
+#include <linux/clocksource.h>
+#include <linux/irqchip.h>
 
 #include <asm/system_info.h>
 
@@ -592,7 +594,7 @@ struct rm_spi_ts_platform_data rm31080ts_roth_data = {
 };
 
 static struct tegra_spi_device_controller_data dev_cdata = {
-       .rx_clk_tap_delay = 0,
+       .rx_clk_tap_delay = 16,
        .tx_clk_tap_delay = 16,
 };
 
@@ -611,9 +613,9 @@ struct spi_board_info rm31080a_roth_spi_board[1] = {
 static int __init roth_touch_init(void)
 {
        struct board_info board_info;
+       int touch_panel_id = tegra_get_touch_panel_id();
 
        tegra_get_board_info(&board_info);
-       int touch_panel_id = tegra_get_touch_panel_id();
        if (touch_panel_id == PANEL_TPK ||
                        touch_panel_id == PANEL_WINTEK) {
                int err;
@@ -679,7 +681,6 @@ static void __init tegra_roth_init(void)
 #elif defined CONFIG_BLUEDROID_PM
        roth_setup_bluedroid_pm();
 #endif
-       tegra_release_bootloader_fb();
 #ifdef CONFIG_TEGRA_WDT_RECOVERY
        tegra_wdt_recovery_init();
 #endif
@@ -707,6 +708,10 @@ struct of_dev_auxdata roth_auxdata_lookup[] __initdata = {
        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-pwm", TEGRA_PWFM_BASE, "tegra-pwm",
+                               NULL),
+       OF_DEV_AUXDATA("pwm-backlight", NULL, "pwm-backlight",
+                               NULL),
        {}
 };
 #endif
@@ -744,8 +749,8 @@ MACHINE_START(ROTH, "roth")
        .map_io         = tegra_map_common_io,
        .reserve        = tegra_roth_reserve,
        .init_early     = tegra11x_init_early,
-       .init_irq       = tegra_dt_init_irq,
-       .init_time      = tegra_init_timer,
+       .init_irq       = irqchip_init,
+       .init_time      = clocksource_of_init,
        .init_machine   = tegra_roth_dt_init,
        .restart        = tegra_assert_system_reset,
        .dt_compat      = roth_dt_board_compat,