From patchwork Wed Jul 15 08:34:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1496 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 94CA03F1D9 for ; Wed, 15 Jul 2020 10:35:03 +0200 (CEST) Received: by mail-pj1-f70.google.com with SMTP id t12sf2168036pju.8 for ; Wed, 15 Jul 2020 01:35:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1594802102; cv=pass; d=google.com; s=arc-20160816; b=nB59PSyJ/1GIUvU9UG5K6MeZH3vB0CJ9rBN8psEt9PFxZvfiuf9FTkqDxpQgdX4Fyi 2pJPSuPvmDkpKhcByQ/hZhniAc3DVZADlefw+RqQdGeuG9pglpge+lbTBs9705dEem11 P68S10moJy3PdNQ88qy6OWtZebxiK0GqzwHw0IKtSkVS5iFbmfR5wK9HNmfC9tFx3tFx XPFOcEImHbgWxHYyfkt5WxFhXXm5ChtDV5g1xACTsCpzwP79+C1wo3Mt8mBymbTmEXnq 7MmXbmnpRNa/R3V7x1lG5mgYEqiIfORLMh5gFZXcHZgjYZtbciNVzmxOUQLuDgkRvGTS cZJw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ev92nK3PTZQMRnaly/D7m+BjWgcgbOy5VJRzephHC0Q=; b=soEDQgp2gPBlnH+AsMN4LjVWwXP8mu8wgiOBRQor/jGmyjvDgzfzDSPQUQdx1iz0Do FqHF38iLFwhw7QJT9+tSJ/U3XaYE9G2p6HoBK/H9Ht2UUe1gVS2VIp/E/eXaCCkLK9y/ dHYsiw8F6I3vLJaQjJWM8QzgZsn5Nal1IuoyCbEkRjbG0uulvveFSx/r1VoBMyOfHk8Q YBdDyg3tQLDj5eU6Hzmcvi4VH+KyrfuysdbOV7e5s5XoimIubBEAz8NZ/8u6MA+PhcK0 qc4j9Z5T+gpTvhV5Pl2PvPEgHxXyjTeLQUwZfa2kfEcyzHsUoAIrbONgj7whXKSYO3vK 22sQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=D99E52J1; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=ev92nK3PTZQMRnaly/D7m+BjWgcgbOy5VJRzephHC0Q=; b=K2CesHdv7NH4aTOZsizvCo2s5/yYgCYUxRCsipdlfidQXH93yX9UU/AacbW3JFDPMj YSKpM/6h53X9+3Ad50Imm7ECdI5taS9G+oSSICRysHwLradUHxvjeW9wuWpcR2hI3mop xder88p+nRG+KZgTIsk4Ed8lGIoBxnDHfFP2I= 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:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=ev92nK3PTZQMRnaly/D7m+BjWgcgbOy5VJRzephHC0Q=; b=sBwRRR36/iOy40Lw58YsAeIZa94zXyq9cG6yfDApQk2rVk29lO4dMs2gYq6Un6Ewgp fjdTVOpoYgVrO+FL5HB2rylfr7mUKBB2Zd1Su2yvsSz33HBjXOZjBAHl4BFCUl+KCa/C BvzC9AwfjF9z+nrNOy2cjGZ/+D/Xi8LGOcdZ69ZKAtwyw0yC6maD6owq7uZaj/6yTGX3 AwBmZRSjm5ogFBaO9kLd6TB/UkFS/3Izg53xzDXgJLe7ekTCh8JnZHNUZ/uS0T49RnhJ wFa5nOD9EbNR5ANG0Gma12TgESl0c6OTGU+I2TmPnqm3umFHPZYsodqnAQ3oanhMYKBV sOEA== X-Gm-Message-State: AOAM533kcHPeH3r5L0SXaJH/1Dv84fhjOmG3DoCzCSHklHfCWJ0dijDz LUSyL8AdVLv2kdl2/crlgaCr0Jwl X-Google-Smtp-Source: ABdhPJzALiWOJju6aqPNrGF9HjHdjIoE9nrWCIXaEA9b8tGDhxuBRa/8rKjv12YhpUgPvkUd8yANgg== X-Received: by 2002:a17:90a:cf01:: with SMTP id h1mr9020504pju.234.1594802102440; Wed, 15 Jul 2020 01:35:02 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:525b:: with SMTP id s27ls628106pgl.11.gmail; Wed, 15 Jul 2020 01:35:02 -0700 (PDT) X-Received: by 2002:a62:3741:: with SMTP id e62mr7626636pfa.127.1594802101746; Wed, 15 Jul 2020 01:35:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594802101; cv=none; d=google.com; s=arc-20160816; b=cwmwdRRVbj6E3AfZOv3lMNnfhp02j8av9mLI8aNUJGR+ycoy0355Uxfmcvjxyi5z1+ mTCS1BHePVbRr/5IBnAhnpl2FyJahjQNw9H+S+frhM8K0V71nAzZtNEFHtbfDVa96OuR f+9Ob5DQUKSuEaWbLP4fE0z4+WjfesIqmUu1T9u2lBEYoZwi27UPWkDAYGyxqm9n5eVR zfYVR64VbpNTOGAPJz1CuDXpfJUc3cAVXe9K90p1OdYbbxyCIj7mQa3yOiSbGXKxqwme BistlH+brPs9itkYdISu0PRMbE9GBGtgOtfjf2AVlqLWBell8dlMMmuPDU2N9KdIon3m oVcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=5Gf+3b18Fng3ehSSzSlGlAKgiKsSEaA+C81WsDyFW3w=; b=Wn4q5mQhOBWGJm1anoiUn0f9YAgixFxpO5yeWwJ4bO38FyK8TA8Sxp7G7vGEpa5uGi V3hmccZA1B8T3YRjkx3AtirV3O6eVrKhizZGRuepZYl8TIeSYj3tvPRXkZJd4ezyO54O +E2DfpyN3eWlWvlMuhWhN3IGBzbKPTVYqx8Psy3npFiBUj9kWDIXE5wo4Hmn7j271O2b usLhr7Gd4ub+nZySshb51guyBd6e85uO5YCOzwS9a4kkjqDpMTfvZl9O2Gg4kYgT4bM8 CaXwOQy+6Lw+OysIg5+NF8nqnPHmV4Ukum6K1Vw+UwaN+X6nQPcO7DXrcbEJEQ0UJ/ib rbBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=D99E52J1; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y8sor1827009pfq.18.2020.07.15.01.35.01 for (Google Transport Security); Wed, 15 Jul 2020 01:35:01 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a62:88d4:: with SMTP id l203mr7603870pfd.205.1594802101431; Wed, 15 Jul 2020 01:35:01 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:9887:56a8:c916:cfdb]) by smtp.gmail.com with ESMTPSA id m92sm1467584pje.13.2020.07.15.01.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 01:35:00 -0700 (PDT) From: Jagan Teki To: Heiko Stuebner , Rob Herring Cc: Suniel Mahesh , Michael Trimarchi , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amarula , Jagan Teki Subject: [PATCH v6 4/7] arm64: dts: rk3399pro: vmarc-som: Move common properties into Carrier Date: Wed, 15 Jul 2020 14:04:15 +0530 Message-Id: <20200715083418.112003-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200715083418.112003-1-jagan@amarulasolutions.com> References: <20200715083418.112003-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=D99E52J1; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Some of gmac, sdmmc node properties are common across rk3288 and rk3399pro SOM's so move them into Carrier dtsi. Chosen node is specific to rk3399pro configure SBC, so move it into RockPI N10 dts. Signed-off-by: Jagan Teki --- Changes for v6: - spilt of previous version Trivial patch .../dts/rockchip-radxa-dalang-carrier.dtsi | 18 ++++++++++++---- .../dts/rockchip/rk3399pro-rock-pi-n10.dts | 4 ++++ .../dts/rockchip/rk3399pro-vmarc-som.dtsi | 21 +++++-------------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi index 00b200a62263..450e5bb5af0b 100644 --- a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi +++ b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi @@ -8,8 +8,11 @@ #include / { - chosen { - stdout-path = "serial2:1500000n8"; + clkin_gmac: external-gmac-clock { + compatible = "fixed-clock"; + clock-frequency = <125000000>; + clock-output-names = "clkin_gmac"; + #clock-cells = <0>; }; vcc12v_dcin: vcc12v-dcin-regulator { @@ -33,6 +36,15 @@ vcc5v0_sys: vcc5v0-sys-regulator { }; &gmac { + assigned-clock-parents = <&clkin_gmac>; + clock_in_out = "input"; + phy-mode = "rgmii"; + pinctrl-names = "default"; + pinctrl-0 = <&rgmii_pins>; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 50000>; + tx_delay = <0x28>; + rx_delay = <0x11>; status = "okay"; }; @@ -48,10 +60,8 @@ &sdmmc { bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; - cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; disable-wp; vqmmc-supply = <&vccio_sd>; - max-frequency = <150000000>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts index 539f4005386d..369de5dc0ebd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts @@ -15,4 +15,8 @@ / { model = "Radxa ROCK Pi N10"; compatible = "radxa,rockpi-n10", "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro"; + + chosen { + stdout-path = "serial2:1500000n8"; + }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi index d8fa8127d9dc..37ed95d5f7e9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi @@ -11,13 +11,6 @@ / { compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro"; - - clkin_gmac: external-gmac-clock { - compatible = "fixed-clock"; - clock-frequency = <125000000>; - clock-output-names = "clkin_gmac"; - #clock-cells = <0>; - }; }; &cpu_l0 { @@ -42,17 +35,8 @@ &emmc_phy { &gmac { assigned-clocks = <&cru SCLK_RMII_SRC>; - assigned-clock-parents = <&clkin_gmac>; - clock_in_out = "input"; phy-supply = <&vcc_lan>; - phy-mode = "rgmii"; - pinctrl-names = "default"; - pinctrl-0 = <&rgmii_pins>; snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 10000 50000>; - tx_delay = <0x28>; - rx_delay = <0x11>; }; &i2c0 { @@ -335,6 +319,11 @@ &sdhci { status = "okay"; }; +&sdmmc { + cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; + max-frequency = <150000000>; +}; + &tsadc { rockchip,hw-tshut-mode = <1>; rockchip,hw-tshut-polarity = <1>;