Skip to contentSkip to conversation

imx6: fix pl301_mx6qper1_bch clock gating setup

PATCH New Anatolij Gustschin 2 participants 3 messages Sep 15, 2014 – Sep 16, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 imx6: fix pl301_mx6qper1_bch clock gating setup

Current code sets reserved CG1 bits instead of CG6 bits for pl301_mx6qper1_bch clock. Fix it.

Cc Heiko Schocher <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Tim Harvey <[email protected]>
---
 board/aristainetos/aristainetos.c       |    2 +-
 board/barco/titanium/titanium.c         |    2 +-
 board/gateworks/gw_ventana/gw_ventana.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
board/aristainetos/aristainetos.c +1 -1
index 3bfcf5b..bb946b5 100644
@@ -433,7 +433,7 @@ static void setup_gpmi_nand(void)
 		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
 		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK |
 		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK |
-		     MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_OFFSET);
+		     MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK);
 
 	/* enable apbh clock gating */
 	setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK);
board/barco/titanium/titanium.c +1 -1
index 84a7b84..bcf45a2 100644
@@ -177,7 +177,7 @@ static void setup_gpmi_nand(void)
 		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
 		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK |
 		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK |
-		     MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_OFFSET);
+		     MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK);
 
 	/* enable apbh clock gating */
 	setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK);
board/gateworks/gw_ventana/gw_ventana.c +1 -1
index a222921..b51c104 100644
@@ -259,7 +259,7 @@ static void setup_gpmi_nand(void)
 		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
 		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK |
 		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK |
-		     MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_OFFSET);
+		     MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK);
 
 	/* enable apbh clock gating */
 	setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK);
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 imx6: fix pl301_mx6qper1_bch clock gating setup

Hi Anatolij,

Please take a look at this patch:
https://www.mail-archive.com/u-boot at lists.denx.de/msg145208.html function setup_gpmi_io_clk().

It's not in mainline yet, but Stefano already applied it to his tree, and using it will both fix the problem, and get rid of all this code duplication.

Quoted 53 lines · Anatolij Gustschin

Current code sets reserved CG1 bits instead of CG6 bits for pl301_mx6qper1_bch clock. Fix it.

Cc Heiko Schocher <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Tim Harvey <[email protected]>
---
  board/aristainetos/aristainetos.c       |    2 +-
  board/barco/titanium/titanium.c         |    2 +-
  board/gateworks/gw_ventana/gw_ventana.c |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
board/aristainetos/aristainetos.c +1 -1
index 3bfcf5b..bb946b5 100644
@@ -433,7 +433,7 @@ static void setup_gpmi_nand(void)
  		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
  		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK |
  		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK |
-		     MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_OFFSET);
+		     MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK);
 
  	/* enable apbh clock gating */
  	setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK);
board/barco/titanium/titanium.c +1 -1
index 84a7b84..bcf45a2 100644
@@ -177,7 +177,7 @@ static void setup_gpmi_nand(void)
  		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
  		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK |
  		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK |
-		     MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_OFFSET);
+		     MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK);
 
  	/* enable apbh clock gating */
  	setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK);
board/gateworks/gw_ventana/gw_ventana.c +1 -1
index a222921..b51c104 100644
@@ -259,7 +259,7 @@ static void setup_gpmi_nand(void)
  		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
  		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK |
  		     MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK |
-		     MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_OFFSET);
+		     MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK);
 
  	/* enable apbh clock gating */
  	setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK);
Signature · 2 lines
Regards,
Nikita Kiryanov
#2 lore raw

PATCH 1/1 imx6: fix pl301_mx6qper1_bch clock gating setup

Hi Nikita,

Quoted 7 lines · On Tue, 16 Sep 2014 11:55:04 +0300 Nikita Kiryanov <[email protected]>…

Please take a look at this patch:
https://www.mail-archive.com/u-boot at lists.denx.de/msg145208.html function setup_gpmi_io_clk().

It's not in mainline yet, but Stefano already applied it to his tree, and using it will both fix the problem, and get rid of all this code duplication.

Ah, okay. I was not aware of your changes.

Thanks,

Anatolij