Skip to content

L
linux
Commit a457b86c authored by Antoine Tenart's avatar Antoine Tenart Committed by Sebastian Hesselbarth
Browse files
Options

ARM: berlin: move BG2Q 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 b8b59d4c
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 23 deletions
arch/arm/boot/dts/berlin2q.dtsi
View file @ a457b86c
...@@ -74,7 +74,7 @@ pmu { ...@@ -74,7 +74,7 @@ pmu {
sdhci0: sdhci@ab0000 { sdhci0: sdhci@ab0000 {
compatible = "mrvl,pxav3-mmc"; compatible = "mrvl,pxav3-mmc";
reg = <0xab0000 0x200>; reg = <0xab0000 0x200>;
clocks = <&chip CLKID_SDIO1XIN>; clocks = <&chip_clk CLKID_SDIO1XIN>;
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
...@@ -82,7 +82,7 @@ sdhci0: sdhci@ab0000 { ...@@ -82,7 +82,7 @@ sdhci0: sdhci@ab0000 {
sdhci1: sdhci@ab0800 { sdhci1: sdhci@ab0800 {
compatible = "mrvl,pxav3-mmc"; compatible = "mrvl,pxav3-mmc";
reg = <0xab0800 0x200>; reg = <0xab0800 0x200>;
clocks = <&chip CLKID_SDIO1XIN>; clocks = <&chip_clk CLKID_SDIO1XIN>;
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled"; status = "disabled";
}; };
...@@ -91,7 +91,7 @@ sdhci2: sdhci@ab1000 { ...@@ -91,7 +91,7 @@ sdhci2: sdhci@ab1000 {
compatible = "mrvl,pxav3-mmc"; compatible = "mrvl,pxav3-mmc";
reg = <0xab1000 0x200>; reg = <0xab1000 0x200>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&chip CLKID_NFC_ECC>, <&chip CLKID_NFC>; clocks = <&chip_clk CLKID_NFC_ECC>, <&chip_clk CLKID_NFC>;
clock-names = "io", "core"; clock-names = "io", "core";
status = "disabled"; status = "disabled";
}; };
...@@ -112,7 +112,7 @@ scu: snoop-control-unit@ad0000 { ...@@ -112,7 +112,7 @@ scu: snoop-control-unit@ad0000 {
local-timer@ad0600 { local-timer@ad0600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
reg = <0xad0600 0x20>; reg = <0xad0600 0x20>;
clocks = <&chip CLKID_TWD>; clocks = <&chip_clk CLKID_TWD>;
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
}; };
...@@ -135,7 +135,7 @@ usb2: usb@a30000 { ...@@ -135,7 +135,7 @@ usb2: usb@a30000 {
compatible = "chipidea,usb2"; compatible = "chipidea,usb2";
reg = <0xa30000 0x10000>; reg = <0xa30000 0x10000>;
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&chip CLKID_USB2>; clocks = <&chip_clk CLKID_USB2>;
phys = <&usb_phy2>; phys = <&usb_phy2>;
phy-names = "usb-phy"; phy-names = "usb-phy";
status = "disabled"; status = "disabled";
...@@ -160,7 +160,7 @@ usb_phy1: phy@b78000 { ...@@ -160,7 +160,7 @@ usb_phy1: phy@b78000 {
eth0: ethernet@b90000 { eth0: ethernet@b90000 {
compatible = "marvell,pxa168-eth"; compatible = "marvell,pxa168-eth";
reg = <0xb90000 0x10000>; reg = <0xb90000 0x10000>;
clocks = <&chip CLKID_GETH0>; clocks = <&chip_clk CLKID_GETH0>;
interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
/* set by bootloader */ /* set by bootloader */
local-mac-address = [00 00 00 00 00 00]; local-mac-address = [00 00 00 00 00 00];
...@@ -267,7 +267,7 @@ i2c0: i2c@1400 { ...@@ -267,7 +267,7 @@ i2c0: i2c@1400 {
reg = <0x1400 0x100>; reg = <0x1400 0x100>;
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
interrupts = <4>; interrupts = <4>;
clocks = <&chip CLKID_CFG>; clocks = <&chip_clk CLKID_CFG>;
pinctrl-0 = <&twsi0_pmux>; pinctrl-0 = <&twsi0_pmux>;
pinctrl-names = "default"; pinctrl-names = "default";
status = "disabled"; status = "disabled";
...@@ -280,7 +280,7 @@ i2c1: i2c@1800 { ...@@ -280,7 +280,7 @@ i2c1: i2c@1800 {
reg = <0x1800 0x100>; reg = <0x1800 0x100>;
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
interrupts = <5>; interrupts = <5>;
clocks = <&chip CLKID_CFG>; clocks = <&chip_clk CLKID_CFG>;
pinctrl-0 = <&twsi1_pmux>; pinctrl-0 = <&twsi1_pmux>;
pinctrl-names = "default"; pinctrl-names = "default";
status = "disabled"; status = "disabled";
...@@ -289,7 +289,7 @@ i2c1: i2c@1800 { ...@@ -289,7 +289,7 @@ i2c1: i2c@1800 {
timer0: timer@2c00 { timer0: timer@2c00 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c00 0x14>; reg = <0x2c00 0x14>;
clocks = <&chip CLKID_CFG>; clocks = <&chip_clk CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
interrupts = <8>; interrupts = <8>;
}; };
...@@ -297,14 +297,14 @@ timer0: timer@2c00 { ...@@ -297,14 +297,14 @@ timer0: timer@2c00 {
timer1: timer@2c14 { timer1: timer@2c14 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c14 0x14>; reg = <0x2c14 0x14>;
clocks = <&chip CLKID_CFG>; clocks = <&chip_clk CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
}; };
timer2: timer@2c28 { timer2: timer@2c28 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c28 0x14>; reg = <0x2c28 0x14>;
clocks = <&chip CLKID_CFG>; clocks = <&chip_clk CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -312,7 +312,7 @@ timer2: timer@2c28 { ...@@ -312,7 +312,7 @@ timer2: timer@2c28 {
timer3: timer@2c3c { timer3: timer@2c3c {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c3c 0x14>; reg = <0x2c3c 0x14>;
clocks = <&chip CLKID_CFG>; clocks = <&chip_clk CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -320,7 +320,7 @@ timer3: timer@2c3c { ...@@ -320,7 +320,7 @@ timer3: timer@2c3c {
timer4: timer@2c50 { timer4: timer@2c50 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c50 0x14>; reg = <0x2c50 0x14>;
clocks = <&chip CLKID_CFG>; clocks = <&chip_clk CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -328,7 +328,7 @@ timer4: timer@2c50 { ...@@ -328,7 +328,7 @@ timer4: timer@2c50 {
timer5: timer@2c64 { timer5: timer@2c64 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c64 0x14>; reg = <0x2c64 0x14>;
clocks = <&chip CLKID_CFG>; clocks = <&chip_clk CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -336,7 +336,7 @@ timer5: timer@2c64 { ...@@ -336,7 +336,7 @@ timer5: timer@2c64 {
timer6: timer@2c78 { timer6: timer@2c78 {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c78 0x14>; reg = <0x2c78 0x14>;
clocks = <&chip CLKID_CFG>; clocks = <&chip_clk CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -344,7 +344,7 @@ timer6: timer@2c78 { ...@@ -344,7 +344,7 @@ timer6: timer@2c78 {
timer7: timer@2c8c { timer7: timer@2c8c {
compatible = "snps,dw-apb-timer"; compatible = "snps,dw-apb-timer";
reg = <0x2c8c 0x14>; reg = <0x2c8c 0x14>;
clocks = <&chip CLKID_CFG>; clocks = <&chip_clk CLKID_CFG>;
clock-names = "timer"; clock-names = "timer";
status = "disabled"; status = "disabled";
}; };
...@@ -361,10 +361,14 @@ aic: interrupt-controller@3800 { ...@@ -361,10 +361,14 @@ aic: interrupt-controller@3800 {
chip: chip-control@ea0000 { chip: chip-control@ea0000 {
compatible = "marvell,berlin2q-chip-ctrl", "simple-mfd", "syscon"; compatible = "marvell,berlin2q-chip-ctrl", "simple-mfd", "syscon";
#clock-cells = <1>;
reg = <0xea0000 0x400>, <0xdd0170 0x10>; reg = <0xea0000 0x400>, <0xdd0170 0x10>;
chip_clk: clock {
compatible = "marvell,berlin2q-clk";
#clock-cells = <1>;
clocks = <&refclk>; clocks = <&refclk>;
clock-names = "refclk"; clock-names = "refclk";
};
soc_pinctrl: pin-controller { soc_pinctrl: pin-controller {
compatible = "marvell,berlin2q-soc-pinctrl"; compatible = "marvell,berlin2q-soc-pinctrl";
...@@ -390,7 +394,7 @@ ahci: sata@e90000 { ...@@ -390,7 +394,7 @@ ahci: sata@e90000 {
compatible = "marvell,berlin2q-ahci", "generic-ahci"; compatible = "marvell,berlin2q-ahci", "generic-ahci";
reg = <0xe90000 0x1000>; reg = <0xe90000 0x1000>;
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&chip CLKID_SATA>; clocks = <&chip_clk CLKID_SATA>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -410,7 +414,7 @@ sata1: sata-port@1 { ...@@ -410,7 +414,7 @@ sata1: sata-port@1 {
sata_phy: phy@e900a0 { sata_phy: phy@e900a0 {
compatible = "marvell,berlin2q-sata-phy"; compatible = "marvell,berlin2q-sata-phy";
reg = <0xe900a0 0x200>; reg = <0xe900a0 0x200>;
clocks = <&chip CLKID_SATA>; clocks = <&chip_clk CLKID_SATA>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
#phy-cells = <1>; #phy-cells = <1>;
...@@ -429,7 +433,7 @@ usb0: usb@ed0000 { ...@@ -429,7 +433,7 @@ usb0: usb@ed0000 {
compatible = "chipidea,usb2"; compatible = "chipidea,usb2";
reg = <0xed0000 0x10000>; reg = <0xed0000 0x10000>;
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&chip CLKID_USB0>; clocks = <&chip_clk CLKID_USB0>;
phys = <&usb_phy0>; phys = <&usb_phy0>;
phy-names = "usb-phy"; phy-names = "usb-phy";
status = "disabled"; status = "disabled";
...@@ -439,7 +443,7 @@ usb1: usb@ee0000 { ...@@ -439,7 +443,7 @@ usb1: usb@ee0000 {
compatible = "chipidea,usb2"; compatible = "chipidea,usb2";
reg = <0xee0000 0x10000>; reg = <0xee0000 0x10000>;
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&chip CLKID_USB1>; clocks = <&chip_clk CLKID_USB1>;
phys = <&usb_phy1>; phys = <&usb_phy1>;
phy-names = "usb-phy"; phy-names = "usb-phy";
status = "disabled"; status = "disabled";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7