From patchwork Tue Aug 11 14:25:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 6992581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3BB859F344 for ; Tue, 11 Aug 2015 14:28:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 21766202F2 for ; Tue, 11 Aug 2015 14:28:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E0EA202BE for ; Tue, 11 Aug 2015 14:28:12 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZPAVT-0004eu-4O; Tue, 11 Aug 2015 14:26:23 +0000 Received: from mail-io0-x234.google.com ([2607:f8b0:4001:c06::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZPAVQ-0004PV-5k for linux-arm-kernel@lists.infradead.org; Tue, 11 Aug 2015 14:26:21 +0000 Received: by iodt126 with SMTP id t126so12424748iod.2 for ; Tue, 11 Aug 2015 07:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=0q7KA1/RBeDkh/0WJptJTA3j6IHOsP8vQTPeMPQRhGk=; b=EjqWiAcptKb/WdTPdtT0wMraki5fVKar7NB1WEM8+nCpLBLN3MPRh4U7LdaLGq+6s5 pxHBO0C4F2xaIbqT7AurBIwGFNH4vjV7Cpk1XjWJmYsSCl+6T5qPbscQwDqJNAkkQaeW 1+WEW0ywlINJDnOUajB7w96tHwty6P3liNoFs64BoC7fjghGddWuy4pqMNorN2ePcasd POZis8etU7sI2idBAI2E3D9e9QzAr73R2rgWzTCQOaKDzM2nTT6zHxEw3c59Hui7VMJS thOzvwruYHDSZFAMVDKWxxlyOurhufLokmVStBY/L/18qDcw3X0JcR2nyX0N3WJBDndg JOYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=0q7KA1/RBeDkh/0WJptJTA3j6IHOsP8vQTPeMPQRhGk=; b=k36UPc/N7Va3CXcVGoE/lZzQ5/OMeoNNSvv0xGWoIZcEI4pvZhAF2QV6I2W6+DgnHU I8ux0rTwKjs+v2h/XKEo01MTf5YYOd1oaKY9ou0wlVdGCcXriE3rTqhCRtB7AoYAk2X5 CM1EvwdteXy1gv8ZLBxl2XA3kgIhitfn/6PQ8U7On29rhxoz0TQde3+1Tunq/ZrMVJPd 95gzIiw6Gz2zvRzwIss1SMQLJIUrkDxz7TOH3eX+A12aNKPzds6Zk8eDYKY2pzyoPKxU k6Gf0vagIChiYGrUakjJYP+8h1bvrzvIsqCOmu9TSaT+1r7ho5XoMYHEm/KRkeSaXFUj ZNuw== X-Gm-Message-State: ALoCoQkHdB6IZy9CBqw/PH/g6HFTEqM4X9tMwyGnp5Hjg2ATUCV7a+HcIAs/KiS+mBTBjZlAEOBL X-Received: by 10.107.35.138 with SMTP id j132mr31433263ioj.159.1439303157891; Tue, 11 Aug 2015 07:25:57 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id u4sm8193687igz.8.2015.08.11.07.25.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Aug 2015 07:25:56 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 38D76220DC8; Tue, 11 Aug 2015 08:25:56 -0600 (MDT) From: Simon Glass To: linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm: rpi: Device tree modifications for U-Boot Date: Tue, 11 Aug 2015 08:25:53 -0600 Message-Id: <1439303153-12171-1-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.5.0.rc2.392.g76e840b X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150811_072620_365827_7DF84E82 X-CRM114-Status: GOOD ( 12.68 ) X-Spam-Score: -2.8 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Ian Campbell , Russell King , Pawel Moll , Stephen Warren , Simon Glass , Lee Jones , linux-kernel@vger.kernel.org, Rob Herring , linux-rpi-kernel@lists.infradead.org, Kumar Gala , Stephen Warren MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This updates the device tree from the kernel version to something suitable for U-Boot: - Add stdout-path alias for console - Mark the /soc node to be available pre-relocation so that the early serial console works (we need the 'ranges' property to be available) Signed-off-by: Simon Glass --- arch/arm/boot/dts/bcm2835.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi index 301c73f..bd6bff6 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -8,6 +8,7 @@ chosen { bootargs = "earlyprintk console=ttyAMA0"; + stdout-path = &uart; }; soc { @@ -16,6 +17,7 @@ #size-cells = <1>; ranges = <0x7e000000 0x20000000 0x02000000>; dma-ranges = <0x40000000 0x00000000 0x20000000>; + u-boot,dm-pre-reloc; timer@7e003000 { compatible = "brcm,bcm2835-system-timer"; @@ -92,7 +94,7 @@ #interrupt-cells = <2>; }; - uart@7e201000 { + uart: uart@7e201000 { compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; reg = <0x7e201000 0x1000>; interrupts = <2 25>;