Hi Sascha,
Here are a few imx fixes targetting v3.2-rc. Please have a review.
If it looks all good to you, I can send you a pull request if you want.
Shawn Guo (4):
arm/imx: fix mx3_defconfig to add FEC back
arm/imx: fix the references to ARCH_MX3
arm/imx: fix AUTO_ZRELADDR selection
arm/imx: fix imx6q mmc error when mounting rootfs
arch/arm/configs/mx3_defconfig | 1 +
arch/arm/mach-imx/Makefile.boot | 10 +++++++---
arch/arm/mach-imx/clock-imx6q.c | 17 ++++++++++++++++-
arch/arm/plat-mxc/Kconfig | 4 ++--
drivers/dma/Kconfig | 4 ++--
drivers/mmc/host/sdhci-esdhc-imx.c | 8 ++++++++
6 files changed, 36 insertions(+), 8 deletions(-)
The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
which is not good, since FEC is useful for both developers and users.
Signed-off-by: Shawn Guo <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/configs/mx3_defconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
@@ -67,6 +67,7 @@ CONFIG_SMSC_PHY=y CONFIG_NET_ETHERNET=y CONFIG_SMSC911X=y CONFIG_DNET=y+CONFIG_FEC=y # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set # CONFIG_INPUT_MOUSEDEV is not set
From: Richard Zhao <hidden> Date: 2011-11-10 08:49:18
Is it supposed to be generated, like by make menuconfig?
Richard
On Thu, Nov 10, 2011 at 04:39:29PM +0800, Shawn Guo wrote:
quoted hunk
The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
which is not good, since FEC is useful for both developers and users.
Signed-off-by: Shawn Guo <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/configs/mx3_defconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
@@ -67,6 +67,7 @@ CONFIG_SMSC_PHY=y CONFIG_NET_ETHERNET=y CONFIG_SMSC911X=y CONFIG_DNET=y+CONFIG_FEC=y # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set # CONFIG_INPUT_MOUSEDEV is not set
--
1.7.4.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Thu, Nov 10, 2011 at 09:57:48AM +0100, Uwe Kleine-K?nig wrote:
On Thu, Nov 10, 2011 at 04:39:29PM +0800, Shawn Guo wrote:
quoted
The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
which is not good, since FEC is useful for both developers and users.
$ git show d880db0^:drivers/net/Kconfig | grep -A4 'config FEC$'
config FEC
bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC
default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM
So when d880db0 was created
make savedefconfig
dropped CONFIG_FEC=y justifiably. The culprit is commit
230dec6 (net/fec: add imx6q enet support)
which dropped the default line.
Thanks for letting me know that's me :)
Anyway, I put what I see from 'git log -p arch/arm/configs/mx3_defconfig'
there.
--
Regards,
Shawn
On Fri, Nov 11, 2011 at 03:16:25PM +0800, Shawn Guo wrote:
On Thu, Nov 10, 2011 at 09:57:48AM +0100, Uwe Kleine-K?nig wrote:
quoted
On Thu, Nov 10, 2011 at 04:39:29PM +0800, Shawn Guo wrote:
quoted
The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
which is not good, since FEC is useful for both developers and users.
$ git show d880db0^:drivers/net/Kconfig | grep -A4 'config FEC$'
config FEC
bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC
default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM
So when d880db0 was created
make savedefconfig
dropped CONFIG_FEC=y justifiably. The culprit is commit
230dec6 (net/fec: add imx6q enet support)
which dropped the default line.
Thanks for letting me know that's me :)
:-)
I forgot to say that I prefer to add back the default line in Kconfig
instead of adding it to the defconfig again.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
On Thu, Nov 10, 2011 at 04:39:29PM +0800, Shawn Guo wrote:
The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
which is not good, since FEC is useful for both developers and users.
Signed-off-by: Shawn Guo <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
I skipped this one for now as I have hope to get the i.MX5 merge into
-rc which would remove this file. If not, I'll send this one later.
Sascha
@@ -67,6 +67,7 @@ CONFIG_SMSC_PHY=y CONFIG_NET_ETHERNET=y CONFIG_SMSC911X=y CONFIG_DNET=y+CONFIG_FEC=y # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set # CONFIG_INPUT_MOUSEDEV is not set
--
1.7.4.1
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
On Fri, Nov 11, 2011 at 04:58:51PM +0100, Sascha Hauer wrote:
On Thu, Nov 10, 2011 at 04:39:29PM +0800, Shawn Guo wrote:
quoted
The commit 'd880db0 arm: mx3: update defconfig' removes FEC support
which is not good, since FEC is useful for both developers and users.
Signed-off-by: Shawn Guo <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
I skipped this one for now as I have hope to get the i.MX5 merge into
-rc which would remove this file. If not, I'll send this one later.
The config symbol ARCH_MX3 has been removed by commit 'a89cf59
arm/imx: merge i.MX3 and i.MX6', and it should not be referenced
any more.
Signed-off-by: Shawn Guo <redacted>
Cc: Vinod Koul <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-imx/Makefile.boot | 10 +++++++---
drivers/dma/Kconfig | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
On Thu, Nov 10, 2011 at 04:39:30PM +0800, Shawn Guo wrote:
quoted hunk
The config symbol ARCH_MX3 has been removed by commit 'a89cf59
arm/imx: merge i.MX3 and i.MX6', and it should not be referenced
any more.
Signed-off-by: Shawn Guo <redacted>
Cc: Vinod Koul <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-imx/Makefile.boot | 10 +++++++---
drivers/dma/Kconfig | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
I already sent a patch to Vinod to remove those individual SoC
dependencies and depend on ARCH_MXC instead.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
The config symbol ARCH_MX3 has been removed by commit 'a89cf59
arm/imx: merge i.MX3 and i.MX6', and it should not be referenced
any more.
The patch also change ARCH_MX* to SOC_IMX* for other platforms.
Signed-off-by: Shawn Guo <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
Changes since v1:
* Drop changes on drivers/dma/Kconfig, as Sascha alreay has a patch
to fix it.
* Change ARCH_MX* to SOC_IMX* for other platforms as well.
arch/arm/mach-imx/Makefile.boot | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
From: Paul Bolle <hidden> Date: 2011-11-21 13:47:49
On Fri, 2011-11-11 at 15:37 +0800, Shawn Guo wrote:
The config symbol ARCH_MX3 has been removed by commit 'a89cf59
arm/imx: merge i.MX3 and i.MX6', and it should not be referenced
any more.
The patch also change ARCH_MX* to SOC_IMX* for other platforms.
Signed-off-by: Shawn Guo <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
Changes since v1:
* Drop changes on drivers/dma/Kconfig, as Sascha alreay has a patch
to fix it.
This appears to be to the patch that ended up as commit 59198b6cb2 in
the mainline tree. But in mainline there are still those two references
to ARCH_MX3 in drivers/dma/Kconfig. Can I ask what happened to this
patch of Sascha that Shawn mentions?
Paul Bolle
On Mon, Nov 21, 2011 at 02:47:49PM +0100, Paul Bolle wrote:
On Fri, 2011-11-11 at 15:37 +0800, Shawn Guo wrote:
quoted
The config symbol ARCH_MX3 has been removed by commit 'a89cf59
arm/imx: merge i.MX3 and i.MX6', and it should not be referenced
any more.
The patch also change ARCH_MX* to SOC_IMX* for other platforms.
Signed-off-by: Shawn Guo <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
Changes since v1:
* Drop changes on drivers/dma/Kconfig, as Sascha alreay has a patch
to fix it.
This appears to be to the patch that ended up as commit 59198b6cb2 in
the mainline tree. But in mainline there are still those two references
to ARCH_MX3 in drivers/dma/Kconfig. Can I ask what happened to this
patch of Sascha that Shawn mentions?
I just resent this.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
From: Paul Bolle <hidden> Date: 2011-11-22 10:50:44
(Canned message follows.)
On Tue, 2011-11-22 at 11:43 +0100, Sascha Hauer wrote:
On Mon, Nov 21, 2011 at 02:47:49PM +0100, Paul Bolle wrote:
Can I ask what happened to this
quoted
patch of Sascha that Shawn mentions?
I just resent this.
Thanks. I'll stop worrying about this invalid Kconfig dependency for
now. It might pop up again if I ever decide to scan the mainline tree
for invalid symbols again. We'll see.
Paul Bolle
The AUTO_ZRELADDR selection for ARCH_IMX_V4_V5 and ARCH_MX5 should
really be mutually exclusive to ZBOOT_ROM just like what ARCH_IMX_V6_V7
does.
Signed-off-by: Shawn Guo <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/plat-mxc/Kconfig | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
The following error is seen in some case when mounting rootfs from
SD/MMC cards.
Waiting for root device /dev/mmcblk0p1...
mmc1: host does not support reading read-only switch. assuming write-enable.
mmc1: new high speed SDHC card at address b368
mmcblk0: mmc1:b368 SDC 3.74 GiB
mmcblk0: p1
mmc1: Timeout waiting for hardware interrupt.
mmcblk0: error -110 transferring data, sector 3678224, nr 40, cmd response 0x900, card status 0xc00
end_request: I/O error, dev mmcblk0, sector 3678225
Buffer I/O error on device mmcblk0p1, logical block 458754
lost page write due to I/O error on mmcblk0p1
This patch fixes the problem by lowering the usdhc clock and correcting
watermark configuration.
Signed-off-by: Shawn Guo <redacted>
Cc: Chris Ball <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-imx/clock-imx6q.c | 17 ++++++++++++++++-
drivers/mmc/host/sdhci-esdhc-imx.c | 8 ++++++++
2 files changed, 24 insertions(+), 1 deletions(-)
The following error is seen in some case when mounting rootfs from
SD/MMC cards.
Waiting for root device /dev/mmcblk0p1...
mmc1: host does not support reading read-only switch. assuming write-enable.
mmc1: new high speed SDHC card at address b368
mmcblk0: mmc1:b368 SDC 3.74 GiB
mmcblk0: p1
mmc1: Timeout waiting for hardware interrupt.
mmcblk0: error -110 transferring data, sector 3678224, nr 40, cmd response 0x900, card status 0xc00
end_request: I/O error, dev mmcblk0, sector 3678225
Buffer I/O error on device mmcblk0p1, logical block 458754
lost page write due to I/O error on mmcblk0p1
This patch fixes the problem by lowering the usdhc clock and correcting
watermark configuration.
Signed-off-by: Shawn Guo <redacted>
Cc: Chris Ball <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
The above errors are gone with this patch.
Tested-by: Dirk Behme <redacted>
Thanks
Dirk
From: Jason Liu <hidden> Date: 2011-11-10 15:07:12
2011/11/10 Shawn Guo [off-list ref]:
quoted hunk
The following error is seen in some case when mounting rootfs from
SD/MMC cards.
?Waiting for root device /dev/mmcblk0p1...
?mmc1: host does not support reading read-only switch. assuming write-enable.
?mmc1: new high speed SDHC card at address b368
?mmcblk0: mmc1:b368 SDC ? 3.74 GiB
? mmcblk0: p1
?mmc1: Timeout waiting for hardware interrupt.
?mmcblk0: error -110 transferring data, sector 3678224, nr 40, cmd response 0x900, card status 0xc00
?end_request: I/O error, dev mmcblk0, sector 3678225
?Buffer I/O error on device mmcblk0p1, logical block 458754
?lost page write due to I/O error on mmcblk0p1
This patch fixes the problem by lowering the usdhc clock and correcting
watermark configuration.
Signed-off-by: Shawn Guo <redacted>
Cc: Chris Ball <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
?arch/arm/mach-imx/clock-imx6q.c ? ?| ? 17 ++++++++++++++++-
?drivers/mmc/host/sdhci-esdhc-imx.c | ? ?8 ++++++++
?2 files changed, 24 insertions(+), 1 deletions(-)
@@ -2002,6 +2002,21 @@ int __init mx6q_clocks_init(void)
? ? ? ?clk_set_rate(&asrc_serial_clk, 1500000);
? ? ? ?clk_set_rate(&enfc_clk, 11000000);
+ ? ? ? /*
+ ? ? ? ?* Before pinctrl API is available, we have to rely on the pad
+ ? ? ? ?* configuration set up by bootloader. ?For usdhc example here,
+ ? ? ? ?* u-boot sets up the pads for 49.5 MHz case, and we have to lower
+ ? ? ? ?* the usdhc clock from 198 to 49.5 MHz to match the pad configuration.
The comments above is wrong. The pad configuration don't have the relationship
with the clock freq 49.5MHZ. I'm not sure you mean pinctrl API can
resolve the clock
configuration, do you mean common clock API?
+ ? ? ? ?*
+ ? ? ? ?* FIXME: This is should be removed after pinctrl API is available.
+ ? ? ? ?* At that time, usdhc driver can call pinctrl API to change pad
+ ? ? ? ?* configuration dynamically per different usdhc clock settings.
+ ? ? ? ?*/
+ ? ? ? clk_set_rate(&usdhc1_clk, 49500000);
+ ? ? ? clk_set_rate(&usdhc2_clk, 49500000);
+ ? ? ? clk_set_rate(&usdhc3_clk, 49500000);
+ ? ? ? clk_set_rate(&usdhc4_clk, 49500000);
+
On Thu, Nov 10, 2011 at 11:07:12PM +0800, Jason Liu wrote:
2011/11/10 Shawn Guo [off-list ref]:
quoted
The following error is seen in some case when mounting rootfs from
SD/MMC cards.
?Waiting for root device /dev/mmcblk0p1...
?mmc1: host does not support reading read-only switch. assuming write-enable.
?mmc1: new high speed SDHC card at address b368
?mmcblk0: mmc1:b368 SDC ? 3.74 GiB
? mmcblk0: p1
?mmc1: Timeout waiting for hardware interrupt.
?mmcblk0: error -110 transferring data, sector 3678224, nr 40, cmd response 0x900, card status 0xc00
?end_request: I/O error, dev mmcblk0, sector 3678225
?Buffer I/O error on device mmcblk0p1, logical block 458754
?lost page write due to I/O error on mmcblk0p1
This patch fixes the problem by lowering the usdhc clock and correcting
watermark configuration.
Signed-off-by: Shawn Guo <redacted>
Cc: Chris Ball <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
?arch/arm/mach-imx/clock-imx6q.c ? ?| ? 17 ++++++++++++++++-
?drivers/mmc/host/sdhci-esdhc-imx.c | ? ?8 ++++++++
?2 files changed, 24 insertions(+), 1 deletions(-)
@@ -2002,6 +2002,21 @@ int __init mx6q_clocks_init(void)
? ? ? ?clk_set_rate(&asrc_serial_clk, 1500000);
? ? ? ?clk_set_rate(&enfc_clk, 11000000);
+ ? ? ? /*
+ ? ? ? ?* Before pinctrl API is available, we have to rely on the pad
+ ? ? ? ?* configuration set up by bootloader. ?For usdhc example here,
+ ? ? ? ?* u-boot sets up the pads for 49.5 MHz case, and we have to lower
+ ? ? ? ?* the usdhc clock from 198 to 49.5 MHz to match the pad configuration.
The comments above is wrong. The pad configuration don't have the relationship
with the clock freq 49.5MHZ. I'm not sure you mean pinctrl API can
resolve the clock
configuration, do you mean common clock API?
The usdhc on imx6 needs different pad configuration to run at different
clock frequencies, 49.5, 99, 198 MHz.
Regards,
Shawn
quoted
+ ? ? ? ?*
+ ? ? ? ?* FIXME: This is should be removed after pinctrl API is available.
+ ? ? ? ?* At that time, usdhc driver can call pinctrl API to change pad
+ ? ? ? ?* configuration dynamically per different usdhc clock settings.
+ ? ? ? ?*/
+ ? ? ? clk_set_rate(&usdhc1_clk, 49500000);
+ ? ? ? clk_set_rate(&usdhc2_clk, 49500000);
+ ? ? ? clk_set_rate(&usdhc3_clk, 49500000);
+ ? ? ? clk_set_rate(&usdhc4_clk, 49500000);
+