From patchwork Sat Feb 6 10:18:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Heiko_St=C3=BCbner?= X-Patchwork-Id: 12072071 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=-18.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 145F5C433E0 for ; Sat, 6 Feb 2021 10:19:37 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 85BC564E36 for ; Sat, 6 Feb 2021 10:19:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 85BC564E36 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sntech.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=j9eGjgtSiwG55Qa4TmGnrWAFo5Pikv7KHB1lH8sip0k=; b=VYGOoBvltCpd5ZKciSEK/YFLQW ydcqhfKtow1oi4Du/1wecqNO3uaMZlbgupIi12//QJC/Swl5n5A/2o3GCYW9UoiyTFQHKczw184r2 a9/ijUt4QVDKqJpIIaKOw0uAa9ANc6ukqV0wkwYegAGW+QaEv9l1oVQklIAsTfrX83EqhnD1f7BSx c/WVcKoCGlxBIsaxbZAFuRJGNIfW64PhnYXWOEE01HfWTsJ6qEjHEI0PwozRs15iGAsMeXh0Xwj8g DCzW9WJmP/lzzrpJESst3QTKTb5ROg3EcnfHwD41J9Th+4xFoN3O6xwV4SDxYTYkGuh0SR70PwyzO DTTdbaHg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8Kfa-0000Ns-1M; Sat, 06 Feb 2021 10:18:26 +0000 Received: from gloria.sntech.de ([185.11.138.130]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l8KfW-0000Mp-9z; Sat, 06 Feb 2021 10:18:23 +0000 Received: from p508fcd06.dip0.t-ipconnect.de ([80.143.205.6] helo=phil.localnet) by gloria.sntech.de with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l8KfT-00074K-PN; Sat, 06 Feb 2021 11:18:19 +0100 From: Heiko Stuebner To: arm@kernel.org Subject: [GIT PULL RESEND] Rockchip dts64 changes for 5.12 Date: Sat, 06 Feb 2021 11:18:18 +0100 Message-ID: <12699743.uLZWGnKmhe@phil> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210206_051822_375170_A7D352D2 X-CRM114-Status: GOOD ( 14.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , List-Id: Cc: linux-rockchip@lists.infradead.org, soc@kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Arnd, Kevin, Olof, sorry I mixed up the versioning in the pull's subject. The changes are of course meant for 5.12. Thanks Heiko The following changes since commit 5c8fe583cce542aa0b84adc939ce85293de36e5e: Linux 5.11-rc1 (2020-12-27 15:30:22 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v5.12-rockchip-dts64-1 for you to fetch changes up to 7582ad63c9bd09a8f0988c46074481ddd4f92e04: arm64: dts: rockchip: more user friendly name of sound nodes (2021-02-01 19:00:31 +0100) ---------------------------------------------------------------- New boards: Radxa Rock Pi E, NanoPi M4B More fixed indices for mmc nodes; removal of obsolete amba bus nodes; nand-flash-controller nodes for px30 and rk3308; rk3399 pcie ranges fix; board-level fixes for Helios64, NanoPi and Rock960; more sound support for rock64 and rockpro64 and cleanups to make dt-bindings happier. ---------------------------------------------------------------- Chen-Yu Tsai (5): arm64: dts: rockchip: rk3328: Add clock_in_out property to gmac2phy node dt-bindings: arm: rockchip: Add Radxa ROCK Pi E arm64: dts: rockchip: rk3328: Add Radxa ROCK Pi E arm64: dts: rockchip: Move ep-gpios property to nanopc-t4 from nanopi4 arm64: dts: rockchip: Add NanoPi M4B board Johan Jonker (11): arm64: dts: rockchip: assign a fixed index to mmc devices on rk3328 boards arm64: dts: rockchip: add QoS register compatibles for rk3399 arm64: dts: rockchip: add QoS register compatibles for px30 arm64: dts: rockchip: rename thermal subnodes for rk3368 arm64: dts: rockchip: rename thermal subnodes for rk3399 arm64: dts: rockchip: fix ranges property format for rk3399 pcie node arm64: dts: rockchip: cleanup cpu_thermal node of rk3399-rock960.dts arm64: dts: rockchip: assign a fixed index to mmc devices on px30 boards arm64: dts: rockchip: assign a fixed index to mmc devices on rk3308 boards arm64: dts: rockchip: assign a fixed index to mmc devices on rk3368 boards arm64: dts: rockchip: rename pinctrl nodename to gmac2io for nanopi-r2s board Katsuhiro Suzuki (3): arm64: dts: rockchip: enable HDMI sound nodes for rk3328-rock64 arm64: dts: rockchip: add SPDIF node for rk3399-rockpro64 arm64: dts: rockchip: more user friendly name of sound nodes Robin Murphy (2): arm64: dts: rockchip: Light "sys" LED on NanoPi R2S arm64: dts: rockchip: Remove bogus "amba" bus nodes Uwe Kleine-König (1): arm64: dts: rockchip: Rely on SoC external pull up on pmic-int-l on Helios64 Yifeng Zhao (2): arm64: dts: rockchip: Add NFC node for RK3308 SoC arm64: dts: rockchip: Add NFC node for PX30 SoC .../devicetree/bindings/arm/rockchip.yaml | 5 + arch/arm64/boot/dts/rockchip/Makefile | 2 + arch/arm64/boot/dts/rockchip/px30.dtsi | 83 +++-- arch/arm64/boot/dts/rockchip/rk3308.dtsi | 63 ++-- arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 3 +- arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 382 +++++++++++++++++++++ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 56 ++- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 33 +- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 62 ++-- .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 1 + arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts | 52 +++ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3399-rock960.dts | 53 +-- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 29 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 109 +++--- 16 files changed, 690 insertions(+), 246 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts