Patchwork [U-Boot] S5P:SROM config code moved to s5p-common directory

login
register
mail settings
Submitter Chander Kashyap
Date April 15, 2011, 5:05 a.m.
Message ID <1302843918-1105-1-git-send-email-chander.kashyap@linaro.org>
Download mbox | patch
Permalink /patch/91319/
State Changes Requested
Delegated to: Minkyu Kang
Headers show

Comments

Chander Kashyap - April 15, 2011, 5:05 a.m.
SROM config code is made common for S5P series of boards.
smdkc100.c now refers to s5p-common/sromc.c for SROM related
subroutines.

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
---
 arch/arm/cpu/armv7/s5p-common/Makefile    |    3 +-
 arch/arm/cpu/armv7/s5p-common/sromc.c     |   49 ++++++++++++++++++++++++++
 arch/arm/cpu/armv7/s5pc1xx/Makefile       |    1 -
 arch/arm/cpu/armv7/s5pc1xx/sromc.c        |   49 --------------------------
 arch/arm/include/asm/arch-s5pc1xx/smc.h   |   53 -----------------------------
 arch/arm/include/asm/arch-s5pc1xx/sromc.h |   53 +++++++++++++++++++++++++++++
 board/samsung/smdkc100/smdkc100.c         |    4 +-
 7 files changed, 106 insertions(+), 106 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/s5p-common/sromc.c
 delete mode 100644 arch/arm/cpu/armv7/s5pc1xx/sromc.c
 delete mode 100644 arch/arm/include/asm/arch-s5pc1xx/smc.h
 create mode 100644 arch/arm/include/asm/arch-s5pc1xx/sromc.h

--
1.7.1
Minkyu Kang - April 18, 2011, 7:42 a.m.
Dear Chander Kashyap,

On 15 April 2011 14:05, Chander Kashyap <chander.kashyap@linaro.org> wrote:
> SROM config code is made common for S5P series of boards.
> smdkc100.c now refers to s5p-common/sromc.c for SROM related
> subroutines.
>
> Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
> ---
>  arch/arm/cpu/armv7/s5p-common/Makefile    |    3 +-
>  arch/arm/cpu/armv7/s5p-common/sromc.c     |   49 ++++++++++++++++++++++++++
>  arch/arm/cpu/armv7/s5pc1xx/Makefile       |    1 -
>  arch/arm/cpu/armv7/s5pc1xx/sromc.c        |   49 --------------------------
>  arch/arm/include/asm/arch-s5pc1xx/smc.h   |   53 -----------------------------
>  arch/arm/include/asm/arch-s5pc1xx/sromc.h |   53 +++++++++++++++++++++++++++++

Why you renamed this file?

>  board/samsung/smdkc100/smdkc100.c         |    4 +-
>  7 files changed, 106 insertions(+), 106 deletions(-)
>  create mode 100644 arch/arm/cpu/armv7/s5p-common/sromc.c
>  delete mode 100644 arch/arm/cpu/armv7/s5pc1xx/sromc.c
>  delete mode 100644 arch/arm/include/asm/arch-s5pc1xx/smc.h
>  create mode 100644 arch/arm/include/asm/arch-s5pc1xx/sromc.h
>

Thanks.
Minkyu Kang.
Minkyu Kang - April 19, 2011, 8:24 a.m.
Dear Chander Kashyap

