From patchwork Sat May 23 16:49:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew de Quincey X-Patchwork-Id: 25537 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 n4NGngqL008382 for ; Sat, 23 May 2009 16:49:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753175AbZEWQti (ORCPT ); Sat, 23 May 2009 12:49:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753747AbZEWQti (ORCPT ); Sat, 23 May 2009 12:49:38 -0400 Received: from 82-71-49-12.dsl.in-addr.zen.co.uk ([82.71.49.12]:50425 "EHLO mail.lidskialf.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753029AbZEWQti (ORCPT ); Sat, 23 May 2009 12:49:38 -0400 Received: from lidskialf.net (beyond.lidskialf.net [172.16.1.1]) by mail.lidskialf.net (Postfix) with ESMTP id 398E948A6119C for ; Sat, 23 May 2009 17:49:39 +0100 (BST) Received: from munin.lidskialf.net (munin.lidskialf.net [172.16.1.17]) by lidskialf.net (Horde Framework) with HTTP; Sat, 23 May 2009 17:49:39 +0100 Message-ID: <20090523174939.45129s043kunkc2o@lidskialf.net> Date: Sat, 23 May 2009 17:49:39 +0100 From: Andrew de Quincey To: linux-omap@vger.kernel.org Subject: Patch: Fix N770 MMC support MIME-Version: 1.0 User-Agent: Internet Messaging Program (IMP) H3 (4.3) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Some of the N770's MMC configuration options seem to have been dropped. This patch adds them back in again. Note that only the .ocr_mask change was /critical/, but I've added the .max_freq setting back as well, as the original sources had it. Can anyone confirm if this is unnecessary? Secondly, there is support in the original code for a 4wire/higher speed mode. As I don't have the requisite N770 hardware (I think it was a rev2 N770?) to test this, I can't really add it back. commit b67345993d494a1dd5021e29de9611af80cbf1cd Author: Andrew de Quincey Date: Sat May 23 17:43:19 2009 +0100 Fix n770 MMC support Some of the necessary configuration settings for the N770's MMC support had been dropped. Add them back in again. Signed-off-by: Andrew de Quincey diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 2c4785e..bfed959 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -209,9 +209,11 @@ static int nokia770_mmc_get_cover_state(struct device *dev, int slot) static struct omap_mmc_platform_data nokia770_mmc2_data = { .nr_slots = 1, .dma_mask = 0xffffffff, + .max_freq = 12000000, .slots[0] = { .set_power = nokia770_mmc_set_power, .get_cover_state = nokia770_mmc_get_cover_state, + .ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34, .name = "mmcblk", }, };