Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kernel
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Bryan O'Donoghue
Kernel
Commits
5d652410
Commit
5d652410
authored
6 years ago
by
TreeHugger Robot
Committed by
Android Partner Code Review
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge "darter: remove useless gpio key config" into android-msm-darter-3.18
parents
a43e4265
a84bf2ad
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
arch/arm/boot/dts/msm8909w-darter/msm8909-darter-mtp.dtsi
+0
-18
0 additions, 18 deletions
arch/arm/boot/dts/msm8909w-darter/msm8909-darter-mtp.dtsi
arch/arm/boot/dts/msm8909w-darter/msm8909-darter-pinctrl.dtsi
+4
-4
4 additions, 4 deletions
.../arm/boot/dts/msm8909w-darter/msm8909-darter-pinctrl.dtsi
with
4 additions
and
22 deletions
arch/arm/boot/dts/msm8909w-darter/msm8909-darter-mtp.dtsi
+
0
−
18
View file @
5d652410
...
...
@@ -174,24 +174,6 @@ gpio_keys {
pinctrl-0 = <&gpio_key_active>;
pinctrl-1 = <&gpio_key_suspend>;
camera_focus {
label = "camera_focus";
gpios = <&msm_gpio 91 0x1>;
linux,input-type = <1>;
linux,code = <0x210>;
gpio-key,wakeup;
debounce-interval = <15>;
};
camera_snapshot {
label = "camera_snapshot";
gpios = <&msm_gpio 92 0x1>;
linux,input-type = <1>;
linux,code = <0x2fe>;
gpio-key,wakeup;
debounce-interval = <15>;
};
stem_1 {
label = "STEM_1";
gpios = <&msm_gpio 90 0x1>;
...
...
This diff is collapsed.
Click to expand it.
arch/arm/boot/dts/msm8909w-darter/msm8909-darter-pinctrl.dtsi
+
4
−
4
View file @
5d652410
...
...
@@ -1007,12 +1007,12 @@ config {
tlmm_gpio_key {
gpio_key_active: gpio_key_active {
mux {
pins = "gpio90"
, "gpio91", "gpio92"
;
pins = "gpio90";
function = "gpio";
};
config {
pins = "gpio90"
, "gpio91", "gpio92"
;
pins = "gpio90";
drive-strength = <2>;
bias-pull-up;
};
...
...
@@ -1020,12 +1020,12 @@ config {
gpio_key_suspend: gpio_key_suspend {
mux {
pins = "gpio90"
, "gpio91", "gpio92"
;
pins = "gpio90";
function = "gpio";
};
config {
pins = "gpio90"
, "gpio91", "gpio92"
;
pins = "gpio90";
drive-strength = <2>;
bias-pull-up;
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment