Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 68615C433EF for ; Sun, 8 May 2022 00:19:30 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D416283B44; Sun, 8 May 2022 02:19:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1651969168; bh=fg994JBhmPYlE6rCcE3JfaeRA2G0Qyz8/l8gMYjwIlg=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=HGqEHEQUXq6aKSkEH5km73Yq6Z8V4rMYFnxZFoe360hNk2Mubrurg5UaVA4vJVfBp RRYfCKoeNzZdBsToVBCNsK7cuxrAHqQJItAHX9POZq7kaLdUCkqR5DXSOnu9vd/1jT cIoqM1h9hLFi3by1PEcmRG2TADSnIrGijxozidfQyz+ov4uQ7Dg/spo7or8SpENdFu YOAh3uQjNAG2gdLdwCjBZzD3rCIVW9IeN5wbkI29Tp+uk+SgQhEIdZsQOUhauzTqN7 iinK76nul56X0G0fOSOAghg13oJSUEsyrlj/DR3JLKlqqHgUoi9jwVL53T0Zv/davb TYjxSZBJyrhFQ== Received: from tr.lan (ip-86-49-12-201.net.upcbroadband.cz [86.49.12.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id E60C3830E5; Sun, 8 May 2022 02:19:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1651969166; bh=fg994JBhmPYlE6rCcE3JfaeRA2G0Qyz8/l8gMYjwIlg=; h=From:To:Cc:Subject:Date:From; b=TAuj1yu9Ba139NeA1owVkFWaIzPUKE0MXlH2O1+VzoeRyN/S+b4GTxPXWEZvMKbLo 15XDVXEAj+7lPFP6kSV7xG45aUY029NT0i8YggrWH54XMFiqORWusa4ref4H92Lzqe GUlMfpoXWlnkWErSyWtVNS+/10G4yP5nHj5P5cI0ZTlephW1BHkbdK0DPPCQs8vpjw qDwKyrfWxhTg6IGvrJIx3cjMb/gx6Tkcv10+Y+HglFenSnsx2FArlB38ED7ZhtBQzU gn5nw+pyTVe6KfONe+7CUoVjqu057lIJID6sCoClkr6FKmbuE5x9MZNZHy7BpieqdY 1yMA89hPSl0+w== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Stefano Babic Subject: [PATCH] ARM: imx: mx5: Convert MX53 Menlo board to DM I2C and DM RTC Date: Sun, 8 May 2022 02:19:12 +0200 Message-Id: <20220508001912.571697-1-marex@denx.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Convert the board to DM I2C and DM RTC. This leads to removal of board side iomuxc configuration, which is now done using pin control driver, and conversion of board side legacy I2C accessors to DM ones. Signed-off-by: Marek Vasut Cc: Stefano Babic --- board/menlo/m53menlo/m53menlo.c | 27 +++++++-------------------- configs/m53menlo_defconfig | 8 ++------ 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c index 9545e633a3d..61ab3844b87 100644 --- a/board/menlo/m53menlo/m53menlo.c +++ b/board/menlo/m53menlo/m53menlo.c @@ -226,16 +226,21 @@ static const char *lvds_compat_string; static int detect_lvds(struct display_info_t const *dev) { + struct udevice *idev, *ibus; u8 touchid[23]; u8 *touchptr = &touchid[0]; int ret; - ret = i2c_set_bus_num(0); + ret = uclass_get_device_by_seq(UCLASS_I2C, 0, &ibus); + if (ret) + return 0; + + ret = dm_i2c_probe(ibus, 0x38, 0, &idev); if (ret) return 0; /* Touchscreen is at address 0x38, ID register is 0xbb. */ - ret = i2c_read(0x38, 0xbb, 1, touchid, sizeof(touchid)); + ret = dm_i2c_read(idev, 0xbb, touchid, sizeof(touchid)); if (ret) return 0; @@ -385,23 +390,6 @@ splasherr: return 0; } -#define I2C_PAD_CTRL (PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \ - PAD_CTL_PUS_100K_UP | PAD_CTL_ODE) - -static void setup_iomux_i2c(void) -{ - static const iomux_v3_cfg_t i2c_pads[] = { - /* I2C1 */ - NEW_PAD_CTRL(MX53_PAD_EIM_D28__I2C1_SDA, I2C_PAD_CTRL), - NEW_PAD_CTRL(MX53_PAD_EIM_D21__I2C1_SCL, I2C_PAD_CTRL), - /* I2C2 */ - NEW_PAD_CTRL(MX53_PAD_EIM_D16__I2C2_SDA, I2C_PAD_CTRL), - NEW_PAD_CTRL(MX53_PAD_EIM_EB2__I2C2_SCL, I2C_PAD_CTRL), - }; - - imx_iomux_v3_setup_multiple_pads(i2c_pads, ARRAY_SIZE(i2c_pads)); -} - static void setup_iomux_video(void) { static const iomux_v3_cfg_t lcd_pads[] = { @@ -505,7 +493,6 @@ int board_early_init_f(void) { setup_iomux_uart(); setup_iomux_fec(); - setup_iomux_i2c(); setup_iomux_nand(); setup_iomux_video(); diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index df4907a8263..90d3e59e57d 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -11,9 +11,6 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x100000 CONFIG_TARGET_M53MENLO=y -CONFIG_SYS_I2C_MXC_I2C1=y -CONFIG_SYS_I2C_MXC_I2C2=y -CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx53-m53menlo" CONFIG_SPL_TEXT_BASE=0x70008000 @@ -53,7 +50,6 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_BMP=y CONFIG_CMD_BOOTCOUNT=y -CONFIG_CMD_DATE=y CONFIG_CMD_BTRFS=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y @@ -75,8 +71,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_DM=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041 -CONFIG_SYS_I2C_LEGACY=y -CONFIG_SPL_SYS_I2C_LEGACY=y +CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y CONFIG_FSL_ESDHC_IMX=y CONFIG_MTD=y @@ -102,6 +97,7 @@ CONFIG_PINCTRL_IMX5=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_RTC=y CONFIG_RTC_M41T62=y CONFIG_MXC_UART=y CONFIG_SYSRESET=y -- 2.35.1