From: Dima Zavin <dima@android.com>
Date: Thu, 11 Nov 2010 23:31:26 +0000 (-0800)
Subject: Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~116
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9b95be845359742cfd490c0da670009ff6222496;p=firefly-linux-kernel-4.4.55.git

Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36

Conflicts:
	drivers/video/tegra/dc/hdmi.c

Change-Id: Ia2bd5c56238b9ef0a1eaba3c184c00ea33368263
---

9b95be845359742cfd490c0da670009ff6222496
diff --cc drivers/video/tegra/dc/hdmi.c
index acc3b36ea046,6ad63ba791a4..7e19466d3775
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@@ -23,7 -23,7 +23,8 @@@
  #include <linux/interrupt.h>
  #include <linux/kernel.h>
  #include <linux/slab.h>
+ #include <linux/spinlock.h>
 +#include <linux/switch.h>
  #include <linux/workqueue.h>
  
  #include <mach/clk.h>
@@@ -54,7 -54,9 +55,11 @@@ struct tegra_dc_hdmi_data 
  	struct clk			*disp1_clk;
  	struct clk			*disp2_clk;
  
 +	struct switch_dev		hpd_switch;
++
+ 	spinlock_t			suspend_lock;
+ 	bool				suspended;
+ 	bool				hpd_pending;
  };
  
  const struct fb_videomode tegra_dc_hdmi_supported_modes[] = {
@@@ -569,10 -600,10 +608,13 @@@ static int tegra_dc_hdmi_init(struct te
  	hdmi->clk = clk;
  	hdmi->disp1_clk = disp1_clk;
  	hdmi->disp2_clk = disp2_clk;
+ 	hdmi->suspended = false;
+ 	hdmi->hpd_pending = false;
+ 	spin_lock_init(&hdmi->suspend_lock);
  
 +	hdmi->hpd_switch.name = "hdmi";
 +	switch_dev_register(&hdmi->hpd_switch);
 +
  	dc->out->depth = 24;
  
  	tegra_dc_set_outdata(dc, hdmi);