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

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

ARM: berlin: remove useless chip and system ctrl compatibles

Now that the rework to have one sub-node per device in the chip and
system controllers is done, their dedicated compatible can be removed.

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

parent fd26031b

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", "simple-mfd", "syscon";		compatible = "simple-mfd", "syscon";
	reg = <0xea0000 0x400>;		reg = <0xea0000 0x400>;

	chip_clk: clock {		chip_clk: clock {
	@@ -454,7 +454,7 @@
	};		};

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

	sys_pinctrl: pin-controller {		sys_pinctrl: pin-controller {

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", "simple-mfd", "syscon";		compatible = "simple-mfd", "syscon";
	reg = <0xea0000 0x400>;		reg = <0xea0000 0x400>;

	chip_clk: clock {		chip_clk: clock {
	@@ -401,7 +401,7 @@
	};		};

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

	sys_pinctrl: pin-controller {		sys_pinctrl: pin-controller {

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", "simple-mfd", "syscon";		compatible = "simple-mfd", "syscon";
	reg = <0xea0000 0x400>, <0xdd0170 0x10>;		reg = <0xea0000 0x400>, <0xdd0170 0x10>;

	chip_clk: clock {		chip_clk: clock {
	@@ -538,7 +538,7 @@
	};		};

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

	sys_pinctrl: pin-controller {		sys_pinctrl: pin-controller {