Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Linux-Kernel
Linux AT91
Commits
7a3868bd
Commit
7a3868bd
authored
Apr 10, 2015
by
Mike Dean
Browse files
Fixed device tree issue which caused conflict with LCD driver for SOM-150ES.
parent
5d9a7913
Changes
1
Hide whitespace changes
Inline
Side-by-side
arch/arm/boot/dts/som-a5d35-150es.dts
View file @
7a3868bd
...
...
@@ -236,7 +236,7 @@
cpld
:
ecoreex
@
60000000
{
compatible
=
"ecoreex"
;
pinctrl
-
0
=
<&
pinctrl_smc
&
pinctrl_pck0_as_cpld_clk
>;
/*
pinctrl
-
0
=
<&
pinctrl_smc
&
pinctrl_pck0_as_cpld_clk
>;
*/
pinctrl
-
names
=
"default"
;
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
...
...
@@ -246,6 +246,8 @@
};
lcd
:
lcd
@
60001000
{
compatible
=
"emac,lcd"
;
pinctrl
-
0
=
<&
pinctrl_smc
>;
pinctrl
-
names
=
"default"
;
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
reg
=
<
0x60001000
0x10
>;
...
...
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