summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-01-18 16:07:33 -0500
committerTom Rini <trini@konsulko.com>2022-01-18 16:07:33 -0500
commit6a685753ce8b6b02b67d64b239143bf19eda63c9 (patch)
tree872c41b62af1a07287b695808c6207f36f29ec53 /include
parent115090ef59ba6a371bed40181af8ceecc5635777 (diff)
parent60435ca4da823e40c4a9c7b4eda3c0b68966f9ee (diff)
downloadu-boot-6a685753ce8b6b02b67d64b239143bf19eda63c9.tar.gz
u-boot-6a685753ce8b6b02b67d64b239143bf19eda63c9.tar.bz2
u-boot-6a685753ce8b6b02b67d64b239143bf19eda63c9.zip
Merge branch '2022-01-18-platform-updates'
- cubieboard7 MMC support, AST2600 MAC support
Diffstat (limited to 'include')
-rw-r--r--include/dt-bindings/power/owl-s700-powergate.h19
-rw-r--r--include/miiphy.h8
2 files changed, 19 insertions, 8 deletions
diff --git a/include/dt-bindings/power/owl-s700-powergate.h b/include/dt-bindings/power/owl-s700-powergate.h
new file mode 100644
index 0000000000..4cf1aefbf0
--- /dev/null
+++ b/include/dt-bindings/power/owl-s700-powergate.h
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Actions Semi S700 SPS
+ *
+ * Copyright (c) 2017 Andreas Färber
+ */
+#ifndef DT_BINDINGS_POWER_OWL_S700_POWERGATE_H
+#define DT_BINDINGS_POWER_OWL_S700_POWERGATE_H
+
+#define S700_PD_VDE 0
+#define S700_PD_VCE_SI 1
+#define S700_PD_USB2_1 2
+#define S700_PD_HDE 3
+#define S700_PD_DMA 4
+#define S700_PD_DS 5
+#define S700_PD_USB3 6
+#define S700_PD_USB2_0 7
+
+#endif
diff --git a/include/miiphy.h b/include/miiphy.h
index 8b77bac01e..77a0035958 100644
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -126,8 +126,6 @@ int bb_miiphy_write(struct mii_dev *miidev, int addr, int devad, int reg,
#define ESTATUS_1000XF 0x8000
#define ESTATUS_1000XH 0x4000
-#ifdef CONFIG_DM_MDIO
-
/**
* struct mdio_perdev_priv - Per-device class data for MDIO DM
*
@@ -185,10 +183,6 @@ struct phy_device *dm_mdio_phy_connect(struct udevice *mdiodev, int phyaddr,
*/
struct phy_device *dm_eth_phy_connect(struct udevice *ethdev);
-#endif
-
-#ifdef CONFIG_DM_MDIO_MUX
-
/* indicates none of the child buses is selected */
#define MDIO_MUX_SELECT_NONE -1
@@ -206,5 +200,3 @@ struct mdio_mux_ops {
#define mdio_mux_get_ops(dev) ((struct mdio_mux_ops *)(dev)->driver->ops)
#endif
-
-#endif