From patchwork Wed Jan 10 10:34:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jorge Ramirez-Ortiz, Gmail" X-Patchwork-Id: 858199 X-Patchwork-Delegate: trini@ti.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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dBQUR9/l"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zGlq00YTLz9ryT for ; Wed, 10 Jan 2018 21:38:36 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C7966C2218F; Wed, 10 Jan 2018 10:38:06 +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=FREEMAIL_FROM, 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 9EDF6C21DDF; Wed, 10 Jan 2018 10:35:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 38B73C22135; Wed, 10 Jan 2018 10:34:56 +0000 (UTC) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by lists.denx.de (Postfix) with ESMTPS id 3FE5DC220BD for ; Wed, 10 Jan 2018 10:34:49 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id 100so916781wrb.7 for ; Wed, 10 Jan 2018 02:34:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=hK3bQwDQbUOdxoahpfQAjghG/4QSnfpigGAXq68FCBE=; b=dBQUR9/lnbMVc/yYq11d2UuZaGaKTEaigI8SyDE7PfByxAzgAt6OCSataSjghWntWM Wtc3RKQfojEyGY3+ZExxdHz9jt3B6tReEdV6f4OK6SR1VUtSxEQkR4niZdcdRGrXVv0L h33w28xRPJLsgGmUkEGpptXOy+8rpk196iwwvLTC94n+HNHhye0zpYLOM1wBdQ4Q6anj 8vtqb4npLwJPX6SSBduYP9/SJ+zzhCb42KNrzqeX6LOZuKdBv5rcV8uE6Aan3NR3eN71 y7HrI2jtHEXEgeLP6XlpbIB53jKAOZyavrUGzjJntTsUCIgpRg077ulKgYgBpQ+iHkI0 t9LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=hK3bQwDQbUOdxoahpfQAjghG/4QSnfpigGAXq68FCBE=; b=dJHnYO/9mAfwt41WlhrGA9iXD6IL1pHD4CPJMQ6C7/8r8D6QuIdwlpUBUAmxy+xSlX JNkgv+ddTtUHTNnb7l00JmiDuyIBEvYL9YXSgnx77E7nkvT7YuvK8A8Yu1OQQruA7exf nKPA8FAXVU90blPKPhIS1Sf0th9EOV3aoG7Ey76AlO3/avrR/Q8jEKGdoQdEpn2TBr6j F+ipxOpuCqhhjyDySDcNROB1CWN95lkIgXvElKE/U3M1YcomJwBNZr0YqVh5XFehGaV/ yTgrB9z4ClPwpcLIQGCt7JBeVv3xmmlSo/katceDlQgIKpSiwm+Tk7WVFmltd06N7h3N XEqw== X-Gm-Message-State: AKwxytdWm5qO191EJt0v5OXoHxmlWqQjVtkEGn2PLyoMul/yUxQOqXjH fEG4Lp+itNP+m8Kufl7BqOhBww== X-Google-Smtp-Source: ACJfBotoPhzLglqlJQVkKwDvUO8Q1TGp8sVpvRzLfcpm5dUnxA01oKP2Voq+3yiK/OKFd8G8rHHJRg== X-Received: by 10.223.164.206 with SMTP id h14mr5042379wrb.229.1515580488694; Wed, 10 Jan 2018 02:34:48 -0800 (PST) Received: from igloo.80.58.61.254 (141.pool85-51-114.dynamic.orange.es. [85.51.114.141]) by smtp.gmail.com with ESMTPSA id i33sm21484737wri.90.2018.01.10.02.34.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 02:34:48 -0800 (PST) From: Jorge Ramirez-Ortiz To: u-boot@lists.denx.de Date: Wed, 10 Jan 2018 11:34:34 +0100 Message-Id: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [U-Boot] [PATCH v1 01/07] db410c: configs: increase gunzip buffer size for the kernel 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" From: Jorge Ramirez-Ortiz the kernel fails to boot when it goes over the limit. Signed-off-by: Jorge Ramirez-Ortiz --- include/configs/dragonboard410c.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index d2447b2..3c5bb8a 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -23,7 +23,7 @@ #define CONFIG_SYS_TEXT_BASE 0x80080000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x80000) -#define CONFIG_SYS_BOOTM_LEN 0x1000000 /* 16MB max kernel size */ +#define CONFIG_SYS_BOOTM_LEN SZ_64M /* UART */ From patchwork Wed Jan 10 10:34:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Jorge Ramirez-Ortiz, Gmail" X-Patchwork-Id: 858210 X-Patchwork-Delegate: trini@ti.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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="a1TPtFMR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zGlx11Hxjz9ryk for ; Wed, 10 Jan 2018 21:43:49 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C7740C22169; Wed, 10 Jan 2018 10:41:41 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 EF39AC22180; Wed, 10 Jan 2018 10:36:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6999EC2214F; Wed, 10 Jan 2018 10:34:57 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by lists.denx.de (Postfix) with ESMTPS id A76E3C2211E for ; Wed, 10 Jan 2018 10:34:50 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id 123so4730922wme.0 for ; Wed, 10 Jan 2018 02:34:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=2rJmnEp+Dw7SDcd3SVoooiF72aa9i5MVlX23Oo6J+3U=; b=a1TPtFMRNSjcBGitqnILSPv2oC3orBH3T0XPbAwK3VIwTPTN0svDQ5HsJjSd7uOAPT 8PbPb82Ob3wdRncyz3cecwtu2dKkexan8gZy7xOmeCvrmX4FGLxNINCqrJsNT/hq8ZFv MYRf+9BF+SdHp71xBT5AhgHiHfiSUxYtBCwDclOhBidYj5cUF6OctZIijnlAjSLlwELj DobV6WA6mHOh6UpHx+O3JoybEBb9JrhL3HZHLcHFac4X7xNotbSyIRjBuHhO5z3PFqrd OP4EqGzTBMQDrngem3S3b76QYE9+YnMBjt9F7ckAl4pLikXLPbticFIoZ0imDGBlTqaj aA3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2rJmnEp+Dw7SDcd3SVoooiF72aa9i5MVlX23Oo6J+3U=; b=PLlVwpKbphMmezFT6Ho6zEolITApJEMVsUNpOPnS+N+yDwH7hPhJpI+1IX4vXFY5Fg 5cYi7rNoWQvi3LgO7LUtjmjboHTwSNvWzLjqyEfQM9udxh/iyuhLZoJIFhZcTeqDtAxa /ZSi85SMwpQbQhHOdpIpE5WkMzOPtvDKeWXbZ6l5aBn+lnDbgVC2aPsZGNR9JKtdXQSa cmtNYnVVSAQGEryYuEjwYsUhDp2C7pHb77njswtYFcgpfr+YH2pKE5rAw7REuzWE5cjD /UH0WSDtX5dQ4ZgU0H6lanymwc9ShvU2BxIhwa9smaz7IMPRnJqZGc++UlgwLXBXzOej N+Ng== X-Gm-Message-State: AKGB3mIHtHJKLniHArg31a/5tDQOPhVG7zhqSFNLQjrURjx1bUmCSxKQ PICYYuIymvulu5CbFIaRiHKnuQ== X-Google-Smtp-Source: ACJfBouPCWqjaCnFAFhuB78nxuq6waGKDVun6h+Gn/Ui13lMFEl4fuWCCmrUK7+sV1WtNjz4Xt4boA== X-Received: by 10.28.159.209 with SMTP id i200mr14542299wme.101.1515580489987; Wed, 10 Jan 2018 02:34:49 -0800 (PST) Received: from igloo.80.58.61.254 (141.pool85-51-114.dynamic.orange.es. [85.51.114.141]) by smtp.gmail.com with ESMTPSA id i33sm21484737wri.90.2018.01.10.02.34.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 02:34:49 -0800 (PST) From: Jorge Ramirez-Ortiz To: u-boot@lists.denx.de Date: Wed, 10 Jan 2018 11:34:35 +0100 Message-Id: <1515580480-26075-2-git-send-email-jorge.ramirez.ortiz@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> References: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v1 02/07] db410c: update wlan and bt mac addresses from firmware 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" From: Jorge Ramirez-Ortiz The firmware that runs before u-boot modifies u-boot's device tree adding the local-mac-address and local-bd-address properties for the compatibles "qcom,wcnss-bt" and "qcom,wcnss-wlan". This commit reads that firmware, retrieves the properties and fixups the device tree that is passed to the kernel before booting. Signed-off-by: Jorge Ramirez-Ortiz --- arch/arm/dts/dragonboard410c.dts | 10 +++++ board/qualcomm/dragonboard410c/Makefile | 1 + board/qualcomm/dragonboard410c/dragonboard410c.c | 49 +++++++++++++++++++++--- board/qualcomm/dragonboard410c/lowlevel_init.S | 28 ++++++++++++++ configs/dragonboard410c_defconfig | 3 ++ 5 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 board/qualcomm/dragonboard410c/lowlevel_init.S diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts index 7746622..25aeac4 100644 --- a/arch/arm/dts/dragonboard410c.dts +++ b/arch/arm/dts/dragonboard410c.dts @@ -86,6 +86,16 @@ clock-frequency = <200000000>; }; + wcnss { + bt { + compatible="qcom,wcnss-bt"; + }; + + wifi { + compatible="qcom,wcnss-wlan"; + }; + }; + spmi@200f000 { compatible = "qcom,spmi-pmic-arb"; reg = <0x200f800 0x200 0x2400000 0x400000 0x2c00000 0x400000>; diff --git a/board/qualcomm/dragonboard410c/Makefile b/board/qualcomm/dragonboard410c/Makefile index cd67808..5082383 100644 --- a/board/qualcomm/dragonboard410c/Makefile +++ b/board/qualcomm/dragonboard410c/Makefile @@ -5,4 +5,5 @@ # obj-y := dragonboard410c.o +obj-y += lowlevel_init.o extra-y += head.o diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c index 848e278..99fc91b 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.c +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c @@ -10,9 +10,16 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; +/* pointer to the device tree ammended by the firmware */ +extern const void *fw_dtb; + +static char wlan_mac[ARP_HLEN]; +static char bt_mac[ARP_HLEN]; + int dram_init(void) { gd->ram_size = PHYS_SDRAM_1_SIZE; @@ -27,7 +34,6 @@ int dram_init_banksize(void) return 0; } - int board_prepare_usb(enum usb_init_type type) { static struct udevice *pmic_gpio; @@ -96,11 +102,6 @@ int board_prepare_usb(enum usb_init_type type) return 0; } -int board_init(void) -{ - return 0; -} - /* Check for vol- button - if pressed - stop autoboot */ int misc_init_r(void) { @@ -134,3 +135,39 @@ int misc_init_r(void) return 0; } + +int board_init(void) +{ + int offset, len; + const char *mac; + + /* take a copy of the firmware information (the user could unknownly + overwrite that DDR via tftp or other means) */ + + offset = fdt_node_offset_by_compatible(fw_dtb, -1, "qcom,wcnss-wlan"); + if (offset >= 0) { + mac = fdt_getprop(fw_dtb, offset, "local-mac-address", &len); + if (mac) + memcpy(wlan_mac, mac, ARP_HLEN); + } + + offset = fdt_node_offset_by_compatible(fw_dtb, -1, "qcom,wcnss-bt"); + if (offset >= 0) { + mac = fdt_getprop(fw_dtb, offset, "local-bd-address", &len); + if (mac) + memcpy(bt_mac, mac, ARP_HLEN); + } + + return 0; +} + +int ft_board_setup(void *blob, bd_t *bd) +{ + do_fixup_by_compat(blob, "qcom,wcnss-wlan", "local-mac-address", + wlan_mac, ARP_HLEN, 1); + + do_fixup_by_compat(blob, "qcom,wcnss-bt", "local-bd-address", + bt_mac, ARP_HLEN, 1); + + return 0; +} diff --git a/board/qualcomm/dragonboard410c/lowlevel_init.S b/board/qualcomm/dragonboard410c/lowlevel_init.S new file mode 100644 index 0000000..15b2d0c --- /dev/null +++ b/board/qualcomm/dragonboard410c/lowlevel_init.S @@ -0,0 +1,28 @@ +/* + * (C) Copyright 2016 + * Cédric Schieli + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include + +.align 8 +.global fw_dtb +fw_dtb: + .dword 0x0 + +/* + * Routine: save_boot_params (called after reset from start.S) + * Description: save ATAG/FDT address provided by the firmware at boot time + */ + +.global save_boot_params +save_boot_params: + + /* The firmware provided ATAG/FDT address can be found in r2/x0 */ + adr x8, fw_dtb + str x0, [x8] + + /* Returns */ + b save_boot_params_ret diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index b71bff7..cfe9be9 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -44,3 +44,6 @@ CONFIG_USB_ETHER_ASIX88179=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_MMC=y +CONFIG_OF_BOARD_SETUP=y From patchwork Wed Jan 10 10:34:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jorge Ramirez-Ortiz, Gmail" X-Patchwork-Id: 858203 X-Patchwork-Delegate: trini@ti.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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ClspthgT"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zGltF395qz9ryT for ; Wed, 10 Jan 2018 21:41:25 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BB66CC22163; Wed, 10 Jan 2018 10:41:21 +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=FREEMAIL_FROM, 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 AE55CC21E0F; Wed, 10 Jan 2018 10:36:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6433FC2217D; Wed, 10 Jan 2018 10:34:58 +0000 (UTC) Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by lists.denx.de (Postfix) with ESMTPS id BA481C22143 for ; Wed, 10 Jan 2018 10:34:51 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id z48so11154909wrz.6 for ; Wed, 10 Jan 2018 02:34:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=monA3jbxXyj6wNoGgwanLr0xEIFPtxZFmbzD32Sg2Gc=; b=ClspthgTz0t+7ILMuykoiOAzeJJGq4iTZdrVSLjrupSfICc+lz7TtRj0KPSf/gnqi/ FZWlhGCSOcR8/68QFcflmGdi3NltWMa9egtiC96HcydmP4xDisaS1qZenr8FiRpo0Vdk b75wv6xlgLtogPS223hwxm1uuY4ZX8aNRwxS87dkqjBOVQHkdjjTDZcBR2uTaB0gbEBA RVmEu1T+eI8/SvI2N3sdHkA1VfHamPdU87TRKAzRWT05aaByX0FxMPl+kM5rSwY1w5Ag dB91cU8oK7QDd/ev1BxfFIG5q/5hI9j56IDm4ijZNIB6foGwCfT/SZg2Q9/TV+yBWmwj ii5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=monA3jbxXyj6wNoGgwanLr0xEIFPtxZFmbzD32Sg2Gc=; b=WBjhxwhYkQ2KbKbKj5qJ98c0MYEuSAOw7xC58BU6EQThQRtIWuTidb/CgImfH60ZeX /1qR/zVZ4xZHicoEN5zl0rwlUrUuQ2PHalbdWyKYLi+CgqSxfE6BfzBUQLS75Gw92I+y MLzNQIGnJZ2Up6Bnu/EqQOJJIaSBp7ndYLJVt323Myig+dJjAr2NdXVx5DKBumYpm3U+ Cw0oIxoNQQmRWri626m8mqrPMNrdU7zqJHMHJ0TOxJz+nL+EpqkUWHkCsWTfpEKvBz8/ ERO9QvAyfZ5yexUuHFqdxEPqkC+67HnVC81VSA7arijCEASDwsNsXb6DcgYIrw5P3DOm nl9Q== X-Gm-Message-State: AKGB3mL1s9ue4c5WIb/AF1rVDTm8dBourqqfJi4bqKSMYpt/ac7v5Jbe 1bp8XVbMOXbAWBvKFaLUJVxRFw== X-Google-Smtp-Source: ACJfBosPuMQsuTRxB3N/HZA6lXbmf5y8DcjRDkSxCdnfIpvKoY/TAyg80COgKLQJtpBMbclpkGVCTQ== X-Received: by 10.223.198.20 with SMTP id n20mr16086064wrg.191.1515580491233; Wed, 10 Jan 2018 02:34:51 -0800 (PST) Received: from igloo.80.58.61.254 (141.pool85-51-114.dynamic.orange.es. [85.51.114.141]) by smtp.gmail.com with ESMTPSA id i33sm21484737wri.90.2018.01.10.02.34.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 02:34:50 -0800 (PST) From: Jorge Ramirez-Ortiz To: u-boot@lists.denx.de Date: Wed, 10 Jan 2018 11:34:36 +0100 Message-Id: <1515580480-26075-3-git-send-email-jorge.ramirez.ortiz@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> References: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> Subject: [U-Boot] [PATCH v1 03/07] db410c: replace reset driver with psci 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" From: Jorge Ramirez-Ortiz this should be the norm for armv8 platforms. Signed-off-by: Jorge Ramirez-Ortiz --- arch/arm/dts/dragonboard410c.dts | 5 --- board/qualcomm/dragonboard410c/dragonboard410c.c | 5 +++ configs/dragonboard410c_defconfig | 2 +- drivers/sysreset/Makefile | 2 -- drivers/sysreset/sysreset_snapdragon.c | 40 ------------------------ 5 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 drivers/sysreset/sysreset_snapdragon.c diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts index 25aeac4..b67e588 100644 --- a/arch/arm/dts/dragonboard410c.dts +++ b/arch/arm/dts/dragonboard410c.dts @@ -48,11 +48,6 @@ clock = <&clkc 4>; }; - restart@4ab000 { - compatible = "qcom,pshold"; - reg = <0x4ab000 0x4>; - }; - soc_gpios: pinctrl@1000000 { compatible = "qcom,apq8016-pinctrl"; reg = <0x1000000 0x300000>; diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c index 99fc91b..8ef4338 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.c +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c @@ -171,3 +171,8 @@ int ft_board_setup(void *blob, bd_t *bd) return 0; } + +void reset_cpu(ulong addr) +{ + psci_system_reset(); +} diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index cfe9be9..de923ad 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -30,7 +30,6 @@ CONFIG_DM_PMIC=y CONFIG_PMIC_PM8916=y CONFIG_MSM_SERIAL=y CONFIG_SPMI_MSM=y -CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y @@ -47,3 +46,4 @@ CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_OF_BOARD_SETUP=y +CONFIG_PSCI_RESET=y diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile index 2e9598e..000c288 100644 --- a/drivers/sysreset/Makefile +++ b/drivers/sysreset/Makefile @@ -8,10 +8,8 @@ obj-$(CONFIG_SYSRESET) += sysreset-uclass.o obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o - obj-$(CONFIG_ARCH_ROCKCHIP) += sysreset_rockchip.o obj-$(CONFIG_SANDBOX) += sysreset_sandbox.o -obj-$(CONFIG_ARCH_SNAPDRAGON) += sysreset_snapdragon.o obj-$(CONFIG_ARCH_STI) += sysreset_sti.o obj-$(CONFIG_TARGET_XTFPGA) += sysreset_xtfpga.o obj-$(CONFIG_ARCH_ASPEED) += sysreset_ast.o diff --git a/drivers/sysreset/sysreset_snapdragon.c b/drivers/sysreset/sysreset_snapdragon.c deleted file mode 100644 index 9869813..0000000 --- a/drivers/sysreset/sysreset_snapdragon.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Qualcomm APQ8016 reset controller driver - * - * (C) Copyright 2015 Mateusz Kulikowski - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include -#include -#include -#include - -DECLARE_GLOBAL_DATA_PTR; - -static int msm_sysreset_request(struct udevice *dev, enum sysreset_t type) -{ - phys_addr_t addr = devfdt_get_addr(dev); - if (!addr) - return -EINVAL; - writel(0, addr); - return -EINPROGRESS; -} - -static struct sysreset_ops msm_sysreset_ops = { - .request = msm_sysreset_request, -}; - -static const struct udevice_id msm_sysreset_ids[] = { - { .compatible = "qcom,pshold" }, - { } -}; - -U_BOOT_DRIVER(msm_reset) = { - .name = "msm_sysreset", - .id = UCLASS_SYSRESET, - .of_match = msm_sysreset_ids, - .ops = &msm_sysreset_ops, -}; From patchwork Wed Jan 10 10:34:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jorge Ramirez-Ortiz, Gmail" X-Patchwork-Id: 858212 X-Patchwork-Delegate: trini@ti.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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X0/WFXOL"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zGlxn3Cxmz9ryk for ; Wed, 10 Jan 2018 21:44:29 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0AD0BC2217A; Wed, 10 Jan 2018 10:42:36 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 EE979C2214A; Wed, 10 Jan 2018 10:36:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A6C94C22168; Wed, 10 Jan 2018 10:34:59 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by lists.denx.de (Postfix) with ESMTPS id 13A2EC2209F for ; Wed, 10 Jan 2018 10:34:53 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id f206so26027144wmf.5 for ; Wed, 10 Jan 2018 02:34:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=zAuMPiQsqtCOBU1vbUwCdf0jvKNVylQBt2xrTCp6vS8=; b=X0/WFXOL9i4YUtPT82JtD7iKyxs0vBLf7NT7BKlexTt45ltY4mQAGRGVC7ntqWkmfe qPPN+2Uweiqxj5L3rwxGOv1s/W3i3dtsq4WdwoBhVSUGLcQYh2F/5Tk8jTsp1dihRNug 23bExEKh7EoYOA2WRBJuQ8/8h0VMM0HmGWKGoZoq9ORxjVA3SKqNuA2B9rikgUr2dNEQ +0PApscACKv6AiltX427/uydZBeBbcd6z5A/Pr89i0y8pbZwoy/Nx8IWNHgkcHmYVJWw 38o3BfH/VLGR6Yt3l4v2mTrQtXv7ZKLGRfukqNHaeG3eFEZ6AaxF2phSRibJQLcaoZIc 2q/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=zAuMPiQsqtCOBU1vbUwCdf0jvKNVylQBt2xrTCp6vS8=; b=WhJcwRuvjtYxv4P18v3sv5xZAAArYR1XjDG36RhScFc3A7s3DsNLmc6sqYRwr+z2G9 97uW5w7h7eNZ3ZKXBYDhnry16SOPoy/EnocdJxRDqz0vsG+u2MCUBE1lXLBnRwO/QFP0 /QdYwiAR97pBmH3dkjrO44N6KxLiY5SaBR/7TFCbQSCKvkx4CD2G/ASqZrOs2MlmSK/x YOTIM4JgaupDpaVZFAkU6OZcS/dBTr01X4NaShqwsCnqCAX+RObzxEshERnSGT8hhH4o IvBT0XrLQmmag7CY9aHMCJFozzxGeFQp3H5YD9B74kaY/rZDXUbm+tzhpWTopJ0MYviH qleA== X-Gm-Message-State: AKwxytdWoB2pjBd7fNmU87++C4VrVqAl1KsyAa5dNih1U2HLp97HAa54 foDU43qh9QyDdClHpMUvsIBrgg== X-Google-Smtp-Source: ACJfBotzUgFvlwfpc8fyBd9TM805uh/T/in5gBCfxoA1RB3Ycbl91u5rsmPukXyXAtJN1jwK8tY4Og== X-Received: by 10.28.165.213 with SMTP id o204mr1430803wme.82.1515580492560; Wed, 10 Jan 2018 02:34:52 -0800 (PST) Received: from igloo.80.58.61.254 (141.pool85-51-114.dynamic.orange.es. [85.51.114.141]) by smtp.gmail.com with ESMTPSA id i33sm21484737wri.90.2018.01.10.02.34.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 02:34:51 -0800 (PST) From: Jorge Ramirez-Ortiz To: u-boot@lists.denx.de Date: Wed, 10 Jan 2018 11:34:37 +0100 Message-Id: <1515580480-26075-4-git-send-email-jorge.ramirez.ortiz@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> References: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> Subject: [U-Boot] [PATCH v1 04/07] fdtdec: allow board to provide fdt for CONFIG_OF_SEPARATE 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" From: Rob Clark Similar to CONFIG_OF_BOARD, but in this case the fdt is still built by u-boot build. This allows the board to patch the fdt, etc. In the specific case of dragonboard 410c, we pass the u-boot generated fdt to the previous stage of bootloader (by embedding it in the u-boot.img that is loaded by lk/aboot), which patches the fdt and passes it back to u-boot. Signed-off-by: Rob Clark --- include/fdtdec.h | 3 ++- lib/fdtdec.c | 35 +++++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/include/fdtdec.h b/include/fdtdec.h index 0fb3e07..4afb9ac 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -990,7 +990,8 @@ int fdtdec_setup(void); /** * Board-specific FDT initialization. Returns the address to a device tree blob. - * Called when CONFIG_OF_BOARD is defined. + * Called when CONFIG_OF_BOARD is defined, or if CONFIG_OF_SEPARATE is defined + * and the board implements it. */ void *board_fdt_blob_setup(void); diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 30ec6b9..cc3dfd6 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1272,6 +1272,28 @@ static int uncompress_blob(const void *src, ulong sz_src, void **dstp) # endif #endif +#if CONFIG_IS_ENABLED(OF_SEPARATE) +/* + * For CONFIG_OF_SEPARATE, the board may optionally implement this to + * provide and/or fixup the fdt. + */ +__weak void *board_fdt_blob_setup(void) +{ + void *fdt_blob = NULL; +#ifdef CONFIG_SPL_BUILD + /* FDT is at end of BSS unless it is in a different memory region */ + if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS)) + fdt_blob = (ulong *)&_image_binary_end; + else + fdt_blob = (ulong *)&__bss_end; +#else + /* FDT is at end of image */ + fdt_blob = (ulong *)&_end; +#endif + return fdt_blob; +} +#endif + int fdtdec_setup(void) { #if CONFIG_IS_ENABLED(OF_CONTROL) @@ -1285,18 +1307,7 @@ int fdtdec_setup(void) # else gd->fdt_blob = __dtb_dt_begin; # endif -# elif defined CONFIG_OF_SEPARATE -# ifdef CONFIG_SPL_BUILD - /* FDT is at end of BSS unless it is in a different memory region */ - if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS)) - gd->fdt_blob = (ulong *)&_image_binary_end; - else - gd->fdt_blob = (ulong *)&__bss_end; -# else - /* FDT is at end of image */ - gd->fdt_blob = (ulong *)&_end; -# endif -# elif defined(CONFIG_OF_BOARD) +# elif defined(CONFIG_OF_BOARD) || defined (CONFIG_OF_SEPARATE) /* Allow the board to override the fdt address. */ gd->fdt_blob = board_fdt_blob_setup(); # elif defined(CONFIG_OF_HOSTFILE) From patchwork Wed Jan 10 10:34:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jorge Ramirez-Ortiz, Gmail" X-Patchwork-Id: 858209 X-Patchwork-Delegate: trini@ti.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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RHTcOgdb"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zGlwp3Lndz9ryk for ; Wed, 10 Jan 2018 21:43:38 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 280D1C2217E; Wed, 10 Jan 2018 10:42:16 +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=FREEMAIL_FROM, 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 EC5E9C2215A; Wed, 10 Jan 2018 10:36:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 83E38C22192; Wed, 10 Jan 2018 10:35:02 +0000 (UTC) Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by lists.denx.de (Postfix) with ESMTPS id 426CFC21E08 for ; Wed, 10 Jan 2018 10:34:54 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id w107so16875947wrb.9 for ; Wed, 10 Jan 2018 02:34:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=DGa8NPaKlVxCJ0cRoxqtwgwkC8YEprG7ZNL6mGwjjpk=; b=RHTcOgdbuaa89gXI4g37Hkoo8H4QFa8FORsdV2B32+R235zJC/LJj+TplzGK+9DndH FzGzBTv4ayOkM1cVGz16mi8JPXAoLn6e0pWq09UV2fPUhBwt8pBSUp6MwWNpWSdRRsks 3h8IdKs9/ogkuQ2d0v01WmnKTz+9t7ofGhaKUhX9VjTAwjlTtG9Jcz8VIrbYiA5hEOv2 JVcaDNLW9cvdOsD+bTPEuBP7dInwgtc9Aeet8HpED9ARtJ39r9Z8IKbaSLbFCtGRrQQq /MxaDZHwy2oM+bVgU3L0niobOX17eUUWEImQHC6AHt2nV7May8TQrCpsnASACbK96iY8 kWsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=DGa8NPaKlVxCJ0cRoxqtwgwkC8YEprG7ZNL6mGwjjpk=; b=oWyXGyi+2tHugoJt2aeYoZPpPtWP4lbOxuATvBihcGdObLsRSfZ8yVWoY/csf7D87F kUyuzSqn3NpF3HeC8ORObuk9GXHjLrsBzzvJKVHFaMW7fIhayVXNPYH6QoJ238kCzNQl dy7VsJkwNWZ6kxtpkRA0Raole76f93ZEZOqOr+OQ/dQvI3ZQ+qOV5cqjkL0UNehEvwIT bld6ALZvUWSYRq2Js80+3uNUE7ZJgRrx3ZQ35IWmFbLaf9s77azhLVmzRG38ciaNCjeN DXaU0PCy9LW65cYSJEpT1Mk2CVXq2Dj8/B5nV/DRs1fjM1fZhDB+AvnIa/6j4F1PLV+1 wd/g== X-Gm-Message-State: AKwxytcZLD0buGNvKGlXMG2Pgq9Thh6yn2RqGlaMHREEfmVwgSlu7cyL K6byF1l/iHIWkcOnWg8awC6mOg== X-Google-Smtp-Source: ACJfBosrt1LsZNfSQs7L8utJY9Zlg6yyp/D0xlLxBNTXmV6xjhOEOZhDw4af0ke7ZHk/F1O15EHqQg== X-Received: by 10.223.134.227 with SMTP id 32mr97017wry.176.1515580493746; Wed, 10 Jan 2018 02:34:53 -0800 (PST) Received: from igloo.80.58.61.254 (141.pool85-51-114.dynamic.orange.es. [85.51.114.141]) by smtp.gmail.com with ESMTPSA id i33sm21484737wri.90.2018.01.10.02.34.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 02:34:53 -0800 (PST) From: Jorge Ramirez-Ortiz To: u-boot@lists.denx.de Date: Wed, 10 Jan 2018 11:34:38 +0100 Message-Id: <1515580480-26075-5-git-send-email-jorge.ramirez.ortiz@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> References: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> Subject: [U-Boot] [PATCH v1 05/07] db410c: use the device tree parsed by the lk loader. 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" From: Jorge Ramirez-Ortiz We dont need to keep copies of the properties that we are going to fixup since we will be using the dtb provided by the firmware. Signed-off-by: Jorge Ramirez-Ortiz --- board/qualcomm/dragonboard410c/dragonboard410c.c | 71 ++++++++++++++---------- configs/dragonboard410c_defconfig | 1 + 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c index 8ef4338..236160a 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.c +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c @@ -15,14 +15,22 @@ DECLARE_GLOBAL_DATA_PTR; /* pointer to the device tree ammended by the firmware */ -extern const void *fw_dtb; +extern void *fw_dtb; -static char wlan_mac[ARP_HLEN]; -static char bt_mac[ARP_HLEN]; +void *board_fdt_blob_setup(void) +{ + if (fdt_magic(fw_dtb) != FDT_MAGIC) { + printf("Firmware provided invalid dtb!\n"); + return NULL; + } + + return fw_dtb; +} int dram_init(void) { gd->ram_size = PHYS_SDRAM_1_SIZE; + return 0; } @@ -138,36 +146,43 @@ int misc_init_r(void) int board_init(void) { - int offset, len; - const char *mac; - - /* take a copy of the firmware information (the user could unknownly - overwrite that DDR via tftp or other means) */ - - offset = fdt_node_offset_by_compatible(fw_dtb, -1, "qcom,wcnss-wlan"); - if (offset >= 0) { - mac = fdt_getprop(fw_dtb, offset, "local-mac-address", &len); - if (mac) - memcpy(wlan_mac, mac, ARP_HLEN); - } - - offset = fdt_node_offset_by_compatible(fw_dtb, -1, "qcom,wcnss-bt"); - if (offset >= 0) { - mac = fdt_getprop(fw_dtb, offset, "local-bd-address", &len); - if (mac) - memcpy(bt_mac, mac, ARP_HLEN); - } - return 0; } int ft_board_setup(void *blob, bd_t *bd) { - do_fixup_by_compat(blob, "qcom,wcnss-wlan", "local-mac-address", - wlan_mac, ARP_HLEN, 1); - - do_fixup_by_compat(blob, "qcom,wcnss-bt", "local-bd-address", - bt_mac, ARP_HLEN, 1); + int offset, len, i; + const char *mac; + struct { + const char *compatible; + const char *property; + } fix[] = { + [0] = { + /* update the kernel's dtb with wlan mac */ + .compatible = "qcom,wcnss-wlan", + .property = "local-mac-address", + }, + [1] = { + /* update the kernel's dtb with bt mac */ + .compatible = "qcom,wcnss-bt", + .property = "local-bd-address", + }, + }; + + for ( i = 0; i < sizeof(fix)/sizeof(fix[0]); i++) { + + offset = fdt_node_offset_by_compatible(gd->fdt_blob, -1, + fix[i].compatible); + if (offset < 0) + continue; + + mac = fdt_getprop(gd->fdt_blob, offset, fix[i].property, &len); + if (mac) + do_fixup_by_compat(blob, + fix[i].compatible, + fix[i].property, + mac, ARP_HLEN, 1); + } return 0; } diff --git a/configs/dragonboard410c_defconfig b/configs/dragonboard410c_defconfig index de923ad..4389f52 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/dragonboard410c_defconfig @@ -47,3 +47,4 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_OF_BOARD_SETUP=y CONFIG_PSCI_RESET=y +CONFIG_OF_SEPARATE=y From patchwork Wed Jan 10 10:34:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jorge Ramirez-Ortiz, Gmail" X-Patchwork-Id: 858204 X-Patchwork-Delegate: trini@ti.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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eZ7Mokzt"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zGlvb5vbPz9s9Y for ; Wed, 10 Jan 2018 21:42:35 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6A16CC2215A; Wed, 10 Jan 2018 10:41: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=FREEMAIL_FROM, 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 1007BC22187; Wed, 10 Jan 2018 10:36:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9011EC22161; Wed, 10 Jan 2018 10:35:02 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id 516DCC22142 for ; Wed, 10 Jan 2018 10:34:55 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id f8so16889933wre.4 for ; Wed, 10 Jan 2018 02:34:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=C3qX848fy49lmcHWdBcci+U9yT8FJ5Ehk4SIU7bPdwI=; b=eZ7MokztCmMZCQ5Ri/UhXy5njsY0+8O6xsyiccaTGYXAJ9DotoPm/DRAGvvrJV69ul idbNtJX1rMVn817Z0PoRJVMUGpNd2b5CgXMmUhAJs4fgQKn5myYjmJidwygwAIc0ltE9 CCpRO8uqOz79ksxlFTiCfWXE8aZ2lEuOGNSKot8xusRVDvSxa1y3LRV58Ahw7O+7Itn0 TOLkIUHI/qAY5XT3y4zvXZ5hWy4P4jQzflHhyiXC7gIKTYX/+Z3f5X05FnGRwXD0wrQC dKnTVcm2ETcQ2VyXV0AWpighPhzTq0HfL6/ggZfQtB9XT5MMTVRvCANtzqJud4xJkDZV ijcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=C3qX848fy49lmcHWdBcci+U9yT8FJ5Ehk4SIU7bPdwI=; b=UdtGFmr0+cCiaMJJevy7k6+qPHhaaLDP4TlkitriiS/9LgMo44dN4L8a7ZdSZFbp8B CJuPYmnGzqXt5kSKqq/yR6fZwL6il+7Vg3+KZ9bwO1ivi67hiaVRMZ7RUA41SFXaiuKz B8SeaYXvZ3NYPiMYeAxenjSKRbl3um1wZxxDhP9noroQsDrKzesp/RvY0xwzlmR5R4K4 +CO9dE04nX9wpxBl7CbvbnIxAyflQXT8g0CvPwXvgqndq5lQ7Q6FLx+q5srqZJhxdQa4 czF7/MBXJdQyTi9net+NUGWvfEENY153JY4q+eeGPFJ1JNHHx//GZDU5VOyU3H6q3BLY D9NQ== X-Gm-Message-State: AKGB3mLDEmUIX2Kq/xxS17xTUy4iDId1ctiQygvpxHbb9vIDgRH0LHaY m8+dL+9fkVSo+n9CwBteoX6yxg== X-Google-Smtp-Source: ACJfBotkZJX49CXkhTngK7JRaJUjhfwP3huVswDKQVZNqU6FL/caQHR5Qp8JCq0FPABA1S5aXx8xsQ== X-Received: by 10.223.139.78 with SMTP id v14mr16054630wra.136.1515580494823; Wed, 10 Jan 2018 02:34:54 -0800 (PST) Received: from igloo.80.58.61.254 (141.pool85-51-114.dynamic.orange.es. [85.51.114.141]) by smtp.gmail.com with ESMTPSA id i33sm21484737wri.90.2018.01.10.02.34.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 02:34:54 -0800 (PST) From: Jorge Ramirez-Ortiz To: u-boot@lists.denx.de Date: Wed, 10 Jan 2018 11:34:39 +0100 Message-Id: <1515580480-26075-6-git-send-email-jorge.ramirez.ortiz@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> References: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> Subject: [U-Boot] [PATCH v1 06/07] db410c: add reserved-memory node to dts 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" From: Rob Clark If lk lights up display and populates simple-framebuffer node, it will also setup a reserved-memory node (needed by simplefb on linux). But it isn't clever enough to cope when the reserved-memory node is not present. Signed-off-by: Rob Clark --- arch/arm/dts/dragonboard410c.dts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts index b67e588..5ccfe7f 100644 --- a/arch/arm/dts/dragonboard410c.dts +++ b/arch/arm/dts/dragonboard410c.dts @@ -23,11 +23,16 @@ reg = <0 0x80000000 0 0x3da00000>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + }; + chosen { stdout-path = "/soc/serial@78b0000"; }; - soc { #address-cells = <0x1>; #size-cells = <0x1>; From patchwork Wed Jan 10 10:34:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jorge Ramirez-Ortiz, Gmail" X-Patchwork-Id: 858211 X-Patchwork-Delegate: trini@ti.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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DzoE81xV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zGlxh58hTz9ryk for ; Wed, 10 Jan 2018 21:44:24 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 596BCC2211E; Wed, 10 Jan 2018 10:42:53 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 16197C21E18; Wed, 10 Jan 2018 10:37:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 752E0C2218C; Wed, 10 Jan 2018 10:35:04 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by lists.denx.de (Postfix) with ESMTPS id 79E3CC220DC for ; Wed, 10 Jan 2018 10:34:56 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id t8so25761843wmc.3 for ; Wed, 10 Jan 2018 02:34:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=v9bimDbF/+qo4PtRz12MRMxVn/JMG7LvVwq/u4nWtPA=; b=DzoE81xVUFLKs6uIaiDg4JwoiAW8Ex4CHWErq2mFWKBJQm5Kkyx5Uo82NVHylEqJ5G N7eAa0/W5CfxwNW3coBavs2ESdCnhd3Ft9gT9MaHkvI4bOlKZpVsEDWu7bsAH2ZWxZsP 9fwMui+DsQ9/MWt0GfalLRL6Tyn4QNgMlQlOTeE4Un26T3cUNAzLJBHwQTKURES+oGoa AS0VonCMWZ8dnnbLn4NX0G4eHu8ee3TuTTrEKsmIej2GNTMTBrbmuq0uySPRkCbomy8p jLz4moxfVjptcO9gxCxDD1MfKWFKU75MNH2PKmtGLhhQidgZOdKdIVL9fknqBNzmdYfy de9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=v9bimDbF/+qo4PtRz12MRMxVn/JMG7LvVwq/u4nWtPA=; b=b/PLrQbVRotVhPNaljrwtgzFVUfIEC0nmRgh/PaNhr1WAXjA9w5HigbbzYAdXaQ35U qLc8Hj4r2gusr5+/xvuJHJ5OtEql+OEtQz7FT53IVi80hAEY/XohU/3BcmprjalaU4Qc pihrXOGsRNfLj6cUUrTwskO6bip1j2n2wycv+yyRHXPy9bk8sLfOikbY1iFNpdndGR/Z +D5/tQhPmnMZYtw8NClEi3q/BSSwoDjcApXVqjlIqa3S6RLMkTcBffIoFdxWkPrZov8a lkSkJRdJh6RUn20VNqO4lAZEGCRGnAaTNtKtG8MUOgpkc0ujYXRzW8vuzl2mw25mBZLU G0OQ== X-Gm-Message-State: AKwxyte0NKN7QRVMfI0JOXW5ih0jIwKoiCl9y7m0izMY8tZEnFxumVE4 hERb3iQB/DVfmPEUs6laHcFVaA== X-Google-Smtp-Source: ACJfBou7ZNtDJ8fEnV5vWBAlKpIGcI7ATO4Wa34fllFGXoiAi/RAxsqrAz7Q8aYwxstBYvJM/eRptQ== X-Received: by 10.28.217.15 with SMTP id q15mr4023547wmg.161.1515580495995; Wed, 10 Jan 2018 02:34:55 -0800 (PST) Received: from igloo.80.58.61.254 (141.pool85-51-114.dynamic.orange.es. [85.51.114.141]) by smtp.gmail.com with ESMTPSA id i33sm21484737wri.90.2018.01.10.02.34.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 02:34:55 -0800 (PST) From: Jorge Ramirez-Ortiz To: u-boot@lists.denx.de Date: Wed, 10 Jan 2018 11:34:40 +0100 Message-Id: <1515580480-26075-7-git-send-email-jorge.ramirez.ortiz@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> References: <1515580480-26075-1-git-send-email-jorge.ramirez.ortiz@gmail.com> Subject: [U-Boot] [PATCH v1 07/07] db410c: on aarch64 the fdtfile is in per-vendor subdirectory 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" From: Rob Clark Signed-off-by: Rob Clark --- include/configs/dragonboard410c.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 3c5bb8a..530d667 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -92,7 +92,7 @@ REFLASH(dragonboard/u-boot.img, 8)\ "initrd_high=0xffffffffffffffff\0" \ "linux_image=Image\0" \ "kernel_addr_r=0x81000000\0"\ - "fdtfile=apq8016-sbc.dtb\0" \ + "fdtfile=qcom/apq8016-sbc.dtb\0" \ "fdt_addr_r=0x83000000\0"\ "ramdisk_addr_r=0x84000000\0"\ "scriptaddr=0x90000000\0"\