From 61fb6bf29914e8ddaf2f5b3bb66ca51c95ff6848 Mon Sep 17 00:00:00 2001 From: Nan Li Date: Wed, 20 Nov 2019 18:44:59 +0800 Subject: [PATCH] sd: optimize sd_uart jtag pin cfg [1/1] PD#SWPL-17140 Problem: sd_uart jtag pin cfg error. Solution: modify sd_uart jtag pin dts cfgs. Verify: sm1 Change-Id: I66a2f147110e48d53bd2fa08ac3860426ffd1e7d Signed-off-by: Nan Li --- arch/arm/boot/dts/amlogic/mesong12a.dtsi | 4 ++-- arch/arm/boot/dts/amlogic/mesong12b.dtsi | 2 +- arch/arm/boot/dts/amlogic/mesong12b_a.dtsi | 2 +- arch/arm/boot/dts/amlogic/mesonsm1.dtsi | 2 +- arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts | 2 +- arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts | 2 +- arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts | 2 +- arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts | 2 +- arch/arm/boot/dts/amlogic/tm2_pxp.dts | 2 +- arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts | 2 +- arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_drm.dts | 2 +- arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts | 2 +- arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts | 2 +- arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts | 2 +- arch/arm/boot/dts/amlogic/tm2_t962x3_ab301_drm.dts | 2 +- arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts | 2 +- arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts | 2 +- arch/arm64/boot/dts/amlogic/mesong12a.dtsi | 4 ++-- arch/arm64/boot/dts/amlogic/mesong12b.dtsi | 2 +- arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi | 2 +- arch/arm64/boot/dts/amlogic/mesonsm1.dtsi | 2 +- arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts | 2 +- arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts | 2 +- arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts | 2 +- arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts | 2 +- arch/arm64/boot/dts/amlogic/tm2_pxp.dts | 2 +- arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts | 2 +- arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_drm.dts | 2 +- arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts | 2 +- arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts | 2 +- arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts | 2 +- arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301_drm.dts | 2 +- arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts | 2 +- arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts | 2 +- 34 files changed, 36 insertions(+), 36 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/mesong12a.dtsi b/arch/arm/boot/dts/amlogic/mesong12a.dtsi index 16fb5edb84b3..37ad6e1ffb15 100644 --- a/arch/arm/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm/boot/dts/amlogic/mesong12a.dtsi @@ -1439,7 +1439,7 @@ ocr_avail = <0x200080>; /**VDD voltage 3.3 ~ 3.4 */ max_req_size = <0x20000>; /**128KB*/ gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_6 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), @@ -1508,7 +1508,7 @@ ocr_avail = <0x200080>; /**VDD voltage 3.3 ~ 3.4 */ max_req_size = <0x20000>; /**128KB*/ gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_6 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm/boot/dts/amlogic/mesong12b.dtsi b/arch/arm/boot/dts/amlogic/mesong12b.dtsi index dc2dca7771c7..227091db4a77 100644 --- a/arch/arm/boot/dts/amlogic/mesong12b.dtsi +++ b/arch/arm/boot/dts/amlogic/mesong12b.dtsi @@ -1544,7 +1544,7 @@ ocr_avail = <0x200080>; /**VDD voltage 3.3 ~ 3.4 */ max_req_size = <0x20000>; /**128KB*/ gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_6 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi b/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi index a5e2bff85ca1..ec35f56ab379 100644 --- a/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi +++ b/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi @@ -1498,7 +1498,7 @@ ocr_avail = <0x200080>; /**VDD voltage 3.3 ~ 3.4 */ max_req_size = <0x20000>; /**128KB*/ gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_6 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi index 69be77603d4d..112d13c561f3 100644 --- a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi +++ b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi @@ -1546,7 +1546,7 @@ ocr_avail = <0x200080>; /**VDD voltage 3.3 ~ 3.4 */ max_req_size = <0x20000>; /**128KB*/ gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_6 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts index 42227085a894..832ed0bf3e63 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts @@ -1382,7 +1382,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts index 45facecae34e..f25dc4f47a77 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts @@ -1365,7 +1365,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts index fa658efa8128..9c212fa76507 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts @@ -1375,7 +1375,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts index 10dc322d05a0..95145e9f1ada 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts @@ -1358,7 +1358,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm/boot/dts/amlogic/tm2_pxp.dts b/arch/arm/boot/dts/amlogic/tm2_pxp.dts index f4ad774f16d5..c9850fafdc69 100644 --- a/arch/arm/boot/dts/amlogic/tm2_pxp.dts +++ b/arch/arm/boot/dts/amlogic/tm2_pxp.dts @@ -790,7 +790,7 @@ max_req_size = <0x20000>; /**128KB*/ no_sduart = <1>; gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts index 28b215a5c98d..533b5e049483 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts @@ -1345,7 +1345,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_drm.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_drm.dts index 117204c68dfd..a74f2a61adf1 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_drm.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_drm.dts @@ -1336,7 +1336,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts index ea6ae1713214..37d41298249d 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts @@ -1340,7 +1340,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts index 60dc60a2ea8a..4ddce9a9b66d 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts @@ -1270,7 +1270,7 @@ max_req_size = <0x20000>; /**128KB*/ no_sduart = <1>; gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts index 72b87bd081d2..6fdb326a94b1 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts @@ -1349,7 +1349,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301_drm.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301_drm.dts index c990c26d011d..be8d3b8d9e37 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301_drm.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301_drm.dts @@ -1346,7 +1346,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts index 90a9cf9867a0..0b22584ac9da 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts @@ -1278,7 +1278,7 @@ max_req_size = <0x20000>; /**128KB*/ no_sduart = <1>; gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts index 58f5c1ff4f50..3eeac468f6b6 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts @@ -1330,7 +1330,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi index 86ee9123f6c1..f0dea63d605a 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi @@ -1438,7 +1438,7 @@ ocr_avail = <0x200080>; /**VDD voltage 3.3 ~ 3.4 */ max_req_size = <0x20000>; /**128KB*/ gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_6 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), @@ -1507,7 +1507,7 @@ ocr_avail = <0x200080>; /**VDD voltage 3.3 ~ 3.4 */ max_req_size = <0x20000>; /**128KB*/ gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_6 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi index 904b4c799df2..6a4a5f0435f2 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi @@ -1529,7 +1529,7 @@ ocr_avail = <0x200080>; /**VDD voltage 3.3 ~ 3.4 */ max_req_size = <0x20000>; /**128KB*/ gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_6 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi index 113dd780d3bc..8838802112b3 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi @@ -1498,7 +1498,7 @@ ocr_avail = <0x200080>; /**VDD voltage 3.3 ~ 3.4 */ max_req_size = <0x20000>; /**128KB*/ gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_6 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi index c1bb351e75a0..be3da8a36099 100644 --- a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi @@ -1545,7 +1545,7 @@ ocr_avail = <0x200080>; /**VDD voltage 3.3 ~ 3.4 */ max_req_size = <0x20000>; /**128KB*/ gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_6 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts index 2d232db5939b..6042f783ad1c 100644 --- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts +++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts @@ -1379,7 +1379,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts index 1da6aef7ee73..53d3a86e4248 100644 --- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts +++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts @@ -1360,7 +1360,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts index 234f81403a34..271174235228 100644 --- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts +++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts @@ -1371,7 +1371,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts index a88c219ae7fe..8c0ee4dde263 100644 --- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts +++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts @@ -1352,7 +1352,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm64/boot/dts/amlogic/tm2_pxp.dts b/arch/arm64/boot/dts/amlogic/tm2_pxp.dts index 0c044a5ea7b4..2f693caa0edb 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_pxp.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_pxp.dts @@ -787,7 +787,7 @@ max_req_size = <0x20000>; /**128KB*/ no_sduart = <1>; gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; card_type = <5>; }; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts index af03bdb9953f..f183875c9f19 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts @@ -1340,7 +1340,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_drm.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_drm.dts index 773fbb708e6c..4e391aac4585 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_drm.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_drm.dts @@ -1331,7 +1331,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts index ec5a3e994ecf..67c3134a2a41 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311_sbr.dts @@ -1335,7 +1335,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts index becfe9d66072..80b504290fb3 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts @@ -1270,7 +1270,7 @@ max_req_size = <0x20000>; /**128KB*/ no_sduart = <1>; gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts index fb0ac9e19ac7..a36709843e09 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts @@ -1346,7 +1346,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301_drm.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301_drm.dts index d6d497e5092e..387d2504a011 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301_drm.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301_drm.dts @@ -1343,7 +1343,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * }; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts index 063cfdfd58e3..5e2c7c97c078 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts @@ -1278,7 +1278,7 @@ max_req_size = <0x20000>; /**128KB*/ no_sduart = <1>; gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; card_type = <5>; /* 3:sdio device(ie:sdio-wifi), diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts index 182a11037c21..4e3b6a5c77ae 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts @@ -1332,7 +1332,7 @@ * max_req_size = <0x20000>; * no_sduart = <1>; * gpio_dat3 = <&gpio GPIOC_3 GPIO_ACTIVE_HIGH>; - * jtag_pin = <&gpio GPIOC_0 GPIO_ACTIVE_HIGH>; + * jtag_pin = <&gpio GPIOC_1 GPIO_ACTIVE_HIGH>; * gpio_cd = <&gpio GPIOC_10 GPIO_ACTIVE_HIGH>; * card_type = <5>; * };