Commit 6b457409 authored Dec 21, 2017 by Arnd Bergmann

Merge tag 'v4.15-rockchip-dts32fixes-1' of...

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

parents d2271826 912d7985

arch/arm/boot/dts/rk3066a-marsboard.dts

+4 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,10 @@
		};
		};

		&cpu0 {
		cpu0-supply = <&vdd_arm>;
		};

		&i2c1 {
		status = "okay";
		clock-frequency = <400000>;

arch/arm/boot/dts/rk3288.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -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";

Admin message