From patchwork Sat Feb 7 18:51:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 437603 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 F151B14018C for ; Sun, 8 Feb 2015 05:57:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 80A9D4B612; Sat, 7 Feb 2015 19:57:56 +0100 (CET) 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 66-PHwPoquJ0; Sat, 7 Feb 2015 19:57:56 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 141314B624; Sat, 7 Feb 2015 19:57:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 046174B164 for ; Sat, 7 Feb 2015 19:57:43 +0100 (CET) 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 3qu6WICehDmA for ; Sat, 7 Feb 2015 19:57:42 +0100 (CET) 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-pd0-f201.google.com (mail-pd0-f201.google.com [209.85.192.201]) by theia.denx.de (Postfix) with ESMTPS id 783B24A048 for ; Sat, 7 Feb 2015 19:57:39 +0100 (CET) Received: by pdbfp1 with SMTP id fp1so5395982pdb.0 for ; Sat, 07 Feb 2015 10:57:38 -0800 (PST) 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=yjs2EyRarIxicXThepEj4fSLxVxlfktwTo6cvofIZV8=; b=ejXlBZUoqa6QiK28nVnMG8qG3NSkH0TslsakzEjzCzR1djoUk4YgNVUAP5XIZBE7Y7 621gCPfEcwO2MUXKNktk8Q3qLlcvn+8xPCeOGzpzzsOwdnf8d1dz3v9cS6bo4quzRYNo gbCYB6Yxnwrp3ikI5yP98bDMFeU8P9lUhYRQUASzpsxC3UokQoj/nM8yjalG9pNTaNmB R1mpLDvfvualJWEZjymCKGMQvxmrEfwSz7GGMKoHQBSgF1SzgQ6272isRP3msvkwbt16 rAIwVSumErZ3wFNRtca3ekp6WkoRdYPaCUKOwrDKtKy9/IKblVw8JkhaDh+sJ8bRqSk5 3UaA== X-Gm-Message-State: ALoCoQlZU2ZKiKmn80OoIi18bWVhOShCo9vFhMUDlz7d6IGFmGUckDCVKiwEaupUcV3dmvGYSIHg X-Received: by 10.68.132.99 with SMTP id ot3mr7019922pbb.6.1423335458203; Sat, 07 Feb 2015 10:57:38 -0800 (PST) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id s10si1144879qcl.3.2015.02.07.10.57.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Feb 2015 10:57:38 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id CB8G52T0.1; Sat, 07 Feb 2015 10:57:38 -0800 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 86845220DAF; Sat, 7 Feb 2015 11:52:16 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sat, 7 Feb 2015 11:51:46 -0700 Message-Id: <1423335112-24585-14-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1423335112-24585-1-git-send-email-sjg@chromium.org> References: <1423335112-24585-1-git-send-email-sjg@chromium.org> Cc: Kim Phillips , Kumar Gala , Andy Fleming , Stefan Roese Subject: [U-Boot] [PATCH v2 13/19] ppc: amcc: Omit unneeded ns16550 CONFIG if using driver model 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" This comes from the device tree or a call to get_uart_clock(). Signed-off-by: Simon Glass --- Changes in v2: None arch/powerpc/include/asm/ppc460ex_gt.h | 2 ++ include/configs/amcc-common.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/powerpc/include/asm/ppc460ex_gt.h b/arch/powerpc/include/asm/ppc460ex_gt.h index f41df0d..ea019aa 100644 --- a/arch/powerpc/include/asm/ppc460ex_gt.h +++ b/arch/powerpc/include/asm/ppc460ex_gt.h @@ -19,10 +19,12 @@ /* Memory mapped registers */ #define CONFIG_SYS_PERIPHERAL_BASE 0xef600000 /* Internal Peripherals */ +#ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_PERIPHERAL_BASE + 0x0300) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_PERIPHERAL_BASE + 0x0400) #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_PERIPHERAL_BASE + 0x0500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_PERIPHERAL_BASE + 0x0600) +#endif #define GPIO0_BASE (CONFIG_SYS_PERIPHERAL_BASE + 0x0b00) #define GPIO1_BASE (CONFIG_SYS_PERIPHERAL_BASE + 0x0c00) diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 2aea899..73e1b0a 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -20,8 +20,10 @@ */ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL +#ifndef CONFIG_DM_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_CLK get_serial_clock() +#endif #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}