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 322EFC433EF for ; Mon, 2 May 2022 09:42:36 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B957583B2C; Mon, 2 May 2022 11:42:33 +0200 (CEST) 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="d6XegQbV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 34C1C83BDB; Mon, 2 May 2022 11:42:32 +0200 (CEST) Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) (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 BB16483439 for ; Mon, 2 May 2022 11:42:29 +0200 (CEST) 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-x634.google.com with SMTP id y3so26679713ejo.12 for ; Mon, 02 May 2022 02:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BjHy2KZxnrwRp5Cth0bhHxvAZ+IlNaM+UqwOsfVfiAY=; b=d6XegQbVtnOy4omfAfZJBZn4RIzzsZTCNnsbshP32SDwL22ugOpKqnnRkWFZqdu3Yj z1pb0irVbA+LWSrrI/Muwpzv9PQANLfM7T0nvFE20TcGMuGj8CE2nO2fHZi59AGM98wn KmqSYAT1cURF4MpHp5W1bzVHwmPWLTuM5Tq/YAGtDshrH3F7meMK4Zn1weMts/0UtNeK VPj2pq9JsdC4cXqwuA9g/+Jnpqfn+OJ6yb6tdKh9l6stOiO/9GMrHfA8UylW9ibdt2XM DCbUaWFHmEHDcBuoCp8NgG7c+OkeGx/Zm5Gv+ZfQyx435/Um3cpsj89ka0aEAr9Obc1X 4Z4g== 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:mime-version :content-transfer-encoding; bh=BjHy2KZxnrwRp5Cth0bhHxvAZ+IlNaM+UqwOsfVfiAY=; b=66IVkfgS9zOjtF1yFSzrmlb45ItiGyPQ/PesluqYWgEksq4bxDoDUsHK75lOEppbR1 sFPqV8szDM5DKB7AWLvqbSVEXY9CsKgXsVvc/8SgyTOa2OJ033AYJCr/RxGCoukbC2ps kFonaWdiYQ553h75G3iuwLdAaNNK4FRkX1jLKVAFW7qkLd1QcVox7WM7piJo0Z2cUddy w8Qaaux1dET3GatCQC0ThQ65Jp7WJ2C5mu5gU1586ItXlpgp6Jjzj2cGlhgneRZ5tlyJ b8wqvX6dT/5DtQhUCnlssAnqCWx11P6nC63+XQjT//7aqSVhs1z27lJcAWU6q68to0bI nNhw== X-Gm-Message-State: AOAM530uJMtiNQJiJmJBLMN0+AJxKEuk97Zei+QyZ3G4783GJyWitrbc hrhSbUC3W4URQjMQc1PgOnc= X-Google-Smtp-Source: ABdhPJwOvRGIDYdyHGN251iPwu/7f5q+Mr2c7lI/2VNkQwPlBtUls+sxbqAlRCLM8+aVcyUJEDFRNA== X-Received: by 2002:a17:906:3082:b0:6e0:111f:8986 with SMTP id 2-20020a170906308200b006e0111f8986mr10297923ejv.677.1651484549325; Mon, 02 May 2022 02:42:29 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id k6-20020aa7d8c6000000b0042617ba63d0sm6478605eds.90.2022.05.02.02.42.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 02:42:28 -0700 (PDT) From: Johan Jonker To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, u-boot@lists.denx.de Subject: [PATCH v1] arm: dts: rockchip: rk3288: rename mmc nodenames Date: Mon, 2 May 2022 11:42:22 +0200 Message-Id: <20220502094222.10398-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.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 The boot_devices constants for rk3288 were changed to match the binding, but the dtsi file was not synced. Fix by renaming the rk3288 mmc node names. Also correct the clock name for "ciu-drive". Signed-off-by: Johan Jonker --- arch/arm/dts/rk3288.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi index 5e40e741..0bfa4c39 100644 --- a/arch/arm/dts/rk3288.dtsi +++ b/arch/arm/dts/rk3288.dtsi @@ -150,48 +150,48 @@ ports = <&vopl_out>, <&vopb_out>; }; - sdmmc: dwmmc@ff0c0000 { + sdmmc: mmc@ff0c0000 { compatible = "rockchip,rk3288-dw-mshc"; max-frequency = <150000000>; clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>, <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>; - clock-names = "biu", "ciu", "ciu_drv", "ciu_sample"; + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; fifo-depth = <0x100>; interrupts = ; reg = <0xff0c0000 0x4000>; status = "disabled"; }; - sdio0: dwmmc@ff0d0000 { + sdio0: mmc@ff0d0000 { compatible = "rockchip,rk3288-dw-mshc"; max-frequency = <150000000>; clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>, <&cru SCLK_SDIO0_DRV>, <&cru SCLK_SDIO0_SAMPLE>; - clock-names = "biu", "ciu", "ciu_drv", "ciu_sample"; + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; fifo-depth = <0x100>; interrupts = ; reg = <0xff0d0000 0x4000>; status = "disabled"; }; - sdio1: dwmmc@ff0e0000 { + sdio1: mmc@ff0e0000 { compatible = "rockchip,rk3288-dw-mshc"; max-frequency = <150000000>; clocks = <&cru HCLK_SDIO1>, <&cru SCLK_SDIO1>, <&cru SCLK_SDIO1_DRV>, <&cru SCLK_SDIO1_SAMPLE>; - clock-names = "biu", "ciu", "ciu_drv", "ciu_sample"; + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; fifo-depth = <0x100>; interrupts = ; reg = <0xff0e0000 0x4000>; status = "disabled"; }; - emmc: dwmmc@ff0f0000 { + emmc: mmc@ff0f0000 { compatible = "rockchip,rk3288-dw-mshc"; max-frequency = <150000000>; clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>, <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>; - clock-names = "biu", "ciu", "ciu_drv", "ciu_sample"; + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; fifo-depth = <0x100>; interrupts = ; reg = <0xff0f0000 0x4000>; -- 2.20.1