git.openwrt.org Git - openwrt/openwrt.git/blob

   1 From 12bd4eee1bb882417a38c2b5c9790e97725e489d Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Thu, 3 Sep 2020 15:12:50 +0100
   4 Subject: [PATCH] dt: Remove duplicate assignment for i2c0 pinctrl
   5  config
   6
   7 The include file bcm283x-rpi-i2c0mux_0_XX.dtsi was setting
   8 pinctrl-0 on i2c0mux, as were the individual platform DT files.
   9
  10 Remove this duplication and rely on the include file.
  11
  12 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  13 ---
  14  arch/arm/boot/dts/bcm2708-rpi-b-plus.dts   | 4 ----
  15  arch/arm/boot/dts/bcm2708-rpi-b.dts        | 4 ----
  16  arch/arm/boot/dts/bcm2708-rpi-cm.dts       | 4 ----
  17  arch/arm/boot/dts/bcm2708-rpi-zero-w.dts   | 4 ----
  18  arch/arm/boot/dts/bcm2708-rpi-zero.dts     | 4 ----
  19  arch/arm/boot/dts/bcm2709-rpi-2-b.dts      | 4 ----
  20  arch/arm/boot/dts/bcm2710-rpi-2-b.dts      | 4 ----
  21  arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 4 ----
  22  arch/arm/boot/dts/bcm2710-rpi-3-b.dts      | 4 ----
  23  arch/arm/boot/dts/bcm2710-rpi-cm3.dts      | 4 ----
  24  10 files changed, 40 deletions(-)
  25
  26 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  27 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  28 @@ -73,10 +73,6 @@
  29         clock-frequency = <100000>;
  30  };
  31
  32 -&i2c0mux {
  33 -       pinctrl-0 = <&i2c0_pins>;
  34 -};
  35 -
  36  &i2c1 {
  37         pinctrl-names = "default";
  38         pinctrl-0 = <&i2c1_pins>;
  39 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
  40 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
  41 @@ -73,10 +73,6 @@
  42         clock-frequency = <100000>;
  43  };
  44
  45 -&i2c0mux {
  46 -       pinctrl-0 = <&i2c0_pins>;
  47 -};
  48 -
  49  &i2c1 {
  50         pinctrl-names = "default";
  51         pinctrl-0 = <&i2c1_pins>;
  52 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts
  53 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
  54 @@ -72,10 +72,6 @@
  55         clock-frequency = <100000>;
  56  };
  57
  58 -&i2c0mux {
  59 -       pinctrl-0 = <&i2c0_pins>;
  60 -};
  61 -
  62  &i2c1 {
  63         pinctrl-names = "default";
  64         pinctrl-0 = <&i2c1_pins>;
  65 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
  66 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
  67 @@ -122,10 +122,6 @@
  68         clock-frequency = <100000>;
  69  };
  70
  71 -&i2c0mux {
  72 -       pinctrl-0 = <&i2c0_pins>;
  73 -};
  74 -
  75  &i2c1 {
  76         pinctrl-names = "default";
  77         pinctrl-0 = <&i2c1_pins>;
  78 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
  79 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
  80 @@ -76,10 +76,6 @@
  81         clock-frequency = <100000>;
  82  };
  83
  84 -&i2c0mux {
  85 -       pinctrl-0 = <&i2c0_pins>;
  86 -};
  87 -
  88  &i2c1 {
  89         pinctrl-names = "default";
  90         pinctrl-0 = <&i2c1_pins>;
  91 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
  92 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
  93 @@ -73,10 +73,6 @@
  94         clock-frequency = <100000>;
  95  };
  96
  97 -&i2c0mux {
  98 -       pinctrl-0 = <&i2c0_pins>;
  99 -};
 100 -
 101  &i2c1 {
 102         pinctrl-names = "default";
 103         pinctrl-0 = <&i2c1_pins>;
 104 --- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 105 +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 106 @@ -73,10 +73,6 @@
 107         clock-frequency = <100000>;
 108  };
 109
 110 -&i2c0mux {
 111 -       pinctrl-0 = <&i2c0_pins>;
 112 -};
 113 -
 114  &i2c1 {
 115         pinctrl-names = "default";
 116         pinctrl-0 = <&i2c1_pins>;
 117 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 118 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 119 @@ -132,10 +132,6 @@
 120         clock-frequency = <100000>;
 121  };
 122
 123 -&i2c0mux {
 124 -       pinctrl-0 = <&i2c0_pins>;
 125 -};
 126 -
 127  &i2c1 {
 128         pinctrl-names = "default";
 129         pinctrl-0 = <&i2c1_pins>;
 130 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 131 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 132 @@ -147,10 +147,6 @@
 133         clock-frequency = <100000>;
 134  };
 135
 136 -&i2c0mux {
 137 -       pinctrl-0 = <&i2c0_pins>;
 138 -};
 139 -
 140  &i2c1 {
 141         pinctrl-names = "default";
 142         pinctrl-0 = <&i2c1_pins>;
 143 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 144 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 145 @@ -92,10 +92,6 @@
 146         clock-frequency = <100000>;
 147  };
 148
 149 -&i2c0mux {
 150 -       pinctrl-0 = <&i2c0_pins>;
 151 -};
 152 -
 153  &i2c1 {
 154         pinctrl-names = "default";
 155         pinctrl-0 = <&i2c1_pins>;