diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-09-10 20:39:50 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-09-10 20:39:50 +0200 |
| commit | 93bf93308b5aad49a6575406966b3ab2047e14d3 (patch) | |
| tree | cdfffe437d6cd1e80e6de04a6bae7d04bf399001 | |
| parent | ee1d00997cb9e7af38627cb0ac39f6297aee44c9 (diff) | |
| parent | e824af454ceb354b1bebc50ca09ef2b1df9ca1ab (diff) | |
| download | kernel-4.19.0-0.rc3.git0.1.vanilla.knurd.1.fc30.tar.gz kernel-4.19.0-0.rc3.git0.1.vanilla.knurd.1.fc30.tar.xz kernel-4.19.0-0.rc3.git0.1.vanilla.knurd.1.fc30.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc3.git0.1.vanilla.knurd.1.fc30kernel-4.19.0-0.rc3.git0.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc3.git0.1.vanilla.knurd.1.fc28kernel-4.19.0-0.rc3.git0.1.vanilla.knurd.1.fc27
| -rw-r--r-- | arm64-96boards-Rock960-CE-board-support.patch | 1659 | ||||
| -rw-r--r-- | bcm2835-hwmon-Add-support-for-RPi-voltage-sensor.patch | 30 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 24 | ||||
| -rw-r--r-- | sources | 3 |
5 files changed, 1679 insertions, 39 deletions
diff --git a/arm64-96boards-Rock960-CE-board-support.patch b/arm64-96boards-Rock960-CE-board-support.patch new file mode 100644 index 000000000..ee1fef5ec --- /dev/null +++ b/arm64-96boards-Rock960-CE-board-support.patch @@ -0,0 +1,1659 @@ +From patchwork Mon Sep 10 15:13:53 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Manivannan Sadhasivam + <manivannan.sadhasivam@linaro.org> +X-Patchwork-Id: 10594431 +Return-Path: + <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> +Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org + [172.30.200.125]) + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 73CD514BD + for <patchwork-linux-arm@patchwork.kernel.org>; + Mon, 10 Sep 2018 15:15:33 +0000 (UTC) +Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) + by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D47C28C27 + for <patchwork-linux-arm@patchwork.kernel.org>; + Mon, 10 Sep 2018 15:15:33 +0000 (UTC) +Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) + id 5116628C53; Mon, 10 Sep 2018 15:15:33 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on + pdx-wl-mail.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 +Received: from bombadil.infradead.org (bombadil.infradead.org + [198.137.202.133]) + (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EDF1528C27 + for <patchwork-linux-arm@patchwork.kernel.org>; + Mon, 10 Sep 2018 15:15:31 +0000 (UTC) +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=bombadil.20170209; h=Sender: + Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: + List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: + In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: + Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc + :Resent-Message-ID:List-Owner; + bh=MsLZPB+rA3nDtNH8e90hVGAuKXNRnfg7yUTFRVYc6dI=; b=h4EvyRF3c6JHDN+V8CA1aCQ+Z1 + YJv25g2qREcfTe43jtJB8EdndYJJvCH7lwCqcySm4a7gc6OmLzMHyOkbJpY5btuCSASttz84P5UQR + nQohc2vi6Gw0/0sRPpWedlb3lyVDOjQTqssy1EJ5AfGmF4zixU86HPfI/HSSMdvThPOtryoX5RLTb + ibxf8tARxEuJj2etn2yjSOPGVh/cqqFoYQ8bYx79baCtrqIhbZyf0FThVXv5zFoZs8P4dkl+6bQxL + g7qcM3JpsT5cNwPtXWHQu9wqV81v3HfC0KnEFn6LcoB3TE/ZwGpgPZjflJrCqpqAk7kWeWW+2dI4C + FHizu/pA==; +Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) + by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) + id 1fzNuN-00006z-Ln; Mon, 10 Sep 2018 15:15:23 +0000 +Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) + by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) + id 1fzNtW-0007s1-E0 + for linux-arm-kernel@lists.infradead.org; Mon, 10 Sep 2018 15:14:34 +0000 +Received: by mail-pg1-x543.google.com with SMTP id 7-v6so10649320pgf.2 + for <linux-arm-kernel@lists.infradead.org>; + Mon, 10 Sep 2018 08:14:28 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=Eog9j9IcKFaAzJXy1OcDk20W/serCK49+v6e5E41fYs=; + b=UumzTjrKvICkslj9/rY1Ypqo4g/VFWMM/z4LWlc0YmDX6R7J7mkz84ZdTL5XsoDcXH + bIJYtcSPWxrKlCExdB+l76HrTiEIwBTSpa+43+zkBZmBL96zkDP+ttgtuhQHuHLySPkk + e5/P5mAeV67NX82dCuBHtDGkNgnXHKwGYVJ4E= +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; + bh=Eog9j9IcKFaAzJXy1OcDk20W/serCK49+v6e5E41fYs=; + b=Zs0nhcL8gTYkjWpXtvcZzWYogSg7OWkFayoR/xLbsQSFpBzZ2Bz3l3SHbpp2ik8r4q + ttai7OC70sE0YX+07kWmUskhY6DZ9v9Y9C12Gorn7R2Vrb8d9bJ0iYC/WDBKpvqPXRJh + qxhB8hZQSDN5n1o7575Zra770wEz+2ZpuYn0XqV0Eu1GsTHpg2DM81R/ee2QB0H+DSPc + nzWzZ0d1nw4hFMVzaZX/NxGZG8y0n0xJ1cczcixZk0i5rA8laVOK0F6NSIM0hSlVmpbA + w8ABebeQMFhjDJzyuhpitWNVSqXUd8lL66MmLCJN0ywvaKlkCTOA3+YzKC3i13DI5GDe + l3Uw== +X-Gm-Message-State: APzg51DkGQG9g2kFMP8auJcqLZzVe9v0wPZb5nX0QBtWinR+6ggMBUHP + q7OTJ5nOg3//Y7mKlI8nThBh +X-Google-Smtp-Source: + ANB0VdazLqQZTiVhxGQkZGzXM/aTQSynf/Y1rCmuJyISmCcXxPMDwVVko2CYJbgXHjZ/o6nqP2KzHA== +X-Received: by 2002:a62:63c2:: with SMTP id + x185-v6mr24200641pfb.13.1536592467755; + Mon, 10 Sep 2018 08:14:27 -0700 (PDT) +Received: from localhost.localdomain + ([2405:204:728c:6bba:60a8:6c40:2817:7ee1]) + by smtp.gmail.com with ESMTPSA id e202-v6sm26703907pfh.16.2018.09.10.08.14.19 + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Mon, 10 Sep 2018 08:14:27 -0700 (PDT) +From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> +To: heiko@sntech.de, + robh+dt@kernel.org +Subject: [PATCH 1/4] arm64: dts: rockchip: Split out common nodes for Rock960 + based boards +Date: Mon, 10 Sep 2018 20:43:53 +0530 +Message-Id: <20180910151356.25946-2-manivannan.sadhasivam@linaro.org> +X-Mailer: git-send-email 2.17.1 +In-Reply-To: <20180910151356.25946-1-manivannan.sadhasivam@linaro.org> +References: <20180910151356.25946-1-manivannan.sadhasivam@linaro.org> +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20180910_081430_502727_1CA120A0 +X-CRM114-Status: GOOD ( 17.07 ) +X-BeenThere: linux-arm-kernel@lists.infradead.org +X-Mailman-Version: 2.1.21 +Precedence: list +List-Id: <linux-arm-kernel.lists.infradead.org> +List-Unsubscribe: + <http://lists.infradead.org/mailman/options/linux-arm-kernel>, + <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> +List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> +List-Post: <mailto:linux-arm-kernel@lists.infradead.org> +List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> +List-Subscribe: + <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, + <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> +Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, + tom@vamrs.com, amit.kucheria@linaro.org, shawn.lin@rock-chips.com, + linux-kernel@vger.kernel.org, vicencb@gmail.com, dev@vamrs.com, + linux-rockchip@lists.infradead.org, pbrobinson@gmail.com, + Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, + enric.balletbo@collabora.com, ezequiel@collabora.com, stephen@vamrs.com +MIME-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> +Errors-To: + linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org +X-Virus-Scanned: ClamAV using ClamSMTP + +Since the same family members of Rock960 boards (Rock960 and Ficus) +share the same configuration, split out the common nodes into a common +dtsi file for reducing code duplication. The board specific nodes for +Ficus boards are then placed in corresponding board DTS file. + +Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> +--- + arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 429 +---------------- + .../boot/dts/rockchip/rk3399-rock960.dtsi | 439 ++++++++++++++++++ + 2 files changed, 440 insertions(+), 428 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts b/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts +index 8978d924eb83..7f6ec37d5a69 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts +@@ -7,8 +7,7 @@ + */ + + /dts-v1/; +-#include "rk3399.dtsi" +-#include "rk3399-opp.dtsi" ++#include "rk3399-rock960.dtsi" + + / { + model = "96boards RK3399 Ficus"; +@@ -25,31 +24,6 @@ + #clock-cells = <0>; + }; + +- vcc1v8_s0: vcc1v8-s0 { +- compatible = "regulator-fixed"; +- regulator-name = "vcc1v8_s0"; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <1800000>; +- regulator-always-on; +- }; +- +- vcc_sys: vcc-sys { +- compatible = "regulator-fixed"; +- regulator-name = "vcc_sys"; +- regulator-min-microvolt = <5000000>; +- regulator-max-microvolt = <5000000>; +- regulator-always-on; +- }; +- +- vcc3v3_sys: vcc3v3-sys { +- compatible = "regulator-fixed"; +- regulator-name = "vcc3v3_sys"; +- regulator-min-microvolt = <3300000>; +- regulator-max-microvolt = <3300000>; +- regulator-always-on; +- vin-supply = <&vcc_sys>; +- }; +- + vcc3v3_pcie: vcc3v3-pcie-regulator { + compatible = "regulator-fixed"; + enable-active-high; +@@ -75,46 +49,6 @@ + regulator-always-on; + vin-supply = <&vcc_sys>; + }; +- +- vdd_log: vdd-log { +- compatible = "pwm-regulator"; +- pwms = <&pwm2 0 25000 0>; +- regulator-name = "vdd_log"; +- regulator-min-microvolt = <800000>; +- regulator-max-microvolt = <1400000>; +- regulator-always-on; +- regulator-boot-on; +- vin-supply = <&vcc_sys>; +- }; +- +-}; +- +-&cpu_l0 { +- cpu-supply = <&vdd_cpu_l>; +-}; +- +-&cpu_l1 { +- cpu-supply = <&vdd_cpu_l>; +-}; +- +-&cpu_l2 { +- cpu-supply = <&vdd_cpu_l>; +-}; +- +-&cpu_l3 { +- cpu-supply = <&vdd_cpu_l>; +-}; +- +-&cpu_b0 { +- cpu-supply = <&vdd_cpu_b>; +-}; +- +-&cpu_b1 { +- cpu-supply = <&vdd_cpu_b>; +-}; +- +-&emmc_phy { +- status = "okay"; + }; + + &gmac { +@@ -133,263 +67,6 @@ + status = "okay"; + }; + +-&hdmi { +- ddc-i2c-bus = <&i2c3>; +- pinctrl-names = "default"; +- pinctrl-0 = <&hdmi_cec>; +- status = "okay"; +-}; +- +-&i2c0 { +- clock-frequency = <400000>; +- i2c-scl-rising-time-ns = <168>; +- i2c-scl-falling-time-ns = <4>; +- status = "okay"; +- +- vdd_cpu_b: regulator@40 { +- compatible = "silergy,syr827"; +- reg = <0x40>; +- fcs,suspend-voltage-selector = <1>; +- regulator-name = "vdd_cpu_b"; +- regulator-min-microvolt = <712500>; +- regulator-max-microvolt = <1500000>; +- regulator-ramp-delay = <1000>; +- regulator-always-on; +- regulator-boot-on; +- vin-supply = <&vcc_sys>; +- status = "okay"; +- +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- +- vdd_gpu: regulator@41 { +- compatible = "silergy,syr828"; +- reg = <0x41>; +- fcs,suspend-voltage-selector = <1>; +- regulator-name = "vdd_gpu"; +- regulator-min-microvolt = <712500>; +- regulator-max-microvolt = <1500000>; +- regulator-ramp-delay = <1000>; +- regulator-always-on; +- regulator-boot-on; +- vin-supply = <&vcc_sys>; +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- +- rk808: pmic@1b { +- compatible = "rockchip,rk808"; +- reg = <0x1b>; +- interrupt-parent = <&gpio1>; +- interrupts = <21 IRQ_TYPE_LEVEL_LOW>; +- pinctrl-names = "default"; +- pinctrl-0 = <&pmic_int_l>; +- rockchip,system-power-controller; +- wakeup-source; +- #clock-cells = <1>; +- clock-output-names = "xin32k", "rk808-clkout2"; +- +- vcc1-supply = <&vcc_sys>; +- vcc2-supply = <&vcc_sys>; +- vcc3-supply = <&vcc_sys>; +- vcc4-supply = <&vcc_sys>; +- vcc6-supply = <&vcc_sys>; +- vcc7-supply = <&vcc_sys>; +- vcc8-supply = <&vcc3v3_sys>; +- vcc9-supply = <&vcc_sys>; +- vcc10-supply = <&vcc_sys>; +- vcc11-supply = <&vcc_sys>; +- vcc12-supply = <&vcc3v3_sys>; +- vddio-supply = <&vcc_1v8>; +- +- regulators { +- vdd_center: DCDC_REG1 { +- regulator-name = "vdd_center"; +- regulator-min-microvolt = <750000>; +- regulator-max-microvolt = <1350000>; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- +- vdd_cpu_l: DCDC_REG2 { +- regulator-name = "vdd_cpu_l"; +- regulator-min-microvolt = <750000>; +- regulator-max-microvolt = <1350000>; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-off-in-suspend; +- }; +- }; +- +- vcc_ddr: DCDC_REG3 { +- regulator-name = "vcc_ddr"; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- }; +- }; +- +- vcc_1v8: DCDC_REG4 { +- regulator-name = "vcc_1v8"; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <1800000>; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <1800000>; +- }; +- }; +- +- vcc1v8_dvp: LDO_REG1 { +- regulator-name = "vcc1v8_dvp"; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <1800000>; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <1800000>; +- }; +- }; +- +- vcca1v8_hdmi: LDO_REG2 { +- regulator-name = "vcca1v8_hdmi"; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <1800000>; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <1800000>; +- }; +- }; +- +- vcca_1v8: LDO_REG3 { +- regulator-name = "vcca_1v8"; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <1800000>; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <1800000>; +- }; +- }; +- +- vcc_sd: LDO_REG4 { +- regulator-name = "vcc_sd"; +- regulator-min-microvolt = <1800000>; +- regulator-max-microvolt = <3300000>; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <3300000>; +- }; +- }; +- +- vcc3v0_sd: LDO_REG5 { +- regulator-name = "vcc3v0_sd"; +- regulator-min-microvolt = <3000000>; +- regulator-max-microvolt = <3000000>; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <3000000>; +- }; +- }; +- +- vcc_1v5: LDO_REG6 { +- regulator-name = "vcc_1v5"; +- regulator-min-microvolt = <1500000>; +- regulator-max-microvolt = <1500000>; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <1500000>; +- }; +- }; +- +- vcca0v9_hdmi: LDO_REG7 { +- regulator-name = "vcca0v9_hdmi"; +- regulator-min-microvolt = <900000>; +- regulator-max-microvolt = <900000>; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <900000>; +- }; +- }; +- +- vcc_3v0: LDO_REG8 { +- regulator-name = "vcc_3v0"; +- regulator-min-microvolt = <3000000>; +- regulator-max-microvolt = <3000000>; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <3000000>; +- }; +- }; +- +- vcc3v3_s3: SWITCH_REG1 { +- regulator-name = "vcc3v3_s3"; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- }; +- }; +- +- vcc3v3_s0: SWITCH_REG2 { +- regulator-name = "vcc3v3_s0"; +- regulator-always-on; +- regulator-boot-on; +- regulator-state-mem { +- regulator-on-in-suspend; +- }; +- }; +- }; +- }; +-}; +- +-&i2c1 { +- status = "okay"; +-}; +- +-&i2c2 { +- status = "okay"; +-}; +- +-&i2c3 { +- status = "okay"; +-}; +- +-&i2c4 { +- status = "okay"; +-}; +- +-&io_domains { +- bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */ +- audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */ +- sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */ +- gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */ +- status = "okay"; +-}; +- + &pcie_phy { + status = "okay"; + }; +@@ -403,11 +80,6 @@ + status = "okay"; + }; + +-&pmu_io_domains { +- pmu1830-supply = <&vcc_1v8>; +- status = "okay"; +-}; +- + &pinctrl { + gmac { + rgmii_sleep_pins: rgmii-sleep-pins { +@@ -416,31 +88,6 @@ + }; + }; + +- sdmmc { +- sdmmc_bus1: sdmmc-bus1 { +- rockchip,pins = +- <4 8 RK_FUNC_1 &pcfg_pull_up_8ma>; +- }; +- +- sdmmc_bus4: sdmmc-bus4 { +- rockchip,pins = +- <4 8 RK_FUNC_1 &pcfg_pull_up_8ma>, +- <4 9 RK_FUNC_1 &pcfg_pull_up_8ma>, +- <4 10 RK_FUNC_1 &pcfg_pull_up_8ma>, +- <4 11 RK_FUNC_1 &pcfg_pull_up_8ma>; +- }; +- +- sdmmc_clk: sdmmc-clk { +- rockchip,pins = +- <4 12 RK_FUNC_1 &pcfg_pull_none_18ma>; +- }; +- +- sdmmc_cmd: sdmmc-cmd { +- rockchip,pins = +- <4 13 RK_FUNC_1 &pcfg_pull_up_8ma>; +- }; +- }; +- + pcie { + pcie_drv: pcie-drv { + rockchip,pins = +@@ -448,23 +95,6 @@ + }; + }; + +- pmic { +- pmic_int_l: pmic-int-l { +- rockchip,pins = +- <1 21 RK_FUNC_GPIO &pcfg_pull_up>; +- }; +- +- vsel1_gpio: vsel1-gpio { +- rockchip,pins = +- <1 17 RK_FUNC_GPIO &pcfg_pull_down>; +- }; +- +- vsel2_gpio: vsel2-gpio { +- rockchip,pins = +- <1 14 RK_FUNC_GPIO &pcfg_pull_down>; +- }; +- }; +- + usb2 { + host_vbus_drv: host-vbus-drv { + rockchip,pins = +@@ -473,37 +103,6 @@ + }; + }; + +-&pwm2 { +- status = "okay"; +-}; +- +-&pwm3 { +- status = "okay"; +-}; +- +-&sdhci { +- bus-width = <8>; +- mmc-hs400-1_8v; +- mmc-hs400-enhanced-strobe; +- non-removable; +- status = "okay"; +-}; +- +-&sdmmc { +- bus-width = <4>; +- cap-mmc-highspeed; +- cap-sd-highspeed; +- clock-frequency = <100000000>; +- clock-freq-min-max = <100000 100000000>; +- disable-wp; +- sd-uhs-sdr104; +- vqmmc-supply = <&vcc_sd>; +- card-detect-delay = <800>; +- pinctrl-names = "default"; +- pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; +- status = "okay"; +-}; +- + &tcphy0 { + status = "okay"; + }; +@@ -538,16 +137,6 @@ + status = "okay"; + }; + +-&uart0 { +- pinctrl-names = "default"; +- pinctrl-0 = <&uart0_xfer &uart0_cts>; +- status = "okay"; +-}; +- +-&uart2 { +- status = "okay"; +-}; +- + &usb_host0_ehci { + status = "okay"; + }; +@@ -581,19 +170,3 @@ + status = "okay"; + dr_mode = "host"; + }; +- +-&vopb { +- status = "okay"; +-}; +- +-&vopb_mmu { +- status = "okay"; +-}; +- +-&vopl { +- status = "okay"; +-}; +- +-&vopl_mmu { +- status = "okay"; +-}; +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +new file mode 100644 +index 000000000000..5a5d8e28ef55 +--- /dev/null ++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +@@ -0,0 +1,439 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2018 Collabora Ltd. ++ * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd. ++ * Copyright (c) 2018 Linaro Ltd. ++ */ ++ ++#include "rk3399.dtsi" ++#include "rk3399-opp.dtsi" ++ ++/ { ++ vcc1v8_s0: vcc1v8-s0 { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc1v8_s0"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ }; ++ ++ vcc_sys: vcc-sys { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc_sys"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ vcc3v3_sys: vcc3v3-sys { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc3v3_sys"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ vin-supply = <&vcc_sys>; ++ }; ++ ++ vdd_log: vdd-log { ++ compatible = "pwm-regulator"; ++ pwms = <&pwm2 0 25000 0>; ++ regulator-name = "vdd_log"; ++ regulator-min-microvolt = <800000>; ++ regulator-max-microvolt = <1400000>; ++ regulator-always-on; ++ regulator-boot-on; ++ vin-supply = <&vcc_sys>; ++ }; ++ ++}; ++ ++&cpu_l0 { ++ cpu-supply = <&vdd_cpu_l>; ++}; ++ ++&cpu_l1 { ++ cpu-supply = <&vdd_cpu_l>; ++}; ++ ++&cpu_l2 { ++ cpu-supply = <&vdd_cpu_l>; ++}; ++ ++&cpu_l3 { ++ cpu-supply = <&vdd_cpu_l>; ++}; ++ ++&cpu_b0 { ++ cpu-supply = <&vdd_cpu_b>; ++}; ++ ++&cpu_b1 { ++ cpu-supply = <&vdd_cpu_b>; ++}; ++ ++&emmc_phy { ++ status = "okay"; ++}; ++ ++&hdmi { ++ ddc-i2c-bus = <&i2c3>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&hdmi_cec>; ++ status = "okay"; ++}; ++ ++&i2c0 { ++ clock-frequency = <400000>; ++ i2c-scl-rising-time-ns = <168>; ++ i2c-scl-falling-time-ns = <4>; ++ status = "okay"; ++ ++ vdd_cpu_b: regulator@40 { ++ compatible = "silergy,syr827"; ++ reg = <0x40>; ++ fcs,suspend-voltage-selector = <1>; ++ regulator-name = "vdd_cpu_b"; ++ regulator-min-microvolt = <712500>; ++ regulator-max-microvolt = <1500000>; ++ regulator-ramp-delay = <1000>; ++ regulator-always-on; ++ regulator-boot-on; ++ vin-supply = <&vcc_sys>; ++ status = "okay"; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ vdd_gpu: regulator@41 { ++ compatible = "silergy,syr828"; ++ reg = <0x41>; ++ fcs,suspend-voltage-selector = <1>; ++ regulator-name = "vdd_gpu"; ++ regulator-min-microvolt = <712500>; ++ regulator-max-microvolt = <1500000>; ++ regulator-ramp-delay = <1000>; ++ regulator-always-on; ++ regulator-boot-on; ++ vin-supply = <&vcc_sys>; ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ rk808: pmic@1b { ++ compatible = "rockchip,rk808"; ++ reg = <0x1b>; ++ interrupt-parent = <&gpio1>; ++ interrupts = <21 IRQ_TYPE_LEVEL_LOW>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pmic_int_l>; ++ rockchip,system-power-controller; ++ wakeup-source; ++ #clock-cells = <1>; ++ clock-output-names = "xin32k", "rk808-clkout2"; ++ ++ vcc1-supply = <&vcc_sys>; ++ vcc2-supply = <&vcc_sys>; ++ vcc3-supply = <&vcc_sys>; ++ vcc4-supply = <&vcc_sys>; ++ vcc6-supply = <&vcc_sys>; ++ vcc7-supply = <&vcc_sys>; ++ vcc8-supply = <&vcc3v3_sys>; ++ vcc9-supply = <&vcc_sys>; ++ vcc10-supply = <&vcc_sys>; ++ vcc11-supply = <&vcc_sys>; ++ vcc12-supply = <&vcc3v3_sys>; ++ vddio-supply = <&vcc_1v8>; ++ ++ regulators { ++ vdd_center: DCDC_REG1 { ++ regulator-name = "vdd_center"; ++ regulator-min-microvolt = <750000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ vdd_cpu_l: DCDC_REG2 { ++ regulator-name = "vdd_cpu_l"; ++ regulator-min-microvolt = <750000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ vcc_ddr: DCDC_REG3 { ++ regulator-name = "vcc_ddr"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ }; ++ }; ++ ++ vcc_1v8: DCDC_REG4 { ++ regulator-name = "vcc_1v8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1800000>; ++ }; ++ }; ++ ++ vcc1v8_dvp: LDO_REG1 { ++ regulator-name = "vcc1v8_dvp"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1800000>; ++ }; ++ }; ++ ++ vcca1v8_hdmi: LDO_REG2 { ++ regulator-name = "vcca1v8_hdmi"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1800000>; ++ }; ++ }; ++ ++ vcca_1v8: LDO_REG3 { ++ regulator-name = "vcca_1v8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1800000>; ++ }; ++ }; ++ ++ vcc_sd: LDO_REG4 { ++ regulator-name = "vcc_sd"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <3300000>; ++ }; ++ }; ++ ++ vcc3v0_sd: LDO_REG5 { ++ regulator-name = "vcc3v0_sd"; ++ regulator-min-microvolt = <3000000>; ++ regulator-max-microvolt = <3000000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <3000000>; ++ }; ++ }; ++ ++ vcc_1v5: LDO_REG6 { ++ regulator-name = "vcc_1v5"; ++ regulator-min-microvolt = <1500000>; ++ regulator-max-microvolt = <1500000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1500000>; ++ }; ++ }; ++ ++ vcca0v9_hdmi: LDO_REG7 { ++ regulator-name = "vcca0v9_hdmi"; ++ regulator-min-microvolt = <900000>; ++ regulator-max-microvolt = <900000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <900000>; ++ }; ++ }; ++ ++ vcc_3v0: LDO_REG8 { ++ regulator-name = "vcc_3v0"; ++ regulator-min-microvolt = <3000000>; ++ regulator-max-microvolt = <3000000>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <3000000>; ++ }; ++ }; ++ ++ vcc3v3_s3: SWITCH_REG1 { ++ regulator-name = "vcc3v3_s3"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ }; ++ }; ++ ++ vcc3v3_s0: SWITCH_REG2 { ++ regulator-name = "vcc3v3_s0"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ }; ++ }; ++ }; ++ }; ++}; ++ ++&i2c1 { ++ status = "okay"; ++}; ++ ++&i2c2 { ++ status = "okay"; ++}; ++ ++&i2c3 { ++ status = "okay"; ++}; ++ ++&i2c4 { ++ status = "okay"; ++}; ++ ++&io_domains { ++ bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */ ++ audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */ ++ sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */ ++ gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */ ++ status = "okay"; ++}; ++ ++&pmu_io_domains { ++ pmu1830-supply = <&vcc_1v8>; ++ status = "okay"; ++}; ++ ++&pinctrl { ++ sdmmc { ++ sdmmc_bus1: sdmmc-bus1 { ++ rockchip,pins = ++ <4 8 RK_FUNC_1 &pcfg_pull_up_8ma>; ++ }; ++ ++ sdmmc_bus4: sdmmc-bus4 { ++ rockchip,pins = ++ <4 8 RK_FUNC_1 &pcfg_pull_up_8ma>, ++ <4 9 RK_FUNC_1 &pcfg_pull_up_8ma>, ++ <4 10 RK_FUNC_1 &pcfg_pull_up_8ma>, ++ <4 11 RK_FUNC_1 &pcfg_pull_up_8ma>; ++ }; ++ ++ sdmmc_clk: sdmmc-clk { ++ rockchip,pins = ++ <4 12 RK_FUNC_1 &pcfg_pull_none_18ma>; ++ }; ++ ++ sdmmc_cmd: sdmmc-cmd { ++ rockchip,pins = ++ <4 13 RK_FUNC_1 &pcfg_pull_up_8ma>; ++ }; ++ }; ++ ++ pmic { ++ pmic_int_l: pmic-int-l { ++ rockchip,pins = ++ <1 21 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; ++ ++ vsel1_gpio: vsel1-gpio { ++ rockchip,pins = ++ <1 17 RK_FUNC_GPIO &pcfg_pull_down>; ++ }; ++ ++ vsel2_gpio: vsel2-gpio { ++ rockchip,pins = ++ <1 14 RK_FUNC_GPIO &pcfg_pull_down>; ++ }; ++ }; ++}; ++ ++&pwm2 { ++ status = "okay"; ++}; ++ ++&pwm3 { ++ status = "okay"; ++}; ++ ++&sdhci { ++ bus-width = <8>; ++ mmc-hs400-1_8v; ++ mmc-hs400-enhanced-strobe; ++ non-removable; ++ status = "okay"; ++}; ++ ++&sdmmc { ++ bus-width = <4>; ++ cap-mmc-highspeed; ++ cap-sd-highspeed; ++ clock-frequency = <100000000>; ++ clock-freq-min-max = <100000 100000000>; ++ disable-wp; ++ sd-uhs-sdr104; ++ vqmmc-supply = <&vcc_sd>; ++ card-detect-delay = <800>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; ++ status = "okay"; ++}; ++ ++&uart0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_xfer &uart0_cts>; ++ status = "okay"; ++}; ++ ++&uart2 { ++ status = "okay"; ++}; ++ ++&vopb { ++ status = "okay"; ++}; ++ ++&vopb_mmu { ++ status = "okay"; ++}; ++ ++&vopl { ++ status = "okay"; ++}; ++ ++&vopl_mmu { ++ status = "okay"; ++}; + +From patchwork Mon Sep 10 15:13:54 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Manivannan Sadhasivam + <manivannan.sadhasivam@linaro.org> +X-Patchwork-Id: 10594435 +Return-Path: + <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> +Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org + [172.30.200.125]) + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2BF1F921 + for <patchwork-linux-arm@patchwork.kernel.org>; + Mon, 10 Sep 2018 15:16:42 +0000 (UTC) +Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) + by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18E7328C53 + for <patchwork-linux-arm@patchwork.kernel.org>; + Mon, 10 Sep 2018 15:16:42 +0000 (UTC) +Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) + id 0BCAE28EEA; Mon, 10 Sep 2018 15:16:42 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on + pdx-wl-mail.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 +Received: from bombadil.infradead.org (bombadil.infradead.org + [198.137.202.133]) + (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8BD0528C53 + for <patchwork-linux-arm@patchwork.kernel.org>; + Mon, 10 Sep 2018 15:16:41 +0000 (UTC) +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=bombadil.20170209; h=Sender: + Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: + List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: + In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: + Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc + :Resent-Message-ID:List-Owner; + bh=xmUkL5mhfsjBunlvmyohQp6j9uGJXfnKJf9vQglqLgg=; b=mVmqN9cD59M0SIET1b/PL7/vE9 + pvFJkHJLmhp8Nf/jBRW1g+V1d+G5W7/6V3bHNBbhYfjjOoRhXr+XDaTWhJEHlYR2hUm3TxwBv5JEz + d1tE6BgOCfrCex3T4D+BwL9hyn1HbEnuM6Mgrx25O4Y/ggGLoZkIyYdLI12AVSd6Hk5cb5wFfS+rv + hx+PI1hQF9brC3kTjV43q2/j+K0ZGZuLmtUQr/Hd2RKRoDfqLjy38KFVEUQfln/YS8dxQ2h9GJc7B + 36IaewzvWd8m2CicWSAhbTDb9pAK9i4bVRPwvF/JvZNPQ055lEu2vTsmVrDSbN9LyCxOwqK4x3Zc8 + ke7bGLYA==; +Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) + by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) + id 1fzNvS-0001Wo-Dn; Mon, 10 Sep 2018 15:16:30 +0000 +Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) + by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) + id 1fzNtm-0007u1-LE + for linux-arm-kernel@lists.infradead.org; Mon, 10 Sep 2018 15:14:48 +0000 +Received: by mail-pf1-x442.google.com with SMTP id h69-v6so10643325pfd.4 + for <linux-arm-kernel@lists.infradead.org>; + Mon, 10 Sep 2018 08:14:36 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=k14lBxRZet8JTP0sZsFzzMdrUIiDAx3PCahAr8M1lTM=; + b=DbONVz7SNceTZXBZJ8Gl0rnlFDJW0nx0gDqbWxJjPAh0FU6WbQn5fnmnQX/SPblLQM + R5dn8fXgoyp9F+BayRLiTZj1xjjwsa9c+cNblxab/snkslnvqb4DubBY+neFF4oPV9m+ + JZTvXyEfdmfD6P5xOPV4BcrIX1U5FSXgs2mBc= +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; + bh=k14lBxRZet8JTP0sZsFzzMdrUIiDAx3PCahAr8M1lTM=; + b=s6q6nHAuMNRkVtpoFs76F3HMPL1m5eDLsaQ9pNi0FO4EtdT7IxWEN43Q/OXD9Ec6TA + JLM/dXlx5I8Lc39SmhZxcP0BfMxOGnYRcEtU3zVgeY4bVHZydei8Nsk+W6Kp55r8+wAS + QrArSMKy/SOcuZKPBdK7U7hkoT/gSX3/nsXVMTzFmwhvqjrn7nBULpCOQqrHKdleFz2H + clVhr8XxqlgaZFHos2etV/H3MDabY6IMTdwWOv4CP7N77+eJu8TPOfzbsYv/CnwC78RR + TIKMG7nK2XR0zJtxMkANNFduuNysv376xmaBLB83tJuKDY3bLvojBX+58mM3ebT4pPyD + 7sfQ== +X-Gm-Message-State: APzg51ANQPVOFbZPLMacirZdgZ298uzOkAJhfBNgbgq6OK+DDHULL1Uh + 8q0GLuzZeY2eYX+Xn29czper +X-Google-Smtp-Source: + ANB0VdY+YL+272sxvYeYxwuGJDW6P6/Y/3lJAb3pIhIsB8QKeqbJX/Nis0AJl0X6UUBDBYgnww6LFA== +X-Received: by 2002:a65:5284:: with SMTP id + y4-v6mr23235056pgp.283.1536592475955; + Mon, 10 Sep 2018 08:14:35 -0700 (PDT) +Received: from localhost.localdomain + ([2405:204:728c:6bba:60a8:6c40:2817:7ee1]) + by smtp.gmail.com with ESMTPSA id e202-v6sm26703907pfh.16.2018.09.10.08.14.28 + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Mon, 10 Sep 2018 08:14:35 -0700 (PDT) +From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> +To: heiko@sntech.de, + robh+dt@kernel.org +Subject: [PATCH 2/4] dt-bindings: arm: rockchip: Add binding for Rock960 board +Date: Mon, 10 Sep 2018 20:43:54 +0530 +Message-Id: <20180910151356.25946-3-manivannan.sadhasivam@linaro.org> +X-Mailer: git-send-email 2.17.1 +In-Reply-To: <20180910151356.25946-1-manivannan.sadhasivam@linaro.org> +References: <20180910151356.25946-1-manivannan.sadhasivam@linaro.org> +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20180910_081446_721758_4D036032 +X-CRM114-Status: GOOD ( 10.68 ) +X-BeenThere: linux-arm-kernel@lists.infradead.org +X-Mailman-Version: 2.1.21 +Precedence: list +List-Id: <linux-arm-kernel.lists.infradead.org> +List-Unsubscribe: + <http://lists.infradead.org/mailman/options/linux-arm-kernel>, + <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> +List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> +List-Post: <mailto:linux-arm-kernel@lists.infradead.org> +List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> +List-Subscribe: + <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, + <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> +Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, + tom@vamrs.com, amit.kucheria@linaro.org, shawn.lin@rock-chips.com, + linux-kernel@vger.kernel.org, vicencb@gmail.com, dev@vamrs.com, + linux-rockchip@lists.infradead.org, pbrobinson@gmail.com, + Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, + enric.balletbo@collabora.com, ezequiel@collabora.com, stephen@vamrs.com +MIME-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> +Errors-To: + linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org +X-Virus-Scanned: ClamAV using ClamSMTP + +Add devicetree binding for Rock960 board from Vamrs Limited. + +Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> +--- + Documentation/devicetree/bindings/arm/rockchip.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt +index acfd3c773dd0..aaad9e2ff9a3 100644 +--- a/Documentation/devicetree/bindings/arm/rockchip.txt ++++ b/Documentation/devicetree/bindings/arm/rockchip.txt +@@ -5,6 +5,10 @@ Rockchip platforms device tree bindings + Required root node properties: + - compatible = "vamrs,ficus", "rockchip,rk3399"; + ++- 96boards RK3399 Rock960 (ROCK960 Consumer Edition) ++ Required root node properties: ++ - compatible = "vamrs,rk3399-rock960", "rockchip,rk3399"; ++ + - Amarula Vyasa RK3288 board + Required root node properties: + - compatible = "amarula,vyasa-rk3288", "rockchip,rk3288"; + +From patchwork Mon Sep 10 15:13:55 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Manivannan Sadhasivam + <manivannan.sadhasivam@linaro.org> +X-Patchwork-Id: 10594437 +Return-Path: + <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> +Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org + [172.30.200.125]) + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5454714BD + for <patchwork-linux-arm@patchwork.kernel.org>; + Mon, 10 Sep 2018 15:17:33 +0000 (UTC) +Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) + by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4324E28C53 + for <patchwork-linux-arm@patchwork.kernel.org>; + Mon, 10 Sep 2018 15:17:33 +0000 (UTC) +Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) + id 3684A28EEA; Mon, 10 Sep 2018 15:17:33 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on + pdx-wl-mail.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 +Received: from bombadil.infradead.org (bombadil.infradead.org + [198.137.202.133]) + (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9562128C53 + for <patchwork-linux-arm@patchwork.kernel.org>; + Mon, 10 Sep 2018 15:17:32 +0000 (UTC) +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=bombadil.20170209; h=Sender: + Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: + List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: + In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: + Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc + :Resent-Message-ID:List-Owner; + bh=BlDZBHjhu66Mc2lMpXjbsv/4KpMpcTJgc9cuw0S3bQA=; b=JDfI6kvhr48gipdHeSTE7tPcUN + q5lSDa1z6DWLELD32uQ9dLmn8et3RT9krsAn+kJh1vBLmqlo5ciSIGC9Wl6qwNCskWn/zFietv0Bm + S+rDQncYZNJDSrASyv6gUpgjsQJOCcthqBseEX6O0zKSreyf2RX9BppBryBPINHPL6eG55Ard4Ort + fG6lSQajVnhRe3B/BdWo2v+j3+MAQixs8Z0udQ5rxCY7lY2jbcs2DPFxb9fkNKWCZZvPbMZ4CG1Z8 + vCppSQoomPOfjp58Dvbxyc+DkNiGm8WccccSZkU7WRut/dZ5KsaFLNzTQFmDN226xo3+/5tp8imFM + gnrQk3Rw==; +Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) + by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) + id 1fzNwI-0001tm-2P; Mon, 10 Sep 2018 15:17:22 +0000 +Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) + by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) + id 1fzNtu-0007xY-Os + for linux-arm-kernel@lists.infradead.org; Mon, 10 Sep 2018 15:14:56 +0000 +Received: by mail-pl1-x644.google.com with SMTP id g2-v6so8931123plo.2 + for <linux-arm-kernel@lists.infradead.org>; + Mon, 10 Sep 2018 08:14:44 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=znfZBHVDWIral+xe0reTBGcJ7dk9ivMDjn8uEGJfcT8=; + b=Al3A4xuT8zmMMUoHO2mMDnqXf7kGCK9hCVkQJSQZFZzcSy+jmsteTH3xgr6KchUnj1 + 2j1TY1/JwFbt7AnCtLEHEsqI81Ish0NmRq1zZTjIu9xkJ9SgOxdf5wBa3TGzYWZoukb+ + CKfaB4Fv5Gj/U4qLXVxDT6wTw7vhRDNz1ZsRQ= +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; + bh=znfZBHVDWIral+xe0reTBGcJ7dk9ivMDjn8uEGJfcT8=; + b=pHwar4aOiw/cjrOxYMYxMuQ65Xs/Y2e9eqLAbhpyq3aMtSWES8sUya9sJf1/NA1FAN + hLN94KSswIBrhHJIpTU73ntZwVPGSkj5m3kcOaL5+hqSAmG5Mze15d4Pe0mT1fUp5zSd + tEv9erBdk11fJB7WR0TnG8JjDrFz9WitioFWAzA9qy9dtDH3w9bgoBYOXJbHQ/4LccFv + tG5llBmw3VAaqQIj2CKTEOKUpYYhk2D+5V5tZ1/Hhx8Oeb7NBd0nAWRsUb5m1c6loXR2 + wxMPnk0flXzPiGH05Tn/PGLXOM0VY9NY5xljC0DBDmeziPPWjvlpxdJsYRTAqL8EiokC + KXdw== +X-Gm-Message-State: APzg51BkoY23CtrZPfldJhpIX8f8btFYkNpT825jAOFcY6CP1Pbqsx+W + jmGEBdg90S9M/H0OWl3Lo+e0OsI2UQ== +X-Google-Smtp-Source: + ANB0VdZ0RhAKUx7fA0XxuM8dKFymYLSLzCbRGtKYFlZfvEfM0z2IIetkAoJZsjfgCiGmtZMwRvEVuA== +X-Received: by 2002:a17:902:740a:: with SMTP id + g10-v6mr22947347pll.22.1536592483495; + Mon, 10 Sep 2018 08:14:43 -0700 (PDT) +Received: from localhost.localdomain + ([2405:204:728c:6bba:60a8:6c40:2817:7ee1]) + by smtp.gmail.com with ESMTPSA id e202-v6sm26703907pfh.16.2018.09.10.08.14.36 + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Mon, 10 Sep 2018 08:14:42 -0700 (PDT) +From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> +To: heiko@sntech.de, + robh+dt@kernel.org +Subject: [PATCH 3/4] arm64: boot: dts: rockchip: Add support for Rock960 board +Date: Mon, 10 Sep 2018 20:43:55 +0530 +Message-Id: <20180910151356.25946-4-manivannan.sadhasivam@linaro.org> +X-Mailer: git-send-email 2.17.1 +In-Reply-To: <20180910151356.25946-1-manivannan.sadhasivam@linaro.org> +References: <20180910151356.25946-1-manivannan.sadhasivam@linaro.org> +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20180910_081454_819186_85F98455 +X-CRM114-Status: GOOD ( 16.37 ) +X-BeenThere: linux-arm-kernel@lists.infradead.org +X-Mailman-Version: 2.1.21 +Precedence: list +List-Id: <linux-arm-kernel.lists.infradead.org> +List-Unsubscribe: + <http://lists.infradead.org/mailman/options/linux-arm-kernel>, + <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> +List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> +List-Post: <mailto:linux-arm-kernel@lists.infradead.org> +List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> +List-Subscribe: + <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, + <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> +Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, + tom@vamrs.com, amit.kucheria@linaro.org, shawn.lin@rock-chips.com, + linux-kernel@vger.kernel.org, vicencb@gmail.com, dev@vamrs.com, + linux-rockchip@lists.infradead.org, pbrobinson@gmail.com, + Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, + enric.balletbo@collabora.com, ezequiel@collabora.com, stephen@vamrs.com +MIME-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> +Errors-To: + linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org +X-Virus-Scanned: ClamAV using ClamSMTP + +Add devicetree support for Rock960 board, one of the Consumer Edition +boards of the 96Boards family. This board support utilizes the common +Rock960 family board support that includes Ficus 96Board. + +Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> +--- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../boot/dts/rockchip/rk3399-rock960.dts | 139 ++++++++++++++++++ + 2 files changed, 140 insertions(+) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock960.dts + +diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile +index b0092d95b574..57c0d76458e6 100644 +--- a/arch/arm64/boot/dts/rockchip/Makefile ++++ b/arch/arm64/boot/dts/rockchip/Makefile +@@ -14,5 +14,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts +new file mode 100644 +index 000000000000..281f3d79b38e +--- /dev/null ++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dts +@@ -0,0 +1,139 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2018 Linaro Ltd. ++ */ ++ ++/dts-v1/; ++#include "rk3399-rock960.dtsi" ++ ++/ { ++ model = "96boards Rock960"; ++ compatible = "vamrs,rk3399-rock960", "rockchip,rk3399"; ++ ++ chosen { ++ stdout-path = "serial2:1500000n8"; ++ }; ++ ++ vcc3v3_pcie: vcc3v3-pcie-regulator { ++ compatible = "regulator-fixed"; ++ enable-active-high; ++ gpio = <&gpio2 5 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pcie_drv>; ++ regulator-boot-on; ++ regulator-name = "vcc3v3_pcie"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vcc3v3_sys>; ++ }; ++ ++ vcc5v0_host: vcc5v0-host-regulator { ++ compatible = "regulator-fixed"; ++ enable-active-high; ++ gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&host_vbus_drv>; ++ regulator-name = "vcc5v0_host"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ vin-supply = <&vcc_sys>; ++ }; ++}; ++ ++&pinctrl { ++ pcie { ++ pcie_drv: pcie-drv { ++ rockchip,pins = ++ <2 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ ++ usb2 { ++ host_vbus_drv: host-vbus-drv { ++ rockchip,pins = ++ <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++}; ++ ++&pcie_phy { ++ status = "okay"; ++}; ++ ++&pcie0 { ++ ep-gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_HIGH>; ++ num-lanes = <4>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pcie_clkreqn_cpm>; ++ vpcie3v3-supply = <&vcc3v3_pcie>; ++ status = "okay"; ++}; ++ ++&tcphy0 { ++ status = "okay"; ++}; ++ ++&tcphy1 { ++ status = "okay"; ++}; ++ ++&u2phy0 { ++ status = "okay"; ++}; ++ ++&u2phy1 { ++ status = "okay"; ++}; ++ ++&u2phy0_host { ++ phy-supply = <&vcc5v0_host>; ++ status = "okay"; ++}; ++ ++&u2phy1_host { ++ phy-supply = <&vcc5v0_host>; ++ status = "okay"; ++}; ++ ++&u2phy0_otg { ++ status = "okay"; ++}; ++ ++&u2phy1_otg { ++ status = "okay"; ++}; ++ ++&usb_host0_ehci { ++ status = "okay"; ++}; ++ ++&usb_host0_ohci { ++ status = "okay"; ++}; ++ ++&usb_host1_ehci { ++ status = "okay"; ++}; ++ ++&usb_host1_ohci { ++ status = "okay"; ++}; ++ ++&usbdrd3_0 { ++ status = "okay"; ++}; ++ ++&usbdrd_dwc3_0 { ++ status = "okay"; ++ dr_mode = "otg"; ++}; ++ ++&usbdrd3_1 { ++ status = "okay"; ++}; ++ ++&usbdrd_dwc3_1 { ++ status = "okay"; ++ dr_mode = "host"; ++}; + +From patchwork Mon Sep 10 15:13:56 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Manivannan Sadhasivam + <manivannan.sadhasivam@linaro.org> +X-Patchwork-Id: 10594441 +Return-Path: + <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> +Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org + [172.30.200.125]) + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6C84E921 + for <patchwork-linux-arm@patchwork.kernel.org>; + Mon, 10 Sep 2018 15:18:21 +0000 (UTC) +Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) + by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8B81290E9 + for <patchwork-linux-arm@patchwork.kernel.org>; + Mon, 10 Sep 2018 15:18:16 +0000 (UTC) +Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) + id 9B4C2291F9; Mon, 10 Sep 2018 15:18:16 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on + pdx-wl-mail.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, + DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 +Received: from bombadil.infradead.org (bombadil.infradead.org + [198.137.202.133]) + (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0A283290E9 + for <patchwork-linux-arm@patchwork.kernel.org>; + Mon, 10 Sep 2018 15:18:16 +0000 (UTC) +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=bombadil.20170209; h=Sender: + Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: + List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: + In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: + Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc + :Resent-Message-ID:List-Owner; + bh=0ikSWm9Ew4+OM0qaBWpLR7/qrsx402HdvOTbCVK6WLs=; b=iYHrXnke7eyKVXuqegTuZU2pVy + JOtS+JODGf3O3P3SHSVhr1nAkaq4DAOSy/kjn0O0/SY34a3Z7vQ1tLOWHKLXScDsC9ZnvlhwfBFDM + kLOKtlYqB5lpdJtP+vk3bKEcyLIL1gJcAApgWpS4yxEDyqP73S8/2rKjPhRk7A4FtUFhoCNAo6xAv + +A6Y5chj5PhQUddQ5FSV4h1uJWQtOICBRj/zGjm0pdHcZ8oMPhicXEfIUTsVA89tKbjr8U6J3bNE8 + vAgcAmyYOWqOLiw3lrisMlKJLBagNU3M1Q1C5VKEn5TlqnqQ5waYcPAKn8SmKZzh57LMD0yOF0Vi1 + p17NGt3Q==; +Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) + by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) + id 1fzNwy-0002B7-RR; Mon, 10 Sep 2018 15:18:04 +0000 +Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) + by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) + id 1fzNu3-00081w-2X + for linux-arm-kernel@lists.infradead.org; Mon, 10 Sep 2018 15:15:06 +0000 +Received: by mail-pf1-x443.google.com with SMTP id j26-v6so10630033pfi.10 + for <linux-arm-kernel@lists.infradead.org>; + Mon, 10 Sep 2018 08:14:52 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=DddfjiWU+nwLV/my5PU24VcyaUhmZjI44x/ThHNh0Tk=; + b=PWevnr2Lpw/bnA0HESa9iyVkClbxsJOYPlhP7AmMwy9a6c7eqqnS4kcFuumWD8eDqu + 5TyPbARtJMbdmXcn+ZyEocjr/nOC+pLcQKBFUQPkfOwz8jVZ5fKgUmR0hiIx0crIxFFy + 0qfls7qARHP7wRbThv1DW/l1pDMx20fE2zYwQ= +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; + bh=DddfjiWU+nwLV/my5PU24VcyaUhmZjI44x/ThHNh0Tk=; + b=cFEHSVGuJxHH7AjHGKTEZgKUfsxXK2Q2RwekMwNqTghG134tsp30N/eikGKSuVI1pQ + e4zM5JqLDH0yBeEsAxxtiws41SL/1l+mm+9NBylbiDjJ2lU08Vz0LQxhB7E0Y8UnjbX7 + tuJNFuoFofCBux8/8/2/Bt9oAv26+yQIQnFvSzsvxduxD5ZlfUFI8K06sxlaMNlhwYIL + rtps3m0KcFAeYIC+5CKuTMGIlH3XJ9L8xL/VWeell0rpmD1Xp1/tPtxuanBYkRVJjjIu + 5sUDjfJ+w7uGwlSHBwYz/1DejPm7t3NZCHINwqx1Olwb8gInYbU7htJdtSwkxRanStos + JzdQ== +X-Gm-Message-State: APzg51A9iwtgmsDyP+CN23RCS/3YrB6AHMxq22H11ncEe+Dka8pkL1ti + zurFCUUzVWuSFn4SpTO/sZVy +X-Google-Smtp-Source: + ANB0Vda8CeIyNE1qDZp1KonBEUUFJCFFlGslTIiiPJ26+7Ys0yYeOHMxSM8/+E1iSjcD5FMm6WCxkw== +X-Received: by 2002:a65:608b:: with SMTP id + t11-v6mr23620131pgu.259.1536592491302; + Mon, 10 Sep 2018 08:14:51 -0700 (PDT) +Received: from localhost.localdomain + ([2405:204:728c:6bba:60a8:6c40:2817:7ee1]) + by smtp.gmail.com with ESMTPSA id e202-v6sm26703907pfh.16.2018.09.10.08.14.43 + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Mon, 10 Sep 2018 08:14:50 -0700 (PDT) +From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> +To: heiko@sntech.de, + robh+dt@kernel.org +Subject: [PATCH 4/4] arm64: dts: rockchip: Enable SD card detection for + Rock960 boards +Date: Mon, 10 Sep 2018 20:43:56 +0530 +Message-Id: <20180910151356.25946-5-manivannan.sadhasivam@linaro.org> +X-Mailer: git-send-email 2.17.1 +In-Reply-To: <20180910151356.25946-1-manivannan.sadhasivam@linaro.org> +References: <20180910151356.25946-1-manivannan.sadhasivam@linaro.org> +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20180910_081503_224251_E8EEEA66 +X-CRM114-Status: GOOD ( 12.06 ) +X-BeenThere: linux-arm-kernel@lists.infradead.org +X-Mailman-Version: 2.1.21 +Precedence: list +List-Id: <linux-arm-kernel.lists.infradead.org> +List-Unsubscribe: + <http://lists.infradead.org/mailman/options/linux-arm-kernel>, + <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> +List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> +List-Post: <mailto:linux-arm-kernel@lists.infradead.org> +List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> +List-Subscribe: + <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, + <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> +Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, + tom@vamrs.com, amit.kucheria@linaro.org, shawn.lin@rock-chips.com, + linux-kernel@vger.kernel.org, vicencb@gmail.com, dev@vamrs.com, + linux-rockchip@lists.infradead.org, pbrobinson@gmail.com, + Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, + enric.balletbo@collabora.com, ezequiel@collabora.com, stephen@vamrs.com +MIME-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> +Errors-To: + linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org +X-Virus-Scanned: ClamAV using ClamSMTP + +For proper working of SD cards, let's add the Card Detect GPIO property +to the common devicetree for Rock960 family boards. + +Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> +--- + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +index 5a5d8e28ef55..f68254831ad9 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +@@ -403,6 +403,7 @@ + cap-sd-highspeed; + clock-frequency = <100000000>; + clock-freq-min-max = <100000 100000000>; ++ cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + disable-wp; + sd-uhs-sdr104; + vqmmc-supply = <&vcc_sd>; diff --git a/bcm2835-hwmon-Add-support-for-RPi-voltage-sensor.patch b/bcm2835-hwmon-Add-support-for-RPi-voltage-sensor.patch deleted file mode 100644 index 7812084f1..000000000 --- a/bcm2835-hwmon-Add-support-for-RPi-voltage-sensor.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a0cf7704b6bc145a9f198a9b2bcf92ccc5d6b6be Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Fri, 20 Jul 2018 12:58:37 +0100 -Subject: [PATCH] hwmon: rpi: add module alias to raspberrypi-hwmon - -The raspberrypi-hwmon driver doesn't automatically load, although it does work -when loaded, by adding the alias it auto loads as expected when built as a -module. Tested on RPi2/RPi3 on 32 bit kernel and RPi3B+ on aarch64 with -Fedora 28 and a patched 4.18 RC kernel. - -Fixes: q3c493c885cf ("hwmon: Add support for RPi voltage sensor") -Signed-off-by: Peter Robinson <pbrobinson@gmail.com> -CC: Stefan Wahren <stefan.wahren@i2se.com> -CC: Eric Anholt <eric@anholt.net> ---- - drivers/hwmon/raspberrypi-hwmon.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/hwmon/raspberrypi-hwmon.c b/drivers/hwmon/raspberrypi-hwmon.c -index fb4e4a6bb1f63..be5ba46908953 100644 ---- a/drivers/hwmon/raspberrypi-hwmon.c -+++ b/drivers/hwmon/raspberrypi-hwmon.c -@@ -164,3 +164,4 @@ module_platform_driver(rpi_hwmon_driver); - MODULE_AUTHOR("Stefan Wahren <stefan.wahren@i2se.com>"); - MODULE_DESCRIPTION("Raspberry Pi voltage sensor driver"); - MODULE_LICENSE("GPL v2"); -+MODULE_ALIAS("platform:raspberrypi-hwmon"); --- -2.17.1 - @@ -1 +1 @@ -28619527b8a712590c93d0a9e24b4425b9376a8c +a49a9dcce802b3651013f659813df1361d306172 diff --git a/kernel.spec b/kernel.spec index 218329d79..fa5f07d93 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,9 +75,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 2 +%global rcrev 3 # The git snapshot level -%define gitrev 1 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -597,14 +597,14 @@ Patch305: qcom-msm89xx-fixes.patch Patch306: arm-sdhci-esdhc-imx-fixes.patch # https://www.spinics.net/lists/arm-kernel/msg670137.html -Patch311: arm64-ZynqMP-firmware-clock-drivers-core.patch +Patch307: arm64-ZynqMP-firmware-clock-drivers-core.patch -Patch331: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch +Patch308: arm64-96boards-Rock960-CE-board-support.patch -Patch332: bcm2835-hwmon-Add-support-for-RPi-voltage-sensor.patch +Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch # https://patchwork.freedesktop.org/patch/240917/ -Patch334: drm-vc4-Fix-the-no-scaling-case-on-multi-planar-YUV-formats.patch +Patch331: drm-vc4-Fix-the-no-scaling-case-on-multi-planar-YUV-formats.patch # Fix for AllWinner A64 Timer Errata, still not final # https://patchwork.kernel.org/patch/10392891/ @@ -1883,6 +1883,18 @@ fi # # %changelog +* Mon Sep 10 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc3.git0.1 +- Linux v4.19-rc3 + +* Mon Sep 10 2018 Jeremy Cline <jcline@redhat.com> +- Disable debugging options. + +* Fri Sep 07 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc2.git3.1 +- Linux v4.19-rc2-205-ga49a9dcce802 + +* Thu Sep 06 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc2.git2.1 +- Linux v4.19-rc2-163-gb36fdc6853a3 + * Wed Sep 05 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc2.git1.1 - Linux v4.19-rc2-107-g28619527b8a7 - Re-enable debugging options @@ -1,3 +1,2 @@ SHA512 (linux-4.18.tar.xz) = 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038 -SHA512 (patch-4.19-rc2.xz) = 4b40954908c077525ee849c56d5daddf4aca996b00387e45b91452e5bacde1caedf7ff66169a5f296d6d38b9e4b057de22419b273d3472c182c9677f97843ccf -SHA512 (patch-4.19-rc2-git1.xz) = 42e3474d1ebb306cb4539246fb86da7f7e5a1fd1897913109dc0d41325b8f90e24551bb48d5efa3e40e224cd452cd954b7caedf934157282bd17fea3b54d1da9 +SHA512 (patch-4.19-rc3.xz) = 4165e2ae2efddad320d54eacaa26fec93e57d48960c031618105a07b7242b6347cdfb3bea5cee7907465ff110c41d0d1ce837095f37d21921bb6a1d703f6c875 |