[U-Boot] [PATCH 0/2] Enable the CONFIG_DM_MMC for Exynos4 series

newer
Re: [U-Boot] [PATCH 1/2] ARM: dts:...

older
[U-Boot] Please pull u-boot-fdt...

Jaehoon Chung

30 May 2017 30 May '17

3:03 a.m.

Enable the CONFIG_DM_MMC for Exynos4 series. To use this, change the nodes relevant to mmc/sd in each dts.

Tested with trats/trats2/universal_c210/odroid. But i didn't test origen board..someone can test it. It's helpful.

Jaehoon Chung (2): ARM: dts: exynos4: change the nodes relevant to mmc/sd configs: enable the CONFIG_DM_MMC for exynos4 series

arch/arm/dts/exynos4.dtsi | 25 +++++++++------ arch/arm/dts/exynos4210-origen.dts | 24 ++++---------- arch/arm/dts/exynos4210-trats.dts | 40 +++++++++--------------- arch/arm/dts/exynos4210-universal_c210.dts | 36 +++++++++------------ arch/arm/dts/exynos4412-odroid.dts | 50 ++++++++++++------------------ arch/arm/dts/exynos4412-trats2.dts | 49 +++++++++++++++-------------- arch/arm/dts/exynos4x12.dtsi | 13 -------- configs/odroid_defconfig | 1 + configs/origen_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + 12 files changed, 99 insertions(+), 143 deletions(-)

-- 2.10.2

Show replies by date

Jaehoon Chung

30 May 30 May

3:03 a.m.

New subject: [U-Boot] [PATCH 1/2] ARM: dts: exynos4: change the nodes relevant to mmc/sd

Change the nodes relevant to mmc/sd for using DM. compatible are also changed to each SoCs.

Signed-off-by: Jaehoon Chung jh80.chung@samsung.com --- arch/arm/dts/exynos4.dtsi | 25 +++++++++------ arch/arm/dts/exynos4210-origen.dts | 24 ++++---------- arch/arm/dts/exynos4210-trats.dts | 40 +++++++++--------------- arch/arm/dts/exynos4210-universal_c210.dts | 36 +++++++++------------ arch/arm/dts/exynos4412-odroid.dts | 50 ++++++++++++------------------ arch/arm/dts/exynos4412-trats2.dts | 49 +++++++++++++++-------------- arch/arm/dts/exynos4x12.dtsi | 13 -------- 7 files changed, 94 insertions(+), 143 deletions(-)

diff --git a/arch/arm/dts/exynos4.dtsi b/arch/arm/dts/exynos4.dtsi index a5a00c8..53d39dc 100644 --- a/arch/arm/dts/exynos4.dtsi +++ b/arch/arm/dts/exynos4.dtsi @@ -122,44 +122,49 @@ interrupts = <7 63 0>; };

