From patchwork Mon Sep 10 03:58:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 146266 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2040421ljw; Sun, 9 Sep 2018 21:01:15 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYF/uNlG8wh0a6oCdjqU0TZqycEgsm5hM4QbXxm7EEc2WsQlXb1AR2aJgTY4F/yH/JESDv6 X-Received: by 2002:a50:a8e4:: with SMTP id k91-v6mr21060527edc.4.1536552075586; Sun, 09 Sep 2018 21:01:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536552075; cv=none; d=google.com; s=arc-20160816; b=T8s1G0vQJXhpzv5t15Q2AdR4mefBZpsY//S5F3E6CnDrja4t+bDd17dEtui62uEOo8 qZWOiAuUhV+PwjIMF2ywgpCqgQe8q/mkcCbkokxdJv7XpMMgZo6zuFgW/CnQzOUZkPGC v5/9XHrHZH2a5hwl362SaguFqTniRGTF+GLLIJaEzXcL0uVNcktPu7H5GKjatYRc489/ ipPVZZkdtPMlY5QnYjgL3uCD6YbKkUjdoPMt31XT5/KQzJuSflgxo9v7me7sLtGlgWgE n/1VGkZAWU45N3WyboUHHbOBwZFWhjQM4L+07Kf7fd0h9tR5oHi0LC0IRjLvvYToxr7E Rhfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter; bh=uWHa3yMTruSOKYZ0sLv8kayC6V4trKz2UyHZgMXtaac=; b=QDPl3d7iD5qKnzDsAVm/h8/iH63bLMZZBuyg3LBe9I9tB+82tTylNXAJZUzWRZJj7V EcHFpOimHnuDdmdhYzg9mwkCFdRowNMErRjhoxzXlvG12XmHX7QfJ1/G9wLDeFQGFbo4 uPmP4k/usYlL+d0VPfpWrt8mlad8wV4Rf5bwToJmJ4e+9aiX+SG02nV3iNoXeBi4JEwx tYZfTC6vwlCBdbVihkheFc4SfmvjNoX2sPBR4GH68AyUgJzlOiK+dUWJmktGErt7y1an pukCP9n2h57s+CfDArqeatP8qHqBksGZDv+wW2klZKL2r7Ao3s9n83A7+B7bqpuznbVl 4P2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=QXWy+i5Y; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id o18-v6si1351922edf.177.2018.09.09.21.01.15; Sun, 09 Sep 2018 21:01:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=QXWy+i5Y; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 38833C21DD9; Mon, 10 Sep 2018 04:00:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id CB8B5C21E0D; Mon, 10 Sep 2018 03:59:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F3A52C21DFA; Mon, 10 Sep 2018 03:59:15 +0000 (UTC) Received: from conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by lists.denx.de (Postfix) with ESMTPS id 905D0C21E47 for ; Mon, 10 Sep 2018 03:59:09 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w8A3wifV006634; Mon, 10 Sep 2018 12:58:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w8A3wifV006634 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1536551925; bh=N/4Q6oDkvlZSGE4+XKWEytbRHa/WXDBxoIm1huzlIxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QXWy+i5YLB7K1o0TbVQAufklzGDq+wMW09xQI4++/tk2XIXS6FTtgMxBrzUtrr/mu 1dAW/3CM2jeXjWvTm77lg+XrE9qx/g1T++fSe5l17owSiocl5OsqPwytPBo0T1ejpU oIT05sBiw2ai4D1BJvkkzpi4SlM2k5RBEVsJJ3i5ZtTxW+1i6nPjyXMJVm3UwwKeoI qfyM0G87Uv9EgPP5UwhOHAhhDW56L3YzbAqrXY8IHqHj5RQqI68NIsDGpQQdJc20Rm qBbMp/FQIKuNQqHtHBPa5iT4iiOBRX5cDvea0/FkTcRx5hP7ukvGemLGsrRMnX39Ta hzkxiev+545ng== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 10 Sep 2018 12:58:32 +0900 Message-Id: <1536551916-21187-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536551916-21187-1-git-send-email-yamada.masahiro@socionext.com> References: <1536551916-21187-1-git-send-email-yamada.masahiro@socionext.com> Cc: Tom Rini Subject: [U-Boot] [PATCH 1/5] ARM: dts: uniphier: sync DT with Linux 4.19-rc1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Masahiro Yamada --- arch/arm/dts/uniphier-ld11-global.dts | 3 ++- arch/arm/dts/uniphier-ld11.dtsi | 2 +- arch/arm/dts/uniphier-ld20-global.dts | 3 ++- arch/arm/dts/uniphier-ld20.dtsi | 4 +++- arch/arm/dts/uniphier-ld4.dtsi | 3 +-- arch/arm/dts/uniphier-pinctrl.dtsi | 5 ----- arch/arm/dts/uniphier-pro4.dtsi | 3 +-- arch/arm/dts/uniphier-pxs2.dtsi | 3 +++ arch/arm/dts/uniphier-pxs3.dtsi | 2 +- arch/arm/dts/uniphier-sld8.dtsi | 3 +-- 10 files changed, 15 insertions(+), 16 deletions(-) diff --git a/arch/arm/dts/uniphier-ld11-global.dts b/arch/arm/dts/uniphier-ld11-global.dts index 11be2aa..744b36e 100644 --- a/arch/arm/dts/uniphier-ld11-global.dts +++ b/arch/arm/dts/uniphier-ld11-global.dts @@ -54,12 +54,13 @@ sound { compatible = "audio-graph-card"; label = "UniPhier LD11"; - widgets = "Headphone", "Headphone Jack"; + widgets = "Headphone", "Headphones"; dais = <&i2s_port2 &i2s_port3 &i2s_port4 &spdif_port0 &comp_spdif_port0>; + hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>; }; spdif-out { diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi index 3f9237c..d63b56e 100644 --- a/arch/arm/dts/uniphier-ld11.dtsi +++ b/arch/arm/dts/uniphier-ld11.dtsi @@ -407,7 +407,7 @@ reg = <0x5a000000 0x400>; interrupts = <0 78 4>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_emmc_1v8>; + pinctrl-0 = <&pinctrl_emmc>; clocks = <&sys_clk 4>; resets = <&sys_rst 4>; bus-width = <8>; diff --git a/arch/arm/dts/uniphier-ld20-global.dts b/arch/arm/dts/uniphier-ld20-global.dts index fe6608e..1a5e7c2 100644 --- a/arch/arm/dts/uniphier-ld20-global.dts +++ b/arch/arm/dts/uniphier-ld20-global.dts @@ -54,12 +54,13 @@ sound { compatible = "audio-graph-card"; label = "UniPhier LD20"; - widgets = "Headphone", "Headphone Jack"; + widgets = "Headphone", "Headphones"; dais = <&i2s_port2 &i2s_port3 &i2s_port4 &spdif_port0 &comp_spdif_port0>; + hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>; }; spdif-out { diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi index 6ffbf18..35867ab 100644 --- a/arch/arm/dts/uniphier-ld20.dtsi +++ b/arch/arm/dts/uniphier-ld20.dtsi @@ -58,6 +58,7 @@ clocks = <&sys_clk 32>; enable-method = "psci"; operating-points-v2 = <&cluster0_opp>; + #cooling-cells = <2>; }; cpu2: cpu@100 { @@ -77,6 +78,7 @@ clocks = <&sys_clk 33>; enable-method = "psci"; operating-points-v2 = <&cluster1_opp>; + #cooling-cells = <2>; }; }; @@ -512,7 +514,7 @@ reg = <0x5a000000 0x400>; interrupts = <0 78 4>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_emmc_1v8>; + pinctrl-0 = <&pinctrl_emmc>; clocks = <&sys_clk 4>; resets = <&sys_rst 4>; bus-width = <8>; diff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi index 4545056..e3d3138 100644 --- a/arch/arm/dts/uniphier-ld4.dtsi +++ b/arch/arm/dts/uniphier-ld4.dtsi @@ -247,9 +247,8 @@ status = "disabled"; reg = <0x5a500000 0x200>; interrupts = <0 78 4>; - pinctrl-names = "default", "1.8v"; + pinctrl-names = "default"; pinctrl-0 = <&pinctrl_emmc>; - pinctrl-1 = <&pinctrl_emmc_1v8>; clocks = <&mio_clk 1>; reset-names = "host", "bridge"; resets = <&mio_rst 1>, <&mio_rst 4>; diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi index 9dd9d49..2dc86d2 100644 --- a/arch/arm/dts/uniphier-pinctrl.dtsi +++ b/arch/arm/dts/uniphier-pinctrl.dtsi @@ -56,11 +56,6 @@ function = "emmc"; }; - pinctrl_emmc_1v8: emmc-1v8 { - groups = "emmc", "emmc_dat8"; - function = "emmc"; - }; - pinctrl_ether_mii: ether-mii { groups = "ether_mii"; function = "ether_mii"; diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi index 8185b54..3cd9b72 100644 --- a/arch/arm/dts/uniphier-pro4.dtsi +++ b/arch/arm/dts/uniphier-pro4.dtsi @@ -281,9 +281,8 @@ status = "disabled"; reg = <0x5a500000 0x200>; interrupts = <0 78 4>; - pinctrl-names = "default", "1.8v"; + pinctrl-names = "default"; pinctrl-0 = <&pinctrl_emmc>; - pinctrl-1 = <&pinctrl_emmc_1v8>; clocks = <&mio_clk 1>; reset-names = "host", "bridge"; resets = <&mio_rst 1>, <&mio_rst 4>; diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi index f4101c0..48782a5 100644 --- a/arch/arm/dts/uniphier-pxs2.dtsi +++ b/arch/arm/dts/uniphier-pxs2.dtsi @@ -36,6 +36,7 @@ enable-method = "psci"; next-level-cache = <&l2>; operating-points-v2 = <&cpu_opp>; + #cooling-cells = <2>; }; cpu2: cpu@2 { @@ -46,6 +47,7 @@ enable-method = "psci"; next-level-cache = <&l2>; operating-points-v2 = <&cpu_opp>; + #cooling-cells = <2>; }; cpu3: cpu@3 { @@ -56,6 +58,7 @@ enable-method = "psci"; next-level-cache = <&l2>; operating-points-v2 = <&cpu_opp>; + #cooling-cells = <2>; }; }; diff --git a/arch/arm/dts/uniphier-pxs3.dtsi b/arch/arm/dts/uniphier-pxs3.dtsi index cfeeecd..c6ec63c 100644 --- a/arch/arm/dts/uniphier-pxs3.dtsi +++ b/arch/arm/dts/uniphier-pxs3.dtsi @@ -327,7 +327,7 @@ reg = <0x5a000000 0x400>; interrupts = <0 78 4>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_emmc_1v8>; + pinctrl-0 = <&pinctrl_emmc>; clocks = <&sys_clk 4>; resets = <&sys_rst 4>; bus-width = <8>; diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi index f20926e..35c2f85 100644 --- a/arch/arm/dts/uniphier-sld8.dtsi +++ b/arch/arm/dts/uniphier-sld8.dtsi @@ -251,9 +251,8 @@ status = "disabled"; reg = <0x5a500000 0x200>; interrupts = <0 78 4>; - pinctrl-names = "default", "1.8v"; + pinctrl-names = "default"; pinctrl-0 = <&pinctrl_emmc>; - pinctrl-1 = <&pinctrl_emmc_1v8>; clocks = <&mio_clk 1>; reset-names = "host", "bridge"; resets = <&mio_rst 1>, <&mio_rst 4>;