-
Notifications
You must be signed in to change notification settings - Fork 5.3k
BSC0 config for I2C_MUX_PINCTRL to drive camera/display and GPIO #3537
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9f10313
defconfig: Enable I2C_MUX_PINCTRL in all Pi configs
6by9 eb7fd83
dt: Implement an I2C pinctrl mux for BSC0.
6by9 2c294f9
dtoverlays: Update CSI overlays to use i2c_csi_dsi
6by9 39e472b
dt: Update all mainline bcm283x dt files for i2c0 pinctrl mux
6by9 c5ecb35
ARM: dts: Create bcm2708-rpi-b-rev1.dts
pelwell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /dts-v1/; | ||
|
|
||
| #include "bcm2708.dtsi" | ||
| #include "bcm2708-rpi.dtsi" | ||
| #include "bcm283x-rpi-smsc9512.dtsi" | ||
| #include "bcm283x-rpi-csi1-2lane.dtsi" | ||
|
|
||
| / { | ||
| compatible = "raspberrypi,model-b", "brcm,bcm2835"; | ||
| model = "Raspberry Pi Model B"; | ||
| }; | ||
|
|
||
| &gpio { | ||
| spi0_pins: spi0_pins { | ||
| brcm,pins = <9 10 11>; | ||
| brcm,function = <4>; /* alt0 */ | ||
| }; | ||
|
|
||
| spi0_cs_pins: spi0_cs_pins { | ||
| brcm,pins = <8 7>; | ||
| brcm,function = <1>; /* output */ | ||
| }; | ||
|
|
||
| i2c0_pins: i2c0 { | ||
| brcm,pins = <0 1>; | ||
| brcm,function = <4>; | ||
| }; | ||
|
|
||
| i2c1_pins: i2c1 { | ||
| brcm,pins = <2 3>; | ||
| brcm,function = <4>; | ||
| }; | ||
|
|
||
| i2s_pins: i2s { | ||
| brcm,pins = <28 29 30 31>; | ||
| brcm,function = <6>; /* alt2 */ | ||
| }; | ||
|
|
||
| audio_pins: audio_pins { | ||
| brcm,pins = <40 45>; | ||
| brcm,function = <4>; | ||
| }; | ||
| }; | ||
|
|
||
| &uart0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &spi0 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&spi0_pins &spi0_cs_pins>; | ||
| cs-gpios = <&gpio 8 1>, <&gpio 7 1>; | ||
|
|
||
| spidev0: spidev@0{ | ||
| compatible = "spidev"; | ||
| reg = <0>; /* CE0 */ | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| spi-max-frequency = <125000000>; | ||
| }; | ||
|
|
||
| spidev1: spidev@1{ | ||
| compatible = "spidev"; | ||
| reg = <1>; /* CE1 */ | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| spi-max-frequency = <125000000>; | ||
| }; | ||
| }; | ||
|
|
||
| /delete-node/ &i2c0mux; | ||
|
|
||
| i2c0: &i2c0if { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&i2c0_pins>; | ||
| clock-frequency = <100000>; | ||
| }; | ||
|
|
||
| i2c_csi_dsi: &i2c1 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&i2c1_pins>; | ||
| clock-frequency = <100000>; | ||
| }; | ||
|
|
||
| / { | ||
| aliases { | ||
| i2c0 = &i2c0; | ||
| }; | ||
|
|
||
| __overrides__ { | ||
| i2c0 = <&i2c0>, "status"; | ||
| }; | ||
| }; | ||
|
|
||
| &i2c2 { | ||
| clock-frequency = <100000>; | ||
| }; | ||
|
|
||
| &i2s { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&i2s_pins>; | ||
| }; | ||
|
|
||
| &leds { | ||
| act_led: act { | ||
| label = "led0"; | ||
| linux,default-trigger = "mmc0"; | ||
| gpios = <&gpio 16 1>; | ||
| }; | ||
| }; | ||
|
|
||
| &hdmi { | ||
| hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
|
|
||
| &audio { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&audio_pins>; | ||
| }; | ||
|
|
||
| / { | ||
| __overrides__ { | ||
| act_led_gpio = <&act_led>,"gpios:4"; | ||
| act_led_activelow = <&act_led>,"gpios:8"; | ||
| act_led_trigger = <&act_led>,"linux,default-trigger"; | ||
| }; | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bcm283x-rpi-i2c0mux_0_28.dtsi is included which sets
Do we need to duplicate? Or is there a commit missing here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i2c0_pins is a downstream entity so I don't want to refer to it from an upstream file, but I do want to retain the name, hence the apparent duplication.