git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
bcm2835-rpi-a-plus.dts
diff --git
a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
index db8a6017f220a2b737b5e0af002e9b1077572f03..6c8ce39833bf68345b93d2efeee54c4238115341 100644
(file)
--- a/
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@
-8,6
+8,11
@@
compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";
model = "Raspberry Pi Model A+";
compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";
model = "Raspberry Pi Model A+";
+ memory@0 {
+ device_type = "memory";
+ reg = <0 0x10000000>;
+ };
+
leds {
act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
leds {
act {
gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
@@
-99,6
+104,8
@@
&hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
&hdmi {
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
+ power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
+ status = "okay";
};
&pwm {
};
&pwm {
@@
-107,6
+114,13
@@
status = "okay";
};
status = "okay";
};
+&sdhost {
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdhost_gpio48>;
+ bus-width = <4>;
+ status = "okay";
+};
+
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_gpio14>;