Skip to content

Commit

Permalink
fixups
Browse files Browse the repository at this point in the history
  • Loading branch information
@pelwell
pelwell committed Apr 15, 2020
1 parent c188d57 commit 78a055a
Show file tree
Hide file tree
Showing 36 changed files with 140 additions and 67 deletions.
13 changes: 11 additions & 2 deletions arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "bcm2708-rpi.dtsi"
#include "bcm283x-rpi-smsc9514.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c10mux_0_28.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"

/ {
compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
Expand All @@ -22,6 +22,11 @@
brcm,function = <1>; /* output */
};

i2c0_pins: i2c0 {
brcm,pins = <0 1>;
brcm,function = <4>;
};

i2c1_pins: i2c1 {
brcm,pins = <2 3>;
brcm,function = <4>;
Expand Down Expand Up @@ -64,10 +69,14 @@
};
};

&i2c10 {
&i2c0if {
clock-frequency = <100000>;
};

&i2c0mux {
pinctrl-0 = <&i2c0_pins>;
};

&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
Expand Down
18 changes: 11 additions & 7 deletions arch/arm/boot/dts/bcm2708-rpi-b.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "bcm2708-rpi.dtsi"
#include "bcm283x-rpi-smsc9512.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c10mux_0_28.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"

/ {
compatible = "raspberrypi,model-b", "brcm,bcm2835";
Expand All @@ -22,6 +22,11 @@
brcm,function = <1>; /* output */
};

i2c0_pins: i2c0 {
brcm,pins = <0 1>;
brcm,function = <4>;
};

i2c1_pins: i2c1 {
brcm,pins = <2 3>;
brcm,function = <4>;
Expand All @@ -38,11 +43,6 @@
};
};

&i2c10mux {
pinctrl-0;
pinctrl-1 = <&i2c0_gpio28>;
};

&uart0 {
status = "okay";
};
Expand All @@ -69,10 +69,14 @@
};
};

&i2c10 {
&i2c0if {
clock-frequency = <100000>;
};

&i2c0mux {
pinctrl-0 = <&i2c0_pins>;
};

&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
Expand Down
13 changes: 11 additions & 2 deletions arch/arm/boot/dts/bcm2708-rpi-cm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "bcm2708-rpi-cm.dtsi"
#include "bcm283x-rpi-csi0-2lane.dtsi"
#include "bcm283x-rpi-csi1-4lane.dtsi"
#include "bcm283x-rpi-i2c10mux_0_28.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"

/ {
compatible = "raspberrypi,compute-module", "brcm,bcm2835";
Expand All @@ -25,6 +25,11 @@
brcm,function = <1>; /* output */
};

i2c0_pins: i2c0 {
brcm,pins = <0 1>;
brcm,function = <4>;
};

i2c1_pins: i2c1 {
brcm,pins = <2 3>;
brcm,function = <4>;
Expand Down Expand Up @@ -63,10 +68,14 @@
};
};

&i2c10 {
&i2c0if {
clock-frequency = <100000>;
};

&i2c0mux {
pinctrl-0 = <&i2c0_pins>;
};

&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
Expand Down
13 changes: 11 additions & 2 deletions arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "bcm2708.dtsi"
#include "bcm2708-rpi.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c10mux_0_28.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"

/ {
compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
Expand Down Expand Up @@ -31,6 +31,11 @@
brcm,function = <1>; /* output */
};

i2c0_pins: i2c0 {
brcm,pins = <0 1>;
brcm,function = <4>;
};

i2c1_pins: i2c1 {
brcm,pins = <2 3>;
brcm,function = <4>;
Expand Down Expand Up @@ -112,10 +117,14 @@
};
};

&i2c10 {
&i2c0if {
clock-frequency = <100000>;
};

&i2c0mux {
pinctrl-0 = <&i2c0_pins>;
};

&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/bcm2708-rpi-zero.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
};
};

