From patchwork Sat Sep 2 15:43:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 809100 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vgYuFzag"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xl0gg3q9tz9sQl for ; Sun, 3 Sep 2017 01:40:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 33543C21DC1; Sat, 2 Sep 2017 15:40:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E3FFBC21D19; Sat, 2 Sep 2017 15:39:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AA06FC21E55; Sat, 2 Sep 2017 15:39:36 +0000 (UTC) Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by lists.denx.de (Postfix) with ESMTPS id E058CC21E05 for ; Sat, 2 Sep 2017 15:39:32 +0000 (UTC) Received: by mail-it0-f66.google.com with SMTP id k189so1174259itk.1 for ; Sat, 02 Sep 2017 08:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=J7nXRYllVN9fsWHLt2s9qSVOz/emyPTtJ4ooDvEJl7s=; b=vgYuFzagu5U5gHNyN1vUEOeXS6MNmXnrWnbY5KmBqsnTBQjvXCaQH2A1xED71nnqq+ LtFOsIGi0QYf45VVc84JHE+vVn6I5qk80tZlWoVlVsUjBDP3h2XP2tEB9QixlRJOJUiW N3od/obzE8kD5LpsMWk5buG35xCiCIIDH6KanzI4/tAonlPPzH+whiwO0H8/RQHQqTuA lz4v6h94BeGmJW3dwv1XGzHhw3ATgtvXRsSNTASFps70vE3Bnc3h9n8Q1E8D36LCQXPM H3ONx53geHoaonRWQOnF2/kr+O7jlKeKWZDBK3eDzUZpRAdkPc5bnyhp27YoROs6BghV y1xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=J7nXRYllVN9fsWHLt2s9qSVOz/emyPTtJ4ooDvEJl7s=; b=b2WpLAVfiV7SxvPmS8D98KsrlDN/gKbxtTrIldL3hwEvT1MRILV63YaahFJuSJ12RN ow50k2NlpL4JwTGaYtHpffyaEhxT+81/3dY1n28bbzVy+Eb/ykAE4MO5mekbf10l4Z4O nIcO/o/1iAbOKKbbuQ3wvSkzhmSHl+WBYBG9/6pShsp7TZnwy9BJrJo+11dzXJul+VB9 UhQ5ijY2ZT4MyZYfXakVfTiN81dPCtlcXjboQ8INyUZsnrn/p2iCzvmELGLOAVtaTuVT TmE/VVVlElaK6rEkiibdixwSVA2H8AT2rVWUFgodilsNl/rsYb523Bm/HPuz/gVHQ1Ka 6Wnw== X-Gm-Message-State: AHPjjUiiIcfaS3qshQfBn4kQPlTRkAmgvXwr2r648m/ojjPN3toj9pt1 yhKnCCMYQhpyHBX/ X-Google-Smtp-Source: ADKCNb6+3eEkmdwUPRbVz7P13MW8WorvoAgusLv1oWxBdT0FkuKvhsCs5nB9ZAF4gtr+RagqcvmegQ== X-Received: by 10.36.60.151 with SMTP id m145mr1399093ita.101.1504366771725; Sat, 02 Sep 2017 08:39:31 -0700 (PDT) Received: from ala-d2121-lx1.wrs.com (unknown-156-139.windriver.com. [147.11.156.139]) by smtp.gmail.com with ESMTPSA id x87sm1425596ita.38.2017.09.02.08.39.30 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 02 Sep 2017 08:39:30 -0700 (PDT) From: Bin Meng To: Tom Rini , U-Boot Mailing List Date: Sat, 2 Sep 2017 08:43:53 -0700 Message-Id: <1504367034-1000-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1504367034-1000-1-git-send-email-bmeng.cn@gmail.com> References: <1504367034-1000-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH 2/3] block: ide: Drop CONFIG_IDE_LED X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This is actually not used. Drop it. Signed-off-by: Bin Meng --- drivers/block/ide.c | 46 -------------------------------------------- include/configs/dbau1x00.h | 1 - include/configs/lsxl.h | 1 - include/configs/pb1x00.h | 1 - include/ide.h | 13 ------------- scripts/config_whitelist.txt | 1 - 6 files changed, 63 deletions(-) diff --git a/drivers/block/ide.c b/drivers/block/ide.c index cea0397..ce51153 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -44,12 +44,6 @@ struct blk_desc ide_dev_desc[CONFIG_SYS_IDE_MAXDEVICE]; #define CONFIG_SYS_ATA_PORT_ADDR(port) (port) #endif -#ifndef CONFIG_IDE_LED /* define LED macros, they are not used anyways */ -# define DEVICE_LED(x) 0 -# define LED_IDE1 1 -# define LED_IDE2 2 -#endif - #ifdef CONFIG_IDE_RESET extern void ide_set_reset(int idereset); @@ -217,8 +211,6 @@ unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen, unsigned char c, err, mask, res; int n; - ide_led(DEVICE_LED(device), 1); /* LED on */ - /* Select device */ mask = ATA_STAT_BUSY | ATA_STAT_DRQ; @@ -326,7 +318,6 @@ unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen, err = 0; } AI_OUT: - ide_led(DEVICE_LED(device), 0); /* LED off */ return err; } @@ -560,7 +551,6 @@ static void ide_ident(struct blk_desc *dev_desc) device = dev_desc->devnum; printf(" Device %d: ", device); - ide_led(DEVICE_LED(device), 1); /* LED on */ /* Select device */ ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device)); @@ -600,7 +590,6 @@ static void ide_ident(struct blk_desc *dev_desc) */ c = ide_wait(device, IDE_TIME_OUT); } - ide_led(DEVICE_LED(device), 0); /* LED off */ if (((c & ATA_STAT_DRQ) == 0) || ((c & (ATA_STAT_FAULT | ATA_STAT_ERR)) != 0)) { @@ -716,22 +705,6 @@ static void ide_ident(struct blk_desc *dev_desc) #endif } -__weak void ide_led(uchar led, uchar status) -{ -#if defined(CONFIG_IDE_LED) && defined(PER8_BASE) /* required by LED_PORT */ - static uchar led_buffer; /* Buffer for current LED status */ - - uchar *led_port = LED_PORT; - - if (status) /* switch LED on */ - led_buffer |= led; - else /* switch LED off */ - led_buffer &= ~led; - - *led_port = led_buffer; -#endif -} - __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", @@ -783,12 +756,6 @@ void ide_init(void) WATCHDOG_RESET(); - /* - * Reset the IDE just to be sure. - * Light LED's to show - */ - ide_led((LED_IDE1 | LED_IDE2), 1); /* LED's on */ - /* ATAPI Drives seems to need a proper IDE Reset */ ide_reset(); @@ -818,8 +785,6 @@ void ide_init(void) i++; if (i > (ATA_RESET_TIME * 100)) { puts("** Timeout **\n"); - /* LED's off */ - ide_led((LED_IDE1 | LED_IDE2), 0); return; } if ((i >= 100) && ((i % 100) == 0)) @@ -844,10 +809,7 @@ void ide_init(void) putc('\n'); - ide_led((LED_IDE1 | LED_IDE2), 0); /* LED's off */ - for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; ++i) { - int led = (IDE_BUS(i) == 0) ? LED_IDE1 : LED_IDE2; ide_dev_desc[i].type = DEV_TYPE_UNKNOWN; ide_dev_desc[i].if_type = IF_TYPE_IDE; ide_dev_desc[i].devnum = i; @@ -862,9 +824,7 @@ void ide_init(void) #endif if (!ide_bus_ok[IDE_BUS(i)]) continue; - ide_led(led, 1); /* LED on */ ide_ident(&ide_dev_desc[i]); - ide_led(led, 0); /* LED off */ dev_print(&ide_dev_desc[i]); if ((ide_dev_desc[i].lba > 0) && (ide_dev_desc[i].blksz > 0)) { @@ -987,8 +947,6 @@ ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt, debug("ide_read dev %d start " LBAF ", blocks " LBAF " buffer at %lX\n", device, blknr, blkcnt, (ulong) buffer); - ide_led(DEVICE_LED(device), 1); /* LED on */ - /* Select device */ ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device)); @@ -1086,7 +1044,6 @@ ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt, buffer += ATA_BLOCKSIZE; } IDE_READ_E: - ide_led(DEVICE_LED(device), 0); /* LED off */ return n; } @@ -1114,8 +1071,6 @@ ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt, } #endif - ide_led(DEVICE_LED(device), 1); /* LED on */ - /* Select device */ ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device)); @@ -1179,7 +1134,6 @@ ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt, buffer += ATA_BLOCKSIZE; } WR_OUT: - ide_led(DEVICE_LED(device), 0); /* LED off */ return n; } diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index ce91f10..1207372 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -163,7 +163,6 @@ #define CONFIG_SYS_IDE_MAXBUS 1 /* max. 1 IDE bus */ #define CONFIG_SYS_IDE_MAXDEVICE 1 /* max. 1 drive per IDE bus */ -#undef CONFIG_IDE_LED /* LED for ide not supported */ #undef CONFIG_IDE_RESET /* reset for ide not supported */ #define CONFIG_SYS_ATA_IDE0_OFFSET 0x0000 diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 7cbbe87..5d5851f 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -142,7 +142,6 @@ #endif /* CONFIG_CMD_NET */ #ifdef CONFIG_IDE -#undef CONFIG_IDE_LED #undef CONFIG_SYS_IDE_MAXBUS #define CONFIG_SYS_IDE_MAXBUS 1 #undef CONFIG_SYS_IDE_MAXDEVICE diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index 369e82f..b7e3196 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -115,7 +115,6 @@ #define CONFIG_SYS_IDE_MAXBUS 1 /* max. 1 IDE bus */ #define CONFIG_SYS_IDE_MAXDEVICE 1 /* max. 1 drive per IDE bus */ -#undef CONFIG_IDE_LED /* LED for ide not supported */ #undef CONFIG_IDE_RESET /* reset for ide not supported */ #define CONFIG_SYS_ATA_IDE0_OFFSET 0x0000 diff --git a/include/ide.h b/include/ide.h index a4be763..4d78891 100644 --- a/include/ide.h +++ b/include/ide.h @@ -15,19 +15,6 @@ #define ATA_CURR_BASE(dev) (CONFIG_SYS_ATA_BASE_ADDR+ide_bus_offset[IDE_BUS(dev)]) extern ulong ide_bus_offset[]; -#ifdef CONFIG_IDE_LED - -/* - * LED Port - */ -#define LED_PORT ((uchar *)(PER8_BASE + 0x3000)) -#define LED_IDE1 0x01 -#define LED_IDE2 0x02 -#define DEVICE_LED(d) ((d & 2) | ((d & 2) == 0)) /* depends on bit positions! */ - -void ide_led(uchar led, uchar status); -#endif /* CONFIG_IDE_LED */ - /* * Function Prototypes */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 440f740..2aa23dc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1080,7 +1080,6 @@ CONFIG_I2C_RTC_ADDR CONFIG_I2C_TIMEOUT CONFIG_ICACHE CONFIG_ICS307_REFCLK_HZ -CONFIG_IDE_LED CONFIG_IDE_PCMCIA CONFIG_IDE_PREINIT CONFIG_IDE_REG_CS