x86: dts: edison: configure I2C#6 pins

Now that we have the pinctrl driver for Merrifield in place we can make
use of it and set I2C#6 pins appropriately.

Initial configuration came from the firmware.  Which quite likely has
been used in the phones, where that is not part of Atom peripheral, is
in use. Thus we need to override the leftover.

Signed-off-by: Georgii Staroselskii <georgii.staroselskii@emlid.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/dts/edison.dts b/arch/x86/dts/edison.dts
index 5c80f5c7fabea0e8fd4348bc8d55d89bb9183b5c..ca8dfb42872386929e39017d7728e7a6977d8509 100644 (file)
--- a/arch/x86/dts/edison.dts
+++ b/arch/x86/dts/edison.dts
@@ -90,4 +90,26 @@
                compatible = "intel,reset-tangier";
                u-boot,dm-pre-reloc;
        };
+
+       pinctrl {
+               compatible = "intel,pinctrl-tangier";
+               reg = <0xff0c0000 0x8000>;
+
+               /*
+                * Initial configuration came from the firmware.
+                * Which quite likely has been used in the phones, where I2C #8,
+                * that is not part of Atom peripheral, is in use.
+                * Thus we need to override the leftover.
+                */
+               i2c6_scl@0 {
+                       pad-offset = <111>;
+                       mode-func = <1>;
+                       protected;
+               };
+               i2c6_sda@0 {
+                       pad-offset = <112>;
+                       mode-func = <1>;
+                       protected;
+               };
+       };
 };