Revert "msm: acpuclock-8064: Lower max L2 speed to 1134MHz"

This reverts commit dbd1c8f19ec4fa293aef598919a2f421f3ff8608.
Revert "msm: acpuclock-8064: Add support for 8064v1.1 FASTER PVS bin"

This reverts commit db236499d3de96e7054de8b4d55b1d670ccf60ac.
ASoc: msm8960: Add msm8960AB board specific change

- GPIOs 23, 35 are used for headset mic on msm8960
- Do not configure GPIOs 23, 35 on msm8960AB target
  for headset mic, as these GIPOs are used for FAN
  external VDD_CX regulator control

Change-Id: I9320e2223fef2476c6ce7a8ccd38ef9555ebe616
Signed-off-by: Jayasena Sangaraboina <jsanga@codeaurora.org>
(cherry picked from commit 21c9f483e14dbb5b54ac5bf63f7d8711a157ebcb)
msm: kgsl: Move graphics device registration for 8960

Move all graphics device registration to one location.  Always register
the 3D core.  Register the 2D cores if they are present on the device.

Change-Id: Id92685950bb98f47725a33a931ea00eb1385d138
Signed-off-by: Carter Cooper <ccooper@codeaurora.org>
(cherry picked from commit 25555d8d29aff405bbd89076f8dd3538b8c24b80)
msm: vidc: Bus clk changes for 8960 PRO.

Assign the correct master clk ids to vidc
bus client. Without this change video init
fails.

Change-Id: I88b0c6798f4c44c78d1c7428e5774f54bcb5de1a
Signed-off-by: Arun Menon <menon@codeaurora.org>
msm: msm_bus: Fix the number of masters for 8960 Pro

The video core master IDs on 8064 Pro are higher than
the ID values for 8960. This patch changes the max
allowed ID value to the correct number.

Change-Id: I286023c362df27272d109a822e32df6673e637ab
Signed-off-by: Gagan Mac <gmac@codeaurora.org>
(cherry picked from commit 42bb27f6410ca2ca066d0396a3d8ac4277978162)
msm: clock-8960: Disable SMMU SFPB hardware clock gating

Disable hardware clock gating for the SMMU ahb interface as
testing has shown that having it enabled leads to random lock ups
in the multimedia subsystem.

Change-Id: I9bced1aa8988e5ec2986959fa4e95cd3ccd46ef0
Signed-off-by: David Garibaldi <dgaribal@codeaurora.org>
(cherry picked from commit f69836a0bd51be3071b943e16112e69608c6d15d)
msm: socinfo: Add support for detecting Krait Pass 3

Add an API for checking whether the current CPU is Krait
Pass 3.

Conflicts:

	arch/arm/mach-msm/include/mach/socinfo.h
	arch/arm/mach-msm/socinfo.c

Change-Id: Id6893ded88ebd83c911720bf35a9a5c9a44fa128
Signed-off-by: Joel King <joelking@codeaurora.org>
(cherry picked from commit 824bd1f08f70d90239538f1c23e50d2178546ec3)
msm: clock-8960: Add core clock for second gfx3d iommu on 8960ab

The 8960ab has two gfx3d iommus one of which was missing.
Also add a dependency on gfx3d_axi_clk for 8960ab

Change-Id: If11e6e5e6d860f27db94b6633d44b94d0ce56ed2
Signed-off-by: Joel King <joelking@codeaurora.org>
Bluetooth: hci_ath: Configure GPIOs as part of bluetooth on.

Configuration of GPIOs should not be part of module init process
as gpios can be shared with other module.
Moved the configuration of gpios as part of driver open and releasing
them as part of driver close, so that there will not be any conflict
between different modules.

Change-Id: Iac507dd1e07e2cd4adb4c28058800fa4f51c9b52
Signed-off-by: Ram Mohan Korukonda <rkorukon@codeaurora.org>
(cherry picked from commit e359d865fd343481f86abeff5120d573493a72cc)
msm: kgsl: Set 8960PRO GPU chip id

There are two versions of 8960.  Set the 8960PRO chip id correctly.
Ensure 8960 clock values do not get changed when the device is 8960PRO.

