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

Commit ec16187a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.12/fixes-v2-signed' of... 

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

Fixes for omaps for v4.12-rc cycle most consisting of few minor dts fixes
for various devices. Also included is a memory controller (GPMC) debug output
fix as without that the shown bootloader configured GPMC bus width will
be wrong and won't work for kernel timings:

- Add dra7 powerhold configuration to be able to shut down pmic correctly
- Fix polarity for gta04 mcbsp4 clocks for modem
- Fix Pandaboard CEC pin pull making it usable
- Fix LogicPD Torpedo camera pin mux
- Fix GPMC debug bus width
- Reduce cpu thermal shutdown temperature

* tag 'omap-for-v4.12/fixes-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: dra7: Reduce cpu thermal shutdown temperature
  memory: omap-gpmc: Fix debug output for access width
  ARM: dts: LogicPD Torpedo: Fix camera pin mux
  ARM: dts: omap4: enable CEC pin for Pandaboard A4 and ES
  ARM: dts: gta04: fix polarity of clocks for mcbsp4
  ARM: dts: dra7: Add power hold and power controller properties to palmas

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6a3538c1 bca52388

arch/arm/boot/dts/dra7-evm.dts

+2 −0
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ 
	tps659038: tps659038@58 {

		compatible = "ti,tps659038";

		reg = <0x58>;

		ti,palmas-override-powerhold;

		ti,system-power-controller;



		tps659038_pmic {

			compatible = "ti,tps659038-pmic";

arch/arm/boot/dts/dra7.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -2017,4 +2017,8 @@ 
	coefficients = <0 2000>;

};



&cpu_crit {

	temperature = <120000>; /* milli Celsius */

};



/include/ "dra7xx-clocks.dtsi"

arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts

+3 −3
Original line number Diff line number Diff line
@@ -249,9 +249,9 @@ 
			OMAP3_CORE1_IOPAD(0x2110, PIN_INPUT | MUX_MODE0)   /* cam_xclka.cam_xclka */

			OMAP3_CORE1_IOPAD(0x2112, PIN_INPUT | MUX_MODE0)   /* cam_pclk.cam_pclk */



			OMAP3_CORE1_IOPAD(0x2114, PIN_INPUT | MUX_MODE0)   /* cam_d0.cam_d0 */

			OMAP3_CORE1_IOPAD(0x2116, PIN_INPUT | MUX_MODE0)   /* cam_d1.cam_d1 */

			OMAP3_CORE1_IOPAD(0x2118, PIN_INPUT | MUX_MODE0)   /* cam_d2.cam_d2 */

			OMAP3_CORE1_IOPAD(0x2116, PIN_INPUT | MUX_MODE0)   /* cam_d0.cam_d0 */

			OMAP3_CORE1_IOPAD(0x2118, PIN_INPUT | MUX_MODE0)   /* cam_d1.cam_d1 */

			OMAP3_CORE1_IOPAD(0x211a, PIN_INPUT | MUX_MODE0)   /* cam_d2.cam_d2 */

			OMAP3_CORE1_IOPAD(0x211c, PIN_INPUT | MUX_MODE0)   /* cam_d3.cam_d3 */

			OMAP3_CORE1_IOPAD(0x211e, PIN_INPUT | MUX_MODE0)   /* cam_d4.cam_d4 */

			OMAP3_CORE1_IOPAD(0x2120, PIN_INPUT | MUX_MODE0)   /* cam_d5.cam_d5 */

arch/arm/boot/dts/omap3-gta04.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ 
		simple-audio-card,bitclock-master = <&telephony_link_master>;

		simple-audio-card,frame-master = <&telephony_link_master>;

		simple-audio-card,format = "i2s";



		simple-audio-card,bitclock-inversion;

		simple-audio-card,frame-inversion;

		simple-audio-card,cpu {

			sound-dai = <&mcbsp4>;

		};

arch/arm/boot/dts/omap4-panda-a4.dts

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
/* Pandaboard Rev A4+ have external pullups on SCL & SDA */

&dss_hdmi_pins {

	pinctrl-single,pins = <

		OMAP4_IOPAD(0x09a, PIN_INPUT_PULLUP | MUX_MODE0)	/* hdmi_cec.hdmi_cec */

		OMAP4_IOPAD(0x09a, PIN_INPUT | MUX_MODE0)		/* hdmi_cec.hdmi_cec */

		OMAP4_IOPAD(0x09c, PIN_INPUT | MUX_MODE0)		/* hdmi_scl.hdmi_scl */

		OMAP4_IOPAD(0x09e, PIN_INPUT | MUX_MODE0)		/* hdmi_sda.hdmi_sda */

		>;