All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bin Meng <bmeng.cn@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 06/23] dm: pch: Remove pch_get_version op
Date: Mon,  1 Feb 2016 01:40:41 -0800	[thread overview]
Message-ID: <1454319658-17431-7-git-send-email-bmeng.cn@gmail.com> (raw)
In-Reply-To: <1454319658-17431-1-git-send-email-bmeng.cn@gmail.com>

pch_get_version op was only used by the ich spi controller driver,
and does not really provide a good identification of pch controller
so far, since we see plenty of Intel PCH chipsets and one differs
from another a lot, which is not simply either a PCHV_7 or PCHV_9.
Now that ich spi controller driver was updated to not get such info
from pch, the pch_get_version op is useless now.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 arch/x86/cpu/ivybridge/bd82x6x.c |  6 ------
 drivers/pch/pch-uclass.c         | 10 ----------
 drivers/pch/pch7.c               |  6 ------
 drivers/pch/pch9.c               |  6 ------
 include/pch.h                    | 20 --------------------
 5 files changed, 48 deletions(-)

diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c
index 2b172d4..16796de 100644
--- a/arch/x86/cpu/ivybridge/bd82x6x.c
+++ b/arch/x86/cpu/ivybridge/bd82x6x.c
@@ -182,11 +182,6 @@ static int bd82x6x_pch_get_sbase(struct udevice *dev, ulong *sbasep)
 	return 0;
 }
 
-static enum pch_version bd82x6x_pch_get_version(struct udevice *dev)
-{
-	return PCHV_9;
-}
-
 static int bd82x6x_set_spi_protect(struct udevice *dev, bool protect)
 {
 	uint8_t bios_cntl;
@@ -207,7 +202,6 @@ static int bd82x6x_set_spi_protect(struct udevice *dev, bool protect)
 
 static const struct pch_ops bd82x6x_pch_ops = {
 	.get_sbase	= bd82x6x_pch_get_sbase,
-	.get_version	= bd82x6x_pch_get_version,
 	.set_spi_protect = bd82x6x_set_spi_protect,
 };
 
diff --git a/drivers/pch/pch-uclass.c b/drivers/pch/pch-uclass.c
index 4579ed1..cae4f50 100644
--- a/drivers/pch/pch-uclass.c
+++ b/drivers/pch/pch-uclass.c
@@ -23,16 +23,6 @@ int pch_get_sbase(struct udevice *dev, ulong *sbasep)
 	return ops->get_sbase(dev, sbasep);
 }
 
-enum pch_version pch_get_version(struct udevice *dev)
-{
-	struct pch_ops *ops = pch_get_ops(dev);
-
-	if (!ops->get_version)
-		return -ENOSYS;
-
-	return ops->get_version(dev);
-}
-
 int pch_set_spi_protect(struct udevice *dev, bool protect)
 {
 	struct pch_ops *ops = pch_get_ops(dev);
diff --git a/drivers/pch/pch7.c b/drivers/pch/pch7.c
index ef72422..7c6a2ca 100644
--- a/drivers/pch/pch7.c
+++ b/drivers/pch/pch7.c
@@ -22,11 +22,6 @@ static int pch7_get_sbase(struct udevice *dev, ulong *sbasep)
 	return 0;
 }
 
-static enum pch_version pch7_get_version(struct udevice *dev)
-{
-	return PCHV_7;
-}
-
 static int pch7_set_spi_protect(struct udevice *dev, bool protect)
 {
 	uint8_t bios_cntl;
@@ -44,7 +39,6 @@ static int pch7_set_spi_protect(struct udevice *dev, bool protect)
 
 static const struct pch_ops pch7_ops = {
 	.get_sbase	= pch7_get_sbase,
-	.get_version	= pch7_get_version,
 	.set_spi_protect = pch7_set_spi_protect,
 };
 
diff --git a/drivers/pch/pch9.c b/drivers/pch/pch9.c
index 529cb02..27a9fda 100644
--- a/drivers/pch/pch9.c
+++ b/drivers/pch/pch9.c
@@ -20,14 +20,8 @@ static int pch9_get_sbase(struct udevice *dev, ulong *sbasep)
 	return 0;
 }
 
