From patchwork Wed Apr 5 19:20:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 747464 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vywtk6YFVz9s8T for ; Thu, 6 Apr 2017 05:31:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 88BD2C21C4B; Wed, 5 Apr 2017 19:25:42 +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_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 62A6EC21C63; Wed, 5 Apr 2017 19:23:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E2387C21C3E; Wed, 5 Apr 2017 19:22:25 +0000 (UTC) Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by lists.denx.de (Postfix) with ESMTPS id 2D893C21C4B for ; Wed, 5 Apr 2017 19:22:19 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id o123so3280783pga.1 for ; Wed, 05 Apr 2017 12:22:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GIRQHRBmS8mB0NsrbXIcwtzFzw8G4L4DYWIXWqpt2RU=; b=cF46WlgOaV/VoXt4etjbuchGQdkTBnqMfK73eMUK7ZnWYaQPQ5OYwTD+1fbqj+bVXP I9qGK3qAB9USS+vjaTVUdRAANE6FmLXb4g/MM5vBEvT37PyeozUs7avmibyWzGIVdHRL l3PlqswBMqPPRkGNIDcBvhnJnxMnFdfO8+PFXQYbQxtoye02SM76l6kVs8q3q/r7ybVr HsZIwLVxiNhbMFuISciNe8bbhCMyq3LX9YSC/gFUvinB7Dj0G2L/rIHposwLsarEbFfH DaNnAsEcwIP00FZauhAkiELDVsn6zr2g5rGe9aTjIKCmNBkwEcyPNjqBX337/IivlEs9 KGaw== X-Gm-Message-State: AFeK/H2q625hAebyJJ7VVPGSQ1cZpbH4lX0Bly+h69dK9LPBmZCKj9nJGOVO6Mbwnlqqbw== X-Received: by 10.84.224.66 with SMTP id a2mr38777952plt.32.1491420137852; Wed, 05 Apr 2017 12:22:17 -0700 (PDT) Received: from localhost.localdomain ([117.254.77.17]) by smtp.gmail.com with ESMTPSA id 189sm38970526pgd.30.2017.04.05.12.22.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 12:22:16 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Thu, 6 Apr 2017 00:50:21 +0530 Message-Id: <1491420041-12471-12-git-send-email-jagan@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491420041-12471-1-git-send-email-jagan@openedev.com> References: <1491420041-12471-1-git-send-email-jagan@openedev.com> Cc: Fabio Estevam , u-boot@lists.denx.de Subject: [U-Boot] [PATCH v3 11/31] ARM: i.MX6: sabresd: Enable DM_I2C and DM_PMIC 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Jagan Teki Enable DM_I2C, DM_PMIC and DM_PMIC_PFUZE100 for dt supported sabresd config boards: - imx6q_sabresd_defconfig - imx6qp_sabresd_defconfig I2C Log: -------- => i2c bus Bus 0: i2c@021a0000 Bus 1: i2c@021a4000 08: pfuze100@08, offset len 1, flags 0 Bus 2: i2c@021a8000 => i2c dev 1 Setting bus to 1 => i2c speed 100000 Setting bus speed to 100000 Hz => i2c probe Valid chip addresses: 08 48 => i2c md 08 0x0 0x20 0000: 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 ................ 0010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ => i2c md 48 0x0 0x20 0000: 00 f0 00 00 00 00 00 00 00 00 00 80 70 41 41 41 ............pAAA 0010: 00 00 00 80 70 41 41 41 41 41 41 41 41 41 41 41 ....pAAAAAAAAAAA Cc: Stefano Babic Cc: Fabio Estevam Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- board/freescale/mx6sabresd/mx6sabresd.c | 7 ++++++- configs/imx6q_sabresd_defconfig | 3 +++ configs/imx6qp_sabresd_defconfig | 3 +++ include/configs/mx6sabresd.h | 4 +++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index db25dad..5776b39 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -202,6 +202,7 @@ static void enable_lvds(struct display_info_t const *dev) enable_backlight(); } +#ifndef CONFIG_DM_I2C static struct i2c_pads_info i2c_pad_info1 = { .scl = { .i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD, @@ -214,6 +215,7 @@ static struct i2c_pads_info i2c_pad_info1 = { .gp = IMX_GPIO_NR(4, 13) } }; +#endif static void setup_spi(void) { @@ -594,8 +596,9 @@ int board_init(void) #ifdef CONFIG_MXC_SPI setup_spi(); #endif +#ifndef CONFIG_DM_I2C setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); - +#endif #ifdef CONFIG_USB_EHCI_MX6 setup_usb(); #endif @@ -603,6 +606,7 @@ int board_init(void) return 0; } +#ifndef CONFIG_DM_PMIC int power_init_board(void) { struct pmic *p; @@ -631,6 +635,7 @@ int power_init_board(void) return 0; } +#endif #ifdef CONFIG_MXC_SPI int board_spi_cs_gpio(unsigned bus, unsigned cs) diff --git a/configs/imx6q_sabresd_defconfig b/configs/imx6q_sabresd_defconfig index e1bea93..2076418 100644 --- a/configs/imx6q_sabresd_defconfig +++ b/configs/imx6q_sabresd_defconfig @@ -50,10 +50,13 @@ CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y CONFIG_OF_CONTROL=y +CONFIG_DM_I2C=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y +CONFIG_DM_PMIC=y # CONFIG_BLK is not set # CONFIG_DM_MMC_OPS is not set +CONFIG_DM_PMIC_PFUZE100=y CONFIG_SYS_I2C_MXC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/configs/imx6qp_sabresd_defconfig b/configs/imx6qp_sabresd_defconfig index 0d51c2b..f75ab70 100644 --- a/configs/imx6qp_sabresd_defconfig +++ b/configs/imx6qp_sabresd_defconfig @@ -51,10 +51,13 @@ CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y CONFIG_OF_CONTROL=y +CONFIG_DM_I2C=y CONFIG_DM_GPIO=y CONFIG_DM_MMC=y +CONFIG_DM_PMIC=y # CONFIG_BLK is not set # CONFIG_DM_MMC_OPS is not set +CONFIG_DM_PMIC_PFUZE100=y CONFIG_SYS_I2C_MXC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 7c0e7a5..6ece575 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -52,7 +52,7 @@ #endif /* I2C Configs */ -#ifdef CONFIG_SYS_I2C_MXC +#if defined(CONFIG_SYS_I2C_MXC) && !defined(CONFIG_DM_I2C) #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ @@ -61,10 +61,12 @@ #endif /* PMIC */ +#ifndef CONFIG_DM_PMIC_PFUZE100 #define CONFIG_POWER #define CONFIG_POWER_I2C #define CONFIG_POWER_PFUZE100 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#endif /* USB Configs */ #ifdef CONFIG_CMD_USB