Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sciaps dpp #42

Open
wants to merge 6 commits into
base: ngx_2.7in-DPP3
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion arch/arm/boot/dts/qcom/apq8016-dart.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,10 @@
vbus_otg-supply = <&vph_pwr_vreg>;
};

//For Ketek DPP3: must be "disabled"
&blsp1_uart1 {
status = "ok";
//status = "ok";
status = "disabled";
};

&blsp1_uart2 {
Expand Down
15 changes: 12 additions & 3 deletions arch/arm/boot/dts/qcom/apq8016-var-sd410.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,21 @@
reg = <0x59>;
};

/* DS1307 RTC module */
rtc@0x68 {
compatible = "dallas,ds1307";
///* DS1307 RTC module */
//rtc@0x68 {
// compatible = "dallas,ds1307";
// reg = <0x68>;
//};

ds1341: rtc@68 {
compatible = "dallas,ds1341";
disable-oscillator-stop-flag;
//enable-glitch-filter;
enable-sciaps-SQWnINTB-workaround;
reg = <0x68>;
};


nose_cam_leds@0x62 {
compatible = "nxp,pca9633";
#address-cells = <1>;
Expand Down
4 changes: 3 additions & 1 deletion arch/arm/boot/dts/qcom/msm8916-cdp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,10 @@
};
};

//For Ketek DPP3: must be "disabled"
&blsp1_uart1 {
status = "ok";
//status = "ok";
status = "disabled";
};

&sdhc_1 {
Expand Down
4 changes: 3 additions & 1 deletion arch/arm/boot/dts/qcom/msm8916-mtp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,10 @@
};
};

//For Ketek DPP3: must be "disabled"
&blsp1_uart1 {
status = "ok";
//status = "ok";
status = "disabled";
};

&sdhc_1 {
Expand Down
52 changes: 52 additions & 0 deletions arch/arm/boot/dts/qcom/msm8916-pinctrl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,58 @@
};
};

// spi1 spi_1 is BLSP1 QUP0 (also called BLSP1)
spi1_active {
/* MOSI, MISO, CLK */
qcom,pins = <&gp 0>, <&gp 1>, <&gp 3>;
qcom,num-grp-pins = <3>;
qcom,pin-func = <1>;
label = "spi1-active";
/* active state */
spi1_default: spi1_default {
drive-strength = <12>; /* 12 MA */
bias-disable = <0>; /* No PULL */
};
};

spi1_suspend {
/* MOSI, MISO, CLK */
qcom,pins = <&gp 0>, <&gp 1>, <&gp 3>;
qcom,num-grp-pins = <3>;
qcom,pin-func = <0>;
label = "spi1-suspend";
/* suspended state */
spi1_sleep: spi1_sleep {
drive-strength = <2>; /* 2 MA */
bias-pull-down; /* pull down */
};
};

spi1_cs0_active {
/* CS */
qcom,pins = <&gp 2>;
qcom,num-grp-pins = <1>;
qcom,pin-func = <1>;
label = "spi1-cs0-active";
spi1_cs0_active: cs0_active {
drive-strength = <2>;
bias-disable = <0>;
};
};


spi1_cs0_suspend {
/* CS */
qcom,pins = <&gp 2>;
qcom,num-grp-pins = <1>;
qcom,pin-func = <0>;
label = "spi1-cs0-suspend";
spi1_cs0_sleep: cs0_sleep {
drive-strength = <2>;
bias-disable = <0>;
};
};

spi2_active {
/* MOSI, MISO, CLK */
qcom,pins = <&gp 16>, <&gp 17>, <&gp 19>;
Expand Down
49 changes: 47 additions & 2 deletions arch/arm/boot/dts/qcom/msm8916.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
i2c6 = &i2c_6; /* I2C6 NFC qup6 device */
i2c3 = &i2c_3; /* I2C7 BLSP1 QUP3 (also BLSP3) device */
i2c4 = &i2c_4; /* I2C4 controller device */
uart4 = &blsp1_uart1;
// Disable for Ketek DPP3
//uart4 = &blsp1_uart1;
};

cpus {
Expand Down Expand Up @@ -447,8 +448,52 @@
pinctrl-names = "sleep", "default";
pinctrl-0 = <&hsuart_sleep>;
pinctrl-1 = <&hsuart_active>;
/*status = "disabled";*/
//For Ketek DPP3: must be "disabled"
//status = "ok";
status = "disabled";
};

spi_1: spi@78b5000 { /* BLSP1: BLSP1 QUP0 */
compatible = "qcom,spi-qup-v2";
#address-cells = <1>;
#size-cells = <0>;
reg-names = "spi_physical", "spi_bam_physical";
reg = <0x78b5000 0x600>,
<0x7884000 0x23000>;
interrupt-names = "spi_irq", "spi_bam_irq";
interrupts = <0 95 0>, <0 238 0>;
spi-max-frequency = <50000000>;
qcom,gpio-mosi = <&msm_gpio 0 0>;
qcom,gpio-miso = <&msm_gpio 1 0>;
qcom,gpio-clk = <&msm_gpio 3 0>;
qcom,gpio-cs0 = <&msm_gpio 2 0>;
cs-gpios = <&msm_gpio 2 0>;
pinctrl-names = "spi_default", "spi_sleep";
pinctrl-0 = <&spi1_default &spi1_cs0_active>;
pinctrl-1 = <&spi1_sleep &spi1_cs0_sleep>;

clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
<&clock_gcc clk_gcc_blsp1_qup1_spi_apps_clk>;
clock-names = "iface_clk", "core_clk";
qcom,infinite-mode = <0>;
qcom,use-bam;
qcom,use-pinctrl;
qcom,ver-reg-exists;
qcom,bam-consumer-pipe-index = <4>;
qcom,bam-producer-pipe-index = <5>;
qcom,master-id = <86>;
//For Ketek DPP3: must be "ok"
status = "ok";
//status = "disabled";

ketek_dpp3@0 {
compatible = "ketek,dpp3";
reg = <0>;
spi-max-frequency = <12000000>;
spi-cpha = <0>;
spi-cpol = <0>;
};

};

blsp1_uart2: serial@78b0000 {
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/configs/ngx_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -586,3 +586,4 @@ CONFIG_QMI_ENCDEC=y
CONFIG_STRICT_MEMORY_RWX=y
CONFIG_USB_NET_AX8817X = y
CONFIG_FB_MSM_MDSS_SPLASH_SCIAPS_X=y
CONFIG_SCIAPS_DRIVERS=y
2 changes: 2 additions & 0 deletions drivers/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,6 @@ source "drivers/soc/Kconfig"

source "drivers/firmware/Kconfig"

source "drivers/sciaps/Kconfig"

endmenu
3 changes: 3 additions & 0 deletions drivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,6 @@ obj-$(CONFIG_ESOC) += esoc/
obj-$(CONFIG_BIF) += bif/
obj-$(CONFIG_SENSORS) += sensors/
obj-$(CONFIG_SENSORS_SSC) += sensors/

# SciAps Drivers
obj-$(CONFIG_SCIAPS_DRIVERS) += sciaps/
Loading