diff options
| author | Michael Heimpold <michael.heimpold@i2se.com> | 2017-02-09 08:42:42 +0100 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2017-03-08 15:18:16 +0100 |
| commit | 45e89549ac47d4c91e326c900e1624f0aca91987 (patch) | |
| tree | a331e6325708c1801179dfd8254bfce66ff5422a | |
| parent | df93726be96468ba67ef973f2166747e44bfa5db (diff) | |
| download | talos-obmc-linux-45e89549ac47d4c91e326c900e1624f0aca91987.tar.gz talos-obmc-linux-45e89549ac47d4c91e326c900e1624f0aca91987.zip | |
ARM: dts: imx28: rename mmc2_sck_cfg
This patch renames mmc2_sck_cfg in order to prepare for an alternative
muxing setup.
Signed-off-by: Michael Heimpold <michael.heimpold@i2se.com>
Cc: Stefan Wahren <stefan.wahren@i2se.com>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
| -rw-r--r-- | arch/arm/boot/dts/imx28-m28cu3.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx28.dtsi | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx28-m28cu3.dts b/arch/arm/boot/dts/imx28-m28cu3.dts index 2df63bee6f4e..bb5329479c62 100644 --- a/arch/arm/boot/dts/imx28-m28cu3.dts +++ b/arch/arm/boot/dts/imx28-m28cu3.dts @@ -57,7 +57,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc2_4bit_pins_a &mmc2_cd_cfg - &mmc2_sck_cfg>; + &mmc2_sck_cfg_a>; bus-width = <4>; vmmc-supply = <®_vddio_sd1>; status = "okay"; diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 3981f1daf3a9..cf67e5c03130 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -613,7 +613,8 @@ fsl,pull-up = <MXS_PULL_DISABLE>; }; - mmc2_sck_cfg: mmc2-sck-cfg { + mmc2_sck_cfg_a: mmc2-sck-cfg@0 { + reg = <0>; fsl,pinmux-ids = < MX28_PAD_SSP0_DATA7__SSP2_SCK >; |
