From patchwork Fri May 22 21:42:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 475814 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 52297140B0E for ; Sat, 23 May 2015 07:43:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8AF4B4B6A2; Fri, 22 May 2015 23:43:38 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id trBuFFpSCs63; Fri, 22 May 2015 23:43:38 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D6D024B689; Fri, 22 May 2015 23:43:37 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6F26E4B691 for ; Fri, 22 May 2015 23:43:30 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 02S-dobLl9CI for ; Fri, 22 May 2015 23:43:30 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-vn0-f74.google.com (mail-vn0-f74.google.com [209.85.216.74]) by theia.denx.de (Postfix) with ESMTPS id 725194B69E for ; Fri, 22 May 2015 23:43:21 +0200 (CEST) Received: by vnbf129 with SMTP id f129so987994vnb.1 for ; Fri, 22 May 2015 14:43:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2Kvnk2wKEOtZMn63rP//fNRwuVNeipmZ435CFvt3NNI=; b=ePmvUgxeLc06lFhrRHS05prvBJVj3xn/bHA3hTqAy5h7PUsfOSnjZNc86YEtNvphAR jq5C605u6mKuYkk8QYax6BLXFLPLcopH5jLk9VDqUiphkB8FVk5pcmMnKhDFgSfkXgDd CfvXPgEvXYTDyfdfzaQUSscJ70Xzp75wBReu4vzc+2AccUWkSDxY3jlpiGJDysSbcPOi 1PAYb4XOKs4bFa36xQrJ3hx0fBX62pVnvGuottzzjYpk+kpq4D1+gr/BRDqOKMNTZ3zg G8xtM+YbwCYc4NRr2zNOBMvvUGcn8eRNfvdMKxMykRvO9SQlqeVtOi6o2/kuk3IYh/S7 dSaw== X-Gm-Message-State: ALoCoQlhLcGZ+G67UIvfmqc4QlvRRSy91eAhQFDB/2tF0FzuHgwLmw31TLQzrQ7PUg6TEqoP1t6L X-Received: by 10.236.22.74 with SMTP id s50mr13232580yhs.53.1432331000211; Fri, 22 May 2015 14:43:20 -0700 (PDT) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id v17si181186yhc.0.2015.05.22.14.43.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 May 2015 14:43:20 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id 7EiGhDTz.1; Fri, 22 May 2015 14:43:20 -0700 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 912F9221D2E; Fri, 22 May 2015 15:43:19 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Fri, 22 May 2015 15:42:16 -0600 Message-Id: <1432330937-9335-3-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1432330937-9335-1-git-send-email-sjg@chromium.org> References: <1432330937-9335-1-git-send-email-sjg@chromium.org> Cc: Przemyslaw Marczak Subject: [U-Boot] [PATCH 3/4] sandbox: dts: Sort the sandbox.dts file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Sort this by node name for easier browsing. Signed-off-by: Simon Glass Acked-by: Joe Hershberger --- arch/sandbox/dts/sandbox.dts | 106 ++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 52 deletions(-) diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index a3ebd80..8927527 100644 --- a/arch/sandbox/dts/sandbox.dts +++ b/arch/sandbox/dts/sandbox.dts @@ -17,30 +17,6 @@ stdout-path = "/serial"; }; - /* Needs to be available prior to relocation */ - uart0: serial { - compatible = "sandbox,serial"; - sandbox,text-colour = "cyan"; - }; - - triangle { - compatible = "demo-shape"; - colour = "cyan"; - sides = <3>; - character = <83>; - light-gpios = <&gpio_a 2>, <&gpio_b 6 0>; - }; - square { - compatible = "demo-shape"; - colour = "blue"; - sides = <4>; - }; - hexagon { - compatible = "demo-simple"; - colour = "white"; - sides = <6>; - }; - cros_ec: cros-ec@0 { reg = <0 0>; compatible = "google,cros-ec-sandbox"; @@ -70,10 +46,22 @@ }; }; - lcd { - compatible = "sandbox,lcd-sdl"; - xres = <1366>; - yres = <768>; + eth@10002000 { + compatible = "sandbox,eth"; + reg = <0x10002000 0x1000>; + fake-host-hwaddr = [00 00 66 44 22 00]; + }; + + eth@80000000 { + compatible = "sandbox,eth-raw"; + reg = <0x80000000 0x1000>; + host-raw-interface = "eth0"; + }; + + eth@90000000 { + compatible = "sandbox,eth-raw"; + reg = <0x90000000 0x1000>; + host-raw-interface = "lo"; }; gpio_a: gpios@0 { @@ -92,6 +80,12 @@ num-gpios = <10>; }; + hexagon { + compatible = "demo-simple"; + colour = "white"; + sides = <6>; + }; + i2c_0: i2c@0 { #address-cells = <1>; #size-cells = <0>; @@ -120,18 +114,10 @@ }; }; - spi@0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0 0>; - compatible = "sandbox,spi"; - cs-gpios = <0>, <&gpio_a 0>; - firmware_storage_spi: flash@0 { - reg = <0>; - compatible = "spansion,m25p16", "sandbox,spi-flash"; - spi-max-frequency = <40000000>; - sandbox,filename = "spi.bin"; - }; + lcd { + compatible = "sandbox,lcd-sdl"; + xres = <1366>; + yres = <768>; }; pci: pci-controller { @@ -150,22 +136,38 @@ }; }; - eth@10002000 { - compatible = "sandbox,eth"; - reg = <0x10002000 0x1000>; - fake-host-hwaddr = [00 00 66 44 22 00]; + spi@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0 0>; + compatible = "sandbox,spi"; + cs-gpios = <0>, <&gpio_a 0>; + firmware_storage_spi: flash@0 { + reg = <0>; + compatible = "spansion,m25p16", "sandbox,spi-flash"; + spi-max-frequency = <40000000>; + sandbox,filename = "spi.bin"; + }; }; - eth@80000000 { - compatible = "sandbox,eth-raw"; - reg = <0x80000000 0x1000>; - host-raw-interface = "eth0"; + square { + compatible = "demo-shape"; + colour = "blue"; + sides = <4>; }; - eth@90000000 { - compatible = "sandbox,eth-raw"; - reg = <0x90000000 0x1000>; - host-raw-interface = "lo"; + triangle { + compatible = "demo-shape"; + colour = "cyan"; + sides = <3>; + character = <83>; + light-gpios = <&gpio_a 2>, <&gpio_b 6 0>; + }; + + /* Needs to be available prior to relocation */ + uart0: serial { + compatible = "sandbox,serial"; + sandbox,text-colour = "cyan"; }; usb@0 {