- sdhci@12510000 { + sdhci0: sdhci@12510000 { #address-cells = <1>; #size-cells = <0>; - compatible = "samsung,exynos-mmc"; + compatible = "samsung,exynos4412-sdhci"; reg = <0x12510000 0x1000>; interrupts = <0 75 0>; + status = "disabled"; };

- sdhci@12520000 { + sdhci1: sdhci@12520000 { #address-cells = <1>; #size-cells = <0>; - compatible = "samsung,exynos-mmc"; + compatible = "samsung,exynos4412-sdhci"; reg = <0x12520000 0x1000>; interrupts = <0 76 0>; + status = "disabled"; };

- sdhci@12530000 { + sdhci2: sdhci@12530000 { #address-cells = <1>; #size-cells = <0>; - compatible = "samsung,exynos-mmc"; + compatible = "samsung,exynos4412-sdhci"; reg = <0x12530000 0x1000>; interrupts = <0 77 0>; + status = "disabled"; };

- sdhci@12540000 { + sdhci3: sdhci@12540000 { #address-cells = <1>; #size-cells = <0>; - compatible = "samsung,exynos-mmc"; + compatible = "samsung,exynos4412-sdhci"; reg = <0x12540000 0x1000>; interrupts = <0 78 0>; + status = "disabled"; };

- dwmmc@12550000 { + mshc_0: dwmmc@12550000 { #address-cells = <1>; #size-cells = <0>; - compatible = "samsung,exynos-dwmmc"; + compatible = "samsung,exynos4412-dw-mshc"; reg = <0x12550000 0x1000>; interrupts = <0 131 0>; + status = "disabled"; };

}; diff --git a/arch/arm/dts/exynos4210-origen.dts b/arch/arm/dts/exynos4210-origen.dts index 26c4d7f..a13d033 100644 --- a/arch/arm/dts/exynos4210-origen.dts +++ b/arch/arm/dts/exynos4210-origen.dts @@ -22,24 +22,12 @@ aliases { serial0 = "/serial@13800000"; console = "/serial@13820000"; - mmc2 = "/sdhci@12530000"; - }; - - sdhci@12510000 { - status = "disabled"; - }; - - sdhci@12520000 { - status = "disabled"; - }; - - sdhci@12530000 { - samsung,bus-width = <4>; - samsung,timing = <1 2 3>; - cd-gpios = <&gpk2 2 0>; }; +};

- sdhci@12540000 { - status = "disabled"; - }; +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpk2 2 0>; + status = "okay"; }; diff --git a/arch/arm/dts/exynos4210-trats.dts b/arch/arm/dts/exynos4210-trats.dts index ac422e4..2abe3e9 100644 --- a/arch/arm/dts/exynos4210-trats.dts +++ b/arch/arm/dts/exynos4210-trats.dts @@ -21,8 +21,6 @@ aliases { serial0 = "/serial@13800000"; console = "/serial@13820000"; - mmc0 = "/sdhci@12510000"; - mmc2 = "/sdhci@12530000"; i2c8 = &i2c_fg; };

@@ -91,30 +89,6 @@ samsung,dsim-device-reverse-panel = <1>; };

- sdhci@12510000 { - samsung,bus-width = <8>; - samsung,timing = <1 3 3>; - pwr-gpios = <&gpk0 2 0>; - }; - - sdhci@12520000 { - status = "disabled"; - }; - - sdhci@12530000 { - samsung,bus-width = <4>; - samsung,timing = <1 2 3>; - cd-gpios = <&gpx3 4 0>; - }; - - sdhci@12540000 { - status = "disabled"; - }; - - dwmmc@12550000 { - status = "disabled"; - }; - i2c_fg: fuel-gauge { compatible = "i2c-gpio"; gpios = <&gpy4 1 0>, /* sda */ @@ -265,3 +239,17 @@ }; }; }; + +&sdhci0 { + samsung,bus-width = <8>; + samsung,timing = <1 3 3>; + pwr-gpios = <&gpk0 2 0>; + status = "okay"; +}; + +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpx3 4 0>; + status = "okay"; +}; diff --git a/arch/arm/dts/exynos4210-universal_c210.dts b/arch/arm/dts/exynos4210-universal_c210.dts index 5763627..d8ce0e3 100644 --- a/arch/arm/dts/exynos4210-universal_c210.dts +++ b/arch/arm/dts/exynos4210-universal_c210.dts @@ -17,28 +17,6 @@ aliases { serial0 = "/serial@13800000"; console = "/serial@13820000"; - mmc0 = "/sdhci@12510000"; - mmc2 = "/sdhci@12530000"; - }; - - sdhci@12510000 { - samsung,bus-width = <8>; - samsung,timing = <1 3 3>; - pwr-gpios = <&gpk0 2 0>; - }; - - sdhci@12520000 { - status = "disabled"; - }; - - sdhci@12530000 { - samsung,bus-width = <4>; - samsung,timing = <1 2 3>; - cd-gpios = <&gpx3 4 0>; - }; - - sdhci@12540000 { - status = "disabled"; };

soft-spi { @@ -258,3 +236,17 @@ }; }; }; + +&sdhci0 { + samsung,bus-width = <8>; + samsung,timing = <1 3 3>; + pwr-gpios = <&gpk0 2 0>; + status = "okay"; +}; + +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpx3 4 0>; + status = "okay"; +}; diff --git a/arch/arm/dts/exynos4412-odroid.dts b/arch/arm/dts/exynos4412-odroid.dts index 8710747..ecfd5d1 100644 --- a/arch/arm/dts/exynos4412-odroid.dts +++ b/arch/arm/dts/exynos4412-odroid.dts @@ -25,8 +25,8 @@ i2c7 = "/i2c@138d0000"; serial0 = "/serial@13800000"; console = "/serial@13810000"; - mmc2 = "/sdhci@12530000"; - mmc4 = "/dwmmc@12550000"; + mmc0 = &mshc_0; + mmc1 = &sdhci2; };

