Skip to contentSkip to conversation

ARM: davinci_all_defconfig: Enable some UBI modules

PATCH New Karl Beldan 2 participants 7 messages Aug 19, 2016 – Aug 23, 2016

Subsystems (3)
Arm (32-bit) Arm sub-architectures TI DaVinci machine support
lore
Share & tools
lore

Karl Beldan

author
#0 lore raw

PATCH 1/1 ARM: davinci_all_defconfig: Enable some UBI modules

This enables UBI+UBIFS to handle the NAND MTDs, including the useful MTD_UBI_BLOCK.

Signed-off-by Karl Beldan <[email protected]>
---
 arch/arm/configs/davinci_all_defconfig | 3 +++
 1 file changed, 3 insertions(+)
arch/arm/configs/davinci_all_defconfig +3 -0
index cc94af9d..5e5dd6b 100644
@@ -66,6 +66,8 @@ CONFIG_MTD_M25P80=m
 CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_DAVINCI=m
 CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_BLOCK=y
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=1

@@ -188,6 +190,7 @@ CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=m
+CONFIG_UBIFS_FS=m
 CONFIG_CRAMFS=y
 CONFIG_MINIX_FS=m
 CONFIG_NFS_FS=y
Signature · 1 line
2.9.2
author
#1 lore raw

PATCH v2 1/1 ARM: davinci: da8xx-dt: Add ti-aemif lookup for clock matching

The davinci boards don't have their clocks in DT yet and getting a clock with a null con_id will fail, unless registering them as clk_lookups. This registers the aemif clock for the ti-aemif memory driver.

The current aemif lookup entry resolving to the same clock:
'CLK(NULL, "aemif", &aemif_clk)'
is currently used by davinci_nand and remains for non-DT and backward compatibility.

Currently the davinci boards only configure the AEMIF in case of non-DT boot, via some code in mach-davinci.
This change will allow DT-based davinci platforms to do the same, via the ti-aemif memory driver code.

Signed-off-by Karl Beldan <[email protected]>

