Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 16:10:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-uniphier

Browse source
This commit is contained in:
Tom Rini 2018-05-22 13:53:26 -04:00
commit 668e309eff
8 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/arm/dts/uniphier-ld11.dtsi
View file

@ -418,7 +418,7 @@
mmc-ddr-1_8v; mmc-ddr-1_8v;
mmc-hs200-1_8v; mmc-hs200-1_8v;
mmc-pwrseq = <&emmc_pwrseq>; mmc-pwrseq = <&emmc_pwrseq>;
cdns,phy-input-delay-legacy = <4>; cdns,phy-input-delay-legacy = <9>;
cdns,phy-input-delay-mmc-highspeed = <2>; cdns,phy-input-delay-mmc-highspeed = <2>;
cdns,phy-input-delay-mmc-ddr = <3>; cdns,phy-input-delay-mmc-ddr = <3>;
cdns,phy-dll-delay-sdclk = <21>; cdns,phy-dll-delay-sdclk = <21>;
@ -553,10 +553,13 @@
status = "disabled"; status = "disabled";
reg = <0x65000000 0x8500>; reg = <0x65000000 0x8500>;
interrupts = <0 66 4>; interrupts = <0 66 4>;
clock-names = "ether";
clocks = <&sys_clk 6>; clocks = <&sys_clk 6>;
reset-names = "ether";
resets = <&sys_rst 6>; resets = <&sys_rst 6>;
phy-mode = "rmii"; phy-mode = "internal";
local-mac-address = [00 00 00 00 00 00]; local-mac-address = [00 00 00 00 00 00];
socionext,syscon-phy-mode = <&soc_glue 0>;
mdio: mdio { mdio: mdio {
#address-cells = <1>; #address-cells = <1>;

8
arch/arm/dts/uniphier-ld20-ref.dts
View file

@ -67,3 +67,11 @@
reg = <0>; reg = <0>;
}; };
}; };
&pinctrl_ether_rgmii {
tx {
pins = "RGMII_TXCLK", "RGMII_TXD0", "RGMII_TXD1",
"RGMII_TXD2", "RGMII_TXD3", "RGMII_TXCTL";
drive-strength = <9>;
};
};

5
arch/arm/dts/uniphier-ld20.dtsi
View file

