Merge tag 'rpi-next-2019.07' of https://github.com/mbgg/u-boot

[project/bcm63xx/u-boot.git] / arch / arm / dts / bcm2835-rpi-b-plus.dts

diff --git a/arch/arm/dts/bcm2835-rpi-b-plus.dts b/arch/arm/dts/bcm2835-rpi-b-plus.dts
index a846f1e781d8a30e2e0afeaed5e67c32005f9b97..1e40d672b05522c628e77eaf31b011f7d4341192 100644 (file)
--- a/arch/arm/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/dts/bcm2835-rpi-b-plus.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
@@ -10,12 +11,12 @@
 
        leds {
                act {
-                       gpios = <&gpio 47 0>;
+                       gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
                };
 
                pwr {
                        label = "PWR";
-                       gpios = <&gpio 35 0>;
+                       gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                        linux,default-trigger = "default-on";
                };
@@ -32,8 +33,8 @@
         * "FOO" = GPIO line named "FOO" on the schematic
         * "FOO_N" = GPIO line named "FOO" on schematic, active low
         */
-       gpio-line-names = "SDA0",
-                         "SCL0",
+       gpio-line-names = "ID_SDA",
+                         "ID_SCL",
                          "SDA1",
                          "SCL1",
                          "GPIO_GCLK",
@@ -102,6 +103,12 @@
        hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
 };
 
+&pwm {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
+       status = "okay";
+};
+
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_gpio14>;