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

Commit 8fd62389 authored by Rohit Vaswani's avatar Rohit Vaswani Committed by David Brown
Browse files

ARM: msm: Consolidate gpiomux for older architectures 



Msm gpiomux can be used only for 7x30 and 8x50.
Prevent compilation and fix build issues on 7X00, 8X60 and 8960.

Signed-off-by: default avatarRohit Vaswani <rvaswani@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent a39a9f7b

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,