---
This patch was originally patch 1/4 of the series
"Add DT support for NAND to LCDK via ti-aemif" from which two other patches have already applied in Sekhar's tree.
Sekhar, please note that commit 31e3a881 ("ARM: dts: da850,da850-evm:
Add an aemif node and use it for the NAND") of your tree depends on this change.

Thanks,
Karl

v2:
- Reword the commit message more accurately after Sekhar's feedback

 arch/arm/mach-davinci/da850.c    | 1 +
 arch/arm/mach-davinci/da8xx-dt.c | 1 +
 2 files changed, 2 insertions(+)
arch/arm/mach-davinci/da850.c +1 -0
index 0d046ac..ed3d0e9 100644
@@ -501,6 +501,7 @@ static struct clk_lookup da850_clks[] = {
 	CLK("da8xx_lcdc.0",	"fck",		&lcdc_clk),
 	CLK("da830-mmc.0",	NULL,		&mmcsd0_clk),
 	CLK("da830-mmc.1",	NULL,		&mmcsd1_clk),
+	CLK("ti-aemif",		NULL,		&aemif_clk),
 	CLK(NULL,		"aemif",	&aemif_clk),
 	CLK(NULL,		"usb11",	&usb11_clk),
 	CLK(NULL,		"usb20",	&usb20_clk),
arch/arm/mach-davinci/da8xx-dt.c +1 -0
index ca99711..c9f7e92 100644
@@ -37,6 +37,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("ti,davinci-dm6467-emac", 0x01e20000, "davinci_emac.1",
 		       NULL),
 	OF_DEV_AUXDATA("ti,da830-mcasp-audio", 0x01d00000, "davinci-mcasp.0", NULL),
+	OF_DEV_AUXDATA("ti,da850-aemif", 0x68000000, "ti-aemif", NULL),
 	{}
 };
Signature · 1 line
2.9.2
#2 lore raw

PATCH v2 1/1 ARM: davinci: da8xx-dt: Add ti-aemif lookup for clock matching

Quoted 2 lines · Karl Beldan

The davinci boards don't have their clocks in DT yet and getting a clock with a null con_id will fail, unless registering them as clk_lookups.

This statement is true, but I am not sure why you limit it to those clocks with null con_id. On DaVinci, all clocks need to be registered via a clk_lookup entry. Else clk_get() will fail.

So can I just edit this to:

"
The davinci boards don't have their clocks in DT yet and getting a clock will fail, unless registering them as clk_lookups.
"

while applying?

Quoted 12 lines

This registers the aemif clock for the ti-aemif memory driver.

The current aemif lookup entry resolving to the same clock:
'CLK(NULL, "aemif", &aemif_clk)'
is currently used by davinci_nand and remains for non-DT and backward compatibility.

Currently the davinci boards only configure the AEMIF in case of non-DT boot, via some code in mach-davinci.
This change will allow DT-based davinci platforms to do the same, via the ti-aemif memory driver code.

Quoted 8 lines
Signed-off-by Karl Beldan <[email protected]>

---
This patch was originally patch 1/4 of the series
"Add DT support for NAND to LCDK via ti-aemif" from which two other patches have already applied in Sekhar's tree.
Sekhar, please note that commit 31e3a881 ("ARM: dts: da850,da850-evm:
Add an aemif node and use it for the NAND") of your tree depends on this change.

yes, noted. While sending the pull request to ARM-SoC, I send the SoC changes first.

Thanks,
Sekhar

author
#3 lore raw

PATCH v2 1/1 ARM: davinci: da8xx-dt: Add ti-aemif lookup for clock matching

Quoted 8 lines · Sekhar Nori
Quoted 2 lines · Karl Beldan

The davinci boards don't have their clocks in DT yet and getting a clock with a null con_id will fail, unless registering them as clk_lookups.

This statement is true, but I am not sure why you limit it to those clocks with null con_id. On DaVinci, all clocks need to be registered via a clk_lookup entry. Else clk_get() will fail.

Quoted 9 lines

So can I just edit this to:

"
The davinci boards don't have their clocks in DT yet and getting a clock will fail, unless registering them as clk_lookups.
"

while applying?

Sure, as well as a 'reworded commit message' tag.

Thanks,
Karl

Quoted 26 lines
Quoted 12 lines

This registers the aemif clock for the ti-aemif memory driver.

The current aemif lookup entry resolving to the same clock:
'CLK(NULL, "aemif", &aemif_clk)'
is currently used by davinci_nand and remains for non-DT and backward compatibility.

Currently the davinci boards only configure the AEMIF in case of non-DT boot, via some code in mach-davinci.
This change will allow DT-based davinci platforms to do the same, via the ti-aemif memory driver code.

Quoted 8 lines
Signed-off-by Karl Beldan <[email protected]>

---
This patch was originally patch 1/4 of the series
"Add DT support for NAND to LCDK via ti-aemif" from which two other patches have already applied in Sekhar's tree.
Sekhar, please note that commit 31e3a881 ("ARM: dts: da850,da850-evm:
Add an aemif node and use it for the NAND") of your tree depends on this change.

yes, noted. While sending the pull request to ARM-SoC, I send the SoC changes first.

Thanks,
Sekhar

Applied
#4 lore raw

PATCH v2 1/1 ARM: davinci: da8xx-dt: Add ti-aemif lookup for clock matching

Quoted 16 lines · Karl Beldan
Quoted 15 lines · Sekhar Nori
Quoted 2 lines · Karl Beldan

The davinci boards don't have their clocks in DT yet and getting a clock with a null con_id will fail, unless registering them as clk_lookups.

This statement is true, but I am not sure why you limit it to those clocks with null con_id. On DaVinci, all clocks need to be registered via a clk_lookup entry. Else clk_get() will fail.

So can I just edit this to:

"
The davinci boards don't have their clocks in DT yet and getting a clock will fail, unless registering them as clk_lookups.
"

Quoted 4 lines
Quoted 2 lines

while applying?

Sure, as well as a 'reworded commit message' tag.

Applied to v4.9/soc

Author:     Karl Beldan <[email protected]>
AuthorDate: Fri Aug 19 16:47:36 2016 +0000
Commit:     Sekhar Nori <[email protected]>
CommitDate: Tue Aug 23 16:32:31 2016 +0530

ARM: davinci: da8xx-dt: Add ti-aemif lookup for clock matching

The davinci boards don't have their clocks in DT yet and getting a clock will fail, unless registering them as clk_lookups. This registers the aemif clock for the ti-aemif memory driver.

The current aemif lookup entry resolving to the same clock:
'CLK(NULL, "aemif", &aemif_clk)'
is currently used by davinci_nand and remains for non-DT and backward compatibility.

Currently the davinci boards only configure the AEMIF in case of non-DT boot, via some code in mach-davinci.
This change will allow DT-based davinci platforms to do the same, via the ti-aemif memory driver code.

Signed-off-by Karl Beldan <[email protected]>
[nsekhar at ti.com: reworded commit message]
Signed-off-by Sekhar Nori <[email protected]>

Thanks,
Sekhar

author
#5 lore raw

PATCH 1/1 ARM: davinci_all_defconfig: Enable some UBI modules

In reply to Karl Beldan
Quoted 8 lines · Karl Beldan

This enables UBI+UBIFS to handle the NAND MTDs, including the useful MTD_UBI_BLOCK.

Signed-off-by Karl Beldan <[email protected]>
---
 arch/arm/configs/davinci_all_defconfig | 3 +++
 1 file changed, 3 insertions(+)

I wanted to send this one after
"[PATCH v2] ARM: davinci: da8xx-dt: Add ti-aemif lookup for clock matching" but wildcards failed me. I didn't include it in a series as said commit is already a dependency of already applied changes.

Rgds,
Karl