From patchwork Thu Aug 30 19:10:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 964120 X-Patchwork-Delegate: sbabic@denx.de 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=none (p=none dis=none) header.from=ossystems.com.br Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 421XHh0qkFz9s0n for ; Fri, 31 Aug 2018 05:14:56 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CC559C21E3E; Thu, 30 Aug 2018 19:11: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=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 1AD2CC21DED; Thu, 30 Aug 2018 19:11:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CC987C21DD7; Thu, 30 Aug 2018 19:11:10 +0000 (UTC) Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by lists.denx.de (Postfix) with ESMTPS id 9CF74C21DCA for ; Thu, 30 Aug 2018 19:11:09 +0000 (UTC) Received: by mail-qt0-f194.google.com with SMTP id m13-v6so11811478qth.1 for ; Thu, 30 Aug 2018 12:11:09 -0700 (PDT) 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:organization; bh=vlc9YqHs35jowm5qQw/n0pOQ3P5SHCR1sKblye4O1EQ=; b=Xy1kqOXpySG0wgjhe4uD6txer2/Q1aPf+iE9LY+xUr1fBbFDBkN9u4jdyXM6frSFy3 VPGm15dTmSQ78//FJtrpvzcnLbLtElHVqhd8e/4n7tGwsDe4Pbbnrt8rFNRRv28Ilthl XgcOSX2grTKW/ULk4GDTtbiJhq535Dv4fWccK5GQCseGdsyNs9nTpqVw+464N/aTx+vT nCstm7MTuihR67DNH6fWeXfqriVBZbB9tGvs22KIdpE6wGUaV9vAd8bYrBRO2MwKpFwm gxJP7Tm1/7cY0Eez+Plq8QYR/LnLjmZBtxRh6hXpIaEeqpavIe4q5XuU/PO9bbncK7bo 0J6w== X-Gm-Message-State: APzg51BustcWwU/XUgy5Vs+e7awbaGVk0dOt+9DrVbfg6PZSTjb8UFu/ NRJTVWRW3uuBwFZy8k31lI7IMAc92SY= X-Google-Smtp-Source: ANB0VdYHzhGNom0FQI4N2NhYkK+1smKRX+U82E8n8jFFZx2k6H0rca30VvLUBcuToVEpuJ/gcudeyA== X-Received: by 2002:a37:2941:: with SMTP id p62-v6mr12411954qkh.330.1535656268269; Thu, 30 Aug 2018 12:11:08 -0700 (PDT) Received: from localhost.localdomain ([177.194.218.61]) by smtp.gmail.com with ESMTPSA id 44-v6sm5122083qtq.91.2018.08.30.12.11.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Aug 2018 12:11:07 -0700 (PDT) Received: by localhost.localdomain (sSMTP sendmail emulation); Thu, 30 Aug 2018 16:11:01 -0300 From: Otavio Salvador To: U-Boot Mailing List Date: Thu, 30 Aug 2018 16:10:18 -0300 Message-Id: <20180830191026.2699-5-otavio@ossystems.com.br> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180830191026.2699-1-otavio@ossystems.com.br> References: <20180830191026.2699-1-otavio@ossystems.com.br> Organization: O.S. Systems Software LTDA. Cc: Marek Vasut , Otavio Salvador , Fabio Estevam , Richard Hu , John Weber Subject: [U-Boot] [PATCH 05/13] pico-imx6ul: Add support for the 512MB module 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: Fabio Estevam Currently only the module with 256MB of RAM is supported. Add support for the 512MB of RAM variant as well. Signed-off-by: Fabio Estevam Signed-off-by: Fabio Berton Signed-off-by: Otavio Salvador --- board/technexion/pico-imx6ul/spl.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c index 6989c81946..428d3b10fb 100644 --- a/board/technexion/pico-imx6ul/spl.c +++ b/board/technexion/pico-imx6ul/spl.c @@ -69,7 +69,6 @@ static struct mx6_ddr3_cfg mem_ddr = { .density = 2, .width = 16, .banks = 8, - .rowaddr = 14, .coladdr = 10, .pagesz = 2, .trcd = 1350, @@ -91,12 +90,34 @@ static void ccgr_init(void) writel(0xFFFFFFFF, &ccm->CCGR7); } -static void spl_dram_init(void) +static void imx6ul_spl_dram_cfg_size(u32 ram_size) { + if (ram_size == SZ_256M) + mem_ddr.rowaddr = 14; + else + mem_ddr.rowaddr = 15; + mx6ul_dram_iocfg(mem_ddr.width, &mx6_ddr_ioregs, &mx6_grp_ioregs); mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr); } +static void imx6ul_spl_dram_cfg(void) +{ + ulong ram_size_test, ram_size = 0; + + for (ram_size = SZ_512M; ram_size >= SZ_256M; ram_size >>= 1) { + imx6ul_spl_dram_cfg_size(ram_size); + ram_size_test = get_ram_size((long int *)PHYS_SDRAM, ram_size); + if (ram_size_test == ram_size) + break; + } + + if (ram_size < SZ_256M) { + puts("ERROR: DRAM size detection failed\n"); + hang(); + } +} + void board_init_f(ulong dummy) { ccgr_init(); @@ -104,7 +125,7 @@ void board_init_f(ulong dummy) board_early_init_f(); timer_init(); preloader_console_init(); - spl_dram_init(); + imx6ul_spl_dram_cfg(); memset(__bss_start, 0, __bss_end - __bss_start); board_init_r(NULL, 0); }