diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 07:31:33 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-10 08:48:38 +0100 |
| commit | e91a42a8f80099a8dc3a1903a5118964592e14ff (patch) | |
| tree | f4d68c8595c4a828b9bcecfcb5c9b890158650c2 /dts/Bindings | |
| parent | b7a0f044b6e25924763fc04da06fc4e12254f785 (diff) | |
| download | barebox-e91a42a8f80099a8dc3a1903a5118964592e14ff.tar.gz barebox-e91a42a8f80099a8dc3a1903a5118964592e14ff.tar.xz | |
dts: update to v4.2-rc4
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/Bindings')
| -rw-r--r-- | dts/Bindings/iommu/arm,smmu-v3.txt | 3 | ||||
| -rw-r--r-- | dts/Bindings/mmc/fsl-imx-esdhc.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/dts/Bindings/iommu/arm,smmu-v3.txt b/dts/Bindings/iommu/arm,smmu-v3.txt index c03eec1168..3443e0f838 100644 --- a/dts/Bindings/iommu/arm,smmu-v3.txt +++ b/dts/Bindings/iommu/arm,smmu-v3.txt @@ -35,3 +35,6 @@ the PCIe specification. NOTE: this only applies to the SMMU itself, not masters connected upstream of the SMMU. + +- hisilicon,broken-prefetch-cmd + : Avoid sending CMD_PREFETCH_* commands to the SMMU. diff --git a/dts/Bindings/mmc/fsl-imx-esdhc.txt b/dts/Bindings/mmc/fsl-imx-esdhc.txt index 5d0376b8f2..211e7785f4 100644 --- a/dts/Bindings/mmc/fsl-imx-esdhc.txt +++ b/dts/Bindings/mmc/fsl-imx-esdhc.txt @@ -17,7 +17,6 @@ Required properties: "fsl,imx6sx-usdhc" Optional properties: -- fsl,cd-controller : Indicate to use controller internal card detection - fsl,wp-controller : Indicate to use controller internal write protection - fsl,delay-line : Specify the number of delay cells for override mode. This is used to set the clock delay for DLL(Delay Line) on override mode @@ -35,7 +34,6 @@ esdhc@70004000 { compatible = "fsl,imx51-esdhc"; reg = <0x70004000 0x4000>; interrupts = <1>; - fsl,cd-controller; fsl,wp-controller; }; |