From patchwork Sat May 13 14:33:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 9725353 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 35FCA60325 for ; Sat, 13 May 2017 14:51:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A64828874 for ; Sat, 13 May 2017 14:51:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EDC3288DB; Sat, 13 May 2017 14:51:44 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 AC52E288CA for ; Sat, 13 May 2017 14:51:43 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=taSwPzXrPcsTjHigo8gE4b4GSqE5EyTo96dtZXWt31A=; b=uIC7hUnlvAMQbn N4ZriJGHSlvglL5MlW5RglQ0GllgaubQm322HxIosEHzP4RIaRlwv5MtlTLz+nNN9SaVRM8kcCE3Q HSq5b/LZ0mhXXjlxmWpyM0sPsuNdQNxrlv+7SIRlQp5ycZpbyM+5Z2AYTashVOLIsX+mG9h2z15U+ +/3OTHvcCKp6ZlFuiY6bUjHxdS0kXTnBeAMrbW16YmNM+1/AamthQ7Hp+Ss2PBwF9ppwbFtmS/bbm /5ejoG/WVwnV/fZFWu/SJ8sxD7/QsJ0hr5lr7VjC3A1zj7tWYbfOnSQhyYvtLq3ZoHL0UeNJie7Ih ro+ClKoKeTcp3w6LqV8Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d9YON-00040O-AM; Sat, 13 May 2017 14:51:35 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d9YOA-0003fj-Nc; Sat, 13 May 2017 14:51:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=LU25P/77Fw5qY3s8g9H/oPgDUDJAM+V2TSBDjxxSu+0=; b=uKIdC0PHMm7b9c+mKH4HAIs2PD ug2w5JPDWfLYiXrHoOdmTscmzMUMCbJ1IcXpnYKBmAyKkzOJfb6DRVtSXZLnkMzIYus6G9omeGH+D 9IAL30dgoRvYtMS+IlImNKshOjUVVXbwd8xM0x2S+AqbiUohM0w85Qwgji8L28dXl/t/Ws7MYF1iX yb2/i+cU8UGIZvYtv+kcRwatc+b6lvRHFHq81gXwH2ZNLUlrrgTJ6WNyS15tD5QgtN5P+6BIhEz5s edIyEoCs4dhGLOvIX0EyISM+UcNfOdnqK/H8FZPyl2Uqqj3vZd0otPZEGUtNFGMxd65GiLDIezOHu +Re7pfoA==; Received: from mx2.suse.de ([195.135.220.15] helo=mx1.suse.de) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d9Y8G-0007z0-8U; Sat, 13 May 2017 14:35:00 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 92D34AD89; Sat, 13 May 2017 14:33:53 +0000 (UTC) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: linux-amlogic@lists.infradead.org Subject: [PATCH v2 18/18] arm64: dts: meson-gx-p23x-q20x: Fix node order Date: Sat, 13 May 2017 16:33:37 +0200 Message-Id: <20170513143337.14278-19-afaerber@suse.de> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170513143337.14278-1-afaerber@suse.de> References: <20170513143337.14278-1-afaerber@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170513_153456_370790_246F700D X-CRM114-Status: UNSURE ( 9.57 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Kevin Hilman , Will Deacon , linux-kernel@vger.kernel.org, Rob Herring , Catalin Marinas , Carlo Caione , =?UTF-8?q?Andreas=20F=C3=A4rber?= , linux-arm-kernel@lists.infradead.org Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Sort nodes referenced by label alphabetically. Signed-off-by: Andreas Färber --- v1 -> v2: * Rebased (new nodes added) .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 58 +++++++++++----------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi index 25eed18a7439..dc478d094c11 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi @@ -121,19 +121,42 @@ }; }; -/* This UART is brought out to the DB9 connector */ -&uart_AO { +&cvbs_vdac_port { + cvbs_vdac_out: endpoint { + remote-endpoint = <&cvbs_connector_in>; + }; +}; + +ðmac { status = "okay"; - pinctrl-0 = <&uart_ao_a_pins>; +}; + +&hdmi_tx { + status = "okay"; + pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; pinctrl-names = "default"; }; +&hdmi_tx_tmds_port { + hdmi_tx_tmds_out: endpoint { + remote-endpoint = <&hdmi_connector_in>; + }; +}; + &ir { status = "okay"; pinctrl-0 = <&remote_input_ao_pins>; pinctrl-names = "default"; }; +&pwm_ef { + status = "okay"; + pinctrl-0 = <&pwm_e_pins>; + pinctrl-names = "default"; + clocks = <&clkc CLKID_FCLK_DIV4>; + clock-names = "clkin0"; +}; + /* Wireless SDIO Module */ &sd_emmc_a { status = "okay"; @@ -198,32 +221,9 @@ vqmmc-supply = <&vddio_boot>; }; -&pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; - clocks = <&clkc CLKID_FCLK_DIV4>; - clock-names = "clkin0"; -}; - -ðmac { - status = "okay"; -}; - -&cvbs_vdac_port { - cvbs_vdac_out: endpoint { - remote-endpoint = <&cvbs_connector_in>; - }; -}; - -&hdmi_tx { +/* This UART is brought out to the DB9 connector */ +&uart_AO { status = "okay"; - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; + pinctrl-0 = <&uart_ao_a_pins>; pinctrl-names = "default"; }; - -&hdmi_tx_tmds_port { - hdmi_tx_tmds_out: endpoint { - remote-endpoint = <&hdmi_connector_in>; - }; -};