github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ARM: pxa: software node oriented GPIO rework for v7.2

Browse Source 
- attach software nodes to their target GPIO controllers on PXA
   platforms
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEkeUTLeW1Rh17omX8BZ0uy/82hMMFAmoDF1QACgkQBZ0uy/82
 hMN+vBAAnm8CcZlIxset1DoRYcZLW1PGjscmrlGeLz2x+ZCYI5GCunVrCwHi2lEA
 eKkvkmjFlFEGFMljoUlUkaab92Px+/53fNump1TR5zlxBvf1lPgfUFRf2MLRnz/u
 viLwfRVRmkTRZ6TpWLNF2DUVpN9av4oaT514BKHxdUTm21v3iPjetFlv57D48qWB
 3zizGBkmT9nOha9MkigM5gXjibchEloKrORZPpQFm5u3iwJaOlHWRSObB6zAfDua
 TNW5q4AlddWgIGUdIPv8y0YymWztPKbmgmieuNvKU6Tk28dnrE0GE+dW67TuEqB+
 m+/+5dctdjuk0/O4hZWa2Fc0t7VgzOYLnF6P4MIufZnUKVm7ppaSEMaeOcUPstsh
 eQK+t5jEEeb8WVm4OUFJgT4J4yMdQrkoZTyJqhyZoTPn7GNe+hsfoZxpstPJh84K
 TXfomePp5usrJqOpkFv4zlQz4AtZKB6tu7xYaMPzb4t+To6O6BDpHW5ZcByXbYo+
 fzhLSNdaY+GUtQ8cfUpaqBhMH7zkF/UzV4BCfun5o+Xwd0Dz6ALMtPnCNH/sgyS9
 IAe7KQL2OPt6m5Cmtm5qZqpUZhdEum8XvoEbYpqilx7ZmWAPeOnscj3KR7iPd2B0
 HuqlucsTS0c6qsK6AWTp7iXsFZrv0ovuChO+X2phWGzg0Xcg+oQ=
 =9eMs
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmoOCIcACgkQmmx57+YA
 GNnaMw//W/0u4ofpyJStNyhN3eG2mrz63eFshCZMFL3zW/91lAxp538kivEWShgz
 ooRrfIHIJBm5+zoc/rIDQHg4HSNrw6QdPN+tz83PQ2AZWZjBbqky+9CgNfljsBk/
 u8SzzMvmiKdM86s3PrAMm7xwSTqUOvaCnGQKtTDu9GPXxNbDHP2ZV0lMnODxTq22
 NUMY7jVbLsAuHQUwYzItidM60RbMViRPTUR3pUINd7khMnykBoadNmXqkJMo3bFq
 gZQ+jtOqHfogHAE/wt1/MNLeGHi8LzoICe8KaTZiibhGo9QOa7l9e+Jh8F4361wJ
 EOMpktxRyo5SDmcvgHp+Q2AfhQOrGi9v1Jaok2twCg3f++DEgt+uWrycz77X7YGH
 7kgh2076JuvRtUQrB/tLm+eed/OyBY/DJ0OKgXH8ffFSm9BMczDEqSEQfb0eGpD6
 MclHYGTFONH1PUI+o3FE9IAxVqt7q9gMgY2Mlp08p1egqWyOuUU8tfj4lW2cB9+8
 GirAnwmJsN1MnPbq3Lz0lh4k+qCGBj/fLXZTQn5d1cAhRFN/mKFcNsOUHJqEBhNX
 orCo5vhIHUfbO4oS0k6TqOlsWi8gpNB/mn7BxJwRmPVQ8CJfZ/wgE0EmcaQMrEEs
 ZO1TwvEa/JM1hFabeeUAQQhBKT5sTk2VQJ8WpQfDfU+s0b0YvRU=
 =cIKh
 -----END PGP SIGNATURE-----

Merge tag 'soc-pxa-gpio-for-v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into soc/arm

ARM: pxa: software node oriented GPIO rework for v7.2

- attach software nodes to their target GPIO controllers on PXA
  platforms

* tag 'soc-pxa-gpio-for-v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  ARM: pxa: pxa27x: attach software node to its target GPIO controller
  ARM: pxa: pxa25x: attach software node to its target GPIO controller
  ARM: pxa: spitz: attach software nodes to their target GPIO controllers
  ARM: pxa: statify platform device definitions in spitz board file

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2026-05-20 21:16:21 +02:00
commit e02914dafe
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-pxa/pxa25x.c
View File

@ -240,6 +240,9 @@ static int __init pxa25x_init(void)
if (!of_have_populated_dt()) {
software_node_register(&pxa2xx_gpiochip_node);
pxa25x_device_gpio.dev.fwnode = software_node_fwnode(
&pxa2xx_gpiochip_node);
pxa2xx_set_dmac_info(&pxa25x_dma_pdata);
ret = platform_add_devices(pxa25x_devices,
ARRAY_SIZE(pxa25x_devices));

3
arch/arm/mach-pxa/pxa27x.c
View File

@ -342,6 +342,9 @@ static int __init pxa27x_init(void)
if (!of_have_populated_dt()) {
software_node_register(&pxa2xx_gpiochip_node);
pxa27x_device_gpio.dev.fwnode = software_node_fwnode(
&pxa2xx_gpiochip_node);
pxa2xx_set_dmac_info(&pxa27x_dma_pdata);
ret = platform_add_devices(devices,
ARRAY_SIZE(devices));

11
arch/arm/mach-pxa/spitz.c
View File

@ -165,7 +165,7 @@ static struct scoop_config spitz_scoop_1_setup = {
.gpio_base = SPITZ_SCP_GPIO_BASE,
};
struct platform_device spitz_scoop_1_device = {
static struct platform_device spitz_scoop_1_device = {
.name = "sharp-scoop",
.id = 0,
.dev = {
@ -192,7 +192,7 @@ static struct scoop_config spitz_scoop_2_setup = {
.gpio_base = SPITZ_SCP2_GPIO_BASE,
};
struct platform_device spitz_scoop_2_device = {
static struct platform_device spitz_scoop_2_device = {
.name = "sharp-scoop",
.id = 1,
.dev = {
@ -204,11 +204,15 @@ struct platform_device spitz_scoop_2_device = {
static void __init spitz_scoop_init(void)
{
spitz_scoop_1_device.dev.fwnode = software_node_fwnode(&spitz_scoop_1_gpiochip_node);
platform_device_register(&spitz_scoop_1_device);
/* Akita doesn't have the second SCOOP chip */
if (!machine_is_akita())
if (!machine_is_akita()) {
spitz_scoop_2_device.dev.fwnode = software_node_fwnode(
&spitz_scoop_2_gpiochip_node);
platform_device_register(&spitz_scoop_2_device);
}
}
/* Power control is shared with between one of the CF slots and SD */
@ -988,6 +992,7 @@ static struct i2c_board_info spitz_i2c_devs[] = {
.type = "max7310",
.addr = 0x18,
.platform_data = &akita_pca953x_pdata,
.swnode = &akita_max7310_gpiochip_node,
},
};