Skip to content

Update DM-GPIO-Test.dts #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DerekMolloyDCU wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update DM-GPIO-Test.dts #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions overlay/DM-GPIO-Test.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,8 @@
0x030 0x27 /* P8_12 44 INPUT MODE7 pulldown - Green Wire */
0x024 0x2f /* P8_13 23 INPUT MODE7 none - White Wire */

<<<<<<< HEAD
/* OUTPUT GPIO(mode7) 0x07 pullup, 0x17 pulldown, 0x0f no pullup/down */
/* INPUT GPIO(mode7) 0x27 pullup, 0x37 pulldown, 0x2f no pullup/down */
=======
/* INPUT GPIO(mode7) 0x07 pulldown, 0x17 pullup, 0x?f no pullup/down */
/* OUTPUT GPIO(mode7) 0x27 pulldown, 0x37 pullup, 0x?f no pullup/down */
>>>>>>> f83cf685371044f2fbc8e8da09759bed24038367
>;
};
};
Expand Down