@ -523,7 +523,7 @@
mmc-ddr-1_8v; mmc-ddr-1_8v;
mmc-hs200-1_8v; mmc-hs200-1_8v;
mmc-pwrseq = <&emmc_pwrseq>; mmc-pwrseq = <&emmc_pwrseq>;
cdns,phy-input-delay-legacy = <4>; cdns,phy-input-delay-legacy = <9>;
cdns,phy-input-delay-mmc-highspeed = <2>; cdns,phy-input-delay-mmc-highspeed = <2>;
cdns,phy-input-delay-mmc-ddr = <3>; cdns,phy-input-delay-mmc-ddr = <3>;
cdns,phy-dll-delay-sdclk = <21>; cdns,phy-dll-delay-sdclk = <21>;
@ -622,10 +622,13 @@
interrupts = <0 66 4>; interrupts = <0 66 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ether_rgmii>; pinctrl-0 = <&pinctrl_ether_rgmii>;
clock-names = "ether";
clocks = <&sys_clk 6>; clocks = <&sys_clk 6>;
reset-names = "ether";
resets = <&sys_rst 6>; resets = <&sys_rst 6>;
phy-mode = "rgmii"; phy-mode = "rgmii";
local-mac-address = [00 00 00 00 00 00]; local-mac-address = [00 00 00 00 00 00];
socionext,syscon-phy-mode = <&soc_glue 0>;
mdio: mdio { mdio: mdio {
#address-cells = <1>; #address-cells = <1>;

10
arch/arm/dts/uniphier-pro4.dtsi
View file

@ -342,7 +342,7 @@
has-transaction-translator; has-transaction-translator;
}; };
soc-glue@5f800000 { soc_glue: soc-glue@5f800000 {
compatible = "socionext,uniphier-pro4-soc-glue", compatible = "socionext,uniphier-pro4-soc-glue",
"simple-mfd", "syscon"; "simple-mfd", "syscon";
reg = <0x5f800000 0x2000>; reg = <0x5f800000 0x2000>;
@ -427,10 +427,14 @@
interrupts = <0 66 4>; interrupts = <0 66 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ether_rgmii>; pinctrl-0 = <&pinctrl_ether_rgmii>;
clocks = <&sys_clk 6>; clock-names = "gio", "ether", "ether-gb", "ether-phy";
resets = <&sys_rst 6>; clocks = <&sys_clk 12>, <&sys_clk 6>, <&sys_clk 7>,
<&sys_clk 10>;
reset-names = "gio", "ether";
resets = <&sys_rst 12>, <&sys_rst 6>;
phy-mode = "rgmii"; phy-mode = "rgmii";
local-mac-address = [00 00 00 00 00 00]; local-mac-address = [00 00 00 00 00 00];
socionext,syscon-phy-mode = <&soc_glue 0>;
mdio: mdio { mdio: mdio {
#address-cells = <1>; #address-cells = <1>;

3
arch/arm/dts/uniphier-pxs2.dtsi
View file

@ -545,10 +545,13 @@
interrupts = <0 66 4>; interrupts = <0 66 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ether_rgmii>; pinctrl-0 = <&pinctrl_ether_rgmii>;
clock-names = "ether";
clocks = <&sys_clk 6>; clocks = <&sys_clk 6>;
reset-names = "ether";
resets = <&sys_rst 6>; resets = <&sys_rst 6>;
phy-mode = "rgmii"; phy-mode = "rgmii";
local-mac-address = [00 00 00 00 00 00]; local-mac-address = [00 00 00 00 00 00];
socionext,syscon-phy-mode = <&soc_glue 0>;
mdio: mdio { mdio: mdio {
#address-cells = <1>; #address-cells = <1>;

8
arch/arm/dts/uniphier-pxs3.dtsi
View file

@ -338,7 +338,7 @@
mmc-ddr-1_8v; mmc-ddr-1_8v;
mmc-hs200-1_8v; mmc-hs200-1_8v;
mmc-pwrseq = <&emmc_pwrseq>; mmc-pwrseq = <&emmc_pwrseq>;
cdns,phy-input-delay-legacy = <4>; cdns,phy-input-delay-legacy = <9>;
cdns,phy-input-delay-mmc-highspeed = <2>; cdns,phy-input-delay-mmc-highspeed = <2>;
cdns,phy-input-delay-mmc-ddr = <3>; cdns,phy-input-delay-mmc-ddr = <3>;
cdns,phy-dll-delay-sdclk = <21>; cdns,phy-dll-delay-sdclk = <21>;
@ -430,10 +430,13 @@
interrupts = <0 66 4>; interrupts = <0 66 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ether_rgmii>; pinctrl-0 = <&pinctrl_ether_rgmii>;
clock-names = "ether";
clocks = <&sys_clk 6>; clocks = <&sys_clk 6>;
reset-names = "ether";
resets = <&sys_rst 6>; resets = <&sys_rst 6>;
phy-mode = "rgmii"; phy-mode = "rgmii";
local-mac-address = [00 00 00 00 00 00]; local-mac-address = [00 00 00 00 00 00];
socionext,syscon-phy-mode = <&soc_glue 0>;
mdio0: mdio { mdio0: mdio {
#address-cells = <1>; #address-cells = <1>;
@ -448,10 +451,13 @@
interrupts = <0 67 4>; interrupts = <0 67 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ether1_rgmii>; pinctrl-0 = <&pinctrl_ether1_rgmii>;
clock-names = "ether";
clocks = <&sys_clk 7>; clocks = <&sys_clk 7>;
reset-names = "ether";
resets = <&sys_rst 7>; resets = <&sys_rst 7>;
phy-mode = "rgmii"; phy-mode = "rgmii";
local-mac-address = [00 00 00 00 00 00]; local-mac-address = [00 00 00 00 00 00];
socionext,syscon-phy-mode = <&soc_glue 1>;
mdio1: mdio { mdio1: mdio {
#address-cells = <1>; #address-cells = <1>;

4
arch/arm/mach-uniphier/board_late_init.c
View file

@ -38,7 +38,7 @@ static int uniphier_set_fdt_file(void)
char dtb_name[256]; char dtb_name[256];
int buf_len = sizeof(dtb_name); int buf_len = sizeof(dtb_name);
if (env_get("fdt_file")) if (env_get("fdtfile"))
return 0; /* do nothing if it is already set */ return 0; /* do nothing if it is already set */
compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL); compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL);
@ -56,7 +56,7 @@ static int uniphier_set_fdt_file(void)
strncat(dtb_name, ".dtb", buf_len); strncat(dtb_name, ".dtb", buf_len);
return env_set("fdt_file", dtb_name); return env_set("fdtfile", dtb_name);
} }
int board_late_init(void) int board_late_init(void)

4
include/configs/uniphier.h
View file

@ -168,10 +168,10 @@
"run boot_common\0" \ "run boot_common\0" \
"tftpboot=tftpboot $kernel_addr_load $bootfile && " \ "tftpboot=tftpboot $kernel_addr_load $bootfile && " \
"tftpboot $ramdisk_addr_r $ramdisk_file &&" \ "tftpboot $ramdisk_addr_r $ramdisk_file &&" \
"tftpboot $fdt_addr_r $fdt_file &&" \ "tftpboot $fdt_addr_r $fdtfile &&" \
"run boot_common\0" \ "run boot_common\0" \
"__nfsboot=tftpboot $kernel_addr_load $bootfile && " \ "__nfsboot=tftpboot $kernel_addr_load $bootfile && " \
"tftpboot $fdt_addr_r $fdt_file &&" \ "tftpboot $fdt_addr_r $fdtfile &&" \
"setenv ramdisk_addr_r - &&" \ "setenv ramdisk_addr_r - &&" \
"run boot_common\0" "run boot_common\0"
#endif #endif