Add the new compatible string for ZynqMP SD Host Controller for its use
in the Arasan SDHCI driver for some of the ZynqMP specific operations.
Add required properties for the same.
Signed-off-by: Manish Narani <[email protected]>
---
This patch depends on the below series of patches:
https://lkml.org/lkml/2019/10/17/37
Changes in v2:
- Added clock-names for SD card clocks for getting clocks in the driver
Changes in v3:
- Reverted "Added clock-names for SD card clocks for getting clocks in the driver"
---
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 9aa67340a4d8..c7b8c3c28aa7 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -494,20 +494,26 @@
sdhci0: mmc@ff160000 {
compatible = "arasan,sdhci-8.9a";
+ compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
status = "disabled";
interrupt-parent = <&gic>;
interrupts = <0 48 4>;
reg = <0x0 0xff160000 0x0 0x1000>;
clock-names = "clk_xin", "clk_ahb";
+ #clock-cells = <1>;
+ clock-output-names = "clk_out_sd0", "clk_in_sd0";
};
sdhci1: mmc@ff170000 {
compatible = "arasan,sdhci-8.9a";
+ compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
status = "disabled";
interrupt-parent = <&gic>;
interrupts = <0 49 4>;
reg = <0x0 0xff170000 0x0 0x1000>;
clock-names = "clk_xin", "clk_ahb";
+ #clock-cells = <1>;
+ clock-output-names = "clk_out_sd1", "clk_in_sd1";
};
smmu: smmu@fd800000 {
--
2.17.1
On 17. 10. 19 9:28, Manish Narani wrote:
> Add the new compatible string for ZynqMP SD Host Controller for its use
> in the Arasan SDHCI driver for some of the ZynqMP specific operations.
> Add required properties for the same.
>
> Signed-off-by: Manish Narani <[email protected]>
> ---
> This patch depends on the below series of patches:
> https://lkml.org/lkml/2019/10/17/37
>
> Changes in v2:
> - Added clock-names for SD card clocks for getting clocks in the driver
>
> Changes in v3:
> - Reverted "Added clock-names for SD card clocks for getting clocks in the driver"
> ---
> arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> index 9aa67340a4d8..c7b8c3c28aa7 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@ -494,20 +494,26 @@
>
> sdhci0: mmc@ff160000 {
> compatible = "arasan,sdhci-8.9a";
> + compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
> status = "disabled";
> interrupt-parent = <&gic>;
> interrupts = <0 48 4>;
> reg = <0x0 0xff160000 0x0 0x1000>;
> clock-names = "clk_xin", "clk_ahb";
> + #clock-cells = <1>;
> + clock-output-names = "clk_out_sd0", "clk_in_sd0";
> };
>
> sdhci1: mmc@ff170000 {
> compatible = "arasan,sdhci-8.9a";
> + compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
> status = "disabled";
> interrupt-parent = <&gic>;
> interrupts = <0 49 4>;
> reg = <0x0 0xff170000 0x0 0x1000>;
> clock-names = "clk_xin", "clk_ahb";
> + #clock-cells = <1>;
> + clock-output-names = "clk_out_sd1", "clk_in_sd1";
> };
>
> smmu: smmu@fd800000 {
>
Patches have been applied
https://lkml.org/lkml/2019/11/20/366
That's why I have applied this one to my tree.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
On 21. 11. 19 9:34, Michal Simek wrote:
> On 17. 10. 19 9:28, Manish Narani wrote:
>> Add the new compatible string for ZynqMP SD Host Controller for its use
>> in the Arasan SDHCI driver for some of the ZynqMP specific operations.
>> Add required properties for the same.
>>
>> Signed-off-by: Manish Narani <[email protected]>
>> ---
>> This patch depends on the below series of patches:
>> https://lkml.org/lkml/2019/10/17/37
>>
>> Changes in v2:
>> - Added clock-names for SD card clocks for getting clocks in the driver
>>
>> Changes in v3:
>> - Reverted "Added clock-names for SD card clocks for getting clocks in the driver"
>> ---
>> arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>> index 9aa67340a4d8..c7b8c3c28aa7 100644
>> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
>> @@ -494,20 +494,26 @@
>>
>> sdhci0: mmc@ff160000 {
>> compatible = "arasan,sdhci-8.9a";
>> + compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
>> status = "disabled";
>> interrupt-parent = <&gic>;
>> interrupts = <0 48 4>;
>> reg = <0x0 0xff160000 0x0 0x1000>;
>> clock-names = "clk_xin", "clk_ahb";
>> + #clock-cells = <1>;
>> + clock-output-names = "clk_out_sd0", "clk_in_sd0";
>> };
>>
>> sdhci1: mmc@ff170000 {
>> compatible = "arasan,sdhci-8.9a";
>> + compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
>> status = "disabled";
>> interrupt-parent = <&gic>;
>> interrupts = <0 49 4>;
>> reg = <0x0 0xff170000 0x0 0x1000>;
>> clock-names = "clk_xin", "clk_ahb";
>> + #clock-cells = <1>;
>> + clock-output-names = "clk_out_sd1", "clk_in_sd1";
>> };
>>
>> smmu: smmu@fd800000 {
>>
>
> Patches have been applied
> https://lkml.org/lkml/2019/11/20/366
>
> That's why I have applied this one to my tree.
Sorry for confusion. I removed this patch. There are two lines with
compatible property which is wrong. Please send v4.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs