From nobody Sun Nov 24 02:30:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1727800891; cv=none; d=zohomail.com; s=zohoarc; b=EULgyWhEEUm5XXayyWboKy7e8zbpSpuOsRa+1izEB1DGKzvaaY3KkiqHw0gdLxe0gyFRszM+rLo61+RFoFvezPL2odOAqSNqXL5rL7FMN5KyRFLHyXPVgZICyg1a2GOQs4wU6tODpgj+qRX61aBQJtomPDlCohutmV0lx/niKJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727800891; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=6+uHLoLXqsNtRgNN+QBAtOWDlDpnmgj31oagsZRP2ws=; b=CgOO/68U912Slh1q3hg5Xs5sD/B/ihN2KTtJ08NLlLST3ou/3K4TV5Z4Jh8vBmu6jQWlPofrzqVhXOEnUAt6sK7e2Xux3yxrk3Ph8Rc8Eeq1Y//UH1p8WUsuGFLDqlJZUUbPTAzbJJS8TRohkSQ9m//+k1o/qEn++bQF6PXZKjg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1727800891428251.02142250611553; Tue, 1 Oct 2024 09:41:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1svfv3-00069m-6z; Tue, 01 Oct 2024 12:40:13 -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 1svfum-0005ip-1T for qemu-devel@nongnu.org; Tue, 01 Oct 2024 12:39:58 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1svfuf-0006Ab-Nj for qemu-devel@nongnu.org; Tue, 01 Oct 2024 12:39:55 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-42cbbb1727eso50900195e9.2 for ; Tue, 01 Oct 2024 09:39:49 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd56e6547sm12243771f8f.58.2024.10.01.09.39.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 09:39:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1727800788; x=1728405588; 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=6+uHLoLXqsNtRgNN+QBAtOWDlDpnmgj31oagsZRP2ws=; b=ENopzfPkR67vS4am3dT2NmQuIQoQKKjiR7oDSZtsbgg4TrmbaGFY8j5oBpuQpCDHvc uKl9AOdxLvuLKPMKEa8y2FkgSmlqxdq5DFElOdZza0QaJDK2mPj441HVwDyNQU3XW7nI 2+pBWwVC9lZJ2x/F7v1ifPFHQzMEKWPkwASwpJH+NVT8sw4m3VS4P5bNgvB252V7lW30 /KLUak75cY2yUN/sj8G0oK9PyrMCXgdogqwwne9PJayERzN5IACKIKVCvoZ3CK+k2D6Z J6vQHS3RJnKyP/IMEAGQMCdDUImMYYhBiQ4rTQRwgUOes4NVLPjfUYFZXb8uQpO0jgaG 0OuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727800788; x=1728405588; 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=6+uHLoLXqsNtRgNN+QBAtOWDlDpnmgj31oagsZRP2ws=; b=EEKl2a8cB1rbUunS/Y0FUl8nicRtlsJWda7KK3RqkUVHP7I7LUN48qyQrVZMKvTG+5 MQYhpOGJFdxUjFOaO5sUZMp5nJYjr4EP4PvZig7qT36CM4nIkDuuP6waxqDXJcb++r9J 1Qi9MrdNhxMbdYxs/rK0jPXLTd1KMIBPbSDMlwVLB9hU4X+/trz0XTyHeElLugobiSnQ 4bGUwtxWESRTwDsp59GuCO+THMtOEb8R4NqtxGtq/83Q1ekdn/4SakBx3Jnak3phT1dm JNF+MfAJBUU6YRPYlX/esARrtKF3obg7AISAMTm95pmSOi3O2X+dXUWNcVqf06l02Fsv k9Fw== X-Gm-Message-State: AOJu0YwV4AhGkwosNeR/2J/8v9CGTHGY/xsWStkH9Hx/W7BZf4RXbo27 V0YrzoSDNFIu2OZOYd7qub1Cb4m7moUW6UAEZZ8TGUESxmFeU2eMGgv8ZrTOTCnSG7lu7/0yyIH V X-Google-Smtp-Source: AGHT+IEkBdE64KcgfX4+eq2xF/+xprahYD5HIau7Pg1xAQ1YBUR8711ajNGDFJADZc8tkh3muZzylw== X-Received: by 2002:a05:600c:3ca9:b0:42c:b843:792b with SMTP id 5b1f17b1804b1-42f777b63b9mr1041745e9.2.1727800788152; Tue, 01 Oct 2024 09:39:48 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 52/54] hw/misc/omap_clk: Remove OMAP2-specifics Date: Tue, 1 Oct 2024 17:39:16 +0100 Message-Id: <20241001163918.1275441-53-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241001163918.1275441-1-peter.maydell@linaro.org> References: <20241001163918.1275441-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1727800892262116600 Content-Type: text/plain; charset="utf-8" Remove the handling for all non-OMAP1 SoCs. Signed-off-by: Peter Maydell Message-id: 20240903160751.4100218-52-peter.maydell@linaro.org --- hw/misc/omap_clk.c | 527 +-------------------------------------------- 1 file changed, 2 insertions(+), 525 deletions(-) diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c index c77ca2fc74e..0157c9be759 100644 --- a/hw/misc/omap_clk.c +++ b/hw/misc/omap_clk.c @@ -35,9 +35,6 @@ struct clk { #define CLOCK_IN_OMAP730 (1 << 11) #define CLOCK_IN_OMAP1510 (1 << 12) #define CLOCK_IN_OMAP16XX (1 << 13) -#define CLOCK_IN_OMAP242X (1 << 14) -#define CLOCK_IN_OMAP243X (1 << 15) -#define CLOCK_IN_OMAP343X (1 << 16) uint32_t flags; int id; =20 @@ -59,8 +56,7 @@ static struct clk xtal_osc12m =3D { static struct clk xtal_osc32k =3D { .name =3D "xtal_osc_32k", .rate =3D 32768, - .flags =3D CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | - CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, + .flags =3D CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, }; =20 static struct clk ck_ref =3D { @@ -507,449 +503,10 @@ static struct clk i2c_ick =3D { static struct clk clk32k =3D { .name =3D "clk32-kHz", .flags =3D CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | - CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | ALWAYS_ENABLED, + ALWAYS_ENABLED, .parent =3D &xtal_osc32k, }; =20 -static struct clk ref_clk =3D { - .name =3D "ref_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | ALWAYS_ENABLED, - .rate =3D 12000000, /* 12 MHz or 13 MHz or 19.2 MHz */ - /*.parent =3D sys.xtalin */ -}; - -static struct clk apll_96m =3D { - .name =3D "apll_96m", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | ALWAYS_ENABLED, - .rate =3D 96000000, - /*.parent =3D ref_clk */ -}; - -static struct clk apll_54m =3D { - .name =3D "apll_54m", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | ALWAYS_ENABLED, - .rate =3D 54000000, - /*.parent =3D ref_clk */ -}; - -static struct clk sys_clk =3D { - .name =3D "sys_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | ALWAYS_ENABLED, - .rate =3D 32768, - /*.parent =3D sys.xtalin */ -}; - -static struct clk sleep_clk =3D { - .name =3D "sleep_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | ALWAYS_ENABLED, - .rate =3D 32768, - /*.parent =3D sys.xtalin */ -}; - -static struct clk dpll_ck =3D { - .name =3D "dpll", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | ALWAYS_ENABLED, - .parent =3D &ref_clk, -}; - -static struct clk dpll_x2_ck =3D { - .name =3D "dpll_x2", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | ALWAYS_ENABLED, - .parent =3D &ref_clk, -}; - -static struct clk wdt1_sys_clk =3D { - .name =3D "wdt1_sys_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | ALWAYS_ENABLED, - .rate =3D 32768, - /*.parent =3D sys.xtalin */ -}; - -static struct clk func_96m_clk =3D { - .name =3D "func_96m_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .divisor =3D 1, - .parent =3D &apll_96m, -}; - -static struct clk func_48m_clk =3D { - .name =3D "func_48m_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .divisor =3D 2, - .parent =3D &apll_96m, -}; - -static struct clk func_12m_clk =3D { - .name =3D "func_12m_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .divisor =3D 8, - .parent =3D &apll_96m, -}; - -static struct clk func_54m_clk =3D { - .name =3D "func_54m_clk", - .flags =3D CLOCK_IN_OMAP242X, - .divisor =3D 1, - .parent =3D &apll_54m, -}; - -static struct clk sys_clkout =3D { - .name =3D "clkout", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk sys_clkout2 =3D { - .name =3D "clkout2", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk core_clk =3D { - .name =3D "core_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &dpll_x2_ck, /* Switchable between dpll_ck and clk32k */ -}; - -static struct clk l3_clk =3D { - .name =3D "l3_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_clk, -}; - -static struct clk core_l4_iclk =3D { - .name =3D "core_l4_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &l3_clk, -}; - -static struct clk wu_l4_iclk =3D { - .name =3D "wu_l4_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &l3_clk, -}; - -static struct clk core_l3_iclk =3D { - .name =3D "core_l3_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_clk, -}; - -static struct clk core_l4_usb_clk =3D { - .name =3D "core_l4_usb_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &l3_clk, -}; - -static struct clk wu_gpt1_clk =3D { - .name =3D "wu_gpt1_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk wu_32k_clk =3D { - .name =3D "wu_32k_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk uart1_fclk =3D { - .name =3D "uart1_fclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &func_48m_clk, -}; - -static struct clk uart1_iclk =3D { - .name =3D "uart1_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_l4_iclk, -}; - -static struct clk uart2_fclk =3D { - .name =3D "uart2_fclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &func_48m_clk, -}; - -static struct clk uart2_iclk =3D { - .name =3D "uart2_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_l4_iclk, -}; - -static struct clk uart3_fclk =3D { - .name =3D "uart3_fclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &func_48m_clk, -}; - -static struct clk uart3_iclk =3D { - .name =3D "uart3_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_l4_iclk, -}; - -static struct clk mpu_fclk =3D { - .name =3D "mpu_fclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_clk, -}; - -static struct clk mpu_iclk =3D { - .name =3D "mpu_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_clk, -}; - -static struct clk int_m_fclk =3D { - .name =3D "int_m_fclk", - .alias =3D "mpu_intc_fclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_clk, -}; - -static struct clk int_m_iclk =3D { - .name =3D "int_m_iclk", - .alias =3D "mpu_intc_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_clk, -}; - -static struct clk core_gpt2_clk =3D { - .name =3D "core_gpt2_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk core_gpt3_clk =3D { - .name =3D "core_gpt3_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk core_gpt4_clk =3D { - .name =3D "core_gpt4_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk core_gpt5_clk =3D { - .name =3D "core_gpt5_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk core_gpt6_clk =3D { - .name =3D "core_gpt6_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk core_gpt7_clk =3D { - .name =3D "core_gpt7_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk core_gpt8_clk =3D { - .name =3D "core_gpt8_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk core_gpt9_clk =3D { - .name =3D "core_gpt9_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk core_gpt10_clk =3D { - .name =3D "core_gpt10_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk core_gpt11_clk =3D { - .name =3D "core_gpt11_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk core_gpt12_clk =3D { - .name =3D "core_gpt12_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, -}; - -static struct clk mcbsp1_clk =3D { - .name =3D "mcbsp1_cg", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .divisor =3D 2, - .parent =3D &func_96m_clk, -}; - -static struct clk mcbsp2_clk =3D { - .name =3D "mcbsp2_cg", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .divisor =3D 2, - .parent =3D &func_96m_clk, -}; - -static struct clk emul_clk =3D { - .name =3D "emul_ck", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &func_54m_clk, -}; - -static struct clk sdma_fclk =3D { - .name =3D "sdma_fclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &l3_clk, -}; - -static struct clk sdma_iclk =3D { - .name =3D "sdma_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_l3_iclk, /* core_l4_iclk for the configuration port = */ -}; - -static struct clk i2c1_fclk =3D { - .name =3D "i2c1.fclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &func_12m_clk, - .divisor =3D 1, -}; - -static struct clk i2c1_iclk =3D { - .name =3D "i2c1.iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_l4_iclk, -}; - -static struct clk i2c2_fclk =3D { - .name =3D "i2c2.fclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &func_12m_clk, - .divisor =3D 1, -}; - -static struct clk i2c2_iclk =3D { - .name =3D "i2c2.iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_l4_iclk, -}; - -static struct clk gpio_dbclk[5] =3D { - { - .name =3D "gpio1_dbclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &wu_32k_clk, - }, { - .name =3D "gpio2_dbclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &wu_32k_clk, - }, { - .name =3D "gpio3_dbclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &wu_32k_clk, - }, { - .name =3D "gpio4_dbclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &wu_32k_clk, - }, { - .name =3D "gpio5_dbclk", - .flags =3D CLOCK_IN_OMAP243X, - .parent =3D &wu_32k_clk, - }, -}; - -static struct clk gpio_iclk =3D { - .name =3D "gpio_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &wu_l4_iclk, -}; - -static struct clk mmc_fck =3D { - .name =3D "mmc_fclk", - .flags =3D CLOCK_IN_OMAP242X, - .parent =3D &func_96m_clk, -}; - -static struct clk mmc_ick =3D { - .name =3D "mmc_iclk", - .flags =3D CLOCK_IN_OMAP242X, - .parent =3D &core_l4_iclk, -}; - -static struct clk spi_fclk[3] =3D { - { - .name =3D "spi1_fclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &func_48m_clk, - }, { - .name =3D "spi2_fclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &func_48m_clk, - }, { - .name =3D "spi3_fclk", - .flags =3D CLOCK_IN_OMAP243X, - .parent =3D &func_48m_clk, - }, -}; - -static struct clk dss_clk[2] =3D { - { - .name =3D "dss_clk1", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_clk, - }, { - .name =3D "dss_clk2", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &sys_clk, - }, -}; - -static struct clk dss_54m_clk =3D { - .name =3D "dss_54m_clk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &func_54m_clk, -}; - -static struct clk dss_l3_iclk =3D { - .name =3D "dss_l3_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_l3_iclk, -}; - -static struct clk dss_l4_iclk =3D { - .name =3D "dss_l4_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_l4_iclk, -}; - -static struct clk spi_iclk[3] =3D { - { - .name =3D "spi1_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_l4_iclk, - }, { - .name =3D "spi2_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - .parent =3D &core_l4_iclk, - }, { - .name =3D "spi3_iclk", - .flags =3D CLOCK_IN_OMAP243X, - .parent =3D &core_l4_iclk, - }, -}; - -static struct clk omapctrl_clk =3D { - .name =3D "omapctrl_iclk", - .flags =3D CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, - /* XXX Should be in WKUP domain */ - .parent =3D &core_l4_iclk, -}; - static struct clk *onchip_clks[] =3D { /* OMAP 1 */ =20 @@ -1019,80 +576,6 @@ static struct clk *onchip_clks[] =3D { &i2c_fck, &i2c_ick, =20 - /* OMAP 2 */ - - &ref_clk, - &apll_96m, - &apll_54m, - &sys_clk, - &sleep_clk, - &dpll_ck, - &dpll_x2_ck, - &wdt1_sys_clk, - &func_96m_clk, - &func_48m_clk, - &func_12m_clk, - &func_54m_clk, - &sys_clkout, - &sys_clkout2, - &core_clk, - &l3_clk, - &core_l4_iclk, - &wu_l4_iclk, - &core_l3_iclk, - &core_l4_usb_clk, - &wu_gpt1_clk, - &wu_32k_clk, - &uart1_fclk, - &uart1_iclk, - &uart2_fclk, - &uart2_iclk, - &uart3_fclk, - &uart3_iclk, - &mpu_fclk, - &mpu_iclk, - &int_m_fclk, - &int_m_iclk, - &core_gpt2_clk, - &core_gpt3_clk, - &core_gpt4_clk, - &core_gpt5_clk, - &core_gpt6_clk, - &core_gpt7_clk, - &core_gpt8_clk, - &core_gpt9_clk, - &core_gpt10_clk, - &core_gpt11_clk, - &core_gpt12_clk, - &mcbsp1_clk, - &mcbsp2_clk, - &emul_clk, - &sdma_fclk, - &sdma_iclk, - &i2c1_fclk, - &i2c1_iclk, - &i2c2_fclk, - &i2c2_iclk, - &gpio_dbclk[0], - &gpio_dbclk[1], - &gpio_dbclk[2], - &gpio_dbclk[3], - &gpio_iclk, - &mmc_fck, - &mmc_ick, - &spi_fclk[0], - &spi_iclk[0], - &spi_fclk[1], - &spi_iclk[1], - &spi_fclk[2], - &spi_iclk[2], - &dss_clk[0], - &dss_clk[1], - &dss_54m_clk, - &dss_l3_iclk, - &dss_l4_iclk, - &omapctrl_clk, - NULL }; =20 @@ -1230,12 +713,6 @@ void omap_clk_init(struct omap_mpu_state_s *mpu) flag =3D CLOCK_IN_OMAP310; else if (cpu_is_omap1510(mpu)) flag =3D CLOCK_IN_OMAP1510; - else if (cpu_is_omap2410(mpu) || cpu_is_omap2420(mpu)) - flag =3D CLOCK_IN_OMAP242X; - else if (cpu_is_omap2430(mpu)) - flag =3D CLOCK_IN_OMAP243X; - else if (cpu_is_omap3430(mpu)) - flag =3D CLOCK_IN_OMAP243X; else return; =20 --=20 2.34.1