From: Jaehoon Chung <jh80.chung@samsung.com> To: linux-mmc@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, ulf.hansson@linaro.org, robh+dt@kernel.org, krzk@kernel.org, heiko@sntech.de, shawn.lin@rock-chips.com, Jaehoon Chung <jh80.chung@samsung.com> Subject: [PATCH 09/13] mmc: dw_mmc: remove the "clock-freq-min-max" property Date: Thu, 03 Nov 2016 15:21:31 +0900 [thread overview] Message-ID: <20161103062135.10697-10-jh80.chung@samsung.com> (raw) In-Reply-To: <20161103062135.10697-1-jh80.chung@samsung.com> Remove the "clock-freq-min-max" property. There is "max-frequency" property in drivers/mmc/core/host.c It can be used for getting maximum frequency. And minimum clock value is assigned to 100K by default. Because MMC core should check the initial clock value from 400K to 100K until finding correct value. It's why Minimum value puts 100K by default. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> --- Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt | 3 --- drivers/mmc/host/dw_mmc.c | 13 ++++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt index 4e00e85..21c8251 100644 --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt @@ -56,9 +56,6 @@ Optional properties: is specified and the ciu clock is specified then we'll try to set the ciu clock to this at probe time. -* clock-freq-min-max: Minimum and Maximum clock frequency for card output - clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default. - * num-slots: specifies the number of slots supported by the controller. The number of physical slots actually used could be equal or less than the value specified by num-slots. If this property is not specified, the value diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index bd8c5ea..a0c5a85 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2589,7 +2589,6 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) struct dw_mci_slot *slot; const struct dw_mci_drv_data *drv_data = host->drv_data; int ctrl_id, ret; - u32 freq[2]; mmc = mmc_alloc_host(sizeof(struct dw_mci_slot), host->dev); if (!mmc) @@ -2603,14 +2602,6 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) host->slot[id] = slot; mmc->ops = &dw_mci_ops; - if (of_property_read_u32_array(host->dev->of_node, - "clock-freq-min-max", freq, 2)) { - mmc->f_min = DW_MCI_FREQ_MIN; - mmc->f_max = DW_MCI_FREQ_MAX; - } else { - mmc->f_min = freq[0]; - mmc->f_max = freq[1]; - } /*if there are external regulators, get them*/ ret = mmc_regulator_get_supply(mmc); @@ -2649,6 +2640,10 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) if (ret) goto err_host_allocated; + mmc->f_min = DW_MCI_FREQ_MIN; + if (!mmc->f_max) + mmc->f_max = DW_MCI_FREQ_MAX; + /* Useful defaults if platform data is unset. */ if (host->use_dma == TRANS_MODE_IDMAC) { mmc->max_segs = host->ring_size; -- 2.10.1
WARNING: multiple messages have this Message-ID (diff)
From: jh80.chung@samsung.com (Jaehoon Chung) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/13] mmc: dw_mmc: remove the "clock-freq-min-max" property Date: Thu, 03 Nov 2016 15:21:31 +0900 [thread overview] Message-ID: <20161103062135.10697-10-jh80.chung@samsung.com> (raw) In-Reply-To: <20161103062135.10697-1-jh80.chung@samsung.com> Remove the "clock-freq-min-max" property. There is "max-frequency" property in drivers/mmc/core/host.c It can be used for getting maximum frequency. And minimum clock value is assigned to 100K by default. Because MMC core should check the initial clock value from 400K to 100K until finding correct value. It's why Minimum value puts 100K by default. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> --- Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt | 3 --- drivers/mmc/host/dw_mmc.c | 13 ++++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt index 4e00e85..21c8251 100644 --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt @@ -56,9 +56,6 @@ Optional properties: is specified and the ciu clock is specified then we'll try to set the ciu clock to this at probe time. -* clock-freq-min-max: Minimum and Maximum clock frequency for card output - clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default. - * num-slots: specifies the number of slots supported by the controller. The number of physical slots actually used could be equal or less than the value specified by num-slots. If this property is not specified, the value diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index bd8c5ea..a0c5a85 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2589,7 +2589,6 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) struct dw_mci_slot *slot; const struct dw_mci_drv_data *drv_data = host->drv_data; int ctrl_id, ret; - u32 freq[2]; mmc = mmc_alloc_host(sizeof(struct dw_mci_slot), host->dev); if (!mmc) @@ -2603,14 +2602,6 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) host->slot[id] = slot; mmc->ops = &dw_mci_ops; - if (of_property_read_u32_array(host->dev->of_node, - "clock-freq-min-max", freq, 2)) { - mmc->f_min = DW_MCI_FREQ_MIN; - mmc->f_max = DW_MCI_FREQ_MAX; - } else { - mmc->f_min = freq[0]; - mmc->f_max = freq[1]; - } /*if there are external regulators, get them*/ ret = mmc_regulator_get_supply(mmc); @@ -2649,6 +2640,10 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) if (ret) goto err_host_allocated; + mmc->f_min = DW_MCI_FREQ_MIN; + if (!mmc->f_max) + mmc->f_max = DW_MCI_FREQ_MAX; + /* Useful defaults if platform data is unset. */ if (host->use_dma == TRANS_MODE_IDMAC) { mmc->max_segs = host->ring_size; -- 2.10.1
next prev parent reply other threads:[~2016-11-03 6:23 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-03 6:21 [PATCH 00/13] mmc: dw_mmc: cleans the codes for dwmmc controller Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-03 6:21 ` [PATCH 01/13] mmc: dw_mmc: display the real register value on debugfs Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-03 6:21 ` [PATCH 02/13] mmc: dw_mmc: fix the debug message for checking card's present Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-03 6:21 ` [PATCH 03/13] mmc: dw_mmc: change the DW_MCI_FREQ_MIN from 400K to 100K Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-03 6:21 ` [PATCH 04/13] mmc: dw_mmc: use the hold register when send stop command Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-03 6:21 ` [PATCH 05/13] mmc: dw_mmc: call the dw_mci_prep_stop_abort() by default Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-03 6:21 ` [PATCH 06/13] mmc: core: move the cookie's enum values from sdhci.h to mmc.h Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-03 6:21 ` [PATCH 07/13] mmc: dw_mmc: use the cookie's enum values for post/pre_req() Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-03 6:21 ` [PATCH 08/13] mmc: dw_mmc: remove the unnecessary mmc_data structure Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung [this message] 2016-11-03 6:21 ` [PATCH 09/13] mmc: dw_mmc: remove the "clock-freq-min-max" property Jaehoon Chung 2016-11-03 8:20 ` Heiko Stübner 2016-11-03 8:20 ` Heiko Stübner 2016-11-03 8:42 ` Jaehoon Chung 2016-11-03 8:42 ` Jaehoon Chung 2016-11-03 6:21 ` [PATCH 10/13] ARM: dts: exynos: replace to "max-frequecy" instead of "clock-freq-min-max" Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-03 18:41 ` Krzysztof Kozlowski 2016-11-03 18:41 ` Krzysztof Kozlowski 2016-11-04 10:21 ` Jaehoon Chung 2016-11-04 10:21 ` Jaehoon Chung 2016-11-04 11:19 ` Heiko Stuebner 2016-11-04 11:19 ` Heiko Stuebner 2016-11-04 15:04 ` Krzysztof Kozlowski 2016-11-04 15:04 ` Krzysztof Kozlowski 2016-11-07 0:38 ` Jaehoon Chung 2016-11-07 0:38 ` Jaehoon Chung 2016-11-09 20:10 ` Krzysztof Kozlowski 2016-11-09 20:10 ` Krzysztof Kozlowski 2016-11-09 20:10 ` Krzysztof Kozlowski 2016-11-03 6:21 ` [PATCH 11/13] ARM: dts: rockchip: replace to "max-frequency" " Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-09 14:05 ` Heiko Stuebner 2016-11-09 14:05 ` Heiko Stuebner 2016-11-03 6:21 ` [PATCH 12/13] ARM64: " Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-09 14:37 ` Heiko Stuebner 2016-11-09 14:37 ` Heiko Stuebner 2016-11-03 6:21 ` [PATCH 13/13] Documentation: synopsys-dw-mshc: remove the unused properties Jaehoon Chung 2016-11-03 6:21 ` Jaehoon Chung 2016-11-10 18:47 ` Rob Herring 2016-11-10 18:47 ` Rob Herring 2016-11-10 18:47 ` Rob Herring 2016-11-09 18:55 ` [PATCH 00/13] mmc: dw_mmc: cleans the codes for dwmmc controller Heiko Stuebner 2016-11-09 18:55 ` Heiko Stuebner
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=20161103062135.10697-10-jh80.chung@samsung.com \ --to=jh80.chung@samsung.com \ --cc=devicetree@vger.kernel.org \ --cc=heiko@sntech.de \ --cc=krzk@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=robh+dt@kernel.org \ --cc=shawn.lin@rock-chips.com \ --cc=ulf.hansson@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.