On 15 April 2011 14:05, Chander Kashyap <chander.kashyap@linaro.org> wrote:
> SROM config code is made common for S5P series of boards.
> smdkc100.c now refers to s5p-common/sromc.c for SROM related
> subroutines.
>
> Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
> ---
>  arch/arm/cpu/armv7/s5p-common/Makefile    |    3 +-
>  arch/arm/cpu/armv7/s5p-common/sromc.c     |   49 ++++++++++++++++++++++++++
>  arch/arm/cpu/armv7/s5pc1xx/Makefile       |    1 -
>  arch/arm/cpu/armv7/s5pc1xx/sromc.c        |   49 --------------------------
>  arch/arm/include/asm/arch-s5pc1xx/smc.h   |   53 -----------------------------
>  arch/arm/include/asm/arch-s5pc1xx/sromc.h |   53 +++++++++++++++++++++++++++++
>  board/samsung/smdkc100/smdkc100.c         |    4 +-
>  7 files changed, 106 insertions(+), 106 deletions(-)
>  create mode 100644 arch/arm/cpu/armv7/s5p-common/sromc.c
>  delete mode 100644 arch/arm/cpu/armv7/s5pc1xx/sromc.c
>  delete mode 100644 arch/arm/include/asm/arch-s5pc1xx/smc.h
>  create mode 100644 arch/arm/include/asm/arch-s5pc1xx/sromc.h
>

applied to u-boot-samsung

Thanks
Minkyu Kang.
Wolfgang Denk - May 17, 2011, 8:46 a.m.
Dear Chander Kashyap,

In message <1302843918-1105-1-git-send-email-chander.kashyap@linaro.org> you wrote:
> SROM config code is made common for S5P series of boards.
> smdkc100.c now refers to s5p-common/sromc.c for SROM related
> subroutines.
> 
> Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>

It appears this is missing arch/arm/include/asm/arch-s5pc2xx/sromc.h 

Please squash with patch submitted here:

05/17 Minkyu Kang        [U-Boot] [PATCH] S5PC2XX: add the sromc header file
             http://article.gmane.org/gmane.comp.boot-loaders.u-boot/99965


Best regards,

Wolfgang Denk
Minkyu Kang - May 18, 2011, 6:55 a.m.
Dear Wolfgang Denk,

On 17 May 2011 17:46, Wolfgang Denk <wd@denx.de> wrote:
> Dear Chander Kashyap,
>
> In message <1302843918-1105-1-git-send-email-chander.kashyap@linaro.org> you wrote:
>> SROM config code is made common for S5P series of boards.
>> smdkc100.c now refers to s5p-common/sromc.c for SROM related
>> subroutines.
>>
>> Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
>
> It appears this is missing arch/arm/include/asm/arch-s5pc2xx/sromc.h
>
> Please squash with patch submitted here:
>
> 05/17 Minkyu Kang        [U-Boot] [PATCH] S5PC2XX: add the sromc header file
>             http://article.gmane.org/gmane.comp.boot-loaders.u-boot/99965

OK. done.

Thanks
Minkyu Kang

Patch

diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/s5p-common/Makefile
index ce0a41e..1705399 100644
--- a/arch/arm/cpu/armv7/s5p-common/Makefile
+++ b/arch/arm/cpu/armv7/s5p-common/Makefile
@@ -27,7 +27,8 @@  LIB	= $(obj)libs5p-common.o

 COBJS-y		+= cpu_info.o
 COBJS-y		+= timer.o
-COBJS-$(CONFIG_PWM)		+= pwm.o
+COBJS-y		+= sromc.o
+COBJS-$(CONFIG_PWM)	+= pwm.o

 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS-y) $(SOBJS))
