From patchwork Thu Oct 11 19:04:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1583391 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 211B13FD9C for ; Thu, 11 Oct 2012 19:07:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933243Ab2JKTEM (ORCPT ); Thu, 11 Oct 2012 15:04:12 -0400 Received: from mail-ia0-f174.google.com ([209.85.210.174]:42988 "EHLO mail-ia0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933073Ab2JKTEI (ORCPT ); Thu, 11 Oct 2012 15:04:08 -0400 Received: by mail-ia0-f174.google.com with SMTP id y32so1489106iag.19 for ; Thu, 11 Oct 2012 12:04:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=k+qytEYMzBGuS1mKWdgjCdYdMEmtaVO71KoKKvD0+h0=; b=ae84iH0BomSpifiGNF9FdDrTQoRCZtKbEyGjWz9Dpifg4c2Z/fAkqzCyyoRjj6xGPK W8LigbuwEG9lG/b3QAJvlCQBZl1lUr6w7/E5wEoiA65fjl1OLit28SFqpDMKhNyw+jnr cH1KH+0/KWDFwYmxdBzDb49GDiuM2ufp1W6KTpcdLREHy56sGBXgUOpAIbZcQ9XPXc4s WgjSH7I2bki7QUSym3EO+2u/ovLDAeVBWFMM43WK/XMirXwMo3bkqvgdp9okme5pAkfE SpaWZJmwAkaXk72cfOeHffszdxU79JY+VOM8GMu+inZNEd7Ve4AqXckjggrNlKElnglv mgBg== Received: by 10.50.106.233 with SMTP id gx9mr1891510igb.49.1349982248100; Thu, 11 Oct 2012 12:04:08 -0700 (PDT) Received: from beef.ohporter.com (cpe-24-166-64-7.neo.res.rr.com. [24.166.64.7]) by mx.google.com with ESMTPS id us4sm7461igc.9.2012.10.11.12.04.05 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Oct 2012 12:04:07 -0700 (PDT) From: Matt Porter To: Tony Lindgren , Sekhar Nori , Grant Likely , Mark Brown , Benoit Cousson , Russell King , Vinod Koul , Rob Landley , Chris Ball Cc: Devicetree Discuss , Linux OMAP List , Linux ARM Kernel List , Linux DaVinci Kernel List , Linux Kernel Mailing List , Linux Documentation List , Linux MMC List , Linux SPI Devel List , Arnd Bergmann , Dan Williams , Rob Herring Subject: [RFC PATCH v2 08/16] ARM: omap: add hsmmc am33xx specific init Date: Thu, 11 Oct 2012 15:04:33 -0400 Message-Id: <1349982281-10785-9-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349982281-10785-1-git-send-email-mporter@ti.com> References: <1349982281-10785-1-git-send-email-mporter@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org AM33xx requires special handling in hsmmc initialization platform glue. Signed-off-by: Matt Porter --- arch/arm/mach-omap2/hsmmc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 4d3a632..42ce988 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -365,7 +365,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, else mmc->slots[0].ocr_mask = c->ocr_mask; - if (!soc_is_am35xx()) + if (!soc_is_am35xx() && !soc_is_am33xx()) mmc->slots[0].features |= HSMMC_HAS_PBIAS; if (cpu_is_omap44xx() && (omap_rev() > OMAP4430_REV_ES1_0)) @@ -388,7 +388,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, } } - if (soc_is_am35xx()) + if (soc_is_am35xx() || soc_is_am33xx()) mmc->slots[0].set_power = nop_mmc_set_power; /* OMAP3630 HSMMC1 supports only 4-bit */ @@ -489,7 +489,8 @@ static void __init omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo, if (res < 0) goto free_mmc; - omap_hsmmc_mux(mmc_data, (ctrl_nr - 1)); + if (!soc_is_am33xx()) + omap_hsmmc_mux(mmc_data, (ctrl_nr - 1)); name = "omap_hsmmc"; res = snprintf(oh_name, MAX_OMAP_MMC_HWMOD_NAME_LEN,