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: 506080 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0E3AC14016A for ; Wed, 12 Aug 2015 00:26:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=EjqWiAcp; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965080AbbHKOZ7 (ORCPT ); Tue, 11 Aug 2015 10:25:59 -0400 Received: from mail-io0-f180.google.com ([209.85.223.180]:35893 "EHLO mail-io0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965038AbbHKOZ6 (ORCPT ); Tue, 11 Aug 2015 10:25:58 -0400 Received: by ioeg141 with SMTP id g141so203515604ioe.3 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=li7X0A+hQhidAQuUoLVubtk7dWeJpQVHsfao7D2hdr1sl9G6fHpOiCFN5AFYad4IYt WuO5QKLU5QxfEUaa+KVCZIlL0togCk6IVia+4SwIJ4WCwTti+m7AtMcdQf0PeuoUge86 tssqiRpoemTODtiq4xWEvPGNGtLHmetIpO8gbvfa44O51C3Ei85pqzDgHLDOXXsUQ2ln UKg0G5qUBcEWaTnaqCmaTCz2i0Jj6m5N7I7iZ4IFEjvVBAtP5/+EwgE8/GlrpPx9hXUX SDISDu4HL9fVKd7a0Cg7H3DK3sQdxSWVjRI95XqXSqIZLl7YwsOPbEwaurCP/m9DW4kf MXNw== X-Gm-Message-State: ALoCoQlMtyjESg5xW218FIRvlYEoOdQes7W262q4JgKeHkHRxCZHtGGyh7F83EAETFwxAVoSjHE9 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 Cc: Stephen Warren , Stephen Warren , Simon Glass , Russell King , Lee Jones , devicetree@vger.kernel.org, Kumar Gala , linux-kernel@vger.kernel.org, Ian Campbell , Rob Herring , linux-rpi-kernel@lists.infradead.org, Pawel Moll , Mark Rutland 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 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org 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>;