Revert "platform: tegra: Fix sparse warning"

This reverts commit cdc959fe3748c9d6f09dbad96c91644fccaf060b.

The function tegra_check_disp_latency_allowance() will be used. The code
that will actually use this API is still being developed.

The change to the EMC timers code was also an incorrect fix. Including
chip specific header files in the emc_timers code is incorrect.

Change-Id: I018b7d7dc8e7565fd5b23ccf2d3fe0a22d5f5c0e
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/747436
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>

diff --git a/drivers/platform/tegra/mc/latency_allowance.c b/drivers/platform/tegra/mc/latency_allowance.c
index 6f0ac797cd606968506a198b773e33110717d3ec..effdc7413af4e83f0b87e9f3b8ff6010d4614303 100644 (file)
--- a/drivers/platform/tegra/mc/latency_allowance.c
+++ b/drivers/platform/tegra/mc/latency_allowance.c
@@ -286,6 +286,22 @@ int tegra_set_disp_latency_allowance(enum tegra_la_id id,
        return 0;
 }
 
+/*
+ * Check if the passed bandwidth is possible.
+ *
+ * Returns zero if there is a possible LA value that can satifsy @bw_mbps at
+ * @emc_freq_hz. If no function has been defined for the active chip then this
+ * this function returns true (i.e 0).
+ */
+int tegra_check_disp_latency_allowance(enum tegra_la_id id,
+                                      unsigned long emc_freq_hz,
+                                      unsigned int bw_mbps,
+                                      struct dc_to_la_params disp_params) {
+       if (cs.check_disp_la)
+               return cs.check_disp_la(id, emc_freq_hz, bw_mbps, disp_params);
+       return 0;
+}
+
 /* Sets latency allowance based on clients memory bandwitdh requirement.
  * Bandwidth passed is in mega bytes per second.
  */

diff --git a/drivers/platform/tegra/mc/tegra_emc_timers.c b/drivers/platform/tegra/mc/tegra_emc_timers.c
index 28f6a00f5b537d03da5406dff48eee432bb1964e..f806e9ddb31547c59d32cd11674b1fa87f5946b8 100644 (file)
--- a/drivers/platform/tegra/mc/tegra_emc_timers.c
+++ b/drivers/platform/tegra/mc/tegra_emc_timers.c
@@ -35,7 +35,6 @@
 #include <linux/timer.h>
 #include <linux/atomic.h>
 
-#include <linux/platform/tegra/tegra21_emc.h>
 #include <linux/platform/tegra/tegra_emc.h>
 
 #define TEGRA_DRAM_THERM_MAX_STATE     1