Change-Id: I818de1badf090b1e11bd03bed2f410a36c3749e9
Signed-off-by: Carter Cooper <ccooper@codeaurora.org>
(cherry picked from commit a7e0e665776279f0f0fd33d33f93be50772374ae)
msm: kgsl: Enable GPU to use multiple IOMMU devices

Set the defualt IOMMU count to two for the GPU.
If the device is 8960 (ie not 8960PRO), set the IOMMU
count to one and let kgsl take care of initializing only
one IOMMU device.

Signed-off-by: Carter Cooper <ccooper@codeaurora.org>
coresight: disable ETM probe for Krait pass3

Memory mapped accesses to ETM registers on Krait pass3 cause
intermittent hangs that lock up all the Kraits and their T32
sessions.

This is currently under debug but until this is resolved
error out of ETM probe for Krait pass3.

Change-Id: Ia7fb4359e9541a7bcaf905f09dea8a009b6c9b1f
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>
Signed-off-by: Joel King <joelking@codeaurora.org>
msm: iommu: Remove the vcap iommu from 8960ab

There is no vcap iommu in the 8960ab platform.
Also, a cleaner separation between platforms is
obtained by re-organizing the gfx3d and vcap
structures by device block instead of by msm.

Change-Id: I9dbfceebe67d44c4ee65e960873e2f9a1811f913
Signed-off-by: Joel King <joelking@codeaurora.org>
(cherry picked from commit b82921f43be2debbe59738a96fe4332b7b48f6b6)
msm: vidc: enable video core clock to 266Mhz

This change will ensure that video core clock is
set to 266Mhz on supported devices, else fallback
to 228Mhz.

(cherry picked from commit 2cd6f1a77d845c162966b974b0e9dd4db0878020)

Change-Id: I5735ede8a9cd79923f33cc20da53c02072f04c10
Signed-off-by: Arun Menon <menon@codeaurora.org>
Signed-off-by: Jessica Gonzalez <jgaona@codeaurora.org>
(cherry picked from commit 3800cde4b3cc3659a0e066cff68ec3c06c0699e8)
msm: socinfo: Add support for APQ8064AB

Add the SoC ID and cpu_is wrapper for identifying the
APQ8064AB SoC.

Change-Id: If3c809a1d2be4fb9cbeb09f67c6b6ffded8e06c9
Signed-off-by: Jay Chokshi <jchokshi@codeaurora.org>
(cherry picked from commit 6b43778d47b576a634307426f694715cc8176874)
msm: clock: Return error upon invalid call to clk_set_rate

Calls to clk_set_rate should only change the voltage vote if the clock
is prepared. However, they need to check if the rate is valid even if
the clock is not prepared.

Change-Id: I5f13807e803689489f2b43bd58fbd8f46137c0e2
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
(cherry picked from commit 879e05ff19333ade09e3c0eaa17e98e8c6207995)
msm: clock-pll: Update PLL enable sequences for new processes

The PLL enable sequences across certain chipsets are
different due to differing manufacturing processes.
Update the PLL enabling sequences to reflect these
differences

Conflicts:

	arch/arm/mach-msm/clock-8960.c

Change-Id: Iba1e515b20f49d1629c512ffce2919e4ce0874c3
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
(cherry picked from commit 87035b42aa2aaebd308271a0fbfbf7c82ef1a9d9)
msm: acpuclock-8064: Add support for multiple speed and PVS bins.

Add support for 1.7 GHz and 2.0 GHz parts and their corresponding
L2 and memory bandwidth votes.

Support selecting different PVS tables based upon EFUSE speed bin
across all krait targets.

Conflicts:

	arch/arm/mach-msm/acpuclock-krait.h

Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
Change-Id: Ibbf6b5182fce0a9e92014883d07a35dee5f0d2a1
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
msm: clock-8960: Add support for 8064v2 and 8064ab

Adjust frequency tables and voltage limits for both v2 and ab
changes.

Conflicts:

	arch/arm/mach-msm/clock-8960.c

Change-Id: I1310122a465be65a2bae5158f5f571f772a87977
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
(cherry picked from commit d0ab394c9655ae68b989fb645744cc41c697b5d9)