sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-02-14 02:31:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

[dwgpio] Use fdt_reg() to get GPIO port numbers

Browse Source 
DesignWare GPIO port numbers are represented as unsized single-entry
regions.  Use fdt_reg() to obtain the GPIO port number, rather than
requiring access to a region cell size specification stored in the
port group structure.

This allows the field name "regs" in the port group structure to be
repurposed to hold the I/O register base address, which then matches
the common usage in other drivers.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2025-08-07 15:43:58 +01:00
parent 88ba011764
commit 8460dc4e8f
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/drivers/gpio/dwgpio.c
View File

@@ -64,15 +64,12 @@ static int dwgpio_group_probe ( struct dt_device *dt, unsigned int offset ) {
dt_set_drvdata ( dt, group ); dt_set_drvdata ( dt, group );
/* Map registers */ /* Map registers */
group->base = dt_ioremap ( dt, offset, 0, 0 ); group->regs = dt_ioremap ( dt, offset, 0, 0 );
if ( ! group->base ) { if ( ! group->regs ) {
rc = -ENODEV; rc = -ENODEV;
goto err_ioremap; goto err_ioremap;
} }
/* Get region cell size specification */
fdt_reg_cells ( &sysfdt, offset, &group->regs );
/* Probe child ports */ /* Probe child ports */
if ( ( rc = dt_probe_children ( dt, offset ) ) != 0 ) if ( ( rc = dt_probe_children ( dt, offset ) ) != 0 )
goto err_children; goto err_children;
@@ -81,7 +78,7 @@ static int dwgpio_group_probe ( struct dt_device *dt, unsigned int offset ) {
dt_remove_children ( dt ); dt_remove_children ( dt );
err_children: err_children:
iounmap ( group->base ); iounmap ( group->regs );
err_ioremap: err_ioremap:
free ( group ); free ( group );
err_alloc: err_alloc:
@@ -100,7 +97,7 @@ static void dwgpio_group_remove ( struct dt_device *dt ) {
dt_remove_children ( dt ); dt_remove_children ( dt );
/* Unmap registers */ /* Unmap registers */
iounmap ( group->base ); iounmap ( group->regs );
/* Free device */ /* Free device */
free ( group ); free ( group );
@@ -260,8 +257,7 @@ static int dwgpio_probe ( struct dt_device *dt, unsigned int offset ) {
group = dt_get_drvdata ( parent ); group = dt_get_drvdata ( parent );
/* Identify port */ /* Identify port */
if ( ( rc = fdt_reg_address ( &sysfdt, offset, &group->regs, 0, if ( ( rc = fdt_reg ( &sysfdt, offset, &port ) ) != 0 ) {
&port ) ) != 0 ) {
DBGC ( dwgpio, "DWGPIO %s could not get port number: %s\n", DBGC ( dwgpio, "DWGPIO %s could not get port number: %s\n",
dwgpio->name, strerror ( rc ) ); dwgpio->name, strerror ( rc ) );
goto err_port; goto err_port;
@@ -271,8 +267,8 @@ static int dwgpio_probe ( struct dt_device *dt, unsigned int offset ) {
dwgpio->name, parent->name, dwgpio->port, gpios->count ); dwgpio->name, parent->name, dwgpio->port, gpios->count );
/* Map registers */ /* Map registers */
dwgpio->swport = ( group->base + DWGPIO_SWPORT ( port ) ); dwgpio->swport = ( group->regs + DWGPIO_SWPORT ( port ) );
dwgpio->ext = ( group->base + DWGPIO_EXT_PORT ( port ) ); dwgpio->ext = ( group->regs + DWGPIO_EXT_PORT ( port ) );
dwgpio_dump ( dwgpio ); dwgpio_dump ( dwgpio );
/* Record original register values */ /* Record original register values */

6
src/drivers/gpio/dwgpio.h
View File

@@ -53,10 +53,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/** A DesignWare GPIO port group */ /** A DesignWare GPIO port group */
struct dwgpio_group { struct dwgpio_group {
/** Register base */ /** Registers */
void *base; void *regs;
/** Region cell size specification */
struct fdt_reg_cells regs;
}; };
/** A DesignWare GPIO port */ /** A DesignWare GPIO port */