From patchwork Mon May 15 22:17:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 99836 Delivered-To: patches@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1748836qge; Mon, 15 May 2017 15:17:17 -0700 (PDT) X-Received: by 10.99.99.134 with SMTP id x128mr8309689pgb.46.1494886637475; Mon, 15 May 2017 15:17:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494886637; cv=none; d=google.com; s=arc-20160816; b=hEjINmk+Tk8OfsgmhVH2YijLXsXmgY5Vzz85ga7cnT8qaqAQ7SUP8lLtbH/WQNCfy9 nzQOjwoFr2K7/5sgiDdPWX9Q8xC2HKIG1VP8nQKYN7cavXOSCsAvNOseZnpxPeOSp5xe RgjflVhy6EF90HgSIuNk7H1EDs2NP4wtxO303XGn1NkPQbYepDZdVf+zF3sYCFPa1ctP LtTG8dDCiUGKbRjFOD/Y10thyUvnl1wqNjeWJtLWPPkV+o9HmxogM7hKI0T8RzavkzfQ 8OHFooaAYO+gkFUiozcZLIxem42IS3/ab5B8e6Xg/Ro2gDNTc4IPCinLJByPWze/QAvn Jy7Q== 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=F//sOagGNdHm8U8eQfQFOQ7Ld9As3+K/kD2RtHnGGyY=; b=i1zML2CE+1uEPfoFIKXjd0GoLzR6MRecetZLyc2VjoMl+EoG1um8JyPX6q1hsTWQ2X yCeNy5fX/pe105GdgQGSgpkvl37G78T3q6wm9VVIdJMtEN3QNjLez92F8fT11A2Qk1iU 7sj7ESDIo7ZPSqztof9JtXuGgFh86UWCm/GM0k8sx9P14WggzSMl+7YDLl1iKpjTeZRH jALchr4Mqp4iPw9RZh1K6EJXshpTiuhgcFKvCAavA+H7ZaMUYS2+5hDFJoCxZNhNymA5 /VYSr46wmQS1xFhvaNLhlXvQx5RCONDy8S5lOwjrd8jyuXPKtUBH7sGb3u/IGMeCLOUP zS6w== 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:c05::233 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-pg0-x233.google.com (mail-pg0-x233.google.com. [2607:f8b0:400e:c05::233]) by mx.google.com with ESMTPS id l3si12000461pln.335.2017.05.15.15.17.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 May 2017 15:17:17 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::233 as permitted sender) client-ip=2607:f8b0:400e:c05::233; 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:c05::233 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pg0-x233.google.com with SMTP id q125so47041091pgq.2 for ; Mon, 15 May 2017 15:17:17 -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=F//sOagGNdHm8U8eQfQFOQ7Ld9As3+K/kD2RtHnGGyY=; b=iApmU2W33p+1nnIJKKlAgWlx4TP1nU5iOX1l3TosWZcDdEHaBkrPqxjJp1MBbtFGCO VbTL2pOJ2nyxXVcrJ8Uh1okRq+Ghx6QAx2bUscFAqWP/vrT0qzvfpoTTI4HONuESD4Dh gvd5hzwDAmjwVcYVY9g5mmqtuX9G+j+MFIk+I= 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=F//sOagGNdHm8U8eQfQFOQ7Ld9As3+K/kD2RtHnGGyY=; b=PPj7Mz90CYofsZtatBNC8V8PeCiVtRzENM6j2lonL1UWDabADKqdjfKMPbiVaOFGUU tbnpAYLNgA+lVS54I6KMmcYvWhqIwgNWWghHl+YQDshfry9t4c4mqbtDxIOmXS+Iorxf et4etz/FHcAJMDSfbelVc4iFx2pNO95F9zAnVe1HEROhoXDhGCNNgKYnWjU1mqIzh+9T y9DGAokethwW3EA7w7DfXNCq+mhzF4RVf+pDQ9uSnzsafAmjrEUPZHJZHo0rrLqchuJg f6pybpe2kvPcyWLlxvpjvIaii5KRFi0DiGTOmZnbEE5344WvoXFsZ4JrurI5dmz+fMB6 BOdg== X-Gm-Message-State: AODbwcCBouanZYyYwJ4HBVGCYlFeS8Yz4GVA8ys3MTgtMDpAi/VeVLY+ B8NEs3qtFR0Vd5bmmXs= X-Received: by 10.98.215.12 with SMTP id b12mr8826227pfh.162.1494886636942; Mon, 15 May 2017 15:17:16 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id p10sm21481911pgf.63.2017.05.15.15.17.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 May 2017 15:17:15 -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][PATCH v4] arm64: dts: hi6220: Add k3-dma and i2s/hdmi audio support Date: Mon, 15 May 2017 15:17:12 -0700 Message-Id: <1494886632-29200-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 75bce2d..8b285b9 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -418,6 +418,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 { @@ -458,6 +473,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 1e5129b..bead852 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>; @@ -834,6 +847,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 {