| Message ID | 1444824684-24526-3-git-send-email-ludovic.desroches@atmel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On 14/10/2015 at 14:11:24 +0200, Ludovic Desroches wrote : > Add SAMA5D2 SoC plus Atmel flexcom and Atmel sdhci devices. > > Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> > --- > arch/arm/configs/sama5_defconfig | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > It is probably worth updating the multi_v7_defconfig too (in a separate patch).
On Thu, Oct 15, 2015 at 03:24:51PM +0200, Alexandre Belloni wrote: > Hi, > > On 14/10/2015 at 14:11:24 +0200, Ludovic Desroches wrote : > > Add SAMA5D2 SoC plus Atmel flexcom and Atmel sdhci devices. > > > > Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> > > --- > > arch/arm/configs/sama5_defconfig | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > It is probably worth updating the multi_v7_defconfig too (in a separate > patch). > Maybe I have to send a whole defconfig update . I mean when you do savedefconfig, you have more changes. I won't send each one separately. I have kept changes which were in relation with the stuff I had. Or I can send a defconfig update from the savedefconfig and then add sama5d2, flexcom and sdhci. Ludovic
Le 15/10/2015 17:31, Ludovic Desroches a écrit : > On Thu, Oct 15, 2015 at 03:24:51PM +0200, Alexandre Belloni wrote: >> Hi, >> >> On 14/10/2015 at 14:11:24 +0200, Ludovic Desroches wrote : >>> Add SAMA5D2 SoC plus Atmel flexcom and Atmel sdhci devices. >>> >>> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> >>> --- >>> arch/arm/configs/sama5_defconfig | 6 +++++- >>> 1 file changed, 5 insertions(+), 1 deletion(-) >>> >> It is probably worth updating the multi_v7_defconfig too (in a separate >> patch). >> > > Maybe I have to send a whole defconfig update . I mean when you do > savedefconfig, you have more changes. I won't send each one separately. I > have kept changes which were in relation with the stuff I had. > > Or I can send a defconfig update from the savedefconfig and then add > sama5d2, flexcom and sdhci. Actually you can do this for our own AT91 defconfigs. For the multi_v7_defconfig I would recommend to simply make a patch with our updates and let the arm-soc maintainer merge it with their current one: I mean, they will manage the conflicts on this file anyway and the changes to this file will not be part of one or our pull-requests but a patch that they will handle separately: so no need to add more update than the strictly needed ones on our end. Bye,
On Thu, Oct 15, 2015 at 05:42:53PM +0200, Nicolas Ferre wrote: > Le 15/10/2015 17:31, Ludovic Desroches a écrit : > > On Thu, Oct 15, 2015 at 03:24:51PM +0200, Alexandre Belloni wrote: > >> Hi, > >> > >> On 14/10/2015 at 14:11:24 +0200, Ludovic Desroches wrote : > >>> Add SAMA5D2 SoC plus Atmel flexcom and Atmel sdhci devices. > >>> > >>> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> > >>> --- > >>> arch/arm/configs/sama5_defconfig | 6 +++++- > >>> 1 file changed, 5 insertions(+), 1 deletion(-) > >>> > >> It is probably worth updating the multi_v7_defconfig too (in a separate > >> patch). > >> > > > > Maybe I have to send a whole defconfig update . I mean when you do > > savedefconfig, you have more changes. I won't send each one separately. I > > have kept changes which were in relation with the stuff I had. > > > > Or I can send a defconfig update from the savedefconfig and then add > > sama5d2, flexcom and sdhci. > > Actually you can do this for our own AT91 defconfigs. > > For the multi_v7_defconfig I would recommend to simply make a patch with > our updates and let the arm-soc maintainer merge it with their current > one: I mean, they will manage the conflicts on this file anyway and the > changes to this file will not be part of one or our pull-requests but a > patch that they will handle separately: so no need to add more update > than the strictly needed ones on our end. > In fact, I realize that I have read too quickly Alexandre's answer. I have understood that I should put CONFIG_SOC_SAM_V7=y in a separate patch. So yes I would do a whole update for our defconfigs and only the addition needed for the multi_v7 one Ludovic
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index 31eb951..6e806f5 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -15,7 +15,7 @@ CONFIG_LBDAF=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_AT91=y -CONFIG_SOC_SAM_V7=y +CONFIG_SOC_SAMA5D2=y CONFIG_SOC_SAMA5D3=y CONFIG_SOC_SAMA5D4=y CONFIG_AEABI=y @@ -135,6 +135,7 @@ CONFIG_POWER_SUPPLY=y CONFIG_POWER_RESET=y # CONFIG_HWMON is not set CONFIG_SSB=m +CONFIG_MFD_ATMEL_FLEXCOM=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_ACT8865=y @@ -171,6 +172,9 @@ CONFIG_USB_ATMEL_USBA=y CONFIG_USB_G_SERIAL=y CONFIG_MMC=y # CONFIG_MMC_BLOCK_BOUNCE is not set +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF_AT91=y CONFIG_MMC_ATMELMCI=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y
Add SAMA5D2 SoC plus Atmel flexcom and Atmel sdhci devices. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> --- arch/arm/configs/sama5_defconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)