-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
16 changed files
with
85 additions
and
166 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,28 +27,22 @@ Functionally sort of complete patch. Enough for production for now. | |
create mode 100644 drivers/staging/n821-cpld/cpld_psu.c | ||
create mode 100644 drivers/staging/n821-cpld/mdio-i2c-gen.c | ||
|
||
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig | ||
index e03627ad4460..ea84ef8c9e2d 100644 | ||
--- a/drivers/staging/Kconfig | ||
+++ b/drivers/staging/Kconfig | ||
@@ -80,4 +80,6 @@ source "drivers/staging/qlge/Kconfig" | ||
@@ -78,4 +78,6 @@ source "drivers/staging/qlge/Kconfig" | ||
|
||
source "drivers/vme_user/Kconfig" | ||
source "drivers/staging/vme_user/Kconfig" | ||
|
||
+source "drivers/staging/n821-cpld/Kconfig" | ||
+ | ||
endif # STAGING | ||
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile | ||
index c7f8d8d8dd11..efeda9bf2243 100644 | ||
--- a/drivers/staging/Makefile | ||
+++ b/drivers/staging/Makefile | ||
@@ -30,2 +30,3 @@ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/ | ||
@@ -28,3 +28,4 @@ obj-$(CONFIG_PI433) += pi433/ | ||
obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/ | ||
obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ | ||
obj-$(CONFIG_QLGE) += qlge/ | ||
+obj-$(CONFIG_N821_CPLD) += n821-cpld/ | ||
diff --git a/drivers/staging/n821-cpld/Kconfig b/drivers/staging/n821-cpld/Kconfig | ||
new file mode 100644 | ||
index 000000000000..1db74863f66d | ||
--- /dev/null | ||
+++ b/drivers/staging/n821-cpld/Kconfig | ||
@@ -0,0 +1,58 @@ | ||
|
@@ -110,9 +104,6 @@ index 000000000000..1db74863f66d | |
+ | ||
+ To compile this driver as a module, choose M here. The module | ||
+ will be called n821-cpld-psu. | ||
diff --git a/drivers/staging/n821-cpld/Makefile b/drivers/staging/n821-cpld/Makefile | ||
new file mode 100644 | ||
index 000000000000..a41ce015901f | ||
--- /dev/null | ||
+++ b/drivers/staging/n821-cpld/Makefile | ||
@@ -0,0 +1,16 @@ | ||
|
@@ -132,9 +123,6 @@ index 000000000000..a41ce015901f | |
+n821-cpld-fan-objs := cpld_fan.o | ||
+n821-cpld-psu-objs := cpld_psu.o | ||
+n821-cpld-gpio-objs := cpld_gpio.o | ||
diff --git a/drivers/staging/n821-cpld/cpld.h b/drivers/staging/n821-cpld/cpld.h | ||
new file mode 100644 | ||
index 000000000000..3053994cdc2f | ||
--- /dev/null | ||
+++ b/drivers/staging/n821-cpld/cpld.h | ||
@@ -0,0 +1,28 @@ | ||
|
@@ -166,9 +154,6 @@ index 000000000000..3053994cdc2f | |
+}; | ||
+ | ||
+#endif | ||
diff --git a/drivers/staging/n821-cpld/cpld_core.c b/drivers/staging/n821-cpld/cpld_core.c | ||
new file mode 100644 | ||
index 000000000000..81c6372244e9 | ||
--- /dev/null | ||
+++ b/drivers/staging/n821-cpld/cpld_core.c | ||
@@ -0,0 +1,154 @@ | ||
|
@@ -326,9 +311,6 @@ index 000000000000..81c6372244e9 | |
+MODULE_DESCRIPTION("Niagara 821 CPLD driver"); | ||
+MODULE_AUTHOR("Christian Svensson <[email protected]>"); | ||
+MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/staging/n821-cpld/cpld_fan.c b/drivers/staging/n821-cpld/cpld_fan.c | ||
new file mode 100644 | ||
index 000000000000..44e99580ccd7 | ||
--- /dev/null | ||
+++ b/drivers/staging/n821-cpld/cpld_fan.c | ||
@@ -0,0 +1,116 @@ | ||
|
@@ -448,9 +430,6 @@ index 000000000000..44e99580ccd7 | |
+MODULE_DESCRIPTION("Niagara 821 CPLD fan driver"); | ||
+MODULE_AUTHOR("Christian Svensson <[email protected]>"); | ||
+MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/staging/n821-cpld/cpld_gpio.c b/drivers/staging/n821-cpld/cpld_gpio.c | ||
new file mode 100644 | ||
index 000000000000..c63f6233ba6a | ||
--- /dev/null | ||
+++ b/drivers/staging/n821-cpld/cpld_gpio.c | ||
@@ -0,0 +1,167 @@ | ||
|
@@ -621,9 +600,6 @@ index 000000000000..c63f6233ba6a | |
+MODULE_DESCRIPTION("Niagara 821 CPLD GPIO driver"); | ||
+MODULE_AUTHOR("Christian Svensson <[email protected]>"); | ||
+MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/staging/n821-cpld/cpld_i2c.c b/drivers/staging/n821-cpld/cpld_i2c.c | ||
new file mode 100644 | ||
index 000000000000..bbd32eefbba4 | ||
--- /dev/null | ||
+++ b/drivers/staging/n821-cpld/cpld_i2c.c | ||
@@ -0,0 +1,266 @@ | ||
|
@@ -893,9 +869,6 @@ index 000000000000..bbd32eefbba4 | |
+MODULE_DESCRIPTION("Niagara 821 CPLD I2C driver"); | ||
+MODULE_AUTHOR("Christian Svensson <[email protected]>"); | ||
+MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/staging/n821-cpld/cpld_psu.c b/drivers/staging/n821-cpld/cpld_psu.c | ||
new file mode 100644 | ||
index 000000000000..1e7f896f217b | ||
--- /dev/null | ||
+++ b/drivers/staging/n821-cpld/cpld_psu.c | ||
@@ -0,0 +1,135 @@ | ||
|
@@ -1034,9 +1007,6 @@ index 000000000000..1e7f896f217b | |
+MODULE_DESCRIPTION("Niagara 821 CPLD psu driver"); | ||
+MODULE_AUTHOR("Christian Svensson <[email protected]>"); | ||
+MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/staging/n821-cpld/mdio-i2c-gen.c b/drivers/staging/n821-cpld/mdio-i2c-gen.c | ||
new file mode 100644 | ||
index 000000000000..64005914ffd2 | ||
--- /dev/null | ||
+++ b/drivers/staging/n821-cpld/mdio-i2c-gen.c | ||
@@ -0,0 +1,92 @@ | ||
|
@@ -1132,6 +1102,3 @@ index 000000000000..64005914ffd2 | |
+MODULE_AUTHOR("Brian Silverman <[email protected]>"); | ||
+MODULE_LICENSE("GPL"); | ||
+MODULE_DESCRIPTION("Generic driver for MDIO bus over I2C"); | ||
-- | ||
2.39.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.