From 35963ec32bb70f0543d483051d891e58a3989338 Mon Sep 17 00:00:00 2001 From: "xingyu.wu" Date: Thu, 30 Jun 2022 14:10:50 +0800 Subject: [PATCH] spi:pl022:revert commit commit ID: 940582b82915ee234594afff1a0290cead49a290 2e334ea5dc9637799177f672f2dd5c04c1b567e4 Signed-off-by: Xingyu Wu --- drivers/spi/spi-pl022.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 633c460..e4484ac 100755 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -33,7 +33,6 @@ #include #include #include -#include /* * This macro is used to define some register default values. @@ -371,7 +370,6 @@ struct pl022 { resource_size_t phybase; void __iomem *virtbase; struct clk *clk; - struct reset_control *rst; struct spi_master *master; struct pl022_ssp_controller *master_info; /* Message per-transfer pump */ @@ -2184,19 +2182,6 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id) goto err_no_clk_en; } - pl022->rst = devm_reset_control_get_exclusive(&adev->dev, "rst_apb"); - if (!IS_ERR(pl022->rst)) { - status = reset_control_deassert(pl022->rst); - if (status) { - dev_err(&adev->dev, "could not deassert SSP/SPI bus reset\n"); - goto err_no_rst_clr; - } - } else { - status = PTR_ERR(pl022->rst); - dev_err(&adev->dev, "could not retrieve SSP/SPI bus reset\n"); - goto err_no_rst; - } - /* Initialize transfer pump */ tasklet_init(&pl022->pump_transfers, pump_transfers, (unsigned long)pl022); @@ -2256,9 +2241,6 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id) if (platform_info->enable_dma) pl022_dma_remove(pl022); err_no_irq: - reset_control_assert(pl022->rst); - err_no_rst_clr: - err_no_rst: clk_disable_unprepare(pl022->clk); err_no_clk_en: err_no_clk: -- 2.7.4