From patchwork Thu Sep 15 16:52:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 12977654 X-Patchwork-Delegate: geert@linux-m68k.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90B46ECAAA1 for ; Thu, 15 Sep 2022 16:53:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229731AbiIOQxq (ORCPT ); Thu, 15 Sep 2022 12:53:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230119AbiIOQxm (ORCPT ); Thu, 15 Sep 2022 12:53:42 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24F56F2; Thu, 15 Sep 2022 09:53:41 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id k9so31850761wri.0; Thu, 15 Sep 2022 09:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=p4zPXFzEmWgLuo+i2mZoclcbSp19IgN0lgmH+INT3lc=; b=RGscQldbrixtH4VM1aTTz2PSE2Mz4g/j9su1k4VwR+w8eezShNjMUBYHRNSMnDsQLZ 9z5dyAoOuFGYhGrZ7ukgctCygt2nUujjVWQQkzMHr6XYZ8HvZIWIVr+ornpDFgz5Y+Mr HIx/VBe+696Cs56RCUVON/3CmiwusrVUQ8cu+XUw8U/62QtYZg3j2fmwsTjRJWVLXPWs fGWvGO/bqkUhmR9jVMOmbKBNAJcWKK8UEuwt43LiZc4AeOXfxXsa2DEXf67epmYzkzjA Ywi4gPZBB5d5s/9uxzvq1UD6T2bsWlqcIBQ+7ksFz2SJUgC1+H+msQ1SjUR7vZkBjaKY 7fiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=p4zPXFzEmWgLuo+i2mZoclcbSp19IgN0lgmH+INT3lc=; b=uf+roq3TR7EFW6sk0hkUqwb6m/DUcYjp9Ta23p6TrliLB/DZiZLmCEB7zdMRpk1q/W mXgvgb1Tt103kU3rvzSzsIMfOP02B7n1HjCMt1RKleXara/smaWFBBjHu3vRz2nfNRy1 IJePl5k8nsMTom8iklGhXXn1JFeFhngnjA8b30Im991z5j7nD4lmcFOADlvkr5J3vn9Z FPuQ+ZyD3A8pAPz5+9RW5wiMZtM+rmmumtxeZVdqFhzoGWpN8PdbLmUROPQybZP2gGyX el5wdoFBEjdke04DN60NKmlRLzzbJT2hdJcXUPHC5lOZW3bC6K9vimi7AQuAJ2n+b880 UzFg== X-Gm-Message-State: ACrzQf0PxL6DK5bSLcWnzONXB1m1tMs9YtN0R/tov7xC1rxG8+O9o+hs kqwL6ioY6lEC1o+NRmm1Cy8= X-Google-Smtp-Source: AMsMyM5T0VA4b5gmZF/SHhNtsIKv5qgv6/KCmvNkiR6tgSp0RDeSL56OGc3lM2iBEPphMDcAlySq0A== X-Received: by 2002:adf:f804:0:b0:228:62fd:6e9a with SMTP id s4-20020adff804000000b0022862fd6e9amr372716wrp.697.1663260819608; Thu, 15 Sep 2022 09:53:39 -0700 (PDT) Received: from prasmi.home ([2a00:23c8:2501:c701:fc6e:cfa1:9281:3490]) by smtp.gmail.com with ESMTPSA id o15-20020a05600c4fcf00b003b332a7bf15sm3562129wmq.7.2022.09.15.09.53.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 09:53:38 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Magnus Damm , Rob Herring , Krzysztof Kozlowski Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar , Biju Das , Lad Prabhakar Subject: [PATCH 1/2] arm64: dts: renesas: rzg2ul-smarc: Include SoM DTSI into board DTS Date: Thu, 15 Sep 2022 17:52:55 +0100 Message-Id: <20220915165256.352843-2-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220915165256.352843-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20220915165256.352843-1-prabhakar.mahadev-lad.rj@bp.renesas.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org From: Lad Prabhakar Move including the rzg2ul-smarc-som.dtsi from the carrier board rzg2ul-smarc.dtsi to the actual RZ/G2UL SMARC EVK board dts r9a07g043u11-smarc.dts. Also move the SW_SW0_DEV_SEL and SW_ET0_EN_N macros to board dts as they are used by SoM and carrier board DTS/I. This is in preparation of re-using the SoM and carrier board DTSIs for RZ/Five SMARC EVK. Signed-off-by: Lad Prabhakar Reviewed-by: Geert Uytterhoeven --- arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts | 12 ++++++++++++ arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts b/arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts index 121e55282d18..059885a01ede 100644 --- a/arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts +++ b/arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts @@ -6,7 +6,19 @@ */ /dts-v1/; + +/* + * DIP-Switch SW1 setting + * 1 : High; 0: Low + * SW1-2 : SW_SD0_DEV_SEL (0: uSD; 1: eMMC) + * SW1-3 : SW_ET0_EN_N (0: ETHER0; 1: CAN0, CAN1, SSI1, RSPI1) + * Please change below macros according to SW1 setting on the SoM + */ +#define SW_SW0_DEV_SEL 1 +#define SW_ET0_EN_N 1 + #include "r9a07g043.dtsi" +#include "rzg2ul-smarc-som.dtsi" #include "rzg2ul-smarc.dtsi" / { diff --git a/arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi b/arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi index f9835c12023e..2a1331ed1a5c 100644 --- a/arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi +++ b/arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi @@ -5,17 +5,6 @@ * Copyright (C) 2022 Renesas Electronics Corp. */ -/* - * DIP-Switch SW1 setting - * 1 : High; 0: Low - * SW1-2 : SW_SD0_DEV_SEL (0: uSD; 1: eMMC) - * SW1-3 : SW_ET0_EN_N (0: ETHER0; 1: CAN0, CAN1, SSI1, RSPI1) - * Please change below macros according to SW1 setting - */ -#define SW_SW0_DEV_SEL 1 -#define SW_ET0_EN_N 1 - -#include "rzg2ul-smarc-som.dtsi" #include "rzg2ul-smarc-pinfunction.dtsi" #include "rz-smarc-common.dtsi" From patchwork Thu Sep 15 16:52:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 12977656 X-Patchwork-Delegate: geert@linux-m68k.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BEDFC6FA8A for ; Thu, 15 Sep 2022 16:53:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229923AbiIOQxr (ORCPT ); Thu, 15 Sep 2022 12:53:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230141AbiIOQxn (ORCPT ); Thu, 15 Sep 2022 12:53:43 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7EB2F2; Thu, 15 Sep 2022 09:53:42 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id l17so2297806wru.2; Thu, 15 Sep 2022 09:53:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=9JkrATt2M8V3VdLQsKMdveWVvxUXnhUR+3P/iBkNBFY=; b=fAGTRetucC5vEC+0iXVBcYQLejjYf6SFPmcEzscjOxybuxHTqi180SNCyiXX9QkVNP uAzSR52XWT4wUKXjDf8dTou5DN/kaukqoZvYFJsqqtOhSOCICIoNl9zID7hDxQtH1mgR y3rp4Y+40m5MVCHkk46khyk4utKaRkM4YKctF1HNVee2CG+D6hexFE7uUU+a7a3VmMUY PaZdY3brLYCnXg598DoPhJvue4ZmnZ97Iqt0SpKiWIcvslEQY5ZQPZzuXzGOR8C7c5Cu HA2Irzq6ZociS+tksKASaMjw2nNB/GCwFoqu5xVKzcqgvPcj7EEmpaqlx9C/RM8BRshE x05w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=9JkrATt2M8V3VdLQsKMdveWVvxUXnhUR+3P/iBkNBFY=; b=pIbgSLN7iP55dN+1vlcJOhDoJacfIVCOrt26KCMroQ3jRXEAKC73VFbQk+5rYZzJsS PsfAuJ/LmmM8AKT7HgOpn3y1Evv2GjfDA7x6TVYzNjtHsO019Ew26kGZaz8Qoses+Z4c ca6ZRWLOZXplUrI9Ek20jXtqx8b6kLvU0J3HupIm9YQToaS7LVMzj13OS9DOqz+yEfYn ognPmQULZBomklSJK4ICxDegpxe4K1MYuhrrBBj1U9tfvHi9Ks9iz5mPX+/zpy+PYXL0 qM898EA+T6+ubiolyZRr5AIjZupV7SCw3hS8e+R+hYha0qTu7myFCOaIerfVNA9lmW3F bKxQ== X-Gm-Message-State: ACrzQf3hpuZI8rM/OYbOc49OfX5+cdbX+5/NsRF5pVKOAKB5IR0Y5iDt hJ+hz1IlJ+JDZNWgkILo2UQ= X-Google-Smtp-Source: AMsMyM6HziML28XjbP5dM5+Uriq1l6UwR+kdUZly71aeC/wMj4XrZ/QvpbnmX6kbUjl1aE3a84pacw== X-Received: by 2002:a5d:598e:0:b0:22a:cfe5:7ed with SMTP id n14-20020a5d598e000000b0022acfe507edmr411498wri.370.1663260821475; Thu, 15 Sep 2022 09:53:41 -0700 (PDT) Received: from prasmi.home ([2a00:23c8:2501:c701:fc6e:cfa1:9281:3490]) by smtp.gmail.com with ESMTPSA id o15-20020a05600c4fcf00b003b332a7bf15sm3562129wmq.7.2022.09.15.09.53.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 09:53:40 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Magnus Damm , Rob Herring , Krzysztof Kozlowski Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar , Biju Das , Lad Prabhakar Subject: [PATCH 2/2] arm64: dts: renesas: rzg2ul-smarc: Add /omit-if-no-ref/ to pinmux Date: Thu, 15 Sep 2022 17:52:56 +0100 Message-Id: <20220915165256.352843-3-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220915165256.352843-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20220915165256.352843-1-prabhakar.mahadev-lad.rj@bp.renesas.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org From: Lad Prabhakar In preparation to re-use the RZ/G2UL SMARC SoM and carrier DTS/I with the RZ/Five add /omit-if-no-ref/ keyword to pinmux entries as the support for RZ/Five SMARC EVK will be gradually added. Once we have full blown support for RZ/Five SMARC EVK we can get rid of the /omit-if-no-ref/ keyword. Signed-off-by: Lad Prabhakar --- .../boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi | 13 +++++++++++++ arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/arch/arm64/boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi b/arch/arm64/boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi index bd8bc858c28c..2b400100472e 100644 --- a/arch/arm64/boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi +++ b/arch/arm64/boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi @@ -12,12 +12,14 @@ &pinctrl { pinctrl-0 = <&sound_clk_pins>; pinctrl-names = "default"; + /omit-if-no-ref/ can0_pins: can0 { pinmux = , /* TX */ ; /* RX */ }; #if (SW_ET0_EN_N) + /omit-if-no-ref/ can0-stb-hog { gpio-hog; gpios = ; @@ -26,12 +28,14 @@ can0-stb-hog { }; #endif + /omit-if-no-ref/ can1_pins: can1 { pinmux = , /* TX */ ; /* RX */ }; #if (SW_ET0_EN_N) + /omit-if-no-ref/ can1-stb-hog { gpio-hog; gpios = ; @@ -40,11 +44,13 @@ can1-stb-hog { }; #endif + /omit-if-no-ref/ i2c0_pins: i2c0 { pins = "RIIC0_SDA", "RIIC0_SCL"; input-enable; }; + /omit-if-no-ref/ i2c1_pins: i2c1 { pins = "RIIC1_SDA", "RIIC1_SCL"; input-enable; @@ -55,6 +61,7 @@ scif0_pins: scif0 { ; /* RxD */ }; + /omit-if-no-ref/ sd1-pwr-en-hog { gpio-hog; gpios = ; @@ -62,6 +69,7 @@ sd1-pwr-en-hog { line-name = "sd1_pwr_en"; }; + /omit-if-no-ref/ sdhi1_pins: sd1 { sd1_data { pins = "SD1_DATA0", "SD1_DATA1", "SD1_DATA2", "SD1_DATA3"; @@ -78,6 +86,7 @@ sd1_mux { }; }; + /omit-if-no-ref/ sdhi1_pins_uhs: sd1_uhs { sd1_data_uhs { pins = "SD1_DATA0", "SD1_DATA1", "SD1_DATA2", "SD1_DATA3"; @@ -94,11 +103,13 @@ sd1_mux_uhs { }; }; + /omit-if-no-ref/ sound_clk_pins: sound_clk { pins = "AUDIO_CLK1", "AUDIO_CLK2"; input-enable; }; + /omit-if-no-ref/ ssi1_pins: ssi1 { pinmux = , /* BCK */ , /* RCK */ @@ -106,12 +117,14 @@ ssi1_pins: ssi1 { ; /* RXD */ }; + /omit-if-no-ref/ usb0_pins: usb0 { pinmux = , /* VBUS */ , /* OVC */ ; /* OTG_ID */ }; + /omit-if-no-ref/ usb1_pins: usb1 { pinmux = , /* OVC */ ; /* VBUS */ diff --git a/arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi b/arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi index 2a0feb53f0dc..a0a41a062f55 100644 --- a/arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi +++ b/arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi @@ -132,10 +132,12 @@ &ostm2 { }; &pinctrl { + /omit-if-no-ref/ adc_pins: adc { pinmux = ; /* ADC_TRG */ }; + /omit-if-no-ref/ eth0_pins: eth0 { pinmux = , /* ET0_LINKSTA */ , /* ET0_MDC */ @@ -154,6 +156,7 @@ eth0_pins: eth0 { ; /* ET0_RXD3 */ }; + /omit-if-no-ref/ eth1_pins: eth1 { pinmux = , /* ET1_LINKSTA */ , /* ET1_MDC */ @@ -172,6 +175,7 @@ eth1_pins: eth1 { ; /* ET1_RXD3 */ }; + /omit-if-no-ref/ sdhi0_emmc_pins: sd0emmc { sd0_emmc_data { pins = "SD0_DATA0", "SD0_DATA1", "SD0_DATA2", "SD0_DATA3", @@ -190,6 +194,7 @@ sd0_emmc_rst { }; }; + /omit-if-no-ref/ sdhi0_pins: sd0 { sd0_data { pins = "SD0_DATA0", "SD0_DATA1", "SD0_DATA2", "SD0_DATA3"; @@ -206,6 +211,7 @@ sd0_mux { }; }; + /omit-if-no-ref/ sdhi0_pins_uhs: sd0_uhs { sd0_data_uhs { pins = "SD0_DATA0", "SD0_DATA1", "SD0_DATA2", "SD0_DATA3"; @@ -222,6 +228,7 @@ sd0_mux_uhs { }; }; + /omit-if-no-ref/ spi1_pins: rspi1 { pinmux = , /* CK */ , /* MOSI */