ARM: pcm038: Select IIM by default
Subsystems (3)
PATCH 1/7 ARM: pcm038: Select IIM by default
PCM038 uses IIM in board code, so select IMX_IIM symbol by default.
--- arch/arm/mach-imx/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-imx/Kconfig +1 -0
@@ -289,6 +289,7 @@ config MACH_PCA100 config MACH_PCM038 bool "phyCORE-i.MX27" + select IMX_IIM select SPI select DRIVER_SPI_IMX select MFD_MC13XXX
Signature · 7 lines
1.7.12.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/7 ARM: pcm038: Fix serial number IIM-address
--- arch/arm/boards/pcm038/pcm038.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boards/pcm038/pcm038.c +1 -1
@@ -318,7 +318,7 @@ static int pcm038_devices_init(void)pr_notice ("Using environment in %s Flash\n" , envdev); -if (imx_iim_read (1 ,1 , &uid,6 ) ==6 ) +if (imx_iim_read (1 ,0 , &uid,6 ) ==6 )armlinux_set_serial (uid);armlinux_set_bootparams ((void *)0xa0000100 );armlinux_set_architecture (MACH_TYPE_PCM038 );
Signature · 7 lines
1.7.12.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 3/7 ARM: pcm970: Fix bug with CompactFlash
In reply to Alexander ShiyanPatch adds missing MX27_PCMCIA_CTL_BASE_ADDR offset for "readl" operator.
--- arch/arm/boards/pcm038/pcm970.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boards/pcm038/pcm970.c +2 -2
@@ -120,8 +120,8 @@ static void pcm970_ide_init(void)writel (0x0000001f ,MX27_PCMCIA_CTL_BASE_ADDR +MX27_PCMCIA_PGSR );/* Make PCMCIA bank0 valid */ -writel (readl (MX27_PCMCIA_POR (0 )) | (1 <<29 ), -MX27_PCMCIA_CTL_BASE_ADDR +MX27_PCMCIA_POR (0 )); + i =readl (MX27_PCMCIA_CTL_BASE_ADDR +MX27_PCMCIA_POR (0 )); +writel (i | (1 <<29 ),MX27_PCMCIA_CTL_BASE_ADDR +MX27_PCMCIA_POR (0 ));platform_device_register (&pcm970_ide_device); }
Signature · 7 lines
1.7.12.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 4/7 ARM: pcm970: Replace #ifdef with IS_ENABLED()
In reply to Alexander Shiyan--- arch/arm/boards/pcm038/pcm970.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
arch/arm/boards/pcm038/pcm970.c +2 -5
@@ -27,7 +27,6 @@#define GPIO_IDE_PCOE (GPIO_PORTF + 7)#define GPIO_IDE_RESET (GPIO_PORTF + 10) -#ifdef CONFIG_DISK_INTF_PLATFORM_IDEstatic struct resource pcm970_ide_resources[] = { { .start =MX27_PCMCIA_MEM_BASE_ADDR ,
@@ -125,7 +124,6 @@ static void pcm970_ide_init(void)platform_device_register (&pcm970_ide_device); } -#endif static void pcm970_mmc_init (void ) {
@@ -185,9 +183,8 @@ static int pcm970_init(void)imx27_add_usbh2 (&pcm970_usbh2_pdata); } -#ifdef CONFIG_DISK_INTF_PLATFORM_IDE -pcm970_ide_init (); -#endif +if (IS_ENABLED (CONFIG_DISK_INTF_PLATFORM_IDE )) +pcm970_ide_init ();if (IS_ENABLED (CONFIG_MCI_IMX ))pcm970_mmc_init ();
Signature · 7 lines
1.7.12.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 5/7 ARM: i.MX27: Use DEVICE_ID_SINGLE for IIM, CCM and ESDCTL
In reply to Alexander ShiyanOnly one of IIM, CCM or ESDCTL device is allowed, so use DEVICE_ID_SINGLE for these devices.
--- arch/arm/mach-imx/imx27.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/arm/mach-imx/imx27.c +6 -4
@@ -103,12 +103,13 @@ static int imx27_init(void)imx_iomuxv1_init ((void *)MX27_GPIO1_BASE_ADDR ); -add_generic_device ("imx_iim" ,0 ,NULL ,MX27_IIM_BASE_ADDR ,SZ_4K , -IORESOURCE_MEM ,NULL ); +add_generic_device ("imx_iim" ,DEVICE_ID_SINGLE ,NULL , +MX27_IIM_BASE_ADDR ,SZ_4K ,IORESOURCE_MEM ,NULL );imx27_init_max (); -add_generic_device ("imx27-ccm" ,0 ,NULL ,MX27_CCM_BASE_ADDR ,0x1000 ,IORESOURCE_MEM ,NULL ); +add_generic_device ("imx27-ccm" ,DEVICE_ID_SINGLE ,NULL , +MX27_CCM_BASE_ADDR ,0x1000 ,IORESOURCE_MEM ,NULL );add_generic_device ("imx1-gpt" ,0 ,NULL ,MX27_GPT1_BASE_ADDR ,0x100 ,IORESOURCE_MEM ,NULL );add_generic_device ("imx1-gpio" ,0 ,NULL ,MX27_GPIO1_BASE_ADDR ,0x100 ,IORESOURCE_MEM ,NULL );add_generic_device ("imx1-gpio" ,1 ,NULL ,MX27_GPIO2_BASE_ADDR ,0x100 ,IORESOURCE_MEM ,NULL );
@@ -117,7 +118,8 @@ static int imx27_init(void)add_generic_device ("imx1-gpio" ,4 ,NULL ,MX27_GPIO5_BASE_ADDR ,0x100 ,IORESOURCE_MEM ,NULL );add_generic_device ("imx1-gpio" ,5 ,NULL ,MX27_GPIO6_BASE_ADDR ,0x100 ,IORESOURCE_MEM ,NULL );add_generic_device ("imx21-wdt" ,0 ,NULL ,MX27_WDOG_BASE_ADDR ,0x1000 ,IORESOURCE_MEM ,NULL ); -add_generic_device ("imx27-esdctl" ,0 ,NULL ,MX27_ESDCTL_BASE_ADDR ,0x1000 ,IORESOURCE_MEM ,NULL ); +add_generic_device ("imx27-esdctl" ,DEVICE_ID_SINGLE ,NULL , +MX27_ESDCTL_BASE_ADDR ,0x1000 ,IORESOURCE_MEM ,NULL );add_generic_device ("imx27-usb-misc" ,0 ,NULL ,MX27_USB_OTG_BASE_ADDR +0x600 ,0x100 ,IORESOURCE_MEM ,NULL );return 0 ;
Signature · 7 lines
1.7.12.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 6/7 ARM: pcm038: Using "get_ram_size" for determine SRAM size
In reply to Alexander Shiyan--- arch/arm/boards/pcm038/pcm038.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/arm/boards/pcm038/pcm038.c +7 -3
@@ -21,6 +21,7 @@#include <environment.h> #include <mach/imx27-regs.h> #include <fec.h> +#include <sizes.h> #include <notifier.h> #include <mach/gpio.h> #include <asm/armlinux.h>
@@ -186,6 +187,7 @@ static int pcm038_devices_init(void)int i;u64 uid =0 ;char *envdev; +long sram_size;unsigned int mode[] = {PD0_AIN_FEC_TXD0 ,
@@ -270,9 +272,11 @@ static int pcm038_devices_init(void)/* configure SRAM on cs1 */ imx27_setup_weimcs (1 ,0x0000d843 ,0x22252521 ,0x22220a00 ); -/* Can be up to 2MiB */ -add_mem_device ("ram1" ,0xc8000000 ,512 *1024 , -IORESOURCE_MEM_WRITEABLE ); +/* SRAM can be up to 2MiB */ + sram_size =get_ram_size ((ulong *)MX27_CS1_BASE_ADDR ,SZ_2M ); +if (sram_size) +add_mem_device ("ram1" ,MX27_CS1_BASE_ADDR , sram_size, +IORESOURCE_MEM_WRITEABLE );/* initizalize gpios */ for (i =0 ; i <ARRAY_SIZE (mode); i++)
Signature · 7 lines
1.7.12.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 7/7 ARM: pcm038: Update defconfig
In reply to Alexander Shiyan--- arch/arm/configs/pcm038_defconfig | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm/configs/pcm038_defconfig +6 -1
@@ -5,6 +5,7 @@ CONFIG_MACH_PCM038=y CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y +CONFIG_PBL_IMAGE=y CONFIG_MMU=y CONFIG_TEXT_BASE=0xa7f00000 CONFIG_MALLOC_SIZE=0x1000000
@@ -48,6 +49,9 @@ CONFIG_CMD_MAGICVAR=y CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y +CONFIG_CMD_SPI=y +CONFIG_CMD_MIITOOL=y +CONFIG_CMD_CLK=y CONFIG_NET=y CONFIG_NET_DHCP=y CONFIG_NET_PING=y
@@ -56,6 +60,8 @@ CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_FEC_IMX=y CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y +CONFIG_I2C=y +CONFIG_I2C_IMX=y CONFIG_DRIVER_CFI=y CONFIG_CFI_BUFFER_WRITE=y CONFIG_MTD=y
@@ -73,5 +79,4 @@ CONFIG_DRIVER_VIDEO_IMX=y CONFIG_IMXFB_DRIVER_VIDEO_IMX_OVERLAY=y CONFIG_FS_TFTP=y CONFIG_FS_NFS=y -CONFIG_ZLIB=y CONFIG_LZO_DECOMPRESS=y
Signature · 7 lines
1.7.12.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 7/7] ARM: pcm038: Update defconfig
On 13:23 Sun 24 Feb , Alexander Shiyan wrote:
more info here
what you enable or disable at least
Quoted 51 lines
Signed-off-by Alexander Shiyan <[email protected]>--- arch/arm/configs/pcm038_defconfig | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)arch/arm/configs/pcm038_defconfig +6
-1@@ -5,6 +5,7 @@ CONFIG_MACH_PCM038=y CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_UNWIND=y +CONFIG_PBL_IMAGE=y CONFIG_MMU=y CONFIG_TEXT_BASE=0xa7f00000 CONFIG_MALLOC_SIZE=0x1000000@@ -48,6 +49,9 @@ CONFIG_CMD_MAGICVAR=y CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_GPIO=y CONFIG_CMD_UNCOMPRESS=y +CONFIG_CMD_SPI=y +CONFIG_CMD_MIITOOL=y +CONFIG_CMD_CLK=y CONFIG_NET=y CONFIG_NET_DHCP=y CONFIG_NET_PING=y@@ -56,6 +60,8 @@ CONFIG_NET_RESOLV=y CONFIG_DRIVER_NET_FEC_IMX=y CONFIG_NET_USB=y CONFIG_NET_USB_ASIX=y +CONFIG_I2C=y +CONFIG_I2C_IMX=y CONFIG_DRIVER_CFI=y CONFIG_CFI_BUFFER_WRITE=y CONFIG_MTD=y@@ -73,5 +79,4 @@ CONFIG_DRIVER_VIDEO_IMX=y CONFIG_IMXFB_DRIVER_VIDEO_IMX_OVERLAY=y CONFIG_FS_TFTP=y CONFIG_FS_NFS=y -CONFIG_ZLIB=y CONFIG_LZO_DECOMPRESS=ySignature · 7 lines
1.7.12.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
maintainerQuoted 3 lines · Alexander Shiyan
PCM038 uses IIM in board code, so select
IMX_IIMsymbol by default.Signed-off-by Alexander Shiyan <[email protected]>
Applied 1-6,
Sascha
Quoted 25 lines
--- arch/arm/mach-imx/Kconfig | 1 + 1 file changed, 1 insertion(+)arch/arm/mach-imx/Kconfig +1
-0@@ -289,6 +289,7 @@ config MACH_PCA100 config MACH_PCM038 bool "phyCORE-i.MX27" + select IMX_IIM select SPI select DRIVER_SPI_IMX select MFD_MC13XXXSignature · 7 lines
1.7.12.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox