* [PATCH v2] ARM: zynq: DT: Add CAN node
@ 2014-07-25 6:52 Michal Simek
2014-07-25 15:00 ` Sören Brinkmann
[not found] ` <20140725150017.GE16049@xsjandreislx>
0 siblings, 2 replies; 3+ messages in thread
From: Michal Simek @ 2014-07-25 6:52 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: Appana Durga Kedareswara Rao, monstr-pSz03upnqPeHXe+LvDLADg,
Josh Cartwright, Steffen Trumtrar, Rob Herring, Peter Crosthwaite,
Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 1695 bytes --]
Add node describing Zynq's CAN controller.
Signed-off-by: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
---
Changes in v2:
- Add can1
- Enable can0 for zc702
- Use status property
arch/arm/boot/dts/zynq-7000.dtsi | 26 +++++++++++++++++++++++++-
arch/arm/boot/dts/zynq-zc702.dts | 4 ++++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 366ca6434f54..983148111e3a 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -71,7 +71,31 @@
interrupts = <0 7 4>;
interrupt-parent = <&intc>;
clocks = <&clkc 12>;
- };
+ };
+
+ can0: can@e0008000 {
+ compatible = "xlnx,zynq-can-1.0";
+ status = "disabled";
+ clocks = <&clkc 19>, <&clkc 36>;
+ clock-names = "can_clk", "pclk";
+ reg = <0xe0008000 0x1000>;
+ interrupts = <0 28 4>;
+ interrupt-parent = <&intc>;
+ tx-fifo-depth = <0x40>;
+ rx-fifo-depth = <0x40>;
+ };
+
+ can1: can@e0009000 {
+ compatible = "xlnx,zynq-can-1.0";
+ status = "disabled";
+ clocks = <&clkc 19>, <&clkc 36>;
+ clock-names = "can_clk", "pclk";
+ reg = <0xe0009000 0x1000>;
+ interrupts = <0 51 4>;
+ interrupt-parent = <&intc>;
+ tx-fifo-depth = <0x40>;
+ rx-fifo-depth = <0x40>;
+ };
gpio0: gpio@e000a000 {
compatible = "xlnx,zynq-gpio-1.0";
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index 5e09cee33d42..835c3089c61c 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -29,6 +29,10 @@
};
+&can0 {
+ status = "okay";
+};
+
&gem0 {
status = "okay";
phy-mode = "rgmii";
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] ARM: zynq: DT: Add CAN node
2014-07-25 6:52 [PATCH v2] ARM: zynq: DT: Add CAN node Michal Simek
@ 2014-07-25 15:00 ` Sören Brinkmann
[not found] ` <20140725150017.GE16049@xsjandreislx>
1 sibling, 0 replies; 3+ messages in thread
From: Sören Brinkmann @ 2014-07-25 15:00 UTC (permalink / raw)
To: Michal Simek
Cc: linux-arm-kernel, Appana Durga Kedareswara Rao, monstr,
Josh Cartwright, Steffen Trumtrar, Rob Herring, Peter Crosthwaite,
Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, devicetree, linux-kernel
On Fri, 2014-07-25 at 08:52AM +0200, Michal Simek wrote:
> Add node describing Zynq's CAN controller.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
> Changes in v2:
> - Add can1
> - Enable can0 for zc702
> - Use status property
>
> arch/arm/boot/dts/zynq-7000.dtsi | 26 +++++++++++++++++++++++++-
> arch/arm/boot/dts/zynq-zc702.dts | 4 ++++
> 2 files changed, 29 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
> index 366ca6434f54..983148111e3a 100644
> --- a/arch/arm/boot/dts/zynq-7000.dtsi
> +++ b/arch/arm/boot/dts/zynq-7000.dtsi
> @@ -71,7 +71,31 @@
> interrupts = <0 7 4>;
> interrupt-parent = <&intc>;
> clocks = <&clkc 12>;
> - };
> + };
> +
> + can0: can@e0008000 {
> + compatible = "xlnx,zynq-can-1.0";
> + status = "disabled";
> + clocks = <&clkc 19>, <&clkc 36>;
> + clock-names = "can_clk", "pclk";
> + reg = <0xe0008000 0x1000>;
> + interrupts = <0 28 4>;
> + interrupt-parent = <&intc>;
> + tx-fifo-depth = <0x40>;
> + rx-fifo-depth = <0x40>;
> + };
> +
> + can1: can@e0009000 {
> + compatible = "xlnx,zynq-can-1.0";
> + status = "disabled";
> + clocks = <&clkc 19>, <&clkc 36>;
The clocks for CAN1 must be outputs 20 and 37 of the clkc.
Sören
^ permalink raw reply [flat|nested] 3+ messages in thread[parent not found: <20140725150017.GE16049@xsjandreislx>]
* Re: [PATCH v2] ARM: zynq: DT: Add CAN node
[not found] ` <20140725150017.GE16049@xsjandreislx>
@ 2014-07-28 9:18 ` Michal Simek
0 siblings, 0 replies; 3+ messages in thread
From: Michal Simek @ 2014-07-28 9:18 UTC (permalink / raw)
To: Sören Brinkmann, Michal Simek
Cc: linux-arm-kernel, Appana Durga Kedareswara Rao, monstr,
Josh Cartwright, Steffen Trumtrar, Rob Herring, Peter Crosthwaite,
Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, devicetree, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1769 bytes --]
On 07/25/2014 05:00 PM, Sören Brinkmann wrote:
> On Fri, 2014-07-25 at 08:52AM +0200, Michal Simek wrote:
>> Add node describing Zynq's CAN controller.
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>> ---
>>
>> Changes in v2:
>> - Add can1
>> - Enable can0 for zc702
>> - Use status property
>>
>> arch/arm/boot/dts/zynq-7000.dtsi | 26 +++++++++++++++++++++++++-
>> arch/arm/boot/dts/zynq-zc702.dts | 4 ++++
>> 2 files changed, 29 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
>> index 366ca6434f54..983148111e3a 100644
>> --- a/arch/arm/boot/dts/zynq-7000.dtsi
>> +++ b/arch/arm/boot/dts/zynq-7000.dtsi
>> @@ -71,7 +71,31 @@
>> interrupts = <0 7 4>;
>> interrupt-parent = <&intc>;
>> clocks = <&clkc 12>;
>> - };
>> + };
>> +
>> + can0: can@e0008000 {
>> + compatible = "xlnx,zynq-can-1.0";
>> + status = "disabled";
>> + clocks = <&clkc 19>, <&clkc 36>;
>> + clock-names = "can_clk", "pclk";
>> + reg = <0xe0008000 0x1000>;
>> + interrupts = <0 28 4>;
>> + interrupt-parent = <&intc>;
>> + tx-fifo-depth = <0x40>;
>> + rx-fifo-depth = <0x40>;
>> + };
>> +
>> + can1: can@e0009000 {
>> + compatible = "xlnx,zynq-can-1.0";
>> + status = "disabled";
>> + clocks = <&clkc 19>, <&clkc 36>;
> The clocks for CAN1 must be outputs 20 and 37 of the clkc.
Fixed in v3.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-07-28 9:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-25 6:52 [PATCH v2] ARM: zynq: DT: Add CAN node Michal Simek
2014-07-25 15:00 ` Sören Brinkmann
[not found] ` <20140725150017.GE16049@xsjandreislx>
2014-07-28 9:18 ` Michal Simek
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).