i2c@13860000 { @@ -224,34 +224,6 @@ status = "okay"; };

- sdhci@12510000 { - status = "disabled"; - }; - - sdhci@12520000 { - status = "disabled"; - }; - - sdhci@12530000 { - samsung,bus-width = <4>; - samsung,timing = <1 2 3>; - cd-gpios = <&gpk2 2 0>; - }; - - sdhci@12540000 { - status = "disabled"; - }; - - dwmmc@12550000 { - samsung,bus-width = <8>; - samsung,timing = <2 1 0>; - samsung,removable = <0>; - fifoth_val = <0x203f0040>; - bus_hz = <400000000>; - div = <0x3>; - index = <4>; - }; - ehci@12580000 { compatible = "samsung,exynos-ehci"; reg = <0x12580000 0x100>; @@ -268,3 +240,21 @@ reset-gpio = <&gpk1 2 0>; }; }; + +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpk2 2 0>; + status = "okay"; +}; + +&mshc_0 { + samsung,bus-width = <8>; + samsung,timing = <2 1 0>; + samsung,removable = <0>; + fifoth_val = <0x203f0040>; + bus_hz = <400000000>; + div = <0x3>; + index = <4>; + status = "okay"; +}; diff --git a/arch/arm/dts/exynos4412-trats2.dts b/arch/arm/dts/exynos4412-trats2.dts index fd9e48c..0938e79 100644 --- a/arch/arm/dts/exynos4412-trats2.dts +++ b/arch/arm/dts/exynos4412-trats2.dts @@ -31,9 +31,8 @@ i2c9 = &i2c_max77693; serial0 = "/serial@13800000"; console = "/serial@13820000"; - mmc0 = "/sdhci@12510000"; - mmc2 = "/sdhci@12530000"; - mshc0 = "/dwmmc@12550000"; + mmc0 = &mshc_0; + mmc1 = &sdhci2; };

i2c_fg: fuel-gauge { @@ -437,28 +436,30 @@ pwr-gpios = <&gpk0 4 0>; status = "disabled"; }; +};

- sdhci@12520000 { - status = "disabled"; - }; - - sdhci@12530000 { - samsung,bus-width = <4>; - samsung,timing = <1 2 3>; - cd-gpios = <&gpk2 2 0>; - }; +&sdhci0 { + samsung,bus-width = <8>; + samsung,timing = <1 3 3>; + pwr-gpios = <&gpk0 4 0>; + status = "disabled"; +};

- sdhci@12540000 { - status = "disabled"; - }; +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpk2 2 0>; + status = "okay"; +};

