summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-colibri-aster.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri-aster.dtsi28
1 files changed, 1 insertions, 27 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi
index 93367e89466e..e7d6da210dc1 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi
@@ -107,11 +107,6 @@
};
};
-/* ATMEL TS connector */
-&atmel_mxt_ts {
- status = "okay";
-};
-
/* PWM <A> */
&pwm4 {
status = "okay";
@@ -155,28 +150,7 @@
status = "okay";
};
-/* The define SD_1_8 allows to use the SD interface at a higher speed mode
- * if the card supports it. For this the signaling voltage is switched from
- * 3.3V to 1.8V under the usdhc1's drivers control.
- */
-/* #define SD_1_8 */
&usdhc1 {
-#ifdef SD_1_8
- pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
- pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>;
- pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_snvs_usdhc1_cd>;
- pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_snvs_usdhc1_cd>;
- pinctrl-3 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd_sleep>;
- vqmmc-supply = <&reg_sd1_vqmmc>;
-#else
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>;
- no-1-8-v;
-#endif
- cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
- disable-wp;
- enable-sdio-wakeup;
- keep-power-in-suspend;
- status = "okay";
vmmc-supply = <&reg_3v3>;
+ status = "okay";
};