From: Tony Lindgren <tony@atomide.com>
Date: Wed, 15 Jul 2015 11:23:50 +0000 (-0700)
Subject: Merge branch 'omap-for-v4.3/dt' into for-next
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b975bf61c524fcbeb38b64f2ea6c76d0837db12;p=pandora-kernel.git

Merge branch 'omap-for-v4.3/dt' into for-next
---

1b975bf61c524fcbeb38b64f2ea6c76d0837db12
diff --cc arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
index df8908adb0cb,b874eb774f66..80d236ac64a5
--- a/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
@@@ -120,10 -121,10 +121,10 @@@
  
  	lcd0: display@0 {
  		compatible = "lgphilips,lb035q02";
 -		label = "lcd";
 +		label = "lcd35";
  
  		reg = <1>;					/* CS1 */
- 		spi-max-frequency = <10000000>;
+ 		spi-max-frequency = <500000>;
  		spi-cpol;
  		spi-cpha;