Skip to content

Commit 6a9110f

Browse files
committed
Merge commit '5390130f3b288db7d67de5e6c29d0de70d327ff0' into fixes-v5.7
2 parents 9f872f9 + 5390130 commit 6a9110f

File tree

8 files changed

+820
-24
lines changed

8 files changed

+820
-24
lines changed

arch/arm/boot/dts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
832832
am57xx-beagle-x15.dtb \
833833
am57xx-beagle-x15-revb1.dtb \
834834
am57xx-beagle-x15-revc.dtb \
835+
am5729-beagleboneai.dtb \
835836
am57xx-cl-som-am57x.dtb \
836837
am57xx-sbc-am57x.dtb \
837838
am572x-idk.dtb \

arch/arm/boot/dts/am335x-guardian.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
ti,timers = <&timer7>;
106106
pinctrl-names = "default";
107107
pinctrl-0 = <&dmtimer7_pins>;
108+
ti,clock-source = <0x01>;
108109
};
109110

110111
vmmcsd_fixed: regulator-3v3 {

arch/arm/boot/dts/am3517-evm.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
pinctrl-0 = <&pwm_pins>;
157157
ti,timers = <&timer11>;
158158
#pwm-cells = <3>;
159+
ti,clock-source = <0x01>;
159160
};
160161

161162
/* HS USB Host PHY on PORT 1 */

0 commit comments

Comments
 (0)