1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
From 788109b357ddb30a95be72ce46dc22e2335131af Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Thu, 10 Jan 2019 15:27:56 +0000
Subject: [PATCH 303/806] overlays: sdio: Add enhanced 1-bit support
"dtoverlay=sdio,bus_width=1,gpios_22_25" is equivalent to the sdio-1bit
overlay, which is now deprecated.
"dtoverlay=sdio,bus_width=1,gpios_34_37" enables 1-bit mode on GPIOs 34-37.
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
---
arch/arm/boot/dts/overlays/README | 24 +++++++++++----------
arch/arm/boot/dts/overlays/sdio-overlay.dts | 20 ++++++++++++++++-
2 files changed, 32 insertions(+), 12 deletions(-)
--- a/arch/arm/boot/dts/overlays/README
+++ b/arch/arm/boot/dts/overlays/README
@@ -479,8 +479,7 @@ Params: <None>
Name: bmp085_i2c-sensor
Info: This overlay is now deprecated - see i2c-sensor
-Load: dtoverlay=bmp085_i2c-sensor
-Params: <None>
+Load: <Deprecated>
Name: dht11
@@ -1737,7 +1736,8 @@ Params: overclock_50 Clock (i
Name: sdio
Info: Selects the bcm2835-sdhost SD/MMC driver, optionally with overclock,
- and enables SDIO via GPIOs 22-27.
+ and enables SDIO via GPIOs 22-27. An example of use in 1-bit mode is
+ "dtoverlay=sdio,bus_width=1,gpios_22_25"
Load: dtoverlay=sdio,<param>=<val>
Params: sdio_overclock SDIO Clock (in MHz) to use when the MMC
framework requests 50MHz
@@ -1747,16 +1747,18 @@ Params: sdio_overclock SDIO Clo
bus_width Set the SDIO host bus width (default 4 bits)
+ gpios_22_25 Select GPIOs 22-25 for 1-bit mode. Must be used
+ with bus_width=1. This replaces the sdio-1bit
+ overlay, which is now deprecated.
-Name: sdio-1bit
-Info: Selects the bcm2835-sdhost SD/MMC driver, optionally with overclock,
- and enables 1-bit SDIO via GPIOs 22-25.
-Load: dtoverlay=sdio-1bit,<param>=<val>
-Params: sdio_overclock SDIO Clock (in MHz) to use when the MMC
- framework requests 50MHz
+ gpios_34_37 Select GPIOs 34-37 for 1-bit mode. Must be used
+ with bus_width=1.
- poll_once Disable SDIO-device polling every second
- (default on: polling once at boot-time)
+
+Name: sdio-1bit
+Info: This overlay is now deprecated. Use
+ "dtoverlay=sdio,bus_width=1,gpios_22_25" instead.
+Load: <Deprecated>
Name: sdtweak
--- a/arch/arm/boot/dts/overlays/sdio-overlay.dts
+++ b/arch/arm/boot/dts/overlays/sdio-overlay.dts
@@ -32,7 +32,7 @@
pinctrl-names = "default";
pinctrl-0 = <&sdio_ovl_pins>;
non-removable;
- bus-width = <1>;
+ bus-width = <4>;
};
};
};
@@ -49,6 +49,22 @@
};
fragment@3 {
+ target = <&sdio_ovl_pins>;
+ __dormant__ {
+ brcm,pins = <22 23 24 25>;
+ brcm,pull = <0 2 2 2>;
+ };
+ };
+
+ fragment@4 {
+ target = <&sdio_ovl_pins>;
+ __dormant__ {
+ brcm,pins = <34 35 36 37>;
+ brcm,pull = <0 2 2 2>;
+ };
+ };
+
+ fragment@6 {
target-path = "/aliases";
__overlay__ {
mmc1 = "/soc/sdio@7e300000";
@@ -59,5 +75,7 @@
poll_once = <&sdio_ovl>,"non-removable?";
bus_width = <&sdio_ovl>,"bus-width:0";
sdio_overclock = <&sdio_ovl>,"brcm,overclock-50:0";
+ gpios_22_25 = <0>,"=3";
+ gpios_34_37 = <0>,"=4";
};
};
|
