cfg: change default SAM4L cortex_m reset_config

[fw/openocd] / src / flash / nand / s3c2443.c

diff --git a/src/flash/nand/s3c2443.c b/src/flash/nand/s3c2443.c
index 5fb2d927b88533ee9e0d28f3c5de0322e9adcb5c..8cd3213f2d4d6f86689caaa10ae57eb3c3a0e855 100644 (file)
--- a/src/flash/nand/s3c2443.c
+++ b/src/flash/nand/s3c2443.c
@@ -15,7 +15,7 @@
  *   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.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 /*
@@ -30,7 +30,6 @@
 
 #include "s3c24xx.h"
 
-
 NAND_DEVICE_COMMAND_HANDLER(s3c2443_nand_device_command)
 {
        struct s3c24xx_nand_controller *info;
@@ -47,8 +46,7 @@ NAND_DEVICE_COMMAND_HANDLER(s3c2443_nand_device_command)
 
 static int s3c2443_init(struct nand_device *nand)
 {
-       struct s3c24xx_nand_controller *s3c24xx_info = nand->controller_priv;
-       struct target *target = s3c24xx_info->target;
+       struct target *target = nand->target;
 
        target_write_u32(target, S3C2410_NFCONF,
                         S3C2440_NFCONF_TACLS(3) |
@@ -63,17 +61,17 @@ static int s3c2443_init(struct nand_device *nand)
 }
 
 struct nand_flash_controller s3c2443_nand_controller = {
-               .name = "s3c2443",
-               .nand_device_command = &s3c2443_nand_device_command,
-               .init = &s3c2443_init,
-               .reset = &s3c24xx_reset,
-               .command = &s3c24xx_command,
-               .address = &s3c24xx_address,
-               .write_data = &s3c24xx_write_data,
-               .read_data = &s3c24xx_read_data,
-               .write_page = s3c24xx_write_page,
-               .read_page = s3c24xx_read_page,
-               .write_block_data = &s3c2440_write_block_data,
-               .read_block_data = &s3c2440_read_block_data,
-               .nand_ready = &s3c2440_nand_ready,
-       };
+       .name = "s3c2443",
+       .nand_device_command = &s3c2443_nand_device_command,
+       .init = &s3c2443_init,
+       .reset = &s3c24xx_reset,
+       .command = &s3c24xx_command,
+       .address = &s3c24xx_address,
+       .write_data = &s3c24xx_write_data,
+       .read_data = &s3c24xx_read_data,
+       .write_page = s3c24xx_write_page,
+       .read_page = s3c24xx_read_page,
+       .write_block_data = &s3c2440_write_block_data,
+       .read_block_data = &s3c2440_read_block_data,
+       .nand_ready = &s3c2440_nand_ready,
+};