arm64: dts: marvell: move AP806/CP110 thermal nodes into a new syscon (0863e01c) · Commits · 戴 / test

arch/arm64/boot/dts/marvell/armada-ap806.dtsi

+10 −4

Original line number	Diff line number	Diff line
		@@ -247,10 +247,16 @@
		};
		};

		ap_thermal: thermal@6f808c {
		ap_syscon1: system-controller@6f8000 {
		compatible = "syscon", "simple-mfd";
		reg = <0x6f8000 0x1000>;
		#address-cells = <1>;
		#size-cells = <1>;

		ap_thermal: thermal-sensor@80 {
		compatible = "marvell,armada-ap806-thermal";
		reg = <0x6f808c 0x4>,
		<0x6f8084 0x8>;
		reg = <0x80 0x10>;
		};
		};
		};
		};

+12 −6

Original line number	Diff line number	Diff line
		@@ -162,12 +162,6 @@
		interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>;
		};

		CP110_LABEL(thermal): thermal@400078 {
		compatible = "marvell,armada-cp110-thermal";
		reg = <0x400078 0x4>,
		<0x400070 0x8>;
		};

		CP110_LABEL(syscon0): system-controller@440000 {
		compatible = "syscon", "simple-mfd";
		reg = <0x440000 0x2000>;
		@@ -208,6 +202,18 @@
		};
		};

		CP110_LABEL(syscon1): system-controller@400000 {
		compatible = "syscon", "simple-mfd";
		reg = <0x400000 0x1000>;
		#address-cells = <1>;
		#size-cells = <1>;

		CP110_LABEL(thermal): thermal-sensor@70 {
		compatible = "marvell,armada-cp110-thermal";
		reg = <0x70 0x10>;
		};
		};

		CP110_LABEL(usb3_0): usb3@500000 {
		compatible = "marvell,armada-8k-xhci",
		"generic-xhci";