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

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

Merge tag 'msm-3.11-fix1' of... 

Merge tag 'msm-3.11-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into fixes

From David Brown, fixes for MSM for 3.11:

Two small fixes for MSM.

The first fixes the a gpio controller register address.  I didn't see
any acks from the devicetree maintainers, so I've copied them on this
pull request.  The change itself is minor, and just to the register
address.

The second change removes the gpiomux V1 code from MSM.  This was
breaking compilation for some of the targets.

* tag 'msm-3.11-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm

:
  ARM: msm: Consolidate gpiomux for older architectures
  ARM: msm: dts: Fix the gpio register address for msm8960

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5ae90d8e 8fd62389

arch/arm/boot/dts/msm8960-cdp.dts

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
		cpu-offset = <0x80000>;

	};



	msmgpio: gpio@fd510000 {

	msmgpio: gpio@800000 {

		compatible = "qcom,msm-gpio";

		gpio-controller;

		#gpio-cells = <2>;
@@ -34,7 +34,7 @@ 
		interrupts = <0 32 0x4>;

		interrupt-controller;

		#interrupt-cells = <2>;

		reg = <0xfd510000 0x4000>;

		reg = <0x800000 0x4000>;

	};



	serial@16440000 {

arch/arm/mach-msm/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ config MSM_SMD 
	bool



config MSM_GPIOMUX

	depends on !(ARCH_MSM8X60 || ARCH_MSM8960)

	bool "MSM V1 TLMM GPIOMUX architecture"

	bool

	help

	  Support for MSM V1 TLMM GPIOMUX architecture.

arch/arm/mach-msm/gpiomux-v1.c

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/* Copyright (c) 2010, Code Aurora Forum. 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

 * 02110-1301, USA.

 */

#include <linux/kernel.h>

#include "gpiomux.h"

#include "proc_comm.h"



void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val)

{

	unsigned tlmm_config  = (val & ~GPIOMUX_CTL_MASK) |

				((gpio & 0x3ff) << 4);

	unsigned tlmm_disable = 0;

	int rc;



	rc = msm_proc_comm(PCOM_RPC_GPIO_TLMM_CONFIG_EX,

			   &tlmm_config, &tlmm_disable);

	if (rc)

		pr_err("%s: unexpected proc_comm failure %d: %08x %08x\n",

		       __func__, rc, tlmm_config, tlmm_disable);

}

arch/arm/mach-msm/gpiomux.h

+0 −10
Original line number Diff line number Diff line
@@ -73,16 +73,6 @@ extern struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS]; 
int msm_gpiomux_write(unsigned gpio,

		      gpiomux_config_t active,

		      gpiomux_config_t suspended);



/* Architecture-internal function for use by the framework only.

 * This function can assume the following:

 * - the gpio value has passed a bounds-check

 * - the gpiomux spinlock has been obtained

 *

 * This function is not for public consumption.  External users

 * should use msm_gpiomux_write.

 */

void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val);

#else

static inline int msm_gpiomux_write(unsigned gpio,

				    gpiomux_config_t active,