* [GIT PULL] Renesas ARM-based SoC for v3.8 #2
@ 2012-11-07 8:34 Simon Horman
2012-11-07 8:34 ` [PATCH 1/4] ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx Simon Horman
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Simon Horman @ 2012-11-07 8:34 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
please consider the following SoC enhancements for 3.8.
This series is based on the previous SoC series that I sent on Tuesday
and was merged later that day: [GIT PULL v4] Renesas ARM-based SoC for v3.8
----------------------------------------------------------------
The following changes since commit 86bc52ef4373be64867b56f3a9e30cbabf64e0dd:
ARM: shmobile: r8a7740: Enable PMU (2012-11-06 13:47:24 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc
for you to fetch changes up to 9d69f5b87e7f6df51ad2a70557474093de934a8c:
ARM: shmobile: r8a7779: add USB OHCI clock support (2012-11-07 17:11:48 +0900)
----------------------------------------------------------------
Kuninori Morimoto (4):
ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx
ARM: shmobile: r8a7740: add USB24 clock explain
ARM: shmobile: r8a7779: add USB EHCI clock support
ARM: shmobile: r8a7779: add USB OHCI clock support
arch/arm/mach-shmobile/clock-r8a7740.c | 16 ++++++++++++++++
arch/arm/mach-shmobile/clock-r8a7779.c | 7 +++++++
arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 +-
arch/arm/mach-shmobile/pfc-r8a7779.c | 16 ++++++++--------
4 files changed, 32 insertions(+), 9 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/4] ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx 2012-11-07 8:34 [GIT PULL] Renesas ARM-based SoC for v3.8 #2 Simon Horman @ 2012-11-07 8:34 ` Simon Horman 2012-11-07 8:34 ` [PATCH 2/4] ARM: shmobile: r8a7740: add USB24 clock explain Simon Horman ` (3 subsequent siblings) 4 siblings, 0 replies; 6+ messages in thread From: Simon Horman @ 2012-11-07 8:34 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] ARM: shmobile: r8a7740: add USB24 clock explain 2012-11-07 8:34 [GIT PULL] Renesas ARM-based SoC for v3.8 #2 Simon Horman 2012-11-07 8:34 ` [PATCH 1/4] ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx Simon Horman @ 2012-11-07 8:34 ` Simon Horman 2012-11-07 8:34 ` [PATCH 3/4] ARM: shmobile: r8a7779: add USB EHCI clock support Simon Horman ` (2 subsequent siblings) 4 siblings, 0 replies; 6+ messages in thread From: Simon Horman @ 2012-11-07 8:34 UTC (permalink / raw) To: linux-arm-kernel From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> USBCKCR is controlling USB parent clock and divide rate. This parent clock is used as a "usb24s" from other devices, but the "divide rate" is not used. Further, this clock itself is known as "usb24". So, to set this clock is a little confusable. This patch adds quick explain and sample settings for this clock. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- arch/arm/mach-shmobile/clock-r8a7740.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c index 6729e00..c012bbf 100644 --- a/arch/arm/mach-shmobile/clock-r8a7740.c +++ b/arch/arm/mach-shmobile/clock-r8a7740.c @@ -188,6 +188,22 @@ static struct clk pllc1_div2_clk = { }; /* USB clock */ +/* + * USBCKCR is controlling usb24 clock + * bit[7] : parent clock + * bit[6] : clock divide rate + * And this bit[7] is used as a "usb24s" from other devices. + * (Video clock / Sub clock / SPU clock) + * You can controll this clock as a below. + * + * struct clk *usb24 = clk_get(dev, "usb24"); + * struct clk *usb24s = clk_get(NULL, "usb24s"); + * struct clk *system = clk_get(NULL, "system_clk"); + * int rate = clk_get_rate(system); + * + * clk_set_parent(usb24s, system); // for bit[7] + * clk_set_rate(usb24, rate / 2); // for bit[6] + */ static struct clk *usb24s_parents[] = { [0] = &system_clk, [1] = &extal2_clk -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] ARM: shmobile: r8a7779: add USB EHCI clock support 2012-11-07 8:34 [GIT PULL] Renesas ARM-based SoC for v3.8 #2 Simon Horman 2012-11-07 8:34 ` [PATCH 1/4] ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx Simon Horman 2012-11-07 8:34 ` [PATCH 2/4] ARM: shmobile: r8a7740: add USB24 clock explain Simon Horman @ 2012-11-07 8:34 ` Simon Horman 2012-11-07 8:34 ` [PATCH 4/4] ARM: shmobile: r8a7779: add USB OHCI " Simon Horman 2012-11-08 6:30 ` [GIT PULL] Renesas ARM-based SoC for v3.8 #2 Simon Horman 4 siblings, 0 replies; 6+ messages in thread From: Simon Horman @ 2012-11-07 8:34 UTC (permalink / raw) To: linux-arm-kernel From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> ehci-platform driver require these clocks Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- arch/arm/mach-shmobile/clock-r8a7779.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c index 24f5a84..4ba4e3c 100644 --- a/arch/arm/mach-shmobile/clock-r8a7779.c +++ b/arch/arm/mach-shmobile/clock-r8a7779.c @@ -87,6 +87,7 @@ static struct clk div4_clks[DIV4_NR] = { }; enum { MSTP323, MSTP322, MSTP321, MSTP320, + MSTP101, MSTP100, MSTP030, MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021, MSTP016, MSTP015, MSTP014, @@ -98,6 +99,8 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP322] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 22, 0), /* SDHI1 */ [MSTP321] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 21, 0), /* SDHI2 */ [MSTP320] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR3, 20, 0), /* SDHI3 */ + [MSTP101] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 1, 0), /* USB2 */ + [MSTP100] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 0, 0), /* USB0/1 */ [MSTP030] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 30, 0), /* I2C0 */ [MSTP029] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 29, 0), /* I2C1 */ [MSTP028] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 28, 0), /* I2C2 */ @@ -153,6 +156,8 @@ static struct clk_lookup lookups[] = { CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]), /* MSTP32 clocks */ + CLKDEV_DEV_ID("ehci-platform.1", &mstp_clks[MSTP101]), /* USB EHCI port2 */ + CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */ CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP016]), /* TMU00 */ CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP016]), /* TMU01 */ CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] ARM: shmobile: r8a7779: add USB OHCI clock support 2012-11-07 8:34 [GIT PULL] Renesas ARM-based SoC for v3.8 #2 Simon Horman ` (2 preceding siblings ...) 2012-11-07 8:34 ` [PATCH 3/4] ARM: shmobile: r8a7779: add USB EHCI clock support Simon Horman @ 2012-11-07 8:34 ` Simon Horman 2012-11-08 6:30 ` [GIT PULL] Renesas ARM-based SoC for v3.8 #2 Simon Horman 4 siblings, 0 replies; 6+ messages in thread From: Simon Horman @ 2012-11-07 8:34 UTC (permalink / raw) To: linux-arm-kernel From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> ohci-platform driver require these clocks Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- arch/arm/mach-shmobile/clock-r8a7779.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c index 4ba4e3c..be885cf 100644 --- a/arch/arm/mach-shmobile/clock-r8a7779.c +++ b/arch/arm/mach-shmobile/clock-r8a7779.c @@ -157,7 +157,9 @@ static struct clk_lookup lookups[] = { /* MSTP32 clocks */ CLKDEV_DEV_ID("ehci-platform.1", &mstp_clks[MSTP101]), /* USB EHCI port2 */ + CLKDEV_DEV_ID("ohci-platform.1", &mstp_clks[MSTP101]), /* USB OHCI port2 */ CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */ + CLKDEV_DEV_ID("ohci-platform.0", &mstp_clks[MSTP100]), /* USB OHCI port0/1 */ CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP016]), /* TMU00 */ CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP016]), /* TMU01 */ CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [GIT PULL] Renesas ARM-based SoC for v3.8 #2 2012-11-07 8:34 [GIT PULL] Renesas ARM-based SoC for v3.8 #2 Simon Horman ` (3 preceding siblings ...) 2012-11-07 8:34 ` [PATCH 4/4] ARM: shmobile: r8a7779: add USB OHCI " Simon Horman @ 2012-11-08 6:30 ` Simon Horman 4 siblings, 0 replies; 6+ messages in thread From: Simon Horman @ 2012-11-08 6:30 UTC (permalink / raw) To: linux-arm-kernel On Wed, Nov 07, 2012 at 05:34:54PM +0900, Simon Horman wrote: > Hi Olof, Hi Arnd, > > please consider the following SoC enhancements for 3.8. > > This series is based on the previous SoC series that I sent on Tuesday > and was merged later that day: [GIT PULL v4] Renesas ARM-based SoC for v3.8 I have found some problems with this pull-request, I will send an revised one. > ---------------------------------------------------------------- > The following changes since commit 86bc52ef4373be64867b56f3a9e30cbabf64e0dd: > > ARM: shmobile: r8a7740: Enable PMU (2012-11-06 13:47:24 +0900) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc > > for you to fetch changes up to 9d69f5b87e7f6df51ad2a70557474093de934a8c: > > ARM: shmobile: r8a7779: add USB OHCI clock support (2012-11-07 17:11:48 +0900) > > ---------------------------------------------------------------- > Kuninori Morimoto (4): > ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx > ARM: shmobile: r8a7740: add USB24 clock explain > ARM: shmobile: r8a7779: add USB EHCI clock support > ARM: shmobile: r8a7779: add USB OHCI clock support > > arch/arm/mach-shmobile/clock-r8a7740.c | 16 ++++++++++++++++ > arch/arm/mach-shmobile/clock-r8a7779.c | 7 +++++++ > arch/arm/mach-shmobile/include/mach/r8a7779.h | 2 +- > arch/arm/mach-shmobile/pfc-r8a7779.c | 16 ++++++++-------- > 4 files changed, 32 insertions(+), 9 deletions(-) > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-11-08 6:30 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-11-07 8:34 [GIT PULL] Renesas ARM-based SoC for v3.8 #2 Simon Horman 2012-11-07 8:34 ` [PATCH 1/4] ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx Simon Horman 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 2012-11-08 6:30 ` [GIT PULL] Renesas ARM-based SoC for v3.8 #2 Simon Horman
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).