Merge branch 'master' of git://git.denx.de/u-boot-spi

[u-boot] / include / pch.h

diff --git a/include/pch.h b/include/pch.h
index 79f49bd5f673a3c6a454358d5d0a7b799d8b9ffd..73994b8343f72547fb8f555b503f0cdb6f8fe418 100644 (file)
--- a/include/pch.h
+++ b/include/pch.h
@@ -1,19 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2015 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #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)
@@ -21,20 +14,13 @@ enum pch_version {
 /* Operations for the Platform Controller Hub */
 struct pch_ops {
        /**
-        * get_sbase() - get the address of SPI base
+        * get_spi_base() - get the address of SPI base
         *
         * @dev:        PCH device to check
         * @sbasep:     Returns address of SPI base if available, else 0
         * @return 0 if OK, -ve on error (e.g. there is no SPI base)
         */
-       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);
+       int (*get_spi_base)(struct udevice *dev, ulong *sbasep);
 
        /**
         * set_spi_protect() - set whether SPI flash is protected or not
@@ -45,25 +31,36 @@ struct pch_ops {
         * @return 0 on success, -ENOSYS if not implemented
         */
        int (*set_spi_protect)(struct udevice *dev, bool protect);
+
+       /**
+        * get_gpio_base() - get the address of GPIO base
+        *
+        * @dev:        PCH device to check
+        * @gbasep:     Returns address of GPIO base if available, else 0
+        * @return 0 if OK, -ve on error (e.g. there is no GPIO base)
+        */
+       int (*get_gpio_base)(struct udevice *dev, u32 *gbasep);
+
+       /**
+        * get_io_base() - get the address of IO base
+        *
+        * @dev:        PCH device to check
+        * @iobasep:    Returns address of IO base if available, else 0
+        * @return 0 if OK, -ve on error (e.g. there is no IO base)
+        */
+       int (*get_io_base)(struct udevice *dev, u32 *iobasep);
 };
 
 #define pch_get_ops(dev)        ((struct pch_ops *)(dev)->driver->ops)
 
 /**
- * pch_get_sbase() - get the address of SPI base
+ * pch_get_spi_base() - get the address of SPI base
  *
  * @dev:       PCH device to check
  * @sbasep:    Returns address of SPI base if available, else 0
  * @return 0 if OK, -ve on error (e.g. there is no SPI base)
  */
-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);
+int pch_get_spi_base(struct udevice *dev, ulong *sbasep);
 
 /**
  * set_spi_protect() - set whether SPI flash is protected or not
@@ -75,4 +72,22 @@ enum pch_version pch_get_version(struct udevice *dev);
  */
 int pch_set_spi_protect(struct udevice *dev, bool protect);
 
+/**
+ * pch_get_gpio_base() - get the address of GPIO base
+ *
+ * @dev:       PCH device to check
+ * @gbasep:    Returns address of GPIO base if available, else 0
+ * @return 0 if OK, -ve on error (e.g. there is no GPIO base)
+ */
+int pch_get_gpio_base(struct udevice *dev, u32 *gbasep);
+
+/**
+ * pch_get_io_base() - get the address of IO base
+ *
+ * @dev:       PCH device to check
+ * @iobasep:   Returns address of IO base if available, else 0
+ * @return 0 if OK, -ve on error (e.g. there is no IO base)
+ */
+int pch_get_io_base(struct udevice *dev, u32 *iobasep);
+
 #endif