From patchwork Sat Jul 15 12:47:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 788899 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3x8q8y3zhFz9sBR for ; Sat, 15 Jul 2017 22:48:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751302AbdGOMr7 (ORCPT ); Sat, 15 Jul 2017 08:47:59 -0400 Received: from lb3-smtp-cloud2.xs4all.net ([194.109.24.29]:56669 "EHLO lb3-smtp-cloud2.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304AbdGOMr5 (ORCPT ); Sat, 15 Jul 2017 08:47:57 -0400 Received: from marune.fritz.box ([80.101.105.217]) by smtp-cloud2.xs4all.net with ESMTP id l0nt1v00Y4hSry8010nwLF; Sat, 15 Jul 2017 14:47:56 +0200 From: Hans Verkuil To: linux-media@vger.kernel.org Cc: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, Hans Verkuil Subject: [PATCH 2/4] ARM: tegra: add CEC support to tegra124.dtsi Date: Sat, 15 Jul 2017 14:47:51 +0200 Message-Id: <20170715124753.43714-3-hverkuil@xs4all.nl> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170715124753.43714-1-hverkuil@xs4all.nl> References: <20170715124753.43714-1-hverkuil@xs4all.nl> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Hans Verkuil Add support for the Tegra CEC IP to tegra124.dtsi and enable it on the Jetson TK1. Signed-off-by: Hans Verkuil --- arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 ++++ arch/arm/boot/dts/tegra124.dtsi | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts index 7bacb2954f58..c22c0e6dc3d9 100644 --- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts +++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts @@ -67,6 +67,10 @@ }; }; + tegra_cec { + status = "okay"; + }; + gpu@0,57000000 { /* * Node left disabled on purpose - the bootloader will enable diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index 1b10b14a6abd..df7e9e2925f5 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi @@ -123,7 +123,7 @@ nvidia,head = <1>; }; - hdmi@54280000 { + hdmi: hdmi@54280000 { compatible = "nvidia,tegra124-hdmi"; reg = <0x0 0x54280000 0x0 0x00040000>; interrupts = ; @@ -851,6 +851,16 @@ status = "disabled"; }; + tegra_cec { + compatible = "nvidia,tegra124-cec"; + reg = <0x0 0x70015000 0x0 0x00001000>; + interrupts = ; + clocks = <&tegra_car TEGRA124_CLK_CEC>; + clock-names = "cec"; + hdmi-phandle = <&hdmi>; + status = "disabled"; + }; + soctherm: thermal-sensor@700e2000 { compatible = "nvidia,tegra124-soctherm"; reg = <0x0 0x700e2000 0x0 0x600 /* SOC_THERM reg_base */