From patchwork Fri Sep 18 14:53:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 53903 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id 05224218E3 for ; Fri, 18 Sep 2015 14:56:24 +0000 (UTC) Received: by lbot4 with SMTP id t4sf17978726lbo.0 for ; Fri, 18 Sep 2015 07:56:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=jP3aLx+oH7DjO+hPuGgbSCxO0eTpyBg6aBOEezijiVk=; b=Wd7/pnVX1WQLyobEUdMxT4he+QGA0D5vskvkOub4xVMSMnD6yzroOLShabLvTk354f AAis+O/JKEeZcuaWlRJzaCKhvb7StBWUHKEZbeNF/iRY+4+WRB5pgNShsXxCz1g/BPKu 2VdSvyBnuBeTOnJPUJBcYpDGR5lYaHjTAVUURU/08l/UJ9lxZANX08yXPQs+Tq5G08oH B5YGpo18S0D4Ukjfxk3c4Uo/+yFvQ2Um3E57fTo0MceKIWm5ALNcOrhUCp8hDfQIo2F9 T0izM9Kt6Jcpf4iuPogxIjW2HzdRKYu7DbaoooKYDv9dZT9KPbSMpGvW0nMH8Q+ODYsj Lobw== X-Gm-Message-State: ALoCoQnxp2y9XNRQoGs4jC8rdLYvXkLhI31P1NL36o3gXa+dZpxv97/WMtXEJxXHy+bThQtSAS+M X-Received: by 10.152.1.129 with SMTP id 1mr990229lam.3.1442588182900; Fri, 18 Sep 2015 07:56:22 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.103 with SMTP id a7ls186274lah.7.gmail; Fri, 18 Sep 2015 07:56:22 -0700 (PDT) X-Received: by 10.112.204.101 with SMTP id kx5mr3272023lbc.93.1442588182737; Fri, 18 Sep 2015 07:56:22 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id wp2si6231073lbb.136.2015.09.18.07.56.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Sep 2015 07:56:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by lamp12 with SMTP id p12so31480649lam.0 for ; Fri, 18 Sep 2015 07:56:22 -0700 (PDT) X-Received: by 10.152.37.135 with SMTP id y7mr3374079laj.106.1442588182605; Fri, 18 Sep 2015 07:56:22 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp344642lbq; Fri, 18 Sep 2015 07:56:21 -0700 (PDT) X-Received: by 10.50.50.240 with SMTP id f16mr34143179igo.95.1442588181552; Fri, 18 Sep 2015 07:56:21 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sd6si7129664igb.4.2015.09.18.07.56.21; Fri, 18 Sep 2015 07:56:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754676AbbIRO4J (ORCPT + 30 others); Fri, 18 Sep 2015 10:56:09 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:46960 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751823AbbIRO4G (ORCPT ); Fri, 18 Sep 2015 10:56:06 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8IEtjUj027266; Fri, 18 Sep 2015 09:55:45 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8IEtjVm009790; Fri, 18 Sep 2015 09:55:45 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.224.2; Fri, 18 Sep 2015 09:55:45 -0500 Received: from rockdesk.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8IEseAZ002598; Fri, 18 Sep 2015 09:55:42 -0500 From: Roger Quadros To: CC: , , , , , , , , , , Roger Quadros Subject: [PATCH v3 19/27] memory: omap-gpmc: Prevent GPMC_STATUS from being accessed via gpmc_regs Date: Fri, 18 Sep 2015 17:53:41 +0300 Message-ID: <1442588029-13769-20-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1442588029-13769-1-git-send-email-rogerq@ti.com> References: <1442588029-13769-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: rogerq@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , GPMC_STATUS register is private to the GPMC module and must not be accessed directly by NAND driver through the gpmc_regs. They must use gpmc_omap_get_nand_ops() instead. Signed-off-by: Roger Quadros --- drivers/memory/omap-gpmc.c | 2 +- include/linux/platform_data/mtd-nand-omap2.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index 764e24a..4c630ad 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -1051,7 +1051,7 @@ void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) { int i; - reg->gpmc_status = gpmc_base + GPMC_STATUS; + reg->gpmc_status = NULL; /* deprecated */ reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET + GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs; reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET + diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h index 19e509d..17d57a1 100644 --- a/include/linux/platform_data/mtd-nand-omap2.h +++ b/include/linux/platform_data/mtd-nand-omap2.h @@ -45,7 +45,6 @@ enum omap_ecc { }; struct gpmc_nand_regs { - void __iomem *gpmc_status; void __iomem *gpmc_nand_command; void __iomem *gpmc_nand_address; void __iomem *gpmc_nand_data; @@ -64,6 +63,8 @@ struct gpmc_nand_regs { void __iomem *gpmc_bch_result4[GPMC_BCH_NUM_REMAINDER]; void __iomem *gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER]; void __iomem *gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER]; + /* Deprecated. Do not use */ + void __iomem *gpmc_status; }; struct omap_nand_platform_data {