From patchwork Thu Sep 15 15:25:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 12977584 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 lists.gnu.org (lists.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 59754C6FA89 for ; Thu, 15 Sep 2022 15:41:30 +0000 (UTC) Received: from localhost ([::1]:54452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYqzZ-000362-A5 for qemu-devel@archiver.kernel.org; Thu, 15 Sep 2022 11:41:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYqkh-0008GZ-Gj; Thu, 15 Sep 2022 11:26:07 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:36504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYqke-0007Fl-IB; Thu, 15 Sep 2022 11:26:07 -0400 Received: by mail-ed1-x536.google.com with SMTP id e18so27498836edj.3; Thu, 15 Sep 2022 08:26:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=lC+nciPNvefso4Uey0coJ0dgRmlI5e5KX4arjIiF5Js=; b=IIst+g3TVX4DYFlbKFddL/vkxmvqUCwp0c8i87qoH45CuaVGF3cO4SE44UiMWSVJld +CboRiG5HqFBhj8gRBZAeSy/IPzSmraZ6ce4G1Z3zQlYNooTk69NLUHs5oGQaiX82DxT q+UsNlI7dBtVoQ2hatQPMe2X2w+D/4X0d03u8CWJ5IJegbLD2R5BuIBwoZEJKHO/hUzI 3XvqJRXgAzz4UfMHehNbLIvPNNUv2ESQ88ojfl++64EghBac1O7MZ4L5yPVLkQmE90IG 2wXqZMQkcmU7vu8w9sehi34v9yozfBsaUjW6gddo/pYNplbV8bDco68DdcZ0klG4PVJQ 4BFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=lC+nciPNvefso4Uey0coJ0dgRmlI5e5KX4arjIiF5Js=; b=ItrQF7Y9EC00qBXqn4M1kofqU76rHjfAxPXwM7jsa454UyZuzYksok3zXQt53235a4 OXFDISv6VMlTK6cM5JYUsMrnaxZWoi1DCgbetTjubMhDPLEBKti3BgflseFVtWDG5NKh nIWuEXR8Pa02/hm5vUtKpizJLe1zBc66IAtAHE0S2YBcOe0sF/GOKIs4TeMusjTiFpu4 OAGgOdJbUWZc0I2Zm0Bf1PNtSTSXcolSGL74CMEInFkVla9rr70h5KjnFszNjqMKv1z8 hDohF53XDWhcCuQc31i8dbpatTIZ6a2o+BkJ+VLLPA4d9bF3qZQF39PD075+rF4CYtBK Jgzw== X-Gm-Message-State: ACrzQf3gEBso3pgI4v0jl+Yyr6MOX8cyz7DebFEOP50DFIFULfUBPNlP H1Qv3G2TtehxAYt2GtMg7V5BR6XV87c= X-Google-Smtp-Source: AMsMyM5VifQcLjYvRsvN22ZhJYCUjDF45q1Yc4NRfS852ygJn8Vrb8nVL2KxL2ZHrKcQi/jdMnCALg== X-Received: by 2002:a05:6402:1013:b0:448:dc53:752e with SMTP id c19-20020a056402101300b00448dc53752emr370718edu.30.1663255562959; Thu, 15 Sep 2022 08:26:02 -0700 (PDT) Received: from localhost.localdomain (dynamic-077-191-182-143.77.191.pool.telefonica.de. [77.191.182.143]) by smtp.gmail.com with ESMTPSA id 2-20020a170906210200b00730979f568fsm9297138ejt.150.2022.09.15.08.26.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 08:26:02 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org, Bin Meng , qemu-ppc@nongnu.org, Bernhard Beschow Subject: [PATCH 08/11] hw/sd/sdhci-internal: Unexport ESDHC defines Date: Thu, 15 Sep 2022 17:25:17 +0200 Message-Id: <20220915152520.21948-9-shentey@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220915152520.21948-1-shentey@gmail.com> References: <20220915152520.21948-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=shentey@gmail.com; helo=mail-ed1-x536.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-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" These defines aren't used outside of sdhci.c, so can be defined there. Signed-off-by: Bernhard Beschow Reviewed-by: Bin Meng Reviewed-by: Philippe Mathieu-Daudé --- hw/sd/sdhci-internal.h | 20 -------------------- hw/sd/sdhci.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index e8c753d6d1..964570f8e8 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -288,26 +288,6 @@ enum { extern const VMStateDescription sdhci_vmstate; - -#define ESDHC_MIX_CTRL 0x48 - -#define ESDHC_VENDOR_SPEC 0xc0 -#define ESDHC_IMX_FRC_SDCLK_ON (1 << 8) - -#define ESDHC_DLL_CTRL 0x60 - -#define ESDHC_TUNING_CTRL 0xcc -#define ESDHC_TUNE_CTRL_STATUS 0x68 -#define ESDHC_WTMK_LVL 0x44 - -/* Undocumented register used by guests working around erratum ERR004536 */ -#define ESDHC_UNDOCUMENTED_REG27 0x6c - -#define ESDHC_CTRL_4BITBUS (0x1 << 1) -#define ESDHC_CTRL_8BITBUS (0x2 << 1) - -#define ESDHC_PRNSTS_SDSTB (1 << 3) - /* * Default SD/MMC host controller features information, which will be * presented in CAPABILITIES register of generic SD host controller at reset. diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 0e5e988927..6da5e2c781 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1577,6 +1577,25 @@ static const TypeInfo sdhci_bus_info = { /* --- qdev i.MX eSDHC --- */ +#define ESDHC_MIX_CTRL 0x48 + +#define ESDHC_VENDOR_SPEC 0xc0 +#define ESDHC_IMX_FRC_SDCLK_ON (1 << 8) + +#define ESDHC_DLL_CTRL 0x60 + +#define ESDHC_TUNING_CTRL 0xcc +#define ESDHC_TUNE_CTRL_STATUS 0x68 +#define ESDHC_WTMK_LVL 0x44 + +/* Undocumented register used by guests working around erratum ERR004536 */ +#define ESDHC_UNDOCUMENTED_REG27 0x6c + +#define ESDHC_CTRL_4BITBUS (0x1 << 1) +#define ESDHC_CTRL_8BITBUS (0x2 << 1) + +#define ESDHC_PRNSTS_SDSTB (1 << 3) + static uint64_t usdhc_read(void *opaque, hwaddr offset, unsigned size) { SDHCIState *s = SYSBUS_SDHCI(opaque);