Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a68c6bc authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'omap-for-v4.1/fixes-rc6' of... 

Merge tag 'omap-for-v4.1/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge omap fixes for v4.1, urgent fix to avoid potential hardware damage From Tony Lindgren:

Omap fixes for the -rc cycle, including a fix for potential hardware
breakage on BeagleBones:

- BeagleBones don't support RTC-only mode, it can cause hardware
  damage if system-power-controller is specified without
  ti,pmic-shutdown-controller

- Fix a recent regression to am3517 SoCs caused by the recent clock
  move that was not noticed until now despite automated boot
  testing

- Fix a regression for n900 touchscreen triggered by recent
  recent input changes

- Fix compatible property for dm816x USB to avoid errors with
  USB Ethernet

- Fix oops for omap3 when built with CONFIG_THUMB2_KERNEL

* tag 'omap-for-v4.1/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage
  ARM: dts: AM35xx: fix system control module clocks
  ARM: dts: Fix n900 dts file to work around 4.1 touchscreen regression on n900
  ARM: dts: Fix dm816x to use right compatible flag for MUSB
  ARM: OMAP3: Fix booting with thumb2 kernel
parents 9947c34c 7a6cb0ab

Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ Example: 
		touchscreen-fuzz-x = <4>;

		touchscreen-fuzz-y = <7>;

		touchscreen-fuzz-pressure = <2>;

		touchscreen-max-x = <4096>;

		touchscreen-max-y = <4096>;

		touchscreen-size-x = <4096>;

		touchscreen-size-y = <4096>;

		touchscreen-max-pressure = <2048>;



		ti,x-plate-ohms = <280>;

arch/arm/boot/dts/am335x-bone-common.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -223,6 +223,25 @@ 
/include/ "tps65217.dtsi"



&tps {

	/*

	 * Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only

	 * mode") at poweroff.  Most BeagleBone versions do not support RTC-only

	 * mode and risk hardware damage if this mode is entered.

	 *

	 * For details, see linux-omap mailing list May 2015 thread

	 *	[PATCH] ARM: dts: am335x-bone* enable pmic-shutdown-controller

	 * In particular, messages:

	 *	http://www.spinics.net/lists/linux-omap/msg118585.html

	 *	http://www.spinics.net/lists/linux-omap/msg118615.html

	 *

	 * You can override this later with

	 *	&tps {  /delete-property/ ti,pmic-shutdown-controller;  }

	 * if you want to use RTC-only mode and made sure you are not affected

	 * by the hardware problems. (Tip: double-check by performing a current

	 * measurement after shutdown: it should be less than 1 mA.)

	 */

	ti,pmic-shutdown-controller;



	regulators {

		dcdc1_reg: regulator@0 {

			regulator-name = "vdds_dpr";

arch/arm/boot/dts/am35xx-clocks.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
		#clock-cells = <0>;

		compatible = "ti,am35xx-gate-clock";

		clocks = <&ipss_ick>;

		reg = <0x059c>;

		reg = <0x032c>;

		ti,bit-shift = <1>;

	};
@@ -20,7 +20,7 @@ 
		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&rmii_ck>;

		reg = <0x059c>;

		reg = <0x032c>;

		ti,bit-shift = <9>;

	};
@@ -28,7 +28,7 @@ 
		#clock-cells = <0>;

		compatible = "ti,am35xx-gate-clock";

		clocks = <&ipss_ick>;

		reg = <0x059c>;

		reg = <0x032c>;

		ti,bit-shift = <2>;

	};
@@ -36,7 +36,7 @@ 
		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&pclk_ck>;

		reg = <0x059c>;

		reg = <0x032c>;

		ti,bit-shift = <10>;

	};
@@ -44,7 +44,7 @@ 
		#clock-cells = <0>;

		compatible = "ti,am35xx-gate-clock";

		clocks = <&ipss_ick>;

		reg = <0x059c>;

		reg = <0x032c>;

		ti,bit-shift = <0>;

	};
@@ -52,7 +52,7 @@ 
		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&sys_ck>;

		reg = <0x059c>;

		reg = <0x032c>;

		ti,bit-shift = <8>;

	};
@@ -60,7 +60,7 @@ 
		#clock-cells = <0>;

		compatible = "ti,am35xx-gate-clock";

		clocks = <&sys_ck>;

		reg = <0x059c>;

		reg = <0x032c>;

		ti,bit-shift = <3>;

	};

};

arch/arm/boot/dts/dm816x.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ 
			ti,hwmods = "usb_otg_hs";



			usb0: usb@47401000 {

				compatible = "ti,musb-am33xx";

				compatible = "ti,musb-dm816";

				reg = <0x47401400 0x400

				       0x47401000 0x200>;

				reg-names = "mc", "control";
@@ -422,7 +422,7 @@ 
			};



			usb1: usb@47401800 {

				compatible = "ti,musb-am33xx";

				compatible = "ti,musb-dm816";

				reg = <0x47401c00 0x400

				       0x47401800 0x200>;

				reg-names = "mc", "control";

arch/arm/boot/dts/omap3-n900.dts

+2 −2
Original line number Diff line number Diff line
@@ -832,8 +832,8 @@ 
		touchscreen-fuzz-x = <4>;

		touchscreen-fuzz-y = <7>;

		touchscreen-fuzz-pressure = <2>;

		touchscreen-max-x = <4096>;

		touchscreen-max-y = <4096>;

		touchscreen-size-x = <4096>;

		touchscreen-size-y = <4096>;

		touchscreen-max-pressure = <2048>;



		ti,x-plate-ohms = <280>;