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.dtsi | |
| 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.dtsi')
| -rw-r--r-- | arch/arm/dts/bcm2835.dtsi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/dts/bcm2835.dtsi b/arch/arm/dts/bcm2835.dtsi index 659b6e9513..a5c3824c80 100644 --- a/arch/arm/dts/bcm2835.dtsi +++ b/arch/arm/dts/bcm2835.dtsi @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include "bcm283x.dtsi" / { @@ -17,10 +18,10 @@ soc { ranges = <0x7e000000 0x20000000 0x02000000>; dma-ranges = <0x40000000 0x00000000 0x20000000>; + }; - arm-pmu { - compatible = "arm,arm1176-pmu"; - }; + arm-pmu { + compatible = "arm,arm1176-pmu"; }; }; |