UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Enables the standard Nomadik I2C driver for use 

on the original Nomadik instead of using a bit-banged
 driver.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.13 (GNU/Linux)
 
 iQIcBAABAgAGBQJSEeneAAoJEEEQszewGV1zNPcQAJCmBeQ6xmz5yD149f8EMsM/
 9nI2/cDPpGfP4V/KoJREY45K4v4tsUlZsT28PksdIQHFw+ZjowIzIQQ6AeHrFKpl
 AV1gTkQyXV/Lee4wSh0f7ELbA01+HAbz1P1komdGzHQU9maOtq43bwxlp+iVmxHs
 J7GyF5saFKL124utoY8lhYll9rlTALZT6rV3pv5GnHrDBg8fGqLopzhmAlXkFf6i
 pwwFYEMAUMcv431xEVa7eGAXCccNSIjrulRuJc0bnphMOyOHYTGKyv0dujdq8yQA
 uwkn4eGLS0f+MCBgw3RamtZDl0lH5Rj5LsWk3ZIS23AmEpAnxAMA2/uxG207bHgV
 jAbfgXTp/K7LfA0HfINJZZ1e2RhCpNReNR1ylcaHnlsVTGZJmEgtXauVE76nSRME
 SBV2GPgMsZzU8Wm2K7OFaoxsT5ytL0gxxpOilyKvawxlDv6nSGrtyqYpUYIcWNCL
 zW5/DuWwFGZc7IXmizSBArFhg67BLveO2qDsUrNI+4aQrNIvvaNDiUazAv6CCXAr
 bN9xZ0IpdNKl8nKvuqAEBwrDoYNLNdLY7gaI8aBd5kacrWj0/LzukP+zVG6WqNIb
 bM5oT/O7a4CJO7zZL5bVEnePg5GLPkz3+qGTRuWuaEJ8HW4BBrwlOR4TjocezRt6
 y2c+ThrIWwTX1tq4Kv6W
 =jQFd
 -----END PGP SIGNATURE-----

Merge tag 'nomadik-i2c-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

From Linus Walleij:
Enables the standard Nomadik I2C driver for use
on the original Nomadik instead of using a bit-banged
driver.

* tag 'nomadik-i2c-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: nomadik: switch to use the Nomadik I2C driver

Signed-off-by: Kevin Hilman <khilman@linaro.org>
This commit is contained in:
Kevin Hilman 2013-08-22 09:14:04 -07:00
parent 5f5cc5cd7c 66e0c12f9e
commit 7ae0cebc58
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
View File

@ -140,18 +140,30 @@
};
};
i2c0 {
i2c0_default_mux: i2c0_mux {
i2c0_default_mux {
ste,function = "i2c0";
ste,pins = "i2c0_a_1";
};
};
i2c0_default_mode: i2c0_default {
i2c0_default_cfg {
ste,pins = "GPIO62_D3", "GPIO63_D2";
ste,input = <1>;
ste,input = <0>;
};
};
};
i2c1 {
i2c1_default_mux: i2c1_mux {
i2c1_default_mux {
ste,function = "i2c1";
ste,pins = "i2c1_a_1";
};
};
i2c1_default_mode: i2c1_default {
i2c1_default_cfg {
ste,pins = "GPIO53_L4", "GPIO54_L3";
ste,input = <1>;
ste,input = <0>;
};
};
};
@ -159,7 +171,7 @@
i2c2_default_mode: i2c2_default {
i2c2_default_cfg {
ste,pins = "GPIO73_C21", "GPIO74_C20";
ste,input = <1>;
ste,input = <0>;
};
};
};
@ -682,13 +694,17 @@
/* I2C0 connected to the STw4811 power management chip */
i2c0 {
compatible = "i2c-gpio";
gpios = <&gpio1 31 0>, /* sda */
<&gpio1 30 0>; /* scl */
compatible = "st,nomadik-i2c", "arm,primecell";
reg = <0x101f8000 0x1000>;
interrupt-parent = <&vica>;
interrupts = <20>;
clock-frequency = <100000>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&i2c0clk>, <&pclki2c0>;
clock-names = "mclk", "apb_pclk";
pinctrl-names = "default";
pinctrl-0 = <&i2c0_default_mode>;
pinctrl-0 = <&i2c0_default_mux>, <&i2c0_default_mode>;
stw4811@2d {
compatible = "st,stw4811";
@ -698,13 +714,17 @@
/* I2C1 connected to various sensors */
i2c1 {
compatible = "i2c-gpio";
gpios = <&gpio1 22 0>, /* sda */
<&gpio1 21 0>; /* scl */
compatible = "st,nomadik-i2c", "arm,primecell";
reg = <0x101f7000 0x1000>;
interrupt-parent = <&vica>;
interrupts = <21>;
clock-frequency = <100000>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&i2c1clk>, <&pclki2c1>;
clock-names = "mclk", "apb_pclk";
pinctrl-names = "default";
pinctrl-0 = <&i2c1_default_mode>;
pinctrl-0 = <&i2c1_default_mux>, <&i2c1_default_mode>;
camera@2d {
compatible = "st,camera";

1
arch/arm/mach-nomadik/Kconfig
View File

@ -27,6 +27,7 @@ config MACH_NOMADIK_8815NHK
select NOMADIK_8815
select I2C
select I2C_ALGOBIT
select I2C_NOMADIK
endmenu
endif