Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: uniphier-sd: sync with Linux

Browse Source 
Sync with the driver code and the binding recently merged in Linux.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
lime2-spi
Masahiro Yamada 6 years ago
parent b07f6e9faf
commit c3ab1e118f
10 changed files with 49 additions and 57 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      arch/arm/dts/uniphier-ld20.dtsi
  2. 14
      arch/arm/dts/uniphier-ld4.dtsi
  3. 7
      arch/arm/dts/uniphier-pinctrl.dtsi
  4. 4
      arch/arm/dts/uniphier-pro4-ref.dts
  5. 23
      arch/arm/dts/uniphier-pro4.dtsi
  6. 15
      arch/arm/dts/uniphier-pro5.dtsi
  7. 15
      arch/arm/dts/uniphier-pxs2.dtsi
  8. 8
      arch/arm/dts/uniphier-pxs3.dtsi
  9. 14
      arch/arm/dts/uniphier-sld8.dtsi
  10. 4
      drivers/mmc/uniphier-sd.c

2
arch/arm/dts/uniphier-ld20.dtsi
Unescape View File

@ -529,7 +529,7 @@
}; };
sd: sdhc@5a400000 { sd: sdhc@5a400000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v3.1.1";
status = "disabled"; status = "disabled";
reg = <0x5a400000 0x800>; reg = <0x5a400000 0x800>;
interrupts = <0 76 4>; interrupts = <0 76 4>;

14
arch/arm/dts/uniphier-ld4.dtsi
Unescape View File

@ -225,13 +225,13 @@
}; };
sd: sdhc@5a400000 { sd: sdhc@5a400000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v2.91";
status = "disabled"; status = "disabled";
reg = <0x5a400000 0x200>; reg = <0x5a400000 0x200>;
interrupts = <0 76 4>; interrupts = <0 76 4>;
pinctrl-names = "default", "1.8v"; pinctrl-names = "default", "uhs";
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
pinctrl-1 = <&pinctrl_sd_1v8>; pinctrl-1 = <&pinctrl_sd_uhs>;
clocks = <&mio_clk 0>; clocks = <&mio_clk 0>;
reset-names = "host", "bridge"; reset-names = "host", "bridge";
resets = <&mio_rst 0>, <&mio_rst 3>; resets = <&mio_rst 0>, <&mio_rst 3>;
@ -243,19 +243,19 @@
}; };
emmc: sdhc@5a500000 { emmc: sdhc@5a500000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v2.91";
status = "disabled"; status = "disabled";
reg = <0x5a500000 0x200>; reg = <0x5a500000 0x200>;
interrupts = <0 78 4>; interrupts = <0 78 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_emmc>; pinctrl-0 = <&pinctrl_emmc>;
clocks = <&mio_clk 1>; clocks = <&mio_clk 1>;
reset-names = "host", "bridge"; reset-names = "host", "bridge", "hw";
resets = <&mio_rst 1>, <&mio_rst 4>; resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;
bus-width = <8>; bus-width = <8>;
non-removable;
cap-mmc-highspeed; cap-mmc-highspeed;
cap-mmc-hw-reset; cap-mmc-hw-reset;
non-removable;
}; };
usb0: usb@5a800100 { usb0: usb@5a800100 {

7
arch/arm/dts/uniphier-pinctrl.dtsi
Unescape View File

@ -121,7 +121,7 @@
function = "sd"; function = "sd";
}; };
pinctrl_sd_1v8: sd-1v8 { pinctrl_sd_uhs: sd-uhs {
groups = "sd"; groups = "sd";
function = "sd"; function = "sd";
}; };
@ -131,11 +131,6 @@
function = "sd1"; function = "sd1";
}; };
pinctrl_sd1_1v8: sd1-1v8 {
groups = "sd1";
function = "sd1";
};
pinctrl_system_bus: system-bus { pinctrl_system_bus: system-bus {
groups = "system_bus", "system_bus_cs1"; groups = "system_bus", "system_bus_cs1";
function = "system_bus"; function = "system_bus";

4
arch/arm/dts/uniphier-pro4-ref.dts
Unescape View File

@ -70,10 +70,6 @@
status = "okay"; status = "okay";
}; };
&sd1 {
status = "okay";
};
&usb2 { &usb2 {
status = "okay"; status = "okay";
}; };

23
arch/arm/dts/uniphier-pro4.dtsi
Unescape View File

