projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
dm8148-evm.dts
diff --git
a/arch/arm/boot/dts/dm8148-evm.dts
b/arch/arm/boot/dts/dm8148-evm.dts
index
4128fa9
..
d6657b3
100644
(file)
--- a/
arch/arm/boot/dts/dm8148-evm.dts
+++ b/
arch/arm/boot/dts/dm8148-evm.dts
@@
-12,13
+12,13
@@
model = "DM8148 EVM";
compatible = "ti,dm8148-evm", "ti,dm8148";
model = "DM8148 EVM";
compatible = "ti,dm8148-evm", "ti,dm8148";
- memory {
+ memory
@80000000
{
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};
/* MIC94060YC6 controlled by SD1_POW pin */
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};
/* MIC94060YC6 controlled by SD1_POW pin */
- vmmcsd_fixed: fixedregulator
@
0 {
+ vmmcsd_fixed: fixedregulator0 {
compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>;
compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>;