From patchwork Wed Apr 29 20:46:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 6298111 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DFE4CBEEE1 for ; Wed, 29 Apr 2015 20:47:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA5D62018E for ; Wed, 29 Apr 2015 20:47:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05B582017D for ; Wed, 29 Apr 2015 20:47:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751192AbbD2UrC (ORCPT ); Wed, 29 Apr 2015 16:47:02 -0400 Received: from sauhun.de ([89.238.76.85]:59216 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751077AbbD2UrB (ORCPT ); Wed, 29 Apr 2015 16:47:01 -0400 Received: from p4fe249ed.dip0.t-ipconnect.de ([79.226.73.237]:42409 helo=localhost) by pokefinder.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YnYsl-0006jN-LN; Wed, 29 Apr 2015 22:47:00 +0200 From: Wolfram Sang To: linux-sh@vger.kernel.org Cc: Magnus Damm , Simon Horman , Laurent Pinchart , Geert Uytterhoeven , Wolfram Sang Subject: [PATCH v3 2/3] ARM: shmobile: r8a7790: lager: add i2c-demuxer to dts Date: Wed, 29 Apr 2015 22:46:41 +0200 Message-Id: <1430340402-21586-3-git-send-email-wsa@the-dreams.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1430340402-21586-1-git-send-email-wsa@the-dreams.de> References: <1430340402-21586-1-git-send-email-wsa@the-dreams.de> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wolfram Sang WIP/HACK! Not for upstream! Signed-off-by: Wolfram Sang --- arch/arm/boot/dts/r8a7790-lager.dts | 129 +++++++++++------------------------- 1 file changed, 39 insertions(+), 90 deletions(-) diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index aaa4f258e279cc..53aa867653e9fa 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts @@ -49,6 +49,7 @@ aliases { serial0 = &scifa0; serial1 = &scifa1; + i2c8 = &i2cbus8; }; chosen { @@ -223,17 +224,6 @@ }; }; - hdmi-out { - compatible = "hdmi-connector"; - type = "a"; - - port { - hdmi_con: endpoint { - remote-endpoint = <&adv7511_out>; - }; - }; - }; - x2_clk: x2-clock { compatible = "fixed-clock"; #clock-cells = <0>; @@ -245,35 +235,36 @@ #clock-cells = <0>; clock-frequency = <148500000>; }; -}; -&du { - pinctrl-0 = <&du_pins>; - pinctrl-names = "default"; - status = "okay"; + i2cbus@8 { - clocks = <&mstp7_clks R8A7790_CLK_DU0>, - <&mstp7_clks R8A7790_CLK_DU1>, - <&mstp7_clks R8A7790_CLK_DU2>, - <&mstp7_clks R8A7790_CLK_LVDS0>, - <&mstp7_clks R8A7790_CLK_LVDS1>, - <&x13_clk>, <&x2_clk>; - clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1", - "dclkin.0", "dclkin.1"; - - ports { - port@0 { - endpoint { - remote-endpoint = <&adv7123_in>; - }; - }; - port@1 { - endpoint { - remote-endpoint = <&adv7511_in>; + compatible = "i2c-demux-pinctrl"; + i2c-parent = <&iic2>, <&i2c2>; + #address-cells = <1>; + #size-cells = <0>; + + i2cbus8: i2c8@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + ak4643: sound-codec@12 { + compatible = "asahi-kasei,ak4643"; + #sound-dai-cells = <0>; + reg = <0x12>; }; - }; - port@2 { - lvds_connector: endpoint { + + composite-in@20 { + compatible = "adi,adv7180"; + reg = <0x20>; + remote = <&vin1>; + + port { + adv7180: endpoint { + bus-width = <8>; + remote-endpoint = <&vin1ep0>; + }; + }; }; }; }; @@ -340,6 +331,11 @@ renesas,function = "iic1"; }; + i2c2_pins: i2c2 { + renesas,groups = "i2c2"; + renesas,function = "i2c2"; + }; + iic2_pins: iic2 { renesas,groups = "iic2"; renesas,function = "iic2"; @@ -518,63 +514,16 @@ pinctrl-names = "default"; }; +&i2c2 { + pinctrl-0 = <&i2c2_pins>; + pinctrl-names = "active"; +}; + &iic2 { - status = "okay"; pinctrl-0 = <&iic2_pins>; - pinctrl-names = "default"; + pinctrl-names = "active"; clock-frequency = <100000>; - - ak4643: sound-codec@12 { - compatible = "asahi-kasei,ak4643"; - #sound-dai-cells = <0>; - reg = <0x12>; - }; - - composite-in@20 { - compatible = "adi,adv7180"; - reg = <0x20>; - remote = <&vin1>; - - port { - adv7180: endpoint { - bus-width = <8>; - remote-endpoint = <&vin1ep0>; - }; - }; - }; - - hdmi@39 { - compatible = "adi,adv7511w"; - reg = <0x39>; - interrupt-parent = <&gpio1>; - interrupts = <15 IRQ_TYPE_EDGE_FALLING>; - - adi,input-depth = <8>; - adi,input-colorspace = "rgb"; - adi,input-clock = "1x"; - adi,input-style = <1>; - adi,input-justification = "evenly"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - adv7511_in: endpoint { - remote-endpoint = <&du_out_lvds0>; - }; - }; - - port@1 { - reg = <1>; - adv7511_out: endpoint { - remote-endpoint = <&hdmi_con>; - }; - }; - }; - }; }; &iic3 {