Merge remote-tracking branch 'AndDiSa/ads-7.1.0' into ads-7.1.0

AirOne70 · Aug 20, 2017 · 61445b4 · 61445b4
2 parents dc95e53 + 4310049
commit 61445b4
Show file tree

Hide file tree

Showing 11 changed files with 455 additions and 60 deletions.
diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig
@@ -516,6 +516,8 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_FREQ_GOV_INTELLIACTIVE=y
+CONFIG_CPU_INPUT_BOOST=y
+
 
 #
 # ARM CPU frequency scaling drivers

diff --git a/arch/arm/mach-tegra/board-grouper-panel.c b/arch/arm/mach-tegra/board-grouper-panel.c
@@ -217,6 +217,13 @@ static struct platform_device grouper_backlight_device = {
 	},
 };
 
+static int grouper_panel_prepoweroff(void)
+{
+       gpio_set_value(grouper_lvds_shutdown, 0);
+
+       return 0;
+}
+
 static int grouper_panel_postpoweron(void)
 {
 	if (grouper_lvds_reg == NULL) {
@@ -600,6 +607,7 @@ static struct tegra_dc_out grouper_disp1_out = {
 	.modes		= grouper_panel_modes,
 	.n_modes	= ARRAY_SIZE(grouper_panel_modes),
 
+	.prepoweroff    = grouper_panel_prepoweroff,
 	.enable		= grouper_panel_enable,
 	.disable	= grouper_panel_disable,
 	.postpoweron	= grouper_panel_postpoweron,

diff --git a/arch/arm/mach-tegra/board-grouper.c b/arch/arm/mach-tegra/board-grouper.c
@@ -1084,7 +1084,6 @@ static void __init tegra_grouper_init(void)
 	grouper_misc_init();
 	tegra_thermal_init(&thermal_data);
 	tegra_clk_init_from_table(grouper_clk_init_table);
-	grouper_pinmux_init();
 	grouper_misc_reset();
 	grouper_booting_info();
 	grouper_i2c_init();
@@ -1140,11 +1139,17 @@ static void __init tegra_grouper_reserve(void)
 	grouper_ramconsole_reserve(SZ_1M);
 }
 
+static void __init tegra_grouper_init_early(void)
+{
+	tegra_init_early();
+	grouper_pinmux_init();
+}
+
 MACHINE_START(GROUPER, "grouper")
 	.boot_params	= 0x80000100,
 	.map_io		= tegra_map_common_io,
 	.reserve	= tegra_grouper_reserve,
-	.init_early	= tegra_init_early,
+	.init_early	= tegra_grouper_init_early,
 	.init_irq	= tegra_init_irq,
 	.timer		= &tegra_timer,
 	.init_machine	= tegra_grouper_init,

diff --git a/arch/arm/mach-tegra/include/mach/dc.h b/arch/arm/mach-tegra/include/mach/dc.h
@@ -383,6 +383,7 @@ struct tegra_dc_out {
 	u8			*out_sel_configs;
 	unsigned		n_out_sel_configs;
 
+	int	(*prepoweroff)(void);
 	int	(*enable)(void);
 	int	(*postpoweron)(void);
 	int	(*disable)(void);

diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
@@ -228,6 +228,11 @@ depends on X86
 source "drivers/cpufreq/Kconfig.x86"
 endmenu
 
+config CPU_INPUT_BOOST
+	bool "CPU Input Boost"
+	help
+	  Boost the CPU on touchscreen, touchpad, and keypad input.
+
 menu "ARM CPU frequency scaling drivers"
 depends on ARM
 source "drivers/cpufreq/Kconfig.arm"

diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
@@ -3,6 +3,9 @@ obj-$(CONFIG_CPU_FREQ)			+= cpufreq.o
 # CPUfreq stats
 obj-$(CONFIG_CPU_FREQ_STAT)             += cpufreq_stats.o
 
+# CPU Input Boost
+obj-$(CONFIG_CPU_INPUT_BOOST)		+= cpu_input_boost.o
+
 # CPUfreq governors 
 obj-$(CONFIG_CPU_FREQ_GOV_PERFORMANCE)	+= cpufreq_performance.o
 obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE)	+= cpufreq_powersave.o