alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-30 20:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_spi_cs_hold_time_issue_v4.3' into 'release/v4.3'

Browse Source 
spi_master: fix spi cs_ena_posttrans issue (v4.3)

See merge request espressif/esp-idf!16687
This commit is contained in:
Michael (XIAO Xufeng)
2022-02-10 09:36:50 +00:00
parent b979547b06 b3c51e74c8
commit dcfd5187ac
3 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/hal/esp32c3/include/hal/spi_ll.h
View File

@@ -1,16 +1,8 @@
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/******************************************************************************* /*******************************************************************************
* NOTICE * NOTICE
@@ -763,7 +755,7 @@ static inline void spi_ll_set_miso_delay(spi_dev_t *hw, int delay_mode, int dela
*/ */
static inline void spi_ll_master_set_cs_hold(spi_dev_t *hw, int hold) static inline void spi_ll_master_set_cs_hold(spi_dev_t *hw, int hold)
{ {
hw->user1.cs_hold_time = hold - 1; hw->user1.cs_hold_time = hold;
hw->user.cs_hold = hold ? 1 : 0; hw->user.cs_hold = hold ? 1 : 0;
} }

2
components/hal/esp32s2/include/hal/spi_ll.h
View File

@@ -746,7 +746,7 @@ static inline void spi_ll_set_dummy(spi_dev_t *hw, int dummy_n)
*/ */
static inline void spi_ll_master_set_cs_hold(spi_dev_t *hw, int hold) static inline void spi_ll_master_set_cs_hold(spi_dev_t *hw, int hold)
{ {
hw->ctrl2.cs_hold_time = hold - 1; hw->ctrl2.cs_hold_time = hold;
hw->user.cs_hold = hold ? 1 : 0; hw->user.cs_hold = hold ? 1 : 0;
} }

20
components/hal/esp32s3/include/hal/spi_ll.h
View File

@@ -1,16 +1,8 @@
// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/******************************************************************************* /*******************************************************************************
* NOTICE * NOTICE
@@ -770,7 +762,7 @@ static inline void spi_ll_set_miso_delay(spi_dev_t *hw, int delay_mode, int dela
*/ */
static inline void spi_ll_master_set_cs_hold(spi_dev_t *hw, int hold) static inline void spi_ll_master_set_cs_hold(spi_dev_t *hw, int hold)
{ {
hw->user1.cs_hold_time = hold - 1; hw->user1.cs_hold_time = hold;
hw->user.cs_hold = hold ? 1 : 0; hw->user.cs_hold = hold ? 1 : 0;
} }