From patchwork Wed May 8 08:08:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 392 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 251643F066 for ; Wed, 8 May 2019 10:09:23 +0200 (CEST) Received: by mail-pf1-f198.google.com with SMTP id 13sf12124565pfo.15 for ; Wed, 08 May 2019 01:09:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1557302961; cv=pass; d=google.com; s=arc-20160816; b=0BARIsHTIiUk2GP5sP6u+1/gQuEDFy9w3WzPlgIdfYlScEuBjJmgkuns5vOc43Cpnn +MXr6ZKvYA0mH7xWNcECbZtULZm5G/Nak8xXZDkYDvJVjQ5gHEsnFiPfZxySqJUphxgX kyA2RHBWeCCt6a9aSF1NMzd67sI/FQ3Hyz/IpII48493IKpMC7E3TAvuCW58YzxD8+Tu WKODwnNOo4jAQ814SA0P8ImWhSyGSfwSPqJcbBUU2QGRBYHOnzTOIAb82Rz54WDlFgiz t5In8s0VE5AJjw71S73bJpkAiwq9MfDB238UzfCLHf+wCPpSNzOJmDFFUaC2VBHeLVMp CD2w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Lw0qFPQdAFOZgUJhXZ9wlv9sxbdiNpe+S/xrPVu6Udw=; b=rTbESrDvrGW53GOGs7RZuwhsfDcZqensOYZYUuBqIqhoNuhYq/rxpK34Li6hh8m9hd UOYm9docPiaMELcoaPTFaJnnaouApMYIWBom5ef4DZjLjl3ftTPHQSu6rFZbAGcWUe/f e19vB3mcb+JWMAsW2jD87jZY6OHvkkIE/8N0E6WvDIdKgGqh0NnmCN0+uSJFHDUF8wp6 IUwTt70Hvb/McBtPw8qYc6QknG3LdjNa5aGFuzx2tqqDGoLTqX2qDsEJLFiQKySurhPS uJv9ri89F5WNZNrv62QqnRRvL28jTug4t0luaqI53dW69rlv+SCs9+pVrZmlEpOm5U7k KvCQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="n3/IuhFA"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=Lw0qFPQdAFOZgUJhXZ9wlv9sxbdiNpe+S/xrPVu6Udw=; b=Vh0dNlVh1EA4wokq/Vrg9ctJ/pAsfsoqyLASTZK85tlmI3apAfW53nCj0eXu0rNnyy oHxbTLYbclifs7OAgcZs8GKbIJr9+5Tjxgu6gwHE2a+u3ShZSt4llN1yYVz64W8rndPs 9vG2ZJjDDJNPfas6yQtwfQKax06g3d28fIqJg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=Lw0qFPQdAFOZgUJhXZ9wlv9sxbdiNpe+S/xrPVu6Udw=; b=EwRhfVHLTtGoUTxHICqcvSxrhMYmvHV9Wqe7zIrbv4R8v0yay8YYAag9qSQJMK+YWp XEGVSPLM3pGC3C3XQhrYzmbQ2uqMgGkAVBhLdWx4VtsNMENfc4ZbzaORyPpScAY8UqmX xH0oqNKaLvldl2u/bbv1reGVZ/g0ieT4FYUeyZa2mUUkE8DKHV+4cztaw1eOWbne7aHG HWoC/O7MkphH6vIKVeXJ5+wbUnYbOjN5AIEs9InJ1okZF7/80d61GQKy1egPin0ZSCp4 hrsuXPDHM0yGes8HoYL5WVxcaFceg3uZpXP2OaLFyxQS8YhA/CYVAEymzNwckNhcK5m7 +WwQ== X-Gm-Message-State: APjAAAUb1dOn3YQfc7bRS6OQv3uqlQ47DwztZqVAkXh2y+tZJKOLRpPF wKXPFkDmcZrThBVH8QcULTvK8Vzr X-Google-Smtp-Source: APXvYqzrKM2HnYH4DcdLE4NRzQpl7dC3Q06ANZV2h1ytSgNO8ur0DtvgjYA58jRveau5Q+0QKSsI4Q== X-Received: by 2002:aa7:93ba:: with SMTP id x26mr28256985pff.238.1557302961655; Wed, 08 May 2019 01:09:21 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:9148:: with SMTP id 8ls5288383pfi.2.gmail; Wed, 08 May 2019 01:09:21 -0700 (PDT) X-Received: by 2002:a63:8741:: with SMTP id i62mr44895786pge.313.1557302961301; Wed, 08 May 2019 01:09:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557302961; cv=none; d=google.com; s=arc-20160816; b=trbZempWRYJhnepMuorqkxsXLVPAOyZkwC6fJk0Rg+hmO6F57asAbwI25cG82NNXSd iBJn3j4L7nLv/tgpPMAFUC0jp0molkcLnZHj6sT1qE9QOsDWffiPj4GnETgsaGohcZvf kXtta+tDcG+s3BMm3Sr5aGNukqd8gZT5uIy4OLmWpXLbEyufjiNmGzsqEkRE0JYt+q1R b1dA9oxo9GMWPF0fd+4p+MQ1CJErhlOP/Rel6JAqDjtHrvWxnQ5a6h8MDZiVN5u5xRIq Igdk13XCdq2M7Lti/xYaOX0GHI+abo2mGdCuUI3WLP48NJL7GZFTGafI6GicFXp94IPv T+Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=iJdc+LE+goLm9GBcZ8RQa+EHlJZSHEiVDu4uCr02hoI=; b=IcRYRcFZ4wR6NMHRxNr5B2Fkc37rU8NUyIdSmR8MY0+DkuPcPZg8L8iKZCQ+7/VGOu o8vXDdz4+xZaDoC4b/7cNkNuRT+J2nJWJlSegV1/vzLPJxcUDpGLH4MSQjx+3V3FKj6v WVE5WRm6U9CkrVuW7rz7HVboUGG3qXgGTxsphLcGPG/Ntviso/wFVuQ/UyBj9gezX6SP U3veaRR7O8QIKdsrd5vdRUmhnzQgo3dm61uSIycc/EqY6ZnUhNteXMa1Si/AR7n/6z9q nQzrF87UtjHs7VHU20jZmahX7zLK1wsdRFgaiS86eywnNirt6C8Pkd+Jd4AbDO7R35A3 9IAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="n3/IuhFA"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id v22sor11978331pgb.31.2019.05.08.01.09.21 for (Google Transport Security); Wed, 08 May 2019 01:09:21 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a65:6289:: with SMTP id f9mr7382176pgv.380.1557302961010; Wed, 08 May 2019 01:09:21 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id j9sm33537133pfc.43.2019.05.08.01.09.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 01:09:20 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki Subject: [PATCH 1/8] board: rk3399: Drop explicit uart enablement in spl_board_init Date: Wed, 8 May 2019 13:38:57 +0530 Message-Id: <20190508080904.1567-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190508080904.1567-1-jagan@amarulasolutions.com> References: <20190508080904.1567-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="n3/IuhFA"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , preloader_console_init is used for printing SPL boot banner that usually called from spl_board_init. The current spl_board_init in evb and rock960 is enabling explicit pinctrl, debug uart prior to calling preloader_console_init which eventually not required since board_init_f is already enabled debug uart. So, drop those explicit enablement calls from spl_board_init of evb, rock960. Tested this by enabling CONFIG_SPL_BOARD_INIT and adding u-boot,dm-pre-reloc property for uart node. Signed-off-by: Jagan Teki --- board/rockchip/evb_rk3399/evb-rk3399.c | 23 +------------------ board/vamrs/rock960_rk3399/rock960-rk3399.c | 25 +-------------------- 2 files changed, 2 insertions(+), 46 deletions(-) diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c index bf2ad98c47..769b5d146f 100644 --- a/board/rockchip/evb_rk3399/evb-rk3399.c +++ b/board/rockchip/evb_rk3399/evb-rk3399.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -68,27 +67,7 @@ out: void spl_board_init(void) { - struct udevice *pinctrl; - int ret; - - ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl); - if (ret) { - debug("%s: Cannot find pinctrl device\n", __func__); - goto err; - } - - /* Enable debug UART */ - ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_UART_DBG); - if (ret) { - debug("%s: Failed to set up console UART\n", __func__); - goto err; - } - preloader_console_init(); - return; -err: - printf("%s: Error %d\n", __func__, ret); - /* No way to report error here */ - hang(); + return; } diff --git a/board/vamrs/rock960_rk3399/rock960-rk3399.c b/board/vamrs/rock960_rk3399/rock960-rk3399.c index 0f5ef3a09a..018e4b55b8 100644 --- a/board/vamrs/rock960_rk3399/rock960-rk3399.c +++ b/board/vamrs/rock960_rk3399/rock960-rk3399.c @@ -5,9 +5,6 @@ #include #include -#include -#include -#include #include #include @@ -24,27 +21,7 @@ int board_init(void) void spl_board_init(void) { - struct udevice *pinctrl; - int ret; - - ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl); - if (ret) { - debug("%s: Cannot find pinctrl device\n", __func__); - goto err; - } - - /* Enable debug UART */ - ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_UART_DBG); - if (ret) { - debug("%s: Failed to set up console UART\n", __func__); - goto err; - } - preloader_console_init(); - return; -err: - printf("%s: Error %d\n", __func__, ret); - /* No way to report error here */ - hang(); + return; }