From patchwork Tue Oct 6 13:54:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cory Maccarrone X-Patchwork-Id: 51934 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n96E2jOn006476 for ; Tue, 6 Oct 2009 14:02:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932611AbZJFNyh (ORCPT ); Tue, 6 Oct 2009 09:54:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932578AbZJFNyh (ORCPT ); Tue, 6 Oct 2009 09:54:37 -0400 Received: from mail-yx0-f199.google.com ([209.85.210.199]:38410 "EHLO mail-yx0-f199.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932543AbZJFNyg (ORCPT ); Tue, 6 Oct 2009 09:54:36 -0400 Received: by mail-yx0-f199.google.com with SMTP id 37so3932974yxe.33 for ; Tue, 06 Oct 2009 06:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:from:date:message-id :subject:to:content-type; bh=tTTe6V0EaHYtCIKlzR1ZotvWzsX2R+Vmkjr/4/lUmE8=; b=Qq9pu4Uspy8OfsNt8uokQqMY1n3uKTCTNwDQyRk9bDMwDJHD91XXRcSlvnG0FhHHZO Pwr+MZ5Qj835QvEfoXnwxW4nKG8Aqq+jtrkA7HEkQfUECwB5NYgr1fWiLT1SJS94+Km1 0iJaEuhPsIleHESs0I3YDPLr9jsSWC1+0j0us= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=GApHTVUENQ+9QZnzvDu1OnCteoF8Y/TTSadYPIXRa7V9GgLB8EdBk26DEe3WdDTmoV n7LyUNtXayngDqtRagWhDMWIOMI6Ohu7Dxg7g3ZjkDqHUL6e2P3L/llgxzK92fHfPFz3 HWArOf5gbUDW3QVzBTEU/OYS1LwWlyo53+YTY= MIME-Version: 1.0 Received: by 10.151.28.10 with SMTP id f10mr2423657ybj.121.1254837266071; Tue, 06 Oct 2009 06:54:26 -0700 (PDT) From: Cory Maccarrone Date: Tue, 6 Oct 2009 06:54:06 -0700 Message-ID: <6cb013310910060654i7b90d8f3gfaada2cfa50b6cb1@mail.gmail.com> Subject: [PATCH] [OMAP] mmc: Add mux configuration for omap7xx To: linux-omap@vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 0680843..54f18e8 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -108,15 +108,22 @@ static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller, int controller_nr) { if (controller_nr == 0) { - omap_cfg_reg(MMC_CMD); - omap_cfg_reg(MMC_CLK); - omap_cfg_reg(MMC_DAT0); + if (cpu_is_omap7xx()) { + omap_cfg_reg(MMC_7XX_CMD); + omap_cfg_reg(MMC_7XX_CLK); + omap_cfg_reg(MMC_7XX_DAT0); + } else { + omap_cfg_reg(MMC_CMD); + omap_cfg_reg(MMC_CLK); + omap_cfg_reg(MMC_DAT0); + } + if (cpu_is_omap1710()) { omap_cfg_reg(M15_1710_MMC_CLKI); omap_cfg_reg(P19_1710_MMC_CMDDIR); omap_cfg_reg(P20_1710_MMC_DATDIR0); } - if (mmc_controller->slots[0].wires == 4) { + if (mmc_controller->slots[0].wires == 4 && !cpu_is_omap7xx()) { omap_cfg_reg(MMC_DAT1); /* NOTE: DAT2 can be on W10 (here) or M15 */