diff --git a/arch/arm/cpu/armv7/s5p-common/sromc.c b/arch/arm/cpu/armv7/s5p-common/sromc.c
new file mode 100644
index 0000000..091e8d1
--- /dev/null
+++ b/arch/arm/cpu/armv7/s5p-common/sromc.c
@@ -0,0 +1,49 @@ 
+/*
+ * Copyright (C) 2010 Samsung Electronics
+ * Naveen Krishna Ch <ch.naveen@samsung.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/sromc.h>
+
+/*
+ * s5p_config_sromc() - select the proper SROMC Bank and configure the
+ * band width control and bank control registers
+ * srom_bank	- SROM
+ * srom_bw_conf  - SMC Band witdh reg configuration value
+ * srom_bc_conf  - SMC Bank Control reg configuration value
+ */
+void s5p_config_sromc(u32 srom_bank, u32 srom_bw_conf, u32 srom_bc_conf)
+{
+	u32 tmp;
+	struct s5p_sromc *srom =
+		(struct s5p_sromc *)samsung_get_base_sromc();
+
+	/* Configure SMC_BW register to handle proper SROMC bank */
+	tmp = srom->bw;
+	tmp &= ~(0xF << (srom_bank * 4));
+	tmp |= srom_bw_conf;
+	srom->bw = tmp;
+
+	/* Configure SMC_BC register */
+	srom->bc[srom_bank] = srom_bc_conf;
+}
diff --git a/arch/arm/cpu/armv7/s5pc1xx/Makefile b/arch/arm/cpu/armv7/s5pc1xx/Makefile
index b182bf5..d66314e 100644
--- a/arch/arm/cpu/armv7/s5pc1xx/Makefile
+++ b/arch/arm/cpu/armv7/s5pc1xx/Makefile
@@ -32,7 +32,6 @@  SOBJS	= cache.o
 SOBJS	+= reset.o

 COBJS	+= clock.o
-COBJS	+= sromc.o

 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS))
