Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffcc33a5 authored May 16, 2015 by Antoine Tenart Committed by Sebastian Hesselbarth May 18, 2015

ARM: berlin: prepare simple-mfd/syscon conversion of sys/chip ctrl nodes

The chip and system controller nodes will be handled by simple-mfd based
driver probing. Prepare the conversion by adding "simple-mfd" and "syscon"
compatibles to the corresponding nodes.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

parent 9f69e8a7

arch/arm/boot/dts/berlin2.dtsi

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -351,7 +351,7 @@
	};		};

	chip: chip-control@ea0000 {		chip: chip-control@ea0000 {
	compatible = "marvell,berlin2-chip-ctrl";		compatible = "marvell,berlin2-chip-ctrl", "simple-mfd", "syscon";
	#clock-cells = <1>;		#clock-cells = <1>;
	#reset-cells = <2>;		#reset-cells = <2>;
	reg = <0xea0000 0x400>;		reg = <0xea0000 0x400>;
	@@ -442,7 +442,7 @@
	};		};

	sysctrl: system-controller@d000 {		sysctrl: system-controller@d000 {
	compatible = "marvell,berlin2-system-ctrl";		compatible = "marvell,berlin2-system-ctrl", "simple-mfd", "syscon";
	reg = <0xd000 0x100>;		reg = <0xd000 0x100>;

	uart0_pmux: uart0-pmux {		uart0_pmux: uart0-pmux {

arch/arm/boot/dts/berlin2cd.dtsi

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -295,7 +295,7 @@
	};		};

	chip: chip-control@ea0000 {		chip: chip-control@ea0000 {
	compatible = "marvell,berlin2cd-chip-ctrl";		compatible = "marvell,berlin2cd-chip-ctrl", "simple-mfd", "syscon";
	#clock-cells = <1>;		#clock-cells = <1>;
	#reset-cells = <2>;		#reset-cells = <2>;
	reg = <0xea0000 0x400>;		reg = <0xea0000 0x400>;
	@@ -389,7 +389,7 @@
	};		};

	sysctrl: system-controller@d000 {		sysctrl: system-controller@d000 {
	compatible = "marvell,berlin2cd-system-ctrl";		compatible = "marvell,berlin2cd-system-ctrl", "simple-mfd", "syscon";
	reg = <0xd000 0x100>;		reg = <0xd000 0x100>;
	};		};

arch/arm/boot/dts/berlin2q.dtsi

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -360,7 +360,7 @@
	};		};

	chip: chip-control@ea0000 {		chip: chip-control@ea0000 {
	compatible = "marvell,berlin2q-chip-ctrl";		compatible = "marvell,berlin2q-chip-ctrl", "simple-mfd", "syscon";
	#clock-cells = <1>;		#clock-cells = <1>;
	#reset-cells = <2>;		#reset-cells = <2>;
	reg = <0xea0000 0x400>, <0xdd0170 0x10>;		reg = <0xea0000 0x400>, <0xdd0170 0x10>;
	@@ -526,7 +526,7 @@
	};		};

	sysctrl: pin-controller@d000 {		sysctrl: pin-controller@d000 {
	compatible = "marvell,berlin2q-system-ctrl";		compatible = "marvell,berlin2q-system-ctrl", "simple-mfd", "syscon";
	reg = <0xd000 0x100>;		reg = <0xd000 0x100>;

	uart0_pmux: uart0-pmux {		uart0_pmux: uart0-pmux {