From patchwork Fri Feb 1 16:29:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1034938 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43rjQk5Skkz9sDX for ; Sat, 2 Feb 2019 03:35:58 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7B4E5C21D83; Fri, 1 Feb 2019 16:32:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BCCE5C21E16; Fri, 1 Feb 2019 16:30:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D8E9CC21E3A; Fri, 1 Feb 2019 16:29:57 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id D9267C21E29 for ; Fri, 1 Feb 2019 16:29:53 +0000 (UTC) Received: from localhost.localdomain ([81.221.68.199]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MUWjV-1ghWf71RKd-00RHwB; Fri, 01 Feb 2019 17:29:50 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 1 Feb 2019 17:29:14 +0100 Message-Id: <20190201162920.32067-18-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190201162920.32067-1-marcel@ziswiler.com> References: <20190201162920.32067-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:aroctS+7MmHHLcvlgdioeZI9GpVu6cClZ8LX8GzwV7pmU0ihTpy n03ywZqSxifn0m8GS3z3Bt8+XOYHorxCl3v7qIcJTyp8/OB+e5sHcgQFuaiV8HzAdReuzaq kwtxSKkeN3+OOAHYNcz94K5NTFTvVZKAMSv7e7HK7V8y9ALR3TC/SlMj1CPXzuyF3G6aJSm mpVYCNuEr+ElP9gsDWqTg== X-UI-Out-Filterresults: notjunk:1; V03:K0:yxvA05ks09g=:ChnjcQHVMO0QOpTpimjy7d 14ZLlI/rZRPgkznmqATB8xVo5DyChXgTW4atQ8iMNJtERO84Ekl8k4vSZXoma2OJalxuiCFdT iyRGIRvHi1mJtDm7/G3StoBhojVqQDKX+MTxXzUtkpN8LLeug8bwWYwavVpkuAPG3mN/NnC2/ JOeKSPAofgFqkbgowWCdpbbBhUfziDpjWURwu8U5QzQJd8sh6Nrp/uF5lqmPDgzH+5Y9xogl4 Nssvj/EDRbicCZmKLTklMYXXqMn3j88mhrQyTT12zdRRWsXB5QXYWVww0wwqn4aljSR68+Dc8 Zhpknu1WfWHKfssawddof1ErzvX1DS9mmlBxqLPMEbsFBVAMV2o9glrhDmNSk39xQc/l9KcPy LP305UQfO87W/zje1ItW+lsrKpLJMMHixX4L6UlUpoh04r3udawd+OC+rWbM1eR6Aj8wvA5tG UdMjq2lh58a0d+KV6+sHWjA6FfjoLtnqFlpqcne9THMAXrjKefHnfQcvmjvZT5+xOjQg01faq ymxqz99dIzgek1L7G1BmNRXQe5C6ye2Yexcg0AvoII5j3XkZEwNXrJkng5w5onBOrg259TqJ/ GldtheNzI/VgW5dcP4EszxkWakFYrsMksFKUOFv1Ah459+bKxpBAq7AbH4fvz4E9/OIDrgrag sTCEJn0f9MruaaQsakAhrWU2eF3YxyXZUdCtqULVRK5wVTbjjhDX23blduD7L2Nq3+20e8fix tPZ3gYig50HFlArXobNWfRanJRA+5Qt7/ZtbEg== Cc: Marcel Ziswiler , Max Krummenacher Subject: [U-Boot] [PATCH v1 17/23] apalis_imx6: pf0100: reorder and cleanup message printing X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler Keep debug code at the end of the function. Use a one line informational message for the PMIC only. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- board/toradex/apalis_imx6/pf0100.c | 110 +++++++++++++++-------------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/board/toradex/apalis_imx6/pf0100.c b/board/toradex/apalis_imx6/pf0100.c index 6ff21adf50..030124c0ae 100644 --- a/board/toradex/apalis_imx6/pf0100.c +++ b/board/toradex/apalis_imx6/pf0100.c @@ -36,7 +36,7 @@ unsigned pmic_init(void) uchar bus = 1; uchar devid, revid, val; - puts("PMIC: "); + puts("PMIC: "); rc = i2c_get_chip_for_busnum(bus, PFUZE100_I2C_ADDR, 1, &dev); if (rc) { printf("failed to get device for PMIC at address 0x%x\n", @@ -52,57 +52,8 @@ unsigned pmic_init(void) puts("i2c pmic revid read failed\n"); return 0; } - printf("device id: 0x%.2x, revision id: 0x%.2x\n", devid, revid); + printf("device id: 0x%.2x, revision id: 0x%.2x, ", devid, revid); -#ifdef DEBUG - { - unsigned i, j; - - for (i = 0; i < 16; i++) - printf("\t%x", i); - for (j = 0; j < 0x80; ) { - printf("\n%2x", j); - for (i = 0; i < 16; i++) { - dm_i2c_read(dev, j + i, &val, 1); - printf("\t%2x", val); - } - j += 0x10; - } - printf("\nEXT Page 1"); - - val = PFUZE100_PAGE_REGISTER_PAGE1; - if (dm_i2c_write(dev, PFUZE100_PAGE_REGISTER, &val, 1)) { - puts("i2c write failed\n"); - return 0; - } - - for (j = 0x80; j < 0x100; ) { - printf("\n%2x", j); - for (i = 0; i < 16; i++) { - dm_i2c_read(dev, j + i, &val, 1); - printf("\t%2x", val); - } - j += 0x10; - } - printf("\nEXT Page 2"); - - val = PFUZE100_PAGE_REGISTER_PAGE2; - if (dm_i2c_write(dev, PFUZE100_PAGE_REGISTER, &val, 1)) { - puts("i2c write failed\n"); - return 0; - } - - for (j = 0x80; j < 0x100; ) { - printf("\n%2x", j); - for (i = 0; i < 16; i++) { - dm_i2c_read(dev, j + i, &val, 1); - printf("\t%2x", val); - } - j += 0x10; - } - printf("\n"); - } -#endif /* DEBUG */ /* get device programmed state */ val = PFUZE100_PAGE_REGISTER_PAGE1; if (dm_i2c_write(dev, PFUZE100_PAGE_REGISTER, &val, 1)) { @@ -132,13 +83,13 @@ unsigned pmic_init(void) switch (programmed) { case 0: - printf("PMIC: not programmed\n"); + puts("not programmed\n"); break; case 3: - printf("PMIC: programmed\n"); + puts("programmed\n"); break; default: - printf("PMIC: undefined programming state\n"); + puts("undefined programming state\n"); break; } @@ -156,6 +107,57 @@ unsigned pmic_init(void) if (dm_i2c_write(dev, PFUZE100_SWBSTCTL, &val, 1)) puts("i2c write failed\n"); } + +#ifdef DEBUG + { + unsigned int i, j; + + for (i = 0; i < 16; i++) + printf("\t%x", i); + for (j = 0; j < 0x80; ) { + printf("\n%2x", j); + for (i = 0; i < 16; i++) { + dm_i2c_read(dev, j + i, &val, 1); + printf("\t%2x", val); + } + j += 0x10; + } + printf("\nEXT Page 1"); + + val = PFUZE100_PAGE_REGISTER_PAGE1; + if (dm_i2c_write(dev, PFUZE100_PAGE_REGISTER, &val, 1)) { + puts("i2c write failed\n"); + return 0; + } + + for (j = 0x80; j < 0x100; ) { + printf("\n%2x", j); + for (i = 0; i < 16; i++) { + dm_i2c_read(dev, j + i, &val, 1); + printf("\t%2x", val); + } + j += 0x10; + } + printf("\nEXT Page 2"); + + val = PFUZE100_PAGE_REGISTER_PAGE2; + if (dm_i2c_write(dev, PFUZE100_PAGE_REGISTER, &val, 1)) { + puts("i2c write failed\n"); + return 0; + } + + for (j = 0x80; j < 0x100; ) { + printf("\n%2x", j); + for (i = 0; i < 16; i++) { + dm_i2c_read(dev, j + i, &val, 1); + printf("\t%2x", val); + } + j += 0x10; + } + printf("\n"); + } +#endif /* DEBUG */ + return programmed; }