From patchwork Sat Jul 16 02:13:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 72163 Delivered-To: patches@linaro.org Received: by 10.140.29.52 with SMTP id a49csp116856qga; Fri, 15 Jul 2016 19:13:46 -0700 (PDT) X-Received: by 10.98.16.193 with SMTP id 62mr26658612pfq.132.1468635218941; Fri, 15 Jul 2016 19:13:38 -0700 (PDT) Return-Path: Received: from mail-pa0-x234.google.com (mail-pa0-x234.google.com. [2607:f8b0:400e:c03::234]) by mx.google.com with ESMTPS id aj2si12347298pad.150.2016.07.15.19.13.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jul 2016 19:13:38 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c03::234 as permitted sender) client-ip=2607:f8b0:400e:c03::234; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c03::234 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pa0-x234.google.com with SMTP id fi15so43952654pac.1 for ; Fri, 15 Jul 2016 19:13:38 -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=B5aAy231iUz+5O7eA0JX2Nb4wXnNWVKcdhXVyHd5EtM=; b=Nn6K55ypy+qIW8bW8Q2+hf7E0Fl2gGkbFq0qS9XBge8ZLKqg0zLB3LXSj3JFR8V7HP QOLdu4l6+EbN56yoc6QaSZNo1KO5sI6lrTRqzxX1CrN6uPWr8H9EM3PpuSP9w2ZWZbpr NXnef/SFYyqi3w79h0VqkKSPsYK6Fpe4yWuxk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=B5aAy231iUz+5O7eA0JX2Nb4wXnNWVKcdhXVyHd5EtM=; b=Gv4u70+EmgExgxJ1ylQLaXwDP1JDe2wvckPA4pgzoclmngHp6Hplure6vUTDdWzkqs hsNv/1rTwmNhM8YAZ/52Me2H4Oe+DIjHXOc4swC+rSeHvUPEQDoSzva2IoFr3y5ADZpn Wmp3Ufi89wK30pRptA+OyM58X6AH/zFnACwIAYjMHMaSkqMjo5GnE2GhSpRWe01uluEz oCPpVB9ho+Rfq7APRxU4ksH58si6ik5/xq/+F2l8qqpjxaiR4YEVDcIQbbwhOI0s8IMH VhG/vRVSiuRKJ8Xb3fD9DSPkYUbghc0wyEWKWkKJsJ6hWVti7eJ6+S8k8LhQ03SbcE16 Rd3w== X-Gm-Message-State: ALyK8tIMY02yEP1NvVuBbAWcpN2vj4w3qbLS9mdgEkS64Chr+1GhLVsiGQC5dSCD/ytfv2J/thk= X-Received: by 10.66.167.16 with SMTP id zk16mr37004540pab.146.1468635218633; Fri, 15 Jul 2016 19:13:38 -0700 (PDT) Return-Path: Received: from localhost.localdomain (c-73-67-244-238.hsd1.or.comcast.net. [73.67.244.238]) by smtp.gmail.com with ESMTPSA id d1sm7352655pas.48.2016.07.15.19.13.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Jul 2016 19:13:38 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Zhangfei Gao , Jingoo Han , Krzysztof Kozlowski , Maxime Ripard , Vinod Koul , Dan Williams , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Wei Xu , Rob Herring , Andy Green , Dave Long , Guodong Xu Subject: [PATCH 7/7] dts: hi6220: Add k3-dma and i2s/hdmi audio support Date: Fri, 15 Jul 2016 19:13:27 -0700 Message-Id: <1468635207-20065-8-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468635207-20065-1-git-send-email-john.stultz@linaro.org> References: <1468635207-20065-1-git-send-email-john.stultz@linaro.org> Add entry for k3-dma driver and i2s/hdmi audio devices. This enables HDMI audio output. Cc: Zhangfei Gao Cc: Jingoo Han Cc: Krzysztof Kozlowski Cc: Maxime Ripard Cc: Vinod Koul Cc: Dan Williams Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Wei Xu Cc: Rob Herring Cc: Andy Green Cc: Dave Long Cc: Guodong Xu Signed-off-by: John Stultz --- arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) -- 1.9.1 diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index 189d215..ba34962 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -228,6 +228,8 @@ compatible = "simple-bus"; #address-cells = <2>; #size-cells = <2>; + #sound-dai-cells = <0>; + interrupt-parent = <&gic>; ranges; sram: sram@fff80000 { @@ -325,6 +327,19 @@ status = "disabled"; }; + dma0: dma@f7370000 { + compatible = "hisilicon,k3-dma-1.0"; + reg = <0x0 0xf7370000 0x0 0x1000>; + #dma-cells = <1>; + dma-channels = <15>; + dma-requests = <32>; + interrupts = <0 84 4>; + clocks = <&sys_ctrl HI6220_EDMAC_ACLK>; + dma-no-cci; + dma-type = "hi6220_dma"; + status = "ok"; + }; + dual_timer0: timer@f8008000 { compatible = "arm,sp804", "arm,primecell"; reg = <0x0 0xf8008000 0x0 0x1000>; @@ -800,6 +815,27 @@ #thermal-sensor-cells = <1>; }; + i2s0: hi6210_i2s { + compatible = "hisilicon,hi6210-i2s"; + reg = <0x0 0xf7118000 0x0 0x8000>, /* i2s unit */ + <0x0 0xf7030000 0x0 0x400>, /* syscon */ + <0x0 0xf7032000 0x0 0x400>; /* pmctrl */ + interrupts = <0 123 0x4>; /* 155 "DigACodec_intr"-32 */ + pinctrl-names = "default"; + pinctrl-0 = <&bt_pmx_func &bt_cfg_func>; + clocks = <&sys_ctrl HI6220_DACODEC_PCLK>, + <&sys_ctrl HI6220_BBPPLL0_DIV>; + clock-names = "dacodec", "i2s-base"; + dmas = <&dma0 15 &dma0 14>; + dma-names = "rx", "tx"; + }; + + hi6210_hdmi_card: hi6210_hdmi_card { + compatible = "hisilicon,hi6210-hdmi-audio-card"; + reg = <0 0 0 0>; + sound-dai = <&i2s0>; + }; + thermal-zones { cls0: cls0 {