From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751595AbeAPQJi (ORCPT + 1 other); Tue, 16 Jan 2018 11:09:38 -0500 Received: from mail-eopbgr10138.outbound.protection.outlook.com ([40.107.1.138]:61172 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751365AbeAPQIt (ORCPT ); Tue, 16 Jan 2018 11:08:49 -0500 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , Nicolas Ferre , Alexandre Belloni , Rob Herring , Mark Rutland , Russell King , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH 1/3] ARM: dts: at91: nattis: use up-to-date mtd partitions Date: Tue, 16 Jan 2018 17:08:33 +0100 Message-Id: <20180116160835.27943-2-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180116160835.27943-1-peda@axentia.se> References: <20180116160835.27943-1-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR09CA0088.eurprd09.prod.outlook.com (2603:10a6:7:3d::32) To DB6PR0202MB2776.eurprd02.prod.outlook.com (2603:10a6:4:a8::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 32f4e06c-1d8b-4c51-927e-08d55cfb6b93 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(7021125)(5600026)(4604075)(2017052603307)(7153060)(7193020);SRVR:DB6PR0202MB2776; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0202MB2776;3:bS62ELoQVe4v3vLgX4kIp+5LdGxFBARrHsa8CBVbtqm9NgJ8JpeQ2FSxUZQECApgdJRLisaPhRy0G/RlHy9qF2neZDKRoMVQTalF2/o06982bap4UOBuNwivxLhEheSEje+08hkB5F6nOyBeHxn51OjxwerPYjuKjWwQoKDqsOb15yGUCP6GdSwaNHJU5C0qaKACg7emCz4yZC0Rfi9Tk4MinCzwCosBIfxs/XM16IGtVWijernfl02WAXPkpwgQ;25:RyWBg71RUutw9/Wax979zm6Uzr1i0mRXIVVxHlnGg+IX12IqML5Sia8CKMaJ8RooaKqbHFJ5EEvmmIhVwcsi2S9gKWJIlFWilefSsAlS/5nLOGW1seS/x2HOEdiWpAhEAu63qGfjfkBpPgcpo1YUJcHXVI+7IBzHPbvobeO0xmmG2CoYWz++/BTPn6v96wsAwsa3HiGdsg9c5fqRpNSjDUuRVSFpGezQiHRGXesBfH3ZILZHb0EKvSY55xQSzDf77t5DDQezrxpajHbWna/Df5V1BM5MrK1TIWBWA0d1dKcUCciRo3lFEcRYuE0SyDYRYrZZfCRm0JHacGrKt+cr/g==;31:arAP7LoRID+NkWL7bIVbDoJH75fhMs4/yx+esvDsbQJ3+2Bf18vRquTkkibNoWoTLMYvcHAWJrnvU1F8DO/PEdD3SKSfMFi140887VryohDpkH6w2uqOc3Vy4Qxw2KiumlAkowJzQ2Zca7+tuaMUeqYrGDy3crIUyCkRwFeOHnmVo9xw5nXPxsVFVYHvAAqPQo+9xSQEut6/7DIzBykzKjcRPS4khXdGsB4EpiSuXfw= X-MS-TrafficTypeDiagnostic: DB6PR0202MB2776: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; 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)(10201501046)(93006095)(93001095)(3231023)(2400037)(944501161)(6041268)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(2016111802025)(6043046)(6072148)(201708071742011);SRVR:DB6PR0202MB2776;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:DB6PR0202MB2776; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0202MB2776;4:Z+Hmz8Eub7J9JpdBBx4eqbGkd4S70urmAkNDV6cU7zH7oeBZ1VxhXvO/l/+goDCXu1Mn2nXj3wOytBjAgMmJIxFkKGjRnjyzIYjV0P6xq/bXiGAaXwaeAhD+xfcxIbpoBzMtZFPGUZUOzi5WRFWdd/EBqqpt7jxALHCVTEs+nL6xw5Gnq5l2AbRkyJETq4QVVuoS8KPocJnybtlo5Q2FP4gE24B0H2FyE/LLjNrNilOH+pFbCZvZw/78DCh9KhF1qrFBXdDQpH9CEO9tosY8sQ== X-Forefront-PRVS: 0554B1F54F X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(376002)(39380400002)(39840400004)(346002)(366004)(396003)(189003)(199004)(4326008)(25786009)(6486002)(50226002)(105586002)(74482002)(86362001)(106356001)(8936002)(81156014)(8676002)(81166006)(2351001)(54906003)(316002)(16526018)(6666003)(16586007)(5660300001)(6916009)(2361001)(2950100002)(68736007)(53936002)(97736004)(6512007)(59450400001)(386003)(305945005)(48376002)(7736002)(478600001)(66066001)(50466002)(47776003)(52116002)(1076002)(36756003)(76176011)(3846002)(2906002)(51416003)(230783001)(26005)(6116002)(6506007)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:DB6PR0202MB2776;H:orc.pedanet;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DB6PR0202MB2776;23:A2faLeKG102kXQezqyQM6nMPOFmZe/QTyczJnU2?= =?us-ascii?Q?4ziqAOoZgSLOeuZlzPNqkcO4TnRVygVg4Vb3ek7r2BR9lobSYY0qUjFQ3Ghw?= =?us-ascii?Q?rQlxChpDmXgwXhq3XfQe+7RE0bGkwZqaSgfItVJEoBpGEeB5FxGgXnx1R+EJ?= =?us-ascii?Q?MAdU8VUQaTgTCOKxL3dmtuAP81qW0L9+54heJPM7SrcQZB7LNAL4qW5/dFqC?= =?us-ascii?Q?5IqTfahnneQDrU5TVWIgQkNrBiKxFby4Z18KhPX141ID0/I8wjPdQS2D7bb7?= =?us-ascii?Q?aS6w5ztQS0FL+Abxr+IGJeZE+91WZNTlGW3rGSLHpmvjHuy7BTQFDUtywBe+?= =?us-ascii?Q?s6T1CY5z/2wB+XLfzCJYy53smz8mM8h1cDOc//QxPAc4QWROV3/5q9bJL87K?= =?us-ascii?Q?7EpRVOch2KUR1MHKqEMItVWuJFnMD5i5wUolP01YkDkCjAFxsviw+dIzm3iO?= =?us-ascii?Q?szmnzYiMx0Rex+A4jSbQkR5A/PZXtrsTLy5dGRCwbq/plNoGzTalfbNI6h6Y?= =?us-ascii?Q?WXFYA+2X6/0CgkgC9r5T0DRHb5IPVCHdDHCt2dWE7bT49Xh0xsJ3v6+SxS9d?= =?us-ascii?Q?0RBalZSHsfmdFVLdUgOAapv78NPXzLRScmCFlF9QAOeVhyczQ/KY40o24n6z?= =?us-ascii?Q?rsO9ZXul05aQIstV5cdyKLdxWl6dGSdgWnxzlnrrNb5sgzDvvRKXRLZ/5bPT?= =?us-ascii?Q?WU4+r5E47IGuo2qy4tNvdrj4QnnwgB/rqk6sBJ+eFuUXLzTpZF7/hqsZjjzO?= =?us-ascii?Q?4vJfrJGKkLX5LMVNruIODhJyopEvXGaZm3xN7VqY+wG8SR2VkB4BldAGYV6U?= =?us-ascii?Q?m4aKmSqOpsK+ABaAeTJPIpApFy6gkuM+GHjVxqXNgeMoxmF5mAxQb9q6yMkI?= =?us-ascii?Q?8pGE6cjR+tFGtHAZ6pw8yIvzKGTeaKoEN93mOFzVyiXfewSpuUWx5Hp/ruvR?= =?us-ascii?Q?tYXXYzsC3nIbvlCmKRlL6PAdmkl9cD4FCG0nE5pPfRRzR3FtS9PndrumU7YQ?= =?us-ascii?Q?srHB4ZF+FE+pzGXz+oTZl+qewpTDkOMo+PVvTX/jtE6ZVOt5If2l7eglEmx3?= =?us-ascii?Q?Oi0G2TNvdWlVGw7FB4eqwhSGwEI33hG8BQXT79azj8YPAeN4HZJDfaIACYr3?= =?us-ascii?Q?rmK3KiBaQwBkEEDv1f5cZjlbieJLyjVz7e37c7F6Wg7tCfk7Yu4tYKlgXs9/?= =?us-ascii?Q?ZxBgClHNfcNorh/uTh0cC7qNLQJLTLvH+iH2xVVtARGTicWbYkKJNrSag44B?= =?us-ascii?Q?ssDsm6G2WZLc81ETJvOE=3D?= X-Microsoft-Exchange-Diagnostics: 1;DB6PR0202MB2776;6:u5m7gUSCkLwbLK323Bhd/h7lOA+PzQ0Lhn/LbGfShdlKUWQja8Y2kGchb3+Y/s35ZHEeQmr4+zD9+gLGUVWTN2TeWpB9MSJ+thRtZFcl1oZ6YA2lI2wRSAm0iZhIy00ymK84c6/wPZaIgjNzgeNlFqp7jYXJmR4t0ke6mgCysgqJoQWbPFIgyCDkEOQmQC34+w6Tmx0Tq5OTjjfu53mSLHtdBzianalEj3Jt1yGpBAVoVhIbfXyGLR8rsqum4yKjymaaSXIYHunhOA+zCixbsmLnJXSVIT8Hn4LmpEHgDQ3GxE0vUiBxdGfu8NCq/ARP4tW6j5epWsXX7rFfETTP8e9FVCt5BFOuXMKgC3Tar4M=;5:AeGhANt9zU6HZSeQyXdHSI3iw89/SceqJkwTAYDmgYCyuym6d2J+JENih9SU1OyhRt/8Dxw7K6gFBsvxJlHsKsuQ4JIO2r+pW/Eu45jwVCfMPXqMXgUXIG3x/Zrhbr+KfoeJv2muPerE5J2lZLl0Yg9LptiS+jUVkQ0M74d3YfU=;24:W75CiKqnuyqD4KUd9sMh/yurkLKlYwOLonYuTxK7bKQsUnBMl2uHvV5Q2nTOEj7lJMb8bxbhydyV4UNYDkk8jTwbZcT23P4g4fe0fHqtGNI=;7:vhk/XNBB6Dlv2cVHQwCFaWV1aFmqE2EBjmw07/q/iDsnaNHV3ixgf7C1kFrWvr3BAzKgm3llT3DbciUIt+abQyb1n0WP+XU8HAFyPLhmXY5knhpOrCWFMl7aY5fNMBLKA+C1kfUsm3RnKwvntg+rAdbL/K9wvCUQOM/z72Yt2qm7axNdWwE5vUJhJgD/iEwOJX9oLkDnL94AYzdx8+1m1G7gJPjOzd5137OI1HSZxKRi0UYPKx+As6hFMrHsArsp SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 16:08:44.6517 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 32f4e06c-1d8b-4c51-927e-08d55cfb6b93 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0202MB2776 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: 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 | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 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..4882bd6d38c1 100644 --- a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts +++ b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts @@ -216,24 +216,29 @@ 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 { -- 2.11.0