mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-22 15:42:04 +00:00
mvebu: dts: a80x0: Sync the DB DTS with standard config A
Sync the default configuration of Armada-8040-DB with Marvell u-boot-2015 standard configuration "A" for the same board. The standard configuration "A" enables 2 PCIe slots on CP0 and 3 PCIe slots on CP1. This is the main configuration used for u-boot and Linux tests. This patch also re-arranges the DTS file entries by grouping all nodes related to CP0 and CP1. Signed-off-by: Konstantin Porotchkin <kostap@marvell.com> Cc: Stefan Roese <sr@denx.de> Cc: Igal Liberman <igall@marvell.com> Cc: Nadav Haklai <nadavh@marvell.com> Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Konstantin Porotchkin
Stefan Roese
parent
3f75e0ce7b
commit
0f712f2c8d
1 changed files with 115 additions and 107 deletions
|
|
@ -83,28 +83,68 @@
|
|||
|
||||
&cpm_pinctl {
|
||||
/* MPP Bus:
|
||||
* [0-31] = 0xff: Keep default CP0_shared_pins:
|
||||
* [11] CLKOUT_MPP_11 (out)
|
||||
* [23] LINK_RD_IN_CP2CP (in)
|
||||
* [25] CLKOUT_MPP_25 (out)
|
||||
* [29] AVS_FB_IN_CP2CP (in)
|
||||
* [32,34] SMI
|
||||
* [31] GPIO: push button/Wake
|
||||
* [35-36] GPIO
|
||||
* [37-38] I2C
|
||||
* [40-41] SATA[0/1]_PRESENT_ACTIVEn
|
||||
* [42-43] XSMI
|
||||
* [44-55] RGMII1
|
||||
* [56-62] SD
|
||||
* [0-31] = 0xff: Keep default CP0_shared_pins
|
||||
* [11] CLKOUT_MPP_11 (out)
|
||||
* [23] LINK_RD_IN_CP2CP (in)
|
||||
* [25] CLKOUT_MPP_25 (out)
|
||||
* [29] AVS_FB_IN_CP2CP (in)
|
||||
* [32,34] GE_MDIO/MDC
|
||||
* [33] GPIO: GE_INT#/push button/Wake
|
||||
* [35] MSS_GPIO[3]: MSS_PWDN
|
||||
* [36] MSS_GPIO[5]: MSS_VTT_EN
|
||||
* [37-38] I2C0
|
||||
* [39] PTP_CLK
|
||||
* [40-41] SATA[0/1]_PRESENT_ACTIVEn
|
||||
* [42-43] XG_MDC/XG_MDIO (XSMI)
|
||||
* [44-55] RGMII1
|
||||
* [56-62] SD
|
||||
*/
|
||||
/* 0 1 2 3 4 5 6 7 8 9 */
|
||||
/* 0 1 2 3 4 5 6 7 8 9 */
|
||||
pin-func = < 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0xff 0 7 0 7 0 0 2 2 0
|
||||
0 0 8 8 1 1 1 1 1 1
|
||||
1 1 1 1 1 1 0xe 0xe 0xe 0xe
|
||||
0xe 0xe 0xe >;
|
||||
0xff 0xff 0x7 0x0 0x7 0xa 0xa 0x2 0x2 0x5
|
||||
0x9 0x9 0x8 0x8 0x1 0x1 0x1 0x1 0x1 0x1
|
||||
0x1 0x1 0x1 0x1 0x1 0x1 0xe 0xe 0xe 0xe
|
||||
0xe 0xe 0xe>;
|
||||
};
|
||||
|
||||
&cpm_comphy {
|
||||
/* Serdes Configuration:
|
||||
* Lane 0: PCIe0 (x1)
|
||||
* Lane 1: SATA0
|
||||
* Lane 2: KR (10G)
|
||||
* Lane 3: SATA1
|
||||
* Lane 4: USB3_HOST1
|
||||
* Lane 5: PCIe2 (x1)
|
||||
*/
|
||||
phy0 {
|
||||
phy-type = <PHY_TYPE_PEX0>;
|
||||
};
|
||||
phy1 {
|
||||
phy-type = <PHY_TYPE_SATA0>;
|
||||
};
|
||||
phy2 {
|
||||
phy-type = <PHY_TYPE_KR>;
|
||||
};
|
||||
phy3 {
|
||||
phy-type = <PHY_TYPE_SATA1>;
|
||||
};
|
||||
phy4 {
|
||||
phy-type = <PHY_TYPE_USB3_HOST1>;
|
||||
};
|
||||
phy5 {
|
||||
phy-type = <PHY_TYPE_PEX2>;
|
||||
};
|
||||
};
|
||||
|
||||
/* CON6 on CP0 expansion */
|
||||
&cpm_pcie0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cpm_pcie1 {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
/* CON5 on CP0 expansion */
|
||||
|
|
@ -134,21 +174,69 @@
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&cpm_utmi0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cpm_utmi1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cps_pinctl {
|
||||
/* MPP Bus:
|
||||
* [0-11] RGMII0
|
||||
* [13-16] SPI1
|
||||
* [27,31] GE_MDIO/MDC
|
||||
* [32-62] = 0xff: Keep default CP1_shared_pins:
|
||||
* [0-11] RGMII0
|
||||
* [13-16] SPI1
|
||||
* [27,31] GE_MDIO/MDC
|
||||
* [28] SATA1_PRESENT_ACTIVEn
|
||||
* [29-30] UART0
|
||||
* [32-62] = 0xff: Keep default CP1_shared_pins
|
||||
*/
|
||||
/* 0 1 2 3 4 5 6 7 8 9 */
|
||||
/* 0 1 2 3 4 5 6 7 8 9 */
|
||||
pin-func = < 0x3 0x3 0x3 0x3 0x3 0x3 0x3 0x3 0x3 0x3
|
||||
0x3 0x3 0xff 0x3 0x3 0x3 0x3 0xff 0xff 0xff
|
||||
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0x8 0xff 0xff
|
||||
0xff 0x8 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0x3 0x3 0x3 0x3 0x3 0x3 0x3 0xff 0xff 0xff
|
||||
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0x8 0x9 0xa
|
||||
0xA 0x8 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
|
||||
0xff 0xff 0xff >;
|
||||
0xff 0xff 0xff>;
|
||||
};
|
||||
|
||||
&cps_comphy {
|
||||
/* Serdes Configuration:
|
||||
* Lane 0: PCIe0 (x1)
|
||||
* Lane 1: SATA0
|
||||
* Lane 2: KR (10G)
|
||||
* Lane 3: SATA1
|
||||
* Lane 4: PCIe1 (x1)
|
||||
* Lane 5: PCIe2 (x1)
|
||||
*/
|
||||
phy0 {
|
||||
phy-type = <PHY_TYPE_PEX0>;
|
||||
};
|
||||
phy1 {
|
||||
phy-type = <PHY_TYPE_SATA0>;
|
||||
};
|
||||
phy2 {
|
||||
phy-type = <PHY_TYPE_KR>;
|
||||
};
|
||||
phy3 {
|
||||
phy-type = <PHY_TYPE_SATA1>;
|
||||
};
|
||||
phy4 {
|
||||
phy-type = <PHY_TYPE_PEX1>;
|
||||
};
|
||||
phy5 {
|
||||
phy-type = <PHY_TYPE_PEX2>;
|
||||
};
|
||||
};
|
||||
|
||||
/* CON6 on CP1 expansion */
|
||||
&cps_pcie0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cps_pcie1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
/* CON5 on CP1 expansion */
|
||||
|
|
@ -200,86 +288,6 @@
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&cpm_comphy {
|
||||
/*
|
||||
* Serdes Configuration:
|
||||
* Lane 0: SGMII2
|
||||
* Lane 1: USB3_HOST0
|
||||
* Lane 2: KR (10G)
|
||||
* Lane 3: SATA1
|
||||
* Lane 4: USB3_HOST1
|
||||
* Lane 5: PEX2x1
|
||||
*/
|
||||
phy0 {
|
||||
phy-type = <PHY_TYPE_SGMII2>;
|
||||
phy-speed = <PHY_SPEED_3_125G>;
|
||||
};
|
||||
|
||||
phy1 {
|
||||
phy-type = <PHY_TYPE_USB3_HOST0>;
|
||||
};
|
||||
|
||||
phy2 {
|
||||
phy-type = <PHY_TYPE_KR>;
|
||||
};
|
||||
|
||||
phy3 {
|
||||
phy-type = <PHY_TYPE_SATA1>;
|
||||
};
|
||||
|
||||
phy4 {
|
||||
phy-type = <PHY_TYPE_USB3_HOST1>;
|
||||
};
|
||||
|
||||
phy5 {
|
||||
phy-type = <PHY_TYPE_PEX2>;
|
||||
};
|
||||
};
|
||||
|
||||
&cps_comphy {
|
||||
/*
|
||||
* Serdes Configuration:
|
||||
* Lane 0: SGMII2
|
||||
* Lane 1: USB3_HOST0
|
||||
* Lane 2: KR (10G)
|
||||
* Lane 3: SATA1
|
||||
* Lane 4: Unconnected
|
||||
* Lane 5: PEX2x1
|
||||
*/
|
||||
phy0 {
|
||||
phy-type = <PHY_TYPE_SGMII2>;
|
||||
phy-speed = <PHY_SPEED_3_125G>;
|
||||
};
|
||||
|
||||
phy1 {
|
||||
phy-type = <PHY_TYPE_USB3_HOST0>;
|
||||
};
|
||||
|
||||
phy2 {
|
||||
phy-type = <PHY_TYPE_KR>;
|
||||
};
|
||||
|
||||
phy3 {
|
||||
phy-type = <PHY_TYPE_SATA1>;
|
||||
};
|
||||
|
||||
phy4 {
|
||||
phy-type = <PHY_TYPE_UNCONNECTED>;
|
||||
};
|
||||
|
||||
phy5 {
|
||||
phy-type = <PHY_TYPE_PEX2>;
|
||||
};
|
||||
};
|
||||
|
||||
&cpm_utmi0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cpm_utmi1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&cps_utmi0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue