From patchwork Sat Apr 4 05:16:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Akman X-Patchwork-Id: 1266342 X-Patchwork-Delegate: mario.six@gdsys.cc Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=writeme.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=mail.com header.i=@mail.com header.a=rsa-sha256 header.s=dbd5af2cbaf7 header.b=Q0P55yIj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48vQ6h5pVZz9sPF for ; Sat, 4 Apr 2020 16:17:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EC067811EF; Sat, 4 Apr 2020 07:17:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=writeme.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=mail.com header.i=@mail.com header.b="Q0P55yIj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D855D8105B; Sat, 4 Apr 2020 07:17:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.com (mout.gmx.com [74.208.4.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D594F8105B for ; Sat, 4 Apr 2020 07:17:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=writeme.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sinan@writeme.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.com; s=dbd5af2cbaf7; t=1585977455; bh=ucLfs2F5H9aYLKXnvI0Ti2lkMeFi6zlSVDc2EpV7olM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Q0P55yIj5gZQ4hgDPZjw2/BEuelPSMcXGSQA4mO6rha/dKIwo6TA60g2wEuShMO5K DXj89mwlKkAxWxdtHVSEpb2FPW7FtG5gz6/CIfwzd3WsHmL9VGuUFXGjYtAKMfiILW TBWrVLoVrF1e0yQCwUxlE8RDMr5WQ9HyWGAFJZlg= X-UI-Sender-Class: 214d933f-fd2f-45c7-a636-f5d79ae31a79 Received: from localhost.localdomain ([208.111.77.233]) by mail.gmx.com (mrgmxus005 [74.208.5.15]) with ESMTPA (Nemesis) id 0LfU2p-1iwp541N9t-00p3uq; Sat, 04 Apr 2020 07:17:35 +0200 From: sinan@writeme.com To: u-boot@lists.denx.de Cc: mario.six@gdsys.cc, jh80.chung@samsung.com, Sinan Akman Subject: [PATCH v2 2/2] mpc8379erdb: Convert to DM_MMC Date: Sat, 4 Apr 2020 01:16:47 -0400 Message-Id: <20200404051647.10922-2-sinan@writeme.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200404051647.10922-1-sinan@writeme.com> References: <2662dd1d-46ee-7c09-7fef-1053d3fec34d@samsung.com> <20200404051647.10922-1-sinan@writeme.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:+/7C2KJL/vtmMu0gi0GetCe/meQhiR4XNbYRZOQbvqNzZAo524f 6r4ReT8ZdVmhZLO8vZ2/poYt+I9MVeh7HAclbFByHSQoGhRIuvsBOjqQdfLxE0Fj/mmGzd7 E9uZWeZFsF4OLH+1he8dfDHRRZEDEpKav05CMvJJLP5rtrd3XLNpLx/DJSE6I0Vfg99GGbz Pw+AWojOU69BqOviKFPMQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:McazqwRxzWo=:+vT3sNlCWdV8rOG6BLvwop 3WRd+abxBEdQl7fgRnAO05rwESOmtyx8+xuMeoLGc0DYS3qrbuKAqetMcS05rzLbJUCOh1/kG 5o5pcNydG/rbwFVY8YpglpHp88CBA2ucJL6XQXQzJUN1FN9RrpCmfAkBBAJNcLwa2wAfcrglv /RZ1S5zT5GfjKZiRSr8v2Y1kotLd7WxzUIeT/HbQ0x5y5rM/VB74HoAfcGZbQ0yB9u9PFIXhM viIk3v2k7mytOFY7z+ng3O2BSnlhsGUcOaFYnpjuGcY/bPBt2VXY3a5mUEzRSJ/5EzjTmYSXL 3LMyq7mMHAex1KqtLNHtxdEj7d1tv2US1ZdSX5xYPmGsuV8TvchW4RcqzxZhvbFXAYRbXCvkf 9QOdIzBKBmO5tKHey0NLNOkHnBb+KhqYYbkDTMGLsKFucpfhzE192GTftsKCBfXLEfJHIv9oJ xMBrJZI+oOsZWjAEd5mEgrk1i3rfTCjVE0zChiPjV48SyBS+EKjLC1YQODkoB5sqnsyEZ0hmr 2iBv2/67za3G+nswNZDC9eokVGWcmo2xiVDRHohIeHDNHugXcrwcSJ9lcjDaklVEdgSe+JkI7 NpW6xjuqeBriAZGmf1WN02iObIaJGWtGhOQ7/MuoGyQd1MLfBDnD8gjYAz6EioPa3GATiy4Rn DHclAM8TEXHLB+fJSKIEJem8u9SuTUregNjST2y+Qfk32veMyoyjgP6GKE5bwMCEECAy+2/0X +30l9OR+gZIelYk+DGMP4tpy5mLKKNS9CqafL75BGKICCj1iscRkaEgRbh5B1YSe7iIuRheBu lixR1MZk8cQH4bexOtlV8jSk+wtKAf/pck2GTpbSjdjcaB23t7npk93B4+1UjdAOEzNWvi3Bk MSSv6tw3k2fi19OiQjIZeTMbq6fxhZKQFgp6BiAdgD9PuUn4EWRyhoHOAZl5yilzGeO6tLaod XAbhlTjsWY9m6zge3h2HKypI9DMihogQxbnzBgjIdBZTH5dQ+48qwC0LecUQl91O4LcHuK9VJ 5FgzlPgeS0lTCBqBNzWJVHouTVAiYRcDYEf999sYNx+s/u+cQ8L2xgvG8YxVbE6jlMX8qGBVP L3p9XJzAywFhrL6FaOBHXBhb28lc7z/Mby4K9Mtz43UsQ6wTdYJi3zKY731yMXLssAih/rkdt ve0a0uX2/uEnPwMlVgfLo5D60VDtvMSdLK1dDxDG+Twwr96Ee4FuvHJ8entwRLVUrjsgc62ie RF1EpYjr0dxNSqKmAanlBqdNzlk3cIeBGlegz1sHhvnAoV3lera4YuOa+fyXB/nOwGldxtejg 1D1qLk8pUwms1ETMINZ/upTUyTSAhqNmX5KAr3sFCL/hYvLFnGc= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean From: Sinan Akman Signed-off-by: Sinan Akman --- Changes for v2: - Split patches for device tree and DM_MMC board/freescale/mpc837xerdb/mpc837xerdb.c | 9 ++++++++- configs/MPC837XERDB_defconfig | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) -- 2.14.5 diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index 45038acf32..9321952674 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -136,8 +136,8 @@ int checkboard(void) int board_early_init_f(void) { -#ifdef CONFIG_FSL_SERDES immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; +#ifdef CONFIG_FSL_SERDES u32 spridr = in_be32(&immr->sysconf.spridr); /* we check only part num, and don't look for CPU revisions */ @@ -164,10 +164,16 @@ int board_early_init_f(void) break; } #endif /* CONFIG_FSL_SERDES */ + +#ifdef CONFIG_FSL_ESDHC + clrsetbits_be32(&immr->sysconf.sicrl, SICRL_USB_B, SICRL_USB_B_SD); + clrsetbits_be32(&immr->sysconf.sicrh, SICRH_SPI, SICRH_SPI_SD); +#endif return 0; } #ifdef CONFIG_FSL_ESDHC +#if !(CONFIG_IS_ENABLED(DM_MMC)) int board_mmc_init(bd_t *bd) { struct immap __iomem *im = (struct immap __iomem *)CONFIG_SYS_IMMR; @@ -186,6 +192,7 @@ int board_mmc_init(bd_t *bd) return fsl_esdhc_mmc_init(bd); } #endif +#endif /* * Miscellaneous late-boot configurations diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig index fd8335ee4e..8ef193a6e5 100644 --- a/configs/MPC837XERDB_defconfig +++ b/configs/MPC837XERDB_defconfig @@ -160,7 +160,11 @@ CONFIG_CMD_PING=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="mpc8379erdb" CONFIG_ENV_ADDR=0xFE080000 +CONFIG_DM=y +CONFIG_DM_MMC=y CONFIG_FSL_SATA=y CONFIG_FSL_ESDHC=y CONFIG_MTD_NOR_FLASH=y @@ -174,4 +178,3 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y -CONFIG_OF_LIBFDT=y