1 From 531ae7af75b2be2867814693f069fb51e3155341 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Wed, 12 Jun 2019 17:32:11 +0100
4 Subject: [PATCH] overlays: Update w1-gpio and w1-gpio-pullup
6 The parasitic power (power on data) feature is now enabled by
7 default in the w1-gpio driver, so update the README and make the
8 "pullup" parameter a no-op.
10 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
12 arch/arm/boot/dts/overlays/README | 9 ++-------
13 arch/arm/boot/dts/overlays/w1-gpio-overlay.dts | 3 +--
14 arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts | 3 +--
15 3 files changed, 4 insertions(+), 11 deletions(-)
17 --- a/arch/arm/boot/dts/overlays/README
18 +++ b/arch/arm/boot/dts/overlays/README
19 @@ -2261,9 +2261,7 @@ Info: Configures the w1-gpio Onewire i
20 Use this overlay if you *don't* need a GPIO to drive an external pullup.
21 Load: dtoverlay=w1-gpio,<param>=<val>
22 Params: gpiopin GPIO for I/O (default "4")
24 - pullup Non-zero, "on", or "y" to enable the parasitic
25 - power (2-wire, power-on-data) feature
26 + pullup Now enabled by default (ignored)
30 @@ -2271,11 +2269,8 @@ Info: Configures the w1-gpio Onewire i
31 Use this overlay if you *do* need a GPIO to drive an external pullup.
32 Load: dtoverlay=w1-gpio-pullup,<param>=<val>
33 Params: gpiopin GPIO for I/O (default "4")
35 - pullup Non-zero, "on", or "y" to enable the parasitic
36 - power (2-wire, power-on-data) feature
38 extpullup GPIO for external pullup (default "5")
39 + pullup Now enabled by default (ignored)
43 --- a/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts
44 +++ b/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts
46 pinctrl-names = "default";
47 pinctrl-0 = <&w1_pins>;
49 - rpi,parasitic-power = <0>;
55 <&w1_pins>,"brcm,pins:0",
57 - pullup = <&w1>,"rpi,parasitic-power:0";
58 + pullup; // Silently ignore unneeded parameter
61 --- a/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts
62 +++ b/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts
64 pinctrl-names = "default";
65 pinctrl-0 = <&w1_pins>;
66 gpios = <&gpio 4 0>, <&gpio 5 1>;
67 - rpi,parasitic-power = <0>;
73 extpullup = <&w1>,"gpios:16",
74 <&w1_pins>,"brcm,pins:4";
75 - pullup = <&w1>,"rpi,parasitic-power:0";
76 + pullup; // Silently ignore unneeded parameter