diff --git a/arch/arm/cpu/armv7/s5pc1xx/sromc.c b/arch/arm/cpu/armv7/s5pc1xx/sromc.c
deleted file mode 100644
index 044d122..0000000
--- a/arch/arm/cpu/armv7/s5pc1xx/sromc.c
+++ /dev/null
@@ -1,49 +0,0 @@ 
-/*
- * Copyright (C) 2010 Samsung Electronics
- * Naveen Krishna Ch <ch.naveen@samsung.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <asm/arch/smc.h>
-
-/*
- * s5pc1xx_config_sromc() - select the proper SROMC Bank and configure the
- * 		    band width control and bank control registers
- * srom_bank	- SROM Bank 0 to 5
- * smc_bw_conf  - SMC Band witdh reg configuration value
- * smc_bc_conf  - SMC Bank Control reg configuration value
- */
-void s5pc1xx_config_sromc(u32 srom_bank, u32 smc_bw_conf, u32 smc_bc_conf)
-{
-	u32 tmp;
-	struct s5pc1xx_smc *srom =
-		(struct s5pc1xx_smc *)samsung_get_base_sromc();
-
-	/* Configure SMC_BW register to handle proper SROMC bank */
-	tmp = srom->bw;
-	tmp &= ~(0xF << (srom_bank * 4));
-	tmp |= smc_bw_conf;
-	srom->bw = tmp;
-
-	/* Configure SMC_BC register */
-	srom->bc[srom_bank] = smc_bc_conf;
-}
diff --git a/arch/arm/include/asm/arch-s5pc1xx/smc.h b/arch/arm/include/asm/arch-s5pc1xx/smc.h
deleted file mode 100644
index 88f4ffe..0000000
--- a/arch/arm/include/asm/arch-s5pc1xx/smc.h
+++ /dev/null
@@ -1,53 +0,0 @@ 
-/*
- * (C) Copyright 2010 Samsung Electronics
- * Naveen Krishna Ch <ch.naveen@samsung.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- * Note: This file contains the register description for Memory subsystem
- * 	 (SROM, NAND Flash, OneNand, DDR, OneDRAM) on S5PC1XX.
- *
- * 	 Only SROMC is defined as of now
- */
-
-#ifndef __ASM_ARCH_SMC_H_
-#define __ASM_ARCH_SMC_H_
-
-#define SMC_DATA16_WIDTH(x)    (1<<((x*4)+0))
-#define SMC_BYTE_ADDR_MODE(x)  (1<<((x*4)+1))  /* 0-> Half-word base address*/
-						/* 1-> Byte base address*/
-#define SMC_WAIT_ENABLE(x)     (1<<((x*4)+2))
-#define SMC_BYTE_ENABLE(x)     (1<<((x*4)+3))
-
-#define SMC_BC_TACS(x) (x << 28) /* 0clk     address set-up */
-#define SMC_BC_TCOS(x) (x << 24) /* 4clk     chip selection set-up */
-#define SMC_BC_TACC(x) (x << 16) /* 14clk    access cycle */
-#define SMC_BC_TCOH(x) (x << 12) /* 1clk     chip selection hold */
-#define SMC_BC_TAH(x)  (x << 8)  /* 4clk     address holding time */
-#define SMC_BC_TACP(x) (x << 4)  /* 6clk     page mode access cycle */
-#define SMC_BC_PMC(x)  (x << 0)  /* normal(1data)page mode configuration */
-
-#ifndef __ASSEMBLY__
-struct s5pc1xx_smc {
-	unsigned int	bw;
-	unsigned int	bc[6];
-};
-#endif	/* __ASSEMBLY__ */
-
-/* Configure the Band Width and Bank Control Regs for required SROMC Bank */
-void s5pc1xx_config_sromc(u32 srom_bank, u32 smc_bw_conf, u32 smc_bc_conf);
-
-#endif /* __ASM_ARCH_SMC_H_ */
diff --git a/arch/arm/include/asm/arch-s5pc1xx/sromc.h b/arch/arm/include/asm/arch-s5pc1xx/sromc.h
new file mode 100644
index 0000000..3800a8d
--- /dev/null
+++ b/arch/arm/include/asm/arch-s5pc1xx/sromc.h
@@ -0,0 +1,53 @@ 
+/*
+ * (C) Copyright 2010 Samsung Electronics
+ * Naveen Krishna Ch <ch.naveen@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * Note: This file contains the register description for Memory subsystem
+ * 	 (SROM, NAND Flash, OneNand, DDR, OneDRAM) on S5PC1XX.
+ *
+ * 	 Only SROMC is defined as of now
+ */
+
+#ifndef __ASM_ARCH_SROMC_H_
+#define __ASM_ARCH_SROMC_H_
+
+#define SMC_DATA16_WIDTH(x)    (1<<((x*4)+0))
+#define SMC_BYTE_ADDR_MODE(x)  (1<<((x*4)+1))  /* 0-> Half-word base address*/
+						/* 1-> Byte base address*/
+#define SMC_WAIT_ENABLE(x)     (1<<((x*4)+2))
+#define SMC_BYTE_ENABLE(x)     (1<<((x*4)+3))
+
+#define SMC_BC_TACS(x) (x << 28) /* 0clk     address set-up */
+#define SMC_BC_TCOS(x) (x << 24) /* 4clk     chip selection set-up */
+#define SMC_BC_TACC(x) (x << 16) /* 14clk    access cycle */
+#define SMC_BC_TCOH(x) (x << 12) /* 1clk     chip selection hold */
+#define SMC_BC_TAH(x)  (x << 8)  /* 4clk     address holding time */
+#define SMC_BC_TACP(x) (x << 4)  /* 6clk     page mode access cycle */
+#define SMC_BC_PMC(x)  (x << 0)  /* normal(1data)page mode configuration */
+
+#ifndef __ASSEMBLY__
+struct s5p_sromc {
+	unsigned int	bw;
+	unsigned int	bc[6];
+};
+#endif	/* __ASSEMBLY__ */
+
+/* Configure the Band Width and Bank Control Regs for required SROMC Bank */
+void s5p_config_sromc(u32 srom_bank, u32 srom_bw_conf, u32 srom_bc_conf);
+
+#endif /* __ASM_ARCH_SMC_H_ */
diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index d3189f6..1ad68b9 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -24,7 +24,7 @@ 

 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/smc.h>
+#include <asm/arch/sromc.h>
 #include <asm/arch/gpio.h>
 #include <netdev.h>

@@ -50,7 +50,7 @@  static void smc9115_pre_init(void)
 			| SMC_BC_TACP(0x6) | SMC_BC_PMC(0x0);

 	/* Select and configure the SROMC bank */
-	s5pc1xx_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
+	s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);
 }

 int board_init(void)