From patchwork Thu Aug 31 10:45:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 718968 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp395155wrn; Thu, 31 Aug 2023 03:47:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwCauLrYpO1UTxQeutmZ+3MIf5ty3TiovAB5zMFDTGSFafaoCRBFnDyI56mPnyeQRx84S6 X-Received: by 2002:a05:620a:190f:b0:76c:9884:4dce with SMTP id bj15-20020a05620a190f00b0076c98844dcemr2443204qkb.63.1693478859017; Thu, 31 Aug 2023 03:47:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693478859; cv=none; d=google.com; s=arc-20160816; b=YrDX8moBpk6EBtD8YRle4ehsUAWDt1tgI6rQSCwKS4avxdRLhVbhB+5kIn3xdS0cCl 0IKfbwpyFh/UueyUS/77hTFpwlrCUf/w9WnloUeBQnNBFlyiOxgJ69oBw1U1WL4szi4H uS1PG6qvl4/zU4/cNT4Ezd6Is8ZNC+ZzG8ucfGeEh9p8ndvqjkqSYq0LqVDwx48qS15E 78CXT6tA+9GY3mU0GEFssk4Cgmv39QTpvFvddWx5/oPdseefr39DOEidVFX034pQ2OQ+ GUsHgbDWpeMQ337L5TZXRoJe+c/UnXOzggWVErp3H7amAM0Pi18OUKYCP4+3Eh3CmsNC T9xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=kyRjWza4FydApFPcQyrvxJM4UV9pQPcxGBS07VokX2o=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=gHEToAIJ6fPR1HktchhQibxRVf9RdjNe03VDszeDXh3coOHp0G8gnCGlp3TuGvoKrB mg6G84gK5xS0Sb/wFMK7sTYbOLggTqRr3I54GL2S2QlpUwDH3STkhm9bChu8vusqtjzK ACeROizuSrMVbSviyqCKH6cbU6FAtG5Uz3daLP5HvXq64FlcKWWPeQv5dSWvJBlA3w9q rxFES4UjO0d5Tf8hqLdPovNPwS9NxIco02pWs0e4u5RV4WZYAyBSARIdZWjLxFeiOCvy zMY9WQ982DkCSyxehFTw0VW/cbYnr3rUA8eM9pLilDnwU2UlQs16bz/dbK9rbSXLCdJK tPMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C7eTEmu3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o19-20020a05620a0d5300b0076daad4ad3csi719306qkl.32.2023.08.31.03.47.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 03:47:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C7eTEmu3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbfBQ-00048k-1f; Thu, 31 Aug 2023 06:45:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbfB5-0003YT-Lc for qemu-devel@nongnu.org; Thu, 31 Aug 2023 06:45:32 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbfB1-00043Q-1K for qemu-devel@nongnu.org; Thu, 31 Aug 2023 06:45:30 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-400a087b0bfso6273995e9.2 for ; Thu, 31 Aug 2023 03:45:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693478725; x=1694083525; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kyRjWza4FydApFPcQyrvxJM4UV9pQPcxGBS07VokX2o=; b=C7eTEmu3wRM/GH5sFLOAWRD0yxRvp7ZGhRFko1yr/vclm3w/PHUNgLx3KxLiPzzKoi 06gLZxw4nuFzkGm0kcoeEU7w0inGNMJNut5Qz4zo4Nth6h8r9/f3EFjXTMqoyjBlnmdH hLO79aBU/rJVCdWJDuASwdT+Fw1w02X5dbelEiXfLmuB/TCp9nS8AnJf+7uTfagSSKtA zGVqVjBHodGG6U39mxAL0tQ1biqrjKDauBMvpS3o4KqEPxN2Iqin7rBWZIKdeC0ui54q 2CmeXAj9fCADQhBc+v112McuX+fgjwYAgxYMl4Ptr8GLEifIo/vacgExqZ3X6uNDZC8p +DHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693478725; x=1694083525; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kyRjWza4FydApFPcQyrvxJM4UV9pQPcxGBS07VokX2o=; b=NzD2iY47Y7aQscW127vRYSOJmEuAtCmq3PV0b0JGCMhgxBIgClfm6o8mKXA3nyHND9 hh9TqatgsOy4As3rnVILRLoW0nSlq1ZhQf4EjrZi9Y2ER0200vWyoVWrqgn4pbW3TJyX z+F0kSidQbSYsCTBpd72Or7mmj+Wh8CUpWZb8vF2I64z1WL/naxT7etRGpSsrRnQUbwr sNS0dbuFaWTIK2k39jPDfxAUcYKj5XqsaK8YSFluDnjcpGH6oV3ucBkQgvBXBSrWZPpO /y17I4EGmwxQ1nHawrM8bxT6bl2qNBod6YCZhnjhsoq9zhe7KDzjT6tNSnPsGUdsJkOB nQLw== X-Gm-Message-State: AOJu0Yx5C3DAkrkG2gAP/t8pBbmMe4MmZpwPnc2e1qp4bk5UDVu+2oek bEoIf3jKMu74Vrkb5EsvGY+UU+eRPwAbN9IpiXU= X-Received: by 2002:a05:600c:228e:b0:3fe:ef11:d79f with SMTP id 14-20020a05600c228e00b003feef11d79fmr4159542wmf.36.1693478725135; Thu, 31 Aug 2023 03:45:25 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id l5-20020adfe585000000b0031c71693449sm1785524wrm.1.2023.08.31.03.45.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 03:45:24 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/24] Remove i.MX7 IOMUX GPR device from i.MX6UL Date: Thu, 31 Aug 2023 11:45:06 +0100 Message-Id: <20230831104519.3520658-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230831104519.3520658-1-peter.maydell@linaro.org> References: <20230831104519.3520658-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.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, 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-BeenThere: qemu-devel@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-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Jean-Christophe Dubois i.MX7 IOMUX GPR device is not equivalent to i.MX6UL IOMUXC GPR device. In particular, register 22 is not present on i.MX6UL and this is actualy The only register that is really emulated in the i.MX7 IOMUX GPR device. Note: The i.MX6UL code is actually also implementing the IOMUX GPR device as an unimplemented device at the same bus adress and the 2 instantiations were actualy colliding. So we go back to the unimplemented device for now. Signed-off-by: Jean-Christophe Dubois Message-id: 48681bf51ee97646479bb261bee19abebbc8074e.1692964892.git.jcd@tribudubois.net Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/hw/arm/fsl-imx6ul.h | 2 -- hw/arm/fsl-imx6ul.c | 11 ----------- 2 files changed, 13 deletions(-) diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h index 9ee15ae38d6..3bec6bb3fb7 100644 --- a/include/hw/arm/fsl-imx6ul.h +++ b/include/hw/arm/fsl-imx6ul.h @@ -22,7 +22,6 @@ #include "hw/misc/imx6ul_ccm.h" #include "hw/misc/imx6_src.h" #include "hw/misc/imx7_snvs.h" -#include "hw/misc/imx7_gpr.h" #include "hw/intc/imx_gpcv2.h" #include "hw/watchdog/wdt_imx2.h" #include "hw/gpio/imx_gpio.h" @@ -74,7 +73,6 @@ struct FslIMX6ULState { IMX6SRCState src; IMX7SNVSState snvs; IMXGPCv2State gpcv2; - IMX7GPRState gpr; IMXSPIState spi[FSL_IMX6UL_NUM_ECSPIS]; IMXI2CState i2c[FSL_IMX6UL_NUM_I2CS]; IMXSerialState uart[FSL_IMX6UL_NUM_UARTS]; diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c index 2189dcbb72c..0fdd2782ba5 100644 --- a/hw/arm/fsl-imx6ul.c +++ b/hw/arm/fsl-imx6ul.c @@ -63,11 +63,6 @@ static void fsl_imx6ul_init(Object *obj) */ object_initialize_child(obj, "snvs", &s->snvs, TYPE_IMX7_SNVS); - /* - * GPR - */ - object_initialize_child(obj, "gpr", &s->gpr, TYPE_IMX7_GPR); - /* * GPIOs 1 to 5 */ @@ -537,12 +532,6 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) FSL_IMX6UL_WDOGn_IRQ[i])); } - /* - * GPR - */ - sysbus_realize(SYS_BUS_DEVICE(&s->gpr), &error_abort); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpr), 0, FSL_IMX6UL_IOMUXC_GPR_ADDR); - /* * SDMA */