diff --git a/arch/arm64/boot/dts/google/sm8150-floral-display.dtsi b/arch/arm64/boot/dts/google/sm8150-floral-display.dtsi
index 8b09139..b9f24b0 100644
--- a/arch/arm64/boot/dts/google/sm8150-floral-display.dtsi
+++ b/arch/arm64/boot/dts/google/sm8150-floral-display.dtsi
@@ -154,12 +154,9 @@
};
};
-&sde_dp {
- status = "disabled";
-};
&mdss_mdp {
- connectors = <&sde_rscc &sde_wb &sde_dsi>;
+ connectors = <&sde_rscc &sde_wb &sde_dp &sde_dsi>;
};
&soc {
diff --git a/arch/arm64/boot/dts/google/sm8150-floral-haptics.dtsi b/arch/arm64/boot/dts/google/sm8150-floral-haptics.dtsi
index bd1779b..73fbcae 100644
--- a/arch/arm64/boot/dts/google/sm8150-floral-haptics.dtsi
+++ b/arch/arm64/boot/dts/google/sm8150-floral-haptics.dtsi
@@ -41,7 +41,7 @@
};
&qupv3_se15_i2c {
- status = "ok";
+ status = "disable";
// see -qup.dtsi for clk-freq-out setting
floral_cs40l25a: cs40l25a@43 {
compatible = "cirrus,cs40l25a";
diff --git a/arch/arm64/boot/dts/google/sm8150-floral-touch.dtsi b/arch/arm64/boot/dts/google/sm8150-floral-touch.dtsi
index 3f6bb7f..7f64b9f 100644
--- a/arch/arm64/boot/dts/google/sm8150-floral-touch.dtsi
+++ b/arch/arm64/boot/dts/google/sm8150-floral-touch.dtsi
@@ -34,11 +34,17 @@
};
&qupv3_se4_i2c {
- status = "disabled";
+ status = "ok";
+ fsa4480: fsa4480@43 {
+ compatible = "qcom,fsa4480-i2c";
+ reg = <0x43>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&fsa_usbc_ana_en>;
+ };
};
&qupv3_se4_spi {
- status = "ok";
+ status = "disabled";
floral_spitouch: touchscreen@0 {
status = "ok";
compatible = "st,fts";
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index f9b40352..276a9cb 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -677,9 +677,12 @@ static int __device_attach_driver(struct device_driver *drv, void *_data)
*/
if (dev->driver)
return -EBUSY;
-
+
ret = driver_match_device(drv, dev);
- if (ret == 0) {
+ //printk("__device_attach_driver--00000-drv-name=%s,dev name=%s,ret = %d\n",
+ // drv->name, dev_name(dev), ret);
+
+ if (ret == 0) {
/* no match */
return 0;
} else if (ret == -EPROBE_DEFER) {
@@ -821,7 +824,9 @@ static int __driver_attach(struct device *dev, void *data)
*/
ret = driver_match_device(drv, dev);
- if (ret == 0) {
+ //printk("__driver_attach--1111-drv-name=%s,dev name=%s,ret = %d\n",
+ /// drv->name, dev_name(dev), ret);
+ if (ret == 0) {
/* no match */
return 0;
} else if (ret == -EPROBE_DEFER) {
diff --git a/drivers/gpu/drm/msm/dp/dp_aux.c b/drivers/gpu/drm/msm/dp/dp_aux.c
index fb0d923..c9e0fb6 100644
--- a/drivers/gpu/drm/msm/dp/dp_aux.c
+++ b/drivers/gpu/drm/msm/dp/dp_aux.c
@@ -816,6 +816,10 @@ struct dp_aux *dp_aux_get(struct device *dev, struct dp_catalog_aux *catalog,
struct dp_aux_private *aux;
struct dp_aux *dp_aux;
+ printk("-xf.wang---catalog=%p,parser=%p,no_aux_switch = %d,aux_switch=%p,gpio_aux_switch=%d",
+ catalog,parser,parser->no_aux_switch,
+ aux_switch, parser->gpio_aux_switch);
+
if (!catalog || !parser ||
(!parser->no_aux_switch &&
!aux_switch &&
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 67d27df..3e9b19c 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -1311,9 +1311,10 @@ static int dp_init_sub_modules(struct dp_display_private *dp)
dp->aux = dp_aux_get(dev, &dp->catalog->aux, dp->parser,
dp->aux_switch_node);
+ printk("dp_aux_get----xf.wang---9988888--dp\n");
if (IS_ERR(dp->aux)) {
rc = PTR_ERR(dp->aux);
- pr_err("failed to initialize aux, rc = %d\n", rc);
+ pr_err("failed to -xf.wang--initialize aux, rc = %d\n", rc);
dp->aux = NULL;
goto error_aux;
}
@@ -1353,6 +1354,7 @@ static int dp_init_sub_modules(struct dp_display_private *dp)
ctrl_in.power = dp->power;
ctrl_in.catalog = &dp->catalog->ctrl;
ctrl_in.parser = dp->parser;
+ printk("dp_ctrl_get----xf.wang---777777--dp\n");
dp->ctrl = dp_ctrl_get(&ctrl_in);
if (IS_ERR(dp->ctrl)) {
@@ -1362,30 +1364,35 @@ static int dp_init_sub_modules(struct dp_display_private *dp)
goto error_ctrl;
}
+ printk("dp_ctrl_get----xf.wang---dp_audio_get--dp\n");
dp->panel->audio = dp_audio_get(dp->pdev, dp->panel,
&dp->catalog->audio);
if (IS_ERR(dp->panel->audio)) {
rc = PTR_ERR(dp->panel->audio);
- pr_err("failed to initialize audio, rc = %d\n", rc);
+ printk("failed to--xf.wang-- initialize audio, rc = %d\n", rc);
dp->panel->audio = NULL;
goto error_audio;
}
-
memset(&dp->mst, 0, sizeof(dp->mst));
dp->active_stream_cnt = 0;
cb->configure = dp_display_usbpd_configure_cb;
cb->disconnect = dp_display_usbpd_disconnect_cb;
cb->attention = dp_display_usbpd_attention_cb;
+ printk("dp_ctrl_get----xf.wang---dp_hpd_get--7777--dp\n");
dp->hpd = dp_hpd_get(dev, dp->parser, &dp->catalog->hpd, cb);
- if (IS_ERR(dp->hpd)) {
+ printk("dp_ctrl_get----xf.wang---dp_hpd_get--8888888--dp\n");
+ goto error_aux;
+ if (!IS_ERR(dp->hpd)) {
rc = PTR_ERR(dp->hpd);
- pr_err("failed to initialize hpd, rc = %d\n", rc);
+ pr_err("failed to --xf.wang--initialize hpd, rc = %d\n", rc);
dp->hpd = NULL;
goto error_hpd;
}
-
+ printk("dp_ctrl_get----xf.wang---dp_display_initialize_hdcp--*****--dp\n");
+ ///goto error_aux;
+
hdcp_disabled = !!dp_display_initialize_hdcp(dp);
debug_in.panel = dp->panel;
@@ -1411,6 +1418,9 @@ static int dp_init_sub_modules(struct dp_display_private *dp)
dp->debug->hdcp_disabled = hdcp_disabled;
dp_display_update_hdcp_status(dp, true);
+ printk("dp_ctrl_get----xf.wang---66666666--dp\n");
+ goto error_aux;
+
dp_display_get_usb_extcon(dp);
rc = dp->hpd->register_hpd(dp->hpd);
@@ -2153,24 +2163,25 @@ static int dp_display_init_aux_switch(struct dp_display_private *dp)
goto end;
}
- dp->aux_switch_node = of_parse_phandle(dp->pdev->dev.of_node,
- phandle, 0);
+ dp->aux_switch_node = of_parse_phandle(dp->pdev->dev.of_node, phandle, 0);
if (!dp->aux_switch_node) {
- pr_warn("cannot parse %s handle\n", phandle);
+ pr_warn("cannot parse %s-88-dp-xf.wang--newest- handle\n", phandle);
goto end;
}
+ printk("-dp-xf.wang--99->aux_switch_node=%p\n", dp->aux_switch_node);
nb.notifier_call = dp_display_fsa4480_callback;
nb.priority = 0;
rc = fsa4480_reg_notifier(&nb, dp->aux_switch_node);
if (rc) {
- pr_err("failed to register notifier (%d)\n", rc);
+ pr_err("failed to --xf.wang---register notifier (%d)\n", rc);
goto end;
}
fsa4480_unreg_notifier(&nb, dp->aux_switch_node);
-end:
+
+end:
return rc;
}
@@ -2547,7 +2558,8 @@ static int dp_display_probe(struct platform_device *pdev)
{
int rc = 0;
struct dp_display_private *dp;
-
+ printk("dp_display_probe---xf.wang---test prove number!\n");
+
if (!pdev || !pdev->dev.of_node) {
pr_err("pdev not found\n");
rc = -ENODEV;
diff --git a/drivers/gpu/drm/msm/dp/dp_hpd.c b/drivers/gpu/drm/msm/dp/dp_hpd.c
index a2d1abe..66208ac 100644
--- a/drivers/gpu/drm/msm/dp/dp_hpd.c
+++ b/drivers/gpu/drm/msm/dp/dp_hpd.c
@@ -51,7 +51,10 @@ struct dp_hpd *dp_hpd_get(struct device *dev, struct dp_parser *parser,
struct dp_catalog_hpd *catalog, struct dp_hpd_cb *cb)
{
struct dp_hpd *dp_hpd;
+ printk("--xf.wang---dp--parser->no_aux_switch=%d,parser->lphw_hpd=%d\n",
+ parser->no_aux_switch,parser->lphw_hpd);
+ return NULL;
if (parser->no_aux_switch && parser->lphw_hpd) {
dp_hpd = dp_lphw_hpd_get(dev, parser, catalog, cb);
if (!dp_hpd) {
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
index 8374053..1089689 100644
--- a/drivers/i2c/busses/i2c-qcom-geni.c
+++ b/drivers/i2c/busses/i2c-qcom-geni.c
@@ -1017,7 +1017,7 @@ static int geni_i2c_runtime_resume(struct device *dev)
u32 se_mode;
if (unlikely(proto != I2C)) {
- dev_err(gi2c->dev, "Invalid proto %d\n", proto);
+ dev_err(gi2c->dev, "Invalid -i2c-proto %d\n", proto);
se_geni_resources_off(&gi2c->i2c_rsc);
return -ENXIO;
}
diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
index 8884f8e..96a2da7 100644
--- a/drivers/i2c/i2c-core-of.c
+++ b/drivers/i2c/i2c-core-of.c
@@ -128,10 +128,12 @@ struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)
struct i2c_client *client;
dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match);
+ printk("--xf.wang-of_find_i2c_device_by_node-dev=%p\n", dev);
if (!dev)
return NULL;
client = i2c_verify_client(dev);
+ printk("--xf.wang-of_find_i2c_device_by_node-client=%p,dev=%p\n", client, dev);
if (!client)
put_device(dev);
diff --git a/drivers/soc/qcom/fsa4480-i2c.c b/drivers/soc/qcom/fsa4480-i2c.c
index fa95fb5..bacbd90 100644
--- a/drivers/soc/qcom/fsa4480-i2c.c
+++ b/drivers/soc/qcom/fsa4480-i2c.c
@@ -139,6 +139,7 @@ static int fsa4480_usbc_analog_setup_switches(struct fsa4480_priv *fsa_priv)
int rc = 0;
union power_supply_propval mode;
struct device *dev;
+ printk("--fsa4480_usbc_analog_setup_switches-xf.wang-start-\n");
if (!fsa_priv)
return -EINVAL;
@@ -198,16 +199,22 @@ int fsa4480_reg_notifier(struct notifier_block *nb,
struct device_node *node)
{
int rc = 0;
- struct i2c_client *client = of_find_i2c_device_by_node(node);
struct fsa4480_priv *fsa_priv;
+ struct i2c_client *client;
+ printk("--fsa4480_reg_notifier-xf.wang-start-999999999-\n");
+ client = of_find_i2c_device_by_node(node);
+ printk("--fsa4480_reg_notifier-xf.wang-mid-EINVAL-client=%p\n", client);
if (!client)
return -EINVAL;
fsa_priv = (struct fsa4480_priv *)i2c_get_clientdata(client);
+ printk("--fsa4480_reg_notifier-xf.wang-mid-i2c_get_clientdata\n");
if (!fsa_priv)
return -EINVAL;
+ printk("--fsa4480_reg_notifier-xf.wang-mid-blocking_notifier_chain_register!\n");
+
rc = blocking_notifier_chain_register
(&fsa_priv->fsa4480_notifier, nb);
if (rc)
@@ -220,6 +227,7 @@ int fsa4480_reg_notifier(struct notifier_block *nb,
dev_dbg(fsa_priv->dev, "%s: verify if USB adapter is already inserted\n",
__func__);
rc = fsa4480_usbc_analog_setup_switches(fsa_priv);
+ printk("--fsa4480_reg_notifier-xf.wang-end-rc =%d\n",rc);
return rc;
}
@@ -344,6 +352,7 @@ static int fsa4480_probe(struct i2c_client *i2c,
{
struct fsa4480_priv *fsa_priv;
int rc = 0;
+ printk("-fsa4480- fsa4480_probe-start!");
fsa_priv = devm_kzalloc(&i2c->dev, sizeof(*fsa_priv),
GFP_KERNEL);
@@ -355,16 +364,13 @@ static int fsa4480_probe(struct i2c_client *i2c,
fsa_priv->usb_psy = power_supply_get_by_name("usb");
if (!fsa_priv->usb_psy) {
rc = -EPROBE_DEFER;
- dev_dbg(fsa_priv->dev,
- "%s: could not get USB psy info: %d\n",
- __func__, rc);
+ printk("%s:--fsa4480- could not get USB psy info: %d\n", __func__, rc);
goto err_data;
}
fsa_priv->regmap = devm_regmap_init_i2c(i2c, &fsa4480_regmap_config);
if (IS_ERR_OR_NULL(fsa_priv->regmap)) {
- dev_err(fsa_priv->dev, "%s: Failed to initialize regmap: %d\n",
- __func__, rc);
+ printk("%s:-fsa4480- Failed to initialize regmap: %d\n", __func__, rc);
if (!fsa_priv->regmap) {
rc = -EINVAL;
goto err_supply;
@@ -379,8 +385,7 @@ static int fsa4480_probe(struct i2c_client *i2c,
fsa_priv->psy_nb.priority = 0;
rc = power_supply_reg_notifier(&fsa_priv->psy_nb);
if (rc) {
- dev_err(fsa_priv->dev, "%s: power supply reg failed: %d\n",
- __func__, rc);
+ printk( "%s: -fsa4480- power supply reg failed: %d\n", __func__, rc);
goto err_supply;
}
@@ -394,6 +399,7 @@ static int fsa4480_probe(struct i2c_client *i2c,
(struct rw_semaphore)__RWSEM_INITIALIZER
((fsa_priv->fsa4480_notifier).rwsem);
fsa_priv->fsa4480_notifier.head = NULL;
+ printk("-fsa4480- fsa4480_probe-end!");
return 0;
@@ -446,7 +452,9 @@ static int __init fsa4480_init(void)
rc = i2c_add_driver(&fsa4480_i2c_driver);
if (rc)
- pr_err("fsa4480: Failed to register I2C driver: %d\n", rc);
+ printk("-fsa4480-: Failed to register I2C driver: %d\n", rc);
+
+ printk("-fsa4480- fsa4480_init-xf.wang----!");
return rc;
}
@@ -454,6 +462,8 @@ module_init(fsa4480_init);
static void __exit fsa4480_exit(void)
{
+ printk("-fsa4480- fsa4480_exit---xf.wang--!");
+
i2c_del_driver(&fsa4480_i2c_driver);
}
module_exit(fsa4480_exit);
diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c
index 1461007..a413dcc 100644
--- a/drivers/spi/spi-geni-qcom.c
+++ b/drivers/spi/spi-geni-qcom.c
@@ -855,7 +855,7 @@ static int spi_geni_prepare_transfer_hardware(struct spi_master *spi)
goto setup_ipc;
if (unlikely(proto != SPI_SLAVE)) {
- dev_err(mas->dev, "Invalid proto %d\n", proto);
+ dev_err(mas->dev, "Invalid --SPI--proto %d\n", proto);
return -ENXIO;
}
}
@@ -868,7 +868,7 @@ static int spi_geni_prepare_transfer_hardware(struct spi_master *spi)
proto = get_se_proto(mas->base);
if ((unlikely(proto != SPI)) && (!spi->slave)) {
- dev_err(mas->dev, "Invalid proto %d\n", proto);
+ dev_err(mas->dev, "Invalid--SPI-- proto %d\n", proto);
return -ENXIO;
}
pix4xl code diff
©著作权归作者所有,转载或内容合作请联系作者
平台声明：文章内容（如有图片或视频亦包括在内）由作者上传并发布，文章内容仅代表作者本人观点，简书系信息发布平台，仅提供信息存储服务。
平台声明：文章内容（如有图片或视频亦包括在内）由作者上传并发布，文章内容仅代表作者本人观点，简书系信息发布平台，仅提供信息存储服务。
推荐阅读更多精彩内容
- 1、 编码规范方面检查项 2、面向对象设计方面检查项 - 类设计和抽象是否合适 - 是否符合面向接口编程的思想 -...
- 1. 安装Visual Studio Code 安装地址：https://code.visualstudio.co...
- VSC 简介 VSC内置emmet,对Less``Sass都有很好的支持, 支持DEBUG 多屏调试, 与Git有...
