From patchwork Sat Nov 26 18:06:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 84282 Delivered-To: patch@linaro.org Received: by 10.182.1.168 with SMTP id 8csp786616obn; Sat, 26 Nov 2016 10:10:21 -0800 (PST) X-Received: by 10.99.43.8 with SMTP id r8mr25177249pgr.83.1480183821159; Sat, 26 Nov 2016 10:10:21 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q197si49434924pfq.263.2016.11.26.10.10.20; Sat, 26 Nov 2016 10:10:21 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753700AbcKZSKN (ORCPT + 25 others); Sat, 26 Nov 2016 13:10:13 -0500 Received: from conuserg-11.nifty.com ([210.131.2.78]:48104 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753107AbcKZSIT (ORCPT ); Sat, 26 Nov 2016 13:08:19 -0500 Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-11.nifty.com with ESMTP id uAQI6Ues018512; Sun, 27 Nov 2016 03:06:51 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com uAQI6Ues018512 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1480183611; bh=LTOFlVKMPCZDbFGj9xwLlmWgMUcu6DlSmRs7osqxZmc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JqZmbCcFzvYX6F0lpQTGGeorn7a8ENSzB8R84oEsXnTnlXa8bDTq8gIJJpgYNdikk NZcV1ZgO1V+tf2R4w9sOr1btgfjDPhMxrKE7w+veR7LOrkatWZ+3ezHXQwecxvkSAV nHG7EGGJ3aQr8ySTWahlmfjdWpMceRQ20atKa8TNDBL4+IngGYWeHihQcZzLQYQwmr GuBDqa50AukS2WFfVeKH8DPUgZ5zIlN6I58Ys5KLNIPwENgTLNDAYSDzw0Wf4tMUAN jLtwtbr8d+y+rfE2YSEUStj35KdexJBZxZGo4ByhZVTKMGhmnV2fdDKJeX/3VAvPiQ bqQRYWkCdEFzA== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Masahiro Yamada , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Boris Brezillon , Marek Vasut , Brian Norris , Richard Weinberger , David Woodhouse , Cyrille Pitchen , Rob Herring , Mark Rutland Subject: [PATCH 22/39] mtd: nand: denali_dt: remove dma-mask DT property Date: Sun, 27 Nov 2016 03:06:08 +0900 Message-Id: <1480183585-592-23-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480183585-592-1-git-send-email-yamada.masahiro@socionext.com> References: <1480183585-592-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver sets appropriate DMA mask. Delete the "dma-mask" DT property. Refer to the Link tag for negative opinions for this binding. Signed-off-by: Masahiro Yamada Link: https://lkml.org/lkml/2016/2/8/57 --- Documentation/devicetree/bindings/mtd/denali-nand.txt | 2 -- drivers/mtd/nand/denali_dt.c | 9 --------- 2 files changed, 11 deletions(-) -- 2.7.4 diff --git a/Documentation/devicetree/bindings/mtd/denali-nand.txt b/Documentation/devicetree/bindings/mtd/denali-nand.txt index b04d03a..603110b 100644 --- a/Documentation/devicetree/bindings/mtd/denali-nand.txt +++ b/Documentation/devicetree/bindings/mtd/denali-nand.txt @@ -5,7 +5,6 @@ Required properties: - reg : should contain registers location and length for data and reg. - reg-names: Should contain the reg names "nand_data" and "denali_reg" - interrupts : The interrupt number. - - dm-mask : DMA bit mask The device tree may optionally contain sub-nodes describing partitions of the address space. See partition.txt for more detail. @@ -19,5 +18,4 @@ nand: nand@ff900000 { reg = <0xff900000 0x100000>, <0xffb80000 0x10000>; reg-names = "nand_data", "denali_reg"; interrupts = <0 144 4>; - dma-mask = <0xffffffff>; }; diff --git a/drivers/mtd/nand/denali_dt.c b/drivers/mtd/nand/denali_dt.c index 9dcd203..6a486a7 100644 --- a/drivers/mtd/nand/denali_dt.c +++ b/drivers/mtd/nand/denali_dt.c @@ -40,8 +40,6 @@ static const struct of_device_id denali_nand_dt_ids[] = { MODULE_DEVICE_TABLE(of, denali_nand_dt_ids); -static u64 denali_dma_mask; - static int denali_dt_probe(struct platform_device *ofdev) { struct resource *denali_reg, *nand_data; @@ -79,13 +77,6 @@ static int denali_dt_probe(struct platform_device *ofdev) if (IS_ERR(denali->flash_mem)) return PTR_ERR(denali->flash_mem); - if (!of_property_read_u32(ofdev->dev.of_node, - "dma-mask", (u32 *)&denali_dma_mask)) { - denali->dev->dma_mask = &denali_dma_mask; - } else { - denali->dev->dma_mask = NULL; - } - dt->clk = devm_clk_get(&ofdev->dev, NULL); if (IS_ERR(dt->clk)) { dev_err(&ofdev->dev, "no clk available\n");