From patchwork Thu Jan 11 12:03:35 2018 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: 859087 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JZ0eqQTy"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TCu2X+12"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zHPg76y9nz9s75 for ; Thu, 11 Jan 2018 23:04:03 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=m3MskZAovbQscYBhc0NGZe09hIa0M8u6iOH3Fbf3AWA=; b=JZ0eqQTyN5zPnO mPiFimNOaehtFdNKcxZ2+PgX62M0+swD3bLYRIS6dAqrjeVnYBHguX8idgM4O0pLS0ak5a5oZko6J EHCg3BAMyiFjWmQCrKyTRWR5eUsdrmO0h6cvUD+WgsoDHKYVUUVQWJI49dJanb5LWuXqbpLTjtP6p 9h3Q9iAcVj8c0+LiLGn6OFUBFUnydSdB69z42hF0HuJflUf39Dz+nfCS+ilTd9RvIji8d3/Yxgsx6 XK/tEik/GMe4HlXpC2NpBr3eIg0rLh9JBuBu6u+/bWgaPxY8+gl6HIlxxlNQMrBpkaEqP318KJ/ue e2F6cBKFDZttGTpjXP5A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eZbaT-0002zd-Pl; Thu, 11 Jan 2018 12:04:01 +0000 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eZbaR-0002x6-4H for lede-dev@lists.infradead.org; Thu, 11 Jan 2018 12:04:00 +0000 Received: by mail-lf0-x242.google.com with SMTP id y71so2480330lfd.12 for ; Thu, 11 Jan 2018 04:03:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=hczYvEhJMqxtCUxw9Cp0P0ztfD5y+sGNL+M0SHiXnHU=; b=TCu2X+12aC3P+N6YPZnD6KmqGsVYT0RVXf+Ebyeacry17aUmVjszlhT7XhQuLypsX3 JbmXLT2U+KeeqNLHRbVkMxfm3YTI8vgTdUCsSn9oAy1lBjkBIeSRq9tiuBgr0UNt3gna nEN2UoxE7wfgqDZm18OFdhHB+ycFNujDDo6eYyB5U276q3dQwtctLfl6Anjyntg+4Dyp AHyoN++mlUpEqeXq36rDYq7oBdES9C5Vu+ye3dKkHRfQvZF3hL1/iT7uqd1lgRzWJCsI wefGoTnmrKHvDRWpBnohBIQl0bqdxJwVUyfNHeeIn3M7j6aT0zj4zQTCzsWYSKvhSWgM Nhkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=hczYvEhJMqxtCUxw9Cp0P0ztfD5y+sGNL+M0SHiXnHU=; b=VYHLAPITt4cVZTEc0eeSe5RBWjbexnbkOgrMdXNuspZp6f4a7BZZCBD+EPx2APTUux IxpEBxypbsGX+ssO1D1oU4Qs6nc6oIDXHg/AiNnNWe+fnxPL6b5WSrrgr/jxrUGKI83K r63PFSfgCaw1DOUWT/SfzTay8GiP7k3GbdUJV9gKEqKo1oY/mqQXDxRBWpje/UtLpcxU onqAeS5Vk+N3BayOgpSsZ/09xRHSviAwgPsFecOXvZE4pA2nkhfIW1XiyEdlx8ENiHJh +cKxCUisTXzVIH6kyHWUBHbeH6RAKEiCx6vRjC9ZvI81wCa8Y2J6QwjLVkm+sapMhY6V 8aGg== X-Gm-Message-State: AKGB3mIxVuHyAuBFNDBRNWtb7lZ5lxmbeaoL/8/hj6Os1S6O1/TNdwB/ M84/hIVxaH/uClsi1xPRu6w= X-Google-Smtp-Source: ACJfBoty18oSekqpufXBTW873pBCb0oiL7e654DQF4VH8Lq+0bCi+A8PIihw5lyH+bgxrrkOKlZWgQ== X-Received: by 10.46.29.199 with SMTP id w68mr12335252lje.110.1515672226629; Thu, 11 Jan 2018 04:03:46 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id g192sm3311975lfg.69.2018.01.11.04.03.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 04:03:45 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: John Crispin , lede-dev@lists.infradead.org, Pavel Kubelun Date: Thu, 11 Jan 2018 13:03:35 +0100 Message-Id: <20180111120335.16723-1-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180111_040359_199345_A60FE20A X-CRM114-Status: GOOD ( 10.41 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c07:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH] ipq806x: replace linux, part-probe with a proper partitions subnode X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Rafał Miłecki This solution is more upstream compatible as it only requires specifying of_match_table in the parser code and doesn't depend on linux,part-probe which is solution made generic by a LEDE downstream patch that can't be upstreamed. Signed-off-by: Rafał Miłecki Tested-by: Stefan Lippers-Hollmann Acked-by: John Crispin --- .../ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 4 +++- .../ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 4 +++- .../ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 4 +++- .../0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch | 9 ++++++++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ap148.dts index fa4f05bdbe..33fcbc54bf 100644 --- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -122,7 +122,9 @@ spi-max-frequency = <50000000>; reg = <0>; - linux,part-probe = "qcom-smem"; + partitions { + compatible = "qcom,smem"; + }; }; }; }; diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts index 15165b9b72..6069311da9 100644 --- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -182,7 +182,9 @@ spi-max-frequency = <51200000>; reg = <0>; - linux,part-probe = "qcom-smem"; + partitions { + compatible = "qcom,smem"; + }; }; }; }; diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts index 403054cc97..05517bdf40 100644 --- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts +++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts @@ -234,7 +234,9 @@ spi-max-frequency = <50000000>; reg = <0>; - linux,part-probe = "qcom-smem"; + partitions { + compatible = "qcom,smem"; + }; }; }; }; diff --git a/target/linux/ipq806x/patches-4.9/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch b/target/linux/ipq806x/patches-4.9/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch index ad0b09b115..a888b063a1 100644 --- a/target/linux/ipq806x/patches-4.9/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch +++ b/target/linux/ipq806x/patches-4.9/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch @@ -34,7 +34,7 @@ Signed-off-by: Ram Chandra Jangir # --- /dev/null +++ b/drivers/mtd/qcom_smem_part.c -@@ -0,0 +1,228 @@ +@@ -0,0 +1,235 @@ +/* + * Copyright (c) 2015, The Linux Foundation. All rights reserved. + * @@ -240,10 +240,17 @@ Signed-off-by: Ram Chandra Jangir + return smem_parts->len; +} + ++static const struct of_device_id qcom_smem_of_match_table[] = { ++ { .compatible = "qcom,smem" }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(of, qcom_smem_of_match_table); ++ +static struct mtd_part_parser qcom_smem_parser = { + .owner = THIS_MODULE, + .parse_fn = parse_qcom_smem_partitions, + .name = "qcom-smem", ++ .of_match_table = qcom_smem_of_match_table, +}; + +static int __init qcom_smem_parser_init(void)