From patchwork Fri May 22 18:22:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suniel Mahesh X-Patchwork-Id: 1296434 X-Patchwork-Delegate: ykai007@gmail.com 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=85.214.62.61; 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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=bemVzm0H; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 49TFH76nNXz9sRK for ; Sat, 23 May 2020 04:23:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27CB581589; Fri, 22 May 2020 20:23:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.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; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="bemVzm0H"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3DCBE813C6; Fri, 22 May 2020 20:23:25 +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=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3F6BA813C6 for ; Fri, 22 May 2020 20:23:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sunil@amarulasolutions.com Received: by mail-pg1-x542.google.com with SMTP id f21so2350408pgg.12 for ; Fri, 22 May 2020 11:23:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id; bh=Kijhus04xyy+PBIQINsCl7mWupuJuHLbLPrMgdPpsoQ=; b=bemVzm0HRjBAi+YxaFufx/pcAMNky53HW7I1MQOLM+i6Z7Rg0WYVj8iTruGsS85gD/ rfow4ASfTIsBFpB/s9DINVbjOjiY1gq5KCJGxu32DaxZ+cE9eqoYQ+gjpR4ot+EycNyY M3l1b5IVXf+rJb3rosNwHUyGdsKDoo9LkX4Ck= 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; bh=Kijhus04xyy+PBIQINsCl7mWupuJuHLbLPrMgdPpsoQ=; b=aSAs5MYo/6dArIzXmrwPvV/3fom3aDwTtpL1yrV6UDP42Me3IgkRjks/PG/bSOhZpC 3v5deSwhRdWKsmwzk7KR3ap/pIC/QebTs5EE6vYksqKDNwJLPykRh+R0an2r8RZbdwsx XIG5s4wYd2oNZWSOw9vC3vpJRfXILjSLJ8CtuAEPVwdP6HdlPPk7BEDfeN0RNetUYKdu dMRdqVM/XHUq6ThPOHL4sv2aoT6L35p5F9SOV6JflWqfHiWUXfDV7qJ+48A9yFwgpR6o HSJtVAruy7gtcrIWakk4H170hibV1uQykt9QF+TUYc6zpSQ1haOVxBOfZOc1BSWpApKX b7nQ== X-Gm-Message-State: AOAM532LSMMRls8gxA9Do20lVEubiO8P+YhBniJBJ8nSVoU6n9uPuMP6 4G3R9rk3KcuK//Sgw2d5S72RaQ== X-Google-Smtp-Source: ABdhPJy0qPhnumnZ5y4GMQQPlTkfV77OW5gX4zAQWdWEccHL0ljrPvpzkhM4Ysb6HWJpSB0vFtV87w== X-Received: by 2002:a63:d00d:: with SMTP id z13mr14744743pgf.54.1590171800704; Fri, 22 May 2020 11:23:20 -0700 (PDT) Received: from localhost.localdomain ([49.204.227.108]) by smtp.gmail.com with ESMTPSA id m4sm7218358pfm.26.2020.05.22.11.23.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 May 2020 11:23:20 -0700 (PDT) From: sunil@amarulasolutions.com To: Simon Glass , Philipp Tomsich , Kever Yang , Klaus Goger Cc: Jagan Teki , u-boot@lists.denx.de, Suniel Mahesh Subject: [PATCH] rockchip: Fix spl mmc boot device ofpath Date: Fri, 22 May 2020 23:52:33 +0530 Message-Id: <1590171753-22793-1-git-send-email-sunil@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 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: Suniel Mahesh Linux v5.7-rc1 dts(i) sync has changed the sdmmc node from dwmmc@fe320000 to mmc@fe320000 and this ofpath is being used in rockchip spl bootdevice code. So, update the ofpath with a new node name. Fixes: 167efc2c7a46 ("arm64: dts: rk3399: Sync v5.7-rc1 from Linux" Signed-off-by: Suniel Mahesh Signed-off-by: Jagan Teki --- arch/arm/mach-rockchip/rk3399/rk3399.c | 4 ++-- board/theobroma-systems/puma_rk3399/puma-rk3399.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 09b0d6e..4fda93b 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -28,7 +28,7 @@ DECLARE_GLOBAL_DATA_PTR; const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000", [BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000", - [BROM_BOOTSOURCE_SD] = "/dwmmc@fe320000", + [BROM_BOOTSOURCE_SD] = "/mmc@fe320000", }; static struct mm_region rk3399_mem_map[] = { @@ -176,7 +176,7 @@ const char *spl_decode_boot_device(u32 boot_device) u32 boot_device; const char *ofpath; } spl_boot_devices_tbl[] = { - { BOOT_DEVICE_MMC1, "/dwmmc@fe320000" }, + { BOOT_DEVICE_MMC1, "/mmc@fe320000" }, { BOOT_DEVICE_MMC2, "/sdhci@fe330000" }, { BOOT_DEVICE_SPI, "/spi@ff1d0000" }, }; diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c index 561579d..f7f08ae 100644 --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c @@ -77,7 +77,7 @@ static int setup_boottargets(void) } /* - * Only run, if booting from mmc1 (i.e. /dwmmc@fe320000) and + * Only run, if booting from mmc1 (i.e. /mmc@fe320000) and * only consider cases where the default boot-order first * tries to boot from mmc0 (eMMC) and then from mmc1 * (i.e. external SD). @@ -85,7 +85,7 @@ static int setup_boottargets(void) * In other words: the SD card will be moved to earlier in the * order, if U-Boot was also loaded from the SD-card. */ - if (!strcmp(boot_device, "/dwmmc@fe320000")) { + if (!strcmp(boot_device, "/mmc@fe320000")) { char *mmc0, *mmc1; debug("%s: booted from SD-Card\n", __func__);