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

Commit 2ca602de authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.16/pm-signed' of... 

Merge tag 'omap-for-v3.16/pm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Merge "ARM: omap pm changes for v3.16 merge window, resend" from Tony Lindgren:

PM related fixes for omap3 that were discovered during omap3
conversion to device tree. This series sets up the PMIC signaling
in a way where we can test for PM regressions easily by
looking at state of the the sys_clkreq and sys_off_mode pins.

Note that this series alone does not make omap3 PM to cut
off core voltage during off-idle, changes to twl4030-power.c
configurations are still needed. Those will be posted
separately.

* tag 'omap-for-v3.16/pm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: Enable CPUidle in omap2plus_defconfig
  ARM: dts: Enable N900 keyboard sleep leds by default
  ARM: OMAP2+: Fix voltage scaling init for device tree
  ARM: dts: Configure omap3 twl4030 I2C4 pins by default
  ARM: OMAP3: Fix voltage control for deeper idle states
  ARM: OMAP3: Disable broken omap3_set_off_timings function
  ARM: OMAP3: Fix idle mode signaling for sys_clkreq and sys_off_mode
  ARM: dts: Fix omap serial wake-up when booted with device tree
  mfd: twl-core: Fix idle mode signaling for omaps when booted with device tree

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 98954f4b 57b05572

arch/arm/boot/dts/omap3-evm-37xx.dts

+9 −0
Original line number Diff line number Diff line
@@ -89,7 +89,16 @@ 
	status = "disabled";

};



&uart1 {

	interrupts-extended = <&intc 72 &omap3_pmx_core OMAP3_UART1_RX>;

};



&uart2 {

	interrupts-extended = <&intc 73 &omap3_pmx_core OMAP3_UART2_RX>;

};



&uart3 {

	interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_pins>;

};

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

+4 −0
Original line number Diff line number Diff line
@@ -234,6 +234,10 @@ 
	};

};



&uart3 {

	interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;

};



&usb_otg_hs {

	pinctrl-names = "default";

	pinctrl-0 = <&musb_pins>;

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

+19 −0
Original line number Diff line number Diff line
@@ -21,6 +21,17 @@ 
		};

	};



	leds {

		compatible = "gpio-leds";

		heartbeat {

			label = "debug::sleep";

			gpios = <&gpio6 2 GPIO_ACTIVE_HIGH>;  /* gpio162 */

			linux,default-trigger = "default-on";

			pinctrl-names = "default";

			pinctrl-0 = <&debug_leds>;

		};

	};



	memory {

		device_type = "memory";

		reg = <0x80000000 0x10000000>; /* 256 MB */
@@ -130,6 +141,12 @@ 
		>;

	};



	debug_leds: pinmux_debug_led_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2198, PIN_OUTPUT | MUX_MODE4)	/* mcbsp1_clkx.gpio_162 */

		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			0x114 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_clk */
@@ -618,11 +635,13 @@ 
};



&uart2 {

	interrupts-extended = <&intc 73 &omap3_pmx_core OMAP3_UART2_RX>;

	pinctrl-names = "default";

	pinctrl-0 = <&uart2_pins>;

};



&uart3 {

	interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_pins>;

};

arch/arm/boot/dts/omap3.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ 
		uart1: serial@4806a000 {

			compatible = "ti,omap3-uart";

			reg = <0x4806a000 0x2000>;

			interrupts = <72>;

			interrupts-extended = <&intc 72>;

			dmas = <&sdma 49 &sdma 50>;

			dma-names = "tx", "rx";

			ti,hwmods = "uart1";
@@ -277,7 +277,7 @@ 
		uart2: serial@4806c000 {

			compatible = "ti,omap3-uart";

			reg = <0x4806c000 0x400>;

			interrupts = <73>;

			interrupts-extended = <&intc 73>;

			dmas = <&sdma 51 &sdma 52>;

			dma-names = "tx", "rx";

			ti,hwmods = "uart2";
@@ -287,7 +287,7 @@ 
		uart3: serial@49020000 {

			compatible = "ti,omap3-uart";

			reg = <0x49020000 0x400>;

			interrupts = <74>;

			interrupts-extended = <&intc 74>;

			dmas = <&sdma 53 &sdma 54>;

			dma-names = "tx", "rx";

			ti,hwmods = "uart3";

arch/arm/boot/dts/omap4-panda-common.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -481,6 +481,21 @@ 
	usb-supply = <&vusb>;

};



&uart2 {

	interrupts-extended = <&gic GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH

			       &omap4_pmx_core OMAP4_UART2_RX>;

};



&uart3 {

	interrupts-extended = <&gic GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH

			       &omap4_pmx_core OMAP4_UART3_RX>;

};



&uart4 {

	interrupts-extended = <&gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH

			       &omap4_pmx_core OMAP4_UART4_RX>;

};



&usb_otg_hs {

	interface-type = <1>;

	mode = <3>;