Fix up Maxim MAX77686 driver

... to fit into the naming convention

Change-Id: I4a7d81c4d6674d001fc831df863bd2343f6c636f
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/2020
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Tested-by: build bot (Jenkins)

10 files changed, 67 insertions, 6 deletions

diff --git a/src/cpu/samsung/exynos5250/power.c b/src/cpu/samsung/exynos5250/power.c
index f8062d158ade..7d294ed90f71 100644
--- a/src/cpu/samsung/exynos5250/power.c
+++ b/src/cpu/samsung/exynos5250/power.c
@@ -29,7 +29,7 @@
 #include <cpu/samsung/exynos5250/power.h>
 #include <cpu/samsung/exynos5250/sysreg.h>
 #include <cpu/samsung/exynos5-common/spl.h>
-#include <drivers/power/max77686.h>
+#include <drivers/maxim/max77686/max77686.h>
 
 static void ps_hold_setup(void)
 {
diff --git a/src/drivers/Kconfig b/src/drivers/Kconfig
index ef38f3455635..897b665bdb6c 100644
--- a/src/drivers/Kconfig
+++ b/src/drivers/Kconfig
@@ -25,6 +25,7 @@ source src/drivers/generic/Kconfig
 source src/drivers/i2c/Kconfig
 source src/drivers/ics/Kconfig
 source src/drivers/ipmi/Kconfig
+source src/drivers/maxim/Kconfig
 source src/drivers/oxford/Kconfig
 if PC80_SYSTEM
 source src/drivers/pc80/Kconfig
diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc
index a02b70548a4c..b2aa0c8416b0 100644
--- a/src/drivers/Makefile.inc
+++ b/src/drivers/Makefile.inc
@@ -22,6 +22,7 @@ subdirs-y += dec
 subdirs-y += emulation
 subdirs-y += generic
 subdirs-y += i2c
+subdirs-y += maxim
 subdirs-y += oxford
 subdirs-y += realtek
 subdirs-y += sil
diff --git a/src/drivers/maxim/Kconfig b/src/drivers/maxim/Kconfig
new file mode 100644
index 000000000000..7d0b0ed8760b
--- /dev/null
+++ b/src/drivers/maxim/Kconfig
@@ -0,0 +1,20 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2012 The Chromium OS Authors.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+source src/drivers/maxim/max77686/Kconfig
diff --git a/src/drivers/maxim/Makefile.inc b/src/drivers/maxim/Makefile.inc
new file mode 100644
index 000000000000..31c3d75dea68
--- /dev/null
+++ b/src/drivers/maxim/Makefile.inc
@@ -0,0 +1,20 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2012 The Chromium OS Authors.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+subdirs-$(CONFIG_DRIVERS_MAXIM_MAX77676) += max77686
diff --git a/src/drivers/maxim/max77686/Kconfig b/src/drivers/maxim/max77686/Kconfig
new file mode 100644
index 000000000000..ada06f6e60b7
--- /dev/null
+++ b/src/drivers/maxim/max77686/Kconfig
@@ -0,0 +1,24 @@
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2012 The ChromiumOS Authors
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+config DRIVER_MAXIM_77686
+	bool
+	default n
+	help
+	  Maxim 77686 power regulator
diff --git a/src/drivers/power/Makefile.inc b/src/drivers/maxim/max77686/Makefile.inc
index 3fc71042d5ce..3fc71042d5ce 100644
--- a/src/drivers/power/Makefile.inc
+++ b/src/drivers/maxim/max77686/Makefile.inc
diff --git a/src/drivers/power/max77686.c b/src/drivers/maxim/max77686/max77686.c
index 8fbcb8fb3152..8fbcb8fb3152 100644
--- a/src/drivers/power/max77686.c
+++ b/src/drivers/maxim/max77686/max77686.c
diff --git a/src/drivers/power/max77686.h b/src/drivers/maxim/max77686/max77686.h
index 345471eb21b4..345471eb21b4 100644
--- a/src/drivers/power/max77686.h
+++ b/src/drivers/maxim/max77686/max77686.h
diff --git a/src/drivers/power/Kconfig b/src/drivers/power/Kconfig
deleted file mode 100644
index 84ace13dbf89..000000000000
--- a/src/drivers/power/Kconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-config DRIVER_MAXIM_77686
-	bool "Maxim 77686"
-	default n
-	help
-	  Maxim 77686 power regulator