summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Goger <klaus.goger@theobroma-systems.com>2015-05-18 14:37:33 +0200
committerKlaus Goger <klaus.goger@theobroma-systems.com>2015-07-30 18:53:01 +0200
commit0edfb77a4706fa6160f4b7dc83fdc09058904244 (patch)
tree41dcbeeecc2a15df60c6580da8226bbb3e0151d0
parentef7be38dda56059775c96408938657123b7cc8f8 (diff)
ARM: sunxi: enable I2C on pangolin
* added i2c driver to defconfig * added i2c3 pins to A31 dtsi * enabled all i2c blocks in dts Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
-rw-r--r--arch/arm/boot/dts/sun6i-a31-pangolin.dts7
-rw-r--r--arch/arm/boot/dts/sun6i-a31.dtsi7
-rw-r--r--arch/arm/configs/pangolin_defconfig2
3 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31-pangolin.dts b/arch/arm/boot/dts/sun6i-a31-pangolin.dts
index 06024744bb9..9dd0c4d31a6 100644
--- a/arch/arm/boot/dts/sun6i-a31-pangolin.dts
+++ b/arch/arm/boot/dts/sun6i-a31-pangolin.dts
@@ -129,7 +129,6 @@
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
- /* pull-ups and devices require AXP221 DLDO3 */
status = "okay";
};
@@ -145,6 +144,12 @@
status = "okay";
};
+&i2c3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c3_pins_a>;
+ status = "okay";
+};
+
&gpu {
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index cf7f5a31a41..7d231cb5cf2 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -672,6 +672,13 @@
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
+ i2c3_pins_a: i2c3@0 {
+ allwinner,pins = "PB5", "PB6";
+ allwinner,function = "i2c3";
+ allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+ allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ };
+
mmc0_pins_a: mmc0@0 {
allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5";
allwinner,function = "mmc0";
diff --git a/arch/arm/configs/pangolin_defconfig b/arch/arm/configs/pangolin_defconfig
index 3559eb96756..9784990aca5 100644
--- a/arch/arm/configs/pangolin_defconfig
+++ b/arch/arm/configs/pangolin_defconfig
@@ -1323,7 +1323,7 @@ CONFIG_I2C_ALGOBIT=y
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_MV64XXX is not set
+CONFIG_I2C_MV64XXX=y
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PXA_PCI is not set