From patchwork Mon May 8 16:21:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 98841 Delivered-To: patches@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1407428qge; Mon, 8 May 2017 09:21:31 -0700 (PDT) X-Received: by 10.28.173.65 with SMTP id w62mr13834703wme.48.1494260491339; Mon, 08 May 2017 09:21:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494260491; cv=none; d=google.com; s=arc-20160816; b=kveyQV6/CDwIgKTJrTba+I4UYZKRpUIyQnBZ7yw9W9LaabpFvW5jeXOvAteluVU5Ue 3tMoW+hn5kPLBZxqUx1aw56n48mH08ytI3lZXZhsWZCD2nwb8bkAdrvwYYN4V2Zt1Vsn zxfFhxjnstI3UomgndhXk+YmxebvGC/iPj4Dc60CJFZ8VUJB3y/jCBJHN2ZNe+jnqeGG bdxNJB59iKCobMFxZNHzOblzW6GyWYgZl1cfvWmQbnoJu7EgX7aPewZa2E7+sj1ACGrl sEwJeNSV0DJOLGmxcrUSy5+wHq95n773G5toxKnUtVxrQDKwGMxJzy2+G4VxyPjZO+mB 7n4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=G7pR38JJxzCqGgTxeH1/p6ccQR7FDBvDQefUOPhTIHM=; b=PhJpQ3FqdppiU/sXyErhfXl5GJuvtCIh5pwRqnPAydxKT1nzcIwMR+s97jVxXNAIwP DPdcg3TZWBUkZPPF4OE9YdGNM1FvjgEnECvpHQQ00At7Xro8kHPEBzooWcdgBYMfTNhf vsJSWGqjnF9nZ+SrJmdJt1zCsBgviJa5f4gEz6FLq5pz8PPB1v200JjDhzzS4nstNuw9 YreREiSyL6GVXygk7Sr9g1pYWm49kmwyag+Ug+jxZgCCoSRhyC4H8GHNt3IBLm3ISAJh tssfe4YMLZJPrwx14wc/VOoOT7ofL8fk9ONLu4hCZc4UHvqIQVTHf4e/eclz0iV7YE99 bUfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:400c:c09::232 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com. [2a00:1450:400c:c09::232]) by mx.google.com with ESMTPS id v66si7769534wmg.162.2017.05.08.09.21.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 May 2017 09:21:31 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:400c:c09::232 as permitted sender) client-ip=2a00:1450:400c:c09::232; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:400c:c09::232 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x232.google.com with SMTP id m123so70472552wma.0 for ; Mon, 08 May 2017 09:21:31 -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=G7pR38JJxzCqGgTxeH1/p6ccQR7FDBvDQefUOPhTIHM=; b=b7dCC6pgzYxfpFchJjId3F5r2Xx+RT8jbRpHbVIQ9g6wdvxWqZVUHFoG8xh/94P6rE Tz7ZGtD1KSqdGgJIQiUtHO9hH8/O4Lwve6LDZ5CUM0KnCVrP6Dnw+CSz92IsZK/XDpoU JtGBCX8ybtRmvXTzou/OcjgFd2P7HkzpFdJIQ= 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:in-reply-to :references; bh=G7pR38JJxzCqGgTxeH1/p6ccQR7FDBvDQefUOPhTIHM=; b=MGyTEqTUP6MEi1KCSVf52pYeJPshU+i4I+hW4jnI9dG2WMJrnfE3dEPXXVy5lJRA3l pBhOv+so4vWLqXTmv60MErrwr14uUkX8fDzPY7Lbp5V+4jL6b1TXiETQDm6M4g9RuhgL 5G9W06CCd2et7pnrCTXytMlnQtruLeCp49PQnHneXR9pkm8mmiDEvfbAYbPSbDJnK06k C/PRgzlDuW2j/UhLOFmSIBplq+5TDNvxxMs6NQ5QVi6bjBXvBIGfRutqb0Jp7wciaEib UDqRnnYvIxzRVn2iloDZ8860SZ1qSEg8b1PNojra/8YlGxFAfitRWJVw/TIUQEF8i7x7 eKqA== X-Gm-Message-State: AODbwcAUa3FECbQbN/HcklVZ90QoN8sPJsVf+7T1Zz1hPpitpXXZu1ns +7oj05+RrcsK/68tBvw= X-Received: by 10.25.152.79 with SMTP id a76mr1643928lfe.165.1494260490895; Mon, 08 May 2017 09:21:30 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-155-4-221-67.na.cust.bahnhof.se. [155.4.221.67]) by smtp.gmail.com with ESMTPSA id 1sm1600724ljn.59.2017.05.08.09.21.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 May 2017 09:21:30 -0700 (PDT) From: Ulf Hansson To: Wei Xu , linux-arm-kernel@lists.infradead.org Cc: Ulf Hansson , Daniel Lezcano Subject: [PATCH 7/8] arm64: dts: hi6220: Move board data from the dwmmc nodes to hikey dts Date: Mon, 8 May 2017 18:21:16 +0200 Message-Id: <1494260477-25163-8-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494260477-25163-1-git-send-email-ulf.hansson@linaro.org> References: <1494260477-25163-1-git-send-email-ulf.hansson@linaro.org> Move the board specific descriptions for the dwmmc nodes in the hi6220 SoC dtsi, into the hikey dts as it's there these belongs. While changing this, let's take the opportunity to drop the use of the "ti,non-removable" binding for one of the dwmmc device nodes, as it's not a valid binding and not used. Drop also the unnecessary use of "num-slots = <0x1>" for all of the dwmmc nodes, as there is no need to set this since when default number of slots is one. Signed-off-by: Ulf Hansson Acked-by: Daniel Lezcano --- arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 23 ++++++++++++++++++++++- arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 19 ------------------- 2 files changed, 22 insertions(+), 20 deletions(-) -- 2.7.4 diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index 6dab03a..d4b3879 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -281,8 +281,29 @@ /* GPIO blocks 16 thru 19 do not appear to be routed to pins */ + dwmmc_0: dwmmc0@f723d000 { + cap-mmc-highspeed; + non-removable; + bus-width = <0x8>; + vmmc-supply = <&ldo19>; + }; + + dwmmc_1: dwmmc1@f723e000 { + card-detect-delay = <200>; + cap-sd-highspeed; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + vqmmc-supply = <&ldo7>; + vmmc-supply = <&ldo10>; + bus-width = <0x4>; + disable-wp; + cd-gpios = <&gpio1 0 1>; + }; + dwmmc_2: dwmmc2@f723f000 { - ti,non-removable; + broken-cd; + bus-width = <0x4>; non-removable; /* WL_EN */ vmmc-supply = <&wlan_en_reg>; diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index 951152d..5013e4b 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -756,17 +756,12 @@ dwmmc_0: dwmmc0@f723d000 { compatible = "hisilicon,hi6220-dw-mshc"; - num-slots = <0x1>; - cap-mmc-highspeed; - non-removable; reg = <0x0 0xf723d000 0x0 0x1000>; interrupts = <0x0 0x48 0x4>; clocks = <&sys_ctrl 2>, <&sys_ctrl 1>; clock-names = "ciu", "biu"; resets = <&sys_ctrl PERIPH_RSTDIS0_MMC0>; reset-names = "reset"; - bus-width = <0x8>; - vmmc-supply = <&ldo19>; pinctrl-names = "default"; pinctrl-0 = <&emmc_pmx_func &emmc_clk_cfg_func &emmc_cfg_func &emmc_rst_cfg_func>; @@ -774,13 +769,7 @@ dwmmc_1: dwmmc1@f723e000 { compatible = "hisilicon,hi6220-dw-mshc"; - num-slots = <0x1>; - card-detect-delay = <200>; hisilicon,peripheral-syscon = <&ao_ctrl>; - cap-sd-highspeed; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; reg = <0x0 0xf723e000 0x0 0x1000>; interrupts = <0x0 0x49 0x4>; #address-cells = <0x1>; @@ -789,11 +778,6 @@ clock-names = "ciu", "biu"; resets = <&sys_ctrl PERIPH_RSTDIS0_MMC1>; reset-names = "reset"; - vqmmc-supply = <&ldo7>; - vmmc-supply = <&ldo10>; - bus-width = <0x4>; - disable-wp; - cd-gpios = <&gpio1 0 1>; pinctrl-names = "default", "idle"; pinctrl-0 = <&sd_pmx_func &sd_clk_cfg_func &sd_cfg_func>; pinctrl-1 = <&sd_pmx_idle &sd_clk_cfg_idle &sd_cfg_idle>; @@ -801,15 +785,12 @@ dwmmc_2: dwmmc2@f723f000 { compatible = "hisilicon,hi6220-dw-mshc"; - num-slots = <0x1>; reg = <0x0 0xf723f000 0x0 0x1000>; interrupts = <0x0 0x4a 0x4>; clocks = <&sys_ctrl HI6220_MMC2_CIUCLK>, <&sys_ctrl HI6220_MMC2_CLK>; clock-names = "ciu", "biu"; resets = <&sys_ctrl PERIPH_RSTDIS0_MMC2>; reset-names = "reset"; - bus-width = <0x4>; - broken-cd; pinctrl-names = "default", "idle"; pinctrl-0 = <&sdio_pmx_func &sdio_clk_cfg_func &sdio_cfg_func>; pinctrl-1 = <&sdio_pmx_idle &sdio_clk_cfg_idle &sdio_cfg_idle>;