diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-18 18:04:33 +0100 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-19 07:17:21 +0100 |
| commit | 62b7f5931c54e96fca56dd8761b0e466d355c881 (patch) | |
| tree | 1258b392752379833a075df006c2f6d7ac4be51d /target/linux/bcm27xx/patches-5.4/950-0964-dt-Remove-duplicate-assignment-for-i2c0-pinctrl-conf.patch | |
| parent | 76d1168d0d4b9d76e2ad78c0fc6b255561deb284 (diff) | |
| download | upstream-62b7f5931c54e96fca56dd8761b0e466d355c881.tar.gz upstream-62b7f5931c54e96fca56dd8761b0e466d355c881.tar.bz2 upstream-62b7f5931c54e96fca56dd8761b0e466d355c881.zip | |
bcm27xx: import latest patches from the RPi foundation
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
(cherry-picked from commit f07e572f64)
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0964-dt-Remove-duplicate-assignment-for-i2c0-pinctrl-conf.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0964-dt-Remove-duplicate-assignment-for-i2c0-pinctrl-conf.patch | 155 |
1 files changed, 155 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0964-dt-Remove-duplicate-assignment-for-i2c0-pinctrl-conf.patch b/target/linux/bcm27xx/patches-5.4/950-0964-dt-Remove-duplicate-assignment-for-i2c0-pinctrl-conf.patch new file mode 100644 index 0000000000..ce3d9b5773 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0964-dt-Remove-duplicate-assignment-for-i2c0-pinctrl-conf.patch @@ -0,0 +1,155 @@ +From 12bd4eee1bb882417a38c2b5c9790e97725e489d Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.com> +Date: Thu, 3 Sep 2020 15:12:50 +0100 +Subject: [PATCH] dt: Remove duplicate assignment for i2c0 pinctrl + config + +The include file bcm283x-rpi-i2c0mux_0_XX.dtsi was setting +pinctrl-0 on i2c0mux, as were the individual platform DT files. + +Remove this duplication and rely on the include file. + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> +--- + arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 4 ---- + arch/arm/boot/dts/bcm2708-rpi-b.dts | 4 ---- + arch/arm/boot/dts/bcm2708-rpi-cm.dts | 4 ---- + arch/arm/boot/dts/bcm2708-rpi-zero-w.dts | 4 ---- + arch/arm/boot/dts/bcm2708-rpi-zero.dts | 4 ---- + arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 4 ---- + arch/arm/boot/dts/bcm2710-rpi-2-b.dts | 4 ---- + arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 4 ---- + arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 4 ---- + arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 4 ---- + 10 files changed, 40 deletions(-) + +--- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts ++++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +@@ -73,10 +73,6 @@ + clock-frequency = <100000>; + }; + +-&i2c0mux { +- pinctrl-0 = <&i2c0_pins>; +-}; +- + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; +--- a/arch/arm/boot/dts/bcm2708-rpi-b.dts ++++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts +@@ -73,10 +73,6 @@ + clock-frequency = <100000>; + }; + +-&i2c0mux { +- pinctrl-0 = <&i2c0_pins>; +-}; +- + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; +--- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts ++++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts +@@ -72,10 +72,6 @@ + clock-frequency = <100000>; + }; + +-&i2c0mux { +- pinctrl-0 = <&i2c0_pins>; +-}; +- + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; +--- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts ++++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts +@@ -122,10 +122,6 @@ + clock-frequency = <100000>; + }; + +-&i2c0mux { +- pinctrl-0 = <&i2c0_pins>; +-}; +- + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; +--- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts ++++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts +@@ -76,10 +76,6 @@ + clock-frequency = <100000>; + }; + +-&i2c0mux { +- pinctrl-0 = <&i2c0_pins>; +-}; +- + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; +--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts ++++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts +@@ -73,10 +73,6 @@ + clock-frequency = <100000>; + }; + +-&i2c0mux { +- pinctrl-0 = <&i2c0_pins>; +-}; +- + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; +--- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts ++++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts +@@ -73,10 +73,6 @@ + clock-frequency = <100000>; + }; + +-&i2c0mux { +- pinctrl-0 = <&i2c0_pins>; +-}; +- + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; +--- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts ++++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +@@ -132,10 +132,6 @@ + clock-frequency = <100000>; + }; + +-&i2c0mux { +- pinctrl-0 = <&i2c0_pins>; +-}; +- + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; +--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts ++++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +@@ -147,10 +147,6 @@ + clock-frequency = <100000>; + }; + +-&i2c0mux { +- pinctrl-0 = <&i2c0_pins>; +-}; +- + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; +--- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts ++++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts +@@ -92,10 +92,6 @@ + clock-frequency = <100000>; + }; + +-&i2c0mux { +- pinctrl-0 = <&i2c0_pins>; +-}; +- + &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; |