From: Phil Elwell Date: Wed, 19 Jul 2017 14:20:50 +0000 (+0100) Subject: overlays: i2c1-bcm2708: Don't overwrite i2c1 pins node X-Git-Tag: archive/raspbian/4.9.30-2+deb9u2+rpi1~4^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7b5897e889d8acb181b61ff09eeb22fb14eb04da;p=linux-4.9.git overlays: i2c1-bcm2708: Don't overwrite i2c1 pins node It is bad practise to overwrite an entire node in an overlay. Instead, target the node and overwrite any properties that need changing. See: https://github.com/raspberrypi/linux/pull/2118 Suggested-by: soodvarun78 Signed-off-by: Phil Elwell --- diff --git a/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts index e303b9c61c82..7c69047bcd88 100644 --- a/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts @@ -20,18 +20,15 @@ }; fragment@1 { - target = <&gpio>; - __overlay__ { - i2c1_pins: i2c1 { - brcm,pins = <2 3>; - brcm,function = <4>; /* alt0 */ - }; + target = <&i2c1_pins>; + pins: __overlay__ { + brcm,pins = <2 3>; + brcm,function = <4>; /* alt 0 */ }; }; - __overrides__ { - sda1_pin = <&i2c1_pins>,"brcm,pins:0"; - scl1_pin = <&i2c1_pins>,"brcm,pins:4"; - pin_func = <&i2c1_pins>,"brcm,function:0"; + sda1_pin = <&pins>,"brcm,pins:0"; + scl1_pin = <&pins>,"brcm,pins:4"; + pin_func = <&pins>,"brcm,function:0"; }; };