projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mfd-3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd...
[GitHub/exynos8895/android_kernel_samsung_universal8895.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-evm.dts
diff --git
a/arch/arm/boot/dts/am335x-evm.dts
b/arch/arm/boot/dts/am335x-evm.dts
index a16bb9691cc6832b84e48564781234b17a13f6e5..3aee1a43782db9068ac1d82cdd39216de5535a74 100644
(file)
--- a/
arch/arm/boot/dts/am335x-evm.dts
+++ b/
arch/arm/boot/dts/am335x-evm.dts
@@
-467,8
+467,24
@@
&cpsw_emac0 {
phy_id = <&davinci_mdio>, <0>;
&cpsw_emac0 {
phy_id = <&davinci_mdio>, <0>;
+ phy-mode = "rgmii-txid";
};
&cpsw_emac1 {
phy_id = <&davinci_mdio>, <1>;
};
&cpsw_emac1 {
phy_id = <&davinci_mdio>, <1>;
+ phy-mode = "rgmii-txid";
+};
+
+&tscadc {
+ status = "okay";
+ tsc {
+ ti,wires = <4>;
+ ti,x-plate-resistance = <200>;
+ ti,coordiante-readouts = <5>;
+ ti,wire-config = <0x00 0x11 0x22 0x33>;
+ };
+
+ adc {
+ ti,adc-channels = <4 5 6 7>;
+ };
};
};