From patchwork Thu Jan 18 11:46:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 10172949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1D326603B5 for ; Thu, 18 Jan 2018 11:47:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1227D21327 for ; Thu, 18 Jan 2018 11:47:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 065AC26223; Thu, 18 Jan 2018 11:47:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7CBA525D9E for ; Thu, 18 Jan 2018 11:47:17 +0000 (UTC) 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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8L0hoOGf2gXpWh0xWeiafikz4ehZkItJTyq2YmftTLI=; b=KmOUmKHFeRSWVo g/AzBe+jyJpLlOU7WSeFn+eSAHV97g6CY9WNee5PKphIHmbOW8XJz0uojlrFJ8mHMSgI0J16pIzFh ShdV5rQ+g9I52VL2gfhfmZra+9EOEAL4RmHAYN+D2U1YGxoeUk1+Jc3SIyME6InU2joxWV/Qj2fRq Mhx6ppPyQShiL46SOIW2WrzoVnhYFXPxfjUL3mbuP8OgB//olapQO6xzbQSzzCFpu+gRI5vPYA/ls Tjn9VmYBGsIeRthr33cc0j6KZUD5kN7ITJ0HzsfJK44QIz7HGFGKXQHHLV1XmMGOIULPqbs/X35eI w3dMsgOIIcleW4rVnWkQ==; 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 1ec8f4-0003lD-Ha; Thu, 18 Jan 2018 11:47:14 +0000 Received: from mail-he1eur01on0092.outbound.protection.outlook.com ([104.47.0.92] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ec8ef-0003An-0Y for linux-arm-kernel@lists.infradead.org; Thu, 18 Jan 2018 11:46:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentiatech.onmicrosoft.com; s=selector1-axentia-se; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=R82AX6hMoi9ejMKGYtV0I7G7ZpoIPdGrWM9c+Ucvop8=; b=GNNVYf55QsiXmg1JEi39uDs7h8subpBo+mDPS3FP2+3dHlwLmIhquiPoooh6aybm489jf7SJHVtiUjLkrmw+kqxs6WTsiv9EqOIMuiHv7H47MLUzs3+7IOHxBIRR4bckwj28gzgmEWIUkORpTMSNkcnwEGMaiaOhm1I8l/EAl+0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Thu, 18 Jan 2018 11:46:25 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] ARM: dts: at91: nattis: use up-to-date mtd partitions Date: Thu, 18 Jan 2018 12:46:14 +0100 Message-Id: <20180118114616.6639-2-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180118114616.6639-1-peda@axentia.se> References: <20180118114616.6639-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR07CA0017.eurprd07.prod.outlook.com (2603:10a6:7:67::27) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 610cdad6-fb92-49ec-5aed-08d55e691ace X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:uMSNqr7k1MUEk/Ut6/1Z0dfLVa9V/KAe+TfcNdPeCIWEuwpx1HkV1LfsNqqrEnnfeuMvOoVqJrpkm3mfNCpfJzTcJDeqkJ6OCZS0rxB1U6ZCBcVp0dvyNgjm9pitCEwH9E54ovz8Lwa6Eyk6STZqbEmJpfdkQbsJoPr/1CVJbgKBsJje1AXzPnSmpZ3Y96HtmCBCM0jLgwpbxSRPZbnMaw0EEupDEDQxHQhCQpyxAHa7hPqm/aAnu9FpsEbHO5gg; 25:EJ06drDd1ZuiA5HHEllyuKvf4dFAmaPHCGhbM433j558bUb9CVJhbr1uiv04uupjBtT+1s4yk8k/rT8PhFMtZUvpR+zQzEI4j3NSlCS5y54JPi+Ps9JOEMq4+xq+2/qlfzYoiDVYHWl+XF2N5D1x0PsbjHVquV/NM5B3EwlNZ2dx6nVqLRtZz62Ia0PklHAhrxZRQHjwrKzahb53os+PscRMrV1VLSWq4Q8y434dPudmw72SRZFe9ObgTUZuR2nei/kZWjBejL3IrOXNnYGSidcmNnZBV9CYMU2Zquxr2WfC0T7VSXUYfDnFJ21G1aYaqibZTAJQ5Z+9AIiS3xFQaA==; 31:XoVvd2EBFbobtWcgPR8WSE4uxFsa3JiTmk+uSceBVrH/FpHYeYcpc8YHi6EJQKqTYD/xLl7lIFF1b/CimCLvuPTFmItlfs8OdlICsWveWWEWOhBigo5Dm76ydaHBWkj2IkaG2wAcdIYDf6fkt9q0XMeT2rxI/YyvWyCk22b4zrAS63darLcObcqPB1Z3sk9/Mms0oW6l87rI81Hb6aY7TGfZ8GKyfGgG8a8gtDqVUd8= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231023)(2400061)(944501161)(10201501046)(6041268)(2016111802025)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:/AHuHluuH3C3i/XQ+cCRSZjhRW36HAUBNp91/gpIyMgAW4A7sWvyQTlqFXKWsqA4OhWLcg90PO5zA3h1mGeK83cq+Ba4yOEl4pxUPf2lB/kHUfRzru4yb6ALwfmI3i7d2ehQTwz8W4QTb+snm2QLKK8n8b/gHcvOQXIZkVFFpbMB5SYOmsfitfwN4wfsJ2lcTK9tnNn470Ek2cpmLWfGWfbB+HW9wj2iUq9XnXd18Ppb0KH1bqhvRK3TPAwnDyGRKEUY9GFDYLbwIV0Y16L6bw== X-Forefront-PRVS: 05568D1FF7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(396003)(366004)(39380400002)(346002)(39830400003)(189003)(199004)(86362001)(575784001)(2950100002)(6916009)(6512007)(53936002)(36756003)(47776003)(66066001)(81166006)(478600001)(4326008)(25786009)(106356001)(2351001)(105586002)(81156014)(8676002)(97736004)(74482002)(6666003)(2361001)(5660300001)(50226002)(48376002)(68736007)(50466002)(1076002)(6116002)(3846002)(6486002)(230783001)(8936002)(7736002)(2906002)(26005)(6506007)(59450400001)(386003)(51416003)(52116002)(76176011)(16526018)(316002)(16586007)(54906003)(305945005)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0202MB2782; 23:eacUzYX/ISz3bsgBgoWl8CDQFfVGAJxbJxbXD+Y?= =?us-ascii?Q?QOu0kN2GBhpnSMe3bTqYwoHa5YnssS5FrI7ZTzPMP2PoUhvTfffz8Pfr9vwC?= =?us-ascii?Q?ppY2leUnURhuxNBvF28gX15htWNMQEBMtcxOToEMFJfaj+1KYUYIDCyj40TW?= =?us-ascii?Q?MOH/eyjL+jKyoVnmMcGUtwG6aylUvt9tu0gyHld+XJCngiYVxpJk/QyXm2ou?= =?us-ascii?Q?g7FACRq6zKH9GkJvoijo9NBESqN2O17gu4ozp9q+eimpqMHcsACOtLCwSiue?= =?us-ascii?Q?CiiEKoWjM1KoL+sFtl3V5a5Frjolptetxnn4mQpJdwCC6vdgVrKxH2OrUSB8?= =?us-ascii?Q?HfocmHjMIB9UeobXBxnD+SYko1vopZDrk0RNXY5WYukiCGkyQpsd5/kH+dF9?= =?us-ascii?Q?kqTfRfWYyKZ7BV+jmj5L12CPfEse5i5QGeaFaa0LyC5ur5GxRZzzPMMVovu+?= =?us-ascii?Q?9YpfxNa/3ZykhphP9lXClCY/0Z18GkEvM89mmRQ5dz0ce/dQgq+HfqJsSu71?= =?us-ascii?Q?IRsi0CjpX+7tDj12K512dv10d3ImmISsaM44IMLSZKIQOlSy9Zzxu1X6P2qk?= =?us-ascii?Q?3grwuQ3N/x59rv3zmvinru3oNNJw8TaqgrHEv222zZey7O/l+kDAJWLfhOs6?= =?us-ascii?Q?/ovGIkXA4hFigXtYtw/0/4Q653uX6DB/pBkNLRmu3T8gIYHG+TMQrN42m5yZ?= =?us-ascii?Q?/Z8klhy15mNNy9RIJY/SP4xsJltROfS2TQ0pp6ZJShZWHGpAM8MTCHTcjwQm?= =?us-ascii?Q?hy7kNjrlEzjmrb8hHunqVIpkzFypmXZ3vDfV82qGbMWP0w6DmJsLjfSJxetJ?= =?us-ascii?Q?Pcw8WadW3s80LUV2R1ekmVg/Wrap2ZE6Ovrjc2Iqdq2z8ZOSOCybM0bUMXeI?= =?us-ascii?Q?7ZqgfBlL8TvOxZY01lynM8mOz4ASGFRX8Lf5G1DruI05SzAVdyr5JPJERjBC?= =?us-ascii?Q?vO464dSxjsMLPvz2n8c/BNUlobA+gelN5BB+ytoqLbGW5TYhpSBy/COip7Sk?= =?us-ascii?Q?SbeyRfFwOAQwwLnueGEBjP/RHrT5P3mzTlAisbswpF1pR58M/7QbfkF8J3lY?= =?us-ascii?Q?aTKRxoCuPxo/tX5WXP1ar31f+bMw7tFba6eQR7xO49VAOKOFAv4BnepoRlc0?= =?us-ascii?Q?lmJtkywDTGXIk5IxX5eAnAxFpc91GbMDMUXOX6weQrkJqrftdyXCdcdphN5A?= =?us-ascii?Q?sgVTruWeyraCnD8l/fc0w21X2DmtgCQA8b4dSFsG0d69NMcP16F/53nzLP1F?= =?us-ascii?Q?23+GPU1viqnBZtae3VI0VPymE5xF1BhZB7a0BSgqf?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:HRdwrU4tZr/FUwwupqwCdDHtwGvt5oW5bNMiPeWQ6GNDfiYhjjQ956RJFm5NmPeAREbOj+KBQCJpo4JSNX21wLMDBHFNI7RvANH6TGLEMO8vEntmY4a1G1AehyNQKetKw1uQ3qnGlkQpkwgO4MHwmSi/tL+CPx6/4PBNWwXQaMxbN+WN+fK7g+B+/Qxt9xaSpFAqQvglX84iwiF+i7d+Nvea/XpwZaQoV8SfjcG1BLVbLlXquQmzsh/HAZ7qby0I6Xl5vje3kuo5KVhRayE8D+L+n/0qVCiHj8SWTvcHsRKXaSIXnX2FfNYp7pUyRH35cfcrckHnB7dCt7KW3bGcSLBmmo2uY96OblvI8xaYCWY=; 5:hD9mKmQXf29d+mpFyIYMgw4hvkILoxYeJoIFlNr4j0NLKQk6lFqAilxOtCu8hsYMb95SxlADeLvWqbmvdbj/1hpgSLNLKQSH2nBMxRAQ8Iil6J1dzQiuYP2q9VhiQmivmHOTJ85NhdP4H2oh16V4UN7BvfqJ00Q9XLZo69iL2T8=; 24:7IP+8S+gku2Uy9oEzx9eu7u+OrEH1406/m8JHlvSlruRrOu/uW5cmvWi76ZDP4yf0ILvSJxoZYiIoedUdWgDMdZxTluXPmvJBErcK+rufWo=; 7:5fGS4QH5Ic4BwV0hcQjrSkHrdcGr9xSnbenDTm9vk16hw18pEWyhbfkEUZ2v+3Yx0/evUBbz58nN4CyC1xqix+AOcys3b0lgRHTehBPCZCbhpGk94lOy99Ugk2msFcd51/P2NPGnxnDfioPvh3/SJ0nflp6rqbxkxg/lpxxWa0AQW1aoTUOZ4/m96L2lGhbuTiHXejV7Tb5+hF8mKzS7NCgcIdmq0ZVqS3WiltdjqnI3nasi77dQ3uYzwDujD5sZ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2018 11:46:25.0070 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 610cdad6-fb92-49ec-5aed-08d55e691ace X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Rob Herring , Alexandre Belloni , Peter Rosin , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The nattis currently relies on the cmdline to correctly configure the MTD partition table, and the one given in the device tree is simply ignored. Which is fortunate, since the device tree partition table is bonkers and does not match reality. So, in order to avoid confusion, fix the device tree partition table to match what is expected (i.e. what is normally provided on the cmdline). In particular, the rootfs partition should be mtd6. Fixes: 0e4323899973 ("ARM: dts: at91: add devicetree for the Axentia Nattis with Natte power") Signed-off-by: Peter Rosin --- arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts index 3ea1d26e1c68..03683c1b4240 100644 --- a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts +++ b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts @@ -216,29 +216,34 @@ reg = <0x0 0x40000>; }; - bootloader@40000 { - label = "bootloader"; - reg = <0x40000 0x80000>; + barebox@40000 { + label = "barebox"; + reg = <0x40000 0x60000>; }; - bootloaderenv@c0000 { - label = "bootloader env"; - reg = <0xc0000 0xc0000>; + bareboxenv@c0000 { + label = "bareboxenv"; + reg = <0xc0000 0x40000>; }; - dtb@180000 { - label = "device tree"; - reg = <0x180000 0x80000>; + bareboxenv2@100000 { + label = "bareboxenv2"; + reg = <0x100000 0x40000>; + }; + + oftree@180000 { + label = "oftree"; + reg = <0x180000 0x20000>; }; kernel@200000 { label = "kernel"; - reg = <0x200000 0x600000>; + reg = <0x200000 0x500000>; }; rootfs@800000 { label = "rootfs"; - reg = <0x800000 0x0f800000>; + reg = <0x800000 0x1f800000>; }; }; };