@ -259,13 +259,13 @@
}; };
sd: sdhc@5a400000 { sd: sdhc@5a400000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v2.91";
status = "disabled"; status = "disabled";
reg = <0x5a400000 0x200>; reg = <0x5a400000 0x200>;
interrupts = <0 76 4>; interrupts = <0 76 4>;
pinctrl-names = "default", "1.8v"; pinctrl-names = "default", "uhs";
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
pinctrl-1 = <&pinctrl_sd_1v8>; pinctrl-1 = <&pinctrl_sd_uhs>;
clocks = <&mio_clk 0>; clocks = <&mio_clk 0>;
reset-names = "host", "bridge"; reset-names = "host", "bridge";
resets = <&mio_rst 0>, <&mio_rst 3>; resets = <&mio_rst 0>, <&mio_rst 3>;
@ -277,36 +277,33 @@
}; };
emmc: sdhc@5a500000 { emmc: sdhc@5a500000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v2.91";
status = "disabled"; status = "disabled";
reg = <0x5a500000 0x200>; reg = <0x5a500000 0x200>;
interrupts = <0 78 4>; interrupts = <0 78 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_emmc>; pinctrl-0 = <&pinctrl_emmc>;
clocks = <&mio_clk 1>; clocks = <&mio_clk 1>;
reset-names = "host", "bridge"; reset-names = "host", "bridge", "hw";
resets = <&mio_rst 1>, <&mio_rst 4>; resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;
bus-width = <8>; bus-width = <8>;
non-removable;
cap-mmc-highspeed; cap-mmc-highspeed;
cap-mmc-hw-reset; cap-mmc-hw-reset;
non-removable;
}; };
sd1: sdhc@5a600000 { sd1: sdhc@5a600000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v2.91";
status = "disabled"; status = "disabled";
reg = <0x5a600000 0x200>; reg = <0x5a600000 0x200>;
interrupts = <0 85 4>; interrupts = <0 85 4>;
pinctrl-names = "default", "1.8v"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sd1>; pinctrl-0 = <&pinctrl_sd1>;
pinctrl-1 = <&pinctrl_sd1_1v8>;
clocks = <&mio_clk 2>; clocks = <&mio_clk 2>;
reset-names = "host", "bridge";
resets = <&mio_rst 2>, <&mio_rst 5>; resets = <&mio_rst 2>, <&mio_rst 5>;
bus-width = <4>; bus-width = <4>;
cap-sd-highspeed; cap-sd-highspeed;
sd-uhs-sdr12;
sd-uhs-sdr25;
sd-uhs-sdr50;
}; };
usb2: usb@5a800100 { usb2: usb@5a800100 {

15
arch/arm/dts/uniphier-pro5.dtsi
Unescape View File

@ -480,30 +480,29 @@
}; };
emmc: sdhc@68400000 { emmc: sdhc@68400000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v3.1";
status = "disabled"; status = "disabled";
reg = <0x68400000 0x800>; reg = <0x68400000 0x800>;
interrupts = <0 78 4>; interrupts = <0 78 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_emmc>; pinctrl-0 = <&pinctrl_emmc>;
clocks = <&sd_clk 1>; clocks = <&sd_clk 1>;
reset-names = "host"; reset-names = "host", "hw";
resets = <&sd_rst 1>; resets = <&sd_rst 1>, <&sd_rst 6>;
bus-width = <8>; bus-width = <8>;
non-removable;
cap-mmc-highspeed; cap-mmc-highspeed;
cap-mmc-hw-reset; cap-mmc-hw-reset;
no-3-3-v; non-removable;
}; };
sd: sdhc@68800000 { sd: sdhc@68800000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v3.1";
status = "disabled"; status = "disabled";
reg = <0x68800000 0x800>; reg = <0x68800000 0x800>;
interrupts = <0 76 4>; interrupts = <0 76 4>;
pinctrl-names = "default", "1.8v"; pinctrl-names = "default", "uhs";
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
pinctrl-1 = <&pinctrl_sd_1v8>; pinctrl-1 = <&pinctrl_sd_uhs>;
clocks = <&sd_clk 0>; clocks = <&sd_clk 0>;
reset-names = "host"; reset-names = "host";
resets = <&sd_rst 0>; resets = <&sd_rst 0>;

15
arch/arm/dts/uniphier-pxs2.dtsi
Unescape View File

@ -423,30 +423,29 @@
}; };
emmc: sdhc@5a000000 { emmc: sdhc@5a000000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v3.1.1";
status = "disabled"; status = "disabled";
reg = <0x5a000000 0x800>; reg = <0x5a000000 0x800>;
interrupts = <0 78 4>; interrupts = <0 78 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_emmc>; pinctrl-0 = <&pinctrl_emmc>;
clocks = <&sd_clk 1>; clocks = <&sd_clk 1>;
reset-names = "host"; reset-names = "host", "hw";
resets = <&sd_rst 1>; resets = <&sd_rst 1>, <&sd_rst 6>;
bus-width = <8>; bus-width = <8>;
non-removable;
cap-mmc-highspeed; cap-mmc-highspeed;
cap-mmc-hw-reset; cap-mmc-hw-reset;
no-3-3-v; non-removable;
}; };
sd: sdhc@5a400000 { sd: sdhc@5a400000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v3.1.1";
status = "disabled"; status = "disabled";
reg = <0x5a400000 0x800>; reg = <0x5a400000 0x800>;
interrupts = <0 76 4>; interrupts = <0 76 4>;
pinctrl-names = "default", "1.8v"; pinctrl-names = "default", "uhs";
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
pinctrl-1 = <&pinctrl_sd_1v8>; pinctrl-1 = <&pinctrl_sd_uhs>;
clocks = <&sd_clk 0>; clocks = <&sd_clk 0>;
reset-names = "host"; reset-names = "host";
resets = <&sd_rst 0>; resets = <&sd_rst 0>;

8
arch/arm/dts/uniphier-pxs3.dtsi
Unescape View File

@ -342,17 +342,21 @@
}; };
sd: sdhc@5a400000 { sd: sdhc@5a400000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v3.1.1";
status = "disabled"; status = "disabled";
reg = <0x5a400000 0x800>; reg = <0x5a400000 0x800>;
interrupts = <0 76 4>; interrupts = <0 76 4>;
pinctrl-names = "default"; pinctrl-names = "default", "uhs";
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
pinctrl-1 = <&pinctrl_sd_uhs>;
clocks = <&sd_clk 0>; clocks = <&sd_clk 0>;
reset-names = "host"; reset-names = "host";
resets = <&sd_rst 0>; resets = <&sd_rst 0>;
bus-width = <4>; bus-width = <4>;
cap-sd-highspeed; cap-sd-highspeed;
sd-uhs-sdr12;
sd-uhs-sdr25;
sd-uhs-sdr50;
}; };
soc_glue: soc-glue@5f800000 { soc_glue: soc-glue@5f800000 {

14
arch/arm/dts/uniphier-sld8.dtsi
Unescape View File

@ -229,13 +229,13 @@
}; };
sd: sdhc@5a400000 { sd: sdhc@5a400000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v2.91";
status = "disabled"; status = "disabled";
reg = <0x5a400000 0x200>; reg = <0x5a400000 0x200>;
interrupts = <0 76 4>; interrupts = <0 76 4>;
pinctrl-names = "default", "1.8v"; pinctrl-names = "default", "uhs";
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
pinctrl-1 = <&pinctrl_sd_1v8>; pinctrl-1 = <&pinctrl_sd_uhs>;
clocks = <&mio_clk 0>; clocks = <&mio_clk 0>;
reset-names = "host", "bridge"; reset-names = "host", "bridge";
resets = <&mio_rst 0>, <&mio_rst 3>; resets = <&mio_rst 0>, <&mio_rst 3>;
@ -247,19 +247,19 @@
}; };
emmc: sdhc@5a500000 { emmc: sdhc@5a500000 {
compatible = "socionext,uniphier-sdhc"; compatible = "socionext,uniphier-sd-v2.91";
status = "disabled"; status = "disabled";
reg = <0x5a500000 0x200>; reg = <0x5a500000 0x200>;
interrupts = <0 78 4>; interrupts = <0 78 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_emmc>; pinctrl-0 = <&pinctrl_emmc>;
clocks = <&mio_clk 1>; clocks = <&mio_clk 1>;
reset-names = "host", "bridge"; reset-names = "host", "bridge", "hw";
resets = <&mio_rst 1>, <&mio_rst 4>; resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;
bus-width = <8>; bus-width = <8>;
non-removable;
cap-mmc-highspeed; cap-mmc-highspeed;
cap-mmc-hw-reset; cap-mmc-hw-reset;
non-removable;
}; };
usb0: usb@5a800100 { usb0: usb@5a800100 {

4
drivers/mmc/uniphier-sd.c
Unescape View File

@ -25,7 +25,9 @@ static const struct dm_mmc_ops uniphier_sd_ops = {
}; };
static const struct udevice_id uniphier_sd_match[] = { static const struct udevice_id uniphier_sd_match[] = {
{ .compatible = "socionext,uniphier-sdhc", .data = 0 }, { .compatible = "socionext,uniphier-sd-v2.91" },
{ .compatible = "socionext,uniphier-sd-v3.1" },
{ .compatible = "socionext,uniphier-sd-v3.1.1" },
{ /* sentinel */ } { /* sentinel */ }
}; };

Write Preview
Loading…
Cancel
Save