linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Boyd <sboyd@codeaurora.org>
To: Rohit Vaswani <rvaswani@codeaurora.org>
Cc: David Brown <davidb@codeaurora.org>,
	Daniel Walker <dwalker@fifo99.com>,
	Bryan Huntsman <bryanh@codeaurora.org>,
	Russell King <linux@arm.linux.org.uk>,
	Grant Likely <grant.likely@linaro.org>,
	Linus Walleij <linus.walleij@linaro.org>,
	linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs
Date: Thu, 23 May 2013 09:57:56 -0700	[thread overview]
Message-ID: <519E4A94.5080703@codeaurora.org> (raw)
In-Reply-To: <1369268964-28304-2-git-send-email-rvaswani@codeaurora.org>

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

  reply	other threads:[~2013-05-23 16:57 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-23  0:29 [PATCHv2 0/3] Cleanup MSM_GPIOMUX and add DT support for gpio-msm Rohit Vaswani
2013-05-23  0:29 ` [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs Rohit Vaswani
2013-05-23 16:57   ` Stephen Boyd [this message]
2013-05-23 19:37     ` Rohit Vaswani
2013-05-23  0:29 ` [PATCH 2/3] ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60 Rohit Vaswani
2013-05-23  0:29 ` [PATCHv2 3/3] gpio: msm: Add device tree and irqdomain support for gpio-msm-v2 Rohit Vaswani
2013-05-23 11:33   ` Stanimir Varbanov
2013-05-31 12:42   ` Grant Likely
2013-05-31 21:31     ` Rohit Vaswani
2013-05-31 20:01   ` Andy Shevchenko
2013-05-31 20:56     ` Grant Likely
  -- strict thread matches above, loose matches on Subject: below --
2013-06-10 22:50 [PATCHv5 0/3] Cleanup MSM_GPIOMUX and add DT support for gpio-msm Rohit Vaswani
2013-06-10 22:50 ` [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs Rohit Vaswani
2013-06-01  0:21 [PATCHv4 0/3] Cleanup MSM_GPIOMUX and add DT support for gpio-msm Rohit Vaswani
2013-06-01  0:21 ` [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs Rohit Vaswani
2013-06-17  5:36   ` Linus Walleij
2013-05-24 18:32 [PATCHv3 0/3] Cleanup MSM_GPIOMUX and add DT support for gpio-msm Rohit Vaswani
2013-05-24 18:32 ` [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs Rohit Vaswani
2013-05-21 18:32 [PATCH 0/3] Cleanup MSM_GPIOMUX and add device-tree support for Rohit Vaswani
2013-05-21 18:32 ` [PATCH 1/3] ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs Rohit Vaswani
2013-05-30 17:53   ` Linus Walleij

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=519E4A94.5080703@codeaurora.org \
    --to=sboyd@codeaurora.org \
    --cc=bryanh@codeaurora.org \
    --cc=davidb@codeaurora.org \
    --cc=dwalker@fifo99.com \
    --cc=grant.likely@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=rvaswani@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).