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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DFCE4C433F5 for ; Sat, 22 Jan 2022 12:53:45 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0423C834B1; Sat, 22 Jan 2022 13:53:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="k5lMOnEJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 82F8983065; Sat, 22 Jan 2022 13:53:37 +0100 (CET) Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 162D1834B1 for ; Sat, 22 Jan 2022 13:53:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd32.google.com with SMTP id f24so14040572ioc.0 for ; Sat, 22 Jan 2022 04:53:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=txEl4WnINKnAFTnKvNq2xL7WPQd/PdBOvqQ1+7jgtdY=; b=k5lMOnEJjm2jcxAq9uTmue5ct59JyfCenmX5Y0wMnPUG7yclfZpwJeYX6S6T2S67bJ 34uzyYRjIdqLDyUiMXzoDhifmABA10hodYYo9ZoRL9Hlz4oErsYNvUjBw0Pm7uq32NYC Izo+SleFwiqx3ASZXXCbMT2biY5nVeBOczv+Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=txEl4WnINKnAFTnKvNq2xL7WPQd/PdBOvqQ1+7jgtdY=; b=Q4JeqLH92Kig6YN2xlLaCrD2QA4GZkrX3iJfmZG6JNWu5PFTexMQkQIflSzNNX7GhJ 3PLY/rsFW/8PMSXU1XgB/PoDifTCJxnwVfI0q4IlinjsRhzeEkX7dy0qdd8NrDZxG9Vd NgBJXUnzPFKWI63p5od4DacSlmSytohepiLSWQhJ1HRN3XJ823PzYRaX5OC2upWxPN0e LdvPdKXOErVYst14t6o5Ukcsv05v3KzgosQ84V3gquAb0GK9xf7H5olmsO/XjtKRwI3r ce49XDzgL29qMZhEEcGxmhP/65op/5tcl1aP22i82StJ+TQO0o3IwOG0B9K35gefjLmE 43hw== X-Gm-Message-State: AOAM530Gv78fANptJH1SbRHK7LC6xA1tY0PIpNs/id17lOsW751OejPh n+MPagczzJOev1OljYnLz8p3hQ4dZPgKzg== X-Google-Smtp-Source: ABdhPJx1V+vWYCIyk7cEujXAmNe55pT0XdW181kGVEagVpALP4W8IKmnLucPolia/wDLYNR5MRWJqg== X-Received: by 2002:a05:6638:d6:: with SMTP id w22mr3692005jao.180.1642856011665; Sat, 22 Jan 2022 04:53:31 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id 9sm3811720ilx.53.2022.01.22.04.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jan 2022 04:53:31 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Patrick Delaunay , Rasmus Villemoes , Reinoud Zandijk , Stefan Roese Subject: [PATCH 1/3] ide: Drop CONFIG_IDE_AHB Date: Sat, 22 Jan 2022 05:53:23 -0700 Message-Id: <20220122125326.2835665-2-sjg@chromium.org> X-Mailer: git-send-email 2.35.0.rc0.227.g00780c9af4-goog In-Reply-To: <20220122125326.2835665-1-sjg@chromium.org> References: <20220122125326.2835665-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean This is not used in U-Boot anymore. Drop it. Signed-off-by: Simon Glass --- README | 8 -------- drivers/block/ide.c | 22 ---------------------- include/ide.h | 7 ------- 3 files changed, 37 deletions(-) diff --git a/README b/README index 9ebd4f2345a..4cad8f8356c 100644 --- a/README +++ b/README @@ -2393,14 +2393,6 @@ Low Level (hardware related) configuration options: If this macro is defined, then CONFIG_SYS_CCSRBAR_PHYS will be forced to a value that ensures that CCSR is not relocated. -- CONFIG_IDE_AHB: - Most IDE controllers were designed to be connected with PCI - interface. Only few of them were designed for AHB interface. - When software is doing ATA command and data transfer to - IDE devices through IDE-AHB controller, some additional - registers accessing to these kind of IDE-AHB controller - is required. - - CONFIG_SYS_IMMR: Physical address of the Internal Memory. DO NOT CHANGE unless you know exactly what you're doing! (11-4) [MPC8xx systems only] diff --git a/drivers/block/ide.c b/drivers/block/ide.c index 085aa356fee..63c4cfdc1c2 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -676,28 +676,14 @@ __weak void ide_outb(int dev, int port, unsigned char val) debug("ide_outb (dev= %d, port= 0x%x, val= 0x%02x) : @ 0x%08lx\n", dev, port, val, ATA_CURR_BASE(dev) + port); -#if defined(CONFIG_IDE_AHB) - if (port) { - /* write command */ - ide_write_register(dev, port, val); - } else { - /* write data */ - outb(val, (ATA_CURR_BASE(dev))); - } -#else outb(val, ATA_CURR_BASE(dev) + port); -#endif } __weak unsigned char ide_inb(int dev, int port) { uchar val; -#if defined(CONFIG_IDE_AHB) - val = ide_read_register(dev, port); -#else val = inb(ATA_CURR_BASE(dev) + port); -#endif debug("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n", dev, port, ATA_CURR_BASE(dev) + port, val); @@ -824,9 +810,6 @@ __weak void ide_input_swap_data(int dev, ulong *sect_buf, int words) __weak void ide_output_data(int dev, const ulong *sect_buf, int words) { -#if defined(CONFIG_IDE_AHB) - ide_write_data(dev, sect_buf, words); -#else uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG); ushort *dbuf; @@ -837,14 +820,10 @@ __weak void ide_output_data(int dev, const ulong *sect_buf, int words) EIEIO; outw(cpu_to_le16(*dbuf++), paddr); } -#endif /* CONFIG_IDE_AHB */ } __weak void ide_input_data(int dev, ulong *sect_buf, int words) { -#if defined(CONFIG_IDE_AHB) - ide_read_data(dev, sect_buf, words); -#else uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG); ushort *dbuf; @@ -858,7 +837,6 @@ __weak void ide_input_data(int dev, ulong *sect_buf, int words) EIEIO; *dbuf++ = le16_to_cpu(inw(paddr)); } -#endif /* CONFIG_IDE_AHB */ } #ifdef CONFIG_BLK diff --git a/include/ide.h b/include/ide.h index 60739436e9f..2994b7a7622 100644 --- a/include/ide.h +++ b/include/ide.h @@ -41,13 +41,6 @@ int ide_preinit(void); int ide_device_present(int dev); #endif -#if defined(CONFIG_IDE_AHB) -unsigned char ide_read_register(int dev, unsigned int port); -void ide_write_register(int dev, unsigned int port, unsigned char val); -void ide_read_data(int dev, ulong *sect_buf, int words); -void ide_write_data(int dev, const ulong *sect_buf, int words); -#endif - /* * I/O function overrides */ -- 2.35.0.rc0.227.g00780c9af4-goog