History

Merge branch 'ib-pca953x-config' into devel

Linus Walleij committed 7 years ago

Commit 92de6bc2 parents 5340f23 15add068 files · +127 −18Browse files

Showing the changes to include/linux (2 of 8 files). Show all

Unified · Split

2 files
  1. include/linux/gpio/machine.h +2 −0
  2. include/linux/of_gpio.h +2 −0
include/linux/gpio/machine.h+2−0
@@ -12,6 +12,8 @@ enum gpio_lookup_flags { · 11 unmodified lines
1212 GPIO_OPEN_SOURCE = (1 << 2),
1313 GPIO_PERSISTENT = (0 << 3),
1414 GPIO_TRANSITORY = (1 << 3),
15+ GPIO_PULL_UP = (1 << 4),
16+ GPIO_PULL_DOWN = (1 << 5),
1517 };
1618
1719 /**
include/linux/of_gpio.h+2−0
@@ -28,6 +28,8 @@ enum of_gpio_flags { · 27 unmodified lines
2828 OF_GPIO_SINGLE_ENDED = 0x2,
2929 OF_GPIO_OPEN_DRAIN = 0x4,
3030 OF_GPIO_TRANSITORY = 0x8,
31+ OF_GPIO_PULL_UP = 0x10,
32+ OF_GPIO_PULL_DOWN = 0x20,
3133 };
3234
3335 #ifdef CONFIG_OF_GPIO

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t