arm: rpi: Sync rpi dts files from Linux

[platform/kernel/u-boot.git] / arch / arm / dts / bcm2836-rpi-2-b.dts

diff --git a/arch/arm/dts/bcm2836-rpi-2-b.dts b/arch/arm/dts/bcm2836-rpi-2-b.dts
index 7b4e651..d8af8ee 100644 (file)
--- a/arch/arm/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/dts/bcm2836-rpi-2-b.dts
@@ -10,15 +10,16 @@
        model = "Raspberry Pi 2 Model B";
 
        memory@0 {
+               device_type = "memory";
                reg = <0 0x40000000>;
        };
 
        leds {
-               act {
+               led-act {
                        gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
                };
 
-               pwr {
+               led-pwr {
                        label = "PWR";
                        gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
@@ -105,6 +106,8 @@
 
 &hdmi {
        hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
+       power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
+       status = "okay";
 };
 
 &pwm {
@@ -113,6 +116,13 @@
        status = "okay";
 };
 
+&sdhost {
+       pinctrl-names = "default";
+       pinctrl-0 = <&sdhost_gpio48>;
+       bus-width = <4>;
+       status = "okay";
+};
+
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_gpio14>;