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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40D6AC4338F for ; Sat, 21 Aug 2021 01:47:19 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 425AD61167 for ; Sat, 21 Aug 2021 01:47:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 425AD61167 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DEA5480F4B; Sat, 21 Aug 2021 03:47:14 +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="BvVpuD9U"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EA67481BDA; Sat, 21 Aug 2021 03:47:12 +0200 (CEST) Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) (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 0582780C85 for ; Sat, 21 Aug 2021 03:47:06 +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=macroalpha82@gmail.com Received: by mail-ot1-x333.google.com with SMTP id 61-20020a9d0d430000b02903eabfc221a9so18555707oti.0 for ; Fri, 20 Aug 2021 18:47:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6jM+Y1QIOEpqNM2LsKuqDe2pbjLVCV/RqCc2OLBydLU=; b=BvVpuD9U3FG4VUcqprjrfFn6DAAK8z+dPbwYH1Kw/y5ClnpW6aXUHPVSn8dpF9epY9 Nm+ZABpdkhBCsIlNIyMPN8WvGXmpywORx/9J8ieSfG226XOsFlsFKvdCrE3JTNskJz6o flePMCtmTbmX1+728qlSrnEY7DH4wnW4xsvZP+UpjDMwiNgI7TsSl6AZUj40j2WUY7PA 6LYjhq5r4uLIXoIveFqNy4UW+zsgRtPxWqAsI/qZuXeO7AqpDSbn7wqjcaXVKi8aP3Um XyW+OwSnd4EywiKb7qz6arcBqeRf1VnngPilDbFGpODii1N8i7Rejxve07ujWNmMBwJB IIfg== 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:mime-version :content-transfer-encoding; bh=6jM+Y1QIOEpqNM2LsKuqDe2pbjLVCV/RqCc2OLBydLU=; b=quGmwnIh9YzCQ3fXWmdg19A30xTLeTeEpyoaXSsHivZYZX3EA0a31xfxucwHKIb95Q cENZwTo6Gg3qZjzBXp2DAPhaGWS2IhsOr0MQWOIBVJKDqF1byVznuTd9rKSR8TZsHB1i 5G+CLfkTCLbz1DG+aHzOA/SDT0HujTyW4APMIGfW5tN2LglGkmIPWuuTI9DHjKe2MQm7 bupGlhiicD1ZHVZDqrm56sTKeJ5wEnqQ1OK4I6wc2MOSgkysnslxuudvM1rQYjtn5T3C 54b2DxMWvEXOSG6lZvLVSzUnHKMKnCYIez9p5pglaFYdi8cYWn6e8EpeAIazhOqMvuVs oy/g== X-Gm-Message-State: AOAM532mcyCc3T1Gd/5NAjkCKP2EyNj5krIZsH3VnxKY6aNeQ3dtw6df G7A6ByMMHgIiwXlMGj3X0/rEWuYWWhc= X-Google-Smtp-Source: ABdhPJyfg9yIrarJLgmEIY9fZ0rvMi+wdPHSjvbhYvLQ7xXIC85nd2kFj0DojwTD0PJozIBi0ztLkA== X-Received: by 2002:a9d:222:: with SMTP id 31mr19715940otb.79.1629510424025; Fri, 20 Aug 2021 18:47:04 -0700 (PDT) Received: from wintermute.localdomain (cpe-76-183-134-35.tx.res.rr.com. [76.183.134.35]) by smtp.gmail.com with ESMTPSA id h17sm1851548otl.74.2021.08.20.18.47.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 18:47:03 -0700 (PDT) From: Chris Morgan To: u-boot@lists.denx.de Cc: jon.lin@rock-chips.com, kever.yang@rock-chips.com, Chris Morgan Subject: [PATCH] rockchip: px30: sync serial flash controller bindings with mainline Date: Fri, 20 Aug 2021 20:46:58 -0500 Message-Id: <20210821014658.20952-1-macroalpha82@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean From: Chris Morgan The devicetree submitted and approved for the mainline linux kernel is slightly different than the one present here. This syncs both devicetrees (for the Rockchip SFC node at least) present on the PX30 and the Odroid Go Advance. Changes include renaming the flash node, reordering the values in the SFC node for the rk3326-odroid-go2, changing the name of the cs pinctrl node to cs0, and updating the u-boot specific tree to utilize the new flash node value. Signed-off-by: Chris Morgan --- arch/arm/dts/px30.dtsi | 4 ++-- arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 2 +- arch/arm/dts/rk3326-odroid-go2.dts | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/dts/px30.dtsi b/arch/arm/dts/px30.dtsi index aaa8ae2235..ef706486dc 100644 --- a/arch/arm/dts/px30.dtsi +++ b/arch/arm/dts/px30.dtsi @@ -967,7 +967,7 @@ clocks = <&cru SCLK_SFC>, <&cru HCLK_SFC>; clock-names = "clk_sfc", "hclk_sfc"; pinctrl-names = "default"; - pinctrl-0 = <&sfc_clk &sfc_cs &sfc_bus4>; + pinctrl-0 = <&sfc_clk &sfc_cs0 &sfc_bus4>; power-domains = <&power PX30_PD_MMC_NAND>; status = "disabled"; }; @@ -1953,7 +1953,7 @@ <1 RK_PA1 3 &pcfg_pull_none>; }; - sfc_cs: sfc-cs { + sfc_cs0: sfc-cs0 { rockchip,pins = <1 RK_PA4 3 &pcfg_pull_none>; }; diff --git a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi index 741e8dd935..0990005a15 100644 --- a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi +++ b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi @@ -70,7 +70,7 @@ u-boot,dm-pre-reloc; }; -&spi_flash { +&{/sfc@ff3a0000/flash@0} { u-boot,dm-pre-reloc; }; diff --git a/arch/arm/dts/rk3326-odroid-go2.dts b/arch/arm/dts/rk3326-odroid-go2.dts index 6f91f5040b..4e3dceecbe 100644 --- a/arch/arm/dts/rk3326-odroid-go2.dts +++ b/arch/arm/dts/rk3326-odroid-go2.dts @@ -618,18 +618,18 @@ }; &sfc { + pinctrl-0 = <&sfc_clk &sfc_cs0 &sfc_bus2>; + pinctrl-names = "default"; #address-cells = <1>; #size-cells = <0>; - pinctrl-names = "default"; - pinctrl-0 = <&sfc_clk &sfc_cs &sfc_bus2>; status = "okay"; - spi_flash: xt25f128b@0 { + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <108000000>; spi-rx-bus-width = <2>; - spi-tx-bus-width = <2>; + spi-tx-bus-width = <1>; }; }; -- 2.25.1