提交 d7bf2c5c 编写于 作者: M Manish Narani 提交者: Michal Simek

Revert "mmc: arasan: Add pinctrl support to the driver"

This patch reverts the commit 97e81851.

Revert the pinctrl support from the SDHCI Arasan driver as the pinctrl
configuration is already handled by core driver via pinctrl_bind_pins()
API.
Signed-off-by: NManish Narani <manish.narani@xilinx.com>
Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
上级 8cd06ddd
......@@ -23,7 +23,6 @@
#include <linux/regmap.h>
#include <linux/of.h>
#include <linux/firmware/xlnx-zynqmp.h>
#include <linux/pinctrl/consumer.h>
#include "cqhci.h"
#include "sdhci-pltfm.h"
......@@ -126,8 +125,6 @@ struct sdhci_arasan_zynqmp_clk_data {
* @clk_data: Struct for the Arasan Controller Clock Data.
* @soc_ctl_base: Pointer to regmap for syscon for soc_ctl registers.
* @soc_ctl_map: Map to get offsets into soc_ctl registers.
* @pinctrl: Per-device pin control state holder.
* @pins_default: Pinctrl state for a device.
*/
struct sdhci_arasan_data {
struct sdhci_host *host;
......@@ -140,8 +137,6 @@ struct sdhci_arasan_data {
struct regmap *soc_ctl_base;
const struct sdhci_arasan_soc_ctl_map *soc_ctl_map;
struct pinctrl *pinctrl;
struct pinctrl_state *pins_default;
unsigned int quirks; /* Arasan deviations from spec */
/* Controller does not have CD wired and will not function normally without */
......@@ -1533,20 +1528,6 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
goto unreg_clk;
}
sdhci_arasan->pinctrl = devm_pinctrl_get(&pdev->dev);
if (!IS_ERR(sdhci_arasan->pinctrl)) {
sdhci_arasan->pins_default =
pinctrl_lookup_state(sdhci_arasan->pinctrl,
PINCTRL_STATE_DEFAULT);
if (IS_ERR(sdhci_arasan->pins_default)) {
dev_err(&pdev->dev, "Missing default pinctrl config\n");
return IS_ERR(sdhci_arasan->pins_default);
}
pinctrl_select_state(sdhci_arasan->pinctrl,
sdhci_arasan->pins_default);
}
sdhci_arasan->phy = ERR_PTR(-ENODEV);
if (of_device_is_compatible(pdev->dev.of_node,
"arasan,sdhci-5.1")) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册