From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27877C76186 for ; Wed, 24 Jul 2019 21:46:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB48621850 for ; Wed, 24 Jul 2019 21:46:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KYD+joSt"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="N49uHsHU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB48621850 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QA2QkUb4DTwS4BstC05wOARWKut77l0ol7S6t8pVjlc=; b=KYD+joStc6noJx qrzb6Xbe81sKCfP9hBm81aV7y6P4pwRYiyqi6nRrWAP344TJNg1bWSPd77XanMbDv3KdtvxMx2wDD M3TJbJkMSwVcjDMcj6rK3F+dPZBCviXn4c07XKKJLvQGv2Y+IEcNr6bEmkK62N6KUIEkJh0dOqtYe 2AI851afHFgIlBWP8/HUUWSBYFiLtVaM82he4Hul6ZJzSm+1jCYq8rOJTACKEAYVX8TncV7xrjJO2 Uzkg5JMwy/Oh2+AwdESpeL1t9y35ctKnV+WDK82+NAv3UnM5BQIcWEQsVbuQKrInJnGlmDvxT0i5m RndCPIKDbM/v3uGYNUZg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hqP61-0000EG-HI; Wed, 24 Jul 2019 21:46:49 +0000 Received: from mail-io1-xd43.google.com ([2607:f8b0:4864:20::d43]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hqP5y-0000DA-1k for linux-arm-kernel@lists.infradead.org; Wed, 24 Jul 2019 21:46:47 +0000 Received: by mail-io1-xd43.google.com with SMTP id m24so92874561ioo.2 for ; Wed, 24 Jul 2019 14:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=eOzpntW4jYuzCuRORz9nWSGQo3322zBOXDNxUCNWQVo=; b=N49uHsHU+zcaMFDqNV4M15/FPHDeWl0BFf+uvUz6Ah/f9VZ3iGgGU7udezJpszRZrl OuaZ+b0F8RqK82CQm9avLSxoSp0LcZU237Tk1WiIDqICFMob+o2PoxWNVNtFnmSMARna DzJTZ6PwcljRvItJBPksdvEKkg7zDpVhXGLzQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=eOzpntW4jYuzCuRORz9nWSGQo3322zBOXDNxUCNWQVo=; b=g1UQEiKL8Mt9kqssXZrfdLHhqnEtvJuEdkq6w3iP1lfrcwWmDZ65uWazLqX0lWcZnG Qzh2L0keggHChVxlVMgTfeW06exEXuUlokfljrPrtMMAeKEtq19kOOLxOw890jUiq6yv n5wf4tgL4aWNbG3J/OY2gs6JQBgs6+02uxBQj1PjYX4uSIz/Z1s4c+joeRO1OYITENGG ecLuomW+O5M5s/ABSA1cR5O8mfF3HhWwM9FjvKd0XEL0Vw2JMikUttq0dac81QrKoMcX LunU2HFY+ac26AqFkrYUEiJdqLEK7lp0RQhWyGgBE/5ypskM8hc1yp1u6gnl6ZHdDrUB SMMA== X-Gm-Message-State: APjAAAVLDwZHdPKYoLH2vIafxj8pkqp/pOj24Qz4Ozi2GQqU6z8wBfP3 kJVdVLSkRgulFLaZkeWWwMiqedVpHTc= X-Google-Smtp-Source: APXvYqz0GZ5l6B1bcWnZuLBZKua2d8U6LeONp/V67ETZimLs8RQ9yJlOMrQYvrFEatttuFwYKPgwzw== X-Received: by 2002:a5e:d51a:: with SMTP id e26mr72106534iom.71.1564004804594; Wed, 24 Jul 2019 14:46:44 -0700 (PDT) Received: from mail-io1-f54.google.com (mail-io1-f54.google.com. [209.85.166.54]) by smtp.gmail.com with ESMTPSA id y18sm46599038iob.64.2019.07.24.14.46.44 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jul 2019 14:46:44 -0700 (PDT) Received: by mail-io1-f54.google.com with SMTP id e20so62436644iob.9 for ; Wed, 24 Jul 2019 14:46:44 -0700 (PDT) X-Received: by 2002:a6b:5103:: with SMTP id f3mr74359598iob.142.1564004803178; Wed, 24 Jul 2019 14:46:43 -0700 (PDT) MIME-Version: 1.0 References: <20190711223455.12210-1-mka@chromium.org> <20190711223455.12210-2-mka@chromium.org> In-Reply-To: <20190711223455.12210-2-mka@chromium.org> From: Doug Anderson Date: Wed, 24 Jul 2019 14:46:30 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 2/2] ARM: dts: rockchip: consolidate veyron panel and backlight settings To: Matthias Kaehlcke X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190724_144646_122402_7DD032FC X-CRM114-Status: GOOD ( 13.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Heiko Stuebner , "open list:ARM/Rockchip SoC..." , Rob Herring , Linux ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On Thu, Jul 11, 2019 at 3:35 PM Matthias Kaehlcke wrote: > > diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > index 4cc7d3659484..2b0801a539c9 100644 > --- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts > +++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > @@ -15,40 +15,6 @@ > "google,veyron-minnie-rev0", "google,veyron-minnie", > "google,veyron", "rockchip,rk3288"; > > - backlight_regulator: backlight-regulator { > - compatible = "regulator-fixed"; > - enable-active-high; > - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; > - pinctrl-names = "default"; > - pinctrl-0 = <&bl_pwr_en>; > - regulator-name = "backlight_regulator"; > - vin-supply = <&vcc33_sys>; > - startup-delay-us = <15000>; > - }; > - > - panel_regulator: panel-regulator { > - compatible = "regulator-fixed"; > - enable-active-high; > - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; > - pinctrl-names = "default"; > - pinctrl-0 = <&lcd_enable_h>; > - regulator-name = "panel_regulator"; > - startup-delay-us = <100000>; > - vin-supply = <&vcc33_sys>; > - }; > - > - vcc18_lcd: vcc18-lcd { > - compatible = "regulator-fixed"; > - enable-active-high; > - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; > - pinctrl-names = "default"; > - pinctrl-0 = <&avdd_1v8_disp_en>; > - regulator-name = "vcc18_lcd"; > - regulator-always-on; > - regulator-boot-on; > - vin-supply = <&vcc18_wl>; > - }; > - > volume_buttons: volume-buttons { > compatible = "gpio-keys"; > pinctrl-names = "default"; You forgot to remove the line: power-supply = <&backlight_regulator>; ...from minnie. > diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > index 9b6f4d9b03b6..06af58e37a4b 100644 > --- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts > +++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > @@ -14,7 +14,14 @@ > compatible = "google,veyron-pinky-rev2", "google,veyron-pinky", > "google,veyron", "rockchip,rk3288"; > > + /delete-node/backlight-regulator; > + /delete-node/panel-regulator; > /delete-node/emmc-pwrseq; > + /delete-node/vcc18-lcd; > +}; > + > +&backlight { > + /delete-property/power-supply; > }; > > &emmc { > @@ -52,7 +59,17 @@ > i2c-scl-rising-time-ns = <300>; > }; > > +&panel { > + power-supply= <&vcc33_lcd>; Might as well put a space before the "="? > &pinctrl { > + /delete-node/ lcd; > + > + backlight { > + /delete-node/ bl_pwr_en; > + }; I general as the defender of "pinky", I'll let Heiko confirm he's OK with the color of this bikeshed. Sometimes a bit of repetition is preferred over a bunch of confusing /delete-node/ statements since those tend to make things harder to reason about in general. In this case I think things are cleaner after your patch but I won't say it's 100% clear cut. Other than nits I have double-checked this patch, so feel free to add my Reviewed-by after nits are fixed. -Doug _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel