From patchwork Tue Oct 30 16:57:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?=C5=81ukasz_Majewski?= X-Patchwork-Id: 195548 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 346382C00AA for ; Wed, 31 Oct 2012 04:00:51 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D1EDC4A385; Tue, 30 Oct 2012 17:59:54 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 27rpuZIuYLy1; Tue, 30 Oct 2012 17:59:54 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E00764A20A; Tue, 30 Oct 2012 17:58:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B5C024A16B for ; Tue, 30 Oct 2012 17:58:38 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gl3jb0AhxqUw for ; Tue, 30 Oct 2012 17:58:36 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by theia.denx.de (Postfix) with ESMTP id 324D64A156 for ; Tue, 30 Oct 2012 17:58:06 +0100 (CET) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MCP00E6JTRI7J70@mailout2.samsung.com> for u-boot@lists.denx.de; Wed, 31 Oct 2012 01:58:02 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-85-5090071a3b96 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 66.C2.12699.A1700905; Wed, 31 Oct 2012 01:58:02 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MCP009BOTRPFA00@mmp2.samsung.com> for u-boot@lists.denx.de; Wed, 31 Oct 2012 01:58:02 +0900 (KST) From: Lukasz Majewski To: u-boot@lists.denx.de Date: Tue, 30 Oct 2012 17:57:03 +0100 Message-id: <1351616239-21079-9-git-send-email-l.majewski@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1351616239-21079-1-git-send-email-l.majewski@samsung.com> References: <1351616239-21079-1-git-send-email-l.majewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrEJMWRmVeSWpSXmKPExsVy+t9jQV0p9gkBBn2nzCze7u1kd2D0OHtn B2MAYxSXTUpqTmZZapG+XQJXxpHnixkLLhpVrOpmb2DcqtXFyMkhIWAi0bl+AguELSZx4d56 ti5GLg4hgemMEm07J0E5i5kkfn36xwpSxSagJ/H57lMmEFtEQELiV/9VRpAiZoEdjBLNJ8+y gSSEBUIlrj9eywhiswioSuxu/AvWzCvgJrG28TMrxDp5iaf3+4DqOTg4Bdwltq3OBwkLAZW8 /n6NfQIj7wJGhlWMoqkFyQXFSem5RnrFibnFpXnpesn5uZsYwT5/Jr2DcVWDxSFGAQ5GJR5e g3/9AUKsiWXFlbmHGCU4mJVEeJf8BgrxpiRWVqUW5ccXleakFh9ilOZgURLnbfZICRASSE8s Sc1OTS1ILYLJMnFwSjUwams1LTbXP5x5PedTfk9TwpQrAb5Lry9obBebOKU6ke3wpe95hVdm mTKZqLGXvPpsc+/OwrsnZNaxn712UXa6Vk3ASvWlu1/88zUMuW9Yr+hVERf0b53zXNG07+9V I46ycPlYWj2PtpN8fywzfrmOdotkueuiayLL7hbzxR8/kTmfbV1DpoulEktxRqKhFnNRcSIA uzRMU/UBAAA= Cc: Tom Rini , Kyungmin Park Subject: [U-Boot] [PATCH v4 08/24] pmic: Move pmic related code to ./drivers/power directory X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The PMIC framework has been moved to its more natural place ./drivers/power from ./drivers/misc directory. Signed-off-by: Lukasz Majewski Signed-off-by: Kyungmin Park --- 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 --- 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/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 diff --git a/Makefile b/Makefile index d385467..f53f6ad 100644 --- a/Makefile +++ b/Makefile @@ -292,7 +292,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 +# +# 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 + +########################################################################