Re: [PATCH] mfd: prcmu: delete pin control helpers
Hi Linus, On Tue, Jan 22, 2013 at 02:25:35PM +0100, Linus Walleij wrote: > On Tue, Jan 22, 2013 at 4:25 AM, Samuel Ortiz wrote: > > On Mon, Jan 07, 2013 at 09:13:18AM +0100, Linus Walleij wrote: > >> From: Linus Walleij > >> > >> These static inlines are duplicating the task now done by the > >> Nomadik pinctrl drivers, so delete them from the prcmu static > >> inlines, also delete the register definitions as these should > >> only be known by the pinctrl driver. > >> > >> Cc: Loic Pallardy > >> Cc: Patrice Chotard > >> Cc: Michel Jaouen > >> Signed-off-by: Linus Walleij > >> --- > >> Sam, this is a pure clean-up patch following the v3.8 merge > >> window. These inlines are completely unused in the kernel and > >> I'd simply apply it to the -rc series but it's up to you. > > > > Unless it really makes your life easier, I like to keep my -rc pull requests > > for fixes only. > > I'll apply it to my for-next branch for now. > > OK in that case, can I take it through the ARM SoC tree > with your ACK, because I have other cleanups that depend on > this one? Fair enough: Acked-by: Samuel Ortiz Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] mfd: prcmu: delete pin control helpers
Hi Linus, On Tue, Jan 22, 2013 at 02:25:35PM +0100, Linus Walleij wrote: On Tue, Jan 22, 2013 at 4:25 AM, Samuel Ortiz sa...@linux.intel.com wrote: On Mon, Jan 07, 2013 at 09:13:18AM +0100, Linus Walleij wrote: From: Linus Walleij linus.wall...@linaro.org These static inlines are duplicating the task now done by the Nomadik pinctrl drivers, so delete them from the prcmu static inlines, also delete the register definitions as these should only be known by the pinctrl driver. Cc: Loic Pallardy loic.palla...@st.com Cc: Patrice Chotard patrice.chot...@st.com Cc: Michel Jaouen michel.jao...@st.com Signed-off-by: Linus Walleij linus.wall...@linaro.org --- Sam, this is a pure clean-up patch following the v3.8 merge window. These inlines are completely unused in the kernel and I'd simply apply it to the -rc series but it's up to you. Unless it really makes your life easier, I like to keep my -rc pull requests for fixes only. I'll apply it to my for-next branch for now. OK in that case, can I take it through the ARM SoC tree with your ACK, because I have other cleanups that depend on this one? Fair enough: Acked-by: Samuel Ortiz sa...@linux.intel.com Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] mfd: prcmu: delete pin control helpers
On Tue, Jan 22, 2013 at 4:25 AM, Samuel Ortiz wrote: > On Mon, Jan 07, 2013 at 09:13:18AM +0100, Linus Walleij wrote: >> From: Linus Walleij >> >> These static inlines are duplicating the task now done by the >> Nomadik pinctrl drivers, so delete them from the prcmu static >> inlines, also delete the register definitions as these should >> only be known by the pinctrl driver. >> >> Cc: Loic Pallardy >> Cc: Patrice Chotard >> Cc: Michel Jaouen >> Signed-off-by: Linus Walleij >> --- >> Sam, this is a pure clean-up patch following the v3.8 merge >> window. These inlines are completely unused in the kernel and >> I'd simply apply it to the -rc series but it's up to you. > > Unless it really makes your life easier, I like to keep my -rc pull requests > for fixes only. > I'll apply it to my for-next branch for now. OK in that case, can I take it through the ARM SoC tree with your ACK, because I have other cleanups that depend on this one? Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] mfd: prcmu: delete pin control helpers
On Tue, Jan 22, 2013 at 4:25 AM, Samuel Ortiz sa...@linux.intel.com wrote: On Mon, Jan 07, 2013 at 09:13:18AM +0100, Linus Walleij wrote: From: Linus Walleij linus.wall...@linaro.org These static inlines are duplicating the task now done by the Nomadik pinctrl drivers, so delete them from the prcmu static inlines, also delete the register definitions as these should only be known by the pinctrl driver. Cc: Loic Pallardy loic.palla...@st.com Cc: Patrice Chotard patrice.chot...@st.com Cc: Michel Jaouen michel.jao...@st.com Signed-off-by: Linus Walleij linus.wall...@linaro.org --- Sam, this is a pure clean-up patch following the v3.8 merge window. These inlines are completely unused in the kernel and I'd simply apply it to the -rc series but it's up to you. Unless it really makes your life easier, I like to keep my -rc pull requests for fixes only. I'll apply it to my for-next branch for now. OK in that case, can I take it through the ARM SoC tree with your ACK, because I have other cleanups that depend on this one? Yours, Linus Walleij -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] mfd: prcmu: delete pin control helpers
Hi Linus, On Mon, Jan 07, 2013 at 09:13:18AM +0100, Linus Walleij wrote: > From: Linus Walleij > > These static inlines are duplicating the task now done by the > Nomadik pinctrl drivers, so delete them from the prcmu static > inlines, also delete the register definitions as these should > only be known by the pinctrl driver. > > Cc: Loic Pallardy > Cc: Patrice Chotard > Cc: Michel Jaouen > Signed-off-by: Linus Walleij > --- > Sam, this is a pure clean-up patch following the v3.8 merge > window. These inlines are completely unused in the kernel and > I'd simply apply it to the -rc series but it's up to you. Unless it really makes your life easier, I like to keep my -rc pull requests for fixes only. I'll apply it to my for-next branch for now. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] mfd: prcmu: delete pin control helpers
Hi Linus, On Mon, Jan 07, 2013 at 09:13:18AM +0100, Linus Walleij wrote: From: Linus Walleij linus.wall...@linaro.org These static inlines are duplicating the task now done by the Nomadik pinctrl drivers, so delete them from the prcmu static inlines, also delete the register definitions as these should only be known by the pinctrl driver. Cc: Loic Pallardy loic.palla...@st.com Cc: Patrice Chotard patrice.chot...@st.com Cc: Michel Jaouen michel.jao...@st.com Signed-off-by: Linus Walleij linus.wall...@linaro.org --- Sam, this is a pure clean-up patch following the v3.8 merge window. These inlines are completely unused in the kernel and I'd simply apply it to the -rc series but it's up to you. Unless it really makes your life easier, I like to keep my -rc pull requests for fixes only. I'll apply it to my for-next branch for now. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] mfd: prcmu: delete pin control helpers
From: Linus Walleij
These static inlines are duplicating the task now done by the
Nomadik pinctrl drivers, so delete them from the prcmu static
inlines, also delete the register definitions as these should
only be known by the pinctrl driver.
Cc: Loic Pallardy
Cc: Patrice Chotard
Cc: Michel Jaouen
Signed-off-by: Linus Walleij
---
Sam, this is a pure clean-up patch following the v3.8 merge
window. These inlines are completely unused in the kernel and
I'd simply apply it to the -rc series but it's up to you.
---
include/linux/mfd/db8500-prcmu.h | 6 ---
include/linux/mfd/dbx500-prcmu.h | 79
2 files changed, 85 deletions(-)
diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h
index 6ee4247..a65dedd 100644
--- a/include/linux/mfd/db8500-prcmu.h
+++ b/include/linux/mfd/db8500-prcmu.h
@@ -16,12 +16,6 @@
/*
* Registers
*/
-#define DB8500_PRCM_GPIOCR 0x138
-#define DB8500_PRCM_GPIOCR_DBG_UARTMOD_CMD0BIT(0)
-#define DB8500_PRCM_GPIOCR_DBG_STM_APE_CMD BIT(9)
-#define DB8500_PRCM_GPIOCR_DBG_STM_MOD_CMD1BIT(11)
-#define DB8500_PRCM_GPIOCR_SPI2_SELECT BIT(23)
-
#define DB8500_PRCM_LINE_VALUE 0x170
#define DB8500_PRCM_LINE_VALUE_HSI_CAWAKE0 BIT(3)
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index c202d6c..ac60147 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -626,85 +626,6 @@ static inline void prcmu_clear(unsigned int reg, u32 bits)
prcmu_write_masked(reg, bits, 0);
}
-#if defined(CONFIG_UX500_SOC_DB8500)
-
-/**
- * prcmu_enable_spi2 - Enables pin muxing for SPI2 on OtherAlternateC1.
- */
-static inline void prcmu_enable_spi2(void)
-{
- if (cpu_is_u8500())
- prcmu_set(DB8500_PRCM_GPIOCR, DB8500_PRCM_GPIOCR_SPI2_SELECT);
-}
-
-/**
- * prcmu_disable_spi2 - Disables pin muxing for SPI2 on OtherAlternateC1.
- */
-static inline void prcmu_disable_spi2(void)
-{
- if (cpu_is_u8500())
- prcmu_clear(DB8500_PRCM_GPIOCR, DB8500_PRCM_GPIOCR_SPI2_SELECT);
-}
-
-/**
- * prcmu_enable_stm_mod_uart - Enables pin muxing for STMMOD
- * and UARTMOD on OtherAlternateC3.
- */
-static inline void prcmu_enable_stm_mod_uart(void)
-{
- if (cpu_is_u8500()) {
- prcmu_set(DB8500_PRCM_GPIOCR,
- (DB8500_PRCM_GPIOCR_DBG_STM_MOD_CMD1 |
-DB8500_PRCM_GPIOCR_DBG_UARTMOD_CMD0));
- }
-}
-
-/**
- * prcmu_disable_stm_mod_uart - Disables pin muxing for STMMOD
- * and UARTMOD on OtherAlternateC3.
- */
-static inline void prcmu_disable_stm_mod_uart(void)
-{
- if (cpu_is_u8500()) {
- prcmu_clear(DB8500_PRCM_GPIOCR,
- (DB8500_PRCM_GPIOCR_DBG_STM_MOD_CMD1 |
-DB8500_PRCM_GPIOCR_DBG_UARTMOD_CMD0));
- }
-}
-
-/**
- * prcmu_enable_stm_ape - Enables pin muxing for STM APE on OtherAlternateC1.
- */
-static inline void prcmu_enable_stm_ape(void)
-{
- if (cpu_is_u8500()) {
- prcmu_set(DB8500_PRCM_GPIOCR,
- DB8500_PRCM_GPIOCR_DBG_STM_APE_CMD);
- }
-}
-
-/**
- * prcmu_disable_stm_ape - Disables pin muxing for STM APE on OtherAlternateC1.
- */
-static inline void prcmu_disable_stm_ape(void)
-{
- if (cpu_is_u8500()) {
- prcmu_clear(DB8500_PRCM_GPIOCR,
- DB8500_PRCM_GPIOCR_DBG_STM_APE_CMD);
- }
-}
-
-#else
-
-static inline void prcmu_enable_spi2(void) {}
-static inline void prcmu_disable_spi2(void) {}
-static inline void prcmu_enable_stm_mod_uart(void) {}
-static inline void prcmu_disable_stm_mod_uart(void) {}
-static inline void prcmu_enable_stm_ape(void) {}
-static inline void prcmu_disable_stm_ape(void) {}
-
-#endif
-
/* PRCMU QoS APE OPP class */
#define PRCMU_QOS_APE_OPP 1
#define PRCMU_QOS_DDR_OPP 2
--
1.7.11.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] mfd: prcmu: delete pin control helpers
From: Linus Walleij linus.wall...@linaro.org
These static inlines are duplicating the task now done by the
Nomadik pinctrl drivers, so delete them from the prcmu static
inlines, also delete the register definitions as these should
only be known by the pinctrl driver.
Cc: Loic Pallardy loic.palla...@st.com
Cc: Patrice Chotard patrice.chot...@st.com
Cc: Michel Jaouen michel.jao...@st.com
Signed-off-by: Linus Walleij linus.wall...@linaro.org
---
Sam, this is a pure clean-up patch following the v3.8 merge
window. These inlines are completely unused in the kernel and
I'd simply apply it to the -rc series but it's up to you.
---
include/linux/mfd/db8500-prcmu.h | 6 ---
include/linux/mfd/dbx500-prcmu.h | 79
2 files changed, 85 deletions(-)
diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h
index 6ee4247..a65dedd 100644
--- a/include/linux/mfd/db8500-prcmu.h
+++ b/include/linux/mfd/db8500-prcmu.h
@@ -16,12 +16,6 @@
/*
* Registers
*/
-#define DB8500_PRCM_GPIOCR 0x138
-#define DB8500_PRCM_GPIOCR_DBG_UARTMOD_CMD0BIT(0)
-#define DB8500_PRCM_GPIOCR_DBG_STM_APE_CMD BIT(9)
-#define DB8500_PRCM_GPIOCR_DBG_STM_MOD_CMD1BIT(11)
-#define DB8500_PRCM_GPIOCR_SPI2_SELECT BIT(23)
-
#define DB8500_PRCM_LINE_VALUE 0x170
#define DB8500_PRCM_LINE_VALUE_HSI_CAWAKE0 BIT(3)
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index c202d6c..ac60147 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -626,85 +626,6 @@ static inline void prcmu_clear(unsigned int reg, u32 bits)
prcmu_write_masked(reg, bits, 0);
}
-#if defined(CONFIG_UX500_SOC_DB8500)
-
-/**
- * prcmu_enable_spi2 - Enables pin muxing for SPI2 on OtherAlternateC1.
- */
-static inline void prcmu_enable_spi2(void)
-{
- if (cpu_is_u8500())
- prcmu_set(DB8500_PRCM_GPIOCR, DB8500_PRCM_GPIOCR_SPI2_SELECT);
-}
-
-/**
- * prcmu_disable_spi2 - Disables pin muxing for SPI2 on OtherAlternateC1.
- */
-static inline void prcmu_disable_spi2(void)
-{
- if (cpu_is_u8500())
- prcmu_clear(DB8500_PRCM_GPIOCR, DB8500_PRCM_GPIOCR_SPI2_SELECT);
-}
-
-/**
- * prcmu_enable_stm_mod_uart - Enables pin muxing for STMMOD
- * and UARTMOD on OtherAlternateC3.
- */
-static inline void prcmu_enable_stm_mod_uart(void)
-{
- if (cpu_is_u8500()) {
- prcmu_set(DB8500_PRCM_GPIOCR,
- (DB8500_PRCM_GPIOCR_DBG_STM_MOD_CMD1 |
-DB8500_PRCM_GPIOCR_DBG_UARTMOD_CMD0));
- }
-}
-
-/**
- * prcmu_disable_stm_mod_uart - Disables pin muxing for STMMOD
- * and UARTMOD on OtherAlternateC3.
- */
-static inline void prcmu_disable_stm_mod_uart(void)
-{
- if (cpu_is_u8500()) {
- prcmu_clear(DB8500_PRCM_GPIOCR,
- (DB8500_PRCM_GPIOCR_DBG_STM_MOD_CMD1 |
-DB8500_PRCM_GPIOCR_DBG_UARTMOD_CMD0));
- }
-}
-
-/**
- * prcmu_enable_stm_ape - Enables pin muxing for STM APE on OtherAlternateC1.
- */
-static inline void prcmu_enable_stm_ape(void)
-{
- if (cpu_is_u8500()) {
- prcmu_set(DB8500_PRCM_GPIOCR,
- DB8500_PRCM_GPIOCR_DBG_STM_APE_CMD);
- }
-}
-
-/**
- * prcmu_disable_stm_ape - Disables pin muxing for STM APE on OtherAlternateC1.
- */
-static inline void prcmu_disable_stm_ape(void)
-{
- if (cpu_is_u8500()) {
- prcmu_clear(DB8500_PRCM_GPIOCR,
- DB8500_PRCM_GPIOCR_DBG_STM_APE_CMD);
- }
-}
-
-#else
-
-static inline void prcmu_enable_spi2(void) {}
-static inline void prcmu_disable_spi2(void) {}
-static inline void prcmu_enable_stm_mod_uart(void) {}
-static inline void prcmu_disable_stm_mod_uart(void) {}
-static inline void prcmu_enable_stm_ape(void) {}
-static inline void prcmu_disable_stm_ape(void) {}
-
-#endif
-
/* PRCMU QoS APE OPP class */
#define PRCMU_QOS_APE_OPP 1
#define PRCMU_QOS_DDR_OPP 2
--
1.7.11.3
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
