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

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

ARM: berlin: move BG2CD clock node 



With the introduction of the Berlin simple-mfd controller driver, all
drivers previously sharing the chip and system controller nodes now
have their own sub-node.

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

arch/arm/boot/dts/berlin2cd.dtsi

+21 −17
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
		sdhci0: sdhci@ab0000 {

			compatible = "mrvl,pxav3-mmc";

			reg = <0xab0000 0x200>;

			clocks = <&chip CLKID_SDIO0XIN>, <&chip CLKID_SDIO0>;

			clocks = <&chip_clk CLKID_SDIO0XIN>, <&chip_clk CLKID_SDIO0>;

			clock-names = "io", "core";

			interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";
@@ -77,7 +77,7 @@ 
			compatible = "arm,cortex-a9-twd-timer";

			reg = <0xad0600 0x20>;

			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)>;

			clocks = <&chip CLKID_TWD>;

			clocks = <&chip_clk CLKID_TWD>;

		};



		usb_phy0: usb-phy@b74000 {
@@ -99,7 +99,7 @@ 
		eth1: ethernet@b90000 {

			compatible = "marvell,pxa168-eth";

			reg = <0xb90000 0x10000>;

			clocks = <&chip CLKID_GETH1>;

			clocks = <&chip_clk CLKID_GETH1>;

			interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;

			/* set by bootloader */

			local-mac-address = [00 00 00 00 00 00];
@@ -117,7 +117,7 @@ 
		eth0: ethernet@e50000 {

			compatible = "marvell,pxa168-eth";

			reg = <0xe50000 0x10000>;

			clocks = <&chip CLKID_GETH0>;

			clocks = <&chip_clk CLKID_GETH0>;

			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

			/* set by bootloader */

			local-mac-address = [00 00 00 00 00 00];
@@ -216,7 +216,7 @@ 
				compatible = "snps,dw-apb-timer";

				reg = <0x2c00 0x14>;

				interrupts = <8>;

				clocks = <&chip CLKID_CFG>;

				clocks = <&chip_clk CLKID_CFG>;

				clock-names = "timer";

				status = "okay";

			};
@@ -225,7 +225,7 @@ 
				compatible = "snps,dw-apb-timer";

				reg = <0x2c14 0x14>;

				interrupts = <9>;

				clocks = <&chip CLKID_CFG>;

				clocks = <&chip_clk CLKID_CFG>;

				clock-names = "timer";

				status = "okay";

			};
@@ -234,7 +234,7 @@ 
				compatible = "snps,dw-apb-timer";

				reg = <0x2c28 0x14>;

				interrupts = <10>;

				clocks = <&chip CLKID_CFG>;

				clocks = <&chip_clk CLKID_CFG>;

				clock-names = "timer";

				status = "disabled";

			};
@@ -243,7 +243,7 @@ 
				compatible = "snps,dw-apb-timer";

				reg = <0x2c3c 0x14>;

				interrupts = <11>;

				clocks = <&chip CLKID_CFG>;

				clocks = <&chip_clk CLKID_CFG>;

				clock-names = "timer";

				status = "disabled";

			};
@@ -252,7 +252,7 @@ 
				compatible = "snps,dw-apb-timer";

				reg = <0x2c50 0x14>;

				interrupts = <12>;

				clocks = <&chip CLKID_CFG>;

				clocks = <&chip_clk CLKID_CFG>;

				clock-names = "timer";

				status = "disabled";

			};
@@ -261,7 +261,7 @@ 
				compatible = "snps,dw-apb-timer";

				reg = <0x2c64 0x14>;

				interrupts = <13>;

				clocks = <&chip CLKID_CFG>;

				clocks = <&chip_clk CLKID_CFG>;

				clock-names = "timer";

				status = "disabled";

			};
@@ -270,7 +270,7 @@ 
				compatible = "snps,dw-apb-timer";

				reg = <0x2c78 0x14>;

				interrupts = <14>;

				clocks = <&chip CLKID_CFG>;

				clocks = <&chip_clk CLKID_CFG>;

				clock-names = "timer";

				status = "disabled";

			};
@@ -279,7 +279,7 @@ 
				compatible = "snps,dw-apb-timer";

				reg = <0x2c8c 0x14>;

				interrupts = <15>;

				clocks = <&chip CLKID_CFG>;

				clocks = <&chip_clk CLKID_CFG>;

				clock-names = "timer";

				status = "disabled";

			};
@@ -296,10 +296,14 @@ 


		chip: chip-control@ea0000 {

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

			#clock-cells = <1>;

			reg = <0xea0000 0x400>;



			chip_clk: clock {

				compatible = "marvell,berlin2-clk";

				#clock-cells = <1>;

				clocks = <&refclk>;

				clock-names = "refclk";

			};



			soc_pinctrl: pin-controller {

				compatible = "marvell,berlin2cd-soc-pinctrl";
@@ -320,7 +324,7 @@ 
			compatible = "chipidea,usb2";

			reg = <0xed0000 0x200>;

			interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&chip CLKID_USB0>;

			clocks = <&chip_clk CLKID_USB0>;

			phys = <&usb_phy0>;

			phy-names = "usb-phy";

			status = "disabled";
@@ -330,7 +334,7 @@ 
			compatible = "chipidea,usb2";

			reg = <0xee0000 0x200>;

			interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&chip CLKID_USB1>;

			clocks = <&chip_clk CLKID_USB1>;

			phys = <&usb_phy1>;

			phy-names = "usb-phy";

			status = "disabled";