summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2017-12-01 18:44:03 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-12-21 14:29:20 +0100
commit8ef8ae51ec6c642895a710e7db663178c557302c (patch)
treee62ef4e58fa1950998480d4e077f23d78beb5e9e /arch/arm/boot
parent141418d4fc9b1895e94880152402f23995011cca (diff)
ARM: dts: imx6ull: improve clock accuracy for SD High Speed
The High Speed SD interface requires a clock of 50MHz. Using a base clock of 198MHz allows for a more accurate clock than using 132MHz base clock. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi20
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri.dtsi5
2 files changed, 12 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
index d5496de4da78..36a9dc1693e4 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
@@ -37,6 +37,9 @@
&usdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
+ assigned-clocks = <&clks IMX6UL_CLK_USDHC2_SEL>, <&clks IMX6UL_CLK_USDHC2>;
+ assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>;
+ assigned-clock-rates = <0>, <198000000>;
no-1-8-v;
disable-wp;
enable-sdio-wakeup;
@@ -44,18 +47,9 @@
broken-cd;
/* non-removable;*/
status = "okay";
+ /*
+ * Does not work for a WiFi chip since vmmc get turned on only during
+ * SDIO communication...
+ */
// vmmc-supply = <&reg_wifi_pwd>;
-
-#if 0
- mwifiex: wifi@1 {
-//??? what is it really?
- compatible = "marvell,sd8787";
- reg = <1>;
- interrupt-parent = <&pio>;
- interrupts = <38 IRQ_TYPE_LEVEL_LOW>;
-
- marvell,caldata_00_txpwrlimit_2g_cfg_set = /bits/ 8 <0x01 0x00 0x06 0x00 0x08 0x02 0x89 0x01>;
- marvell,wakeup-pin = <3>;
- };
-#endif
};
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index 4ed695f39a25..25aad2654424 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -623,3 +623,8 @@
dr_mode = "host";
};
+&usdhc1 {
+ assigned-clocks = <&clks IMX6UL_CLK_USDHC1_SEL>, <&clks IMX6UL_CLK_USDHC1>;
+ assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>;
+ assigned-clock-rates = <0>, <198000000>;
+};