* [PATCH] MXS: Enable FLEXCAN for MXS/DT
@ 2012-05-27 2:11 Marek Vasut
2012-06-06 5:39 ` Shawn Guo
2012-06-26 9:04 ` Marc Kleine-Budde
0 siblings, 2 replies; 10+ messages in thread
From: Marek Vasut @ 2012-05-27 2:11 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
CC: Dong Aisheng <b29396@freescale.com>
CC: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Linux ARM kernel <linux-arm-kernel@lists.infradead.org>
CC: Shawn Guo <shawn.guo@linaro.org>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
---
arch/arm/boot/dts/imx28.dtsi | 2 ++
arch/arm/mach-mxs/Kconfig | 1 +
2 files changed, 3 insertions(+)
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 119f183..13c6084 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -278,12 +278,14 @@
};
can0: can at 80032000 {
+ compatible = "fsl,p1010-flexcan";
reg = <0x80032000 2000>;
interrupts = <8>;
status = "disabled";
};
can1: can at 80034000 {
+ compatible = "fsl,p1010-flexcan";
reg = <0x80034000 2000>;
interrupts = <9>;
status = "disabled";
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 91cf062..0406f37 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -18,6 +18,7 @@ config SOC_IMX28
select CPU_ARM926T
select HAVE_PWM
select PINCTRL_IMX28
+ select MXS_HAVE_PLATFORM_FLEXCAN
comment "MXS platforms:"
--
1.7.10
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH] MXS: Enable FLEXCAN for MXS/DT
2012-05-27 2:11 [PATCH] MXS: Enable FLEXCAN for MXS/DT Marek Vasut
@ 2012-06-06 5:39 ` Shawn Guo
2012-06-26 9:04 ` Marc Kleine-Budde
1 sibling, 0 replies; 10+ messages in thread
From: Shawn Guo @ 2012-06-06 5:39 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, May 27, 2012 at 04:11:49AM +0200, Marek Vasut wrote:
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Detlev Zundel <dzu@denx.de>
> CC: Dong Aisheng <b29396@freescale.com>
> CC: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Linux ARM kernel <linux-arm-kernel@lists.infradead.org>
> CC: Shawn Guo <shawn.guo@linaro.org>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> ---
> arch/arm/boot/dts/imx28.dtsi | 2 ++
> arch/arm/mach-mxs/Kconfig | 1 +
> 2 files changed, 3 insertions(+)
>
> diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
> index 119f183..13c6084 100644
> --- a/arch/arm/boot/dts/imx28.dtsi
> +++ b/arch/arm/boot/dts/imx28.dtsi
> @@ -278,12 +278,14 @@
> };
>
> can0: can at 80032000 {
> + compatible = "fsl,p1010-flexcan";
> reg = <0x80032000 2000>;
> interrupts = <8>;
> status = "disabled";
> };
>
> can1: can at 80034000 {
> + compatible = "fsl,p1010-flexcan";
> reg = <0x80034000 2000>;
> interrupts = <9>;
> status = "disabled";
> diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
> index 91cf062..0406f37 100644
> --- a/arch/arm/mach-mxs/Kconfig
> +++ b/arch/arm/mach-mxs/Kconfig
> @@ -18,6 +18,7 @@ config SOC_IMX28
> select CPU_ARM926T
> select HAVE_PWM
> select PINCTRL_IMX28
> + select MXS_HAVE_PLATFORM_FLEXCAN
This change shouldn't be part of this patch. Furthermore, this symbol
and arch/arm/mach-mxs/devices/platform-flexcan.c should be removed
completely after we covert all these board files that have flexcan
device enabled over to DT.
Regards,
Shawn
>
> comment "MXS platforms:"
>
> --
> 1.7.10
>
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH] MXS: Enable FLEXCAN for MXS/DT
2012-05-27 2:11 [PATCH] MXS: Enable FLEXCAN for MXS/DT Marek Vasut
2012-06-06 5:39 ` Shawn Guo
@ 2012-06-26 9:04 ` Marc Kleine-Budde
2012-06-26 9:07 ` Marc Kleine-Budde
1 sibling, 1 reply; 10+ messages in thread
From: Marc Kleine-Budde @ 2012-06-26 9:04 UTC (permalink / raw)
To: linux-arm-kernel
On 05/27/2012 04:11 AM, Marek Vasut wrote:
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Detlev Zundel <dzu@denx.de>
> CC: Dong Aisheng <b29396@freescale.com>
> CC: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Linux ARM kernel <linux-arm-kernel@lists.infradead.org>
> CC: Shawn Guo <shawn.guo@linaro.org>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> ---
> arch/arm/boot/dts/imx28.dtsi | 2 ++
> arch/arm/mach-mxs/Kconfig | 1 +
> 2 files changed, 3 insertions(+)
>
> diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
> index 119f183..13c6084 100644
> --- a/arch/arm/boot/dts/imx28.dtsi
> +++ b/arch/arm/boot/dts/imx28.dtsi
> @@ -278,12 +278,14 @@
> };
>
> can0: can at 80032000 {
> + compatible = "fsl,p1010-flexcan";
> reg = <0x80032000 2000>;
> interrupts = <8>;
> status = "disabled";
> };
>
> can1: can at 80034000 {
> + compatible = "fsl,p1010-flexcan";
> reg = <0x80034000 2000>;
> interrupts = <9>;
> status = "disabled";
> diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
> index 91cf062..0406f37 100644
> --- a/arch/arm/mach-mxs/Kconfig
> +++ b/arch/arm/mach-mxs/Kconfig
> @@ -18,6 +18,7 @@ config SOC_IMX28
> select CPU_ARM926T
> select HAVE_PWM
> select PINCTRL_IMX28
> + select MXS_HAVE_PLATFORM_FLEXCAN
This compiles in the code to create a flexcan platform device, which
should not be needed in the DT case. You save some bytes if you use:
+ select HAVE_CAN_FLEXCAN if NET && CAN
>
> comment "MXS platforms:"
>
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120626/fc2a62f9/attachment.sig>
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH] MXS: Enable FLEXCAN for MXS/DT
2012-06-26 9:04 ` Marc Kleine-Budde
@ 2012-06-26 9:07 ` Marc Kleine-Budde
2012-06-26 11:28 ` Shawn Guo
0 siblings, 1 reply; 10+ messages in thread
From: Marc Kleine-Budde @ 2012-06-26 9:07 UTC (permalink / raw)
To: linux-arm-kernel
On 06/26/2012 11:04 AM, Marc Kleine-Budde wrote:
> On 05/27/2012 04:11 AM, Marek Vasut wrote:
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: Detlev Zundel <dzu@denx.de>
>> CC: Dong Aisheng <b29396@freescale.com>
>> CC: Fabio Estevam <fabio.estevam@freescale.com>
>> Cc: Linux ARM kernel <linux-arm-kernel@lists.infradead.org>
>> CC: Shawn Guo <shawn.guo@linaro.org>
>> Cc: Stefano Babic <sbabic@denx.de>
>> Cc: Wolfgang Denk <wd@denx.de>
>> ---
>> arch/arm/boot/dts/imx28.dtsi | 2 ++
>> arch/arm/mach-mxs/Kconfig | 1 +
>> 2 files changed, 3 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
>> index 119f183..13c6084 100644
>> --- a/arch/arm/boot/dts/imx28.dtsi
>> +++ b/arch/arm/boot/dts/imx28.dtsi
>> @@ -278,12 +278,14 @@
>> };
>>
>> can0: can at 80032000 {
>> + compatible = "fsl,p1010-flexcan";
>> reg = <0x80032000 2000>;
>> interrupts = <8>;
>> status = "disabled";
>> };
>>
>> can1: can at 80034000 {
>> + compatible = "fsl,p1010-flexcan";
>> reg = <0x80034000 2000>;
>> interrupts = <9>;
>> status = "disabled";
>> diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
>> index 91cf062..0406f37 100644
>> --- a/arch/arm/mach-mxs/Kconfig
>> +++ b/arch/arm/mach-mxs/Kconfig
>> @@ -18,6 +18,7 @@ config SOC_IMX28
>> select CPU_ARM926T
>> select HAVE_PWM
>> select PINCTRL_IMX28
>> + select MXS_HAVE_PLATFORM_FLEXCAN
>
> This compiles in the code to create a flexcan platform device, which
> should not be needed in the DT case. You save some bytes if you use:
>
> + select HAVE_CAN_FLEXCAN if NET && CAN
...and put this select to MACH_MXS_DT, instead of SOC_IMX28
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120626/737e6568/attachment.sig>
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH] MXS: Enable FLEXCAN for MXS/DT
2012-06-26 9:07 ` Marc Kleine-Budde
@ 2012-06-26 11:28 ` Shawn Guo
2012-06-26 11:43 ` Marc Kleine-Budde
0 siblings, 1 reply; 10+ messages in thread
From: Shawn Guo @ 2012-06-26 11:28 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jun 26, 2012 at 11:07:24AM +0200, Marc Kleine-Budde wrote:
> > + select HAVE_CAN_FLEXCAN if NET && CAN
>
> ...and put this select to MACH_MXS_DT, instead of SOC_IMX28
>
Hmm, why? Flexcan is a feature/block of SoC rather than a machine,
isn't it?
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] MXS: Enable FLEXCAN for MXS/DT
2012-06-26 11:28 ` Shawn Guo
@ 2012-06-26 11:43 ` Marc Kleine-Budde
2012-06-26 14:07 ` Shawn Guo
0 siblings, 1 reply; 10+ messages in thread
From: Marc Kleine-Budde @ 2012-06-26 11:43 UTC (permalink / raw)
To: linux-arm-kernel
On 06/26/2012 01:28 PM, Shawn Guo wrote:
> On Tue, Jun 26, 2012 at 11:07:24AM +0200, Marc Kleine-Budde wrote:
>>> + select HAVE_CAN_FLEXCAN if NET && CAN
>>
>> ...and put this select to MACH_MXS_DT, instead of SOC_IMX28
>>
> Hmm, why? Flexcan is a feature/block of SoC rather than a machine,
> isn't it?
Yes, but the HAVE_CAN_FLEXCAN is used to make the driver available in
Kconfig. What about removing the "depends on HAVE_CAN_FLEXCAN" from the
driver symbol in Kconfig? I can push it via net-next and it will be
mainline in 3.6. You can remove the HAVE_CAN_FLEXCAN from the ARM (and
powerpc) trees.
To avoid Kconfig hickups I'll keep the HAVE_CAN_FLEXCAN symbol in the
net-tree as long as the select HAVE_CAN_FLEXCAN is still present.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120626/e1a388a0/attachment.sig>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] MXS: Enable FLEXCAN for MXS/DT
2012-06-26 11:43 ` Marc Kleine-Budde
@ 2012-06-26 14:07 ` Shawn Guo
2012-06-26 15:43 ` Marek Vasut
0 siblings, 1 reply; 10+ messages in thread
From: Shawn Guo @ 2012-06-26 14:07 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jun 26, 2012 at 01:43:11PM +0200, Marc Kleine-Budde wrote:
> Yes, but the HAVE_CAN_FLEXCAN is used to make the driver available in
> Kconfig. What about removing the "depends on HAVE_CAN_FLEXCAN" from the
> driver symbol in Kconfig? I can push it via net-next and it will be
> mainline in 3.6. You can remove the HAVE_CAN_FLEXCAN from the ARM (and
> powerpc) trees.
>
Ok, that works for me if you would like to have the CAN_FLEXCAN show
up anyway for all the ARCHs, but otherwise we just end up with replacing
"depends on HAVE_CAN_FLEXCAN" with "depends on ARCH_MXS || ARCH_MXC".
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] MXS: Enable FLEXCAN for MXS/DT
2012-06-26 14:07 ` Shawn Guo
@ 2012-06-26 15:43 ` Marek Vasut
0 siblings, 0 replies; 10+ messages in thread
From: Marek Vasut @ 2012-06-26 15:43 UTC (permalink / raw)
To: linux-arm-kernel
Dear Shawn Guo,
> On Tue, Jun 26, 2012 at 01:43:11PM +0200, Marc Kleine-Budde wrote:
> > Yes, but the HAVE_CAN_FLEXCAN is used to make the driver available in
> > Kconfig. What about removing the "depends on HAVE_CAN_FLEXCAN" from the
> > driver symbol in Kconfig? I can push it via net-next and it will be
> > mainline in 3.6. You can remove the HAVE_CAN_FLEXCAN from the ARM (and
> > powerpc) trees.
>
> Ok, that works for me if you would like to have the CAN_FLEXCAN show
> up anyway for all the ARCHs, but otherwise we just end up with replacing
> "depends on HAVE_CAN_FLEXCAN" with "depends on ARCH_MXS || ARCH_MXC".
PPC also uses the flexcan, so don't forget about that.
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] MXS: Enable FLEXCAN for MXS/DT
@ 2012-06-08 18:57 Marek Vasut
2012-06-11 7:13 ` Shawn Guo
0 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2012-06-08 18:57 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
CC: Dong Aisheng <b29396@freescale.com>
CC: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Linux ARM kernel <linux-arm-kernel@lists.infradead.org>
CC: Shawn Guo <shawn.guo@linaro.org>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
---
arch/arm/boot/dts/imx28.dtsi | 18 ++++++++++++++++++
arch/arm/mach-mxs/Kconfig | 1 +
2 files changed, 19 insertions(+)
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 5053019..a40e30d 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -167,6 +167,22 @@
fsl,pull-up = <0>;
};
+ flexcan0_pins_a: flexcan0 at 0 {
+ reg = <0>;
+ fsl,pinmux-ids = <0x0161 0x0162>;
+ fsl,drive-strength = <2>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <0>;
+ };
+
+ flexcan1_pins_a: flexcan1 at 0 {
+ reg = <0>;
+ fsl,pinmux-ids = <0x0121 0x0122>;
+ fsl,drive-strength = <2>;
+ fsl,voltage = <1>;
+ fsl,pull-up = <0>;
+ };
+
gpmi_pins_a: gpmi-nand at 0 {
reg = <0>;
fsl,pinmux-ids = <0x0000 0x0010 0x0020
@@ -295,12 +311,14 @@
};
can0: can@80032000 {
+ compatible = "fsl,p1010-flexcan";
reg = <0x80032000 2000>;
interrupts = <8>;
status = "disabled";
};
can1: can at 80034000 {
+ compatible = "fsl,p1010-flexcan";
reg = <0x80034000 2000>;
interrupts = <9>;
status = "disabled";
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 91cf062..5451c07 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -18,6 +18,7 @@ config SOC_IMX28
select CPU_ARM926T
select HAVE_PWM
select PINCTRL_IMX28
+ select HAVE_CAN_FLEXCAN
comment "MXS platforms:"
--
1.7.10
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH] MXS: Enable FLEXCAN for MXS/DT
2012-06-08 18:57 Marek Vasut
@ 2012-06-11 7:13 ` Shawn Guo
0 siblings, 0 replies; 10+ messages in thread
From: Shawn Guo @ 2012-06-11 7:13 UTC (permalink / raw)
To: linux-arm-kernel
Please use something like "ARM: mxs: Enable FLEXCAN for DT" for the
subject.
On Fri, Jun 08, 2012 at 08:57:10PM +0200, Marek Vasut wrote:
> + flexcan0_pins_a: flexcan0 at 0 {
> + reg = <0>;
> + fsl,pinmux-ids = <0x0161 0x0162>;
Are you sure the second cell is correct? From what
Documentation/devicetree/bindings/pinctrl/fsl,mxs-pinctrl.txt tells:
MX28_PAD_GPMI_RDY2__ENET0_TX_ER 0x0162
> + fsl,drive-strength = <2>;
> + fsl,voltage = <1>;
> + fsl,pull-up = <0>;
> + };
> +
> + flexcan1_pins_a: flexcan1 at 0 {
> + reg = <0>;
> + fsl,pinmux-ids = <0x0121 0x0122>;
Ditto
MX28_PAD_GPMI_CE2N__ENET0_RX_ER 0x0122
> + fsl,drive-strength = <2>;
> + fsl,voltage = <1>;
> + fsl,pull-up = <0>;
> + };
> +
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-06-26 15:43 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-27 2:11 [PATCH] MXS: Enable FLEXCAN for MXS/DT Marek Vasut
2012-06-06 5:39 ` Shawn Guo
2012-06-26 9:04 ` Marc Kleine-Budde
2012-06-26 9:07 ` Marc Kleine-Budde
2012-06-26 11:28 ` Shawn Guo
2012-06-26 11:43 ` Marc Kleine-Budde
2012-06-26 14:07 ` Shawn Guo
2012-06-26 15:43 ` Marek Vasut
-- strict thread matches above, loose matches on Subject: below --
2012-06-08 18:57 Marek Vasut
2012-06-11 7:13 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).