1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00

Merge "ARM: dts: msm: Add SPI Ethernet support for msm8992"

This commit is contained in:
Linux Build Service Account 2014-07-21 14:00:15 -07:00 committed by Gerrit - the friendly Code Review server
commit b38f0dd491
3 changed files with 134 additions and 0 deletions

View file

@ -43,5 +43,105 @@
bias-pull-down;
};
};
spi0_active {
/* MOSI, MISO, CLK */
qcom,pins = <&gp 0>, <&gp 1>, <&gp 3>;
qcom,num-grp-pins = <3>;
qcom,pin-func = <1>;
label = "spi0-active";
/* active state */
spi0_default: default {
drive-strength = <12>; /* 12 MA */
bias-disable = <0>; /* No PULL */
};
};
spi0_suspend {
/* MOSI, MISO, CLK */
qcom,pins = <&gp 0>, <&gp 1>, <&gp 3>;
qcom,num-grp-pins = <3>;
qcom,pin-func = <0>;
label = "spi0-suspend";
/* suspended state */
spi0_sleep: sleep {
drive-strength = <2>; /* 2 MA */
bias-pull-down; /* pull down */
};
};
spi0_cs2_active {
/* CS */
qcom,pins = <&gp 9>;
qcom,num-grp-pins = <1>;
qcom,pin-func = <4>;
label = "spi0-cs2-active";
spi0_cs2_active: cs2_active {
drive-strength = <2>;
bias-disable = <0>;
};
};
spi0_cs2_suspend {
/* CS */
qcom,pins = <&gp 9>;
qcom,num-grp-pins = <1>;
qcom,pin-func = <4>;
label = "spi0-cs2-suspend";
spi0_cs2_sleep: cs2_sleep {
drive-strength = <2>;
bias-disable = <0>;
};
};
spi1_active {
/* MOSI, MISO, CLK */
qcom,pins = <&gp 4>, <&gp 5>, <&gp 7>;
qcom,num-grp-pins = <3>;
qcom,pin-func = <1>;
label = "spi1-active";
/* active state */
spi1_default: default {
drive-strength = <12>; /* 12 MA */
bias-disable = <0>; /* No PULL */
};
};
spi1_suspend {
/* MOSI, MISO, CLK */
qcom,pins = <&gp 4>, <&gp 5>, <&gp 7>;
qcom,num-grp-pins = <3>;
qcom,pin-func = <0>;
label = "spi1-suspend";
/* suspended state */
spi1_sleep: sleep {
drive-strength = <2>; /* 2 MA */
bias-pull-down; /* pull down */
};
};
spi1_cs2_active {
/* CS */
qcom,pins = <&gp 6>;
qcom,num-grp-pins = <1>;
qcom,pin-func = <1>;
label = "spi1-cs2-active";
spi1_cs2_active: cs2_active {
drive-strength = <2>;
bias-disable = <0>;
};
};
spi1_cs2_suspend {
/* CS */
qcom,pins = <&gp 6>;
qcom,num-grp-pins = <1>;
qcom,pin-func = <0>;
label = "spi1-cs2-suspend";
spi1_cs2_sleep: cs2_sleep {
drive-strength = <2>;
bias-disable = <0>;
};
};
};
};

View file

@ -27,3 +27,15 @@
&blsp1_uart5 {
status = "ok";
};
&spi_0 {
ethernet-controller@2 {
compatible = "micrel,ks8851";
interrupt-parent = <&msm_gpio>;
reg = <2>;
spi-max-frequency = <2400000>;
interrupts = <75 0>;
vdd-io-supply = <&dummy_vreg>;
vdd-phy-supply = <&dummy_vreg>;
};
};

View file

@ -20,6 +20,7 @@
interrupt-parent = <&intc>;
aliases {
spi0 = &spi_0;
};
cpus {
@ -264,6 +265,27 @@
regulator-name = "dummy_vreg";
regulator-always-on;
};
spi_0: spi@f9923000 {
compatible = "qcom,spi-qup-v2";
#address-cells = <1>;
#size-cells = <0>;
reg-names = "spi_physical";
reg = <0xf9923000 0x600>;
interrupt-names = "spi_irq";
interrupts = <0 95 0>;
spi-max-frequency = <50000000>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi1_default &spi1_cs2_active>;
pinctrl-1 = <&spi1_sleep &spi1_cs2_sleep>;
clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
<&clock_gcc clk_gcc_blsp1_qup2_spi_apps_clk>;
clock-names = "iface_clk", "core_clk";
qcom,infinite-mode = <0>;
qcom,use-pinctrl;
qcom,ver-reg-exists;
qcom,master-id = <86>;
};
};
#include "msm8992-ion.dtsi"