From patchwork Thu Jan 10 04:24:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1022742 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com 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=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="PK1mBLp2"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43ZtVj3JdBz9sN4 for ; Thu, 10 Jan 2019 15:36:29 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0F8B6C22060; Thu, 10 Jan 2019 04:29:57 +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=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 5E38FC21FC6; Thu, 10 Jan 2019 04:26:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ECDE3C21FA1; Thu, 10 Jan 2019 04:25:56 +0000 (UTC) Received: from mail-it1-f198.google.com (mail-it1-f198.google.com [209.85.166.198]) by lists.denx.de (Postfix) with ESMTPS id 70D89C22028 for ; Thu, 10 Jan 2019 04:25:51 +0000 (UTC) Received: by mail-it1-f198.google.com with SMTP id k133so9704303ite.4 for ; Wed, 09 Jan 2019 20:25:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=5CUEV/msN66ng5dxv3MMzDlZMCPNdQE5BVCfLaY44ks=; b=PK1mBLp21AQNkqC6vN1rEeVM+GFQyWeyUSrVpaz3C3LyVQt/1/BzupZCXJeoDU/Gsc uwQLeKpINEiF4LNzAfVOaSltSIE+3Xp2zgpz1o+Y27cWAaFNcURwdXc+hyscfLwY1vjC d39PrD3HB4m+jy+m1mUQp2qCW6JXKGxMZTmC0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=5CUEV/msN66ng5dxv3MMzDlZMCPNdQE5BVCfLaY44ks=; b=Nx0eC/DRhwDI0DwNE/uf71xQylSx7hMEZcv1hk34C482z+aKQZfsqSEcenrVCQjrKd x4l3M2tL3I9LeiTTbZzUmhg7GpeXLlmYucFwIQDqrOpia47+Cii727eFto+uvrjEX0cO Ejd0EY+kFaw03zc1AlqdqljAnZHEvXNGcQ/P7tnrItUpWr8446ddmiAKFi0sXM5PfIJG cj/bi2MLoSQGqDx4Kx3ZGTtPjZZ1lwWhlg0ZZg9Fe5VkrF49chfz2+EcCdl4PXYk26jE VYbLHT1mrSoy2Ixut/K9iVvEua6R0yioXUkLbIvxWJ10MtxwEeDdpcz3fsPF9wDv8key c/pQ== X-Gm-Message-State: AJcUukfGyvXUlU5srktl7UcvZx+c5l+S2AZ4KwOHQ22RrH9SyT5lC7u2 sNyLQqnzfsEENGjyiufZpFBAXWc1SrM/vmps X-Google-Smtp-Source: ALg8bN5ZVbqa7kTdQC7sxHLJVFlLV3vdFL2xj/P0l6TgliGfel48S69aVF1C1++hgFQCwc2j10i5ZNJWCR3x+O+L X-Received: by 2002:a24:2f0e:: with SMTP id j14mr2797352itj.14.1547094350472; Wed, 09 Jan 2019 20:25:50 -0800 (PST) Date: Wed, 9 Jan 2019 21:24:56 -0700 In-Reply-To: <20190110042457.134141-1-sjg@chromium.org> Message-Id: <20190110042457.134141-18-sjg@chromium.org> Mime-Version: 1.0 References: <20190110042457.134141-1-sjg@chromium.org> X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog From: Simon Glass To: U-Boot Mailing List Cc: huang lin , Jeffy Chen Subject: [U-Boot] [PATCH 17/18] rockchip: gru: Add extra device-tree settings 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add some U-Boot-specific settings. These should really go in the *u-boot.dtsi file, but it seems that rk3399 does not use that yet. Signed-off-by: Simon Glass --- arch/arm/dts/rk3399-gru-bob.dts | 1 + arch/arm/dts/rk3399-gru-chromebook.dtsi | 1 + arch/arm/dts/rk3399-gru.dtsi | 21 +++++++++++++++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/rk3399-gru-bob.dts b/arch/arm/dts/rk3399-gru-bob.dts index 1ee0dc0d9f..0e3d91fc28 100644 --- a/arch/arm/dts/rk3399-gru-bob.dts +++ b/arch/arm/dts/rk3399-gru-bob.dts @@ -7,6 +7,7 @@ /dts-v1/; #include "rk3399-gru-chromebook.dtsi" +#include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi" / { model = "Google Bob"; diff --git a/arch/arm/dts/rk3399-gru-chromebook.dtsi b/arch/arm/dts/rk3399-gru-chromebook.dtsi index ff81dfda3b..c6495adcca 100644 --- a/arch/arm/dts/rk3399-gru-chromebook.dtsi +++ b/arch/arm/dts/rk3399-gru-chromebook.dtsi @@ -232,6 +232,7 @@ &edp { status = "okay"; + rockchip,panel = <&edp_panel>; ports { edp_out: port@1 { reg = <1>; diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi index 7cc9b2642b..df19263acc 100644 --- a/arch/arm/dts/rk3399-gru.dtsi +++ b/arch/arm/dts/rk3399-gru.dtsi @@ -11,7 +11,13 @@ / { chosen { + u-boot,dm-pre-reloc; stdout-path = "serial2:115200n8"; + u-boot,spl-boot-order = &spi_flash; + }; + + config { + u-boot,spl-payload-offset = <0x40000>; }; /* @@ -539,12 +545,14 @@ ap_i2c_audio: &i2c8 { &spi1 { status = "okay"; + u-boot,dm-pre-reloc; pinctrl-names = "default", "sleep"; pinctrl-1 = <&spi1_sleep>; - spiflash@0 { - compatible = "jedec,spi-nor"; + spi_flash: spiflash@0 { + u-boot,dm-pre-reloc; + compatible = "jedec,spi-nor", "spi-flash"; reg = <0>; /* May run faster once verified. */ @@ -558,12 +566,16 @@ ap_i2c_audio: &i2c8 { &spi5 { status = "okay"; + spi-activate-delay = <100>; + spi-max-frequency = <3000000>; + spi-deactivate-delay = <200>; cros_ec: ec@0 { compatible = "google,cros-ec-spi"; reg = <0>; interrupt-parent = <&gpio0>; interrupts = <1 IRQ_TYPE_LEVEL_LOW>; + ec-interrupt = <&gpio0 1 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&ec_ap_int_l>; spi-max-frequency = <3000000>; @@ -618,6 +630,7 @@ ap_i2c_audio: &i2c8 { &uart2 { status = "okay"; + u-boot,dm-pre-reloc; }; &usb_host0_ohci { @@ -650,8 +663,8 @@ ap_i2c_audio: &i2c8 { status = "okay"; }; -#include -#include +#include +#include &pinctrl { /*