Hi Chris,
After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/mmc/host/tmio_mmc_pio.c: In function 'sd_ctrl_read16_rep':
drivers/mmc/host/tmio_mmc_pio.c:56: error: implicit declaration of function 'readsw'
drivers/mmc/host/tmio_mmc_pio.c: In function 'sd_ctrl_write16_rep':
drivers/mmc/host/tmio_mmc_pio.c:73: error: implicit declaration of function 'writesw'
Presumably caused by commit b6147490e6aa ("mmc: tmio: split core
functionality, DMA and MFD glue").
I have used the mmc tree from next-20110325 for tdoay.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
Fix build breakage on platforms, not providing readsw and writesw
functions, e.g., on x86(_64).
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Guennadi Liakhovetski <[email protected]>
---
Subject: Re: linux-next: build failure after merge of the mmc tree
On Mon, 28 Mar 2011, Stephen Rothwell wrote:
> Hi Chris,
>
> After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/mmc/host/tmio_mmc_pio.c: In function 'sd_ctrl_read16_rep':
> drivers/mmc/host/tmio_mmc_pio.c:56: error: implicit declaration of function 'readsw'
> drivers/mmc/host/tmio_mmc_pio.c: In function 'sd_ctrl_write16_rep':
> drivers/mmc/host/tmio_mmc_pio.c:73: error: implicit declaration of function 'writesw'
>
> Presumably caused by commit b6147490e6aa ("mmc: tmio: split core
> functionality, DMA and MFD glue").
>
> I have used the mmc tree from next-20110325 for tdoay.
Stephen, please verify, that this fixes your problem.
drivers/mmc/host/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 0b03cee..94df405 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -452,6 +452,7 @@ config MMC_TMIO
config MMC_SDHI
tristate "SH-Mobile SDHI SD/SDIO controller support"
+ depends on SUPERH || ARCH_SHMOBILE
select MMC_TMIO_CORE
help
This provides support for the SDHI SD/SDIO controller found in
--
1.7.2.5
Hi,
On Mon, Mar 28 2011, Guennadi Liakhovetski wrote:
> Fix build breakage on platforms, not providing readsw and writesw
> functions, e.g., on x86(_64).
>
> Reported-by: Stephen Rothwell <[email protected]>
> Signed-off-by: Guennadi Liakhovetski <[email protected]>
> ---
>
> Subject: Re: linux-next: build failure after merge of the mmc tree
>
> On Mon, 28 Mar 2011, Stephen Rothwell wrote:
>
>> Hi Chris,
>>
>> After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
>> failed like this:
>>
>> drivers/mmc/host/tmio_mmc_pio.c: In function 'sd_ctrl_read16_rep':
>> drivers/mmc/host/tmio_mmc_pio.c:56: error: implicit declaration of function 'readsw'
>> drivers/mmc/host/tmio_mmc_pio.c: In function 'sd_ctrl_write16_rep':
>> drivers/mmc/host/tmio_mmc_pio.c:73: error: implicit declaration of function 'writesw'
>>
>> Presumably caused by commit b6147490e6aa ("mmc: tmio: split core
>> functionality, DMA and MFD glue").
>>
>> I have used the mmc tree from next-20110325 for tdoay.
>
> Stephen, please verify, that this fixes your problem.
I've verified the fix and pushed it to mmc-next, so this should be fixed
tomorrow. Thanks!
- Chris.
--
Chris Ball <[email protected]> <http://printf.net/>
One Laptop Per Child
Hi all,
On Tue, 17 Dec 2013 16:06:19 +0800 Dong Aisheng <[email protected]> wrote:
>
> I tested that Chris tree does not have problem.
> It's caused by IMX tree updates.
>
> Chris,
> Is the way Shawn suggested OK for you?
Can we have some resolution of this please? This failed to build again
today so I have used the version of the mmc tree from next-20131212
again. I tried the obvious fix (s/pinctrl_usdhc4_1/pinctrl_usdhc4/) but
that didn't work.
--
Cheers,
Stephen Rothwell [email protected]
Hi Stephen,
On Mon, Jan 06, 2014 at 05:22:43PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 17 Dec 2013 16:06:19 +0800 Dong Aisheng <[email protected]> wrote:
> >
> > I tested that Chris tree does not have problem.
> > It's caused by IMX tree updates.
> >
> > Chris,
> > Is the way Shawn suggested OK for you?
>
> Can we have some resolution of this please? This failed to build again
> today so I have used the version of the mmc tree from next-20131212
> again. I tried the obvious fix (s/pinctrl_usdhc4_1/pinctrl_usdhc4/) but
> that didn't work.
I'm afraid that using a working mmc tree next branch might be the only
option until Chris comes online to drop the patch from his tree.
Shawn
Hi Shawn,
How do you suggest to fix this issue?
Can we cook a patch for it directly based on linux-next tree?
Regards
Dong Aisheng
On Mon, Jan 6, 2014 at 2:22 PM, Stephen Rothwell <[email protected]> wrote:
> Hi all,
>
> On Tue, 17 Dec 2013 16:06:19 +0800 Dong Aisheng <[email protected]> wrote:
>>
>> I tested that Chris tree does not have problem.
>> It's caused by IMX tree updates.
>>
>> Chris,
>> Is the way Shawn suggested OK for you?
>
> Can we have some resolution of this please? This failed to build again
> today so I have used the version of the mmc tree from next-20131212
> again. I tried the obvious fix (s/pinctrl_usdhc4_1/pinctrl_usdhc4/) but
> that didn't work.
>
> --
> Cheers,
> Stephen Rothwell [email protected]
On Mon, Jan 06, 2014 at 05:22:43PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 17 Dec 2013 16:06:19 +0800 Dong Aisheng <[email protected]> wrote:
> >
> > I tested that Chris tree does not have problem.
> > It's caused by IMX tree updates.
> >
> > Chris,
> > Is the way Shawn suggested OK for you?
>
> Can we have some resolution of this please? This failed to build again
> today so I have used the version of the mmc tree from next-20131212
> again. I tried the obvious fix (s/pinctrl_usdhc4_1/pinctrl_usdhc4/) but
> that didn't work.
Okay, I missed your point. The resolution needs the additional changes
as below.
Shawn
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 91e5dd4..8b05648 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -356,6 +356,10 @@
pinctrl_usdhc3: usdhc3grp {
fsl,pins = <MX6QDL_USDHC3_PINGRP_D8>;
};
+
+ pinctrl_usdhc4: usdhc4grp {
+ fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>;
+ };
};
};
On Mon, Jan 06, 2014 at 02:30:00PM +0800, Dong Aisheng wrote:
> Hi Shawn,
>
> How do you suggest to fix this issue?
> Can we cook a patch for it directly based on linux-next tree?
No, we can not. No patch should be targeting linux-next tree. I just
gave a resolution to Stephen. Before Chris shows up and drops the patch
from his tree, we will need to use that temp resolution.
Shawn
On Mon, Jan 6, 2014 at 2:46 PM, Shawn Guo <[email protected]> wrote:
> On Mon, Jan 06, 2014 at 02:30:00PM +0800, Dong Aisheng wrote:
>> Hi Shawn,
>>
>> How do you suggest to fix this issue?
>> Can we cook a patch for it directly based on linux-next tree?
>
> No, we can not. No patch should be targeting linux-next tree. I just
> gave a resolution to Stephen. Before Chris shows up and drops the patch
> from his tree, we will need to use that temp resolution.
>
Got it, thanks.
Regards
Dong Aisheng
> Shawn
>
Hi Shawn,
On Mon, 6 Jan 2014 14:44:08 +0800 Shawn Guo <[email protected]> wrote:
>
> Okay, I missed your point. The resolution needs the additional changes
> as below.
>
> Shawn
>
> diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> index 91e5dd4..8b05648 100644
> --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> @@ -356,6 +356,10 @@
> pinctrl_usdhc3: usdhc3grp {
> fsl,pins = <MX6QDL_USDHC3_PINGRP_D8>;
> };
> +
> + pinctrl_usdhc4: usdhc4grp {
> + fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>;
> + };
> };
> };
Thanks, I will add this as a merge resolution patch tomorrow.
--
Cheers,
Stephen Rothwell [email protected]
Hi Shawn,
On Mon, 6 Jan 2014 14:44:08 +0800 Shawn Guo <[email protected]> wrote:
>
> Okay, I missed your point. The resolution needs the additional changes
> as below.
Thanks, I applied the following as a merge fix patch today and will carry
it as necessary.
From: Stephen Rothwell <[email protected]>
Date: Tue, 7 Jan 2014 14:20:53 +1100
Subject: [PATCH] mmc: merge fixup for imx6qdl-sabresd.dtsi
Signed-off-by: Stephen Rothwell <[email protected]>
---
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 0eab66ea2009..0eb5704f2850 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -356,6 +356,10 @@
pinctrl_usdhc3: usdhc3grp {
fsl,pins = <MX6QDL_USDHC3_PINGRP_D8>;
};
+
+ pinctrl_usdhc4: usdhc4grp {
+ fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>;
+ };
};
};
@@ -438,7 +438,7 @@
&usdhc4 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc4_1>;
+ pinctrl-0 = <&pinctrl_usdhc4>;
bus-width = <8>;
non-removable;
no-1-8-v;
--
Cheers,
Stephen Rothwell [email protected]
Hi,
On Tue, Dec 17 2013, Shawn Guo wrote:
> Please drop fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support") from
> your tree. It should go via my tree (with a rebase). Sorry, I did not
> notice it early.
Sorry for missing this thread, everyone -- I've dropped this patch
from mmc-next now.
- Chris.
--
Chris Ball <[email protected]> <http://printf.net/>