From mboxrd@z Thu Jan 1 00:00:00 1970 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 27E62C433F5 for ; Tue, 1 Mar 2022 01:49:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 14B3B83CEF; Tue, 1 Mar 2022 02:48:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WAE63FVD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 07B2C83CE2; Tue, 1 Mar 2022 02:48:18 +0100 (CET) Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) (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 9E18E83D01 for ; Tue, 1 Mar 2022 02:48:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jbx6244@gmail.com Received: by mail-ej1-x632.google.com with SMTP id vz16so28566575ejb.0 for ; Mon, 28 Feb 2022 17:48:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4tS4hdoHNCfFfP5lKReqw1Uuzm/YiA3+bhBjHKPIf3k=; b=WAE63FVDiyJP7okb4OMciwvtQzz/kBbPVUetDgnDW12T7ZGgcBf14fxBOKhZTynyvm 63fD5r/u4L5AHfJ87ZvW/MARDf+p6f0qA1Fnd36cXVxfZMdKopUNcRcvNkSgBQ0aX6r+ a07D9HHeaeHHUK44ESWWvkkj8ln4n9VtGP8OvEZeMTRXfmaZCMhO//Fs7nEDbJJkmLbn 8C8nGECBDb/6NfPCkLo4MyCpd/wXPVTN3ovfEKbFfAaOjJkdUmlRIfgbpjDCk144sX+A F1CIZeuZK9Me8F6mmAOwz8vp7HXlCQ6mVDscU7eCe6SKtcrDRKwxI1CRmO+UOLbEVjSi a/FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4tS4hdoHNCfFfP5lKReqw1Uuzm/YiA3+bhBjHKPIf3k=; b=MR/KOYCTC1R3nV8BMuCrVuI2wP01ua7Jnne5hhBOJzE8luxjWmeL1bb26DTHARyqcg BknXMnzhW9mbpVhYxJ54jzM965XcuPH3MOTjrm3C7ox3DfIXyReKaezRxSzOR1rQFddI d1d3ta71NO2waQlNt4YuXSeIu37v5H2Crmu+O3z4lC+PYEUMoJwxNy8za4WDn21/SRnW KIFYlvUKxaiRKhpkzQWo/1McDWBPHavrzR6aA8oruGk5sV8hjRXIUy9k/h6qPXcJR5Uh 1uFETY6v4HbUcwjUGyUKXAkDy8W5cQMhJi7JbXwDEjzTDP1X+HVLaqaDWVKs+F4f8H8H XyrA== X-Gm-Message-State: AOAM531UV53zXM2LlK0BbUI3BZR+VltAYg6r7701VvVOYisyGopFcSoV Fqeln8mrvJiRmuqw5yxASOw= X-Google-Smtp-Source: ABdhPJwuqbeliGLHt+3QqRN0OyL6iaqLkHmqDL783gcSJNAPGVrqi/29Ek7LZOpluKOP2gKnRbbdbA== X-Received: by 2002:a17:906:6a8d:b0:6d1:c4c8:cb3 with SMTP id p13-20020a1709066a8d00b006d1c4c80cb3mr16838974ejr.577.1646099292029; Mon, 28 Feb 2022 17:48:12 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id g9-20020aa7c849000000b00412fc6bf26dsm6816738edt.80.2022.02.28.17.48.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 17:48:11 -0800 (PST) From: Johan Jonker To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, u-boot@lists.denx.de, w.egorov@phytec.de, hl@rock-chips.com, jagan@amarulasolutions.com, heiko@sntech.de Subject: [PATCH v2 12/12] rockchip: fix boot_devices constants Date: Tue, 1 Mar 2022 02:47:49 +0100 Message-Id: <20220301014749.6446-12-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220301014749.6446-1-jbx6244@gmail.com> References: <20220301014749.6446-1-jbx6244@gmail.com> 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 The DT node name pattern in mmc-controller.yaml for mmc is "^mmc(@.*)?$". The Rockchip mmc nodes have been synced with Linux, so update the boot_devices constants as well. Signed-off-by: Johan Jonker Reviewed-by: Simon Glass --- arch/arm/mach-rockchip/rk3188/rk3188.c | 4 ++-- arch/arm/mach-rockchip/rk322x/rk322x.c | 4 ++-- arch/arm/mach-rockchip/rk3288/rk3288.c | 4 ++-- arch/arm/mach-rockchip/rk3328/rk3328.c | 4 ++-- arch/arm/mach-rockchip/rk3368/rk3368.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c index 5a02914e..df8fa156 100644 --- a/arch/arm/mach-rockchip/rk3188/rk3188.c +++ b/arch/arm/mach-rockchip/rk3188/rk3188.c @@ -21,8 +21,8 @@ #define GRF_BASE 0x20008000 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "/dwmmc@1021c000", - [BROM_BOOTSOURCE_SD] = "/dwmmc@10214000", + [BROM_BOOTSOURCE_EMMC] = "/mmc@1021c000", + [BROM_BOOTSOURCE_SD] = "/mmc@10214000", }; #ifdef CONFIG_DEBUG_UART_BOARD_INIT diff --git a/arch/arm/mach-rockchip/rk322x/rk322x.c b/arch/arm/mach-rockchip/rk322x/rk322x.c index ad4ac62e..a304795f 100644 --- a/arch/arm/mach-rockchip/rk322x/rk322x.c +++ b/arch/arm/mach-rockchip/rk322x/rk322x.c @@ -9,8 +9,8 @@ #include const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "/dwmmc@30020000", - [BROM_BOOTSOURCE_SD] = "/dwmmc@30000000", + [BROM_BOOTSOURCE_EMMC] = "/mmc@30020000", + [BROM_BOOTSOURCE_SD] = "/mmc@30000000", }; #ifdef CONFIG_DEBUG_UART_BOARD_INIT diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c index bc20bc5a..3ad28875 100644 --- a/arch/arm/mach-rockchip/rk3288/rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/rk3288.c @@ -28,8 +28,8 @@ DECLARE_GLOBAL_DATA_PTR; #define GRF_BASE 0xff770000 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "/dwmmc@ff0f0000", - [BROM_BOOTSOURCE_SD] = "/dwmmc@ff0c0000", + [BROM_BOOTSOURCE_EMMC] = "/mmc@ff0f0000", + [BROM_BOOTSOURCE_SD] = "/mmc@ff0c0000", }; #ifdef CONFIG_SPL_BUILD diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c index ec3336cb..de17b886 100644 --- a/arch/arm/mach-rockchip/rk3328/rk3328.c +++ b/arch/arm/mach-rockchip/rk3328/rk3328.c @@ -21,8 +21,8 @@ DECLARE_GLOBAL_DATA_PTR; #define FW_DDR_CON_REG 0xFF7C0040 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "/rksdmmc@ff520000", - [BROM_BOOTSOURCE_SD] = "/rksdmmc@ff500000", + [BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000", + [BROM_BOOTSOURCE_SD] = "/mmc@ff500000", }; static struct mm_region rk3328_mem_map[] = { diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c index 9b7132d4..d0a6107e 100644 --- a/arch/arm/mach-rockchip/rk3368/rk3368.c +++ b/arch/arm/mach-rockchip/rk3368/rk3368.c @@ -58,8 +58,8 @@ static struct mm_region rk3368_mem_map[] = { struct mm_region *mem_map = rk3368_mem_map; const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "/dwmmc@ff0f0000", - [BROM_BOOTSOURCE_SD] = "/dwmmc@ff0c0000", + [BROM_BOOTSOURCE_EMMC] = "/mmc@ff0f0000", + [BROM_BOOTSOURCE_SD] = "/mmc@ff0c0000", }; #ifdef CONFIG_ARCH_EARLY_INIT_R -- 2.20.1