From patchwork Sun Dec 7 00:18:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 418441 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 82D3A14010B for ; Sun, 7 Dec 2014 11:18:55 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 4FB552805F2; Sun, 7 Dec 2014 01:16:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id F334A2805E6 for ; Sun, 7 Dec 2014 01:16:54 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sun, 7 Dec 2014 01:16:54 +0100 (CET) Received: by mail-wg0-f48.google.com with SMTP id y19so3595904wgg.21 for ; Sat, 06 Dec 2014 16:18:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=cH48MZBGo99tmC6Yarj7Qn/AT9zfU7QiFqYOLxHTYBs=; b=U1PTtVCUc3DFt/cPnJ49xzfCoVlJEd7dX7c16HLK5MDE1qg7Hpid049G/7XmQNgw+O D22dS4gltx9LzBbovi5KgX+2/Qzj7DckD0wnF9IDDIeOjrN78L6rl554gNtEwKbcR4iV QpS9Hkl279SqS4NCZ8vIzMayu0f1vQMyw7QcCDnwWlLiMa5j9GBXBIjMc2Lo0RvjbKlR 8uQ/i5BhJF45FVJ5elaaHUj/fwdqJYsmQeCaqChQJlQNjGH0aSUerkZipYn4UAs+XO87 A3sGEh9nhyoFuoG9kiH230SUlvwmqsAgee0eR1ZyqoP6ajMgVsA7VvHF/YbEQY8+yi+V pFVQ== X-Received: by 10.194.81.6 with SMTP id v6mr34183670wjx.39.1417911515625; Sat, 06 Dec 2014 16:18:35 -0800 (PST) Received: from linux-tdhb.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by mx.google.com with ESMTPSA id gs9sm50496549wjc.47.2014.12.06.16.18.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Dec 2014 16:18:34 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Hauke Mehrtens , openwrt-devel@lists.openwrt.org Date: Sun, 7 Dec 2014 01:18:22 +0100 Message-Id: <1417911502-20517-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 Subject: [OpenWrt-Devel] [PATCH][RFC][bcm53xx] mtd: nand: bcm_nand: switch from cmdlinepart to ofpart X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" bcm_nand uses (and depends on) OF, so there isn't much sense to use cmdlinepart Signed-off-by: Rafał Miłecki --- drivers/mtd/nand/bcm_nand.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/bcm_nand.c b/drivers/mtd/nand/bcm_nand.c index 3c5b1d1..f2bd79e 100644 --- a/drivers/mtd/nand/bcm_nand.c +++ b/drivers/mtd/nand/bcm_nand.c @@ -40,6 +40,7 @@ #include #include +#include #define NANDC_MAX_CHIPS 2 /* Only 2 CSn supported in NorthStar */ @@ -1494,13 +1495,14 @@ static int __init bcmnand_idm_init(struct bcmnand_ctrl *ctrl) return 0; } -static const char * const part_probes[] = { "bcm47xxpart", "cmdlinepart", NULL }; +static const char * const part_probes[] = { "bcm47xxpart", "ofpart", NULL }; /* * Top-level init function */ static int bcmnand_probe(struct bcma_device *core) { + struct mtd_part_parser_data parser_data; struct device *dev = &core->dev; struct device_node *np = dev->of_node; struct bcmnand_ctrl *ctrl; @@ -1539,7 +1541,8 @@ static int bcmnand_probe(struct bcma_device *core) if (res) return res; - res = mtd_device_parse_register(&ctrl->mtd, part_probes, NULL, NULL, 0); + parser_data.of_node = np; + res = mtd_device_parse_register(&ctrl->mtd, part_probes, &parser_data, NULL, 0); if (res) { pr_err("%s: Failed to register MTD device: %d\n", DRV_NAME, res); return res;