From patchwork Tue Apr 14 08:01:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 47140 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1613920553 for ; Tue, 14 Apr 2015 08:02:00 +0000 (UTC) Received: by lbbrr5 with SMTP id rr5sf607911lbb.3 for ; Tue, 14 Apr 2015 01:01:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:cc:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=3fsdaJhO9zKp4nVyUfGW96LSbuD6kawe55xIlmB76Zw=; b=Bv1Pr2vLY3n/AVCrC7GqaCN/EkeYLZYHg8xDuexk6SSpIwR+F1mUE7gL8VazTipcmu i16iFohx8dZaEsTyonHOkBKBTgIbAdpu5oZOROMiNI+AH3EmvVl+9qpTFMhcpQAQJFrk ZiYXSxz9sIhIpU8iLTRgqDVlNaygPaYiYU7J61yqSUP1vE8E/mJBGLeBDv+EHvFSNCFl XlKAw9EXkbTa+YdLYLfuvHTFshGHJhnMU8CpPnxN6Ck75Nkt4p5H8O9BCejMD2vReb7l R47lG3TpbSwdIE7CNYHEEEaP6u0RdG8UrAh+k3KXoUhsTT5zr1V5qTEh5X97VXXMxU8m NOIQ== X-Gm-Message-State: ALoCoQkC2Hx8TMtAuyMtg0355i7vwBDhJiNnXnRdozPrD4jQQ9/LEwut3wFffnuwGWKX6XitjO1I X-Received: by 10.112.151.146 with SMTP id uq18mr3327157lbb.20.1428998518713; Tue, 14 Apr 2015 01:01:58 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.7.167 with SMTP id dd7ls8685lad.28.gmail; Tue, 14 Apr 2015 01:01:58 -0700 (PDT) X-Received: by 10.112.147.133 with SMTP id tk5mr16763694lbb.17.1428998518311; Tue, 14 Apr 2015 01:01:58 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id dx6si186043lbd.39.2015.04.14.01.01.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Apr 2015 01:01:58 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by labbd9 with SMTP id bd9so1625611lab.2 for ; Tue, 14 Apr 2015 01:01:58 -0700 (PDT) X-Received: by 10.112.125.167 with SMTP id mr7mr16916624lbb.106.1428998518131; Tue, 14 Apr 2015 01:01:58 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp1686549lbt; Tue, 14 Apr 2015 01:01:57 -0700 (PDT) X-Received: by 10.180.21.178 with SMTP id w18mr29189439wie.90.1428998517485; Tue, 14 Apr 2015 01:01:57 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id gs2si2289268wib.26.2015.04.14.01.01.55; Tue, 14 Apr 2015 01:01:57 -0700 (PDT) Received-SPF: none (google.com: u-boot-bounces@lists.denx.de does not designate permitted sender hosts) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 101B3A7429; Tue, 14 Apr 2015 10:01:55 +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 oA61LakRQ-ar; Tue, 14 Apr 2015 10:01:54 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 60258A7423; Tue, 14 Apr 2015 10:01:54 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 47272A7423 for ; Tue, 14 Apr 2015 10:01:51 +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 tCVlpH7CX5fm for ; Tue, 14 Apr 2015 10:01:51 +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-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by theia.denx.de (Postfix) with ESMTPS id 0AC6EA7422 for ; Tue, 14 Apr 2015 10:01:47 +0200 (CEST) Received: by lagv1 with SMTP id v1so1598169lag.3 for ; Tue, 14 Apr 2015 01:01:47 -0700 (PDT) X-Received: by 10.112.160.165 with SMTP id xl5mr16949191lbb.109.1428998507104; Tue, 14 Apr 2015 01:01:47 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id ls10sm57668lac.14.2015.04.14.01.01.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Apr 2015 01:01:45 -0700 (PDT) From: Linus Walleij To: u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Tue, 14 Apr 2015 10:01:35 +0200 Message-Id: <1428998495-14441-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Cc: Steve Rae , u-boot-review@google.com Subject: [U-Boot] [PATCH] vexpress64: use DM for all vexpress64 boards X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: 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" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Commit d8bafe1310487ba0e0785997726b4792072178d3 "ARMv8: enable DM in vexpress64 board" only enabled DM for the simulated vexpress64 board (FVP) with the hardcoded clock value for the simulated board, causing a console regression on the Juno board which was using a different clock setting. Fix this by enabling DM for all vexpress64 boards, defining the clock frequency per-board, deleting the static array of PL01x ports from the config file and relying solely on the port defined in the boardfile using platform data. Cc: David Feng Signed-off-by: Linus Walleij --- board/armltd/vexpress64/vexpress64.c | 2 +- include/configs/vexpress_aemv8a.h | 20 ++++---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index 13dd6674363c..7cb4e0021f66 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -19,7 +19,7 @@ DECLARE_GLOBAL_DATA_PTR; static const struct pl01x_serial_platdata serial_platdata = { .base = V2M_UART0, .type = TYPE_PL011, - .clock = 2400 * 1000, + .clock = CONFIG_PL011_CLOCK, }; U_BOOT_DEVICE(vexpress_serials) = { diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 3fda20a8f6c8..032010bb9e02 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -8,10 +8,9 @@ #ifndef __VEXPRESS_AEMV8A_H #define __VEXPRESS_AEMV8A_H -#define CONFIG_DM - -/* We use generic board for v8 Versatile Express */ +/* We use generic board and device manager for v8 Versatile Express */ #define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_DM #ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP #ifndef CONFIG_SEMIHOSTING @@ -134,27 +133,16 @@ #endif /* PL011 Serial Configuration */ -#define CONFIG_BAUDRATE 115200 -#ifdef CONFIG_DM #define CONFIG_DM_SERIAL -#define CONFIG_PL01X_SERIAL -#else -#define CONFIG_SYS_SERIAL0 V2M_UART0 -#define CONFIG_SYS_SERIAL1 V2M_UART1 +#define CONFIG_BAUDRATE 115200 #define CONFIG_CONS_INDEX 0 +#define CONFIG_PL01X_SERIAL #define CONFIG_PL011_SERIAL #ifdef CONFIG_TARGET_VEXPRESS64_JUNO #define CONFIG_PL011_CLOCK 7273800 #else #define CONFIG_PL011_CLOCK 24000000 #endif -#define CONFIG_PL01x_PORTS {(void *)CONFIG_SYS_SERIAL0, \ - (void *)CONFIG_SYS_SERIAL1} -#endif - -#define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_SERIAL0 V2M_UART0 -#define CONFIG_SYS_SERIAL1 V2M_UART1 /* Command line configuration */ #define CONFIG_MENU