- dwmmc@12550000 { - samsung,bus-width = <8>; - samsung,timing = <2 1 0>; - pwr-gpios = <&gpk0 4 0>; - fifoth_val = <0x203f0040>; - bus_hz = <400000000>; - div = <0x3>; - index = <4>; - }; +&mshc_0 { + samsung,bus-width = <8>; + samsung,timing = <2 1 0>; + samsung,removable = <0>; + fifoth_val = <0x203f0040>; + bus_hz = <400000000>; + div = <0x3>; + index = <4>; + fifo-depth = <0x80>; + status = "okay"; }; diff --git a/arch/arm/dts/exynos4x12.dtsi b/arch/arm/dts/exynos4x12.dtsi index 5d58c6e..b977288 100644 --- a/arch/arm/dts/exynos4x12.dtsi +++ b/arch/arm/dts/exynos4x12.dtsi @@ -27,7 +27,6 @@ pinctrl1 = &pinctrl_1; pinctrl2 = &pinctrl_2; pinctrl3 = &pinctrl_3; - mshc0 = &mshc_0; };

pd_isp: isp-power-domain@10023CA0 { @@ -100,16 +99,4 @@ clock-names = "sclk_fimg2d", "fimg2d"; status = "disabled"; }; - - mshc_0: mmc@12550000 { - compatible = "samsung,exynos4412-dw-mshc"; - reg = <0x12550000 0x1000>; - interrupts = <0 77 0>; - #address-cells = <1>; - #size-cells = <0>; - fifo-depth = <0x80>; - clocks = <&clock 301>, <&clock 149>; - clock-names = "biu", "ciu"; - status = "disabled"; - }; };

-- 2.10.2

Minkyu Kang

5 Jun 5 Jun

5:56 a.m.

New subject: [U-Boot] [PATCH 1/2] ARM: dts: exynos4: change the nodes relevant to mmc/sd

2017. 5. 30. 10:05에 "Jaehoon Chung" jh80.chung@samsung.com님이 작성:

Change the nodes relevant to mmc/sd for using DM. compatible are also changed to each SoCs.

}; diff --git a/arch/arm/dts/exynos4210-origen.dts b/arch/arm/dts/exynos4210- origen.dts index 26c4d7f..a13d033 100644 --- a/arch/arm/dts/exynos4210-origen.dts +++ b/arch/arm/dts/exynos4210-origen.dts @@ -22,24 +22,12 @@ aliases { serial0 = "/serial@13800000"; console = "/serial@13820000"; - mmc2 = "/sdhci@12530000"; - }; - - sdhci@12510000 { - status = "disabled"; - }; - - sdhci@12520000 { - status = "disabled"; - }; - - sdhci@12530000 { - samsung,bus-width = <4>; - samsung,timing = <1 2 3>; - cd-gpios = <&gpk2 2 0>; }; +};

- sdhci@12540000 { - status = "disabled"; - }; +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpk2 2 0>; + status = "okay"; }; diff --git a/arch/arm/dts/exynos4210-trats.dts b/arch/arm/dts/exynos4210- trats.dts index ac422e4..2abe3e9 100644 --- a/arch/arm/dts/exynos4210-trats.dts +++ b/arch/arm/dts/exynos4210-trats.dts @@ -21,8 +21,6 @@ aliases { serial0 = "/serial@13800000"; console = "/serial@13820000"; - mmc0 = "/sdhci@12510000"; - mmc2 = "/sdhci@12530000"; i2c8 = &i2c_fg; };

@@ -91,30 +89,6 @@ samsung,dsim-device-reverse-panel = <1>; };

soft-spi { @@ -258,3 +236,17 @@ }; }; }; + +&sdhci0 { + samsung,bus-width = <8>; + samsung,timing = <1 3 3>; + pwr-gpios = <&gpk0 2 0>; + status = "okay"; +}; + +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpx3 4 0>; + status = "okay"; +}; diff --git a/arch/arm/dts/exynos4412-odroid.dts b/arch/arm/dts/exynos4412- odroid.dts index 8710747..ecfd5d1 100644 --- a/arch/arm/dts/exynos4412-odroid.dts +++ b/arch/arm/dts/exynos4412-odroid.dts @@ -25,8 +25,8 @@ i2c7 = "/i2c@138d0000"; serial0 = "/serial@13800000"; console = "/serial@13810000"; - mmc2 = "/sdhci@12530000"; - mmc4 = "/dwmmc@12550000"; + mmc0 = &mshc_0; + mmc1 = &sdhci2; };

