* [PATCH 2/3] arm: dts: Add mmc[01] aliases to am33xx.dtsi
2022-02-18 12:28 ` [PATCH 1/3] arm: mmc: Add "ti, am335-sdhci" compatible for TI's omap_hsmmc driver Lukasz Majewski
@ 2022-02-18 12:28 ` Lukasz Majewski
2022-03-07 21:23 ` Tom Rini
2022-02-18 12:28 ` [PATCH 3/3] arm: dts: Add DTS description for MMC2 am33xx devices Lukasz Majewski
` (3 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Lukasz Majewski @ 2022-02-18 12:28 UTC (permalink / raw)
To: Tom Rini, u-boot; +Cc: Lukasz Majewski, Matwey V. Kornilov, Paul Barker
This change provides similar aliases definitions as now present in
Linux kernel v5.16.9 for am33xx.dtsi file.
Signed-off-by: Lukasz Majewski <lukma@denx.de>
---
arch/arm/dts/am33xx.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/dts/am33xx.dtsi b/arch/arm/dts/am33xx.dtsi
index b5093020ee..5f9b306ddb 100644
--- a/arch/arm/dts/am33xx.dtsi
+++ b/arch/arm/dts/am33xx.dtsi
@@ -40,6 +40,8 @@
ethernet1 = &cpsw_emac1;
spi0 = &spi0;
spi1 = &spi1;
+ mmc0 = &mmc1;
+ mmc1 = &mmc2;
};
cpus {
--
2.20.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/3] arm: dts: Add DTS description for MMC2 am33xx devices
2022-02-18 12:28 ` [PATCH 1/3] arm: mmc: Add "ti, am335-sdhci" compatible for TI's omap_hsmmc driver Lukasz Majewski
2022-02-18 12:28 ` [PATCH 2/3] arm: dts: Add mmc[01] aliases to am33xx.dtsi Lukasz Majewski
@ 2022-02-18 12:28 ` Lukasz Majewski
2022-03-07 21:23 ` Tom Rini
2022-02-24 12:53 ` [PATCH 1/3] arm: mmc: Add "ti,am335-sdhci" compatible for TI's omap_hsmmc driver Jaehoon Chung
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Lukasz Majewski @ 2022-02-18 12:28 UTC (permalink / raw)
To: Tom Rini, u-boot; +Cc: Lukasz Majewski, Matwey V. Kornilov, Paul Barker
This code has been ported from Linux v5.16.9 arch/arm/boot/dts/am33xx.dtsi
file to allow correct usage of MMC2 controller in U-Boot.
This IP block is a bit specific as it is connected to L3 interconnect bus,
whereas mmc[01] are connected to L4.
Proper configuration of this block (including providing clock) is handled
in ti-sysc.c driver.
Signed-off-by: Lukasz Majewski <lukma@denx.de>
---
arch/arm/dts/am33xx.dtsi | 39 ++++++++++++++++++++++++++++++---------
1 file changed, 30 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/am33xx.dtsi b/arch/arm/dts/am33xx.dtsi
index 5f9b306ddb..5871344edb 100644
--- a/arch/arm/dts/am33xx.dtsi
+++ b/arch/arm/dts/am33xx.dtsi
@@ -42,6 +42,7 @@
spi1 = &spi1;
mmc0 = &mmc1;
mmc1 = &mmc2;
+ mmc2 = &mmc3;
};
cpus {
@@ -303,6 +304,35 @@
};
};
+ target-module@47810000 {
+ compatible = "ti,sysc-omap2", "ti,sysc";
+ reg = <0x478102fc 0x4>,
+ <0x47810110 0x4>,
+ <0x47810114 0x4>;
+ reg-names = "rev", "sysc", "syss";
+ ti,sysc-mask = <(SYSC_OMAP2_CLOCKACTIVITY |
+ SYSC_OMAP2_ENAWAKEUP |
+ SYSC_OMAP2_SOFTRESET |
+ SYSC_OMAP2_AUTOIDLE)>;
+ ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+ <SYSC_IDLE_NO>,
+ <SYSC_IDLE_SMART>;
+ ti,syss-mask = <1>;
+ clocks = <&l3s_clkctrl AM3_L3S_MMC3_CLKCTRL 0>;
+ clock-names = "fck";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0x0 0x47810000 0x1000>;
+
+ mmc3: mmc@0 {
+ compatible = "ti,am335-sdhci";
+ ti,needs-special-reset;
+ interrupts = <29>;
+ reg = <0x0 0x1000>;
+ status = "disabled";
+ };
+ };
+
i2c0: i2c@44e0b000 {
compatible = "ti,omap4-i2c";
#address-cells = <1>;
@@ -359,15 +389,6 @@
status = "disabled";
};
- mmc3: mmc@47810000 {
- compatible = "ti,omap4-hsmmc";
- ti,hwmods = "mmc3";
- ti,needs-special-reset;
- interrupts = <29>;
- reg = <0x47810000 0x1000>;
- status = "disabled";
- };
-
wdt2: wdt@44e35000 {
compatible = "ti,omap3-wdt";
ti,hwmods = "wd_timer2";
--
2.20.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] arm: dts: Add DTS description for MMC2 am33xx devices
2022-02-18 12:28 ` [PATCH 3/3] arm: dts: Add DTS description for MMC2 am33xx devices Lukasz Majewski
@ 2022-03-07 21:23 ` Tom Rini
0 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2022-03-07 21:23 UTC (permalink / raw)
To: Lukasz Majewski; +Cc: u-boot, Matwey V. Kornilov, Paul Barker
[-- Attachment #1: Type: text/plain, Size: 535 bytes --]
On Fri, Feb 18, 2022 at 01:28:43PM +0100, Lukasz Majewski wrote:
> This code has been ported from Linux v5.16.9 arch/arm/boot/dts/am33xx.dtsi
> file to allow correct usage of MMC2 controller in U-Boot.
>
> This IP block is a bit specific as it is connected to L3 interconnect bus,
> whereas mmc[01] are connected to L4.
>
> Proper configuration of this block (including providing clock) is handled
> in ti-sysc.c driver.
>
> Signed-off-by: Lukasz Majewski <lukma@denx.de>
Applied to u-boot/next, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] arm: mmc: Add "ti,am335-sdhci" compatible for TI's omap_hsmmc driver
2022-02-18 12:28 ` [PATCH 1/3] arm: mmc: Add "ti, am335-sdhci" compatible for TI's omap_hsmmc driver Lukasz Majewski
2022-02-18 12:28 ` [PATCH 2/3] arm: dts: Add mmc[01] aliases to am33xx.dtsi Lukasz Majewski
2022-02-18 12:28 ` [PATCH 3/3] arm: dts: Add DTS description for MMC2 am33xx devices Lukasz Majewski
@ 2022-02-24 12:53 ` Jaehoon Chung
2022-03-03 9:28 ` Lukasz Majewski
2022-03-07 21:23 ` [PATCH 1/3] arm: mmc: Add "ti, am335-sdhci" " Tom Rini
4 siblings, 0 replies; 8+ messages in thread
From: Jaehoon Chung @ 2022-02-24 12:53 UTC (permalink / raw)
To: Lukasz Majewski, Tom Rini, u-boot; +Cc: Peng Fan
On 2/18/22 21:28, Lukasz Majewski wrote:
> In the Linux kernel (v5.16) for this SoC there are two separate drivers
> - namely sdhci-omap.c and omap_hsmmc.c which have separate set of
> compatibles.
>
> The U-Boot's drivers/mmc/omap_hsmmc.c driver supports both eMMC and
> SD devices - hence the compatible for SDHCI can be added.
>
> After this change the am335x DTS description can be easier ported
> from Linux kernel.
>
> Signed-off-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Best Regards,
Jaehoon Chung
> ---
>
> drivers/mmc/omap_hsmmc.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
> index 820065800f..b2f4a4e721 100644
> --- a/drivers/mmc/omap_hsmmc.c
> +++ b/drivers/mmc/omap_hsmmc.c
> @@ -2019,6 +2019,7 @@ static const struct udevice_id omap_hsmmc_ids[] = {
> { .compatible = "ti,omap3-hsmmc" },
> { .compatible = "ti,omap4-hsmmc" },
> { .compatible = "ti,am33xx-hsmmc" },
> + { .compatible = "ti,am335-sdhci" },
> { .compatible = "ti,dra7-hsmmc", .data = (ulong)&dra7_mmc_of_data },
> { }
> };
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] arm: mmc: Add "ti,am335-sdhci" compatible for TI's omap_hsmmc driver
2022-02-18 12:28 ` [PATCH 1/3] arm: mmc: Add "ti, am335-sdhci" compatible for TI's omap_hsmmc driver Lukasz Majewski
` (2 preceding siblings ...)
2022-02-24 12:53 ` [PATCH 1/3] arm: mmc: Add "ti,am335-sdhci" compatible for TI's omap_hsmmc driver Jaehoon Chung
@ 2022-03-03 9:28 ` Lukasz Majewski
2022-03-07 21:23 ` [PATCH 1/3] arm: mmc: Add "ti, am335-sdhci" " Tom Rini
4 siblings, 0 replies; 8+ messages in thread
From: Lukasz Majewski @ 2022-03-03 9:28 UTC (permalink / raw)
To: Tom Rini, u-boot; +Cc: Jaehoon Chung, Peng Fan
[-- Attachment #1: Type: text/plain, Size: 1352 bytes --]
Hi Tom,
> In the Linux kernel (v5.16) for this SoC there are two separate
> drivers
> - namely sdhci-omap.c and omap_hsmmc.c which have separate set of
> compatibles.
>
> The U-Boot's drivers/mmc/omap_hsmmc.c driver supports both eMMC and
> SD devices - hence the compatible for SDHCI can be added.
>
> After this change the am335x DTS description can be easier ported
> from Linux kernel.
>
Gentle ping on this patch series.
> Signed-off-by: Lukasz Majewski <lukma@denx.de>
> ---
>
> drivers/mmc/omap_hsmmc.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
> index 820065800f..b2f4a4e721 100644
> --- a/drivers/mmc/omap_hsmmc.c
> +++ b/drivers/mmc/omap_hsmmc.c
> @@ -2019,6 +2019,7 @@ static const struct udevice_id omap_hsmmc_ids[]
> = { { .compatible = "ti,omap3-hsmmc" },
> { .compatible = "ti,omap4-hsmmc" },
> { .compatible = "ti,am33xx-hsmmc" },
> + { .compatible = "ti,am335-sdhci" },
> { .compatible = "ti,dra7-hsmmc", .data =
> (ulong)&dra7_mmc_of_data }, { }
> };
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] arm: mmc: Add "ti, am335-sdhci" compatible for TI's omap_hsmmc driver
2022-02-18 12:28 ` [PATCH 1/3] arm: mmc: Add "ti, am335-sdhci" compatible for TI's omap_hsmmc driver Lukasz Majewski
` (3 preceding siblings ...)
2022-03-03 9:28 ` Lukasz Majewski
@ 2022-03-07 21:23 ` Tom Rini
4 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2022-03-07 21:23 UTC (permalink / raw)
To: Lukasz Majewski; +Cc: u-boot, Jaehoon Chung, Peng Fan
[-- Attachment #1: Type: text/plain, Size: 615 bytes --]
On Fri, Feb 18, 2022 at 01:28:41PM +0100, Lukasz Majewski wrote:
> In the Linux kernel (v5.16) for this SoC there are two separate drivers
> - namely sdhci-omap.c and omap_hsmmc.c which have separate set of
> compatibles.
>
> The U-Boot's drivers/mmc/omap_hsmmc.c driver supports both eMMC and
> SD devices - hence the compatible for SDHCI can be added.
>
> After this change the am335x DTS description can be easier ported
> from Linux kernel.
>
> Signed-off-by: Lukasz Majewski <lukma@denx.de>
> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Applied to u-boot/next, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread