The chip and system controller nodes are now handled by the Berlin controller mfd driver. Its sub-devices are then registered by the mfd driver and let the drivers be probed properly, using their own sub-nodes.
Rework the device tree to take this changes into account. Signed-off-by: Antoine Tenart <antoine.ten...@free-electrons.com> --- arch/arm/boot/dts/berlin2.dtsi | 50 ++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi index 63d00a63cfa6..fbe5c6b6502d 100644 --- a/arch/arm/boot/dts/berlin2.dtsi +++ b/arch/arm/boot/dts/berlin2.dtsi @@ -350,17 +350,25 @@ }; }; - chip: chip-control@ea0000 { - compatible = "marvell,berlin2-chip-ctrl"; - #clock-cells = <1>; - #reset-cells = <2>; + chip: chip-controller@ea0000 { + compatible = "marvell,berlin2-chip-ctrl", "simple-mfd", "syscon"; reg = <0xea0000 0x400>; + #clock-cells = <1>; clocks = <&refclk>; clock-names = "refclk"; - emmc_pmux: emmc-pmux { - groups = "G26"; - function = "emmc"; + soc_pinctrl: pin-controller { + compatible = "marvell,berlin2-soc-pinctrl"; + + emmc_pmux: emmc-pmux { + groups = "G26"; + function = "emmc"; + }; + }; + + chip_rst: reset { + compatible = "marvell,berlin2-reset"; + #reset-cells = <2>; }; }; @@ -442,22 +450,26 @@ }; sysctrl: system-controller@d000 { - compatible = "marvell,berlin2-system-ctrl"; + compatible = "marvell,berlin2-system-ctrl", "simple-mfd", "syscon"; reg = <0xd000 0x100>; - uart0_pmux: uart0-pmux { - groups = "GSM4"; - function = "uart0"; - }; + sys_pinctrl: pin-controller { + compatible = "marvell,berlin2-system-pinctrl"; - uart1_pmux: uart1-pmux { - groups = "GSM5"; - function = "uart1"; - }; + uart0_pmux: uart0-pmux { + groups = "GSM4"; + function = "uart0"; + }; + + uart1_pmux: uart1-pmux { + groups = "GSM5"; + function = "uart1"; + }; - uart2_pmux: uart2-pmux { - groups = "GSM3"; - function = "uart2"; + uart2_pmux: uart2-pmux { + groups = "GSM3"; + function = "uart2"; + }; }; }; -- 2.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/