shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

sd: add sduart not supported flag [1/1]

Browse Source 
PD#SWPL-4858

Problem:
tl1 not support sduart

Solution:
add not supported flag in match_data

Verify:
verify by tl1 skt

Change-Id: I651765433bb62892fad770c85a5eccd4805e7c79
Signed-off-by: Nan Li <nan.li@amlogic.com>
This commit is contained in:
Nan Li
2019-02-14 10:43:31 +08:00
committed by Jianxin Pan
parent e3147e686c
commit ed50fbf1b8
5 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/amlogic/tl1_pxp.dts
View File

@@ -692,6 +692,7 @@
f_min = <400000>;
f_max = <200000000>;
max_req_size = <0x20000>; /**128KB*/
no_sduart = <1>;
gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>;
jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>;
gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>;

1
arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts
View File

@@ -1151,6 +1151,7 @@
f_min = <400000>;
f_max = <200000000>;
max_req_size = <0x20000>; /**128KB*/
no_sduart = <1>;
gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>;
jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>;
gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>;

4
drivers/amlogic/mmc/amlsd.c
View File

@@ -850,7 +850,7 @@ int aml_sd_uart_detect(struct amlsd_platform *pdata)
return 1;
pdata->is_in = true;
pdata->gpio_cd_sta = true;
if ((host->data->chip_type < MMC_CHIP_TL1)
if ((!pdata->no_sduart)
&& aml_is_sduart(pdata)) {
aml_uart_switch(pdata, 1);
pr_info("Uart in\n");
@@ -891,7 +891,7 @@ int aml_sd_uart_detect(struct amlsd_platform *pdata)
host->is_sduart = 0;
if (mmc && mmc->card)
mmc_card_set_removed(mmc->card);
if (host->data->chip_type < MMC_CHIP_TL1) {
if (!pdata->no_sduart) {
aml_uart_switch(pdata, 0);
aml_jtag_switch_ao(pdata);
}

2
drivers/amlogic/mmc/amlsd_of.c
View File

@@ -187,6 +187,8 @@ int amlsd_get_platform_data(struct platform_device *pdev,
str, pdata->gpio_power);
SD_PARSE_U32_PROP_DEC(child, "calc_f",
prop, pdata->calc_f);
SD_PARSE_U32_PROP_DEC(child, "no_sduart",
prop, pdata->no_sduart);
SD_PARSE_U32_PROP_DEC(child, "gpio_cd_level",
prop, pdata->gpio_cd_level);

1
include/linux/amlogic/sd.h
View File

@@ -297,6 +297,7 @@ struct amlsd_platform {
unsigned int gpio_power;
unsigned int power_level;
unsigned int calc_f;
unsigned int no_sduart;
unsigned int auto_clk_close;
unsigned int vol_switch;