From patchwork Fri Jun 2 18:05:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 101293 Delivered-To: patches@linaro.org Received: by 10.140.96.100 with SMTP id j91csp525167qge; Fri, 2 Jun 2017 11:06:04 -0700 (PDT) X-Received: by 10.84.217.94 with SMTP id e30mr1088483plj.272.1496426764291; Fri, 02 Jun 2017 11:06:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496426764; cv=none; d=google.com; s=arc-20160816; b=dEfjZbLB1NRxTRLTG0ptovu+I4jD6tEOoNprmY26eHOcQZ61/gg/aeZaopfvVT/5dP IJoN/psuLK6fY9YBDEn4VNPVDketAQcoldx7sOYuRdRAD18qmKP2obIzRjWUjWVyeKSm VT+J/ix5L2qrp7/kC1SZtQV2PWy+TfCkLsSPt2uvDqYp8YnMT1SEFkNVYlZ1iyPmBlLv L9GO07y+Sx7zOhPRv0DMZ4G+K305vgeDMm5m6C/0xSollrukQOK8oDK0gPXRxlfwWc95 0pnjb9KTsZ4o4oyURlyDnpgxE9cwvAxBetcJdoleDGKDKVMhDlTcjmJOLF2tn+x2kumX bdvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=N5jDvpDQIJHEQDgyMGu1Nv0uwrX+kGr+an89i0BbOaM=; b=fW7C6Q2ENinRavqclTUMoxJmpNP2p3izJ0ClKMRgGtow5Yn7En2L+BNfcJWly4j20i 6sufSoXq8muOB+gw9XINwX5NlvHeH4uNr7EwwOGS5PmSkt/xjrWP6VmWfR53VBjw6xZk ZtaAfSOlBlJJ5BEG7ZtvCVjl5Cn2Kgjo788GCPgNoUgcrpbDNn/cC27hOnEq4gpAptq0 b1BX2dPFQ8ogtPbtkwwEO6hdJdqwqZdQpHE/kdzbgH/mFyF2SZICE73KTqmXIrk3UooA nSqH5lTPgVGEydpwxbQQIa4Z7ydoxj/9NYvEa6RyI5EOGPAdwduKWqdlZC7POAO0z/tR bq2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::234 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-pf0-x234.google.com (mail-pf0-x234.google.com. [2607:f8b0:400e:c00::234]) by mx.google.com with ESMTPS id h10si23394852pgc.122.2017.06.02.11.06.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Jun 2017 11:06:04 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::234 as permitted sender) client-ip=2607:f8b0:400e:c00::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:c00::234 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x234.google.com with SMTP id n23so54279959pfb.2 for ; Fri, 02 Jun 2017 11:06:04 -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; bh=N5jDvpDQIJHEQDgyMGu1Nv0uwrX+kGr+an89i0BbOaM=; b=MXQgZgoP8v14/bwPbLs8PDjUJf4V3U0UjiMn5gzd+uTxwZgb9KsF5sSTPGG6hNUop3 SdVqYwStOdf06kfUX6hKrfplgIEJuAug9MAVUg9UTgCDraAhHd1fdyb9nVivygGHOpgP FkmkE9cAS/hrigl12ApVBYTsHjA9BYPlObno8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=N5jDvpDQIJHEQDgyMGu1Nv0uwrX+kGr+an89i0BbOaM=; b=iVr+8+txJgZrC21wrW8/KYZwLIOr4gJbI83lXGAG3q3IveDMLCLr7SVRGxnh5q9vI8 pqupOr+oE3D8BJTCHZAr13jgO1BmxN2KLMEt4nc3DlLSS/SBWn6nrcFwFqOlfbGGXF4k coBZUhNkCmhCkW5VTbfRAA/pUHDiS4gvxx0vJzArfRuJnpGtgV8VG+/27Kwqs6R80AiW lgGoSYery2qVYoKI94WmshVvpISMevO+bri8ikTBusOIQfwJnTS2K5UTY4fGkSOB91YE 5FxqlgGCCMcHjdXOny72aI3Bcnp0RBPDro1g3HUoLo6T13X+WYc7yjVkVFMvwo4Q3DfS blVA== X-Gm-Message-State: AODbwcAnvXxFOdiE9FxxTInTpzTj8zkOJVtpMVbCszzDkJe3wVAR6rub czBeA5beOQfgoLf29Wo= X-Received: by 10.98.131.142 with SMTP id h136mr8177475pfe.138.1496426763811; Fri, 02 Jun 2017 11:06:03 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id 192sm36984357pfb.10.2017.06.02.11.06.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Jun 2017 11:06:02 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Zhangfei Gao , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Wei Xu , Rob Herring , Andy Green , Dave Long , Guodong Xu , Antonio Borneo Subject: [RESEND x2][PATCH v4] arm64: dts: hi6220: Add k3-dma and i2s/hdmi audio support Date: Fri, 2 Jun 2017 11:05:59 -0700 Message-Id: <1496426759-556-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 Add entry for k3-dma driver and i2s/hdmi audio devices. This enables HDMI audio output. Cc: Zhangfei Gao 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 Cc: Antonio Borneo Signed-off-by: John Stultz v2: * Split core i2s entry into dtsi and hdmi specific bits into hikey dts v4: * Rework simple-card to use many-dai-links method, as there may be other links in the future --- arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 16 ++++++++++++++++ arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 26 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) -- 2.7.4 diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index 5132d8e..ce59586 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -470,6 +470,21 @@ method = "smc"; }; }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "hikey-hdmi"; + + simple-audio-card,dai-link@0 { /* I2S - HDMI */ + format = "i2s"; + cpu { + sound-dai = <&i2s0 0>; + }; + codec { + sound-dai = <&adv7533>; + }; + }; + }; }; &uart2 { @@ -510,6 +525,7 @@ interrupts = <1 2>; pd-gpio = <&gpio0 4 0>; adi,dsi-lanes = <4>; + #sound-dai-cells = <0>; port { adv7533_in: endpoint { diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index 5013e4b..f2e218c 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -332,6 +332,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>; @@ -805,6 +818,19 @@ #thermal-sensor-cells = <1>; }; + i2s0: i2s@f7118000{ + compatible = "hisilicon,hi6210-i2s"; + reg = <0x0 0xf7118000 0x0 0x8000>; /* i2s unit */ + interrupts = ; /* 155 "DigACodec_intr"-32 */ + 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"; + hisilicon,sysctrl-syscon = <&sys_ctrl>; + #sound-dai-cells = <1>; + }; + thermal-zones { cls0: cls0 {