The PMIC framework has been moved to its more natural place ./drivers/power from ./drivers/misc directory.
Signed-off-by: Lukasz Majewski l.majewski@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com --- Changes for v2: - New patch for v2 Changes for v3: - None Changes for v4: - Move PMIC related code (max8997.c and max8998.c) to power/pmic - Define ./power/pmic/libpmic.o library Changes for v5: - None Changes for v6: - None --- Makefile | 3 +- drivers/misc/Makefile | 7 ---- drivers/power/Makefile | 12 +++++-- drivers/power/pmic/Makefile | 48 +++++++++++++++++++++++++++ drivers/{misc => power/pmic}/pmic_max8997.c | 0 drivers/{misc => power/pmic}/pmic_max8998.c | 0 drivers/{misc => power}/pmic_core.c | 0 drivers/{misc => power}/pmic_dialog.c | 0 drivers/{misc => power}/pmic_fsl.c | 0 drivers/{misc => power}/pmic_i2c.c | 0 drivers/{misc => power}/pmic_spi.c | 0 11 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 drivers/power/pmic/Makefile rename drivers/{misc => power/pmic}/pmic_max8997.c (100%) rename drivers/{misc => power/pmic}/pmic_max8998.c (100%) rename drivers/{misc => power}/pmic_core.c (100%) rename drivers/{misc => power}/pmic_dialog.c (100%) rename drivers/{misc => power}/pmic_fsl.c (100%) rename drivers/{misc => power}/pmic_i2c.c (100%) rename drivers/{misc => power}/pmic_spi.c (100%)
diff --git a/Makefile b/Makefile index 9dc89f9..aa8ace8 100644 --- a/Makefile +++ b/Makefile @@ -293,7 +293,8 @@ LIBS-y += drivers/net/libnet.o LIBS-y += drivers/net/phy/libphy.o LIBS-y += drivers/pci/libpci.o LIBS-y += drivers/pcmcia/libpcmcia.o -LIBS-y += drivers/power/libpower.o +LIBS-y += drivers/power/libpower.o \ + drivers/power/pmic/libpmic.o LIBS-y += drivers/spi/libspi.o LIBS-y += drivers/dfu/libdfu.o ifeq ($(CPU),mpc83xx) diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 271463c..cdec88b 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -34,13 +34,6 @@ COBJS-$(CONFIG_NS87308) += ns87308.o COBJS-$(CONFIG_PDSP188x) += pdsp188x.o COBJS-$(CONFIG_STATUS_LED) += status_led.o COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o -COBJS-$(CONFIG_PMIC) += pmic_core.o -COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o -COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o -COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o -COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o -COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o -COBJS-$(CONFIG_PMIC_MAX8997) += pmic_max8997.o
COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 6bf388c..7fc5554 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -23,7 +23,7 @@
include $(TOPDIR)/config.mk
-LIB := $(obj)libpower.o +LIB := $(obj)libpower.o
COBJS-$(CONFIG_FTPMU010_POWER) += ftpmu010.o COBJS-$(CONFIG_TPS6586X_POWER) += tps6586x.o @@ -31,9 +31,15 @@ COBJS-$(CONFIG_TWL4030_POWER) += twl4030.o COBJS-$(CONFIG_TWL6030_POWER) += twl6030.o COBJS-$(CONFIG_TWL6035_POWER) += twl6035.o
+COBJS-$(CONFIG_PMIC) += pmic_core.o +COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o +COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o +COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o +COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o + COBJS := $(COBJS-y) -SRCS := $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS))
all: $(LIB)
diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile new file mode 100644 index 0000000..8ccd6e9 --- /dev/null +++ b/drivers/power/pmic/Makefile @@ -0,0 +1,48 @@ +# +# Copyright (C) 2012 Samsung Electronics +# Lukasz Majewski l.majewski@samsung.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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; either version 2 of +# the License, or (at your option) any later version. +# +# 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., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB := $(obj)libpmic.o + +COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o +COBJS-$(CONFIG_PMIC_MAX8997) += pmic_max8997.o + +COBJS := $(COBJS-y) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +all: $(LIB) + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################## diff --git a/drivers/misc/pmic_max8997.c b/drivers/power/pmic/pmic_max8997.c similarity index 100% rename from drivers/misc/pmic_max8997.c rename to drivers/power/pmic/pmic_max8997.c diff --git a/drivers/misc/pmic_max8998.c b/drivers/power/pmic/pmic_max8998.c similarity index 100% rename from drivers/misc/pmic_max8998.c rename to drivers/power/pmic/pmic_max8998.c diff --git a/drivers/misc/pmic_core.c b/drivers/power/pmic_core.c similarity index 100% rename from drivers/misc/pmic_core.c rename to drivers/power/pmic_core.c diff --git a/drivers/misc/pmic_dialog.c b/drivers/power/pmic_dialog.c similarity index 100% rename from drivers/misc/pmic_dialog.c rename to drivers/power/pmic_dialog.c diff --git a/drivers/misc/pmic_fsl.c b/drivers/power/pmic_fsl.c similarity index 100% rename from drivers/misc/pmic_fsl.c rename to drivers/power/pmic_fsl.c diff --git a/drivers/misc/pmic_i2c.c b/drivers/power/pmic_i2c.c similarity index 100% rename from drivers/misc/pmic_i2c.c rename to drivers/power/pmic_i2c.c diff --git a/drivers/misc/pmic_spi.c b/drivers/power/pmic_spi.c similarity index 100% rename from drivers/misc/pmic_spi.c rename to drivers/power/pmic_spi.c