projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
imx6dl-yapp4-common.dtsi
diff --git
a/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
b/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
index
9148a01
..
cb8b539
100644
(file)
--- a/
arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
+++ b/
arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
@@
-11,6
+11,8
@@
aliases: aliases {
ethernet1 = ð1;
ethernet2 = ð2;
aliases: aliases {
ethernet1 = ð1;
ethernet2 = ð2;
+ mmc0 = &usdhc3;
+ mmc1 = &usdhc4;
};
backlight: backlight {
};
backlight: backlight {
@@
-345,6
+347,7
@@
solomon,height = <64>;
solomon,width = <128>;
solomon,page-offset = <0>;
solomon,height = <64>;
solomon,width = <128>;
solomon,page-offset = <0>;
+ solomon,col-offset = <4>;
solomon,prechargep2 = <15>;
reset-gpios = <&gpio_oled 1 GPIO_ACTIVE_LOW>;
vbat-supply = <&sw2_reg>;
solomon,prechargep2 = <15>;
reset-gpios = <&gpio_oled 1 GPIO_ACTIVE_LOW>;
vbat-supply = <&sw2_reg>;