Revert "ata: ahci: WAR for SATA power issues"

This reverts commit 9558cecc16eb3e0c8b966800fc7cd6a8a476546d.

Change-Id: I9bddc92db0ee629c151a22ec502f9eb75888c11b
Signed-off-by: TW Chiu <twchiu@nvidia.com>
Reviewed-on: http://git-master/r/811591
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Ajay Gupta <ajayg@nvidia.com>
Tested-by: Ajay Gupta <ajayg@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Ashutosh Jha <ajha@nvidia.com>

diff --git a/drivers/ata/ahci-tegra.c b/drivers/ata/ahci-tegra.c
index ab0ea6a2d4cb5b78d12b5d85fd5912442990069f..a4c9d12a4aede4be87cb604ae037f84b5b296cc2 100644 (file)
--- a/drivers/ata/ahci-tegra.c
+++ b/drivers/ata/ahci-tegra.c
@@ -2801,37 +2801,6 @@ static void tegra_ahci_sata_clk_gate(void)
                val = clk_readl(CLK_RST_CONTROLLER_RST_DEV_W_SET);
 }
 
-static int sata_power_war_cb(struct notifier_block *nb, unsigned long action, void *data)
-{
-       u32 val;
-
-       switch (action) {
-       case PM_POST_SUSPEND:
-               /* WAR for SATA_PLL */
-               val = clk_readl(CLK_RST_SATA_PLL_CFG0_REG);
-               val |= (SATA_SEQ_PADPLL_PD_INPUT_VALUE |
-                       SATA_SEQ_LANE_PD_INPUT_VALUE |
-                       SATA_SEQ_RESET_INPUT_VALUE |
-                       PLLE_IDDQ_SWCTL_ON);
-               clk_writel(val, CLK_RST_SATA_PLL_CFG0_REG);
-               udelay(1);
-               val = clk_readl(CLK_RST_SATA_PLL_CFG0_REG);
-               val |= PLLE_SATA_SEQ_ENABLE;
-               clk_writel(val, CLK_RST_SATA_PLL_CFG0_REG);
-
-               /* WAR for SATA IO */
-               tegra_ahci_t210_power_down_aux_idle_detector();
-               break;
-       default:
-               break;
-       }
-       return NOTIFY_DONE;
-}
-
-static struct notifier_block sata_power_war = {
-       .notifier_call = sata_power_war_cb,
-};
-
 static int tegra_ahci_init_one(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
@@ -2848,6 +2817,7 @@ static int tegra_ahci_init_one(struct platform_device *pdev)
        void __iomem *mmio;
        enum tegra_chipid cid;
 
+
 #if defined(CONFIG_TEGRA_AHCI_CONTEXT_RESTORE)
        u32 save_size;
 #endif
@@ -3066,9 +3036,6 @@ static int tegra_ahci_init_one(struct platform_device *pdev)
                        tegra_prod_release(&tegra_hpriv->prod_list);
                        tegra_hpriv->prod_list = NULL;
                }
-               if (np)
-                       if (of_property_read_bool(np, "nvidia,sata-power-war"))
-                               register_pm_notifier(&sata_power_war);
                return -ENODEV;
        }