Skip to content

Commit

Permalink
ARM: ux500: Refactor common DT configs for sdi[n] devices
Browse files Browse the repository at this point in the history
Remove duplicated configurations and move specific details into
each corresponding dtsi file for the href versions.

Cc: Lee Jones <lee.jones@linaro.org>
Cc: devicetree@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Ulf Hansson authored and Linus Walleij committed Dec 13, 2013
1 parent c06551e commit a987a3a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 41 deletions.
2 changes: 0 additions & 2 deletions arch/arm/boot/dts/ste-href.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@
pinctrl-0 = <&sdi0_default_mode>;
pinctrl-1 = <&sdi0_sleep_mode>;

cd-gpios = <&tc3589x_gpio 3 0x4>;

status = "okay";
};

Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/ste-hrefprev60.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@
pinctrl-0 = <&ssp0_hrefprev60_mode>;
};

// External Micro SD slot
sdi0_per1@80126000 {
cd-gpios = <&tc3589x_gpio 3 0x4>;
};

vmmci: regulator-gpio {
gpios = <&tc3589x_gpio 18 0x4>;
enable-gpio = <&tc3589x_gpio 17 0x4>;
Expand Down
39 changes: 0 additions & 39 deletions arch/arm/boot/dts/ste-hrefv60plus.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -19,46 +19,7 @@
soc {
// External Micro SD slot
sdi0_per1@80126000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;
mmc-cap-sd-highspeed;
mmc-cap-mmc-highspeed;
vmmc-supply = <&ab8500_ldo_aux3_reg>;

cd-gpios = <&gpio2 31 0x4>; // 95

status = "okay";
};

// WLAN SDIO channel
sdi1_per2@80118000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <4>;

status = "okay";
};

// PoP:ed eMMC
sdi2_per3@80005000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <8>;
mmc-cap-mmc-highspeed;

status = "okay";
};

// On-board eMMC
sdi4_per2@80114000 {
arm,primecell-periphid = <0x10480180>;
max-frequency = <100000000>;
bus-width = <8>;
mmc-cap-mmc-highspeed;
vmmc-supply = <&ab8500_ldo_aux2_reg>;

status = "okay";
};

pinctrl {
Expand Down

0 comments on commit a987a3a

Please sign in to comment.