From: Christoph Hellwig <hch@lst.de>
To: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: linux-arch@vger.kernel.org, linux-mips@linux-mips.org,
linux-kbuild@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org,
Dominik Brodowski <linux@dominikbrodowski.net>,
Alexandre Bounine <alex.bou9@gmail.com>,
linux-alpha@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/9] MIPS: remove the HT_PCI config option
Date: Thu, 15 Nov 2018 20:05:31 +0100 [thread overview]
Message-ID: <20181115190538.17016-4-hch@lst.de> (raw)
In-Reply-To: <20181115190538.17016-1-hch@lst.de>
This option is always selected from LOONGSON_MACH3X. Switch to just
seleting PCI from that option and definining LOONGSON_PCIIO_BASE based
on CONFIG_LOONGSON_MACH3X.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/mips/Kconfig | 11 -----------
arch/mips/include/asm/mach-loongson64/loongson.h | 2 +-
arch/mips/loongson64/Kconfig | 2 +-
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 8272ea4c7264..7d28c9dd75d0 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3040,17 +3040,6 @@ config PCI
your box. Other bus systems are ISA, EISA, or VESA. If you have PCI,
say Y, otherwise N.
-config HT_PCI
- bool "Support for HT-linked PCI"
- default y
- depends on CPU_LOONGSON3
- select PCI
- select PCI_DOMAINS
- help
- Loongson family machines use Hyper-Transport bus for inter-core
- connection and device connection. The PCI bus is a subordinate
- linked at HT. Choose Y for Loongson-3 based machines.
-
config PCI_DOMAINS
bool
diff --git a/arch/mips/include/asm/mach-loongson64/loongson.h b/arch/mips/include/asm/mach-loongson64/loongson.h
index d0ae5d55413b..b6870fec0f99 100644
--- a/arch/mips/include/asm/mach-loongson64/loongson.h
+++ b/arch/mips/include/asm/mach-loongson64/loongson.h
@@ -113,7 +113,7 @@ static inline void do_perfcnt_IRQ(void)
#define LOONGSON_PCICFG_SIZE 0x00000800 /* 2K */
#define LOONGSON_PCICFG_TOP (LOONGSON_PCICFG_BASE+LOONGSON_PCICFG_SIZE-1)
-#if defined(CONFIG_HT_PCI)
+#ifdef CONFIG_CPU_LOONGSON3
#define LOONGSON_PCIIO_BASE loongson_sysconf.pci_io_base
#else
#define LOONGSON_PCIIO_BASE 0x1fd00000
diff --git a/arch/mips/loongson64/Kconfig b/arch/mips/loongson64/Kconfig
index c865b4b9b775..781a5156ab21 100644
--- a/arch/mips/loongson64/Kconfig
+++ b/arch/mips/loongson64/Kconfig
@@ -76,7 +76,7 @@ config LOONGSON_MACH3X
select CPU_HAS_WB
select HW_HAS_PCI
select ISA
- select HT_PCI
+ select PCI
select I8259
select IRQ_MIPS_CPU
select NR_CPUS_DEFAULT_4
--
2.19.1
next prev parent reply other threads:[~2018-11-15 19:09 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-15 19:05 move bus (PCI, PCMCIA, EISA, rapdio) config to drivers/ v4 Christoph Hellwig
2018-11-15 19:05 ` [PATCH 1/9] arm: remove EISA kconfig option Christoph Hellwig
2018-11-23 2:38 ` Masahiro Yamada
2018-11-15 19:05 ` [PATCH 2/9] alpha: force PCI on for non-jensen configs Christoph Hellwig
2018-11-23 2:38 ` Masahiro Yamada
2018-11-15 19:05 ` Christoph Hellwig [this message]
2018-11-19 21:01 ` [PATCH 3/9] MIPS: remove the HT_PCI config option Paul Burton
2018-11-19 21:05 ` Paul Burton
2018-11-23 2:37 ` Masahiro Yamada
2018-11-15 19:05 ` [PATCH 4/9] PCI: consolidate PCI config entry in drivers/pci Christoph Hellwig
2018-11-16 9:10 ` Geert Uytterhoeven
2018-11-19 21:13 ` Paul Burton
2018-11-15 19:05 ` [PATCH 5/9] PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC config options Christoph Hellwig
2018-11-23 2:41 ` Masahiro Yamada
2018-11-15 19:05 ` [PATCH 6/9] PCI: consolidate the PCI_SYSCALL symbol Christoph Hellwig
2018-11-15 19:05 ` [PATCH 7/9] pcmcia: allow PCMCIA support independent of the architecture Christoph Hellwig
2018-11-15 19:05 ` [PATCH 8/9] rapidio: consolidate RAPIDIO config entry in drivers/rapidio Christoph Hellwig
2018-11-15 19:05 ` [PATCH 9/9] eisa: consolidate EISA Kconfig entry in drivers/eisa Christoph Hellwig
2018-11-23 2:34 ` Masahiro Yamada
2018-11-23 2:32 ` move bus (PCI, PCMCIA, EISA, rapdio) config to drivers/ v4 Masahiro Yamada
2018-11-23 2:36 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181115190538.17016-4-hch@lst.de \
--to=hch@lst.de \
--cc=alex.bou9@gmail.com \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).