Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Sebastian Hesselbarth and committed by
Jason Cooper
d7e1c076 ce55b1f4

+6 -4
+6
arch/arm/boot/dts/kirkwood-6282.dtsi
··· 68 68 marvell,function = "sata1"; 69 69 }; 70 70 71 + /* 72 + * Default I2C1 pinctrl setting on mpp36/mpp37, 73 + * overwrite marvell,pins on board level if required. 74 + */ 71 75 pmx_twsi1: pmx-twsi1 { 72 76 marvell,pins = "mpp36", "mpp37"; 73 77 marvell,function = "twsi1"; ··· 105 101 interrupts = <32>; 106 102 clock-frequency = <100000>; 107 103 clocks = <&gate_clk 7>; 104 + pinctrl-0 = <&pmx_twsi1>; 105 + pinctrl-names = "default"; 108 106 status = "disabled"; 109 107 }; 110 108
-2
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
··· 33 33 34 34 i2c@11100 { 35 35 status = "okay"; 36 - pinctrl-0 = <&pmx_twsi1>; 37 - pinctrl-names = "default"; 38 36 39 37 s35390a: s35390a@30 { 40 38 compatible = "s35390a";
-2
arch/arm/boot/dts/kirkwood-openblocks_a7.dts
··· 45 45 46 46 i2c@11100 { 47 47 status = "okay"; 48 - pinctrl-0 = <&pmx_twsi1>; 49 - pinctrl-names = "default"; 50 48 51 49 s24c02: s24c02@50 { 52 50 compatible = "24c02";