Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AFC8DC55196 for ; Mon, 3 Aug 2026 22:17:01 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wr0xf-0008Cx-3Z; Mon, 03 Aug 2026 18:16:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wqySv-0000Cy-4U for qemu-arm@nongnu.org; Mon, 03 Aug 2026 15:36:49 -0400 Received: from mail-oi1-x22d.google.com ([2607:f8b0:4864:20::22d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wqySt-0004lR-Gy for qemu-arm@nongnu.org; Mon, 03 Aug 2026 15:36:48 -0400 Received: by mail-oi1-x22d.google.com with SMTP id 5614622812f47-4955cd5da3dso1220579b6e.2 for ; Mon, 03 Aug 2026 12:36:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785785806; x=1786390606; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=EGdJ0LTBV05DYiqlvAPQDTCYhGKVOlTNNsyUSaPlO+E=; b=GDwfWnmROwOkjVF+uLk9GKGS3icpHIXDQdGpGD4DaguIZ34V7kn4PpZzt6gJiVhX8J yl+3PLCWdjAJU+4cXuhZEqW/7W6GamYVEs9TClL9i6n3q7JFIrBn/J6TUJ+Xg3LoSWaL ZyRJum6id50iXkv160DDMEiU6EkYcREk5RJNr/NZ3P4SdwycFOzLmMsxl/rM4h6WUg5k 5d6IkgVzo28diS2cz82wb1XgF4oQs7fj1spkbY9t2vaXM5Ok5+cv0cdamUBQUZ+sdh89 xUWj17pqrtTH+gnBvBA77kA5hD7aNd7St/Q4OtmXNtB7ml1u6sMCzqonMpWbjvp2LH33 2kxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785785806; x=1786390606; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EGdJ0LTBV05DYiqlvAPQDTCYhGKVOlTNNsyUSaPlO+E=; b=liS+urHuc8QI1eoFCcIp8UqU6zT0ddBEcuoEWgema8cl+AvEpHIhw0uhVVybbGmUXA jhmWujx66AJleupN6WkKZe40RJtUE3+m5ZclRRr70SXYzpTqBYeWTewy5Vjaswi0HucB rbulQRze+S6fNEEprtoYWWWaR+isKiOou6JIjEEs5WryHJcnY2l3melrRCpI8kqmQStJ oXQZm9oPCV4dGIDUoVll7X58IGY6WjlvvKTbsZLWeizBFQwBKmJHNGH0of4BQVde4ZbQ eJR3Za04iuF2V3405HyDLiSekzKDchl5WRueSzZczEq6l4acZCh6HV4If/bj8JMuaFjq dnvg== X-Forwarded-Encrypted: i=1; AHgh+RodYM7VI1DGciqerJom8Ah9f0NwKSleJuJTWzFehL763g6L9Mxdb3ILC3l18C2+awW3Ht1H8+gvkw==@nongnu.org X-Gm-Message-State: AOJu0YzqVeZEiAqPdojMRdnzk4hsmyr635kJUhGHI2OgETE2DkDeLAcr ydZrk/x0H1/664Kf96kXyilOZ8CyPGE4I1hi0hLqUxwSfIpIIf/eXUVS X-Gm-Gg: AR+sD12yox8XZeOGCXBHKYlyBIzON087d3Hrtt1hThBSrbgDvlBX2uIe0nCNRoBq40+ u7fmRq85crr9htoVtmZIQIWsHfVFOr5/85LrlFvgECIytS1ijZsGdKyRQVYRa6/Ggk2esJ0Tmih SwXxyqUVw6db4pZRkE+pmNT8DmB3jASBzQtLB0VZgV2S2Gg4wm97DYIaDUlkhi9+jW76ot8eGEp EhMoG2iak+hHC/jSh24WgxwL9K/W7CeE4mdO0XzJ1xLyahrMUbgYPdux7PVMRvmmNLFFtRjF5d5 fDCDquCbXG7+uu7y4bUTqI+x5ayi4PrJ+TFOSLc8RXXINv8OmF/145IN49liNovNMZmndQ1msl6 I6qej9OwVBPasXIAz7+3RLfuZBDYj8siGq0JyGBQqrsfrWYe1LV9y+a3o9ZgxvhqIelHoSHNq/6 JvA1ssqKB0WYmhJK7oX9Dht+wMO/T3zT2ZadKNyCymeOblMFjriwJ53bUTbu9poX/uFBsO731x7 2B+KqBSeVE9c9fm X-Received: by 2002:a05:6808:c1e8:b0:497:d371:21c8 with SMTP id 5614622812f47-4af5e2cd936mr17274055b6e.19.1785785806257; Mon, 03 Aug 2026 12:36:46 -0700 (PDT) Received: from devvm55912.cln0.facebook.com ([2a03:2880:31ff:22::]) by smtp.gmail.com with ESMTPSA id 5614622812f47-4af58e95b32sm7243817b6e.10.2026.08.03.12.36.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2026 12:36:45 -0700 (PDT) From: Pablo Mazzini To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jcd@tribudubois.net, qemu-arm@nongnu.org, Pablo Mazzini Subject: [PATCH] hw/misc/imx6_ccm: add the i.MX6SLL variant Date: Mon, 3 Aug 2026 12:36:32 -0700 Message-ID: <20260803193635.4153664-1-pmazzini@gmail.com> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::22d; envelope-from=pmazzini@gmail.com; helo=mail-oi1-x22d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Mon, 03 Aug 2026 18:16:41 -0400 X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org The i.MX6SLL shares the i.MX6Q clock tree, but reports its own chip id in the ANATOP DIGPROG register and implements the PMU and XTALOSC24M registers that the i.MX6Q does not. Add TYPE_IMX6SLL_CCM as a subtype of TYPE_IMX6_CCM. QOM runs the parent's instance_init first, so the subtype only has to override DIGPROG and widen the decoded ANALOG window to cover the extra registers; the i.MX6Q window is unchanged. DIGPROG is a hardwired chip identifier rather than a reset value, so move its default out of imx6_ccm_reset() and into imx6_ccm_init(). The analog register array grows to cover the new registers. Signed-off-by: Pablo Mazzini --- hw/misc/imx6_ccm.c | 39 ++++++++++++++++++++++++++++++++++++-- include/hw/misc/imx6_ccm.h | 12 +++++++++++- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/hw/misc/imx6_ccm.c b/hw/misc/imx6_ccm.c index 45fdd0d5a8..6f48de5954 100644 --- a/hw/misc/imx6_ccm.c +++ b/hw/misc/imx6_ccm.c @@ -223,6 +223,14 @@ static const char *imx6_analog_reg_name(uint32_t reg) return "PMU_MISC1_TOG"; case USB_ANALOG_DIGPROG: return "USB_ANALOG_DIGPROG"; + case PMU_LOW_PWR_CTRL: + return "PMU_LOW_PWR_CTRL"; + case XTALOSC24M_OSC_CONFIG0: + return "XTALOSC24M_OSC_CONFIG0"; + case XTALOSC24M_OSC_CONFIG1: + return "XTALOSC24M_OSC_CONFIG1"; + case XTALOSC24M_OSC_CONFIG2: + return "XTALOSC24M_OSC_CONFIG2"; default: snprintf(unknown, sizeof(unknown), "%u ?", reg); return unknown; @@ -237,7 +245,7 @@ static const VMStateDescription vmstate_imx6_ccm = { .minimum_version_id = 1, .fields = (const VMStateField[]) { VMSTATE_UINT32_ARRAY(ccm, IMX6CCMState, CCM_MAX), - VMSTATE_UINT32_ARRAY(analog, IMX6CCMState, CCM_ANALOG_MAX), + VMSTATE_UINT32_ARRAY(analog, IMX6CCMState, CCM_ANALOG_REGS), VMSTATE_END_OF_LIST() }, }; @@ -474,7 +482,6 @@ static void imx6_ccm_reset(DeviceState *dev) s->analog[USB_ANALOG_USB2_VBUS_DETECT] = 0x00000004; s->analog[USB_ANALOG_USB2_CHRG_DETECT] = 0x00000000; s->analog[USB_ANALOG_USB2_MISC] = 0x00000002; - s->analog[USB_ANALOG_DIGPROG] = 0x00630000; /* all PLLs need to be locked */ s->analog[CCM_ANALOG_PLL_ARM] |= CCM_ANALOG_PLL_LOCK; @@ -763,6 +770,12 @@ static void imx6_ccm_init(Object *obj) memory_region_add_subregion(&s->container, 0x4000, &s->ioanalog); sysbus_init_mmio(sd, &s->container); + + /* + * DIGPROG is a hardwired chip identifier: it is not affected by reset. + * Default to i.MX6Q; variants sharing this CCM override it below. + */ + s->analog[USB_ANALOG_DIGPROG] = 0x00630000; } static void imx6_ccm_class_init(ObjectClass *klass, const void *data) @@ -777,6 +790,21 @@ static void imx6_ccm_class_init(ObjectClass *klass, const void *data) ccm->get_clock_frequency = imx6_ccm_get_clock_frequency; } +static void imx6sll_ccm_init(Object *obj) +{ + IMX6CCMState *s = IMX6_CCM(obj); + + /* + * Runs after imx6_ccm_init(), which installs the i.MX6Q default. The + * clock tree is the same; only the chip identifier differs: + * MXC_CPU_IMX6SLL (0x67), revision 1.0. + */ + s->analog[USB_ANALOG_DIGPROG] = 0x00670000; + + /* Unlike the i.MX6Q, this one implements the PMU/XTALOSC24M registers. */ + memory_region_set_size(&s->ioanalog, CCM_ANALOG_REGS * sizeof(uint32_t)); +} + static const TypeInfo imx6_ccm_info = { .name = TYPE_IMX6_CCM, .parent = TYPE_IMX_CCM, @@ -785,9 +813,16 @@ static const TypeInfo imx6_ccm_info = { .class_init = imx6_ccm_class_init, }; +static const TypeInfo imx6sll_ccm_info = { + .name = TYPE_IMX6SLL_CCM, + .parent = TYPE_IMX6_CCM, + .instance_init = imx6sll_ccm_init, +}; + static void imx6_ccm_register_types(void) { type_register_static(&imx6_ccm_info); + type_register_static(&imx6sll_ccm_info); } type_init(imx6_ccm_register_types) diff --git a/include/hw/misc/imx6_ccm.h b/include/hw/misc/imx6_ccm.h index a54b940686..ba8b9037ce 100644 --- a/include/hw/misc/imx6_ccm.h +++ b/include/hw/misc/imx6_ccm.h @@ -150,6 +150,13 @@ #define USB_ANALOG_DIGPROG 152 #define CCM_ANALOG_MAX 153 +/* PMU and XTALOSC24M registers; i.MX6SLL/SX/UL only */ +#define PMU_LOW_PWR_CTRL 156 +#define XTALOSC24M_OSC_CONFIG0 168 +#define XTALOSC24M_OSC_CONFIG1 172 +#define XTALOSC24M_OSC_CONFIG2 176 +#define CCM_ANALOG_REGS 177 + /* CCM_CBCMR */ #define PRE_PERIPH_CLK_SEL_SHIFT (18) #define PRE_PERIPH_CLK_SEL_LENGTH (2) @@ -195,8 +202,11 @@ struct IMX6CCMState { MemoryRegion ioanalog; uint32_t ccm[CCM_MAX]; - uint32_t analog[CCM_ANALOG_MAX]; + uint32_t analog[CCM_ANALOG_REGS]; }; +/* Same clock tree as the i.MX6Q, but its own chip id in ANATOP DIGPROG. */ +#define TYPE_IMX6SLL_CCM "imx6sll.ccm" + #endif /* IMX6_CCM_H */ -- 2.53.0