From patchwork Fri Apr 6 08:45:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Gray X-Patchwork-Id: 895636 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.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=jsg.id.au Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40HYFV23Shz9s0x for ; Fri, 6 Apr 2018 18:46:06 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D84CAC21D65; Fri, 6 Apr 2018 08:45:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 07F26C21C51; Fri, 6 Apr 2018 08:45:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E55F9C21C2C; Fri, 6 Apr 2018 08:45:55 +0000 (UTC) Received: from lechuck.jsg.id.au (jsg.id.au [210.15.216.215]) by lists.denx.de (Postfix) with ESMTPS id 76C9FC21C29 for ; Fri, 6 Apr 2018 08:45:54 +0000 (UTC) Received: from largo.jsg.id.au (largo.jsg.id.au [192.168.1.43]) by lechuck.jsg.id.au (OpenSMTPD) with ESMTP id d4d41091; Fri, 6 Apr 2018 18:45:49 +1000 (AEST) Received: from largo.jsg.id.au (localhost [127.0.0.1]) by largo.jsg.id.au (OpenSMTPD) with ESMTP id 32e7dae4; Fri, 6 Apr 2018 18:45:49 +1000 (AEST) From: Jonathan Gray To: u-boot@lists.denx.de Date: Fri, 6 Apr 2018 18:45:49 +1000 Message-Id: <20180406084549.15529-1-jsg@jsg.id.au> X-Mailer: git-send-email 2.14.2 Cc: agraf@suse.de Subject: [U-Boot] [PATCH] rpi: Complete table of models with new revision code scheme X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In the model table for the new revision code encoding documented in https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md add the entries for old models with the new scheme and add CM3 which only appears in the new scheme. A device tree for CM3 is not currently upstreamed in linux. When that happens the name will likely have to be adjusted in the table. Signed-off-by: Jonathan Gray --- board/raspberrypi/rpi/rpi.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 279a9c3cda..de8e308f6c 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -91,11 +91,36 @@ static const struct rpi_model rpi_model_unknown = { }; static const struct rpi_model rpi_models_new_scheme[] = { + [0x0] = { + "Model A", + DTB_DIR "bcm2835-rpi-a.dtb", + false, + }, + [0x1] = { + "Model B", + DTB_DIR "bcm2835-rpi-b.dtb", + true, + }, + [0x2] = { + "Model A+", + DTB_DIR "bcm2835-rpi-a-plus.dtb", + false, + }, + [0x3] = { + "Model B+", + DTB_DIR "bcm2835-rpi-b-plus.dtb", + true, + }, [0x4] = { "2 Model B", DTB_DIR "bcm2836-rpi-2-b.dtb", true, }, + [0x6] = { + "Compute Module", + DTB_DIR "bcm2835-rpi-cm.dtb", + false, + }, [0x8] = { "3 Model B", DTB_DIR "bcm2837-rpi-3-b.dtb", @@ -106,6 +131,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { DTB_DIR "bcm2835-rpi-zero.dtb", false, }, + [0xA] = { + "Compute Module 3", + DTB_DIR "bcm2837-rpi-cm3.dtb", + false, + }, [0xC] = { "Zero W", DTB_DIR "bcm2835-rpi-zero-w.dtb",