Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Ran Wang <ran.wang_1@nxp.com>
To:     Michael Walle <michael@walle.cc>
CC:     Linus Walleij <linus.walleij@linaro.org>,
        Andy Shevchenko <andy.shevchenko@gmail.com>,
        Bartosz Golaszewski <bgolaszewski@baylibre.com>,
        "linux-gpio@vger.kernel.org" <linux-gpio@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v2] gpio: mpc8xxx: Add ACPI support
Thread-Topic: [PATCH v2] gpio: mpc8xxx: Add ACPI support
Thread-Index: AQHXHGoX3ImMIOC4Y0GVVlL7LtAO2qqK8IyAgAAAknA=
Date:   Fri, 19 Mar 2021 07:56:35 +0000
Message-ID: <AM6PR04MB54136819BA7C627BCB569C8DF1689@AM6PR04MB5413.eurprd04.prod.outlook.com>
References: <20210319025332.36659-1-ran.wang_1@nxp.com>
 <ab9cca747b83ab1083b86d3aef9156ef@walle.cc>
In-Reply-To: <ab9cca747b83ab1083b86d3aef9156ef@walle.cc>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 62de8cc8-9a30-48a5-6bae-08d8eaac84bd
X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2021 07:56:35.4576
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 7DEj3IwTnQk4Q5KdHARfNRg1UpuHfQPfeLhm8thA0dB48A48lfRGaHTcK2bkhT03Tt/kGlB8jZbaHbj8QB4svQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB6293
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Michael,

On Friday, March 19, 2021 3:52 PM, Michael Walle wrote:
>=20
> Am 2021-03-19 03:53, schrieb Ran Wang:
> > Current implementation only supports DT, now add ACPI support.
> >
> > Note that compared to device of 'fsl,qoriq-gpio', LS1028A and
> > LS1088A's GPIO have no extra programming, so simplify related checking.
> >
> > Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
> > ---
> > Change in v2:
> >  - Initialize devtype with NULL to fix compile warning.
> >  - Replace of_device_get_match_data() and acpi_match_device with
> > device_get_match_data().
> >  - Replace acpi_match_device() with simpler checking logic per Andy's
> > suggestion.
> >
> >  drivers/gpio/gpio-mpc8xxx.c | 34 +++++++++++++++++++++++-----------
> >  1 file changed, 23 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
> > index 6dfca83bcd90..646225fa3e73 100644
> > --- a/drivers/gpio/gpio-mpc8xxx.c
> > +++ b/drivers/gpio/gpio-mpc8xxx.c
> > @@ -9,6 +9,7 @@
> >   * kind, whether express or implied.
> >   */
> >
> > +#include <linux/acpi.h>
> >  #include <linux/kernel.h>
> >  #include <linux/init.h>
> >  #include <linux/spinlock.h>
> > @@ -292,8 +293,6 @@ static const struct of_device_id
> > mpc8xxx_gpio_ids[] =3D {
> >  	{ .compatible =3D "fsl,mpc5121-gpio", .data =3D &mpc512x_gpio_devtype=
, },
> >  	{ .compatible =3D "fsl,mpc5125-gpio", .data =3D &mpc5125_gpio_devtype=
, },
> >  	{ .compatible =3D "fsl,pq3-gpio",     },
> > -	{ .compatible =3D "fsl,ls1028a-gpio", },
> > -	{ .compatible =3D "fsl,ls1088a-gpio", },
> >  	{ .compatible =3D "fsl,qoriq-gpio",   },
> >  	{}
> >  };
> > @@ -303,8 +302,8 @@ static int mpc8xxx_probe(struct platform_device
> > *pdev)
> >  	struct device_node *np =3D pdev->dev.of_node;
> >  	struct mpc8xxx_gpio_chip *mpc8xxx_gc;
> >  	struct gpio_chip	*gc;
> > -	const struct mpc8xxx_gpio_devtype *devtype =3D
> > -		of_device_get_match_data(&pdev->dev);
> > +	const struct mpc8xxx_gpio_devtype *devtype =3D NULL;
> > +	struct fwnode_handle *fwnode;
> >  	int ret;
> >
> >  	mpc8xxx_gc =3D devm_kzalloc(&pdev->dev, sizeof(*mpc8xxx_gc),
> > GFP_KERNEL); @@ -315,14 +314,14 @@ static int mpc8xxx_probe(struct
> > platform_device
> > *pdev)
> >
> >  	raw_spin_lock_init(&mpc8xxx_gc->lock);
> >
> > -	mpc8xxx_gc->regs =3D of_iomap(np, 0);
> > +	mpc8xxx_gc->regs =3D devm_platform_ioremap_resource(pdev, 0);
> >  	if (!mpc8xxx_gc->regs)
> >  		return -ENOMEM;
> >
> >  	gc =3D &mpc8xxx_gc->gc;
> >  	gc->parent =3D &pdev->dev;
> >
> > -	if (of_property_read_bool(np, "little-endian")) {
> > +	if (device_property_read_bool(&pdev->dev, "little-endian")) {
> >  		ret =3D bgpio_init(gc, &pdev->dev, 4,
> >  				 mpc8xxx_gc->regs + GPIO_DAT,
> >  				 NULL, NULL,
> > @@ -345,6 +344,7 @@ static int mpc8xxx_probe(struct platform_device
> > *pdev)
> >
> >  	mpc8xxx_gc->direction_output =3D gc->direction_output;
> >
> > +	devtype =3D device_get_match_data(&pdev->dev);
> >  	if (!devtype)
> >  		devtype =3D &mpc8xxx_gpio_devtype_default;
> >
> > @@ -369,9 +369,9 @@ static int mpc8xxx_probe(struct platform_device
> > *pdev)
> >  	 * associated input enable must be set (GPIOxGPIE[IEn]=3D1) to
> > propagate
> >  	 * the port value to the GPIO Data Register.
> >  	 */
> > +	fwnode =3D dev_fwnode(&pdev->dev);
> >  	if (of_device_is_compatible(np, "fsl,qoriq-gpio") ||
> > -	    of_device_is_compatible(np, "fsl,ls1028a-gpio") ||
> > -	    of_device_is_compatible(np, "fsl,ls1088a-gpio"))
>=20
> Again, please keep this. The DT bindings don't mention "fsl,qoriq-gpio"
> is required. Alternatively, change the binding (ideally convert it to
> YAML) and get an ack by Rob.

OK, I will keep this in next version

Regards,
Ran

> -michael