From: aisheng.dong@freescale.com (Dong Aisheng) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/6] mmc: sdhci-esdhc-imx: remove duplicated dts parsing Date: Thu, 18 Jun 2015 02:05:35 +0800 [thread overview] Message-ID: <1434564337-24720-5-git-send-email-aisheng.dong@freescale.com> (raw) In-Reply-To: <1434564337-24720-1-git-send-email-aisheng.dong@freescale.com> After commit 8d86e4fcccf6 ("mmc: sdhci-esdhc-imx: Call mmc_of_parse()"), we do not need those duplicated parsing anymore. Note: fsl,cd-controller is also deleted due to the driver does not support controller card detection anymore after switch to runtime pm. And there's no user of it right now in device tree. wp-gpios is kept because we're still support fsl,wp-controller, so we need a way to check if it's gpio wp or controller wp. Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com> --- drivers/mmc/host/sdhci-esdhc-imx.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 10f03ee..1b0e618 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -884,27 +884,13 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, struct esdhc_platform_data *boarddata = &imx_data->boarddata; int ret; - if (of_get_property(np, "non-removable", NULL)) - boarddata->cd_type = ESDHC_CD_PERMANENT; - - if (of_get_property(np, "fsl,cd-controller", NULL)) - boarddata->cd_type = ESDHC_CD_CONTROLLER; - if (of_get_property(np, "fsl,wp-controller", NULL)) boarddata->wp_type = ESDHC_WP_CONTROLLER; - boarddata->cd_gpio = of_get_named_gpio(np, "cd-gpios", 0); - if (gpio_is_valid(boarddata->cd_gpio)) - boarddata->cd_type = ESDHC_CD_GPIO; - boarddata->wp_gpio = of_get_named_gpio(np, "wp-gpios", 0); if (gpio_is_valid(boarddata->wp_gpio)) boarddata->wp_type = ESDHC_WP_GPIO; - of_property_read_u32(np, "bus-width", &boarddata->max_bus_width); - - of_property_read_u32(np, "max-frequency", &boarddata->f_max); - if (of_find_property(np, "no-1-8-v", NULL)) boarddata->support_vsel = false; else -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Dong Aisheng <aisheng.dong@freescale.com> To: linux-mmc@vger.kernel.org Cc: ulf.hansson@linaro.org, chris@printf.net, shawn.guo@linaro.org, b29396@freescale.com, fabio.estevam@freescale.com, gwenhael.goavec-merou@armadeus.com, marex@denx.de, s.trumtrar@pengutronix.de, s.hauer@pengutronix.de, lisovy@gmail.com, ipaton0@gmail.com, smoch@web.de, hs@denx.de, rmk+kernel@arm.linux.org.uk, tharvey@gateworks.com, rabeeh@solid-run.com, troy.kisky@boundarydevices.com, p.zabel@pengutronix.de, robertcnelson@gmail.com, LW@KARO-electronics.de, linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/6] mmc: sdhci-esdhc-imx: remove duplicated dts parsing Date: Thu, 18 Jun 2015 02:05:35 +0800 [thread overview] Message-ID: <1434564337-24720-5-git-send-email-aisheng.dong@freescale.com> (raw) In-Reply-To: <1434564337-24720-1-git-send-email-aisheng.dong@freescale.com> After commit 8d86e4fcccf6 ("mmc: sdhci-esdhc-imx: Call mmc_of_parse()"), we do not need those duplicated parsing anymore. Note: fsl,cd-controller is also deleted due to the driver does not support controller card detection anymore after switch to runtime pm. And there's no user of it right now in device tree. wp-gpios is kept because we're still support fsl,wp-controller, so we need a way to check if it's gpio wp or controller wp. Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com> --- drivers/mmc/host/sdhci-esdhc-imx.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 10f03ee..1b0e618 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -884,27 +884,13 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, struct esdhc_platform_data *boarddata = &imx_data->boarddata; int ret; - if (of_get_property(np, "non-removable", NULL)) - boarddata->cd_type = ESDHC_CD_PERMANENT; - - if (of_get_property(np, "fsl,cd-controller", NULL)) - boarddata->cd_type = ESDHC_CD_CONTROLLER; - if (of_get_property(np, "fsl,wp-controller", NULL)) boarddata->wp_type = ESDHC_WP_CONTROLLER; - boarddata->cd_gpio = of_get_named_gpio(np, "cd-gpios", 0); - if (gpio_is_valid(boarddata->cd_gpio)) - boarddata->cd_type = ESDHC_CD_GPIO; - boarddata->wp_gpio = of_get_named_gpio(np, "wp-gpios", 0); if (gpio_is_valid(boarddata->wp_gpio)) boarddata->wp_type = ESDHC_WP_GPIO; - of_property_read_u32(np, "bus-width", &boarddata->max_bus_width); - - of_property_read_u32(np, "max-frequency", &boarddata->f_max); - if (of_find_property(np, "no-1-8-v", NULL)) boarddata->support_vsel = false; else -- 1.9.1
next prev parent reply other threads:[~2015-06-17 18:05 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-06-17 18:05 [PATCH 0/6] mmc: sdhci-esdhci-imx: fix cd/wp regression Dong Aisheng 2015-06-17 18:05 ` Dong Aisheng 2015-06-17 18:05 ` [PATCH 1/6] mmc: sdhci-esdhc-imx: fix cd regression for dt platform Dong Aisheng 2015-06-17 18:05 ` Dong Aisheng 2015-06-17 18:05 ` [PATCH 2/6] mmc: sdhci-esdhc-imx: move all non dt probe code into one function Dong Aisheng 2015-06-17 18:05 ` Dong Aisheng 2015-06-17 18:05 ` [PATCH 3/6] mmc: sdhci: make max-frequency property in device tree work Dong Aisheng 2015-06-17 18:05 ` Dong Aisheng 2015-06-17 18:05 ` Dong Aisheng [this message] 2015-06-17 18:05 ` [PATCH 4/6] mmc: sdhci-esdhc-imx: remove duplicated dts parsing Dong Aisheng 2015-07-09 7:38 ` Shawn Guo 2015-07-09 7:38 ` Shawn Guo 2015-07-09 8:59 ` Dong Aisheng 2015-07-09 8:59 ` Dong Aisheng 2015-06-17 18:05 ` [PATCH 5/6] mmc: sdhci-esdhc-imx: clear f_max in boarddata Dong Aisheng 2015-06-17 18:05 ` Dong Aisheng 2015-06-17 18:05 ` [PATCH 6/6] dts: mmc: fsl-imx-esdhc: remove fsl, cd-controller support Dong Aisheng 2015-06-17 18:05 ` [PATCH 6/6] dts: mmc: fsl-imx-esdhc: remove fsl,cd-controller support Dong Aisheng 2015-07-06 11:57 ` [PATCH 0/6] mmc: sdhci-esdhci-imx: fix cd/wp regression Johan Derycke 2015-07-09 7:50 ` Shawn Guo 2015-07-09 7:50 ` Shawn Guo 2015-07-09 9:29 ` Dong Aisheng 2015-07-09 9:29 ` Dong Aisheng 2015-07-09 13:27 ` Shawn Guo 2015-07-09 13:27 ` Shawn Guo 2015-07-09 17:02 ` Enrico Weigelt, metux IT consult 2015-07-09 17:02 ` Enrico Weigelt, metux IT consult 2015-07-13 11:43 ` Dong Aisheng 2015-07-13 11:43 ` Dong Aisheng 2015-07-14 5:25 ` Soeren Moch 2015-07-14 5:25 ` Soeren Moch 2015-07-22 13:59 ` Dong Aisheng 2015-07-22 13:59 ` Dong Aisheng 2015-07-20 12:44 ` Ulf Hansson 2015-07-20 12:44 ` Ulf Hansson 2015-07-22 14:05 ` Dong Aisheng 2015-07-22 14:05 ` Dong Aisheng
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=1434564337-24720-5-git-send-email-aisheng.dong@freescale.com \ --to=aisheng.dong@freescale.com \ --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: 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.