From patchwork Wed May 21 09:47:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4056 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 4D8CF3F378 for ; Wed, 21 May 2025 11:47:42 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-5fcb3e44457sf6893315a12.2 for ; Wed, 21 May 2025 02:47:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1747820862; cv=pass; d=google.com; s=arc-20240605; b=kZgCym8nS2B4m48xurTdO0+nbK5ajmHYJTkjrU0bwE+Aq82qA9xMlxOYaGCADuHxv1 wQwWuG8wToiX0NOVOlUMGGYc0RqOpgaMVeWPPp351iJD7lEo/ty7/gL/FWf+3UvEICul 4l53QksWVoF/MxXZZq0T9MY7CKStH8LPmMjOoaYVNMff0evjj0rk32bzZ/CCvmVtXPDG zM74MW5LBoDrfU8r/ejcY22LJx2CwumjJ5pWmlT0p1mcciCZp/Fu5quNf6WMcg2TosV7 MP2tUJxtbgGwKZEkx6Fh6/aYpZn/ZGoJa0pVXjfXHHtKQ0/E+f3YkXKQYTdHVffCEit4 elzA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=xVSGYE6iqrIAq+JpZWnBe3zXzREpF/cq1obpLzNiJZo=; fh=RgMpBnTM58+GksAF91AyzHveS4DvA1uJciEAO0SvPkA=; b=OFzlwmN3zq2BzjrbwxLHbDKiSiDiChxSAPow7KVhQ+469cqNOr8uCwYooqapDnPrD5 3cxRozJbxO87Ft6qYi/V6QVS6irnwNL+jXtmDVLSUNDh0KiqJEw18lBE5gyWRN5aup6f Ko6yOtsLOUfO+S61UcFG6XAvV/wJ780ozAYMyQVE+bJ0GYtm9M+MdfZk49DnoWItWKPP FNZ6lJvt9HBZ4X21olXHtYPNpA0xv4gV9m1kiMDgiDiXzESuMsotHegcu3S0r2juDrwT P9bpdARBVKifp2+dxwiFY9Hy1PfXstCJs6JdyczAiCAmJJiWASmq95KiMfxIt/3d2xMu /tlA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nHIGxAEP; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1747820862; x=1748425662; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=xVSGYE6iqrIAq+JpZWnBe3zXzREpF/cq1obpLzNiJZo=; b=FHB0uZVjCLKP36xGJo0c2TGciF9iWA9RkscZyAMyecp8Yfn465/Nnwj77Dlw99+HIe AKM+5pPpyl6SBS1uR0rqSbRtTKGRoOwKiU/t0iUjt/qLl+VgWiYVwbG1J7iL/nZyCLYl 1Nbu5c/3PJT5LK1hA0JMb++FLfdK9o+6sLs1k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747820862; x=1748425662; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xVSGYE6iqrIAq+JpZWnBe3zXzREpF/cq1obpLzNiJZo=; b=tCWk4fWheS9OGEXLN7KxFQiMUrmrHiAAzVL7UdK7pV48x+Qg8WsBL5qUIIpK5L0gz/ gcMaZJBwp7jcK9N793llD+ZudGk5KD+D+RNGELVgUrzuVh/wy+RuGxK+MC5Car6gOtn4 kPl/k6ulQjVk5yNuIeVLacVR0d5adoWDsBj8LtHiHx83zLK47qtTQi9q17xJM3YCpFjc LBfHg5sLrAF137ts/MA4XL9Kt4WsPOg7X2U2/ibd1oWS1uFGzHsjh/tsPr8PyJJUoXgB trJEHfhiSrLotxzGzgJ0tGOPOr2E+mYMhU4F8Ca2dSpD0qQFHeAvevK12BlPKdoHYWTK edSg== X-Forwarded-Encrypted: i=2; AJvYcCUelc3c8WQEO6d+N4CJZtaZgRUbXwI1ya4mEmHF18Id3b48zBd2CcrnpVdevRrjWx7FcuKjVHFnKaHSoKq7@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YzSvc4lekZIl3t+vsrlfjUVgV9xZPyktWqdElgEefuMNjgECGY7 PAxyPPPRVQmPxqmnQColzoyrsam2JLm4BPCNUtuE3m/a0Xxd+DKBBY/5R+h6YmI0Cu5MbQ== X-Google-Smtp-Source: AGHT+IFQy+kldOZub/ALvgyz2q9FRrtU+WNusx61xEpesN6Nx9F3pzF25uOJpFFGA5Zwey/e1r3gjA== X-Received: by 2002:a05:6402:4306:b0:601:f87b:b6a9 with SMTP id 4fb4d7f45d1cf-601f87bba22mr8771766a12.25.1747820861747; Wed, 21 May 2025 02:47:41 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AVT/gBEfo6Z66bKo4zfhPzKL+J9+OaPqx7eHsHlTeTaezC9Czg== Received: by 2002:a05:6402:2803:b0:601:d62c:7601 with SMTP id 4fb4d7f45d1cf-602444d8c51ls105481a12.2.-pod-prod-01-eu; Wed, 21 May 2025 02:47:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXU0q/FPoMyxeA6uwJ1e4YQMAQfJy/XPVtb6HOoxpyQ9F2src4BK666CPGdEkwFyI/l1bvSa1Z5dIC2AHil@amarulasolutions.com X-Received: by 2002:a17:907:f496:b0:ac6:f3f5:3aa5 with SMTP id a640c23a62f3a-ad52d49e2e8mr2145013766b.16.1747820859566; Wed, 21 May 2025 02:47:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747820859; cv=none; d=google.com; s=arc-20240605; b=Bp9nwgIuNAw2+RkkID0w+I6DbHcovaMoDfZPvd+lXe+xpngKSkARlqgjlI8TzwEe1z kyHVP6sRpYjCjSRwg6aZs5MRzdt+DUhIVsN7zngUn6t6an5fXl7PhhP76RG4FskqShjt cY2bGgf8K2KxR9tP8jV5SZ9ZbU9SxDLEtHlSCjgC9Jl2luMVluAJsWy30GF3KNl83z9e vNXBe5IXZTih8B1AJZ6hQ+hssUFF7jHxLHz4lEX7/ApYD+ltamZ09AVeOi+IjPJ4UOLS qCK1GM+guGKc//SkXLZtQHZ8T/lcZ4r0UIPSskHb7KIokWtyZhhZpFPivtAapzRVrfIP 88sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=VJTFK8xdv4RQyg0pIfTbfJObVjKhhuj+68bC/WJdesQ=; fh=8qDRsUnajAS3+96Q/ue5DWuXY59CICrod9CGMlfsXro=; b=cjGQQZg2kakvHIQeU/830e/le/NtvhznsmHs0z9EilQIyGrVfe+NQv5cWBR4A0F0+D hjV4TddjTR+ifRH9bTUxhwpnNoBl1saAAx7UhplZU0vOVle+fpgP+klar6ydFk6O5PvU we2OS0Djg/iJHHIBcjxJSLXHOUTTp7+kcOIAeAoC71tkHCdOYqm2thFg74C8THvvIy8O ZdkFbvRIzyX7NFmwMxxF7fSp++LiI5kUaAArMJrOMd9XteI3PsVKGUzxHUqkV4O8KBge EOUnVfUuoi3rF5wTUnGs2VNDymQo/eqhwNdTegSWq+ugbNLstdjGzCFMX2dMMhWFhj/B 7jlw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nHIGxAEP; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-ad52d0805d6sor548824266b.6.2025.05.21.02.47.39 for (Google Transport Security); Wed, 21 May 2025 02:47:39 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCXh7ATNB7NsE83P6eepi0GX6rp7+KvRra6RqoJccZ1ByLhQyiYHNXp/bps4ewPR7ArJhz2EP+zQJDDbC1P6@amarulasolutions.com X-Gm-Gg: ASbGncu+XJruPrMf06mCGPR2egAjGDSb4AlTASDGEQEI8TbVOLxOe27qxbZD0FnOyEx svJ/NlTOPaguc2Ana4wRSq2utc9G7nXH4bwE7YU94aM0wZ2rd0bOie3YGJmws0FX2pv2jRtNOfU zJA2uO28pWSnRJq7H+n5LQLOVxC31kNmZPBQWzpMWzsLkuFExy0W2/Qn5NGMQfvwZ/9aGusSR5k QeLNUGX+wjxUiUbfFhFKYj6HZebuKQsAoRt5gzGIjYZCZ1ej2UDloVPuL8+UDYh/ie2Vyj/BK7X kzdjr+8yp/crLr7WuH5J3pUd9mvsV9W6rKOh65cMEy0agTZFmFj0BOD5WYyQBQt/UdtfXHJ15LM b2Txo1J7s+bJy X-Received: by 2002:a17:906:fe49:b0:ad2:3f1f:7970 with SMTP id a640c23a62f3a-ad52d45aef4mr1921831366b.2.1747820858969; Wed, 21 May 2025 02:47:38 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6474:ebbf:cfc5:5070:d6f4:1d86]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad52d06b497sm863951166b.42.2025.05.21.02.47.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 May 2025 02:47:38 -0700 (PDT) From: Dario Binacchi To: u-boot@lists.denx.de Cc: michael@amarulasolutions.com, Simon Holesch , linux-amarula@amarulasolutions.com, Michael Bode , Wolfgang Birkner , Dario Binacchi , Simon Glass , Tom Rini Subject: [PATCH v3 2/4] board: bsh: imx6ulz_smm_m2: Add support for 256 MiB DRAM Date: Wed, 21 May 2025 11:47:30 +0200 Message-ID: <20250521094735.1037146-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250521094735.1037146-1-dario.binacchi@amarulasolutions.com> References: <20250521094735.1037146-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nHIGxAEP; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@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: , From: Simon Holesch Calibration values were calculated using the NXP tool I.MX6ULL_DDR3_Script_Aid_V0.01.xlsx Signed-off-by: Wolfgang Birkner Signed-off-by: Simon Holesch Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- (no changes since v2) Changes in v2: - Use standard C comment style board/bsh/imx6ulz_smm_m2/Makefile | 2 +- board/bsh/imx6ulz_smm_m2/ddr3l_timing_128m.c | 169 +++++++++++++++ board/bsh/imx6ulz_smm_m2/ddr3l_timing_256m.c | 168 +++++++++++++++ board/bsh/imx6ulz_smm_m2/spl.c | 207 ++----------------- board/bsh/imx6ulz_smm_m2/spl_mtypes.h | 26 +++ include/configs/imx6ulz_smm_m2.h | 6 +- 6 files changed, 388 insertions(+), 190 deletions(-) create mode 100644 board/bsh/imx6ulz_smm_m2/ddr3l_timing_128m.c create mode 100644 board/bsh/imx6ulz_smm_m2/ddr3l_timing_256m.c create mode 100644 board/bsh/imx6ulz_smm_m2/spl_mtypes.h diff --git a/board/bsh/imx6ulz_smm_m2/Makefile b/board/bsh/imx6ulz_smm_m2/Makefile index 59870419bdde..d448f4fc5215 100644 --- a/board/bsh/imx6ulz_smm_m2/Makefile +++ b/board/bsh/imx6ulz_smm_m2/Makefile @@ -2,5 +2,5 @@ # (C) Copyright 2021 Amarula Solutions B.V. obj-y := imx6ulz_smm_m2.o -obj-$(CONFIG_XPL_BUILD) += spl.o +obj-$(CONFIG_XPL_BUILD) += spl.o ddr3l_timing_256m.o ddr3l_timing_128m.o diff --git a/board/bsh/imx6ulz_smm_m2/ddr3l_timing_128m.c b/board/bsh/imx6ulz_smm_m2/ddr3l_timing_128m.c new file mode 100644 index 000000000000..66c3483adbf5 --- /dev/null +++ b/board/bsh/imx6ulz_smm_m2/ddr3l_timing_128m.c @@ -0,0 +1,169 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include "spl_mtypes.h" + +static const struct dram_cfg_param ddr_ddrc_cfg_128mb[] = { + /* IOMUX */ + + /* DDR IO Type: */ + {0x020e04b4, 0x000C0000}, /* IOMUXC_SW_PAD_CTL_GRP_DDR_TYPE */ + {0x020e04ac, 0x00000000}, /* IOMUXC_SW_PAD_CTL_GRP_DDRPKE */ + + /* Clock: */ + {0x020e027c, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCLK_0 */ + + /* Address: */ + {0x020e0250, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_CAS */ + {0x020e024c, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_RAS */ + {0x020e0490, 0x00000028}, /* IOMUXC_SW_PAD_CTL_GRP_ADDDS */ + + /* Control: */ + {0x020e0288, 0x000C0028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_RESET */ + {0x020e0270, 0x00000000}, /* + * IOMUXC_SW_PAD_CTL_PAD_DRAM_SDBA2 - DSE can be configured + * using Group Control Register IOMUXC_SW_PAD_CTL_GRP_CTLDS + */ + + {0x020e0260, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDODT0 */ + {0x020e0264, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDODT1 */ + {0x020e04a0, 0x00000028}, /* IOMUXC_SW_PAD_CTL_GRP_CTLDS */ + + /* Data Strobes: */ + {0x020e0494, 0x00020000}, /* IOMUXC_SW_PAD_CTL_GRP_DDRMODE_CTL */ + {0x020e0280, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0 */ + {0x020e0284, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1 */ + + /* Data: */ + {0x020e04b0, 0x00020000}, /* IOMUXC_SW_PAD_CTL_GRP_DDRMODE */ + {0x020e0498, 0x00000028}, /* IOMUXC_SW_PAD_CTL_GRP_B0DS */ + {0x020e04a4, 0x00000028}, /* IOMUXC_SW_PAD_CTL_GRP_B1DS */ + + {0x020e0244, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM0 */ + {0x020e0248, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM1 */ + + /* + * ============================================================================= + * DDR Controller Registers + * ============================================================================= + * Manufacturer:ISSI + * Device Part Number:IS43TR16640BL-125JBLI + * Clock Freq.: 400MHz + * Density per CS in Gb: 1 + * Chip Selects used:1 + * Number of Banks:8 + * Row address: 13 + * Column address: 10 + * Data bus width16 + * ============================================================================= + */ + {0x021b001c, 0x00008000}, /* + * MMDC0_MDSCR, set the Configuration request bit + * during MMDC set up + */ + + /* + * ============================================================================= + * Calibration setup. + * ============================================================================= + */ + {0x021b0800, 0xA1390003}, /* + * DDR_PHY_P0_MPZQHWCTRL, enable both one-time & periodic + * HW ZQ calibration. + */ + + /* + * For target board, may need to run write leveling calibration to fine tune + * these settings. + */ + {0x021b080c, 0x00000000}, + + /* Read DQS Gating calibration */ + {0x021b083c, 0x41480148}, /* MPDGCTRL0 PHY0 */ + + /* Read calibration */ + {0x021b0848, 0x40403A3E}, /* MPRDDLCTL PHY0 */ + + /* Write calibration */ + {0x021b0850, 0x4040362E}, /* MPWRDLCTL PHY0 */ + + /* + * Read data bit delay: 3 is the recommended default value, although out of reset + * value is 0. + */ + {0x021b081c, 0x33333333}, /* MMDC_MPRDDQBY0DL */ + {0x021b0820, 0x33333333}, /* MMDC_MPRDDQBY1DL */ + + /* Write data bit delay: */ + {0x021b082c, 0xF3333333}, /* MMDC_MPWRDQBY0DL */ + {0x021b0830, 0xF3333333}, /* MMDC_MPWRDQBY1DL */ + + /* DQS&CLK Duty Cycle */ + {0x021b08c0, 0x00944009}, /* [MMDC_MPDCCR] MMDC Duty Cycle Control Register */ + + /* Complete calibration by forced measurement: */ + {0x021b08b8, 0x00000800}, /* DDR_PHY_P0_MPMUR0, frc_msr */ + + /* + * ============================================================================= + * Calibration setup end + * ============================================================================= + */ + + /* MMDC init: */ + {0x021b0004, 0x0002002D}, /* MMDC0_MDPDC */ + {0x021b0008, 0x1B333030}, /* MMDC0_MDOTC */ + {0x021b000c, 0x2B2F52F3}, /* MMDC0_MDCFG0 */ + {0x021b0010, 0xB66D0B63}, /* MMDC0_MDCFG1 */ + {0x021b0014, 0x01FF00DB}, /* MMDC0_MDCFG2 */ + + /* + * MDMISC: RALAT kept to the high level of 5. + * MDMISC: consider reducing RALAT if your 528MHz board design allow that. + * Lower RALAT benefits: + * a. better operation at low frequency, for LPDDR2 freq < 100MHz, change RALAT to 3 + * b. Small performance improvement + */ + {0x021b0018, 0x00211740}, /* MMDC0_MDMISC */ + {0x021b001c, 0x00008000}, /* + * MMDC0_MDSCR, set the Configuration request bit during + * MMDC set up + */ + {0x021b002c, 0x000026D2}, /* MMDC0_MDRWD */ + {0x021b0030, 0x002F1023}, /* MMDC0_MDOR */ + {0x021b0040, 0x00000043}, /* Chan0 CS0_END */ + {0x021b0000, 0x82180000}, /* MMDC0_MDCTL */ + + {0x021b0890, 0x00400000}, /* MPPDCMPR2 */ + + /* Mode register writes */ + {0x021b001c, 0x02808032}, /* MMDC0_MDSCR, MR2 write, CS0 */ + {0x021b001c, 0x00008033}, /* MMDC0_MDSCR, MR3 write, CS0 */ + {0x021b001c, 0x00048031}, /* MMDC0_MDSCR, MR1 write, CS0 */ + {0x021b001c, 0x15208030}, /* MMDC0_MDSCR, MR0write, CS0 */ + {0x021b001c, 0x04008040}, /* + * MMDC0_MDSCR, ZQ calibration command sent to device + * on CS0 + */ + + {0x021b0020, 0x00007800}, /* MMDC0_MDREF */ + + {0x021b0818, 0x00000227}, /* DDR_PHY_P0_MPODTCTRL */ + + {0x021b0004, 0x0002552D}, /* MMDC0_MDPDC now SDCTL power down enabled */ + + {0x021b0404, 0x00011006}, /* + * MMDC0_MAPSR ADOPT power down enabled, + * MMDC will enter automatically to self-refresh + * while the number of idle cycle reached. + */ + + {0x021b001c, 0x00000000}, /* + * MMDC0_MDSCR, clear this register (especially the + * configuration bit as initialization is complete) + */ +}; + +struct dram_timing_info bsh_dram_timing_128mb = { + .ddrc_cfg = ddr_ddrc_cfg_128mb, + .ddrc_cfg_num = ARRAY_SIZE(ddr_ddrc_cfg_128mb), +}; diff --git a/board/bsh/imx6ulz_smm_m2/ddr3l_timing_256m.c b/board/bsh/imx6ulz_smm_m2/ddr3l_timing_256m.c new file mode 100644 index 000000000000..0fe5b90a6732 --- /dev/null +++ b/board/bsh/imx6ulz_smm_m2/ddr3l_timing_256m.c @@ -0,0 +1,168 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include "spl_mtypes.h" + +static const struct dram_cfg_param ddr_ddrc_cfg_256mb[] = { + /* IOMUX */ + + /* DDR IO Type: */ + {0x020e04b4, 0x000C0000}, /* IOMUXC_SW_PAD_CTL_GRP_DDR_TYPE */ + {0x020e04ac, 0x00000000}, /* IOMUXC_SW_PAD_CTL_GRP_DDRPKE */ + + /* Clock: */ + {0x020e027c, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCLK_0 */ + + /* Address: */ + {0x020e0250, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_CAS */ + {0x020e024c, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_RAS */ + {0x020e0490, 0x00000028}, /* IOMUXC_SW_PAD_CTL_GRP_ADDDS */ + + /* Control: */ + {0x020e0288, 0x000C0028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_RESET */ + {0x020e0270, 0x00000000}, /* + * IOMUXC_SW_PAD_CTL_PAD_DRAM_SDBA2 - DSE can be configured + * using Group Control Register: IOMUXC_SW_PAD_CTL_GRP_CTLDS + */ + + {0x020e0260, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDODT0 */ + {0x020e0264, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDODT1 */ + {0x020e04a0, 0x00000028}, /* IOMUXC_SW_PAD_CTL_GRP_CTLDS */ + + /* Data Strobes: */ + {0x020e0494, 0x00020000}, /* IOMUXC_SW_PAD_CTL_GRP_DDRMODE_CTL */ + {0x020e0280, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0 */ + {0x020e0284, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1 */ + + /* Data: */ + {0x020e04b0, 0x00020000}, /* IOMUXC_SW_PAD_CTL_GRP_DDRMODE */ + {0x020e0498, 0x00000028}, /* IOMUXC_SW_PAD_CTL_GRP_B0DS */ + {0x020e04a4, 0x00000028}, /* IOMUXC_SW_PAD_CTL_GRP_B1DS */ + + {0x020e0244, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM0 */ + {0x020e0248, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM1 */ + + /* + * ============================================================================= + * DDR Controller Registers + * ============================================================================= + * Manufacturer:ISSI + * Device Part Number:IS43TR16640BL-125JBLI + * Clock Freq.: 400MHz + * Density per CS in Gb: 2 + * Chip Selects used:1 + * Number of Banks:8 + * Row address: 14 + * Column address: 10 + * Data bus width16 + * ============================================================================= + */ + {0x021b001c, 0x00008000}, /* + * MMDC0_MDSCR, set the Configuration request bit during + * MMDC set up + */ + + /* + * ============================================================================= + * Calibration setup. + * ============================================================================= + */ + {0x021b0800, 0xA1390003}, /* + * DDR_PHY_P0_MPZQHWCTRL, enable both one-time & periodic + * HW ZQ calibration + */ + + /* + * For target board, may need to run write leveling calibration to fine tune these settings + */ + {0x021b080c, 0x00050005}, + + /* Read DQS Gating calibration */ + {0x021b083c, 0x01480144}, /* MPDGCTRL0 PHY0 */ + + /* Read calibration */ + {0x021b0848, 0x4040363A}, /* MPRDDLCTL PHY0 */ + + /* Write calibration */ + {0x021b0850, 0x40402E2C}, /* MPWRDLCTL PHY0 */ + + /* + * Read data bit delay: 3 is the reccommended default value, although out of reset value + * is 0 + */ + {0x021b081c, 0x33333333}, /* MMDC_MPRDDQBY0DL */ + {0x021b0820, 0x33333333}, /* MMDC_MPRDDQBY1DL */ + + /* Write data bit delay: */ + {0x021b082c, 0xF3333333}, /* MMDC_MPWRDQBY0DL */ + {0x021b0830, 0xF3333333}, /* MMDC_MPWRDQBY1DL */ + + /* DQS&CLK Duty Cycle */ + {0x021b08c0, 0x00944009}, /* [MMDC_MPDCCR] MMDC Duty Cycle Control Register */ + + /* Complete calibration by forced measurement: */ + {0x021b08b8, 0x00000800}, /* DDR_PHY_P0_MPMUR0, frc_msr */ + + /* + * ============================================================================= + * Calibration setup end + * ============================================================================= + */ + + /* MMDC init: */ + {0x021b0004, 0x0002002D}, /* MMDC0_MDPDC */ + {0x021b0008, 0x1B333030}, /* MMDC0_MDOTC */ + {0x021b000c, 0x3F435333}, /* MMDC0_MDCFG0 */ + {0x021b0010, 0xB68E0B63}, /* MMDC0_MDCFG1 */ + {0x021b0014, 0x01FF00DB}, /* MMDC0_MDCFG2 */ + + /* + * MDMISC: RALAT kept to the high level of 5. + * MDMISC: consider reducing RALAT if your 528MHz board design allow that. + * Lower RALAT benefits: + * a. better operation at low frequency, for LPDDR2 freq < 100MHz, change RALAT to 3 + * b. Small performence improvment + */ + {0x021b0018, 0x00211740}, /* MMDC0_MDMISC */ + {0x021b001c, 0x00008000}, /* + * MMDC0_MDSCR, set the Configuration request bit during + * MMDC set up + */ + {0x021b002c, 0x000026D2}, /* MMDC0_MDRWD */ + {0x021b0030, 0x00431023}, /* MMDC0_MDOR */ + {0x021b0040, 0x00000047}, /* Chan0 CS0_END */ + {0x021b0000, 0x83180000}, /* MMDC0_MDCTL */ + + {0x021b0890, 0x00400000}, /* MPPDCMPR2 */ + + /* Mode register writes */ + {0x021b001c, 0x02808032}, /* MMDC0_MDSCR, MR2 write, CS0 */ + {0x021b001c, 0x00008033}, /* MMDC0_MDSCR, MR3 write, CS0 */ + {0x021b001c, 0x00048031}, /* MMDC0_MDSCR, MR1 write, CS0 */ + {0x021b001c, 0x15208030}, /* MMDC0_MDSCR, MR0write, CS0 */ + {0x021b001c, 0x04008040}, /* + * MMDC0_MDSCR, ZQ calibration command sent to device + * on CS0 + */ + + {0x021b0020, 0x00007800}, /* MMDC0_MDREF */ + + {0x021b0818, 0x00000227}, /* DDR_PHY_P0_MPODTCTRL */ + + {0x021b0004, 0x0002552D}, /* MMDC0_MDPDC now SDCTL power down enabled */ + + {0x021b0404, 0x00011006}, /* + * MMDC0_MAPSR ADOPT power down enabled, MMDC will enter + * automatically to self-refresh while the number of idle + * cycle reached + */ + + {0x021b001c, 0x00000000}, /* + * MMDC0_MDSCR, clear this register (especially the + * configuration bit as initialization is complete) + */ +}; + +struct dram_timing_info bsh_dram_timing_256mb = { + .ddrc_cfg = ddr_ddrc_cfg_256mb, + .ddrc_cfg_num = ARRAY_SIZE(ddr_ddrc_cfg_256mb), +}; diff --git a/board/bsh/imx6ulz_smm_m2/spl.c b/board/bsh/imx6ulz_smm_m2/spl.c index 936e54662e98..85fd9e133eb3 100644 --- a/board/bsh/imx6ulz_smm_m2/spl.c +++ b/board/bsh/imx6ulz_smm_m2/spl.c @@ -17,6 +17,8 @@ #include #include +#include "spl_mtypes.h" + #define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) @@ -31,190 +33,15 @@ static void setup_iomux_uart(void) imx_iomux_v3_setup_multiple_pads(uart4_pads, ARRAY_SIZE(uart4_pads)); } -struct dram_cfg_param { - unsigned int reg; - unsigned int val; -}; - -struct dram_timing_info { - const struct dram_cfg_param *ddrc_cfg; - unsigned int ddrc_cfg_num; -}; - -static const struct dram_cfg_param ddr_ddrc_cfg_128mb[] = { - /* IOMUX */ - - /* DDR IO Type: */ - {0x020e04b4, 0x000C0000}, /* IOMUXC_SW_PAD_CTL_GRP_DDR_TYPE */ - {0x020e04ac, 0x00000000}, /* IOMUXC_SW_PAD_CTL_GRP_DDRPKE */ - - /* Clock: */ - {0x020e027c, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDCLK_0 */ - - /* Address: */ - {0x020e0250, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_CAS */ - {0x020e024c, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_RAS */ - {0x020e0490, 0x00000028}, /* IOMUXC_SW_PAD_CTL_GRP_ADDDS */ - - /* Control: */ - {0x020e0288, 0x000C0028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_RESET */ - - {0x020e0270, 0x00000000}, /* - * IOMUXC_SW_PAD_CTL_PAD_DRAM_SDBA2 - DSE can be configured - * using Group Control Register: IOMUXC_SW_PAD_CTL_GRP_CTLDS - */ - - {0x020e0260, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDODT0 */ - {0x020e0264, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDODT1 */ - {0x020e04a0, 0x00000028}, /* IOMUXC_SW_PAD_CTL_GRP_CTLDS */ - - /* Data Strobes: */ - {0x020e0494, 0x00020000}, /* IOMUXC_SW_PAD_CTL_GRP_DDRMODE_CTL */ - {0x020e0280, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS0 */ - {0x020e0284, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_SDQS1 */ - - /* Data: */ - {0x020e04b0, 0x00020000}, /* IOMUXC_SW_PAD_CTL_GRP_DDRMODE */ - {0x020e0498, 0x00000028}, /* IOMUXC_SW_PAD_CTL_GRP_B0DS */ - {0x020e04a4, 0x00000028}, /* IOMUXC_SW_PAD_CTL_GRP_B1DS */ - - {0x020e0244, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM0 */ - {0x020e0248, 0x00000028}, /* IOMUXC_SW_PAD_CTL_PAD_DRAM_DQM1 */ - - /* - * ============================================================================= - * DDR Controller Registers - * ============================================================================= - * Manufacturer:ISSI - * Device Part Number:IS43TR16640BL-125JBLI - * Clock Freq.: 400MHz - * Density per CS in Gb: 1 - * Chip Selects used:1 - * Number of Banks:8 - * Row address: 13 - * Column address: 10 - * Data bus width16 - * ============================================================================= - */ - - {0x021b001c, 0x00008000}, /* - * MMDC0_MDSCR, set the Configuration request bit during - * MMDC set up - */ - - /* - * ============================================================================= - * Calibration setup - * ============================================================================= - */ - - {0x021b0800, 0xA1390003}, /* - * DDR_PHY_P0_MPZQHWCTRL, enable both one-time & periodic - * HW ZQ calibration. - */ - - /* - * For target board, may need to run write leveling calibration to fine tune these - * settings. - */ - {0x021b080c, 0x00000000}, - - /* Read DQS Gating calibration */ - {0x021b083c, 0x41480148}, /* MPDGCTRL0 PHY0 */ - - /* Read calibration */ - {0x021b0848, 0x40403A3E}, /* MPRDDLCTL PHY0 */ - - /* Write calibration */ - {0x021b0850, 0x4040362E}, /* MPWRDLCTL PHY0 */ - - /* - * Read data bit delay: 3 is the recommended default value, although out of reset - * value is 0 - */ - {0x021b081c, 0x33333333}, /* MMDC_MPRDDQBY0DL */ - {0x021b0820, 0x33333333}, /* MMDC_MPRDDQBY1DL */ - - /* Write data bit delay: */ - {0x021b082c, 0xF3333333}, /* MMDC_MPWRDQBY0DL */ - {0x021b0830, 0xF3333333}, /* MMDC_MPWRDQBY1DL */ - - /* DQS&CLK Duty Cycle */ - {0x021b08c0, 0x00944009}, /* [MMDC_MPDCCR] MMDC Duty Cycle Control Register */ - - /* Complete calibration by forced measurement: */ - {0x021b08b8, 0x00000800}, /* DDR_PHY_P0_MPMUR0, frc_msr */ - - /* - * ============================================================================= - * Calibration setup end - * ============================================================================= - */ - - /* MMDC init: */ - {0x021b0004, 0x0002002D}, /* MMDC0_MDPDC */ - {0x021b0008, 0x1B333030}, /* MMDC0_MDOTC */ - {0x021b000c, 0x2B2F52F3}, /* MMDC0_MDCFG0 */ - {0x021b0010, 0xB66D0B63}, /* MMDC0_MDCFG1 */ - {0x021b0014, 0x01FF00DB}, /* MMDC0_MDCFG2 */ - - /* - * MDMISC: RALAT kept to the high level of 5. - * MDMISC: consider reducing RALAT if your 528MHz board design allow that. - * Lower RALAT benefits: - * a. better operation at low frequency, for LPDDR2 freq < 100MHz, change RALAT to 3 - * b. Small performance improvement - */ - {0x021b0018, 0x00211740}, /* MMDC0_MDMISC */ - {0x021b001c, 0x00008000}, /* - * MMDC0_MDSCR, set the Configuration request - * bit during MMDC set up - */ - {0x021b002c, 0x000026D2}, /* MMDC0_MDRWD */ - {0x021b0030, 0x002F1023}, /* MMDC0_MDOR */ - {0x021b0040, 0x00000043}, /* Chan0 CS0_END */ - {0x021b0000, 0x82180000}, /* MMDC0_MDCTL */ - - {0x021b0890, 0x00400000}, /* MPPDCMPR2 */ - - /* Mode register writes */ - {0x021b001c, 0x02808032}, /* MMDC0_MDSCR, MR2 write, CS0 */ - {0x021b001c, 0x00008033}, /* MMDC0_MDSCR, MR3 write, CS0 */ - {0x021b001c, 0x00048031}, /* MMDC0_MDSCR, MR1 write, CS0 */ - {0x021b001c, 0x15208030}, /* MMDC0_MDSCR, MR0write, CS0 */ - {0x021b001c, 0x04008040}, /* - * MMDC0_MDSCR, ZQ calibration command sent to - * device on CS0 - */ - {0x021b0020, 0x00007800}, /* MMDC0_MDREF */ - - {0x021b0818, 0x00000227}, /* DDR_PHY_P0_MPODTCTRL */ - - {0x021b0004, 0x0002552D}, /* MMDC0_MDPDC now SDCTL power down enabled */ - - {0x021b0404, 0x00011006}, /* - * MMDC0_MAPSR ADOPT power down enabled, - * MMDC will enter automatically to self-refresh - * while the number of idle cycle reached. - */ - - {0x021b001c, 0x00000000}, /* - * MMDC0_MDSCR, clear this register - * (especially the configuration bit as initialization - * is complete) - */ -}; - -static struct dram_timing_info dram_timing_128mb = { - .ddrc_cfg = ddr_ddrc_cfg_128mb, - .ddrc_cfg_num = ARRAY_SIZE(ddr_ddrc_cfg_128mb), -}; - static void ddr_cfg_write(const struct dram_timing_info *dram_timing_info) { int i; const struct dram_cfg_param *ddrc_cfg = dram_timing_info->ddrc_cfg; const int ddrc_cfg_num = dram_timing_info->ddrc_cfg_num; + struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR; + + clrbits_le32(&mmdc0->mdctl, 1 << 31); /* clear SDE_0 */ + clrbits_le32(&mmdc0->mdctl, 1 << 30); /* clear SDE_1 */ for (i = 0; i < ddrc_cfg_num; i++) { debug("Writing 0x%x to register 0x%x\n", ddrc_cfg->val, @@ -226,12 +53,22 @@ static void ddr_cfg_write(const struct dram_timing_info *dram_timing_info) static void spl_dram_init(void) { - struct mmdc_p_regs *mmdc0 = (struct mmdc_p_regs *)MMDC_P0_BASE_ADDR; - - clrbits_le32(&mmdc0->mdctl, 1 << 31); /* clear SDE_0 */ - clrbits_le32(&mmdc0->mdctl, 1 << 30); /* clear SDE_1 */ - - ddr_cfg_write(&dram_timing_128mb); + /* Configure memory to maximum supported size for detection */ + ddr_cfg_write(&bsh_dram_timing_256mb); + + /* Detect memory physically present */ + gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, SZ_256M); + + /* Reconfigure memory for actual detected size */ + switch (gd->ram_size) { + case SZ_256M: + /* Already configured, nothing to do */ + break; + case SZ_128M: + default: + ddr_cfg_write(&bsh_dram_timing_128mb); + break; + } } static void ccgr_init(void) diff --git a/board/bsh/imx6ulz_smm_m2/spl_mtypes.h b/board/bsh/imx6ulz_smm_m2/spl_mtypes.h new file mode 100644 index 000000000000..2b517c316e0f --- /dev/null +++ b/board/bsh/imx6ulz_smm_m2/spl_mtypes.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2025 BSH Hausgeraete GmbH + * + * Written by: Simon Holesch + */ + +#ifndef SPL_MTYPES_H +#define SPL_MTYPES_H + +#include + +struct dram_cfg_param { + unsigned int reg; + unsigned int val; +}; + +struct dram_timing_info { + const struct dram_cfg_param *ddrc_cfg; + unsigned int ddrc_cfg_num; +}; + +extern struct dram_timing_info bsh_dram_timing_128mb; +extern struct dram_timing_info bsh_dram_timing_256mb; + +#endif /* SPL_MTYPES_H */ diff --git a/include/configs/imx6ulz_smm_m2.h b/include/configs/imx6ulz_smm_m2.h index 44a3fc02e8ac..87aede218d16 100644 --- a/include/configs/imx6ulz_smm_m2.h +++ b/include/configs/imx6ulz_smm_m2.h @@ -60,10 +60,8 @@ BOOTENV /* Physical Memory Map */ -#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR -#define PHYS_SDRAM_SIZE SZ_128M - -#define CFG_SYS_SDRAM_BASE PHYS_SDRAM +#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR +#define CFG_SYS_SDRAM_BASE PHYS_SDRAM #define CFG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE