diff options
| author | Robby Cai <r63905@freescale.com> | 2014-07-01 21:26:25 +0800 |
|---|---|---|
| committer | Robby Cai <r63905@freescale.com> | 2014-07-02 10:32:16 +0800 |
| commit | c8ef8609a7a4df4929979af19479140427f2e2fe (patch) | |
| tree | 95b52f41031757a07583b93f314483b90a0f9ca0 /arch | |
| parent | 6e8736a0ea4fdddb503a8b5c2b01e4562b175e98 (diff) | |
ENGR00320692-2 ARM: dts: imx6sl: make an alias for csi
Becuase in fsl_csi.c, there's a function call as follows.
id = of_alias_get_id(pdev->dev.of_node, "csi");
The corresponding change has been made for imx6sx, but not for imx6sl.
This patch fixed it by making an alias csi0.
Signed-off-by: Robby Cai <r63905@freescale.com>
(cherry picked from commit a5738d856fd5a8176f04a5eb316dfd512603ab4a)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx6sl-evk-common.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sl-evk-csi.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sl.dtsi | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6sl-evk-common.dtsi b/arch/arm/boot/dts/imx6sl-evk-common.dtsi index 2f0ec262d5f7..7e0088f768d1 100644 --- a/arch/arm/boot/dts/imx6sl-evk-common.dtsi +++ b/arch/arm/boot/dts/imx6sl-evk-common.dtsi @@ -128,7 +128,7 @@ status = "okay"; }; -&csi { +&csi1 { status = "disabled"; }; diff --git a/arch/arm/boot/dts/imx6sl-evk-csi.dts b/arch/arm/boot/dts/imx6sl-evk-csi.dts index 795be40b5e30..cae31bb6c5ae 100644 --- a/arch/arm/boot/dts/imx6sl-evk-csi.dts +++ b/arch/arm/boot/dts/imx6sl-evk-csi.dts @@ -14,7 +14,7 @@ }; }; -&csi { +&csi1 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 400c6be1a879..d5bc609b28c6 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -13,6 +13,7 @@ / { aliases { + csi0 = &csi1; mmc0 = &usdhc1; mmc1 = &usdhc2; mmc2 = &usdhc3; @@ -655,7 +656,7 @@ reg = <0x020e0000 0x4000>; }; - csi: csi@020e4000 { + csi1: csi@020e4000 { compatible = "fsl,imx6sl-csi"; reg = <0x020e4000 0x4000>; interrupts = <0 7 0x04>; @@ -924,7 +925,7 @@ }; }; - csi { + csi1 { pinctrl_csi_0: csigrp-0 { fsl,pins = < MX6SL_PAD_EPDC_GDRL__CSI_MCLK 0x110b0 |