From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/4] ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx
Date: Wed, 07 Nov 2012 08:34:55 +0000 [thread overview]
Message-ID: <1352277298-23312-2-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1352277298-23312-1-git-send-email-horms@verge.net.au>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
PENCx is Power Enable Control pin for USB.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 +-
arch/arm/mach-shmobile/pfc-r8a7779.c | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/include/mach/r8a7779.h
index 499f52d..8ab0cd6 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7779.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7779.h
@@ -71,7 +71,7 @@ enum {
GPIO_FN_A19,
/* IPSR0 */
- GPIO_FN_PENC2, GPIO_FN_SCK0, GPIO_FN_PWM1, GPIO_FN_PWMFSW0,
+ GPIO_FN_USB_PENC2, GPIO_FN_SCK0, GPIO_FN_PWM1, GPIO_FN_PWMFSW0,
GPIO_FN_SCIF_CLK, GPIO_FN_TCLK0_C, GPIO_FN_BS, GPIO_FN_SD1_DAT2,
GPIO_FN_MMC0_D2, GPIO_FN_FD2, GPIO_FN_ATADIR0, GPIO_FN_SDSELF,
GPIO_FN_HCTS1, GPIO_FN_TX4_C, GPIO_FN_A0, GPIO_FN_SD1_DAT3,
diff --git a/arch/arm/mach-shmobile/pfc-r8a7779.c b/arch/arm/mach-shmobile/pfc-r8a7779.c
index cbc26ba..9513234 100644
--- a/arch/arm/mach-shmobile/pfc-r8a7779.c
+++ b/arch/arm/mach-shmobile/pfc-r8a7779.c
@@ -140,7 +140,7 @@ enum {
FN_IP7_3_2, FN_IP7_6_4, FN_IP7_9_7, FN_IP7_12_10,
FN_IP7_14_13, FN_IP2_7_4, FN_IP2_11_8, FN_IP2_15_12,
FN_IP1_28_25, FN_IP2_3_0, FN_IP8_3_0, FN_IP8_7_4,
- FN_IP8_11_8, FN_IP8_15_12, FN_PENC0, FN_PENC1,
+ FN_IP8_11_8, FN_IP8_15_12, FN_USB_PENC0, FN_USB_PENC1,
FN_IP0_2_0, FN_IP8_17_16, FN_IP8_18, FN_IP8_19,
/* GPSR5 */
@@ -176,7 +176,7 @@ enum {
FN_A0, FN_SD1_DAT3, FN_MMC0_D3, FN_FD3,
FN_BS, FN_SD1_DAT2, FN_MMC0_D2, FN_FD2,
FN_ATADIR0, FN_SDSELF, FN_HCTS1, FN_TX4_C,
- FN_PENC2, FN_SCK0, FN_PWM1, FN_PWMFSW0,
+ FN_USB_PENC2, FN_SCK0, FN_PWM1, FN_PWMFSW0,
FN_SCIF_CLK, FN_TCLK0_C,
/* IPSR1 */
@@ -447,7 +447,7 @@ enum {
A0_MARK, SD1_DAT3_MARK, MMC0_D3_MARK, FD3_MARK,
BS_MARK, SD1_DAT2_MARK, MMC0_D2_MARK, FD2_MARK,
ATADIR0_MARK, SDSELF_MARK, HCTS1_MARK, TX4_C_MARK,
- PENC2_MARK, SCK0_MARK, PWM1_MARK, PWMFSW0_MARK,
+ USB_PENC2_MARK, SCK0_MARK, PWM1_MARK, PWMFSW0_MARK,
SCIF_CLK_MARK, TCLK0_C_MARK,
EX_CS0_MARK, RX3_C_IRDA_RX_C_MARK, MMC0_D6_MARK,
@@ -658,7 +658,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(A18_MARK, FN_A18),
PINMUX_DATA(A19_MARK, FN_A19),
- PINMUX_IPSR_DATA(IP0_2_0, PENC2),
+ PINMUX_IPSR_DATA(IP0_2_0, USB_PENC2),
PINMUX_IPSR_MODSEL_DATA(IP0_2_0, SCK0, SEL_SCIF0_0),
PINMUX_IPSR_DATA(IP0_2_0, PWM1),
PINMUX_IPSR_MODSEL_DATA(IP0_2_0, PWMFSW0, SEL_PWMFSW_0),
@@ -1456,7 +1456,7 @@ static struct pinmux_gpio pinmux_gpios[] = {
GPIO_FN(A19),
/* IPSR0 */
- GPIO_FN(PENC2), GPIO_FN(SCK0), GPIO_FN(PWM1), GPIO_FN(PWMFSW0),
+ GPIO_FN(USB_PENC2), GPIO_FN(SCK0), GPIO_FN(PWM1), GPIO_FN(PWMFSW0),
GPIO_FN(SCIF_CLK), GPIO_FN(TCLK0_C), GPIO_FN(BS), GPIO_FN(SD1_DAT2),
GPIO_FN(MMC0_D2), GPIO_FN(FD2), GPIO_FN(ATADIR0), GPIO_FN(SDSELF),
GPIO_FN(HCTS1), GPIO_FN(TX4_C), GPIO_FN(A0), GPIO_FN(SD1_DAT3),
@@ -1865,8 +1865,8 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = {
GP_4_30_FN, FN_IP8_18,
GP_4_29_FN, FN_IP8_17_16,
GP_4_28_FN, FN_IP0_2_0,
- GP_4_27_FN, FN_PENC1,
- GP_4_26_FN, FN_PENC0,
+ GP_4_27_FN, FN_USB_PENC1,
+ GP_4_26_FN, FN_USB_PENC0,
GP_4_25_FN, FN_IP8_15_12,
GP_4_24_FN, FN_IP8_11_8,
GP_4_23_FN, FN_IP8_7_4,
@@ -1981,7 +1981,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = {
FN_BS, FN_SD1_DAT2, FN_MMC0_D2, FN_FD2,
FN_ATADIR0, FN_SDSELF, FN_HCTS1, FN_TX4_C,
/* IP0_2_0 [3] */
- FN_PENC2, FN_SCK0, FN_PWM1, FN_PWMFSW0,
+ FN_USB_PENC2, FN_SCK0, FN_PWM1, FN_PWMFSW0,
FN_SCIF_CLK, FN_TCLK0_C, 0, 0 }
},
{ PINMUX_CFG_REG_VAR("IPSR1", 0xfffc0024, 32,
--
1.7.10.4
next prev parent reply other threads:[~2012-11-07 8:34 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-07 8:34 [GIT PULL] Renesas ARM-based SoC for v3.8 #2 Simon Horman
2012-11-07 8:34 ` Simon Horman [this message]
2012-11-07 8:34 ` [PATCH 2/4] ARM: shmobile: r8a7740: add USB24 clock explain Simon Horman
2012-11-07 8:34 ` [PATCH 3/4] ARM: shmobile: r8a7779: add USB EHCI clock support Simon Horman
2012-11-07 8:34 ` [PATCH 4/4] ARM: shmobile: r8a7779: add USB OHCI " Simon Horman
2013-10-04 6:45 ` [PATCH 4/4] ARM: shmobile: r8a7779: add I2C clock for DT Kuninori Morimoto
2013-10-08 1:50 ` Simon Horman
2012-11-08 6:30 ` [GIT PULL] Renesas ARM-based SoC for v3.8 #2 Simon Horman
2012-11-13 3:10 ` [GIT PULL] Renesas ARM-based SoC for v3.8 #4 Simon Horman
2012-11-13 3:10 ` [PATCH 1/4] Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode" Simon Horman
2012-11-13 3:10 ` [PATCH 2/4] Revert "ARM: shmobile: sh73a0: " Simon Horman
2012-11-13 3:10 ` [PATCH 3/4] Revert "ARM: shmobile: r8a7779: " Simon Horman
2012-11-13 3:10 ` [PATCH 4/4] sh: clkfwk: fixup unsed variable warning Simon Horman
2012-11-13 12:50 ` [GIT PULL] Renesas ARM-based SoC for v3.8 #4 Arnd Bergmann
2013-01-25 2:13 ` [GIT PULL] Renesas ARM-based SoC for v3.9 Simon Horman
2013-01-25 2:13 ` [PATCH 01/15] ARM: shmobile: Remove duplicate inclusion of dma-mapping.h in setup-r8a7740.c Simon Horman
2013-01-25 2:55 ` Sachin Kamat
2013-01-25 3:38 ` Simon Horman
2013-01-25 3:56 ` Sachin Kamat
2013-01-25 2:13 ` [PATCH 02/15] ARM: shmobile: r8a7740: add TMU timer support Simon Horman
2013-01-25 2:13 ` [PATCH 03/15] ARM: shmobile: sh73a0: fixup div4_clks bitmap Simon Horman
2013-01-25 2:13 ` [PATCH 04/15] ARM: mach-shmobile: sh73a0 external IRQ wake update Simon Horman
2013-01-25 2:13 ` [PATCH 05/15] ARM: sh7372: add clock lookup entries for DT-based devices Simon Horman
2013-01-25 2:13 ` [PATCH 06/15] ARM: sh7372: fix cache clean / invalidate order Simon Horman
2013-01-25 2:13 ` [PATCH 07/15] ARM: shmobile: add function declarations for sh7372 DT helper functions Simon Horman
2013-01-25 2:13 ` [PATCH 08/15] ARM: shmobile: sh73a0: Add CPU sleep suspend Simon Horman
2013-01-25 2:13 ` [PATCH 09/15] ARM: shmobile: r8a7740: " Simon Horman
2013-01-25 2:13 ` [PATCH 10/15] ARM: SH-Mobile: sh73a0: Secondary CPUs handle own SCU flags Simon Horman
2013-01-25 2:13 ` [PATCH 11/15] ARM: SH-Mobile: sh73a0: Add CPU Hotplug Simon Horman
2013-01-25 2:13 ` [PATCH 12/15] ARM: mach-shmobile: sh73a0: Allow initialisation of GIC by DT Simon Horman
2013-01-25 10:08 ` Mark Rutland
2013-01-25 2:13 ` [PATCH 13/15] ARM: mach-shmobile: sh73a0: Minimal setup using DT Simon Horman
2013-01-25 2:13 ` [PATCH 14/15] ARM: mach-shmobile: sh73a0: Initialise MMCIF " Simon Horman
2013-01-25 2:13 ` [PATCH 15/15] ARM: shmobile: r8a7779: scif .irqs used SCIx_IRQ_MUXED() Simon Horman
2013-01-25 3:43 ` [GIT PULL] Renesas ARM-based SoC for v3.9 Simon Horman
2013-01-31 6:23 ` [GIT PULL] Renesas ARM-based SoC for v3.9 #2 Simon Horman
2013-01-31 6:23 ` [PATCH 1/9] ARM: shmobile: ag5evm: Use gpio_request_one() Simon Horman
2013-01-31 6:23 ` [PATCH 2/9] ARM: shmobile: ap4evb: " Simon Horman
2013-01-31 6:23 ` [PATCH 3/9] ARM: shmobile: armadillo800eva: " Simon Horman
2013-01-31 6:23 ` [PATCH 4/9] ARM: shmobile: armadillo800eva: Use gpio_set_value() to set GPIO value Simon Horman
2013-01-31 6:23 ` [PATCH 5/9] ARM: shmobile: kota2: Use gpio_request_one() Simon Horman
2013-01-31 6:23 ` [PATCH 6/9] ARM: shmobile: bonito: " Simon Horman
2013-01-31 6:24 ` [PATCH 7/9] ARM: shmobile: kzm9g: " Simon Horman
2013-01-31 6:24 ` [PATCH 8/9] ARM: shmobile: mackerel: " Simon Horman
2013-01-31 6:24 ` [PATCH 9/9] ARM: shmobile: armadillo800eva: set clock rates before timer init Simon Horman
2013-02-01 3:40 ` [GIT PULL] Renesas ARM-based SoC for v3.9 #2 Olof Johansson
2013-01-31 6:26 ` Simon Horman
2013-01-31 6:26 ` [PATCH 1/4] ARM: mach-shmobile: sh73a0: Add reg and device_type properties to cpus Simon Horman
2013-01-31 6:26 ` [PATCH 2/4] ARM: mach-shmobile: emev2: " Simon Horman
2013-01-31 6:26 ` [PATCH 3/4] ARM: mach-shmobile: add shmobile_cpu_disable_any() Simon Horman
2013-01-31 6:26 ` [PATCH 4/4] ARM: mach-shmobile: sh73a0: allow unplugging of CPU0 Simon Horman
2013-02-01 3:40 ` [GIT PULL] Renesas ARM-based SoC for v3.9 #2 Olof Johansson
2013-02-05 3:47 ` [GIT PULL] Renesas ARM-based SoC for v3.9 #3 Simon Horman
2013-02-05 3:47 ` [PATCH] ARM: shmobile: r8a7779: Correct TMU clock support Simon Horman
2013-02-05 19:12 ` [GIT PULL] Renesas ARM-based SoC for v3.9 #3 Olof Johansson
2013-02-06 2:03 ` [GIT PULL] Renesas ARM-based SoC for v3.9 #4 Simon Horman
2013-02-06 2:03 ` [PATCH] ARM: shmobile: Register ARM architected timer Simon Horman
2013-02-10 0:50 ` [GIT PULL] Renesas ARM-based SoC for v3.9 #4 Olof Johansson
2013-02-19 3:49 ` [GIT PULL] Renesas ARM-based SoC for v3.9 #5 Simon Horman
2013-02-19 3:49 ` [PATCH] ARM: shmobile: r8a7779: Correct TMU clock support again Simon Horman
2013-02-19 15:41 ` [GIT PULL] Renesas ARM-based SoC for v3.9 #5 Arnd Bergmann
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=1352277298-23312-2-git-send-email-horms@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.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).