From patchwork Thu Nov 5 18:13:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akshay Bhat X-Patchwork-Id: 7563051 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D41EBBEEA4 for ; Thu, 5 Nov 2015 18:21:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C011420768 for ; Thu, 5 Nov 2015 18:21:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C137A2077A for ; Thu, 5 Nov 2015 18:21:39 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZuP7b-0002fP-Ki; Thu, 05 Nov 2015 18:18:51 +0000 Received: from mail-qg0-x22e.google.com ([2607:f8b0:400d:c04::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZuP4w-0000LC-PM for linux-arm-kernel@lists.infradead.org; Thu, 05 Nov 2015 18:16:09 +0000 Received: by qgeb1 with SMTP id b1so20117869qge.1 for ; Thu, 05 Nov 2015 10:15:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=timesys_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WU6tefKsHYNFNJp5PJi8a45CO0cmctsToc2HV59XypQ=; b=fuHDncobR2CxRWGOLMATPym+LPkR3awzuKHSeteg5oTPlO8b4KJ8H1XSoSmdlOzOV/ 8PD8JVXhTdicTKRqKjEtSuBAy7LTNst65dCMKSOCl3hmfzZyMqXh/tUALOWfkW0eKi3j +kM25zF/z6oMkkVq+iM1COeIgHAer9TXZFRpvojmttXRkifutJdf6ib6N/s3Y50X6pMz E3/b8lJho2SEtVBqEHV+OOQ3l0LJFN3vsuMQjG6KVdaT4WTmBdGbt+nhxdly1O8MnDrJ kJi7GpisBKd/+ab7dMGoRWm25/hUGNwexhcxjZa2Zzx/LdEpjj6/kX5bgkNamcgn/gY7 mi8A== 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=WU6tefKsHYNFNJp5PJi8a45CO0cmctsToc2HV59XypQ=; b=mgvdv+oCJR4IRBLXbleamVfwf+b6MLyxI9OSWqc882VL5Tu7SHjUAo7GPCUb0Bsp9s GjUhun1BuUomXVlBbLLfNBoN39RUms7hpkOZzhmC7KJZ6Z950KweHv4RD+bJ/VZEU1f+ BPwkp+duRA5bnnVZ8d5CZMfCeVYRc5FDsjI5X4fHhd5o732uKI1K+MP1c5J6z1wa17MI HnzKp0UuTvF6bETKRI5EH86TjfMInmTnhPiFmltN+51BpcN+xYqtnySsviGuClvQIsGH Ez/xPqNQZViezfqsO6g8xA+fKxfr9nn6hhnBCeTjzY6oubVmo9LaoiK6r8tnTYY8H9DN 1JGw== X-Gm-Message-State: ALoCoQnQvgbEO2r7leAu5zEeuyv/PQoUY6PJ2e/oFZCuG0NNdHFc+0ko+yfqLfTooGboeSKxcFy9 X-Received: by 10.140.248.136 with SMTP id t130mr9361193qhc.34.1446747344941; Thu, 05 Nov 2015 10:15:44 -0800 (PST) Received: from localhost.localdomain ([96.94.100.129]) by smtp.gmail.com with ESMTPSA id n67sm1929958qkh.18.2015.11.05.10.15.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Nov 2015 10:15:44 -0800 (PST) From: Akshay Bhat To: devicetree@vger.kernel.org Subject: [PATCH v2 10/10] ARM: dts: imx6q-ba16: Cleanup pinctrl and LDO Date: Thu, 5 Nov 2015 13:13:44 -0500 Message-Id: <1446747224-32514-11-git-send-email-akshay.bhat@timesys.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1446747224-32514-1-git-send-email-akshay.bhat@timesys.com> References: <1446747224-32514-1-git-send-email-akshay.bhat@timesys.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151105_101606_996942_A95746A0 X-CRM114-Status: GOOD ( 13.27 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, justin.waters@timesys.com, linux@arm.linux.org.uk, Akshay Bhat , ijc+devicetree@hellion.org.uk, robh+dt@kernel.org, peter.stretz@advantech.com, kernel@pengutronix.de, galak@codeaurora.org, l.stach@pengutronix.de, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org, martin.donnelly@ge.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Incorporate feedback from Lucas Stash - Move entries from pinctrl_hog to relevant groups - Remove unused PCIe power-on-gpio entry - Remove always-on from regulators that do not need to be always-on Signed-off-by: Akshay Bhat --- arch/arm/boot/dts/imx6q-ba16.dtsi | 85 +++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 30 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-ba16.dtsi b/arch/arm/boot/dts/imx6q-ba16.dtsi index 3d47039..d0c4568 100644 --- a/arch/arm/boot/dts/imx6q-ba16.dtsi +++ b/arch/arm/boot/dts/imx6q-ba16.dtsi @@ -2,7 +2,7 @@ * Support for imx6 based Advantech DMS-BA16 Qseven module * * Copyright 2015 Timesys Corporation. - * Copyright 2015 GE Healthcare. + * Copyright 2015 General Electric Company * * The code contained herein is licensed under the GNU General Public * License. You may obtain a copy of the GNU General Public License @@ -73,6 +73,8 @@ }; backlight { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_display>; compatible = "pwm-backlight"; pwms = <&pwm1 0 5000000>; brightness-levels = < 0 1 2 3 4 5 6 7 8 9 @@ -176,6 +178,8 @@ pmic@58 { compatible = "dlg,da9063"; reg = <0x58>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pmic>; interrupt-parent = <&gpio7>; interrupts = <13 IRQ_TYPE_LEVEL_LOW>; @@ -245,43 +249,31 @@ vdd_ldo5: ldo5 { regulator-min-microvolt = <900000>; regulator-max-microvolt = <3600000>; - regulator-always-on; - regulator-boot-on; }; vdd_ldo6: ldo6 { regulator-min-microvolt = <900000>; regulator-max-microvolt = <3600000>; - regulator-always-on; - regulator-boot-on; }; vdd_ldo7: ldo7 { regulator-min-microvolt = <900000>; regulator-max-microvolt = <3600000>; - regulator-always-on; - regulator-boot-on; }; vdd_ldo8: ldo8 { regulator-min-microvolt = <900000>; regulator-max-microvolt = <3600000>; - regulator-always-on; - regulator-boot-on; }; vdd_ldo9: ldo9 { regulator-min-microvolt = <950000>; regulator-max-microvolt = <3600000>; - regulator-always-on; - regulator-boot-on; }; vdd_ldo10: ldo10 { regulator-min-microvolt = <900000>; regulator-max-microvolt = <3600000>; - regulator-always-on; - regulator-boot-on; }; vdd_ldo11: ldo11 { @@ -301,16 +293,6 @@ imx6q-ba16 { pinctrl_hog: hoggrp { fsl,pins = < - MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000 /* uSDHC2 CD */ - MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x80000000 /* uSDHC4 CD */ - MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x80000000 /* uSDHC4 SDIO PWR */ - MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x80000000 /* uSDHC4 SDIO WP */ - MX6QDL_PAD_NANDF_CS3__GPIO6_IO16 0x80000000 /* uSDHC4 SDIO LED */ - MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x80000000 /* SPI1 CS */ - MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 /* PCIe Reset */ - MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x80000000 /* PCIe Wake */ - MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0 /* FEC CLK */ - MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000 /* FEC Reset */ MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x80000000 /* GPIO0 */ MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x80000000 /* GPIO1 */ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x80000000 /* GPIO2 */ @@ -321,17 +303,44 @@ MX6QDL_PAD_NANDF_D7__GPIO2_IO07 0x80000000 /* GPIO7 */ MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x80000000 /* CAM_PWDN */ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 /* CAM_RST */ - MX6QDL_PAD_GPIO_9__WDOG1_B 0x80000000 /* Watchdog out */ - MX6QDL_PAD_GPIO_16__GPIO7_IO11 0x80000000 /* HUB_RESET */ - MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x80000000 /* PMIC Interrupt */ - MX6QDL_PAD_GPIO_19__GPIO4_IO05 0x80000000 /* AR8033 Interrupt */ + MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0 /* CAM CLK */ MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 0x80000000 /* SUS_S3_OUT */ - MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x80000000 /* BLEN_OUT */ - MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 /* LVDS_PPEN_OUT */ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x80000000 /* RTC_INT */ >; }; + pinctrl_wdog: wdoggrp { + fsl,pins = < + MX6QDL_PAD_GPIO_9__WDOG1_B 0x80000000 /* Watchdog out */ + >; + }; + + pinctrl_pmic: pmicgrp { + fsl,pins = < + MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x80000000 /* PMIC Interrupt */ + >; + }; + + pinctrl_usbhub: usbhubgrp { + fsl,pins = < + MX6QDL_PAD_GPIO_16__GPIO7_IO11 0x80000000 /* HUB_RESET */ + >; + }; + + pinctrl_pcie: pciegrp { + fsl,pins = < + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 /* PCIe Reset */ + MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x80000000 /* PCIe Wake */ + >; + }; + + pinctrl_display: dispgrp { + fsl,pins = < + MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x80000000 /* BLEN_OUT */ + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 /* LVDS_PPEN_OUT */ + >; + }; + pinctrl_usdhc4: usdhc4grp { fsl,pins = < MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059 @@ -344,6 +353,10 @@ MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17059 MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17059 MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059 + MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x80000000 /* uSDHC4 CD */ + MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x80000000 /* uSDHC4 SDIO PWR */ + MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x80000000 /* uSDHC4 SDIO WP */ + MX6QDL_PAD_NANDF_CS3__GPIO6_IO16 0x80000000 /* uSDHC4 SDIO LED */ >; }; @@ -352,6 +365,7 @@ MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1 MX6QDL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1 MX6QDL_PAD_EIM_D16__ECSPI1_SCLK 0x100b1 + MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x80000000 /* SPI1 CS */ >; }; @@ -427,6 +441,7 @@ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059 MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059 MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059 + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000 /* uSDHC2 CD */ >; }; @@ -477,13 +492,16 @@ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0 MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0 MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0 + MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000 /* FEC Reset */ + MX6QDL_PAD_GPIO_19__GPIO4_IO05 0x80000000 /* AR8033 Interrupt */ >; }; }; }; &pcie { - power-on-gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie>; reset-gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -524,6 +542,8 @@ }; &usbh1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbhub>; vbus-supply = <®_usb_h1_vbus>; reset-gpios = <&gpio7 11 GPIO_ACTIVE_HIGH>; status = "okay"; @@ -557,3 +577,8 @@ keep-power-in-suspend; status = "okay"; }; + +&wdog1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdog>; +};