From patchwork Tue Dec 9 08:42:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Lee X-Patchwork-Id: 418974 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id A77831400D2; Tue, 9 Dec 2014 19:43:16 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XyGNw-000343-AH; Tue, 09 Dec 2014 08:43:08 +0000 Received: from mail-pa0-f46.google.com ([209.85.220.46]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XyGNp-00033e-Ik for kernel-team@lists.ubuntu.com; Tue, 09 Dec 2014 08:43:01 +0000 Received: by mail-pa0-f46.google.com with SMTP id lj1so130262pab.33 for ; Tue, 09 Dec 2014 00:43:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=S0Ub+vbNpxmFUtEoGao7xUWEHwxuQv9bGAJg10zd5G0=; b=nE7WgjPf9Xp/vhdON3PQwz2AuuVKsKoqPdfjrKEDKJMj8HphZjylmIM+B203CrMMif D244Rhlw7yBi/b6SwDlQApxsA/l2DQa4PljBuaHKRSHuuQKBSMUs1C9gdmiKBJNZzpQc LkLBtAWIVqRnGzStDt1/z5PpW65QcAYRqAPF1XFhHiELOZ4/ylezignOgdPLJvAWnumz IFFtNUvfesmprT4/e38Bjh0b9iYFGZTWe7EdSAE62wsm9cmMp0QbwJPuOmxnxdhr20EL KrxjDrxct/7Ie05iyfdLbOIF+RZQBKYRIgF0/yoPMokC8OLkxF4Lg+6jQejHXal7fwLc Xz5A== X-Gm-Message-State: ALoCoQmtVsECrTHabexrwN+l9ftWUwzaCQqfoyrY/l+4wgqdJOfvcmm2PlzVfal8oNebKVBVO3u7 X-Received: by 10.66.241.202 with SMTP id wk10mr3394897pac.88.1418114580765; Tue, 09 Dec 2014 00:43:00 -0800 (PST) Received: from localhost ([116.213.191.74]) by mx.google.com with ESMTPSA id pk1sm753057pdb.78.2014.12.09.00.42.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Dec 2014 00:43:00 -0800 (PST) From: Adam Lee To: kernel-team@lists.ubuntu.com Subject: [Trusty/Utopic/Vivid][PATCH] mmc: sdhci-pci-o2micro: Fix Dell E5440 issue Date: Tue, 9 Dec 2014 16:42:55 +0800 Message-Id: <1418114575-15538-1-git-send-email-adam.lee@canonical.com> X-Mailer: git-send-email 2.1.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Peter Guo BugLink: http://bugs.launchpad.net/bugs/1346067 Fix Dell E5440 when reboot Linux, can't find o2micro sd host chip issue. Fixes: 01acf6917aed (mmc: sdhci-pci: add support of O2Micro/BayHubTech SD hosts) Signed-off-by: Peter Guo Signed-off-by: Ulf Hansson (cherry picked from commit 6380ea099cdd46d7377b6fbec0291cf2aa387bad) Signed-off-by: Adam Lee Acked-by: Andy Whitcroft --- drivers/mmc/host/sdhci-pci-o2micro.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c index f49666b..257e9ca 100644 --- a/drivers/mmc/host/sdhci-pci-o2micro.c +++ b/drivers/mmc/host/sdhci-pci-o2micro.c @@ -88,8 +88,6 @@ void sdhci_pci_o2_fujin2_pci_init(struct sdhci_pci_chip *chip) return; scratch_32 &= ~((1 << 21) | (1 << 30)); - /* Set RTD3 function disabled */ - scratch_32 |= ((1 << 29) | (1 << 28)); pci_write_config_dword(chip->pdev, O2_SD_FUNC_REG3, scratch_32); /* Set L1 Entrance Timer */