summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGeorgii Staroselskii <georgii.staroselskii@emlid.com>2018-09-11 13:31:08 +0300
committerBin Meng <bmeng.cn@gmail.com>2018-09-17 17:35:52 +0800
commitf26b260c69f1d92940f82b3d6674a7b70a967dfc (patch)
treef941fd7242e63370051518446b8e526ef3211ead /arch
parent355c9b757e1110151c78ea82fd834e6cb09bdb96 (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/dts/edison.dts22
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/x86/dts/edison.dts b/arch/x86/dts/edison.dts
index 5c80f5c7fa..ca8dfb4287 100644
--- 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;
+ };
+ };
};