projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
omap34xx.dtsi
diff --git
a/arch/arm/boot/dts/omap34xx.dtsi
b/arch/arm/boot/dts/omap34xx.dtsi
index 7bc8c0f72ddb29c06ef9e31bd5897dcc865a46ab..4f6b2d5b1902e96114f12b1f8bd7d15ba0b9819e 100644
(file)
--- a/
arch/arm/boot/dts/omap34xx.dtsi
+++ b/
arch/arm/boot/dts/omap34xx.dtsi
@@
-46,7
+46,7
@@
0x480bd800 0x017c>;
interrupts = <24>;
iommus = <&mmu_isp>;
0x480bd800 0x017c>;
interrupts = <24>;
iommus = <&mmu_isp>;
- syscon = <&
omap3_scm_general
0xdc>;
+ syscon = <&
scm_conf
0xdc>;
ti,phy-type = <OMAP3ISP_PHY_TYPE_COMPLEX_IO>;
#clock-cells = <1>;
ports {
ti,phy-type = <OMAP3ISP_PHY_TYPE_COMPLEX_IO>;
#clock-cells = <1>;
ports {