Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp3442067imm; Mon, 4 Jun 2018 03:48:17 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLo+TyDNRyenKb+1RFOsbwegh5TXawx5ZnqNxjqBeaQl8mugHeAYAqHELIwbLlrahOGejop X-Received: by 2002:a17:902:a989:: with SMTP id bh9-v6mr5948039plb.245.1528109296882; Mon, 04 Jun 2018 03:48:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528109296; cv=none; d=google.com; s=arc-20160816; b=jIxRkQIztrlvJHGVEMITsR2frU9KdYQaUkYb1QpgxMzNY1xISYCheXl6PW+gHmqypR GtOyr1wEEjnNmk8Cm7M4MnWPvdxuL1YnVnQ6QXJAUlipVh1wTmi6nSX85LZ0jBjtkkMX O8bM2OGk4KQ6Ribj2Nc7hzlWffNuQQKt5bk5zQOcl0qjasrwXZnelhMG/tEVM/rnlvgf bHa98yucleFvnokZip/sLvejvtbra1Tv0xBeMyXZm+PhaTR00958TzrHzLgH/TNMsywU bqH5HWyag2ilHOon0wH4M8DkA5H9dqBx/2UM72GlRMWjngmdQjfIrQySNafSXl7o57/A fmlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature:arc-authentication-results; bh=z1bOXPKVyJocSLREdUqp81Jgwt56kfPDsjk225HGOb8=; b=I3zqNItI5iEeWoBzVLNCSbDCWP9tlqC/dNjSHNtwt0fuKnbs5RqeNKh45GZMNJRJGk dPVcA31M98lQOy1B1CxexuL/jFiy5pP3jK1s04Q/h7eIa1fsDMEfDeTTG+SM7CLH+z84 RccBE3RT8syaPjsfbZSF11ikSKgTxdWQNu0WHteLmr5RNdZTj3l6Syp+Br/FiExCdJS8 nbr4BPEuzHU0HwUMGRKCO++4YF+Z684ibJAZd7nXHRLNhlWQ408PfU65MNp9S3a3rHlk mwlsbvGNViRyQ8j2/AMN87ME0qoNlWI8Qh32WbPl+llzYiKcOxG04VZaTYv18//r1s7a a65A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=DFLg9+a8; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n1-v6si45826026pld.188.2018.06.04.03.48.02; Mon, 04 Jun 2018 03:48:16 -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; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=DFLg9+a8; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752594AbeFDKrP (ORCPT + 99 others); Mon, 4 Jun 2018 06:47:15 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:56462 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752177AbeFDKqw (ORCPT ); Mon, 4 Jun 2018 06:46:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=z1bOXPKVyJocSLREdUqp81Jgwt56kfPDsjk225HGOb8=; b=DFLg9+a8xiL1tipCiUFyaRVUr Q2k9vp4dPpSueLCMQzFg/+q3f1SE397nP7FkdxaekHxczvZ+DLWOuLdN2m9gqh8lGueVyAIUakMSR ZIo7N+yqyFWogm4FFZ2WBy2fqLeBEbfLiU68tZO/o3+NqcfSE59PCZCEJF7LCwho1V9oo=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fPn0d-0005kr-BJ; Mon, 04 Jun 2018 10:46:43 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fPn0c-0007Gc-UG; Mon, 04 Jun 2018 11:46:42 +0100 Date: Mon, 4 Jun 2018 11:46:42 +0100 From: Mark Brown To: Janusz Krzysztofik Cc: Linus Walleij , Stephen Rothwell , Liam Girdwood , Olof Johansson , Arnd Bergmann , ARM , Linux-Next Mailing List , Linux Kernel Mailing List , Tony Lindgren Subject: Re: linux-next: manual merge of the regulator tree with the arm-soc tree Message-ID: <20180604104642.GC7536@sirena.org.uk> References: <20180530150711.2c7c1fe9@canb.auug.org.au> <2564792.sYBGPVz9u3@z50> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="vOmOzSkFvhd7u8Ms" Content-Disposition: inline In-Reply-To: <2564792.sYBGPVz9u3@z50> X-Cookie: One Bell System - it works. User-Agent: Mutt/1.9.5 (2018-04-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --vOmOzSkFvhd7u8Ms Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jun 01, 2018 at 12:49:53AM +0200, Janusz Krzysztofik wrote: > I confirm the fix by Stephen works for me, however, the conflicting patch= by=20 > Linus breaks things a bit. > Lookup tables added to board files use function name "enable" while the= =20 > regulator uses NULL. As a result, GPIO descriptor is not matched and not= =20 > assigned to the regulator which ends up running with no control over GPIO= pin. > Either the regulator driver should use the function name "enable" or that= name=20 > should be removed from lookup tables. I'll revert this one as well :( --vOmOzSkFvhd7u8Ms Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAlsVGJIACgkQJNaLcl1U h9Cw9Af/fZiF09ZPYuhqNpNAeRnPGyhQl+kvwFebr6N9QUHECbSzww9gsFCbuBIs jiy0Je3YXSgA3vbsxG6AXw5f2ahno/RqrQbd4m9gk9trKhCSHuRM4Y5Ux0ul7VSJ I3oOfcfHeZnJC3alSyBwc5LqUGSNuUMzeEwbrMm2cnBfn/2MSE13QoKGNMGs0fho iCG83nfXKp07niQkqxktluJfQ3C0Q13ZdOFdUzCaGEgSkIUVustMup+WdG7nBNCe GWMBtBO1iKwbTCcFevpF4ouAOz471op7XmRnqqW5G7/aSbR/UJInir41B+ElHFok IyCq5GX+krL9cqamXN7W25zXCxnwng== =Hz4K -----END PGP SIGNATURE----- --vOmOzSkFvhd7u8Ms--