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

Commit f534a6b6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable TLMM STROBE wakeup in XO for 9x07 HSIC"

parents f6787e6f da7cbf60

arch/arm/boot/dts/qcom/mdm9607-pm.dtsi

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -127,6 +127,7 @@ 
		qcom,gic-parent = <&intc>;

		qcom,gic-map = <2 216>, /* tsens_upper_lower_int */

			<49 172>, /* usb1_hs_async_wakeup_irq */

			<50 173>, /* hsic_core_irq */

			<51 174>, /* usb2_hs_async_wakeup_irq */

			<53 104>, /* mdss_irq */

			<58 166>, /* usb_hs_irq */
@@ -155,7 +156,6 @@ 
			<0xff 164>, /* qpic_bam_irq[0] */

			<0xff 168>,

			<0xff 170>, /* sdc1_pwr_cmd_irq */

			<0xff 173>, /* hsic_core_irq */

			<0xff 192>, /* audio_out0_irq */

			<0xff 198>, /* qdss_etrbytecnt_irq */

			<0xff 200>, /* rpm_ipc(4) */

arch/arm/boot/dts/qcom/mdm9607.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -599,13 +599,13 @@ 
	hsic: hsic@7c00000 {

		compatible = "qcom,hsic-peripheral";

		reg = <0x7c00000 0x352>,

		      <0x1112000 0xc>;

		      <0x1100000 0x1200c>;

		interrupts = <0 141 0>, <0 142 0>;

		qcom,hsic-usb-core-id = <1>;

		vdd-supply = <&mdm9607_l9>;

		qcom,vdd-voltage-level = <0 1225000 1225000>;

		qcom,hsic-tlmm-init-seq =

			<0x8 0x5 0x4 0x5 0x0 0x1>;

			<0x12008 0x5 0x12004 0x5 0x12000 0x1 0x8 0x400000>;

		qcom,hsic-disable-on-boot;



		clocks = <&clock_gcc clk_gcc_usb_hsic_ahb_clk>,

drivers/usb/gadget/ci13xxx_msm_hsic.c

+7 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -367,14 +367,18 @@ static void msm_hsic_start(void) 
{

	struct msm_hsic_per *mhsic = the_mhsic;

	int ret, *seq, seq_count;

	u32 val;



	/* Program TLMM pad configuration for HSIC */

	seq = mhsic->pdata->tlmm_init_seq;

	seq_count = mhsic->pdata->tlmm_seq_count;

	if (seq && seq_count) {

		while (seq[0] >= 0 && seq_count > 0) {

			writel_relaxed(seq[1],

					mhsic->tlmm_regs + seq[0]);

			val = readl_relaxed(mhsic->tlmm_regs + seq[0]);

			val |= seq[1];

			dev_dbg(mhsic->dev, "%s: writing %x to %p\n",

				__func__, val, mhsic->tlmm_regs + seq[0]);

			writel_relaxed(val, mhsic->tlmm_regs + seq[0]);

			seq += 2;

			seq_count -= 2;

		}