Merge "ARM: dts: Enable out of band remote wakeup support on apq8084" (6398fc4f) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/apq8084.dtsi

+9 −3

Original line number	Diff line number	Diff line
		@@ -1378,9 +1378,15 @@
		xhci_hsic_host: qcom,xhci-msm-hsic@0xf9c00000 {
		compatible = "qcom,xhci-msm-hsic";
		reg = <0xf9c00000 0xfc000>;
		interrupts =<0 32 0>,
		<0 29 0>;
		interrupt-names = "core_irq", "pwr_event_irq";
		#address-cells = <0>;
		interrupt-parent = <&xhci_hsic_host>;
		interrupts = <0 1 2>;
		#interrupt-cells = <1>;
		interrupt-map-mask = <0xffffffff>;
		interrupt-map = <0 &intc 0 32 0
		1 &intc 0 29 0
		2 &msmgpio 107 0x4>;
		interrupt-names = "core_irq", "pwr_event_irq", "wakeup_irq";
		hsic-vdd-dig-supply = <&pma8084_s2_corner>;
		hsic-gdsc-supply = <&gdsc_usb_hsic>;
		hsic,strobe-gpio = <&msmgpio 134 0x00>;

arch/arm/mach-msm/board-8084-gpiomux.c

+34 −13

Original line number	Diff line number	Diff line
		@@ -265,19 +265,6 @@ static struct msm_gpiomux_config msm_blsp1_uart6_configs[] __initdata = {
		},
		};

		static struct gpiomux_setting hsic_act_cfg = {
		.func = GPIOMUX_FUNC_1,
		.drv = GPIOMUX_DRV_8MA,
		.pull = GPIOMUX_PULL_NONE,
		};

		static struct gpiomux_setting hsic_sus_cfg = {
		.func = GPIOMUX_FUNC_GPIO,
		.drv = GPIOMUX_DRV_2MA,
		.pull = GPIOMUX_PULL_DOWN,
		.dir = GPIOMUX_OUT_LOW,
		};

		static struct gpiomux_setting hdmi_suspend_cfg = {
		.func = GPIOMUX_FUNC_GPIO,
		.drv = GPIOMUX_DRV_2MA,
		@@ -369,6 +356,33 @@ static struct msm_gpiomux_config msm_hdmi_configs[] __initdata = {
		},
		};

		static struct gpiomux_setting hsic_act_cfg = {
		.func = GPIOMUX_FUNC_1,
		.drv = GPIOMUX_DRV_8MA,
		.pull = GPIOMUX_PULL_NONE,
		};

		static struct gpiomux_setting hsic_sus_cfg = {
		.func = GPIOMUX_FUNC_GPIO,
		.drv = GPIOMUX_DRV_2MA,
		.pull = GPIOMUX_PULL_DOWN,
		.dir = GPIOMUX_OUT_LOW,
		};

		static struct gpiomux_setting hsic_wakeup_act_cfg = {
		.func = GPIOMUX_FUNC_GPIO,
		.drv = GPIOMUX_DRV_8MA,
		.pull = GPIOMUX_PULL_DOWN,
		.dir = GPIOMUX_IN,
		};

		static struct gpiomux_setting hsic_wakeup_sus_cfg = {
		.func = GPIOMUX_FUNC_GPIO,
		.drv = GPIOMUX_DRV_2MA,
		.pull = GPIOMUX_PULL_DOWN,
		.dir = GPIOMUX_IN,
		};

		static struct msm_gpiomux_config apq8084_hsic_configs[] = {
		{
		.gpio = 134, /HSIC_STROBE /
		@@ -384,6 +398,13 @@ static struct msm_gpiomux_config apq8084_hsic_configs[] = {
		[GPIOMUX_SUSPENDED] = &hsic_sus_cfg,
		},
		},
		{
		.gpio = 107, /* wake up */
		.settings = {
		[GPIOMUX_ACTIVE] = &hsic_wakeup_act_cfg,
		[GPIOMUX_SUSPENDED] = &hsic_wakeup_sus_cfg,
		},
		},
		};

		static struct gpiomux_setting lcd_en_act_cfg = {