-static enum pch_version pch9_get_version(struct udevice *dev)
-{
-	return PCHV_9;
-}
-
 static const struct pch_ops pch9_ops = {
 	.get_sbase	= pch9_get_sbase,
-	.get_version	= pch9_get_version,
 };
 
 static const struct udevice_id pch9_ids[] = {
diff --git a/include/pch.h b/include/pch.h
index 79f49bd..f3899d8 100644
--- a/include/pch.h
+++ b/include/pch.h
@@ -8,12 +8,6 @@
 #ifndef __pch_h
 #define __pch_h
 
-enum pch_version {
-	PCHV_UNKNOWN,
-	PCHV_7,
-	PCHV_9,
-};
-
 #define PCH_RCBA		0xf0
 
 #define BIOS_CTRL_BIOSWE	BIT(0)
@@ -30,13 +24,6 @@ struct pch_ops {
 	int (*get_sbase)(struct udevice *dev, ulong *sbasep);
 
 	/**
-	 * get_version() - get the PCH version
-	 *
-	 * @return version, or -ENOSYS if unknown
-	 */
-	enum pch_version (*get_version)(struct udevice *dev);
-
-	/**
 	 * set_spi_protect() - set whether SPI flash is protected or not
 	 *
 	 * @dev:	PCH device to adjust
@@ -59,13 +46,6 @@ struct pch_ops {
 int pch_get_sbase(struct udevice *dev, ulong *sbasep);
 
 /**
- * pch_get_version() - get the PCH version
- *
- * @return version, or -ENOSYS if unknown
- */
-enum pch_version pch_get_version(struct udevice *dev);
-
-/**
  * set_spi_protect() - set whether SPI flash is protected or not
  *
  * @dev:	PCH device to adjust
-- 
1.8.2.1

  parent reply	other threads:[~2016-02-01  9:40 UTC|newest]

Thread overview: 83+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-01  9:40 [U-Boot] [PATCH 00/23] x86: Convert to use DM PCI APIs completely Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 01/23] spi: ich: Some clean up Bin Meng
2016-02-01 16:19   ` Simon Glass
2016-02-02 15:54     ` Jagan Teki
2016-02-03  4:32       ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 02/23] spi: ich: Use compatible strings to distinguish controller version Bin Meng
2016-02-01 16:19   ` Simon Glass
2016-02-02 15:55     ` Jagan Teki
2016-02-03  4:32       ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 03/23] spi: ich: Change PCHV_ to ICHV_ Bin Meng
2016-02-01 16:19   ` Simon Glass
2016-02-02 16:01     ` Jagan Teki
2016-02-03  4:32       ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 04/23] x86: tnc: Drop unprotect_spi_flash() Bin Meng
2016-02-01 16:19   ` Simon Glass
2016-02-03  4:32     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 05/23] x86: quark: " Bin Meng
2016-02-01 16:19   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` Bin Meng [this message]
2016-02-01 16:19   ` [U-Boot] [PATCH 06/23] dm: pch: Remove pch_get_version op Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 07/23] dm: pch: Rename get_sbase op to get_spi_base Bin Meng
2016-02-01 16:19   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 08/23] dm: pch: Add get_gpio_base op Bin Meng
2016-02-01 16:19   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 09/23] x86: pch: Implement " Bin Meng
2016-02-01 16:19   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 10/23] dm: pch: Add get_io_base op Bin Meng
2016-02-01 16:19   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 11/23] x86: pch9: Implement " Bin Meng
2016-02-01 16:19   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 12/23] x86: ich6_gpio: Convert to use proper DM API Bin Meng
2016-02-01 16:20   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 13/23] x86: Drop asm/arch/gpio.h Bin Meng
2016-02-01 16:20   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 14/23] x86: minnowmax: Drop io-base property in the pch_pinctrl node Bin Meng
2016-02-01 16:20   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 15/23] x86: irq: Get irq_router's bdf via dm_pci_get_bdf() Bin Meng
2016-02-01 16:20   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 16/23] x86: irq: Move irq_router to a per driver priv Bin Meng
2016-02-01 16:20   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 17/23] x86: irq: Convert to use DM PCI API Bin Meng
2016-02-01 16:20   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 18/23] x86: tnc: Change disable_igd() to have a return value Bin Meng
2016-02-01 16:20   ` Simon Glass
2016-02-03  4:33     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 19/23] x86: tnc: Use DM PCI API in disable_igd() Bin Meng
2016-02-01 16:20   ` Simon Glass
2016-02-03  4:34     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 20/23] x86: tnc: Remove IGD and SDVO devices from driver model Bin Meng
2016-02-01 16:20   ` Simon Glass
2016-02-03  4:34     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 21/23] x86: qemu: Convert to use DM PCI API Bin Meng
2016-02-01 16:20   ` Simon Glass
2016-02-03  4:34     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 22/23] x86: pci: Use DM PCI APIs in pci_assign_irqs() Bin Meng
2016-02-01 16:20   ` Simon Glass
2016-02-03  4:34     ` Bin Meng
2016-02-01  9:40 ` [U-Boot] [PATCH 23/23] x86: pci: Drop legacy PCI APIs Bin Meng
2016-02-01 16:20   ` Simon Glass
2016-02-03  4:34     ` Bin Meng
2016-02-01 16:19 ` [U-Boot] [PATCH 00/23] x86: Convert to use DM PCI APIs completely Simon Glass
2016-02-02  2:25   ` Bin Meng
2016-02-02  3:55     ` Simon Glass
2016-02-02  6:34       ` Bin Meng
2016-02-03  3:30         ` Simon Glass
2016-02-03  3:44           ` Bin Meng
2016-02-04  4:01             ` Simon Glass
2016-02-03  3:37   ` Simon Glass
2016-02-03  3:58     ` Bin Meng
2016-02-04  4:02       ` Simon Glass

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=1454319658-17431-7-git-send-email-bmeng.cn@gmail.com \
    --to=bmeng.cn@gmail.com \
    --cc=u-boot@lists.denx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.