From patchwork Fri Jan 10 14:31:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Przemyslaw Marczak X-Patchwork-Id: 309296 X-Patchwork-Delegate: promsoft@gmail.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 C31302C0096 for ; Sat, 11 Jan 2014 01:33:10 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 473284AC3D; Fri, 10 Jan 2014 15:33:08 +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 RlMrSL3pkx7N; Fri, 10 Jan 2014 15:33:07 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4EF1A4AAFE; Fri, 10 Jan 2014 15:32:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BDC734AAB0 for ; Fri, 10 Jan 2014 15:32:41 +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 AR7xbJPfV1yf for ; Fri, 10 Jan 2014 15:32:35 +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 mailout3.w1.samsung.com (mailout3.w1.samsung.com [210.118.77.13]) by theia.denx.de (Postfix) with ESMTPS id 60A404AACB for ; Fri, 10 Jan 2014 15:32:28 +0100 (CET) Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MZ6002HAWE2ES50@mailout3.w1.samsung.com> for u-boot@lists.denx.de; Fri, 10 Jan 2014 14:32:26 +0000 (GMT) X-AuditID: cbfec7f4-b7f796d000005a13-3f-52d00479a4a6 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id C1.8C.23059.97400D25; Fri, 10 Jan 2014 14:32:25 +0000 (GMT) Received: from AMDC1186.digital.local ([106.116.147.185]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MZ600K8EWDV0160@eusync3.samsung.com>; Fri, 10 Jan 2014 14:32:25 +0000 (GMT) From: Przemyslaw Marczak To: u-boot@lists.denx.de Date: Fri, 10 Jan 2014 15:31:56 +0100 Message-id: <0b6db3bc3ab1011b9bafc8a87deb288a0a4ad931.1389352945.git.p.marczak@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: References: In-reply-to: References: <1386093806-2948-1-git-send-email-p.marczak@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnluLIzCtJLcpLzFFi42I5/e/4Vd1KlgtBBje2WVhcP29nsXRGH6vF rr/3GS1u/GpjtXjzcDOjRceRFkaLHZdvsFise7KW1eLt3k52B06Ps3d2MHr0bVnFGMAUxWWT kpqTWZZapG+XwJUxc8kzpoJ+kYrdX/pZGhifCnQxcnJICJhI7Nu3gR3CFpO4cG89WxcjF4eQ wFJGiQk3dzGDJIQE+pgkJvRlgdhsAgYSey6dAYuLCEhI/Oq/ygjSwCxwjVHi0+/LQA4Hh7CA vsSWj5YgNSwCqhK/Z75iAbF5BWIltq3YwAxSIiGgIDFnkg1ImFPAUmJj91MmiFUWEl967zFh ihdL7Pg5iXECI/8CRoZVjKKppckFxUnpuYZ6xYm5xaV56XrJ+bmbGCGB92UH4+JjVocYBTgY lXh4C2adDxJiTSwrrsw9xCjBwawkwmv/CijEm5JYWZValB9fVJqTWnyIkYmDU6qB0bqgSGfa 4h/qcu0PTDe0RC71SDf1qA1SPhx9/MCGnAIJ/cOzWo4d13s2cVVr+tTbBXs07rSb3u/tn29l XqcxUzdyUf7ndT7uKW4n5OrWnfrlx/VqhvJX/pNnt+hU/NA/qPZwU32L1+o5W4MdbuSem+p5 5fcUtasqrZ9ivxVNtGDuUUq1lLkxUYmlOCPRUIu5qDgRAI9/a5UaAgAA Cc: p.wilczek@samsung.com, dh09.lee@samsung.com, jh80.chung@samsung.com, Przemyslaw Marczak Subject: [U-Boot] [PATCH v5 02/12] trats2: Code cleanup. 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 Remove wrong and unused env variables Trats2 is not as GT-I8800. Signed-off-by: Przemyslaw Marczak Acked-by: Jaehoon Chung Cc: Piotr Wilczek --- Changes v2: - none Changes v3: - none Changes v4: - add "include pmic.h" to "max77686_pmic.h" Changes v5: - add acked-by board/samsung/trats2/trats2.c | 19 ++----------------- drivers/power/battery/bat_trats2.c | 2 +- include/configs/trats2.h | 1 - include/power/max77686_pmic.h | 2 ++ 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c index 1e96fdc..b4ccf51 100644 --- a/board/samsung/trats2/trats2.c +++ b/board/samsung/trats2/trats2.c @@ -72,15 +72,12 @@ static void check_hw_revision(void) int checkboard(void) { puts("Board:\tTRATS2\n"); + printf("HW Revision:\t0x%04x\n", board_rev); + return 0; } #endif -static void show_hw_revision(void) -{ - printf("HW Revision:\t0x%04x\n", board_rev); -} - u32 get_board_rev(void) { return board_rev; @@ -614,15 +611,3 @@ void init_panel_info(vidinfo_t *vid) exynos_set_dsim_platform_data(&dsim_platform_data); } #endif /* LCD */ - -#ifdef CONFIG_MISC_INIT_R -int misc_init_r(void) -{ - setenv("model", "GT-I8800"); - setenv("board", "TRATS2"); - - show_hw_revision(); - - return 0; -} -#endif diff --git a/drivers/power/battery/bat_trats2.c b/drivers/power/battery/bat_trats2.c index f264832..94015aa 100644 --- a/drivers/power/battery/bat_trats2.c +++ b/drivers/power/battery/bat_trats2.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include static struct battery battery_trats; diff --git a/include/configs/trats2.h b/include/configs/trats2.h index c9ce828..7dfbe98 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -272,7 +272,6 @@ #define CONFIG_EFI_PARTITION #define CONFIG_PARTITION_UUIDS -#define CONFIG_MISC_INIT_R #define CONFIG_BOARD_EARLY_INIT_F /* I2C */ diff --git a/include/power/max77686_pmic.h b/include/power/max77686_pmic.h index 16e9016..c2a772a 100644 --- a/include/power/max77686_pmic.h +++ b/include/power/max77686_pmic.h @@ -8,6 +8,8 @@ #ifndef __MAX77686_H_ #define __MAX77686_H_ +#include + enum { MAX77686_REG_PMIC_ID = 0x0, MAX77686_REG_PMIC_INTSRC,