renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 02:04:05 +08:00
Code

ARM: dts: kirkwood: set default pinctrl for I2C1 on 6282

Browse Source 
Currently, the only 6282-based Kirkwood boards that use I2C1 are Openblocks
A6/A7. Both use the same default I2C1 pinctrl setting from kirkwood-6282.dtsi.
Move the pinctrl setting to the I2C1 node directly and put a note in front of
the corresponding pinctrl node to overwrite the setting on board level.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-14-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Sebastian Hesselbarth 2014-04-30 14:56:40 +02:00 committed by Jason Cooper
parent ce55b1f423
commit d7e1c07630
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/kirkwood-6282.dtsi
View File

@ -68,6 +68,10 @@
marvell,function = "sata1";
};
/*
* Default I2C1 pinctrl setting on mpp36/mpp37,
* overwrite marvell,pins on board level if required.
*/
pmx_twsi1: pmx-twsi1 {
marvell,pins = "mpp36", "mpp37";
marvell,function = "twsi1";
@ -101,6 +105,8 @@
interrupts = <32>;
clock-frequency = <100000>;
clocks = <&gate_clk 7>;
pinctrl-0 = <&pmx_twsi1>;
pinctrl-names = "default";
status = "disabled";
};

2
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
View File

@ -33,8 +33,6 @@
i2c@11100 {
status = "okay";
pinctrl-0 = <&pmx_twsi1>;
pinctrl-names = "default";
s35390a: s35390a@30 {
compatible = "s35390a";

2
arch/arm/boot/dts/kirkwood-openblocks_a7.dts
View File

@ -45,8 +45,6 @@
i2c@11100 {
status = "okay";
pinctrl-0 = <&pmx_twsi1>;
pinctrl-names = "default";
s24c02: s24c02@50 {
compatible = "24c02";