i2c@13860000 { @@ -224,34 +224,6 @@ status = "okay"; };

- sdhci@12510000 { - status = "disabled"; - }; - - sdhci@12520000 { - status = "disabled"; - }; - - sdhci@12530000 { - samsung,bus-width = <4>; - samsung,timing = <1 2 3>; - cd-gpios = <&gpk2 2 0>; - }; - - sdhci@12540000 { - status = "disabled"; - }; - - dwmmc@12550000 { - samsung,bus-width = <8>; - samsung,timing = <2 1 0>; - samsung,removable = <0>; - fifoth_val = <0x203f0040>; - bus_hz = <400000000>; - div = <0x3>; - index = <4>; - }; - ehci@12580000 { compatible = "samsung,exynos-ehci"; reg = <0x12580000 0x100>; @@ -268,3 +240,21 @@ reset-gpio = <&gpk1 2 0>; }; }; + +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpk2 2 0>; + status = "okay"; +}; + +&mshc_0 { + samsung,bus-width = <8>; + samsung,timing = <2 1 0>; + samsung,removable = <0>; + fifoth_val = <0x203f0040>; + bus_hz = <400000000>; + div = <0x3>; + index = <4>; + status = "okay"; +}; diff --git a/arch/arm/dts/exynos4412-trats2.dts b/arch/arm/dts/exynos4412- trats2.dts index fd9e48c..0938e79 100644 --- a/arch/arm/dts/exynos4412-trats2.dts +++ b/arch/arm/dts/exynos4412-trats2.dts @@ -31,9 +31,8 @@ i2c9 = &i2c_max77693; serial0 = "/serial@13800000"; console = "/serial@13820000"; - mmc0 = "/sdhci@12510000"; - mmc2 = "/sdhci@12530000"; - mshc0 = "/dwmmc@12550000"; + mmc0 = &mshc_0; + mmc1 = &sdhci2; };

i2c_fg: fuel-gauge { @@ -437,28 +436,30 @@ pwr-gpios = <&gpk0 4 0>; status = "disabled"; }; +};

- sdhci@12540000 { - status = "disabled"; - }; +&sdhci2 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpk2 2 0>; + status = "okay"; +};

_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot

applied to u-boot-samsung

Thanks

Jaehoon Chung

30 May 30 May

3:03 a.m.

New subject: [U-Boot] [PATCH 2/2] configs: enable the CONFIG_DM_MMC for exynos4 series

Enable the CONFIG_DM_MMC for exynos4 series.

diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index a28058a..45c8904 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -39,6 +39,7 @@ CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_COMPAT=y +CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index dfb08fb..573c9e2 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index c342fa9..021e6c5 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -33,6 +33,7 @@ CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_SYS_I2C_S3C24X0=y +CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index 8c92f2f..16ac27f 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -37,6 +37,7 @@ CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_S3C24X0=y +CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 09797c3..0f2445b 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -36,6 +36,7 @@ CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_S3C24X0=y +CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y

-- 2.10.2

Minkyu Kang

5 Jun 5 Jun

5:54 a.m.

New subject: [U-Boot] [PATCH 2/2] configs: enable the CONFIG_DM_MMC for exynos4 series

2017. 5. 30. 10:04에 "Jaehoon Chung" jh80.chung@samsung.com님이 작성:

Enable the CONFIG_DM_MMC for exynos4 series.

_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot

applied to u-boot-samsung

Thanks

2895

Age (days ago)

2901

Last active (days ago)

List overview

Download

4 comments

2 participants

tags (0)

participants (2)

Jaehoon Chung
Minkyu Kang