From: Kyungmin Park <kmpark@infradead.org>
To: Thomas Abraham <thomas.abraham@linaro.org>
Cc: linux-mmc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, cjb@laptop.org,
grant.likely@secretlab.ca, rob.herring@calxeda.com,
linux-samsung-soc@vger.kernel.org, kgene.kim@samsung.com,
patches@linaro.org
Subject: Re: [PATCH 5/7] ARM: Samsung: Add support for MSHC controller clocks
Date: Wed, 2 May 2012 16:04:55 +0900 [thread overview]
Message-ID: <CAH9JG2UwFc+vo1chsH_1XsgCYypLFV2e3AVOrh0=F+bMRKHBZA@mail.gmail.com> (raw)
In-Reply-To: <1335935266-25289-6-git-send-email-thomas.abraham@linaro.org>
Hi Thomas,
I suggest to split the patches into mmc part and samsung specific
part. As you know previous time there's mismatch between mmc and
samsung. So split the patches and send it separately to avoid merge
conflict and mismatch.
I think regardless mmc changes, it can be merged into samsung tree directly.
Thank you,
Kyungmin Park
On 5/2/12, Thomas Abraham <thomas.abraham@linaro.org> wrote:
> Add clock instances for bus interface unit clock and card interface unit
> clock of the all four MSHC controller instances.
>
> Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
> ---
> arch/arm/mach-exynos/clock-exynos5.c | 45
> ++++++++++++----------------------
> 1 files changed, 16 insertions(+), 29 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/clock-exynos5.c
> b/arch/arm/mach-exynos/clock-exynos5.c
> index 7c0f810..4e17131 100644
> --- a/arch/arm/mach-exynos/clock-exynos5.c
> +++ b/arch/arm/mach-exynos/clock-exynos5.c
> @@ -524,35 +524,30 @@ static struct clk exynos5_init_clocks_off[] = {
> .enable = exynos5_clk_ip_peris_ctrl,
> .ctrlbit = (1 << 19),
> }, {
> - .name = "hsmmc",
> - .devname = "exynos4-sdhci.0",
> + .name = "biu",
> + .devname = "dw_mmc.0",
> .parent = &exynos5_clk_aclk_200.clk,
> .enable = exynos5_clk_ip_fsys_ctrl,
> .ctrlbit = (1 << 12),
> }, {
> - .name = "hsmmc",
> - .devname = "exynos4-sdhci.1",
> + .name = "biu",
> + .devname = "dw_mmc.1",
> .parent = &exynos5_clk_aclk_200.clk,
> .enable = exynos5_clk_ip_fsys_ctrl,
> .ctrlbit = (1 << 13),
> }, {
> - .name = "hsmmc",
> - .devname = "exynos4-sdhci.2",
> + .name = "biu",
> + .devname = "dw_mmc.2",
> .parent = &exynos5_clk_aclk_200.clk,
> .enable = exynos5_clk_ip_fsys_ctrl,
> .ctrlbit = (1 << 14),
> }, {
> - .name = "hsmmc",
> - .devname = "exynos4-sdhci.3",
> + .name = "biu",
> + .devname = "dw_mmc.3",
> .parent = &exynos5_clk_aclk_200.clk,
> .enable = exynos5_clk_ip_fsys_ctrl,
> .ctrlbit = (1 << 15),
> }, {
> - .name = "dwmci",
> - .parent = &exynos5_clk_aclk_200.clk,
> - .enable = exynos5_clk_ip_fsys_ctrl,
> - .ctrlbit = (1 << 16),
> - }, {
> .name = "sata",
> .devname = "ahci",
> .enable = exynos5_clk_ip_fsys_ctrl,
> @@ -882,8 +877,8 @@ static struct clksrc_clk exynos5_clk_sclk_uart3 = {
>
> static struct clksrc_clk exynos5_clk_sclk_mmc0 = {
> .clk = {
> - .name = "sclk_mmc",
> - .devname = "exynos4-sdhci.0",
> + .name = "ciu",
> + .devname = "dw_mmc.0",
> .parent = &exynos5_clk_dout_mmc0.clk,
> .enable = exynos5_clksrc_mask_fsys_ctrl,
> .ctrlbit = (1 << 0),
> @@ -893,8 +888,8 @@ static struct clksrc_clk exynos5_clk_sclk_mmc0 = {
>
> static struct clksrc_clk exynos5_clk_sclk_mmc1 = {
> .clk = {
> - .name = "sclk_mmc",
> - .devname = "exynos4-sdhci.1",
> + .name = "ciu",
> + .devname = "dw_mmc.1",
> .parent = &exynos5_clk_dout_mmc1.clk,
> .enable = exynos5_clksrc_mask_fsys_ctrl,
> .ctrlbit = (1 << 4),
> @@ -904,8 +899,8 @@ static struct clksrc_clk exynos5_clk_sclk_mmc1 = {
>
> static struct clksrc_clk exynos5_clk_sclk_mmc2 = {
> .clk = {
> - .name = "sclk_mmc",
> - .devname = "exynos4-sdhci.2",
> + .name = "ciu",
> + .devname = "dw_mmc.2",
> .parent = &exynos5_clk_dout_mmc2.clk,
> .enable = exynos5_clksrc_mask_fsys_ctrl,
> .ctrlbit = (1 << 8),
> @@ -915,8 +910,8 @@ static struct clksrc_clk exynos5_clk_sclk_mmc2 = {
>
> static struct clksrc_clk exynos5_clk_sclk_mmc3 = {
> .clk = {
> - .name = "sclk_mmc",
> - .devname = "exynos4-sdhci.3",
> + .name = "ciu",
> + .devname = "dw_mmc.3",
> .parent = &exynos5_clk_dout_mmc3.clk,
> .enable = exynos5_clksrc_mask_fsys_ctrl,
> .ctrlbit = (1 << 12),
> @@ -927,14 +922,6 @@ static struct clksrc_clk exynos5_clk_sclk_mmc3 = {
> static struct clksrc_clk exynos5_clksrcs[] = {
> {
> .clk = {
> - .name = "sclk_dwmci",
> - .parent = &exynos5_clk_dout_mmc4.clk,
> - .enable = exynos5_clksrc_mask_fsys_ctrl,
> - .ctrlbit = (1 << 16),
> - },
> - .reg_div = { .reg = EXYNOS5_CLKDIV_FSYS3, .shift = 8, .size = 8 },
> - }, {
> - .clk = {
> .name = "sclk_fimd",
> .devname = "s3cfb.1",
> .enable = exynos5_clksrc_mask_disp1_0_ctrl,
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
> in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2012-05-02 7:04 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-02 5:07 [PATCH 0/7] mmc: dw_mmc: add support for device tree based instantiation Thomas Abraham
2012-05-02 5:07 ` [PATCH 1/7] mmc: dw_mmc: lookup for optional biu and ciu clocks Thomas Abraham
2012-05-02 9:17 ` Will Newton
2012-05-10 9:11 ` Thomas Abraham
2012-05-02 9:53 ` Russell King - ARM Linux
2012-05-10 9:12 ` Thomas Abraham
2012-05-02 14:53 ` James Hogan
2012-05-10 9:20 ` Thomas Abraham
2012-05-10 13:43 ` Russell King - ARM Linux
2012-05-02 5:07 ` [PATCH 2/7] mmc: dw_mmc: add quirk to indicate missing write protect line Thomas Abraham
2012-05-02 9:10 ` Will Newton
2012-05-02 5:07 ` [PATCH 3/7] mmc: dw_mmc: add device tree support Thomas Abraham
2012-05-02 6:55 ` Kyungmin Park
2012-05-10 9:42 ` Thomas Abraham
2012-05-10 9:59 ` Kyungmin Park
2012-05-10 10:12 ` Thomas Abraham
2012-05-02 18:07 ` Olof Johansson
2012-05-10 10:15 ` Thomas Abraham
2012-05-12 7:07 ` Olof Johansson
2012-05-12 8:43 ` Thomas Abraham
2012-05-03 22:48 ` Guennadi Liakhovetski
2012-05-12 7:01 ` Thomas Abraham
2012-05-12 19:31 ` Guennadi Liakhovetski
2012-05-17 15:39 ` Thomas Abraham
2012-05-10 10:32 ` James Hogan
2012-05-10 10:44 ` Thomas Abraham
2012-05-02 5:07 ` [PATCH 4/7] mmc: dw_mmc: add samsung exynos5250 specific extentions Thomas Abraham
2012-05-02 7:01 ` Kyungmin Park
2012-05-02 7:49 ` Jaehoon Chung
2012-05-10 10:55 ` Thomas Abraham
2012-05-10 11:17 ` Jaehoon Chung
2012-05-10 10:38 ` Thomas Abraham
2012-05-02 18:10 ` Olof Johansson
2012-05-10 10:55 ` Thomas Abraham
2012-05-02 5:07 ` [PATCH 5/7] ARM: Samsung: Add support for MSHC controller clocks Thomas Abraham
2012-05-02 7:04 ` Kyungmin Park [this message]
2012-05-02 5:07 ` [PATCH 6/7] ARM: Exynos5: Add AUXDATA support for MSHC controllers Thomas Abraham
2012-05-02 5:07 ` [PATCH 7/7] ARM: dts: Add nodes for dw_mmc controllers for Samsung Exynos5250 platforms Thomas Abraham
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='CAH9JG2UwFc+vo1chsH_1XsgCYypLFV2e3AVOrh0=F+bMRKHBZA@mail.gmail.com' \
--to=kmpark@infradead.org \
--cc=cjb@laptop.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=patches@linaro.org \
--cc=rob.herring@calxeda.com \
--cc=thomas.abraham@linaro.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).