lkml.org 
[lkml]   [2013]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs
On 05/22/13 17:29, Rohit Vaswani wrote:
> diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
> index fceb093..614e41e 100644
> --- a/arch/arm/mach-msm/Kconfig
> +++ b/arch/arm/mach-msm/Kconfig
> @@ -48,9 +48,7 @@ config ARCH_MSM8X60
> select CPU_V7
> select GPIO_MSM_V2
> select HAVE_SMP
> - select MSM_GPIOMUX
> select MSM_SCM if SMP
> - select MSM_V2_TLMM
> select USE_OF
>
> config ARCH_MSM8960
> @@ -58,9 +56,8 @@ config ARCH_MSM8960
> select ARM_GIC
> select CPU_V7
> select HAVE_SMP
> - select MSM_GPIOMUX
> + select GPIO_MSM_V2
> select MSM_SCM if SMP
> - select MSM_V2_TLMM
> select USE_OF
>
> config MSM_HAS_DEBUG_UART_HS
> @@ -124,10 +121,10 @@ config MSM_SMD
> bool
>
> config MSM_GPIOMUX
> - bool
> -
> -config MSM_V2_TLMM
> - bool
> + depends on !(ARCH_MSM8X60 || ARCH_MSM8960)

This list will keep getting bigger over time. Please just keep it a
hidden option and don't select it on 8x60/8960.

> + bool "MSM V1 TLMM GPIOMUX architecture"
> + help
> + Support for MSM V1 TLMM GPIOMUX architecture.
>
> config MSM_SCM
> bool
> diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
> index 17519fa..1a26d04 100644
> --- a/arch/arm/mach-msm/Makefile
> +++ b/arch/arm/mach-msm/Makefile
> @@ -27,7 +27,5 @@ obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
> obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
> obj-$(CONFIG_ARCH_MSM8X60) += board-dt-8660.o
> obj-$(CONFIG_ARCH_MSM8960) += board-dt-8960.o
> -
> -obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o
> -obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o
> -obj-$(CONFIG_ARCH_MSM8X60) += gpiomux-8x60.o gpiomux-v2.o gpiomux.o
> +obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o
> +obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o

Did you mean to delete gpiomux-v1.c as well?

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation



\
 
 \ /
  Last update: 2013-05-23 20:21    [W:0.077 / U:3.808 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site