From patchwork Thu Oct 5 10:49:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 114897 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp84841edb; Thu, 5 Oct 2017 03:50:41 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDbzm1nyRzlIYyIJ3qI21S1vLX7oFlrw1bI+bCkxGkpI2oUESo9d50FZBi0pSYYoPRTw4Gn X-Received: by 10.84.134.34 with SMTP id 31mr22864815plg.124.1507200640917; Thu, 05 Oct 2017 03:50:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507200640; cv=none; d=google.com; s=arc-20160816; b=ONE/oDiSOrIvopG46NU/EGAjZ3pKzKTfskNp62EIzLiaxtrNnE03N9kxNogCXsRwMm QsEycYgnghvKms0Xku5pYRc5yLOoLFibdI9T5C2ewwS0WCYJulDM3K2YDo+9Ehcm+MGm NLX4y+rPu470/anScvbLvg1WVCrKuwOOd29leBL8uaWfFDOpFH4gyqGSnZ87mG5luOX+ lsAG87KDawr2MKRPpo/7Eso0oGCg33yY2QmEL3+lmeWVN6weEBfYNTNpoSThAAQO+Haw ZVURQjqDkocIab1v/5xU9rif/zm15sdcPUcD6OZHf9pkyqS8ihZiX81+6Mm1uFzCeMFw RtdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=zTYln+hGwovMn+KVxB00onkV7wxhjT8LKtOXK+SoUQY=; b=xoCL+peDlw46k2V8t2R+CYeRLcFukEb+iGf0MTYw34pepecPGdG8hDubPRNhFN7v5r VT9PHWww7DQfvqQ2HiAyArCXYxc+MJWA6dDoX6oyf+m+qk0Mn6/fJ3C7l/wjHTDc//gJ e4emfhcKFVlrGDO1406EHlG3FHkrcPqvOzF6I3dh3E0UIGwtEOuYPADIiaIG8Zl6V4Ov oJfaLCtCJT2qfF8UorCFf0tXxYwdV7ZtUAVIHaY2qxK4jpC443SJNnHd3a9qSke7+00c WXSPGGDSz5IJE3kvjTAtWGLEabL7y5x9g/HoIpFwwQYYbYPn0/cPL97WdK1bRGmGvHH0 UZlg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c3si3022771pgq.231.2017.10.05.03.50.40; Thu, 05 Oct 2017 03:50:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752149AbdJEKui (ORCPT + 26 others); Thu, 5 Oct 2017 06:50:38 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:39676 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752095AbdJEKue (ORCPT ); Thu, 5 Oct 2017 06:50:34 -0400 Received: by mail.free-electrons.com (Postfix, from userid 110) id 4AA6D2099B; Thu, 5 Oct 2017 12:50:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (unknown [185.94.189.189]) by mail.free-electrons.com (Postfix) with ESMTPSA id B9D8020982; Thu, 5 Oct 2017 12:50:31 +0200 (CEST) From: Maxime Ripard To: Chen-Yu Tsai , Maxime Ripard , Mark Rutland , Rob Herring Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 16/20] ARM: dts: sun9i: Remove GPIO pinctrl nodes to avoid warnings Date: Thu, 5 Oct 2017 12:49:51 +0200 Message-Id: <349ac0811adc34fb98bd66cbe6ee9cdd720236de.1507198895.git-series.maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The A80 boards still define some GPIO pinctrl nodes that are not really useful, and redundant with the muxing already happening on gpio_request. Let's remove those nodes. This will also remove DTC warnings. Signed-off-by: Maxime Ripard --- arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 16 +---------- arch/arm/boot/dts/sun9i-a80-optimus.dts | 36 +---------------------- 2 files changed, 2 insertions(+), 50 deletions(-) -- git-series 0.9.1 Acked-by: Chen-Yu Tsai diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts index 1a09a35d266a..15cc82350360 100644 --- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts +++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts @@ -62,8 +62,6 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pins_cubieboard4>; green { label = "cubieboard4:green:usr"; @@ -97,7 +95,7 @@ &mmc1 { pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins>, <&wifi_en_pin_cubieboard4>; + pinctrl-0 = <&mmc1_pins>; vmmc-supply = <®_dldo1>; vqmmc-supply = <®_cldo3>; mmc-pwrseq = <&wifi_pwrseq>; @@ -131,11 +129,6 @@ }; &pio { - led_pins_cubieboard4: led-pins@0 { - pins = "PH6", "PH17"; - function = "gpio_out"; - }; - mmc0_cd_pin_cubieboard4: mmc0_cd_pin@0 { pins = "PH18"; function = "gpio_in"; @@ -147,13 +140,6 @@ status = "okay"; }; -&r_pio { - wifi_en_pin_cubieboard4: wifi_en_pin@0 { - pins = "PL2"; - function = "gpio_out"; - }; -}; - &r_rsb { status = "okay"; diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index cc9e6a88f2a2..199777e1c5ea 100644 --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts @@ -62,11 +62,8 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pins_optimus>, <&led_r_pins_optimus>; /* The LED names match those found on the board */ - led2 { label = "optimus:led2:usr"; gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; @@ -86,8 +83,6 @@ reg_usb1_vbus: usb1-vbus { compatible = "regulator-fixed"; pinctrl-names = "default"; - pinctrl-0 = <&usb1_vbus_pin_optimus>; - regulator-name = "usb1-vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; @@ -97,8 +92,6 @@ reg_usb3_vbus: usb3-vbus { compatible = "regulator-fixed"; pinctrl-names = "default"; - pinctrl-0 = <&usb3_vbus_pin_optimus>; - regulator-name = "usb3-vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; @@ -139,7 +132,7 @@ &mmc1 { pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins>, <&wifi_en_pin_optimus>; + pinctrl-0 = <&mmc1_pins>; vmmc-supply = <®_dldo1>; vqmmc-supply = <®_cldo3>; mmc-pwrseq = <&wifi_pwrseq>; @@ -181,44 +174,17 @@ }; &pio { - led_pins_optimus: led-pins@0 { - pins = "PH0", "PH1"; - function = "gpio_out"; - }; - mmc0_cd_pin_optimus: mmc0_cd_pin@0 { pins = "PH18"; function = "gpio_in"; bias-pull-up; }; - - usb1_vbus_pin_optimus: usb1_vbus_pin@1 { - pins = "PH4"; - function = "gpio_out"; - }; - - usb3_vbus_pin_optimus: usb3_vbus_pin@1 { - pins = "PH5"; - function = "gpio_out"; - }; }; &r_ir { status = "okay"; }; -&r_pio { - led_r_pins_optimus: led-pins@1 { - pins = "PM15"; - function = "gpio_out"; - }; - - wifi_en_pin_optimus: wifi_en_pin@0 { - pins = "PL2"; - function = "gpio_out"; - }; -}; - &r_rsb { status = "okay";