&i2c0 {
&i2c0if {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
clock-frequency = <100000>;
Expand Down
13 changes: 11 additions & 2 deletions arch/arm/boot/dts/bcm2709-rpi-2-b.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "bcm2709-rpi.dtsi"
#include "bcm283x-rpi-smsc9514.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c10mux_0_28.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"

/ {
compatible = "raspberrypi,2-model-b", "brcm,bcm2836";
Expand All @@ -22,6 +22,11 @@
brcm,function = <1>; /* output */
};

i2c0_pins: i2c0 {
brcm,pins = <0 1>;
brcm,function = <4>;
};

i2c1_pins: i2c1 {
brcm,pins = <2 3>;
brcm,function = <4>;
Expand Down Expand Up @@ -64,10 +69,14 @@
};
};

&i2c10 {
&i2c0if {
clock-frequency = <100000>;
};

&i2c0mux {
pinctrl-0 = <&i2c0_pins>;
};

&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
Expand Down
9 changes: 4 additions & 5 deletions arch/arm/boot/dts/bcm270x-rpi.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
i2s = &i2s;
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c9 = &i2c_csi_dsi;
i2c10 = &i2c10;
i2c10 = &i2c_csi_dsi;
spi0 = &spi0;
spi1 = &spi1;
spi2 = &spi2;
Expand Down Expand Up @@ -85,9 +84,9 @@
uart1 = <&uart1>,"status";
i2s = <&i2s>,"status";
spi = <&spi0>,"status";
i2c0 = <&i2c10>,"status",<&i2c10mux>,"status";
i2c0 = <&i2c0if>,"status",<&i2c0mux>,"status";
i2c1 = <&i2c1>,"status";
i2c0_baudrate = <&i2c10>,"clock-frequency:0";
i2c0_baudrate = <&i2c0if>,"clock-frequency:0";
i2c1_baudrate = <&i2c1>,"clock-frequency:0";

audio = <&audio>,"status";
Expand All @@ -107,7 +106,7 @@
status = "disabled";
};

&i2c0 {
&i2c0if {
status = "disabled";
};

Expand Down
13 changes: 11 additions & 2 deletions arch/arm/boot/dts/bcm2710-rpi-2-b.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "bcm2709-rpi.dtsi"
#include "bcm283x-rpi-smsc9514.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c10mux_0_28.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"

/ {
compatible = "raspberrypi,2-model-b-rev2", "brcm,bcm2837";
Expand All @@ -22,6 +22,11 @@
brcm,function = <1>; /* output */
};

i2c0_pins: i2c0 {
brcm,pins = <0 1>;
brcm,function = <4>;
};

i2c1_pins: i2c1 {
brcm,pins = <2 3>;
brcm,function = <4>;
Expand Down Expand Up @@ -64,10 +69,14 @@
};
};

&i2c10 {
&i2c0if {
clock-frequency = <100000>;
};

&i2c0mux {
pinctrl-0 = <&i2c0_pins>;
};

&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
Expand Down
13 changes: 11 additions & 2 deletions arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "bcm2709-rpi.dtsi"
#include "bcm283x-rpi-lan7515.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c10mux_0_44.dtsi"
#include "bcm283x-rpi-i2c0mux_0_44.dtsi"

/ {
compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";
Expand Down Expand Up @@ -32,6 +32,11 @@
brcm,function = <1>; /* output */
};

i2c0_pins: i2c0 {
brcm,pins = <0 1>;
brcm,function = <4>;
};

i2c1_pins: i2c1 {
brcm,pins = <2 3>;
brcm,function = <4>;
Expand Down Expand Up @@ -122,10 +127,14 @@
};
};

&i2c10 {
&i2c0if {
clock-frequency = <100000>;
};

&i2c0mux {
pinctrl-0 = <&i2c0_pins>;
};

&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
Expand Down
13 changes: 11 additions & 2 deletions arch/arm/boot/dts/bcm2710-rpi-3-b.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "bcm2709-rpi.dtsi"
#include "bcm283x-rpi-smsc9514.dtsi"
#include "bcm283x-rpi-csi1-2lane.dtsi"
#include "bcm283x-rpi-i2c10mux_0_44.dtsi"
#include "bcm283x-rpi-i2c0mux_0_44.dtsi"

/ {
compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
Expand Down Expand Up @@ -32,6 +32,11 @@
brcm,function = <1>; /* output */
};

i2c0_pins: i2c0 {
brcm,pins = <0 1>;
brcm,function = <4>;
};

i2c1_pins: i2c1 {
brcm,pins = <2 3>;
brcm,function = <4>;
Expand Down Expand Up @@ -133,10 +138,14 @@
};
};

&i2c10 {
&i2c0if {
clock-frequency = <100000>;
};

&i2c0mux {
pinctrl-0 = <&i2c0_pins>;
};

&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
Expand Down
13 changes: 11 additions & 2 deletions arch/arm/boot/dts/bcm2710-rpi-cm3.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "bcm2709-rpi.dtsi"
#include "bcm283x-rpi-csi0-2lane.dtsi"
#include "bcm283x-rpi-csi1-4lane.dtsi"
#include "bcm283x-rpi-i2c10mux_0_28.dtsi"
#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
/ {
compatible = "raspberrypi,3-compute-module", "brcm,bcm2837";
model = "Raspberry Pi Compute Module 3";
Expand All @@ -25,6 +25,11 @@
brcm,function = <1>; /* output */
};

i2c0_pins: i2c0 {
brcm,pins = <0 1>;
brcm,function = <4>;
};

i2c1_pins: i2c1 {
brcm,pins = <2 3>;
brcm,function = <4>;
Expand Down Expand Up @@ -83,10 +88,14 @@
};
};

&i2c10 {
&i2c0if {
clock-frequency = <100000>;
};

&i2c0mux {
pinctrl-0 = <&i2c0_pins>;
};

&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins>;
Expand Down
Loading

0 comments on commit 78a055a

Please sign in to comment.