mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
89200afb01
* bump qca-nss-dp and ssdk ssdk-shell to 12.1 * [qca-ssdk] delete 0008 patch as 12.1 version do not need this * [ipq807x]: Add support for tplink-tl-er2260t(basic) * remove unused parts in 2260t.dts * NSS:bump nss-drv64 to 12.1r2 (may affect ipq806x) * fix nss-dp source_url * qca-ssdk: refresh ssdk patch
94 lines
3.7 KiB
Diff
94 lines
3.7 KiB
Diff
diff --git a/src/init/ssdk_clk.c b/src/init/ssdk_clk.c
|
|
index ee9fbdda..486b3590 100755
|
|
--- a/src/init/ssdk_clk.c
|
|
+++ b/src/init/ssdk_clk.c
|
|
@@ -696,7 +696,7 @@ ssdk_mp_tcsr_get(a_uint32_t tcsr_offset, a_uint32_t *tcsr_val)
|
|
{
|
|
void __iomem *tcsr_base = NULL;
|
|
|
|
- tcsr_base = ioremap_nocache(TCSR_ETH_ADDR, TCSR_ETH_SIZE);
|
|
+ tcsr_base = ioremap(TCSR_ETH_ADDR, TCSR_ETH_SIZE);
|
|
if (!tcsr_base)
|
|
{
|
|
SSDK_ERROR("Failed to map tcsr eth address!\n");
|
|
@@ -713,7 +713,7 @@ ssdk_mp_tcsr_set(a_uint32_t tcsr_offset, a_uint32_t tcsr_val)
|
|
{
|
|
void __iomem *tcsr_base = NULL;
|
|
|
|
- tcsr_base = ioremap_nocache(TCSR_ETH_ADDR, TCSR_ETH_SIZE);
|
|
+ tcsr_base = ioremap(TCSR_ETH_ADDR, TCSR_ETH_SIZE);
|
|
if (!tcsr_base)
|
|
{
|
|
SSDK_ERROR("Failed to map tcsr eth address!\n");
|
|
@@ -761,7 +761,7 @@ ssdk_mp_cmnblk_stable_check(void)
|
|
a_uint32_t reg_val;
|
|
int i, loops = 20;
|
|
|
|
- pll_lock = ioremap_nocache(CMN_PLL_LOCKED_ADDR, CMN_PLL_LOCKED_SIZE);
|
|
+ pll_lock = ioremap(CMN_PLL_LOCKED_ADDR, CMN_PLL_LOCKED_SIZE);
|
|
if (!pll_lock) {
|
|
SSDK_ERROR("Failed to map CMN PLL LOCK register!\n");
|
|
return A_FALSE;
|
|
@@ -818,7 +818,7 @@ static void ssdk_cmnblk_pll_src_set(enum cmnblk_pll_src_type pll_source)
|
|
void __iomem *cmn_pll_src_base = NULL;
|
|
a_uint32_t reg_val;
|
|
|
|
- cmn_pll_src_base = ioremap_nocache(CMN_BLK_PLL_SRC_ADDR, CMN_BLK_SIZE);
|
|
+ cmn_pll_src_base = ioremap(CMN_BLK_PLL_SRC_ADDR, CMN_BLK_SIZE);
|
|
if (!cmn_pll_src_base) {
|
|
SSDK_ERROR("Failed to map cmn pll source address!\n");
|
|
return;
|
|
@@ -839,7 +839,7 @@ static void ssdk_cmnblk_init(enum cmnblk_clk_type mode)
|
|
void __iomem *gcc_pll_base = NULL;
|
|
a_uint32_t reg_val;
|
|
|
|
- gcc_pll_base = ioremap_nocache(CMN_BLK_ADDR, CMN_BLK_SIZE);
|
|
+ gcc_pll_base = ioremap(CMN_BLK_ADDR, CMN_BLK_SIZE);
|
|
if (!gcc_pll_base) {
|
|
SSDK_ERROR("Failed to map gcc pll address!\n");
|
|
return;
|
|
diff --git a/src/init/ssdk_init.c b/src/init/ssdk_init.c
|
|
index 0d7cac41..bc4486fe 100755
|
|
--- a/src/init/ssdk_init.c
|
|
+++ b/src/init/ssdk_init.c
|
|
@@ -2945,7 +2945,7 @@ static int ssdk_dess_mac_mode_init(a_uint32_t dev_id, a_uint32_t mac_mode)
|
|
(a_uint8_t *)®_value, 4);
|
|
mdelay(10);
|
|
/*softreset psgmii, fixme*/
|
|
- gcc_addr = ioremap_nocache(0x1812000, 0x200);
|
|
+ gcc_addr = ioremap(0x1812000, 0x200);
|
|
if (!gcc_addr) {
|
|
SSDK_ERROR("gcc map fail!\n");
|
|
return 0;
|
|
diff --git a/src/init/ssdk_plat.c b/src/init/ssdk_plat.c
|
|
index 1d97f81c..dbb186fa 100755
|
|
--- a/src/init/ssdk_plat.c
|
|
+++ b/src/init/ssdk_plat.c
|
|
@@ -1361,7 +1361,7 @@ ssdk_plat_init(ssdk_init_cfg *cfg, a_uint32_t dev_id)
|
|
reg_mode = ssdk_uniphy_reg_access_mode_get(dev_id);
|
|
if(reg_mode == HSL_REG_LOCAL_BUS) {
|
|
ssdk_uniphy_reg_map_info_get(dev_id, &map);
|
|
- qca_phy_priv_global[dev_id]->uniphy_hw_addr = ioremap_nocache(map.base_addr,
|
|
+ qca_phy_priv_global[dev_id]->uniphy_hw_addr = ioremap(map.base_addr,
|
|
map.size);
|
|
if (!qca_phy_priv_global[dev_id]->uniphy_hw_addr) {
|
|
SSDK_ERROR("%s ioremap fail.", __func__);
|
|
@@ -1376,7 +1376,7 @@ ssdk_plat_init(ssdk_init_cfg *cfg, a_uint32_t dev_id)
|
|
reg_mode = ssdk_switch_reg_access_mode_get(dev_id);
|
|
if(reg_mode == HSL_REG_LOCAL_BUS) {
|
|
ssdk_switch_reg_map_info_get(dev_id, &map);
|
|
- qca_phy_priv_global[dev_id]->hw_addr = ioremap_nocache(map.base_addr,
|
|
+ qca_phy_priv_global[dev_id]->hw_addr = ioremap(map.base_addr,
|
|
map.size);
|
|
if (!qca_phy_priv_global[dev_id]->hw_addr) {
|
|
SSDK_ERROR("%s ioremap fail.", __func__);
|
|
@@ -1409,7 +1409,7 @@ ssdk_plat_init(ssdk_init_cfg *cfg, a_uint32_t dev_id)
|
|
return -1;
|
|
}
|
|
|
|
- qca_phy_priv_global[dev_id]->psgmii_hw_addr = ioremap_nocache(map.base_addr,
|
|
+ qca_phy_priv_global[dev_id]->psgmii_hw_addr = ioremap(map.base_addr,
|
|
map.size);
|
|
if (!qca_phy_priv_global[dev_id]->psgmii_hw_addr) {
|
|
SSDK_ERROR("%s ioremap fail.", __func__);
|