gpio: tegra186: Derive register offsets from bank/port
Subsystems (2)
PATCH 1/3 gpio: tegra186: Derive register offsets from bank/port
From: Thierry Reding <[email protected]>
The register offsets for a given bank and port can be easily derived from the bank and port indices. Update the port descriptors to list only the bank and port numbers to simplify this.
--- drivers/gpio/gpio-tegra186.c | 195 ++++++++++++++++++----------------- 1 file changed, 100 insertions(+), 95 deletions(-)
drivers/gpio/gpio-tegra186.c +100 -95
@@ -44,9 +44,9 @@struct tegra_gpio_port {const char *name; -unsigned int offset; +unsigned int bank; +unsigned int port;unsigned int pins; -unsigned int irq; };struct tegra_gpio_soc {
@@ -90,12 +90,15 @@ static void __iomem *tegra186_gpio_get_base(struct tegra_gpio *gpio, unsigned int pin) {const struct tegra_gpio_port *port; +unsigned int offset; port =tegra186_gpio_get_port (gpio, &pin);if (!port)return NULL ; -return gpio->base + port->offset + pin *0x20 ; + offset = port->bank *0x1000 + port->port *0x200 ; + +return gpio->base + offset + pin *0x20 ; } static int tegra186_gpio_get_direction(struct gpio_chip *chip,
@@ -343,12 +346,14 @@ static void tegra186_gpio_irq(struct irq_desc *desc)for (i =0 ; i < gpio->soc->num_ports; i++) {const struct tegra_gpio_port *port = &gpio->soc->ports[i]; -void __iomem *base = gpio->base + port->offset;unsigned int pin, irq;unsigned long value; +void __iomem *base; + + base = gpio->base + port->bank *0x1000 + port->port *0x200 ; -/* skip ports that are not associated with this controller */ -if (parent != gpio->irq[port->irq]) +/* skip ports that are not associated with this bank */ +if (parent != gpio->irq[port->bank]) goto skip; value =readl (base +TEGRA186_GPIO_INTERRUPT_STATUS (1 ));
@@ -562,7 +567,7 @@ static int tegra186_gpio_probe(struct platform_device *pdev)const struct tegra_gpio_port *port = &gpio->soc->ports[i];for (j =0 ; j < port->pins; j++) - irq->map[offset + j] = irq->parents[port->irq]; + irq->map[offset + j] = irq->parents[port->bank]; offset += port->pins; }
@@ -581,38 +586,38 @@ static int tegra186_gpio_remove(struct platform_device *pdev)return 0 ; } -#define TEGRA186_MAIN_GPIO_PORT (port, base, count, controller) \ - [TEGRA186_MAIN_GPIO_PORT_##port] = { \ - .name = #port, \ - .offset = base, \ - .pins = count, \ - .irq = controller, \ +#define TEGRA186_MAIN_GPIO_PORT (_name, _bank, _port, _pins) \ + [TEGRA186_MAIN_GPIO_PORT_##_name] = { \ + .name = #_name, \ + .bank = _bank, \ + .port = _port, \ + .pins = _pins, \ }static const struct tegra_gpio_port tegra186_main_ports[] = { -TEGRA186_MAIN_GPIO_PORT (A ,0x2000 ,7 ,2 ), -TEGRA186_MAIN_GPIO_PORT (B ,0x3000 ,7 ,3 ), -TEGRA186_MAIN_GPIO_PORT (C ,0x3200 ,7 ,3 ), -TEGRA186_MAIN_GPIO_PORT (D ,0x3400 ,6 ,3 ), -TEGRA186_MAIN_GPIO_PORT (E ,0x2200 ,8 ,2 ), -TEGRA186_MAIN_GPIO_PORT (F ,0x2400 ,6 ,2 ), -TEGRA186_MAIN_GPIO_PORT (G ,0x4200 ,6 ,4 ), -TEGRA186_MAIN_GPIO_PORT (H ,0x1000 ,7 ,1 ), -TEGRA186_MAIN_GPIO_PORT (I ,0x0800 ,8 ,0 ), -TEGRA186_MAIN_GPIO_PORT (J ,0x5000 ,8 ,5 ), -TEGRA186_MAIN_GPIO_PORT (K ,0x5200 ,1 ,5 ), -TEGRA186_MAIN_GPIO_PORT (L ,0x1200 ,8 ,1 ), -TEGRA186_MAIN_GPIO_PORT (M ,0x5600 ,6 ,5 ), -TEGRA186_MAIN_GPIO_PORT (N ,0x0000 ,7 ,0 ), -TEGRA186_MAIN_GPIO_PORT (O ,0x0200 ,4 ,0 ), -TEGRA186_MAIN_GPIO_PORT (P ,0x4000 ,7 ,4 ), -TEGRA186_MAIN_GPIO_PORT (Q ,0x0400 ,6 ,0 ), -TEGRA186_MAIN_GPIO_PORT (R ,0x0a00 ,6 ,0 ), -TEGRA186_MAIN_GPIO_PORT (T ,0x0600 ,4 ,0 ), -TEGRA186_MAIN_GPIO_PORT (X ,0x1400 ,8 ,1 ), -TEGRA186_MAIN_GPIO_PORT (Y ,0x1600 ,7 ,1 ), -TEGRA186_MAIN_GPIO_PORT (BB ,0x2600 ,2 ,2 ), -TEGRA186_MAIN_GPIO_PORT (CC ,0x5400 ,4 ,5 ), +TEGRA186_MAIN_GPIO_PORT (A ,2 ,0 ,7 ), +TEGRA186_MAIN_GPIO_PORT (B ,3 ,0 ,7 ), +TEGRA186_MAIN_GPIO_PORT (C ,3 ,1 ,7 ), +TEGRA186_MAIN_GPIO_PORT (D ,3 ,2 ,6 ), +TEGRA186_MAIN_GPIO_PORT (E ,2 ,1 ,8 ), +TEGRA186_MAIN_GPIO_PORT (F ,2 ,2 ,6 ), +TEGRA186_MAIN_GPIO_PORT (G ,4 ,1 ,6 ), +TEGRA186_MAIN_GPIO_PORT (H ,1 ,0 ,7 ), +TEGRA186_MAIN_GPIO_PORT (I ,0 ,4 ,8 ), +TEGRA186_MAIN_GPIO_PORT (J ,5 ,0 ,8 ), +TEGRA186_MAIN_GPIO_PORT (K ,5 ,1 ,1 ), +TEGRA186_MAIN_GPIO_PORT (L ,1 ,1 ,8 ), +TEGRA186_MAIN_GPIO_PORT (M ,5 ,3 ,6 ), +TEGRA186_MAIN_GPIO_PORT (N ,0 ,0 ,7 ), +TEGRA186_MAIN_GPIO_PORT (O ,0 ,1 ,4 ), +TEGRA186_MAIN_GPIO_PORT (P ,4 ,0 ,7 ), +TEGRA186_MAIN_GPIO_PORT (Q ,0 ,2 ,6 ), +TEGRA186_MAIN_GPIO_PORT (R ,0 ,5 ,6 ), +TEGRA186_MAIN_GPIO_PORT (T ,0 ,3 ,4 ), +TEGRA186_MAIN_GPIO_PORT (X ,1 ,2 ,8 ), +TEGRA186_MAIN_GPIO_PORT (Y ,1 ,3 ,7 ), +TEGRA186_MAIN_GPIO_PORT (BB ,2 ,3 ,2 ), +TEGRA186_MAIN_GPIO_PORT (CC ,5 ,2 ,4 ), };static const struct tegra_gpio_soc tegra186_main_soc = {
@@ -622,23 +627,23 @@ static const struct tegra_gpio_soc tegra186_main_soc = { .instance = 0, }; -#define TEGRA186_AON_GPIO_PORT (port, base, count, controller) \ - [TEGRA186_AON_GPIO_PORT_##port] = { \ - .name = #port, \ - .offset = base, \ - .pins = count, \ - .irq = controller, \ +#define TEGRA186_AON_GPIO_PORT (_name, _bank, _port, _pins) \ + [TEGRA186_AON_GPIO_PORT_##_name] = { \ + .name = #_name, \ + .bank = _bank, \ + .port = _port, \ + .pins = _pins, \ }static const struct tegra_gpio_port tegra186_aon_ports[] = { -TEGRA186_AON_GPIO_PORT (S ,0x0200 ,5 ,0 ), -TEGRA186_AON_GPIO_PORT (U ,0x0400 ,6 ,0 ), -TEGRA186_AON_GPIO_PORT (V ,0x0800 ,8 ,0 ), -TEGRA186_AON_GPIO_PORT (W ,0x0a00 ,8 ,0 ), -TEGRA186_AON_GPIO_PORT (Z ,0x0e00 ,4 ,0 ), -TEGRA186_AON_GPIO_PORT (AA ,0x0c00 ,8 ,0 ), -TEGRA186_AON_GPIO_PORT (EE ,0x0600 ,3 ,0 ), -TEGRA186_AON_GPIO_PORT (FF ,0x0000 ,5 ,0 ), +TEGRA186_AON_GPIO_PORT (S ,0 ,1 ,5 ), +TEGRA186_AON_GPIO_PORT (U ,0 ,2 ,6 ), +TEGRA186_AON_GPIO_PORT (V ,0 ,4 ,8 ), +TEGRA186_AON_GPIO_PORT (W ,0 ,5 ,8 ), +TEGRA186_AON_GPIO_PORT (Z ,0 ,7 ,4 ), +TEGRA186_AON_GPIO_PORT (AA ,0 ,6 ,8 ), +TEGRA186_AON_GPIO_PORT (EE ,0 ,3 ,3 ), +TEGRA186_AON_GPIO_PORT (FF ,0 ,0 ,5 ), };static const struct tegra_gpio_soc tegra186_aon_soc = {
@@ -648,43 +653,43 @@ static const struct tegra_gpio_soc tegra186_aon_soc = { .instance = 1, }; -#define TEGRA194_MAIN_GPIO_PORT (port, base, count, controller) \ - [TEGRA194_MAIN_GPIO_PORT_##port] = { \ - .name = #port, \ - .offset = base, \ - .pins = count, \ - .irq = controller, \ +#define TEGRA194_MAIN_GPIO_PORT (_name, _bank, _port, _pins) \ + [TEGRA194_MAIN_GPIO_PORT_##_name] = { \ + .name = #_name, \ + .bank = _bank, \ + .port = _port, \ + .pins = _pins, \ }static const struct tegra_gpio_port tegra194_main_ports[] = { -TEGRA194_MAIN_GPIO_PORT (A ,0x1400 ,8 ,1 ), -TEGRA194_MAIN_GPIO_PORT (B ,0x4e00 ,2 ,4 ), -TEGRA194_MAIN_GPIO_PORT (C ,0x4600 ,8 ,4 ), -TEGRA194_MAIN_GPIO_PORT (D ,0x4800 ,4 ,4 ), -TEGRA194_MAIN_GPIO_PORT (E ,0x4a00 ,8 ,4 ), -TEGRA194_MAIN_GPIO_PORT (F ,0x4c00 ,6 ,4 ), -TEGRA194_MAIN_GPIO_PORT (G ,0x4000 ,8 ,4 ), -TEGRA194_MAIN_GPIO_PORT (H ,0x4200 ,8 ,4 ), -TEGRA194_MAIN_GPIO_PORT (I ,0x4400 ,5 ,4 ), -TEGRA194_MAIN_GPIO_PORT (J ,0x5200 ,6 ,5 ), -TEGRA194_MAIN_GPIO_PORT (K ,0x3000 ,8 ,3 ), -TEGRA194_MAIN_GPIO_PORT (L ,0x3200 ,4 ,3 ), -TEGRA194_MAIN_GPIO_PORT (M ,0x2600 ,8 ,2 ), -TEGRA194_MAIN_GPIO_PORT (N ,0x2800 ,3 ,2 ), -TEGRA194_MAIN_GPIO_PORT (O ,0x5000 ,6 ,5 ), -TEGRA194_MAIN_GPIO_PORT (P ,0x2a00 ,8 ,2 ), -TEGRA194_MAIN_GPIO_PORT (Q ,0x2c00 ,8 ,2 ), -TEGRA194_MAIN_GPIO_PORT (R ,0x2e00 ,6 ,2 ), -TEGRA194_MAIN_GPIO_PORT (S ,0x3600 ,8 ,3 ), -TEGRA194_MAIN_GPIO_PORT (T ,0x3800 ,8 ,3 ), -TEGRA194_MAIN_GPIO_PORT (U ,0x3a00 ,1 ,3 ), -TEGRA194_MAIN_GPIO_PORT (V ,0x1000 ,8 ,1 ), -TEGRA194_MAIN_GPIO_PORT (W ,0x1200 ,2 ,1 ), -TEGRA194_MAIN_GPIO_PORT (X ,0x2000 ,8 ,2 ), -TEGRA194_MAIN_GPIO_PORT (Y ,0x2200 ,8 ,2 ), -TEGRA194_MAIN_GPIO_PORT (Z ,0x2400 ,8 ,2 ), -TEGRA194_MAIN_GPIO_PORT (FF ,0x3400 ,2 ,3 ), -TEGRA194_MAIN_GPIO_PORT (GG ,0x0000 ,2 ,0 ) +TEGRA194_MAIN_GPIO_PORT (A ,1 ,2 ,8 ), +TEGRA194_MAIN_GPIO_PORT (B ,4 ,7 ,2 ), +TEGRA194_MAIN_GPIO_PORT (C ,4 ,3 ,8 ), +TEGRA194_MAIN_GPIO_PORT (D ,4 ,4 ,4 ), +TEGRA194_MAIN_GPIO_PORT (E ,4 ,5 ,8 ), +TEGRA194_MAIN_GPIO_PORT (F ,4 ,6 ,6 ), +TEGRA194_MAIN_GPIO_PORT (G ,4 ,0 ,8 ), +TEGRA194_MAIN_GPIO_PORT (H ,4 ,1 ,8 ), +TEGRA194_MAIN_GPIO_PORT (I ,4 ,2 ,5 ), +TEGRA194_MAIN_GPIO_PORT (J ,5 ,1 ,6 ), +TEGRA194_MAIN_GPIO_PORT (K ,3 ,0 ,8 ), +TEGRA194_MAIN_GPIO_PORT (L ,3 ,1 ,4 ), +TEGRA194_MAIN_GPIO_PORT (M ,2 ,3 ,8 ), +TEGRA194_MAIN_GPIO_PORT (N ,2 ,4 ,3 ), +TEGRA194_MAIN_GPIO_PORT (O ,5 ,0 ,6 ), +TEGRA194_MAIN_GPIO_PORT (P ,2 ,5 ,8 ), +TEGRA194_MAIN_GPIO_PORT (Q ,2 ,6 ,8 ), +TEGRA194_MAIN_GPIO_PORT (R ,2 ,7 ,6 ), +TEGRA194_MAIN_GPIO_PORT (S ,3 ,3 ,8 ), +TEGRA194_MAIN_GPIO_PORT (T ,3 ,4 ,8 ), +TEGRA194_MAIN_GPIO_PORT (U ,3 ,5 ,1 ), +TEGRA194_MAIN_GPIO_PORT (V ,1 ,0 ,8 ), +TEGRA194_MAIN_GPIO_PORT (W ,1 ,1 ,2 ), +TEGRA194_MAIN_GPIO_PORT (X ,2 ,0 ,8 ), +TEGRA194_MAIN_GPIO_PORT (Y ,2 ,1 ,8 ), +TEGRA194_MAIN_GPIO_PORT (Z ,2 ,2 ,8 ), +TEGRA194_MAIN_GPIO_PORT (FF ,3 ,2 ,2 ), +TEGRA194_MAIN_GPIO_PORT (GG ,0 ,0 ,2 ) };static const struct tegra_gpio_soc tegra194_main_soc = {
@@ -694,20 +699,20 @@ static const struct tegra_gpio_soc tegra194_main_soc = { .instance = 0, }; -#define TEGRA194_AON_GPIO_PORT (port, base, count, controller) \ - [TEGRA194_AON_GPIO_PORT_##port] = { \ - .name = #port, \ - .offset = base, \ - .pins = count, \ - .irq = controller, \ +#define TEGRA194_AON_GPIO_PORT (_name, _bank, _port, _pins) \ + [TEGRA194_AON_GPIO_PORT_##_name] = { \ + .name = #_name, \ + .bank = _bank, \ + .port = _port, \ + .pins = _pins, \ }static const struct tegra_gpio_port tegra194_aon_ports[] = { -TEGRA194_AON_GPIO_PORT (AA ,0x0600 ,8 ,0 ), -TEGRA194_AON_GPIO_PORT (BB ,0x0800 ,4 ,0 ), -TEGRA194_AON_GPIO_PORT (CC ,0x0200 ,8 ,0 ), -TEGRA194_AON_GPIO_PORT (DD ,0x0400 ,3 ,0 ), -TEGRA194_AON_GPIO_PORT (EE ,0x0000 ,7 ,0 ) +TEGRA194_AON_GPIO_PORT (AA ,0 ,3 ,8 ), +TEGRA194_AON_GPIO_PORT (BB ,0 ,4 ,4 ), +TEGRA194_AON_GPIO_PORT (CC ,0 ,1 ,8 ), +TEGRA194_AON_GPIO_PORT (DD ,0 ,2 ,3 ), +TEGRA194_AON_GPIO_PORT (EE ,0 ,0 ,7 ) };static const struct tegra_gpio_soc tegra194_aon_soc = {
Signature · 1 line
2.23.0
PATCH 2/3 gpio: tegra186: Program interrupt route mapping
From: Thierry Reding <[email protected]>
The controls for the GG port on Tegra194 resides in the power partition of the C5 PCIe controller and its interrupt route mapping can therefore not be programmed by early boot firmware along with that of the other ports.
Detect this generically by looking at which controls have already been locked down using the security registers and fill in default values for controls that are unlocked.
--- drivers/gpio/gpio-tegra186.c | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
drivers/gpio/gpio-tegra186.c +46 -0
@@ -15,6 +15,14 @@#include <dt-bindings/gpio/tegra186-gpio.h> #include <dt-bindings/gpio/tegra194-gpio.h> +/* security registers */ +#define TEGRA186_GPIO_CTL_SCR 0x0c +#define TEGRA186_GPIO_CTL_SCR_SEC_WEN BIT(28) +#define TEGRA186_GPIO_CTL_SCR_SEC_REN BIT(27) + +#define TEGRA186_GPIO_INT_ROUTE_MAPPING (p, x) (0x14 + (p) * 0x20 + (x) * 4) + +/* control registers */ #define TEGRA186_GPIO_ENABLE_CONFIG 0x00#define TEGRA186_GPIO_ENABLE_CONFIG_ENABLE BIT(0)#define TEGRA186_GPIO_ENABLE_CONFIG_OUT BIT(1)
@@ -64,6 +72,7 @@ struct tegra_gpio {const struct tegra_gpio_soc *soc; +void __iomem *secure;void __iomem *base; };
@@ -449,6 +458,37 @@ static const struct of_device_id tegra186_pmc_of_match[] = { {/* sentinel */ } }; +static void tegra186_gpio_init_route_mapping (struct tegra_gpio *gpio) +{ +unsigned int i, j; +u32 value; + +for (i =0 ; i < gpio->soc->num_ports; i++) { +const struct tegra_gpio_port *port = &gpio->soc->ports[i]; +unsigned int offset, p = port->port; +void __iomem *base; + + base = gpio->secure + port->bank *0x1000 +0x800 ; + + value =readl (base +TEGRA186_GPIO_CTL_SCR ); + +/* +* For controllers that haven't been locked down yet, make +* sure to program the default interrupt route mapping. +*/ +if ((value &TEGRA186_GPIO_CTL_SCR_SEC_REN ) ==0 && + (value &TEGRA186_GPIO_CTL_SCR_SEC_WEN ) ==0 ) { +for (j =0 ; j <8 ; j++) { + offset =TEGRA186_GPIO_INT_ROUTE_MAPPING (p, j); + + value =readl (base + offset); + value =BIT (port->pins) -1 ; +writel (value, base + offset); + } + } + } +} +static int tegra186_gpio_probe (struct platform_device *pdev) {unsigned int i, j, offset;
@@ -464,6 +504,10 @@ static int tegra186_gpio_probe(struct platform_device *pdev) gpio->soc =of_device_get_match_data (&pdev->dev); + gpio->secure =devm_platform_ioremap_resource_byname (pdev,"security" ); +if (IS_ERR (gpio->secure)) +return PTR_ERR (gpio->secure); + gpio->base =devm_platform_ioremap_resource_byname (pdev,"gpio" );if (IS_ERR (gpio->base))return PTR_ERR (gpio->base);
@@ -558,6 +602,8 @@ static int tegra186_gpio_probe(struct platform_device *pdev)return -EPROBE_DEFER ; } +tegra186_gpio_init_route_mapping (gpio); + irq->map =devm_kcalloc (&pdev->dev, gpio->gpio.ngpio,sizeof (*irq->map),GFP_KERNEL );if (!irq->map)
Signature · 1 line
2.23.0
Re: [PATCH 2/3] gpio: tegra186: Program interrupt route mapping
pt., 8 lis 2019 o 16:34 Thierry Reding <[email protected]> napisał(a):
Quoted 103 lines
From: Thierry Reding <[email protected]>
The controls for the GG port on Tegra194 resides in the power partition of the C5 PCIe controller and its interrupt route mapping can therefore not be programmed by early boot firmware along with that of the other ports.
Detect this generically by looking at which controls have already been locked down using the security registers and fill in default values for controls that are unlocked.
Signed-off-by Thierry Reding <[email protected]>--- drivers/gpio/gpio-tegra186.c | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)drivers/gpio/gpio-tegra186.c +46
-1@@ -15,6 +15,14 @@#include <dt-bindings/gpio/tegra186-gpio.h> #include <dt-bindings/gpio/tegra194-gpio.h> +/* security registers */ +#define TEGRA186_GPIO_CTL_SCR 0x0c +#define TEGRA186_GPIO_CTL_SCR_SEC_WEN BIT(28) +#define TEGRA186_GPIO_CTL_SCR_SEC_REN BIT(27) + +#define TEGRA186_GPIO_INT_ROUTE_MAPPING (p, x) (0x14 + (p) * 0x20 + (x) * 4) + +/* control registers */ #define TEGRA186_GPIO_ENABLE_CONFIG 0x00#define TEGRA186_GPIO_ENABLE_CONFIG_ENABLE BIT(0)#define TEGRA186_GPIO_ENABLE_CONFIG_OUT BIT(1)@@ -64,6 +72,7 @@ struct tegra_gpio {const struct tegra_gpio_soc *soc; +void __iomem *secure;void __iomem *base; };@@ -449,6 +458,37 @@ static const struct of_device_id tegra186_pmc_of_match[] = { {/* sentinel */ } }; +static void tegra186_gpio_init_route_mapping (struct tegra_gpio *gpio) +{ +unsigned int i, j; +u32 value; + +for (i =0 ; i < gpio->soc->num_ports; i++) { +const struct tegra_gpio_port *port = &gpio->soc->ports[i]; +unsigned int offset, p = port->port; +void __iomem *base; + + base = gpio->secure + port->bank *0x1000 +0x800 ; + + value =readl (base +TEGRA186_GPIO_CTL_SCR ); + +/* +* For controllers that haven't been locked down yet, make +* sure to program the default interrupt route mapping. +*/ +if ((value &TEGRA186_GPIO_CTL_SCR_SEC_REN ) ==0 && + (value &TEGRA186_GPIO_CTL_SCR_SEC_WEN ) ==0 ) { +for (j =0 ; j <8 ; j++) { + offset =TEGRA186_GPIO_INT_ROUTE_MAPPING (p, j); + + value =readl (base + offset); + value =BIT (port->pins) -1 ; +writel (value, base + offset); + } + } + } +} +static int tegra186_gpio_probe (struct platform_device *pdev) {unsigned int i, j, offset;@@ -464,6 +504,10 @@ static int tegra186_gpio_probe(struct platform_device *pdev) gpio->soc =of_device_get_match_data (&pdev->dev); + gpio->secure =devm_platform_ioremap_resource_byname (pdev,"security" ); +if (IS_ERR (gpio->secure)) +return PTR_ERR (gpio->secure); + gpio->base =devm_platform_ioremap_resource_byname (pdev,"gpio" );if (IS_ERR (gpio->base))return PTR_ERR (gpio->base);@@ -558,6 +602,8 @@ static int tegra186_gpio_probe(struct platform_device *pdev)return -EPROBE_DEFER ; } +tegra186_gpio_init_route_mapping (gpio); + irq->map =devm_kcalloc (&pdev->dev, gpio->gpio.ngpio,sizeof (*irq->map),GFP_KERNEL );if (!irq->map) --
Quoted 2 lines
2.23.0
This doesn't apply without a patch that went through Greg's driver-core tree.
Greg: can you provide us with an immutable branch which we can merge into the gpio for-next tree?
Bart
Re: [PATCH 2/3] gpio: tegra186: Program interrupt route mapping
Quoted 109 lines · Bartosz Golaszewski
pt., 8 lis 2019 o 16:34 Thierry Reding <[email protected]> napisał(a):
Quoted 103 lines
From: Thierry Reding <[email protected]>
The controls for the GG port on Tegra194 resides in the power partition of the C5 PCIe controller and its interrupt route mapping can therefore not be programmed by early boot firmware along with that of the other ports.
Detect this generically by looking at which controls have already been locked down using the security registers and fill in default values for controls that are unlocked.
Signed-off-by Thierry Reding <[email protected]>--- drivers/gpio/gpio-tegra186.c | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)drivers/gpio/gpio-tegra186.c +46
-1@@ -15,6 +15,14 @@#include <dt-bindings/gpio/tegra186-gpio.h> #include <dt-bindings/gpio/tegra194-gpio.h> +/* security registers */ +#define TEGRA186_GPIO_CTL_SCR 0x0c +#define TEGRA186_GPIO_CTL_SCR_SEC_WEN BIT(28) +#define TEGRA186_GPIO_CTL_SCR_SEC_REN BIT(27) + +#define TEGRA186_GPIO_INT_ROUTE_MAPPING (p, x) (0x14 + (p) * 0x20 + (x) * 4) + +/* control registers */ #define TEGRA186_GPIO_ENABLE_CONFIG 0x00#define TEGRA186_GPIO_ENABLE_CONFIG_ENABLE BIT(0)#define TEGRA186_GPIO_ENABLE_CONFIG_OUT BIT(1)@@ -64,6 +72,7 @@ struct tegra_gpio {const struct tegra_gpio_soc *soc; +void __iomem *secure;void __iomem *base; };@@ -449,6 +458,37 @@ static const struct of_device_id tegra186_pmc_of_match[] = { {/* sentinel */ } }; +static void tegra186_gpio_init_route_mapping (struct tegra_gpio *gpio) +{ +unsigned int i, j; +u32 value; + +for (i =0 ; i < gpio->soc->num_ports; i++) { +const struct tegra_gpio_port *port = &gpio->soc->ports[i]; +unsigned int offset, p = port->port; +void __iomem *base; + + base = gpio->secure + port->bank *0x1000 +0x800 ; + + value =readl (base +TEGRA186_GPIO_CTL_SCR ); + +/* +* For controllers that haven't been locked down yet, make +* sure to program the default interrupt route mapping. +*/ +if ((value &TEGRA186_GPIO_CTL_SCR_SEC_REN ) ==0 && + (value &TEGRA186_GPIO_CTL_SCR_SEC_WEN ) ==0 ) { +for (j =0 ; j <8 ; j++) { + offset =TEGRA186_GPIO_INT_ROUTE_MAPPING (p, j); + + value =readl (base + offset); + value =BIT (port->pins) -1 ; +writel (value, base + offset); + } + } + } +} +static int tegra186_gpio_probe (struct platform_device *pdev) {unsigned int i, j, offset;@@ -464,6 +504,10 @@ static int tegra186_gpio_probe(struct platform_device *pdev) gpio->soc =of_device_get_match_data (&pdev->dev); + gpio->secure =devm_platform_ioremap_resource_byname (pdev,"security" ); +if (IS_ERR (gpio->secure)) +return PTR_ERR (gpio->secure); + gpio->base =devm_platform_ioremap_resource_byname (pdev,"gpio" );if (IS_ERR (gpio->base))return PTR_ERR (gpio->base);@@ -558,6 +602,8 @@ static int tegra186_gpio_probe(struct platform_device *pdev)return -EPROBE_DEFER ; } +tegra186_gpio_init_route_mapping (gpio); + irq->map =devm_kcalloc (&pdev->dev, gpio->gpio.ngpio,sizeof (*irq->map),GFP_KERNEL );if (!irq->map) --Quoted 2 lines
2.23.0
This doesn't apply without a patch that went through Greg's driver-core tree.
Quoted 2 lines
Greg: can you provide us with an immutable branch which we can merge into the gpio for-next tree?
A branch for/called what?
You can always pull from my driver-core-next branch, I never rebase it.
thanks,
greg k-h
Re: [PATCH 2/3] gpio: tegra186: Program interrupt route mapping
wt., 12 lis 2019 o 15:10 Greg KH <[email protected]> napisał(a):
Quoted 111 lines · Bartosz Golaszewski
Quoted 109 lines
pt., 8 lis 2019 o 16:34 Thierry Reding <[email protected]> napisał(a):
Quoted 103 lines
From: Thierry Reding <[email protected]>
The controls for the GG port on Tegra194 resides in the power partition of the C5 PCIe controller and its interrupt route mapping can therefore not be programmed by early boot firmware along with that of the other ports.
Detect this generically by looking at which controls have already been locked down using the security registers and fill in default values for controls that are unlocked.
Signed-off-by Thierry Reding <[email protected]>--- drivers/gpio/gpio-tegra186.c | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)drivers/gpio/gpio-tegra186.c +46
-1@@ -15,6 +15,14 @@#include <dt-bindings/gpio/tegra186-gpio.h> #include <dt-bindings/gpio/tegra194-gpio.h> +/* security registers */ +#define TEGRA186_GPIO_CTL_SCR 0x0c +#define TEGRA186_GPIO_CTL_SCR_SEC_WEN BIT(28) +#define TEGRA186_GPIO_CTL_SCR_SEC_REN BIT(27) + +#define TEGRA186_GPIO_INT_ROUTE_MAPPING (p, x) (0x14 + (p) * 0x20 + (x) * 4) + +/* control registers */ #define TEGRA186_GPIO_ENABLE_CONFIG 0x00#define TEGRA186_GPIO_ENABLE_CONFIG_ENABLE BIT(0)#define TEGRA186_GPIO_ENABLE_CONFIG_OUT BIT(1)@@ -64,6 +72,7 @@ struct tegra_gpio {const struct tegra_gpio_soc *soc; +void __iomem *secure;void __iomem *base; };@@ -449,6 +458,37 @@ static const struct of_device_id tegra186_pmc_of_match[] = { {/* sentinel */ } }; +static void tegra186_gpio_init_route_mapping (struct tegra_gpio *gpio) +{ +unsigned int i, j; +u32 value; + +for (i =0 ; i < gpio->soc->num_ports; i++) { +const struct tegra_gpio_port *port = &gpio->soc->ports[i]; +unsigned int offset, p = port->port; +void __iomem *base; + + base = gpio->secure + port->bank *0x1000 +0x800 ; + + value =readl (base +TEGRA186_GPIO_CTL_SCR ); + +/* +* For controllers that haven't been locked down yet, make +* sure to program the default interrupt route mapping. +*/ +if ((value &TEGRA186_GPIO_CTL_SCR_SEC_REN ) ==0 && + (value &TEGRA186_GPIO_CTL_SCR_SEC_WEN ) ==0 ) { +for (j =0 ; j <8 ; j++) { + offset =TEGRA186_GPIO_INT_ROUTE_MAPPING (p, j); + + value =readl (base + offset); + value =BIT (port->pins) -1 ; +writel (value, base + offset); + } + } + } +} +static int tegra186_gpio_probe (struct platform_device *pdev) {unsigned int i, j, offset;@@ -464,6 +504,10 @@ static int tegra186_gpio_probe(struct platform_device *pdev) gpio->soc =of_device_get_match_data (&pdev->dev); + gpio->secure =devm_platform_ioremap_resource_byname (pdev,"security" ); +if (IS_ERR (gpio->secure)) +return PTR_ERR (gpio->secure); + gpio->base =devm_platform_ioremap_resource_byname (pdev,"gpio" );if (IS_ERR (gpio->base))return PTR_ERR (gpio->base);@@ -558,6 +602,8 @@ static int tegra186_gpio_probe(struct platform_device *pdev)return -EPROBE_DEFER ; } +tegra186_gpio_init_route_mapping (gpio); + irq->map =devm_kcalloc (&pdev->dev, gpio->gpio.ngpio,sizeof (*irq->map),GFP_KERNEL );if (!irq->map) --Quoted 2 lines
2.23.0
This doesn't apply without a patch that went through Greg's driver-core tree.
Quoted 7 lines
Quoted 2 lines
Greg: can you provide us with an immutable branch which we can merge into the gpio for-next tree?
A branch for/called what?
You can always pull from my driver-core-next branch, I never rebase it.
That works for me - thanks!
Bart
Quoted 3 lines
thanks,
greg k-h
PATCH 3/3 gpio: tegra186: Add debounce support
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
The GPIO controller found on Tegra186 and later supports debouncing for inputs for up to 255 ms.
--- drivers/gpio/gpio-tegra186.c | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
drivers/gpio/gpio-tegra186.c +38 -0
@@ -32,6 +32,7 @@#define TEGRA186_GPIO_ENABLE_CONFIG_TRIGGER_TYPE_DOUBLE_EDGE (0x3 << 2)#define TEGRA186_GPIO_ENABLE_CONFIG_TRIGGER_TYPE_MASK (0x3 << 2)#define TEGRA186_GPIO_ENABLE_CONFIG_TRIGGER_LEVEL BIT(4) +#define TEGRA186_GPIO_ENABLE_CONFIG_DEBOUNCE BIT(5)#define TEGRA186_GPIO_ENABLE_CONFIG_INTERRUPT BIT(6)#define TEGRA186_GPIO_DEBOUNCE_CONTROL 0x04
@@ -217,6 +218,42 @@ static void tegra186_gpio_set(struct gpio_chip *chip, unsigned int offset,writel (value, base +TEGRA186_GPIO_OUTPUT_VALUE ); } +static int tegra186_gpio_set_config (struct gpio_chip *chip, +unsigned int offset, +unsigned long config) +{ +struct tegra_gpio *gpio =gpiochip_get_data (chip); +u32 debounce, value; +void __iomem *base; + + base =tegra186_gpio_get_base (gpio, offset); +if (base ==NULL ) +return -ENXIO ; + +if (pinconf_to_config_param (config) !=PIN_CONFIG_INPUT_DEBOUNCE ) +return -ENOTSUPP ; + + debounce =pinconf_to_config_argument (config); + +/* +* The Tegra186 GPIO controller supports a maximum of 255 ms debounce +* time. +*/ +if (debounce >255000 ) +return -EINVAL ; + + debounce =DIV_ROUND_UP (debounce,USEC_PER_MSEC ); + + value =TEGRA186_GPIO_DEBOUNCE_CONTROL_THRESHOLD (debounce); +writel (value, base +TEGRA186_GPIO_DEBOUNCE_CONTROL ); + + value =readl (base +TEGRA186_GPIO_ENABLE_CONFIG ); + value |=TEGRA186_GPIO_ENABLE_CONFIG_DEBOUNCE ; +writel (value, base +TEGRA186_GPIO_ENABLE_CONFIG ); + +return 0 ; +} +static int tegra186_gpio_of_xlate (struct gpio_chip *chip,const struct of_phandle_args *spec,u32 *flags)
@@ -539,6 +576,7 @@ static int tegra186_gpio_probe(struct platform_device *pdev) gpio->gpio.direction_output = tegra186_gpio_direction_output; gpio->gpio.get = tegra186_gpio_get, gpio->gpio.set = tegra186_gpio_set; + gpio->gpio.set_config = tegra186_gpio_set_config; gpio->gpio.base =-1 ;
Signature · 1 line
2.23.0
pt., 8 lis 2019 o 16:33 Thierry Reding <[email protected]> napisał(a):
Quoted 289 lines
From: Thierry Reding <[email protected]>
The register offsets for a given bank and port can be easily derived from the bank and port indices. Update the port descriptors to list only the bank and port numbers to simplify this.
Signed-off-by Thierry Reding <[email protected]>--- drivers/gpio/gpio-tegra186.c | 195 ++++++++++++++++++----------------- 1 file changed, 100 insertions(+), 95 deletions(-)drivers/gpio/gpio-tegra186.c +100
-96@@ -44,9 +44,9 @@struct tegra_gpio_port {const char *name; -unsigned int offset; +unsigned int bank; +unsigned int port;unsigned int pins; -unsigned int irq; };struct tegra_gpio_soc {@@ -90,12 +90,15 @@ static void __iomem *tegra186_gpio_get_base(struct tegra_gpio *gpio, unsigned int pin) {const struct tegra_gpio_port *port; +unsigned int offset; port =tegra186_gpio_get_port (gpio, &pin);if (!port)return NULL ; -return gpio->base + port->offset + pin *0x20 ; + offset = port->bank *0x1000 + port->port *0x200 ; + +return gpio->base + offset + pin *0x20 ; } static int tegra186_gpio_get_direction(struct gpio_chip *chip,@@ -343,12 +346,14 @@ static void tegra186_gpio_irq(struct irq_desc *desc)for (i =0 ; i < gpio->soc->num_ports; i++) {const struct tegra_gpio_port *port = &gpio->soc->ports[i]; -void __iomem *base = gpio->base + port->offset;unsigned int pin, irq;unsigned long value; +void __iomem *base; + + base = gpio->base + port->bank *0x1000 + port->port *0x200 ; -/* skip ports that are not associated with this controller */ -if (parent != gpio->irq[port->irq]) +/* skip ports that are not associated with this bank */ +if (parent != gpio->irq[port->bank]) goto skip; value =readl (base +TEGRA186_GPIO_INTERRUPT_STATUS (1 ));@@ -562,7 +567,7 @@ static int tegra186_gpio_probe(struct platform_device *pdev)const struct tegra_gpio_port *port = &gpio->soc->ports[i];for (j =0 ; j < port->pins; j++) - irq->map[offset + j] = irq->parents[port->irq]; + irq->map[offset + j] = irq->parents[port->bank]; offset += port->pins; }@@ -581,38 +586,38 @@ static int tegra186_gpio_remove(struct platform_device *pdev)return 0 ; } -#define TEGRA186_MAIN_GPIO_PORT (port, base, count, controller) \ - [TEGRA186_MAIN_GPIO_PORT_##port] = { \ - .name = #port, \ - .offset = base, \ - .pins = count, \ - .irq = controller, \ +#define TEGRA186_MAIN_GPIO_PORT (_name, _bank, _port, _pins) \ + [TEGRA186_MAIN_GPIO_PORT_##_name] = { \ + .name = #_name, \ + .bank = _bank, \ + .port = _port, \ + .pins = _pins, \ }static const struct tegra_gpio_port tegra186_main_ports[] = { -TEGRA186_MAIN_GPIO_PORT (A ,0x2000 ,7 ,2 ), -TEGRA186_MAIN_GPIO_PORT (B ,0x3000 ,7 ,3 ), -TEGRA186_MAIN_GPIO_PORT (C ,0x3200 ,7 ,3 ), -TEGRA186_MAIN_GPIO_PORT (D ,0x3400 ,6 ,3 ), -TEGRA186_MAIN_GPIO_PORT (E ,0x2200 ,8 ,2 ), -TEGRA186_MAIN_GPIO_PORT (F ,0x2400 ,6 ,2 ), -TEGRA186_MAIN_GPIO_PORT (G ,0x4200 ,6 ,4 ), -TEGRA186_MAIN_GPIO_PORT (H ,0x1000 ,7 ,1 ), -TEGRA186_MAIN_GPIO_PORT (I ,0x0800 ,8 ,0 ), -TEGRA186_MAIN_GPIO_PORT (J ,0x5000 ,8 ,5 ), -TEGRA186_MAIN_GPIO_PORT (K ,0x5200 ,1 ,5 ), -TEGRA186_MAIN_GPIO_PORT (L ,0x1200 ,8 ,1 ), -TEGRA186_MAIN_GPIO_PORT (M ,0x5600 ,6 ,5 ), -TEGRA186_MAIN_GPIO_PORT (N ,0x0000 ,7 ,0 ), -TEGRA186_MAIN_GPIO_PORT (O ,0x0200 ,4 ,0 ), -TEGRA186_MAIN_GPIO_PORT (P ,0x4000 ,7 ,4 ), -TEGRA186_MAIN_GPIO_PORT (Q ,0x0400 ,6 ,0 ), -TEGRA186_MAIN_GPIO_PORT (R ,0x0a00 ,6 ,0 ), -TEGRA186_MAIN_GPIO_PORT (T ,0x0600 ,4 ,0 ), -TEGRA186_MAIN_GPIO_PORT (X ,0x1400 ,8 ,1 ), -TEGRA186_MAIN_GPIO_PORT (Y ,0x1600 ,7 ,1 ), -TEGRA186_MAIN_GPIO_PORT (BB ,0x2600 ,2 ,2 ), -TEGRA186_MAIN_GPIO_PORT (CC ,0x5400 ,4 ,5 ), +TEGRA186_MAIN_GPIO_PORT (A ,2 ,0 ,7 ), +TEGRA186_MAIN_GPIO_PORT (B ,3 ,0 ,7 ), +TEGRA186_MAIN_GPIO_PORT (C ,3 ,1 ,7 ), +TEGRA186_MAIN_GPIO_PORT (D ,3 ,2 ,6 ), +TEGRA186_MAIN_GPIO_PORT (E ,2 ,1 ,8 ), +TEGRA186_MAIN_GPIO_PORT (F ,2 ,2 ,6 ), +TEGRA186_MAIN_GPIO_PORT (G ,4 ,1 ,6 ), +TEGRA186_MAIN_GPIO_PORT (H ,1 ,0 ,7 ), +TEGRA186_MAIN_GPIO_PORT (I ,0 ,4 ,8 ), +TEGRA186_MAIN_GPIO_PORT (J ,5 ,0 ,8 ), +TEGRA186_MAIN_GPIO_PORT (K ,5 ,1 ,1 ), +TEGRA186_MAIN_GPIO_PORT (L ,1 ,1 ,8 ), +TEGRA186_MAIN_GPIO_PORT (M ,5 ,3 ,6 ), +TEGRA186_MAIN_GPIO_PORT (N ,0 ,0 ,7 ), +TEGRA186_MAIN_GPIO_PORT (O ,0 ,1 ,4 ), +TEGRA186_MAIN_GPIO_PORT (P ,4 ,0 ,7 ), +TEGRA186_MAIN_GPIO_PORT (Q ,0 ,2 ,6 ), +TEGRA186_MAIN_GPIO_PORT (R ,0 ,5 ,6 ), +TEGRA186_MAIN_GPIO_PORT (T ,0 ,3 ,4 ), +TEGRA186_MAIN_GPIO_PORT (X ,1 ,2 ,8 ), +TEGRA186_MAIN_GPIO_PORT (Y ,1 ,3 ,7 ), +TEGRA186_MAIN_GPIO_PORT (BB ,2 ,3 ,2 ), +TEGRA186_MAIN_GPIO_PORT (CC ,5 ,2 ,4 ), };static const struct tegra_gpio_soc tegra186_main_soc = {@@ -622,23 +627,23 @@ static const struct tegra_gpio_soc tegra186_main_soc = { .instance = 0, }; -#define TEGRA186_AON_GPIO_PORT (port, base, count, controller) \ - [TEGRA186_AON_GPIO_PORT_##port] = { \ - .name = #port, \ - .offset = base, \ - .pins = count, \ - .irq = controller, \ +#define TEGRA186_AON_GPIO_PORT (_name, _bank, _port, _pins) \ + [TEGRA186_AON_GPIO_PORT_##_name] = { \ + .name = #_name, \ + .bank = _bank, \ + .port = _port, \ + .pins = _pins, \ }static const struct tegra_gpio_port tegra186_aon_ports[] = { -TEGRA186_AON_GPIO_PORT (S ,0x0200 ,5 ,0 ), -TEGRA186_AON_GPIO_PORT (U ,0x0400 ,6 ,0 ), -TEGRA186_AON_GPIO_PORT (V ,0x0800 ,8 ,0 ), -TEGRA186_AON_GPIO_PORT (W ,0x0a00 ,8 ,0 ), -TEGRA186_AON_GPIO_PORT (Z ,0x0e00 ,4 ,0 ), -TEGRA186_AON_GPIO_PORT (AA ,0x0c00 ,8 ,0 ), -TEGRA186_AON_GPIO_PORT (EE ,0x0600 ,3 ,0 ), -TEGRA186_AON_GPIO_PORT (FF ,0x0000 ,5 ,0 ), +TEGRA186_AON_GPIO_PORT (S ,0 ,1 ,5 ), +TEGRA186_AON_GPIO_PORT (U ,0 ,2 ,6 ), +TEGRA186_AON_GPIO_PORT (V ,0 ,4 ,8 ), +TEGRA186_AON_GPIO_PORT (W ,0 ,5 ,8 ), +TEGRA186_AON_GPIO_PORT (Z ,0 ,7 ,4 ), +TEGRA186_AON_GPIO_PORT (AA ,0 ,6 ,8 ), +TEGRA186_AON_GPIO_PORT (EE ,0 ,3 ,3 ), +TEGRA186_AON_GPIO_PORT (FF ,0 ,0 ,5 ), };static const struct tegra_gpio_soc tegra186_aon_soc = {@@ -648,43 +653,43 @@ static const struct tegra_gpio_soc tegra186_aon_soc = { .instance = 1, }; -#define TEGRA194_MAIN_GPIO_PORT (port, base, count, controller) \ - [TEGRA194_MAIN_GPIO_PORT_##port] = { \ - .name = #port, \ - .offset = base, \ - .pins = count, \ - .irq = controller, \ +#define TEGRA194_MAIN_GPIO_PORT (_name, _bank, _port, _pins) \ + [TEGRA194_MAIN_GPIO_PORT_##_name] = { \ + .name = #_name, \ + .bank = _bank, \ + .port = _port, \ + .pins = _pins, \ }static const struct tegra_gpio_port tegra194_main_ports[] = { -TEGRA194_MAIN_GPIO_PORT (A ,0x1400 ,8 ,1 ), -TEGRA194_MAIN_GPIO_PORT (B ,0x4e00 ,2 ,4 ), -TEGRA194_MAIN_GPIO_PORT (C ,0x4600 ,8 ,4 ), -TEGRA194_MAIN_GPIO_PORT (D ,0x4800 ,4 ,4 ), -TEGRA194_MAIN_GPIO_PORT (E ,0x4a00 ,8 ,4 ), -TEGRA194_MAIN_GPIO_PORT (F ,0x4c00 ,6 ,4 ), -TEGRA194_MAIN_GPIO_PORT (G ,0x4000 ,8 ,4 ), -TEGRA194_MAIN_GPIO_PORT (H ,0x4200 ,8 ,4 ), -TEGRA194_MAIN_GPIO_PORT (I ,0x4400 ,5 ,4 ), -TEGRA194_MAIN_GPIO_PORT (J ,0x5200 ,6 ,5 ), -TEGRA194_MAIN_GPIO_PORT (K ,0x3000 ,8 ,3 ), -TEGRA194_MAIN_GPIO_PORT (L ,0x3200 ,4 ,3 ), -TEGRA194_MAIN_GPIO_PORT (M ,0x2600 ,8 ,2 ), -TEGRA194_MAIN_GPIO_PORT (N ,0x2800 ,3 ,2 ), -TEGRA194_MAIN_GPIO_PORT (O ,0x5000 ,6 ,5 ), -TEGRA194_MAIN_GPIO_PORT (P ,0x2a00 ,8 ,2 ), -TEGRA194_MAIN_GPIO_PORT (Q ,0x2c00 ,8 ,2 ), -TEGRA194_MAIN_GPIO_PORT (R ,0x2e00 ,6 ,2 ), -TEGRA194_MAIN_GPIO_PORT (S ,0x3600 ,8 ,3 ), -TEGRA194_MAIN_GPIO_PORT (T ,0x3800 ,8 ,3 ), -TEGRA194_MAIN_GPIO_PORT (U ,0x3a00 ,1 ,3 ), -TEGRA194_MAIN_GPIO_PORT (V ,0x1000 ,8 ,1 ), -TEGRA194_MAIN_GPIO_PORT (W ,0x1200 ,2 ,1 ), -TEGRA194_MAIN_GPIO_PORT (X ,0x2000 ,8 ,2 ), -TEGRA194_MAIN_GPIO_PORT (Y ,0x2200 ,8 ,2 ), -TEGRA194_MAIN_GPIO_PORT (Z ,0x2400 ,8 ,2 ), -TEGRA194_MAIN_GPIO_PORT (FF ,0x3400 ,2 ,3 ), -TEGRA194_MAIN_GPIO_PORT (GG ,0x0000 ,2 ,0 ) +TEGRA194_MAIN_GPIO_PORT (A ,1 ,2 ,8 ), +TEGRA194_MAIN_GPIO_PORT (B ,4 ,7 ,2 ), +TEGRA194_MAIN_GPIO_PORT (C ,4 ,3 ,8 ), +TEGRA194_MAIN_GPIO_PORT (D ,4 ,4 ,4 ), +TEGRA194_MAIN_GPIO_PORT (E ,4 ,5 ,8 ), +TEGRA194_MAIN_GPIO_PORT (F ,4 ,6 ,6 ), +TEGRA194_MAIN_GPIO_PORT (G ,4 ,0 ,8 ), +TEGRA194_MAIN_GPIO_PORT (H ,4 ,1 ,8 ), +TEGRA194_MAIN_GPIO_PORT (I ,4 ,2 ,5 ), +TEGRA194_MAIN_GPIO_PORT (J ,5 ,1 ,6 ), +TEGRA194_MAIN_GPIO_PORT (K ,3 ,0 ,8 ), +TEGRA194_MAIN_GPIO_PORT (L ,3 ,1 ,4 ), +TEGRA194_MAIN_GPIO_PORT (M ,2 ,3 ,8 ), +TEGRA194_MAIN_GPIO_PORT (N ,2 ,4 ,3 ), +TEGRA194_MAIN_GPIO_PORT (O ,5 ,0 ,6 ), +TEGRA194_MAIN_GPIO_PORT (P ,2 ,5 ,8 ), +TEGRA194_MAIN_GPIO_PORT (Q ,2 ,6 ,8 ), +TEGRA194_MAIN_GPIO_PORT (R ,2 ,7 ,6 ), +TEGRA194_MAIN_GPIO_PORT (S ,3 ,3 ,8 ), +TEGRA194_MAIN_GPIO_PORT (T ,3 ,4 ,8 ), +TEGRA194_MAIN_GPIO_PORT (U ,3 ,5 ,1 ), +TEGRA194_MAIN_GPIO_PORT (V ,1 ,0 ,8 ), +TEGRA194_MAIN_GPIO_PORT (W ,1 ,1 ,2 ), +TEGRA194_MAIN_GPIO_PORT (X ,2 ,0 ,8 ), +TEGRA194_MAIN_GPIO_PORT (Y ,2 ,1 ,8 ), +TEGRA194_MAIN_GPIO_PORT (Z ,2 ,2 ,8 ), +TEGRA194_MAIN_GPIO_PORT (FF ,3 ,2 ,2 ), +TEGRA194_MAIN_GPIO_PORT (GG ,0 ,0 ,2 ) };static const struct tegra_gpio_soc tegra194_main_soc = {@@ -694,20 +699,20 @@ static const struct tegra_gpio_soc tegra194_main_soc = { .instance = 0, }; -#define TEGRA194_AON_GPIO_PORT (port, base, count, controller) \ - [TEGRA194_AON_GPIO_PORT_##port] = { \ - .name = #port, \ - .offset = base, \ - .pins = count, \ - .irq = controller, \ +#define TEGRA194_AON_GPIO_PORT (_name, _bank, _port, _pins) \ + [TEGRA194_AON_GPIO_PORT_##_name] = { \ + .name = #_name, \ + .bank = _bank, \ + .port = _port, \ + .pins = _pins, \ }static const struct tegra_gpio_port tegra194_aon_ports[] = { -TEGRA194_AON_GPIO_PORT (AA ,0x0600 ,8 ,0 ), -TEGRA194_AON_GPIO_PORT (BB ,0x0800 ,4 ,0 ), -TEGRA194_AON_GPIO_PORT (CC ,0x0200 ,8 ,0 ), -TEGRA194_AON_GPIO_PORT (DD ,0x0400 ,3 ,0 ), -TEGRA194_AON_GPIO_PORT (EE ,0x0000 ,7 ,0 ) +TEGRA194_AON_GPIO_PORT (AA ,0 ,3 ,8 ), +TEGRA194_AON_GPIO_PORT (BB ,0 ,4 ,4 ), +TEGRA194_AON_GPIO_PORT (CC ,0 ,1 ,8 ), +TEGRA194_AON_GPIO_PORT (DD ,0 ,2 ,3 ), +TEGRA194_AON_GPIO_PORT (EE ,0 ,0 ,7 ) };static const struct tegra_gpio_soc tegra194_aon_soc = { --
Quoted 2 lines
2.23.0
All three applied, thanks!
Bartosz