diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-05 18:19:47 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-05 18:19:47 -0400 |
commit | 54869e0811b341f95458c509fd565e3c4bab6a01 (patch) | |
tree | 7d7f069b874bcf90ec1fd53e2a30756ad92c1159 /arch/arm/dts/bcm2835-rpi-a-plus.dts | |
parent | 1f83431f0053f6fb20c511c391ffc687433848cf (diff) | |
parent | 38e58ff2b785b45e8c8ade8e23f916a1984016c6 (diff) |
Merge tag 'rpi-next-2019.07' of https://github.com/mbgg/u-boot
- fix complation error for CONFIG_USB
- update RPi3 DTBs to v5.1-rc6 state
- add defconfig for RPi3 B+
- Fix BCM2835_MBOX_TAG_TEST_PIXEL_ORDER define
Diffstat (limited to 'arch/arm/dts/bcm2835-rpi-a-plus.dts')
-rw-r--r-- | arch/arm/dts/bcm2835-rpi-a-plus.dts | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/dts/bcm2835-rpi-a-plus.dts b/arch/arm/dts/bcm2835-rpi-a-plus.dts index 9f866491ef..db8a6017f2 100644 --- a/arch/arm/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/dts/bcm2835-rpi-a-plus.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /dts-v1/; #include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" @@ -9,12 +10,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"; }; @@ -30,8 +31,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", @@ -100,6 +101,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>; |