hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed another trailing interrupt-cell 0 and added the cpu regulator 

on the rk3066a-marsboard to make it not fail from cpufreq changes.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAlosSE4QHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgRhMCACXcPJmWvjPRQwrpFrFOrHUfgsku46CFl2a
 AWmN5wGB2pStM1R/1HsfrfO0YXb5e9UESEwyQzb1/DEoAnES5aFrZqnuPSSHr/9W
 cZR8fDRk69cxMILdCy25xmWeAmhPTJUWTPwdhfSkINmf0+DcPehKr97xVyzEcVK3
 LMczvzPUSuipciQbVdR8bTkVy05ToHJctN+ri3Ux9SqrGZcW86W/v5mRnRVxxvXU
 NcdEIB1/IC9nHPYYRJbUvrEgLIzHt21KkS3GEmCI3kf4t7qsY28VkVfsoqrIQMA9
 /ennO0r6df+7sSzQXI25lERWMHk+gSSlq4z3jguI6b8NmAFBynMh
 =CZn2
 -----END PGP SIGNATURE-----

Merge tag 'v4.15-rockchip-dts32fixes-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

Pull "Rockchip dts32 fixes for 4.15" from Heiko Stübner:

Removed another trailing interrupt-cell 0 and added the cpu regulator
on the rk3066a-marsboard to make it not fail from cpufreq changes.

* tag 'v4.15-rockchip-dts32fixes-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: fix rk3288 iep-IOMMU interrupts property cells
  ARM: dts: rockchip: add cpu0-regulator on rk3066a-marsboard
This commit is contained in:
Arnd Bergmann 2017-12-21 16:59:19 +01:00
parent d2271826e5 912d7985f3
commit 6b45740916
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/rk3066a-marsboard.dts
View File

@ -83,6 +83,10 @@
};
};
&cpu0 {
cpu0-supply = <&vdd_arm>;
};
&i2c1 {
status = "okay";
clock-frequency = <400000>;

2
arch/arm/boot/dts/rk3288.dtsi
View File

@ -956,7 +956,7 @@
iep_mmu: iommu@ff900800 {
compatible = "rockchip,iommu";
reg = <0x0 0xff900800 0x0 0x40>;
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH 0>;
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "iep_mmu";
#iommu-cells = <0>;
status = "disabled";