Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
110e2a38
Commit
110e2a38
authored
Dec 07, 2017
by
Linus Walleij
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ib-move-axp209' into devel
parents
4070a534
e1190083
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
534 additions
and
197 deletions
+534
-197
Documentation/devicetree/bindings/gpio/gpio-axp209.txt
Documentation/devicetree/bindings/gpio/gpio-axp209.txt
+47
-2
drivers/gpio/Kconfig
drivers/gpio/Kconfig
+0
-6
drivers/gpio/Makefile
drivers/gpio/Makefile
+0
-1
drivers/gpio/gpio-axp209.c
drivers/gpio/gpio-axp209.c
+0
-188
drivers/pinctrl/Kconfig
drivers/pinctrl/Kconfig
+10
-0
drivers/pinctrl/Makefile
drivers/pinctrl/Makefile
+1
-0
drivers/pinctrl/pinctrl-axp209.c
drivers/pinctrl/pinctrl-axp209.c
+476
-0
No files found.
Documentation/devicetree/bindings/gpio/gpio-axp209.txt
View file @
110e2a38
AXP209 GPIO controller
AXP209 GPIO
& pinctrl
controller
This driver follows the usual GPIO bindings found in
This driver follows the usual GPIO bindings found in
Documentation/devicetree/bindings/gpio/gpio.txt
Documentation/devicetree/bindings/gpio/gpio.txt
This driver follows the usual pinctrl bindings found in
Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
This driver employs the per-pin muxing pattern.
Required properties:
Required properties:
- compatible: Should be "x-powers,axp209-gpio"
- compatible: Should be one of:
- "x-powers,axp209-gpio"
- "x-powers,axp813-gpio"
- #gpio-cells: Should be two. The first cell is the pin number and the
- #gpio-cells: Should be two. The first cell is the pin number and the
second is the GPIO flags.
second is the GPIO flags.
- gpio-controller: Marks the device node as a GPIO controller.
- gpio-controller: Marks the device node as a GPIO controller.
...
@@ -28,3 +35,41 @@ axp209: pmic@34 {
...
@@ -28,3 +35,41 @@ axp209: pmic@34 {
#gpio-cells = <2>;
#gpio-cells = <2>;
};
};
};
};
The GPIOs can be muxed to other functions and therefore, must be a subnode of
axp_gpio.
Example:
&axp_gpio {
gpio0_adc: gpio0-adc {
pins = "GPIO0";
function = "adc";
};
};
&example_node {
pinctrl-names = "default";
pinctrl-0 = <&gpio0_adc>;
};
GPIOs and their functions
-------------------------
Each GPIO is independent from the other (i.e. GPIO0 in gpio_in function does
not force GPIO1 and GPIO2 to be in gpio_in function as well).
axp209
------
GPIO | Functions
------------------------
GPIO0 | gpio_in, gpio_out, ldo, adc
GPIO1 | gpio_in, gpio_out, ldo, adc
GPIO2 | gpio_in, gpio_out
axp813
------
GPIO | Functions
------------------------
GPIO0 | gpio_in, gpio_out, ldo, adc
GPIO1 | gpio_in, gpio_out, ldo
drivers/gpio/Kconfig
View file @
110e2a38
...
@@ -122,12 +122,6 @@ config GPIO_ATH79
...
@@ -122,12 +122,6 @@ config GPIO_ATH79
Select this option to enable GPIO driver for
Select this option to enable GPIO driver for
Atheros AR71XX/AR724X/AR913X SoC devices.
Atheros AR71XX/AR724X/AR913X SoC devices.
config GPIO_AXP209
tristate "X-Powers AXP209 PMIC GPIO Support"
depends on MFD_AXP20X
help
Say yes to enable GPIO support for the AXP209 PMIC
config GPIO_BCM_KONA
config GPIO_BCM_KONA
bool "Broadcom Kona GPIO"
bool "Broadcom Kona GPIO"
depends on OF_GPIO && (ARCH_BCM_MOBILE || COMPILE_TEST)
depends on OF_GPIO && (ARCH_BCM_MOBILE || COMPILE_TEST)
...
...
drivers/gpio/Makefile
View file @
110e2a38
...
@@ -32,7 +32,6 @@ obj-$(CONFIG_GPIO_AMDPT) += gpio-amdpt.o
...
@@ -32,7 +32,6 @@ obj-$(CONFIG_GPIO_AMDPT) += gpio-amdpt.o
obj-$(CONFIG_GPIO_ARIZONA)
+=
gpio-arizona.o
obj-$(CONFIG_GPIO_ARIZONA)
+=
gpio-arizona.o
obj-$(CONFIG_GPIO_ATH79)
+=
gpio-ath79.o
obj-$(CONFIG_GPIO_ATH79)
+=
gpio-ath79.o
obj-$(CONFIG_GPIO_ASPEED)
+=
gpio-aspeed.o
obj-$(CONFIG_GPIO_ASPEED)
+=
gpio-aspeed.o
obj-$(CONFIG_GPIO_AXP209)
+=
gpio-axp209.o
obj-$(CONFIG_GPIO_BCM_KONA)
+=
gpio-bcm-kona.o
obj-$(CONFIG_GPIO_BCM_KONA)
+=
gpio-bcm-kona.o
obj-$(CONFIG_GPIO_BD9571MWV)
+=
gpio-bd9571mwv.o
obj-$(CONFIG_GPIO_BD9571MWV)
+=
gpio-bd9571mwv.o
obj-$(CONFIG_GPIO_BRCMSTB)
+=
gpio-brcmstb.o
obj-$(CONFIG_GPIO_BRCMSTB)
+=
gpio-brcmstb.o
...
...
drivers/gpio/gpio-axp209.c
deleted
100644 → 0
View file @
4070a534
/*
* AXP20x GPIO driver
*
* Copyright (C) 2016 Maxime Ripard <maxime.ripard@free-electrons.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
#include <linux/bitops.h>
#include <linux/device.h>
#include <linux/gpio/driver.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/mfd/axp20x.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/regmap.h>
#include <linux/slab.h>
#define AXP20X_GPIO_FUNCTIONS 0x7
#define AXP20X_GPIO_FUNCTION_OUT_LOW 0
#define AXP20X_GPIO_FUNCTION_OUT_HIGH 1
#define AXP20X_GPIO_FUNCTION_INPUT 2
struct
axp20x_gpio
{
struct
gpio_chip
chip
;
struct
regmap
*
regmap
;
};
static
int
axp20x_gpio_get_reg
(
unsigned
offset
)
{
switch
(
offset
)
{
case
0
:
return
AXP20X_GPIO0_CTRL
;
case
1
:
return
AXP20X_GPIO1_CTRL
;
case
2
:
return
AXP20X_GPIO2_CTRL
;
}
return
-
EINVAL
;
}
static
int
axp20x_gpio_input
(
struct
gpio_chip
*
chip
,
unsigned
offset
)
{
struct
axp20x_gpio
*
gpio
=
gpiochip_get_data
(
chip
);
int
reg
;
reg
=
axp20x_gpio_get_reg
(
offset
);
if
(
reg
<
0
)
return
reg
;
return
regmap_update_bits
(
gpio
->
regmap
,
reg
,
AXP20X_GPIO_FUNCTIONS
,
AXP20X_GPIO_FUNCTION_INPUT
);
}
static
int
axp20x_gpio_get
(
struct
gpio_chip
*
chip
,
unsigned
offset
)
{
struct
axp20x_gpio
*
gpio
=
gpiochip_get_data
(
chip
);
unsigned
int
val
;
int
ret
;
ret
=
regmap_read
(
gpio
->
regmap
,
AXP20X_GPIO20_SS
,
&
val
);
if
(
ret
)
return
ret
;
return
!!
(
val
&
BIT
(
offset
+
4
));
}
static
int
axp20x_gpio_get_direction
(
struct
gpio_chip
*
chip
,
unsigned
offset
)
{
struct
axp20x_gpio
*
gpio
=
gpiochip_get_data
(
chip
);
unsigned
int
val
;
int
reg
,
ret
;
reg
=
axp20x_gpio_get_reg
(
offset
);
if
(
reg
<
0
)
return
reg
;
ret
=
regmap_read
(
gpio
->
regmap
,
reg
,
&
val
);
if
(
ret
)
return
ret
;
/*
* This shouldn't really happen if the pin is in use already,
* or if it's not in use yet, it doesn't matter since we're
* going to change the value soon anyway. Default to output.
*/
if
((
val
&
AXP20X_GPIO_FUNCTIONS
)
>
2
)
return
0
;
/*
* The GPIO directions are the three lowest values.
* 2 is input, 0 and 1 are output
*/
return
val
&
2
;
}
static
int
axp20x_gpio_output
(
struct
gpio_chip
*
chip
,
unsigned
offset
,
int
value
)
{
struct
axp20x_gpio
*
gpio
=
gpiochip_get_data
(
chip
);
int
reg
;
reg
=
axp20x_gpio_get_reg
(
offset
);
if
(
reg
<
0
)
return
reg
;
return
regmap_update_bits
(
gpio
->
regmap
,
reg
,
AXP20X_GPIO_FUNCTIONS
,
value
?
AXP20X_GPIO_FUNCTION_OUT_HIGH
:
AXP20X_GPIO_FUNCTION_OUT_LOW
);
}
static
void
axp20x_gpio_set
(
struct
gpio_chip
*
chip
,
unsigned
offset
,
int
value
)
{
axp20x_gpio_output
(
chip
,
offset
,
value
);
}
static
int
axp20x_gpio_probe
(
struct
platform_device
*
pdev
)
{
struct
axp20x_dev
*
axp20x
=
dev_get_drvdata
(
pdev
->
dev
.
parent
);
struct
axp20x_gpio
*
gpio
;
int
ret
;
if
(
!
of_device_is_available
(
pdev
->
dev
.
of_node
))
return
-
ENODEV
;
if
(
!
axp20x
)
{
dev_err
(
&
pdev
->
dev
,
"Parent drvdata not set
\n
"
);
return
-
EINVAL
;
}
gpio
=
devm_kzalloc
(
&
pdev
->
dev
,
sizeof
(
*
gpio
),
GFP_KERNEL
);
if
(
!
gpio
)
return
-
ENOMEM
;
gpio
->
chip
.
base
=
-
1
;
gpio
->
chip
.
can_sleep
=
true
;
gpio
->
chip
.
parent
=
&
pdev
->
dev
;
gpio
->
chip
.
label
=
dev_name
(
&
pdev
->
dev
);
gpio
->
chip
.
owner
=
THIS_MODULE
;
gpio
->
chip
.
get
=
axp20x_gpio_get
;
gpio
->
chip
.
get_direction
=
axp20x_gpio_get_direction
;
gpio
->
chip
.
set
=
axp20x_gpio_set
;
gpio
->
chip
.
direction_input
=
axp20x_gpio_input
;
gpio
->
chip
.
direction_output
=
axp20x_gpio_output
;
gpio
->
chip
.
ngpio
=
3
;
gpio
->
regmap
=
axp20x
->
regmap
;
ret
=
devm_gpiochip_add_data
(
&
pdev
->
dev
,
&
gpio
->
chip
,
gpio
);
if
(
ret
)
{
dev_err
(
&
pdev
->
dev
,
"Failed to register GPIO chip
\n
"
);
return
ret
;
}
dev_info
(
&
pdev
->
dev
,
"AXP209 GPIO driver loaded
\n
"
);
return
0
;
}
static
const
struct
of_device_id
axp20x_gpio_match
[]
=
{
{
.
compatible
=
"x-powers,axp209-gpio"
},
{
}
};
MODULE_DEVICE_TABLE
(
of
,
axp20x_gpio_match
);
static
struct
platform_driver
axp20x_gpio_driver
=
{
.
probe
=
axp20x_gpio_probe
,
.
driver
=
{
.
name
=
"axp20x-gpio"
,
.
of_match_table
=
axp20x_gpio_match
,
},
};
module_platform_driver
(
axp20x_gpio_driver
);
MODULE_AUTHOR
(
"Maxime Ripard <maxime.ripard@free-electrons.com>"
);
MODULE_DESCRIPTION
(
"AXP20x PMIC GPIO driver"
);
MODULE_LICENSE
(
"GPL"
);
drivers/pinctrl/Kconfig
View file @
110e2a38
...
@@ -63,6 +63,16 @@ config PINCTRL_AS3722
...
@@ -63,6 +63,16 @@ config PINCTRL_AS3722
open drain configuration for the GPIO pins of AS3722 devices. It also
open drain configuration for the GPIO pins of AS3722 devices. It also
supports the GPIO functionality through gpiolib.
supports the GPIO functionality through gpiolib.
config PINCTRL_AXP209
tristate "X-Powers AXP209 PMIC pinctrl and GPIO Support"
depends on MFD_AXP20X
help
AXP PMICs provides multiple GPIOs that can be muxed for different
functions. This driver bundles a pinctrl driver to select the function
muxing and a GPIO driver to handle the GPIO when the GPIO function is
selected.
Say yes to enable pinctrl and GPIO support for the AXP209 PMIC
config PINCTRL_BF54x
config PINCTRL_BF54x
def_bool y if BF54x
def_bool y if BF54x
select PINCTRL_ADI2
select PINCTRL_ADI2
...
...
drivers/pinctrl/Makefile
View file @
110e2a38
...
@@ -11,6 +11,7 @@ obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o
...
@@ -11,6 +11,7 @@ obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o
obj-$(CONFIG_PINCTRL_ADI2)
+=
pinctrl-adi2.o
obj-$(CONFIG_PINCTRL_ADI2)
+=
pinctrl-adi2.o
obj-$(CONFIG_PINCTRL_ARTPEC6)
+=
pinctrl-artpec6.o
obj-$(CONFIG_PINCTRL_ARTPEC6)
+=
pinctrl-artpec6.o
obj-$(CONFIG_PINCTRL_AS3722)
+=
pinctrl-as3722.o
obj-$(CONFIG_PINCTRL_AS3722)
+=
pinctrl-as3722.o
obj-$(CONFIG_PINCTRL_AXP209)
+=
pinctrl-axp209.o
obj-$(CONFIG_PINCTRL_BF54x)
+=
pinctrl-adi2-bf54x.o
obj-$(CONFIG_PINCTRL_BF54x)
+=
pinctrl-adi2-bf54x.o
obj-$(CONFIG_PINCTRL_BF60x)
+=
pinctrl-adi2-bf60x.o
obj-$(CONFIG_PINCTRL_BF60x)
+=
pinctrl-adi2-bf60x.o
obj-$(CONFIG_PINCTRL_AT91)
+=
pinctrl-at91.o
obj-$(CONFIG_PINCTRL_AT91)
+=
pinctrl-at91.o
...
...
drivers/pinctrl/pinctrl-axp209.c
0 → 100644
View file @
110e2a38
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment