From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Tue, 27 Jun 2017 16:49:13 +0200 Subject: [U-Boot] [PATCH 1/2] drivers, block: remove sil680 driver In-Reply-To: <1498574954-22963-1-git-send-email-hs@denx.de> References: <1498574954-22963-1-git-send-email-hs@denx.de> Message-ID: <1498574954-22963-2-git-send-email-hs@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de driver is not used anymore, so remove it. Signed-off-by: Heiko Schocher --- drivers/block/Makefile | 1 - drivers/block/sil680.c | 89 -------------------------------------------- scripts/config_whitelist.txt | 1 - 3 files changed, 91 deletions(-) delete mode 100644 drivers/block/sil680.c diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 0645096..adea6c6 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -27,7 +27,6 @@ obj-$(CONFIG_SATA_DWC) += sata_dwc.o obj-$(CONFIG_SATA_MV) += sata_mv.o obj-$(CONFIG_SATA_SIL3114) += sata_sil3114.o obj-$(CONFIG_SATA_SIL) += sata_sil.o -obj-$(CONFIG_IDE_SIL680) += sil680.o obj-$(CONFIG_SANDBOX) += sandbox.o sandbox_scsi.o sata_sandbox.o obj-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o obj-$(CONFIG_SYSTEMACE) += systemace.o diff --git a/drivers/block/sil680.c b/drivers/block/sil680.c deleted file mode 100644 index bca3397..0000000 --- a/drivers/block/sil680.c +++ /dev/null @@ -1,89 +0,0 @@ -/* - * (C) Copyright 2007 - * Gary Jennejohn, DENX Software Engineering, garyj at denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ -/* sil680.c - ide support functions for the Sil0680A controller */ - -/* - * The following parameters must be defined in the configuration file - * of the target board: - * - * #define CONFIG_IDE_SIL680 - * - * #define CONFIG_PCI_PNP - * NOTE it may also be necessary to define this if the default of 8 is - * incorrect for the target board (e.g. the sequoia board requires 0). - * #define CONFIG_SYS_PCI_CACHE_LINE_SIZE 0 - * - * #define CONFIG_IDE - * #undef CONFIG_IDE_LED - * #undef CONFIG_IDE_RESET - * #define CONFIG_IDE_PREINIT - * #define CONFIG_SYS_IDE_MAXBUS 2 - modify to suit - * #define CONFIG_SYS_IDE_MAXDEVICE (CONFIG_SYS_IDE_MAXBUS*2) - modify to suit - * #define CONFIG_SYS_ATA_BASE_ADDR 0 - * #define CONFIG_SYS_ATA_IDE0_OFFSET 0 - * #define CONFIG_SYS_ATA_IDE1_OFFSET 0 - * #define CONFIG_SYS_ATA_DATA_OFFSET 0 - * #define CONFIG_SYS_ATA_REG_OFFSET 0 - * #define CONFIG_SYS_ATA_ALT_OFFSET 0x0004 - * - * The mapping for PCI IO-space. - * NOTE this is the value for the sequoia board. Modify to suit. - * #define CONFIG_SYS_PCI0_IO_SPACE 0xE8000000 - */ - -#include -#include -#include -#include - -extern ulong ide_bus_offset[CONFIG_SYS_IDE_MAXBUS]; - -int ide_preinit (void) -{ - int status; - pci_dev_t devbusfn; - int l; - - status = 1; - for (l = 0; l < CONFIG_SYS_IDE_MAXBUS; l++) { - ide_bus_offset[l] = -ATA_STATUS; - } - devbusfn = pci_find_device (0x1095, 0x0680, 0); - if (devbusfn != -1) { - status = 0; - - pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0, - (u32 *) &ide_bus_offset[0]); - ide_bus_offset[0] &= 0xfffffff8; - ide_bus_offset[0] += CONFIG_SYS_PCI0_IO_SPACE; - pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_2, - (u32 *) &ide_bus_offset[1]); - ide_bus_offset[1] &= 0xfffffff8; - ide_bus_offset[1] += CONFIG_SYS_PCI0_IO_SPACE; - /* init various things - taken from the Linux driver */ - /* set PIO mode */ - pci_write_config_byte(devbusfn, 0x80, 0x00); - pci_write_config_byte(devbusfn, 0x84, 0x00); - /* IDE0 */ - pci_write_config_byte(devbusfn, 0xA1, 0x02); - pci_write_config_word(devbusfn, 0xA2, 0x328A); - pci_write_config_dword(devbusfn, 0xA4, 0x62DD62DD); - pci_write_config_dword(devbusfn, 0xA8, 0x43924392); - pci_write_config_dword(devbusfn, 0xAC, 0x40094009); - /* IDE1 */ - pci_write_config_byte(devbusfn, 0xB1, 0x02); - pci_write_config_word(devbusfn, 0xB2, 0x328A); - pci_write_config_dword(devbusfn, 0xB4, 0x62DD62DD); - pci_write_config_dword(devbusfn, 0xB8, 0x43924392); - pci_write_config_dword(devbusfn, 0xBC, 0x40094009); - } - return (status); -} - -void ide_set_reset (int flag) { - return; -} diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index feb430f..c1f1293 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1233,7 +1233,6 @@ CONFIG_IDE_PREINIT CONFIG_IDE_REG_CS CONFIG_IDE_RESET CONFIG_IDE_RESET_ROUTINE -CONFIG_IDE_SIL680 CONFIG_IDE_SWAP_IO CONFIG_IDS8313 CONFIG_IDT8T49N222A -- 2.7.4