Commit 7a3868bd authored by Mike Dean's avatar Mike Dean
Browse files

Fixed device tree issue which caused conflict with LCD driver for SOM-150ES.

parent 5d9a7913
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
cpld: ecoreex@60000000 { cpld: ecoreex@60000000 {
compatible = "ecoreex"; compatible = "ecoreex";
pinctrl-0 = <&pinctrl_smc &pinctrl_pck0_as_cpld_clk>; /* pinctrl-0 = <&pinctrl_smc &pinctrl_pck0_as_cpld_clk>; */
pinctrl-names = "default"; pinctrl-names = "default";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -246,6 +246,8 @@ ...@@ -246,6 +246,8 @@
}; };
lcd: lcd@60001000 { lcd: lcd@60001000 {
compatible = "emac,lcd"; compatible = "emac,lcd";
pinctrl-0 = <&pinctrl_smc>;
pinctrl-names = "default";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
reg = <0x60001000 0x10>; reg = <0x60001000 0x10>;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment