From a1aea201ef535484d09f1ba183863ab759410fb4 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 12 Apr 2023 16:11:40 +0100 Subject: [PATCH 719/726] ARM: dts: bcm27xx: Add i2c_arm/vc and friends Since there is now a dedicated dts file for the rev1 Model B (the only Pi to drive the primary camera with i2c1), move the creation of the i2c_arm, i2c_vc and i2c labels, aliases and overrides into the base dts files. Signed-off-by: Phil Elwell --- arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 6 ++++++ arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts | 13 +++++++++++++ arch/arm/boot/dts/bcm2708-rpi-b.dts | 6 ++++++ arch/arm/boot/dts/bcm2708-rpi-cm.dtsi | 6 ++++++ arch/arm/boot/dts/bcm2708-rpi-zero-w.dts | 3 +++ arch/arm/boot/dts/bcm2708-rpi-zero.dts | 3 +++ arch/arm/boot/dts/bcm2709-rpi.dtsi | 3 +++ arch/arm/boot/dts/bcm270x-rpi.dtsi | 7 +++++++ arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 3 +++ 9 files changed, 50 insertions(+) diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts index 9839960c753f..be1293368c84 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts @@ -186,6 +186,12 @@ &cam1_reg { cam0_reg: &cam_dummy_reg { }; +i2c_arm: &i2c1 { +}; + +i2c_vc: &i2c0 { +}; + / { __overrides__ { audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}"; diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts index 3335f6a0f0b9..84bf7c0b5c79 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts @@ -197,6 +197,12 @@ &cam1_reg { cam0_reg: &cam_dummy_reg { }; +i2c_arm: &i2c0 { +}; + +i2c_vc: &i2c1 { +}; + / { __overrides__ { audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}"; @@ -204,5 +210,12 @@ __overrides__ { act_led_gpio = <&act_led>,"gpios:4"; act_led_activelow = <&act_led>,"gpios:8"; act_led_trigger = <&act_led>,"linux,default-trigger"; + + i2c = <&i2c0>,"status"; + i2c_arm = <&i2c0>,"status"; + i2c_vc = <&i2c1>,"status"; + i2c_baudrate = <&i2c0>,"clock-frequency:0"; + i2c_arm_baudrate = <&i2c0>,"clock-frequency:0"; + i2c_vc_baudrate = <&i2c1>,"clock-frequency:0"; }; }; diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts index 634f0f6e6b49..6209c59f1fd4 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts @@ -179,6 +179,12 @@ &cam1_reg { cam0_reg: &cam_dummy_reg { }; +i2c_arm: &i2c1 { +}; + +i2c_vc: &i2c0 { +}; + / { __overrides__ { audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}"; diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi index ec4b154e4014..41f2635893bb 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi @@ -9,6 +9,12 @@ act_led: led-act { }; }; +i2c_arm: &i2c1 { +}; + +i2c_vc: &i2c0 { +}; + / { __overrides__ { act_led_gpio = <&act_led>,"gpios:4"; diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts index 8ce57a10611a..0da68c450ac0 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts @@ -235,6 +235,9 @@ &cam1_reg { cam0_reg: &cam_dummy_reg { }; +i2c_arm: &i2c1 {}; +i2c_vc: &i2c0 {}; + / { __overrides__ { audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}"; diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts index 7c6bbe9ca55b..eee17bf7757b 100644 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts @@ -176,6 +176,9 @@ &cam1_reg { cam0_reg: &cam_dummy_reg { }; +i2c_arm: &i2c1 {}; +i2c_vc: &i2c0 {}; + / { __overrides__ { audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}"; diff --git a/arch/arm/boot/dts/bcm2709-rpi.dtsi b/arch/arm/boot/dts/bcm2709-rpi.dtsi index babfa41cd9f7..7335e7fbcb71 100644 --- a/arch/arm/boot/dts/bcm2709-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi @@ -3,3 +3,6 @@ &vchiq { compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq"; }; + +i2c_arm: &i2c1 {}; +i2c_vc: &i2c0 {}; diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi index 1401d7b261f8..fafd81a3bb42 100644 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi @@ -21,6 +21,7 @@ aliases { i2c0 = &i2c0; i2c1 = &i2c1; i2c10 = &i2c_csi_dsi; + i2c = &i2c_arm; spi0 = &spi0; spi1 = &spi1; spi2 = &spi2; @@ -79,8 +80,14 @@ __overrides__ { spi = <&spi0>,"status"; i2c0 = <&i2c0if>,"status",<&i2c0mux>,"status"; i2c1 = <&i2c1>,"status"; + i2c = <&i2c1>,"status"; + i2c_arm = <&i2c1>,"status"; + i2c_vc = <&i2c0if>,"status",<&i2c0mux>,"status"; i2c0_baudrate = <&i2c0if>,"clock-frequency:0"; i2c1_baudrate = <&i2c1>,"clock-frequency:0"; + i2c_baudrate = <&i2c1>,"clock-frequency:0"; + i2c_arm_baudrate = <&i2c1>,"clock-frequency:0"; + i2c_vc_baudrate = <&i2c0if>,"clock-frequency:0"; watchdog = <&watchdog>,"status"; random = <&random>,"status"; diff --git a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi index f342e8547a8e..c1ad4791f6e2 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi @@ -267,6 +267,9 @@ &i2c0if { interrupts = ; }; +i2c_arm: &i2c1 {}; +i2c_vc: &i2c0 {}; + /delete-node/ &v3d; / { -- 2.33.1