From f3f94f71a88343d3c1af63e32fc7ea74ab4ce7eb Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Sat, 16 May 2015 01:54:58 +0200 Subject: [PATCH] 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 Signed-off-by: Sebastian Hesselbarth --- arch/arm/boot/dts/berlin2.dtsi | 4 ++-- arch/arm/boot/dts/berlin2cd.dtsi | 4 ++-- arch/arm/boot/dts/berlin2q.dtsi | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi index b2ffaf4..4d2f527 100644 --- a/arch/arm/boot/dts/berlin2.dtsi +++ b/arch/arm/boot/dts/berlin2.dtsi @@ -351,7 +351,7 @@ }; chip: chip-control@ea0000 { - compatible = "marvell,berlin2-chip-ctrl", "simple-mfd", "syscon"; + compatible = "simple-mfd", "syscon"; reg = <0xea0000 0x400>; chip_clk: clock { @@ -454,7 +454,7 @@ }; sysctrl: system-controller@d000 { - compatible = "marvell,berlin2-system-ctrl", "simple-mfd", "syscon"; + compatible = "simple-mfd", "syscon"; reg = <0xd000 0x100>; sys_pinctrl: pin-controller { diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi index 6ff0194..0a70d47 100644 --- a/arch/arm/boot/dts/berlin2cd.dtsi +++ b/arch/arm/boot/dts/berlin2cd.dtsi @@ -295,7 +295,7 @@ }; chip: chip-control@ea0000 { - compatible = "marvell,berlin2cd-chip-ctrl", "simple-mfd", "syscon"; + compatible = "simple-mfd", "syscon"; reg = <0xea0000 0x400>; chip_clk: clock { @@ -401,7 +401,7 @@ }; sysctrl: system-controller@d000 { - compatible = "marvell,berlin2cd-system-ctrl", "simple-mfd", "syscon"; + compatible = "simple-mfd", "syscon"; reg = <0xd000 0x100>; sys_pinctrl: pin-controller { diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi index 97ec09a..83ecfbea 100644 --- a/arch/arm/boot/dts/berlin2q.dtsi +++ b/arch/arm/boot/dts/berlin2q.dtsi @@ -360,7 +360,7 @@ }; chip: chip-control@ea0000 { - compatible = "marvell,berlin2q-chip-ctrl", "simple-mfd", "syscon"; + compatible = "simple-mfd", "syscon"; reg = <0xea0000 0x400>, <0xdd0170 0x10>; chip_clk: clock { @@ -538,7 +538,7 @@ }; sysctrl: pin-controller@d000 { - compatible = "marvell,berlin2q-system-ctrl", "simple-mfd", "syscon"; + compatible = "simple-mfd", "syscon"; reg = <0xd000 0x100>; sys_pinctrl: pin-controller { -- 2.7.4