openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: dts: dove: Add internal i2c multiplexer node 

This adds a i2c-mux-pinctrl node to dove.dtsi for the internal i2c
mux found on Dove SoCs. Up to now, we had no board using any of the
two additional i2c busses, so make sure the change does not break
any existing boards.

Therefore, we rename the i2c-controller node label to "i2c" and
enable it by default. Also, the dedicated sub-bus (now "i2c0") is
enabled by default. The two optional sub-busses require additional
external pin-muxing, so disable them by default.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
This commit is contained in:
Sebastian Hesselbarth 2015-05-04 22:08:47 +02:00 committed by Gregory CLEMENT
parent b787f68c36
commit 7ec7e546c0
1 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
arch/arm/boot/dts/dove.dtsi
View File

@ -33,6 +33,42 @@ l2: l2-cache {
marvell,tauros2-cache-features = <0>;
};
i2c-mux {
compatible = "i2c-mux-pinctrl";
#address-cells = <1>;
#size-cells = <0>;
i2c-parent = <&i2c>;
pinctrl-names = "i2c0", "i2c1", "i2c2";
pinctrl-0 = <&pmx_i2cmux_0>;
pinctrl-1 = <&pmx_i2cmux_1>;
pinctrl-2 = <&pmx_i2cmux_2>;
i2c0: i2c@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
};
i2c1: i2c@1 {
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
/* Requires pmx_i2c1 on i2c controller node */
status = "disabled";
};
i2c2: i2c@2 {
reg = <2>;
#address-cells = <1>;
#size-cells = <0>;
/* Requires pmx_i2c2 on i2c controller node */
status = "disabled";
};
};
mbus {
compatible = "marvell,dove-mbus", "marvell,mbus", "simple-bus";
#address-cells = <2>;
@ -123,7 +159,7 @@ spi0: spi-ctrl@10600 {
status = "disabled";
};
i2c0: i2c-ctrl@11000 {
i2c: i2c-ctrl@11000 {
compatible = "marvell,mv64xxx-i2c";
reg = <0x11000 0x20>;
#address-cells = <1>;
@ -132,7 +168,7 @@ i2c0: i2c-ctrl@11000 {
clock-frequency = <400000>;
timeout-ms = <1000>;
clocks = <&core_clk 0>;
status = "disabled";
status = "okay";
};
uart0: serial@12000 {