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

Commit 43225728 authored by Antoine Tenart's avatar Antoine Tenart Committed by Sebastian Hesselbarth
Browse files

ARM: berlin: move reset to simple-mfd nodes 



Now with a proper platform driver for reset and simple-mfd, move to
the new marvell,berlin-reset node.

Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
parent aed6f3ca

arch/arm/boot/dts/berlin2.dtsi

+5 −1
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ 
		chip: chip-control@ea0000 {

			compatible = "marvell,berlin2-chip-ctrl", "simple-mfd", "syscon";

			#clock-cells = <1>;

			#reset-cells = <2>;

			reg = <0xea0000 0x400>;

			clocks = <&refclk>;

			clock-names = "refclk";
@@ -362,6 +361,11 @@ 
				groups = "G26";

				function = "emmc";

			};



			chip_rst: reset {

				compatible = "marvell,berlin2-reset";

				#reset-cells = <2>;

			};

		};



		apb@fc0000 {

arch/arm/boot/dts/berlin2cd.dtsi

+7 −3
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 
			compatible = "marvell,berlin2cd-usb-phy";

			reg = <0xb74000 0x128>;

			#phy-cells = <0>;

			resets = <&chip 0x178 23>;

			resets = <&chip_rst 0x178 23>;

			status = "disabled";

		};
@@ -92,7 +92,7 @@ 
			compatible = "marvell,berlin2cd-usb-phy";

			reg = <0xb78000 0x128>;

			#phy-cells = <0>;

			resets = <&chip 0x178 24>;

			resets = <&chip_rst 0x178 24>;

			status = "disabled";

		};
@@ -297,7 +297,6 @@ 
		chip: chip-control@ea0000 {

			compatible = "marvell,berlin2cd-chip-ctrl", "simple-mfd", "syscon";

			#clock-cells = <1>;

			#reset-cells = <2>;

			reg = <0xea0000 0x400>;

			clocks = <&refclk>;

			clock-names = "refclk";
@@ -306,6 +305,11 @@ 
				groups = "G6";

				function = "uart0";

			};



			chip_rst: reset {

				compatible = "marvell,berlin2-reset";

				#reset-cells = <2>;

			};

		};



		usb0: usb@ed0000 {

arch/arm/boot/dts/berlin2q.dtsi

+8 −4
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
			compatible = "marvell,berlin2-usb-phy";

			reg = <0xa2f400 0x128>;

			#phy-cells = <0>;

			resets = <&chip 0x104 14>;

			resets = <&chip_rst 0x104 14>;

			status = "disabled";

		};
@@ -145,7 +145,7 @@ 
			compatible = "marvell,berlin2-usb-phy";

			reg = <0xb74000 0x128>;

			#phy-cells = <0>;

			resets = <&chip 0x104 12>;

			resets = <&chip_rst 0x104 12>;

			status = "disabled";

		};
@@ -153,7 +153,7 @@ 
			compatible = "marvell,berlin2-usb-phy";

			reg = <0xb78000 0x128>;

			#phy-cells = <0>;

			resets = <&chip 0x104 13>;

			resets = <&chip_rst 0x104 13>;

			status = "disabled";

		};
@@ -362,7 +362,6 @@ 
		chip: chip-control@ea0000 {

			compatible = "marvell,berlin2q-chip-ctrl", "simple-mfd", "syscon";

			#clock-cells = <1>;

			#reset-cells = <2>;

			reg = <0xea0000 0x400>, <0xdd0170 0x10>;

			clocks = <&refclk>;

			clock-names = "refclk";
@@ -376,6 +375,11 @@ 
				groups = "G7";

				function = "twsi1";

			};



			chip_rst: reset {

				compatible = "marvell,berlin2-reset";

				#reset-cells = <2>;

			};

		};



		ahci: sata@e90000 {