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 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
ste-ux500-samsung-janice.dts
diff --git
a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
index
25af066
..
f14cf31
100644
(file)
--- a/
arch/arm/boot/dts/ste-ux500-samsung-janice.dts
+++ b/
arch/arm/boot/dts/ste-ux500-samsung-janice.dts
@@
-420,6
+420,8
@@
non-removable;
cap-mmc-highspeed;
mmc-ddr-1_8v;
non-removable;
cap-mmc-highspeed;
mmc-ddr-1_8v;
+ no-sdio;
+ no-sd;
vmmc-supply = <&ldo_3v3_reg>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mc2_a_1_default>;
vmmc-supply = <&ldo_3v3_reg>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mc2_a_1_default>;
@@
-580,7
+582,7
@@
#size-cells = <0>;
/* Bosch BMA222 accelerometer */
#size-cells = <0>;
/* Bosch BMA222 accelerometer */
- accelerometer@
0
8 {
+ accelerometer@8 {
compatible = "bosch,bma222";
reg = <0x08>;
mount-matrix = "0", "1", "0",
compatible = "bosch,bma222";
reg = <0x08>;
mount-matrix = "0", "1", "0",