armv8: gpio: add gpio feature
Subsystems (2)
PATCH v2 1/3 armv8: gpio: add gpio feature
From: "hui.song" <[email protected]>
add one struct mpc8xxx_gpio_plat to enable gpio feature.
--- .../include/asm/arch-fsl-layerscape/gpio.h | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 arch/arm/include/asm/arch-fsl-layerscape/gpio.h
arch/arm/include/asm/arch-fsl-layerscape/gpio.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright 2020 NXP +*/ + +/* +* Dummy header file to enable CONFIG_OF_CONTROL. +* If CONFIG_OF_CONTROL is enabled, lib/fdtdec.c is compiled. +* It includes <asm/arch/gpio.h> via <asm/gpio.h>, so those SoCs that enable +* OF_CONTROL must have arch/gpio.h. +*/ + +#ifndef __ASM_ARCH_MX85XX_GPIO_H +#define __ASM_ARCH_MX85XX_GPIO_H + +struct mpc8xxx_gpio_plat { +ulong addr; +ulong size; +uint ngpios; +}; + +#endif
Signature · 1 line
2.17.1
PATCH v2 2/3 dm: armv8: gpio: include <asm/arch/gpio.h> for fsl-layerscape
From: "hui.song" <[email protected]>
Enable the gpio feature on fsl-layerscape platform.
--- arch/arm/include/asm/gpio.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/include/asm/gpio.h +2 -6
@@ -1,12 +1,8 @@#if !defined(CONFIG_ARCH_UNIPHIER ) && !defined(CONFIG_ARCH_STI ) && \ !defined(CONFIG_ARCH_K3 ) && !defined(CONFIG_ARCH_BCM68360 ) && \ !defined(CONFIG_ARCH_BCM6858 ) && !defined(CONFIG_ARCH_BCM63158 ) && \ - !defined(CONFIG_ARCH_ROCKCHIP ) && !defined(CONFIG_ARCH_LX2160A ) && \ - !defined(CONFIG_ARCH_LS1028A ) && !defined(CONFIG_ARCH_LS2080A ) && \ - !defined(CONFIG_ARCH_LS1088A ) && !defined(CONFIG_ARCH_ASPEED ) && \ - !defined(CONFIG_ARCH_LS1012A ) && !defined(CONFIG_ARCH_LS1043A ) && \ - !defined(CONFIG_ARCH_LS1046A ) && !defined(CONFIG_ARCH_U8500 ) && \ - !defined(CONFIG_CORTINA_PLATFORM ) + !defined(CONFIG_ARCH_ROCKCHIP ) && !defined(CONFIG_ARCH_ASPEED ) && \ + !defined(CONFIG_ARCH_U8500 ) && !defined(CONFIG_CORTINA_PLATFORM )#include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h>
Signature · 1 line
2.17.1
PATCH v2 3/3 gpio: mpc8xxx: support fsl-layerscape platform.
In reply to Hui SongFrom: "hui.song" <[email protected]>
Make the MPC8XXX gpio driver to support the fsl-layerscape.
--- drivers/gpio/mpc8xxx_gpio.c | 108 +++++++++++++++++++++++++++++------- 1 file changed, 87 insertions(+), 21 deletions(-)
drivers/gpio/mpc8xxx_gpio.c +87 -21
@@ -6,12 +6,15 @@* based on arch/powerpc/include/asm/mpc85xx_gpio.h, which is * * Copyright 2010 eXMeritus, A Boeing Company +* Copyright 2020 NXP */ #include <common.h> #include <dm.h> #include <mapmem.h> #include <asm/gpio.h> +#include <asm/io.h> +#include <dm/of_access.h> struct ccsr_gpio {u32 gpdir;
@@ -20,6 +23,7 @@ struct ccsr_gpio {u32 gpier;u32 gpimr;u32 gpicr; +u32 gpibe; };struct mpc8xxx_gpio_data {
@@ -35,6 +39,7 @@ struct mpc8xxx_gpio_data {*/ u32 dat_shadow;ulong type; +bool little_endian; };enum {
@@ -47,33 +52,56 @@ inline u32 gpio_mask(uint gpio)return (1U << (31 - (gpio))); } -static inline u32 mpc8xxx_gpio_get_val (struct ccsr_gpio *base,u32 mask) +static inline u32 mpc8xxx_gpio_get_val (struct udevice *dev,u32 mask) { -return in_be32 (&base->gpdat) & mask; +struct mpc8xxx_gpio_data *data =dev_get_priv (dev); + +if (data->little_endian) +return in_le32 (&data->base->gpdat) & mask; +else +return in_be32 (&data->base->gpdat) & mask; } -static inline u32 mpc8xxx_gpio_get_dir (struct ccsr_gpio *base,u32 mask) +static inline u32 mpc8xxx_gpio_get_dir (struct udevice *dev,u32 mask) { -return in_be32 (&base->gpdir) & mask; +struct mpc8xxx_gpio_data *data =dev_get_priv (dev); + +if (data->little_endian) +return in_le32 (&data->base->gpdir) & mask; +else +return in_be32 (&data->base->gpdir) & mask; } -static inline int mpc8xxx_gpio_open_drain_val (struct ccsr_gpio *base,u32 mask) +static inline int mpc8xxx_gpio_open_drain_val (struct udevice *dev,u32 mask) { -return in_be32 (&base->gpodr) & mask; +struct mpc8xxx_gpio_data *data =dev_get_priv (dev); + +if (data->little_endian) +return in_le32 (&data->base->gpodr) & mask; +else +return in_be32 (&data->base->gpodr) & mask; } -static inline void mpc8xxx_gpio_open_drain_on (struct ccsr_gpio *base,u32 +static inline void mpc8xxx_gpio_open_drain_on (struct udevice *dev,u32 gpios) { +struct mpc8xxx_gpio_data *data =dev_get_priv (dev);/* GPODR register 1 -> open drain on */ -setbits_be32 (&base->gpodr, gpios); +if (data->little_endian) +setbits_le32 (&data->base->gpodr, gpios); +else +setbits_be32 (&data->base->gpodr, gpios); } -static inline void mpc8xxx_gpio_open_drain_off (struct ccsr_gpio *base, +static inline void mpc8xxx_gpio_open_drain_off (struct udevice *dev,u32 gpios) { +struct mpc8xxx_gpio_data *data =dev_get_priv (dev);/* GPODR register 0 -> open drain off (actively driven) */ -clrbits_be32 (&base->gpodr, gpios); +if (data->little_endian) +clrbits_le32 (&data->base->gpodr, gpios); +else +clrbits_be32 (&data->base->gpodr, gpios); }static int mpc8xxx_gpio_direction_input (struct udevice *dev,uint gpio)
@@ -82,7 +110,10 @@ static int mpc8xxx_gpio_direction_input(struct udevice *dev, uint gpio)u32 mask =gpio_mask (gpio);/* GPDIR register 0 -> input */ -clrbits_be32 (&data->base->gpdir, mask); +if (data->little_endian) +clrbits_le32 (&data->base->gpdir, mask); +else +clrbits_be32 (&data->base->gpdir, mask);return 0 ; }
@@ -100,10 +131,20 @@ static int mpc8xxx_gpio_set_value(struct udevice *dev, uint gpio, int value) data->dat_shadow &= ~mask; } - gpdir =in_be32 (&base->gpdir); +if (data->little_endian) + gpdir =in_le32 (&base->gpdir); +else + gpdir =in_be32 (&base->gpdir); + gpdir |=gpio_mask (gpio); -out_be32 (&base->gpdat, gpdir & data->dat_shadow); -out_be32 (&base->gpdir, gpdir); + +if (data->little_endian) { +out_le32 (&base->gpdat, gpdir & data->dat_shadow); +out_le32 (&base->gpdir, gpdir); + }else { +out_be32 (&base->gpdat, gpdir & data->dat_shadow); +out_be32 (&base->gpdir, gpdir); + }return 0 ; }
@@ -124,21 +165,20 @@ static int mpc8xxx_gpio_get_value(struct udevice *dev, uint gpio) {struct mpc8xxx_gpio_data *data =dev_get_priv (dev); -if (!!mpc8xxx_gpio_get_dir (data->base,gpio_mask (gpio))) { +if (!!mpc8xxx_gpio_get_dir (dev,gpio_mask (gpio))) {/* Output -> use shadowed value */ return !!(data->dat_shadow &gpio_mask (gpio)); }/* Input -> read value from GPDAT register */ -return !!mpc8xxx_gpio_get_val (data->base,gpio_mask (gpio)); +return !!mpc8xxx_gpio_get_val (dev,gpio_mask (gpio)); }static int mpc8xxx_gpio_get_function (struct udevice *dev,uint gpio) { -struct mpc8xxx_gpio_data *data =dev_get_priv (dev);int dir; - dir = !!mpc8xxx_gpio_get_dir (data->base,gpio_mask (gpio)); + dir = !!mpc8xxx_gpio_get_dir (dev,gpio_mask (gpio));return dir ?GPIOF_OUTPUT :GPIOF_INPUT ; }
@@ -146,14 +186,33 @@ static int mpc8xxx_gpio_get_function(struct udevice *dev, uint gpio)static int mpc8xxx_gpio_ofdata_to_platdata (struct udevice *dev) {struct mpc8xxx_gpio_plat *plat =dev_get_platdata (dev); +struct mpc8xxx_gpio_data *data =dev_get_priv (dev);fdt_addr_t addr; -u32 reg[2 ]; +u32 i; +u32 reg[4 ]; + +if (ofnode_read_bool (dev->node,"little-endian" )) + data->little_endian = true; + +if (data->little_endian) +dev_read_u32_array (dev,"reg" , reg,4 ); +else +dev_read_u32_array (dev,"reg" , reg,2 ); + +if (data->little_endian) { +for (i =0 ; i <2 ; i++) + reg[i] =be32_to_cpu (reg[i]); + } -dev_read_u32_array (dev,"reg" , reg,2 ); addr =dev_translate_address (dev, reg); plat->addr = addr; - plat->size = reg[1 ]; + +if (data->little_endian) + plat->size = reg[3 ]; +else + plat->size = reg[1 ]; + plat->ngpios =dev_read_u32_default (dev,"ngpios" ,32 );return 0 ;
@@ -198,6 +257,13 @@ static int mpc8xxx_gpio_probe(struct udevice *dev)if (!str)return -ENOMEM ; +if (ofnode_device_is_compatible (dev->node,"fsl,qoriq-gpio" )) { +unsigned long gpibe = data->addr +sizeof (struct ccsr_gpio ) + -sizeof (u32); + +out_be32 ((unsigned int *)gpibe,0xffffffff ); + } + uc_priv->bank_name = str; uc_priv->gpio_count = data->gpio_count;
Signature · 1 line
2.17.1
PATCH v2 3/3 gpio: mpc8xxx: support fsl-layerscape platform.
Quoted 14 lines
-----Original Message-----
From: Hui Song <[email protected]>
Sent: Friday, July 24, 2020 4:34 PM
To: Jagdish Gediya <[email protected]>; Priyanka Jain <[email protected]>; hs at denx.de; jagan at amarulasolutions.com; aford173 at gmail.com; Alison Wang <[email protected]>; jh80.chung at samsung.com; Pramod Kumar <[email protected]>; Rajesh Bhagat <[email protected]>; Ruchika Gupta <[email protected]>; olteanv at gmail.com
Cc: Xiaobo Xie <[email protected]>; Jiafei Pan <[email protected]>; u- boot at lists.denx.de; Z.q. Hou <[email protected]>; Hui Song <[email protected]>
Subject: [PATCH v2 3/3] gpio: mpc8xxx: support fsl-layerscape platform.
Quoted 9 lines
From: "hui.song" <[email protected]>
Make the MPC8XXX gpio driver to support the fsl-layerscape.
Signed-off-by hui.song <[email protected]>---
drivers/gpio/mpc8xxx_gpio.c| 108 +++++++++++++++++++++++++++++-------1 file changed, 87 insertions(+), 21 deletions(-)
Please mention change history.
Check review comments at https://patchwork.ozlabs.org/project/uboot/patch/20200520104020.9013-3-hui.song_1 at nxp.com/ and mention their status is next version I still see '.' in subject. Correct this and share build status report as well.
Regards
Priyanka