From 0edfb77a4706fa6160f4b7dc83fdc09058904244 Mon Sep 17 00:00:00 2001 From: Klaus Goger Date: Mon, 18 May 2015 14:37:33 +0200 Subject: 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 --- arch/arm/boot/dts/sun6i-a31-pangolin.dts | 7 ++++++- arch/arm/boot/dts/sun6i-a31.dtsi | 7 +++++++ arch/arm/configs/pangolin_defconfig | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) (limited to 'arch') diff --git a/arch/arm/boot/dts/sun6i-a31-pangolin.dts b/arch/arm/boot/dts/sun6i-a31-pangolin.dts index 06024744bb9f..9dd0c4d31a62 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 cf7f5a31a41b..7d231cb5cf25 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -672,6 +672,13 @@ allwinner,pull = ; }; + i2c3_pins_a: i2c3@0 { + allwinner,pins = "PB5", "PB6"; + allwinner,function = "i2c3"; + allwinner,drive = ; + allwinner,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 3559eb967561..9784990aca5c 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 -- cgit v1.2.3