| Message ID | 1386007357-11956-2-git-send-email-soren.brinkmann@xilinx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 12/02/2013 07:02 PM, Soren Brinkmann wrote: > Add nodes for the Arasan SDHCI controller to Zynq dts files. > > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> > --- > v2: > - update compatibilty string according to changes in 1/2 (append > '-8.9a' IP version string) > --- > arch/arm/boot/dts/zynq-7000.dtsi | 20 ++++++++++++++++++++ > arch/arm/boot/dts/zynq-zc702.dts | 4 ++++ > arch/arm/boot/dts/zynq-zc706.dts | 4 ++++ > arch/arm/boot/dts/zynq-zed.dts | 4 ++++ > 4 files changed, 32 insertions(+) Chris: It is up to you if you want to take this through your tree or just let me to take it through my tree. It is adding new nodes to DTS file that's why it shouldn't be any problem to apply it separately. Anyway please let me know what you think. If you want to add it to your tree here is my Acked-by: Michal Simek <monstr@monstr.eu> Thanks, Michal
On 12/02/2013 08:45 PM, Michal Simek wrote: > On 12/02/2013 07:02 PM, Soren Brinkmann wrote: >> Add nodes for the Arasan SDHCI controller to Zynq dts files. >> >> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> >> --- >> v2: >> - update compatibilty string according to changes in 1/2 (append >> '-8.9a' IP version string) >> --- >> arch/arm/boot/dts/zynq-7000.dtsi | 20 ++++++++++++++++++++ >> arch/arm/boot/dts/zynq-zc702.dts | 4 ++++ >> arch/arm/boot/dts/zynq-zc706.dts | 4 ++++ >> arch/arm/boot/dts/zynq-zed.dts | 4 ++++ >> 4 files changed, 32 insertions(+) > > Chris: It is up to you if you want to take this through your tree > or just let me to take it through my tree. It is adding new nodes > to DTS file that's why it shouldn't be any problem to apply it > separately. > > Anyway please let me know what you think. > If you want to add it to your tree here is my > > Acked-by: Michal Simek <monstr@monstr.eu> I have added this patch to my zynq/dt branch. We discussed this in other patch and these dt changes should go through arm-soc tree. Thanks, Michal
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index e7f73b2e4550..4aecd1baf435 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -65,6 +65,26 @@ interrupts = <0 50 4>; }; + sdhci0: ps7-sdhci@e0100000 { + compatible = "arasan,sdhci-8.9a"; + status = "disabled"; + clock-names = "clk_xin", "clk_ahb"; + clocks = <&clkc 21>, <&clkc 32>; + interrupt-parent = <&intc>; + interrupts = <0 24 4>; + reg = <0xe0100000 0x1000>; + } ; + + sdhci1: ps7-sdhci@e0101000 { + compatible = "arasan,sdhci-8.9a"; + status = "disabled"; + clock-names = "clk_xin", "clk_ahb"; + clocks = <&clkc 22>, <&clkc 33>; + interrupt-parent = <&intc>; + interrupts = <0 47 4>; + reg = <0xe0101000 0x1000>; + } ; + slcr: slcr@f8000000 { compatible = "xlnx,zynq-slcr"; reg = <0xF8000000 0x1000>; diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index 21aea99a067b..454394453e9c 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -29,6 +29,10 @@ }; +&sdhci0 { + status = "okay"; +}; + &uart1 { status = "okay"; }; diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts index 79009e0b74b9..d734d5411760 100644 --- a/arch/arm/boot/dts/zynq-zc706.dts +++ b/arch/arm/boot/dts/zynq-zc706.dts @@ -30,6 +30,10 @@ }; +&sdhci0 { + status = "okay"; +}; + &uart1 { status = "okay"; }; diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts index d6acf2b1cdf4..cd259dd13cdc 100644 --- a/arch/arm/boot/dts/zynq-zed.dts +++ b/arch/arm/boot/dts/zynq-zed.dts @@ -30,6 +30,10 @@ }; +&sdhci0 { + status = "okay"; +}; + &uart1 { status = "okay"; };
Add nodes for the Arasan SDHCI controller to Zynq dts files. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> --- v2: - update compatibilty string according to changes in 1/2 (append '-8.9a' IP version string) --- arch/arm/boot/dts/zynq-7000.dtsi | 20 ++++++++++++++++++++ arch/arm/boot/dts/zynq-zc702.dts | 4 ++++ arch/arm/boot/dts/zynq-zc706.dts | 4 ++++ arch/arm/boot/dts/zynq-zed.dts | 4 ++++ 4 files changed, 32 insertions(+)