imx patches for 2.6.36
Subsystems (3)
cover imx patches for 2.6.36
Hello,
in reply to this mail you can find some more clean-ups and updates for the imx platforms. Shortlog and diffstat can be found below.
They are compile tested (all imx defconfigs) and merge fine with Sascha's for-linus and for-rmk branches.
Best regards
Uwe
The following changes since commit 7e125f7b9cbfce4101191b8076d606c517a73066:
Linus Torvalds (1):
Merge git://git.kernel.org/.../davem/ide-2.6
are available in the git repository at:
git://git.pengutronix.de/git/ukl/linux-2.6.git imx/for-2.6.36
Uwe Kleine-K?nig (16):
arm/mx3: rename mach-mx35pdk.c to mach-mx35_3ds.c matching its arch number arm/mx25: rename mach-mx25pdk.c to mach-mx25_3ds.c matching its arch number arm/mx1: add CONFIG_VIDEO_MX1 to defconfig
arm/mx1: don't use deprecated symbol names
arm/mx2/pca100: add #ifdef to fix compiler warning arm/mx1/scb9328: fix type of uart1_mxc_exit to make compiler happy arm/mx2/mx27_3ds: document alternative names and remove empty header arm/imx: remove empty and unused board headers arm/mx2/mbimx27: compile fixes with CONFIG_TOUCHSCREEN_ADS7846=y arm/mx3/kzm_arm11_01: fold board header in its only user arm/mx2/mx21ads: fold board header in its only user arm/mx2/mx27ads: fold board header in its only user arm/mx3/qong: get rid of nearly empty header
arm/mx3/mx31_3ds: fold board header in its only user arm/mx3/mx31ads: fold board header in its only user
arm/mxc: grammar fix
arch/arm/configs/mx1_defconfig | 6 +-
arch/arm/configs/mx27_defconfig | 2 +-
arch/arm/mach-mx1/Makefile | 1 -
arch/arm/mach-mx1/clock.c | 3 +-
arch/arm/mach-mx1/crm_regs.h | 4 +-
arch/arm/mach-mx1/devices.c | 117 ++++----
arch/arm/mach-mx1/generic.c | 13 +-
arch/arm/mach-mx1/mach-mx1ads.c | 12 +-
arch/arm/mach-mx1/mach-scb9328.c | 15 +-
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 5 +-
arch/arm/mach-mx2/mach-imx27lite.c | 1 -
arch/arm/mach-mx2/mach-mx21ads.c | 36 ++-
arch/arm/mach-mx2/mach-mx27_3ds.c | 7 +-
arch/arm/mach-mx2/mach-mx27ads.c | 32 ++-
arch/arm/mach-mx2/mach-pca100.c | 2 +
arch/arm/mach-mx25/Makefile | 2 +-
.../mach-mx25/{mach-mx25pdk.c => mach-mx25_3ds.c} | 6 +
arch/arm/mach-mx3/Makefile | 2 +-
arch/arm/mach-mx3/mach-armadillo5x0.c | 1 -
arch/arm/mach-mx3/mach-kzm_arm11_01.c | 18 +-
arch/arm/mach-mx3/mach-mx31_3ds.c | 41 ++-
arch/arm/mach-mx3/mach-mx31ads.c | 42 ++-
.../mach-mx3/{mach-mx35pdk.c => mach-mx35_3ds.c} | 6 +
arch/arm/mach-mx3/mach-pcm037.c | 1 -
arch/arm/mach-mx3/mach-qong.c | 3 +-
.../arm/plat-mxc/include/mach/board-armadillo5x0.h | 15 -
.../plat-mxc/include/mach/board-eukrea_cpuimx27.h | 2 +-
arch/arm/plat-mxc/include/mach/board-kzmarm11.h | 39 ---
arch/arm/plat-mxc/include/mach/board-mx21ads.h | 52 ---
arch/arm/plat-mxc/include/mach/board-mx27ads.h | 344 --------------------
arch/arm/plat-mxc/include/mach/board-mx27lite.h | 14 -
arch/arm/plat-mxc/include/mach/board-mx27pdk.h | 14 -
arch/arm/plat-mxc/include/mach/board-mx31ads.h | 117 -------
arch/arm/plat-mxc/include/mach/board-mx31lilly.h | 2 +-
arch/arm/plat-mxc/include/mach/board-mx31lite.h | 2 +-
arch/arm/plat-mxc/include/mach/board-mx31moboard.h | 2 +-
arch/arm/plat-mxc/include/mach/board-mx35pdk.h | 22 --
arch/arm/plat-mxc/include/mach/board-pcm037.h | 22 --
arch/arm/plat-mxc/include/mach/board-pcm038.h | 2 +-
arch/arm/plat-mxc/include/mach/board-pcm043.h | 22 --
arch/arm/plat-mxc/include/mach/board-qong.h | 17 -
41 files changed, 272 insertions(+), 794 deletions(-)
rename arch/arm/mach-mx25/{mach-mx25pdk.c => mach-mx25_3ds.c} (97%)
rename arch/arm/mach-mx3/{mach-mx35pdk.c => mach-mx35_3ds.c} (96%)
delete mode 100644 arch/arm/plat-mxc/include/mach/board-armadillo5x0.h
delete mode 100644 arch/arm/plat-mxc/include/mach/board-kzmarm11.h
delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx21ads.h
delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx27ads.h
delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx27lite.h
delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx27pdk.h
delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx31ads.h
delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx35pdk.h
delete mode 100644 arch/arm/plat-mxc/include/mach/board-pcm037.h
delete mode 100644 arch/arm/plat-mxc/include/mach/board-pcm043.h
delete mode 100644 arch/arm/plat-mxc/include/mach/board-qong.hSignature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 1/16 arm/mx3: rename mach-mx35pdk.c to mach-mx35_3ds.c matching its arch number
Additional document all known names of that machine.
---
arch/arm/mach-mx3/Makefile | 2 +-
.../mach-mx3/{mach-mx35pdk.c => mach-mx35_3ds.c} | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
rename arch/arm/mach-mx3/{mach-mx35pdk.c => mach-mx35_3ds.c} (96%)arch/arm/mach-mx3/Makefile +1 -1
@@ -22,5 +22,5 @@ obj-$(CONFIG_MACH_MX31MOBOARD) += mach-mx31moboard.o mx31moboard-devboard.o \ obj-$(CONFIG_MACH_QONG) += mach-qong.o obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o obj-$(CONFIG_MACH_ARMADILLO5X0) += mach-armadillo5x0.o -obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35pdk.o +obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35_3ds.o obj-$(CONFIG_MACH_KZM_ARM11_01) += mach-kzm_arm11_01.o
arch/arm/mach-mx3/mach-mx35_3ds.c renamed from arch/arm/mach-mx3/mach-mx35pdk.c +6 -0
@@ -18,6 +18,12 @@* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* +* This machine is known as: +* - i.MX35 3-Stack Development System +* - i.MX35 Platform Development Kit (i.MX35 PDK) +*/ +#include <linux/types.h> #include <linux/init.h> #include <linux/platform_device.h>
Signature · 1 line
1.7.0
PATCH 1/16 arm/mx3: rename mach-mx35pdk.c to mach-mx35_3ds.c matching its arch number
Uwe,
Quoted 7 lines · Uwe Kleine-K?nig
From: Uwe Kleine-K?nig <[email protected]>
Subject: [PATCH 01/16] arm/mx3: renamemach-mx35pdk.ctomach-mx35_3ds.cmatching its arch number
To: linux-arm-kernel at lists.infradead.org
Cc: kernel at pengutronix.de
Date: Monday, May 24, 2010, 4:55 PM
Additional document all known names
of that machine.
...
To make it consistent across other i.MX boards: shouldn't mach-mx5/board-mx51_babbage.c be also renamed?
Regards,
Fabio Estevam
PATCH 1/16 arm/mx3: rename mach-mx35pdk.c to mach-mx35_3ds.c matching its arch number
Hello Fabio,
Quoted 9 lines · Fabio Estevam
Quoted 7 lines · Uwe Kleine-K?nig
From: Uwe Kleine-K?nig <[email protected]>
Subject: [PATCH 01/16] arm/mx3: renamemach-mx35pdk.ctomach-mx35_3ds.cmatching its arch number
To: linux-arm-kernel at lists.infradead.org
Cc: kernel at pengutronix.de
Date: Monday, May 24, 2010, 4:55 PM
Additional document all known names
of that machine.
Quoted 4 lines
...
To make it consistent across other i.MX boards: shouldn't
mach-mx5/board-mx51_babbage.cbe also renamed?
IMHO yes, but Amit considered "board" to be better than "mach", so I dropped that. The longer term plan is to consolidate all imx platforms in a single directory. For that all files need to be touched anyhow and then I would discuss this again.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 2/16 arm/mx25: rename mach-mx25pdk.c to mach-mx25_3ds.c matching its arch number
In reply to Uwe Kleine-KönigAdditionally document all known names of that machine.
---
arch/arm/mach-mx25/Makefile | 2 +-
.../mach-mx25/{mach-mx25pdk.c => mach-mx25_3ds.c} | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
rename arch/arm/mach-mx25/{mach-mx25pdk.c => mach-mx25_3ds.c} (97%)arch/arm/mach-mx25/Makefile +1 -1
@@ -1,3 +1,3 @@ obj-y := mm.o devices.o obj-$(CONFIG_ARCH_MX25) += clock.o -obj-$(CONFIG_MACH_MX25_3DS) += mach-mx25pdk.o +obj-$(CONFIG_MACH_MX25_3DS) += mach-mx25_3ds.o
arch/arm/mach-mx25/mach-mx25_3ds.c renamed from arch/arm/mach-mx25/mach-mx25pdk.c +6 -0
@@ -16,6 +16,12 @@* Boston, MA 02110-1301, USA. */ +/* +* This machine is known as: +* - i.MX25 3-Stack Development System +* - i.MX25 Platform Development Kit (i.MX25 PDK) +*/ +#include <linux/types.h> #include <linux/init.h> #include <linux/delay.h>
Signature · 1 line
1.7.0
PATCH 3/16 arm/mx1: add CONFIG_VIDEO_MX1 to defconfig
In reply to Uwe Kleine-Königmx1 is the only machine type that can have this device, so add it to its defconfig to get more compile coverage.
--- arch/arm/configs/mx1_defconfig | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
arch/arm/configs/mx1_defconfig +5 -1
@@ -697,6 +697,7 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MFD_WM8400 is not set # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_PCF50633 is not set +CONFIG_MEDIA_SUPPORT=m # # Multimedia devices
@@ -705,13 +706,16 @@ CONFIG_SSB_POSSIBLE=y # # Multimedia core support # -# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_DEV=m # CONFIG_DVB_CORE is not set # CONFIG_VIDEO_MEDIA is not set # # Multimedia drivers # +CONFIG_VIDEO_V4L2=m +CONFIG_SOC_CAMERA=m +CONFIG_VIDEO_MX1=m # CONFIG_DAB is not set #
Signature · 1 line
1.7.0
PATCH 4/16 arm/mx1: don't use deprecated symbol names
In reply to Uwe Kleine-König--- arch/arm/mach-mx1/Makefile | 1 - arch/arm/mach-mx1/clock.c | 3 +- arch/arm/mach-mx1/crm_regs.h | 4 +- arch/arm/mach-mx1/devices.c | 117 +++++++++++++++++++------------------- arch/arm/mach-mx1/generic.c | 13 ++-- arch/arm/mach-mx1/mach-mx1ads.c | 12 ++-- arch/arm/mach-mx1/mach-scb9328.c | 12 ++-- 7 files changed, 81 insertions(+), 81 deletions(-)
arch/arm/mach-mx1/Makefile +0 -1
@@ -4,7 +4,6 @@ # Object file lists. -EXTRA_CFLAGS += -DIMX_NEEDS_DEPRECATED_SYMBOLS obj-y += generic.o clock.o devices.o # Support for CMOS sensor interface
arch/arm/mach-mx1/clock.c +2 -1
@@ -596,7 +596,8 @@ int __init mx1_clocks_init(unsigned long fref)clk_enable (&hclk);clk_enable (&fclk); -mxc_timer_init (&gpt_clk,IO_ADDRESS (TIM1_BASE_ADDR ),TIM1_INT ); +mxc_timer_init (&gpt_clk,MX1_IO_ADDRESS (MX1_TIM1_BASE_ADDR ), +MX1_TIM1_INT );return 0 ; }
arch/arm/mach-mx1/crm_regs.h +2 -2
@@ -9,8 +9,8 @@#ifndef __ARCH_ARM_MACH_MX1_CRM_REGS_H__#define __ARCH_ARM_MACH_MX1_CRM_REGS_H__ -#define CCM_BASE IO_ADDRESS(CCM_BASE_ADDR) -#define SCM_BASE IO_ADDRESS(SCM_BASE_ADDR) +#define CCM_BASE MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR) +#define SCM_BASE MX1_IO_ADDRESS(MX1_SCM_BASE_ADDR)/* CCM register addresses */ #define CCM_CSCR (CCM_BASE + 0x0)
arch/arm/mach-mx1/devices.c +59 -58
210 lines not on this page · raw message
arch/arm/mach-mx1/generic.c +6 -7
@@ -31,23 +31,22 @@static struct map_desc imx_io_desc[]__initdata = { { - .virtual =IMX_IO_BASE , - .pfn =__phys_to_pfn (IMX_IO_PHYS ), - .length =IMX_IO_SIZE , - .type =MT_DEVICE + .virtual =MX1_IO_BASE_ADDR_VIRT , + .pfn =__phys_to_pfn (MX1_IO_BASE_ADDR ), + .length =MX1_IO_SIZE , + .type =MT_DEVICE } };void __init mx1_map_io (void ) {mxc_set_cpu_type (MXC_CPU_MX1 ); -mxc_arch_reset_init (IO_ADDRESS (WDT_BASE_ADDR )); +mxc_arch_reset_init (MX1_IO_ADDRESS (MX1_WDT_BASE_ADDR ));iotable_init (imx_io_desc,ARRAY_SIZE (imx_io_desc)); }void __init mx1_init_irq (void ) { -mxc_init_irq (IO_ADDRESS (AVIC_BASE_ADDR )); +mxc_init_irq (MX1_IO_ADDRESS (MX1_AVIC_BASE_ADDR )); } -
arch/arm/mach-mx1/mach-mx1ads.c +6 -6
@@ -75,8 +75,8 @@ static struct physmap_flash_data mx1ads_flash_data = { };static struct resource flash_resource = { - .start =IMX_CS0_PHYS , - .end =IMX_CS0_PHYS +SZ_32M -1 , + .start =MX1_CS0_PHYS , + .end =MX1_CS0_PHYS +SZ_32M -1 , .flags =IORESOURCE_MEM , };
@@ -145,8 +145,8 @@ struct sys_timer mx1ads_timer = {MACHINE_START (MX1ADS ,"Freescale MX1ADS" )/* Maintainer: Sascha Hauer, Pengutronix */ - .phys_io = IMX_IO_PHYS, - .io_pg_offst = (IMX_IO_BASE >> 18) & 0xfffc, + .phys_io = MX1_IO_BASE_ADDR, + .io_pg_offst = (MX1_IO_BASE_ADDR_VIRT >> 18) & 0xfffc, .boot_params = MX1_PHYS_OFFSET + 0x100, .map_io = mx1_map_io, .init_irq = mx1_init_irq,
@@ -155,8 +155,8 @@ MACHINE_START(MX1ADS, "Freescale MX1ADS") MACHINE_END MACHINE_START(MXLADS, "Freescale MXLADS") - .phys_io = IMX_IO_PHYS, - .io_pg_offst = (IMX_IO_BASE >> 18) & 0xfffc, + .phys_io = MX1_IO_BASE_ADDR, + .io_pg_offst = (MX1_IO_BASE_ADDR_VIRT >> 18) & 0xfffc, .boot_params = MX1_PHYS_OFFSET + 0x100, .map_io = mx1_map_io, .init_irq = mx1_init_irq,
arch/arm/mach-mx1/mach-scb9328.c +6 -6
@@ -31,8 +31,8 @@* This scb9328 has a 32MiB flash */ static struct resource flash_resource = { - .start =IMX_CS0_PHYS , - .end =IMX_CS0_PHYS + (32 *1024 *1024 ) -1 , + .start =MX1_CS0_PHYS , + .end =MX1_CS0_PHYS + (32 *1024 *1024 ) -1 , .flags =IORESOURCE_MEM , };
@@ -70,13 +70,13 @@ static struct dm9000_plat_data dm9000_platdata = {static struct resource dm9000x_resources[] = { { .name ="address area" , - .start =IMX_CS5_PHYS , - .end =IMX_CS5_PHYS +1 , + .start =MX1_CS5_PHYS , + .end =MX1_CS5_PHYS +1 , .flags =IORESOURCE_MEM ,/* address access */ }, { .name ="data area" , - .start =IMX_CS5_PHYS +4 , - .end =IMX_CS5_PHYS +5 , + .start =MX1_CS5_PHYS +4 , + .end =MX1_CS5_PHYS +5 , .flags =IORESOURCE_MEM ,/* data access */ }, { .start =IRQ_GPIOC (3 ),
Signature · 1 line
1.7.0
PATCH 5/16 arm/mx2/pca100: add #ifdef to fix compiler warning
In reply to Uwe Kleine-KönigThis fixes:
arch/arm/mach-mx2/mach-pca100.c:261: warning: 'otg_pdata' defined but not used arch/arm/mach-mx2/mach-pca100.c:273: warning: 'usbh2_pdata' defined but not used
for build having USB_ULPI disabled.
--- arch/arm/mach-mx2/mach-pca100.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-mx2/mach-pca100.c +2 -0
@@ -252,6 +252,7 @@ static struct imxmmc_platform_data sdhc_pdata = { .exit = pca100_sdhc2_exit, }; +#if defined(CONFIG_USB_ULPI )static int otg_phy_init (struct platform_device *pdev) {gpio_set_value (OTG_PHY_CS_GPIO ,0 );
@@ -275,6 +276,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = { .portsc = MXC_EHCI_MODE_ULPI, .flags = MXC_EHCI_INTERFACE_DIFF_UNI, }; +#endif static struct fsl_usb2_platform_data otg_device_pdata = { .operating_mode =FSL_USB2_DR_DEVICE ,
Signature · 1 line
1.7.0
PATCH 5/16 arm/mx2/pca100: add #ifdef to fix compiler warning
Quoted 6 lines · Uwe Kleine-K?nig
This fixes:
arch/arm/mach-mx2/mach-pca100.c:261: warning: 'otg_pdata' defined but not usedarch/arm/mach-mx2/mach-pca100.c:273: warning: 'usbh2_pdata' defined but not usedfor build having
USB_ULPIdisabled.
See:
http://article.gmane.org/gmane.linux.ports.arm.kernel/80438/
Signature · 9 lines
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100525/cb9af6da/attachment.sig>
PATCH 5/16 arm/mx2/pca100: add #ifdef to fix compiler warning
Hello Wolfram,
Quoted 11 lines · Wolfram Sang
Quoted 6 lines · Uwe Kleine-K?nig
This fixes:
arch/arm/mach-mx2/mach-pca100.c:261: warning: 'otg_pdata' defined but not usedarch/arm/mach-mx2/mach-pca100.c:273: warning: 'usbh2_pdata' defined but not usedfor build having
USB_ULPIdisabled.See:
http://article.gmane.org/gmane.linux.ports.arm.kernel/80438/
ah, OK, your patch looks more complete. I dropped my patch and took your's instead. While at it I took "[PATCH] pcm037: fix build warning", too.
Thanks
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 5/16 arm/mx2/pca100: add #ifdef to fix compiler warning
Quoted 3 lines · Uwe Kleine-K?nig
ah, OK, your patch looks more complete. I dropped my patch and took your's instead. While at it I took "[PATCH] pcm037: fix build warning", too.
Hmm, your patches are for 2.6.36; I think these build-fixes should go to 2.6.35 (if Sascha's pull request for mxc-master will be accepted, that is). Otherwise, OK.
Signature · 9 lines
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100525/6c7d973c/attachment.sig>
PATCH 5/16 arm/mx2/pca100: add #ifdef to fix compiler warning
Quoted 9 lines · Wolfram Sang
Quoted 3 lines · Uwe Kleine-K?nig
ah, OK, your patch looks more complete. I dropped my patch and took your's instead. While at it I took "[PATCH] pcm037: fix build warning", too.
Hmm, your patches are for 2.6.36; I think these build-fixes should go to 2.6.35 (if Sascha's pull request for mxc-master will be accepted, that is). Otherwise, OK.
They only fix warnings but shouldn't make any difference for the generated code. So I think 2.6.36 is OK.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 6/16 arm/mx1/scb9328: fix type of uart1_mxc_exit to make compiler happy
In reply to Uwe Kleine-KönigThis fixes:
arch/arm/mach-mx1/mach-scb9328.c:120: warning: initialization from incompatible pointer type
--- arch/arm/mach-mx1/mach-scb9328.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
arch/arm/mach-mx1/mach-scb9328.c +1 -2
@@ -108,11 +108,10 @@ static int uart1_mxc_init(struct platform_device *pdev) ARRAY_SIZE(mxc_uart1_pins), "UART1"); } -static int uart1_mxc_exit (struct platform_device *pdev) +static void uart1_mxc_exit (struct platform_device *pdev) {mxc_gpio_release_multiple_pins (mxc_uart1_pins,ARRAY_SIZE (mxc_uart1_pins)); -return 0 ; }static struct imxuart_platform_data uart_pdata = {
Signature · 1 line
1.7.0
PATCH 7/16 arm/mx2/mx27_3ds: document alternative names and remove empty header
In reply to Uwe Kleine-König--- arch/arm/mach-mx2/mach-mx27_3ds.c | 7 ++++++- arch/arm/plat-mxc/include/mach/board-mx27pdk.h | 14 -------------- 2 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx27pdk.h
arch/arm/mach-mx2/mach-mx27_3ds.c +6 -1
@@ -18,6 +18,12 @@* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* +* This machine is known as: +* - i.MX27 3-Stack Development System +* - i.MX27 Platform Development Kit (i.MX27 PDK) +*/ +#include <linux/platform_device.h> #include <linux/gpio.h> #include <asm/mach-types.h>
@@ -27,7 +33,6 @@#include <mach/common.h> #include <mach/imx-uart.h> #include <mach/iomux-mx27.h> -#include <mach/board-mx27pdk.h> #include "devices.h"
arch/arm/plat-mxc/include/mach/board-mx27pdk.h deleted +0 -14
@@ -1,14 +0,0 @@ -/* -* Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved. -*/ - -/* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_MXC_BOARD_MX27PDK_H__ -#define __ASM_ARCH_MXC_BOARD_MX27PDK_H__ - -#endif /* __ASM_ARCH_MXC_BOARD_MX27PDK_H__ */
Signature · 1 line
1.7.0
PATCH 8/16 arm/imx: remove empty and unused board headers
In reply to Uwe Kleine-König--- arch/arm/mach-mx2/mach-imx27lite.c | 1 - arch/arm/mach-mx3/mach-armadillo5x0.c | 1 - arch/arm/mach-mx3/mach-pcm037.c | 1 - .../arm/plat-mxc/include/mach/board-armadillo5x0.h | 15 ------------- arch/arm/plat-mxc/include/mach/board-mx27lite.h | 14 ------------ arch/arm/plat-mxc/include/mach/board-mx35pdk.h | 22 -------------------- arch/arm/plat-mxc/include/mach/board-pcm037.h | 22 -------------------- arch/arm/plat-mxc/include/mach/board-pcm043.h | 22 -------------------- 8 files changed, 0 insertions(+), 98 deletions(-) delete mode 100644 arch/arm/plat-mxc/include/mach/board-armadillo5x0.h delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx27lite.h delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx35pdk.h delete mode 100644 arch/arm/plat-mxc/include/mach/board-pcm037.h delete mode 100644 arch/arm/plat-mxc/include/mach/board-pcm043.h
arch/arm/mach-mx2/mach-imx27lite.c +0 -1
@@ -28,7 +28,6 @@#include <mach/common.h> #include <mach/imx-uart.h> #include <mach/iomux-mx27.h> -#include <mach/board-mx27lite.h> #include "devices.h"
arch/arm/mach-mx3/mach-armadillo5x0.c +0 -1
@@ -50,7 +50,6 @@#include <mach/common.h> #include <mach/imx-uart.h> #include <mach/iomux-mx3.h> -#include <mach/board-armadillo5x0.h> #include <mach/mmc.h> #include <mach/ipu.h> #include <mach/mx3fb.h>
arch/arm/mach-mx3/mach-pcm037.c +0 -1
@@ -43,7 +43,6 @@#include <asm/mach/arch.h> #include <asm/mach/time.h> #include <asm/mach/map.h> -#include <mach/board-pcm037.h> #include <mach/common.h> #include <mach/hardware.h> #include <mach/i2c.h>
arch/arm/plat-mxc/include/mach/board-armadillo5x0.h deleted +0 -15
@@ -1,15 +0,0 @@ -/* -* Copyright 2009 Alberto Panizzo <[email protected]>. -* All Rights Reserved. -*/ - -/* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_MXC_BOARD_ARMADILLO5X0_H__ -#define __ASM_ARCH_MXC_BOARD_ARMADILLO5X0_H__ - -#endif
arch/arm/plat-mxc/include/mach/board-mx27lite.h deleted +0 -14
@@ -1,14 +0,0 @@ -/* -* Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved. -*/ - -/* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_MXC_BOARD_MX27LITE_H__ -#define __ASM_ARCH_MXC_BOARD_MX27LITE_H__ - -#endif /* __ASM_ARCH_MXC_BOARD_MX27LITE_H__ */
arch/arm/plat-mxc/include/mach/board-mx35pdk.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* -* Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved -* -* 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 -*/ - -#ifndef __ASM_ARCH_MXC_BOARD_MX35PDK_H__ -#define __ASM_ARCH_MXC_BOARD_MX35PDK_H__ - -#endif /* __ASM_ARCH_MXC_BOARD_MX35PDK_H__ */
arch/arm/plat-mxc/include/mach/board-pcm037.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* -* Copyright (C) 2008 Sascha Hauer, Pengutronix -* -* 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 -*/ - -#ifndef __ASM_ARCH_MXC_BOARD_PCM037_H__ -#define __ASM_ARCH_MXC_BOARD_PCM037_H__ - -#endif /* __ASM_ARCH_MXC_BOARD_PCM037_H__ */
arch/arm/plat-mxc/include/mach/board-pcm043.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* -* Copyright (C) 2008 Sascha Hauer, Pengutronix -* -* 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 -*/ - -#ifndef __ASM_ARCH_MXC_BOARD_PCM043_H__ -#define __ASM_ARCH_MXC_BOARD_PCM043_H__ - -#endif /* __ASM_ARCH_MXC_BOARD_PCM043_H__ */
Signature · 1 line
1.7.0
PATCH 9/16 arm/mx2/mbimx27: compile fixes with CONFIG_TOUCHSCREEN_ADS7846=y
In reply to Uwe Kleine-KönigThis fixes:
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:166: error: expected identifier or '(' before '||' token arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:204: error: variable 'eukrea_mbimx27_spi_0_data' has initializer but incomplete type arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:205: error: unknown field 'chipselect' specified in initializer arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:205: warning: excess elements in struct initializer arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:205: warning: (near initialization for 'eukrea_mbimx27_spi_0_data') arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:206: error: unknown field 'num_chipselect' specified in initializer arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:206: warning: excess elements in struct initializer arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:206: warning: (near initialization for 'eukrea_mbimx27_spi_0_data') arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c: In function 'eukrea_mbimx27_baseboard_init':
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:239: error: implicit declaration of function 'ads7846_dev_init'
While at it add TOUCHSCREEN_ADS7846=m to mx27_defconfig.
--- arch/arm/configs/mx27_defconfig | 2 +- arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
arch/arm/configs/mx27_defconfig +1 -1
@@ -623,7 +623,7 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_ADS7846=m # CONFIG_TOUCHSCREEN_AD7877 is not set # CONFIG_TOUCHSCREEN_AD7879_I2C is not set # CONFIG_TOUCHSCREEN_AD7879_SPI is not set
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c +3 -2
@@ -33,6 +33,7 @@#include <mach/hardware.h> #include <mach/mmc.h> #include <mach/imx-uart.h> +#include <mach/spi.h> #include "devices.h"
@@ -162,7 +163,7 @@ static struct imxuart_platform_data uart_pdata[] = { }, }; -#if defined(CONFIG_TOUCHSCREEN_ADS7846) +#if defined(CONFIG_TOUCHSCREEN_ADS7846 ) \ || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE )#define ADS7846_PENDOWN (GPIO_PORTD | 25)
@@ -228,7 +229,7 @@ void __init eukrea_mbimx27_baseboard_init(void)mxc_register_device (&mxc_fb_device, &eukrea_mbimx27_fb_data);mxc_register_device (&mxc_sdhc_device0,NULL ); -#if defined(CONFIG_TOUCHSCREEN_ADS7846) +#if defined(CONFIG_TOUCHSCREEN_ADS7846 ) \ || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE )/* SPI and ADS7846 Touchscreen controler init */ mxc_gpio_mode (GPIO_PORTD |28 |GPIO_GPIO |GPIO_OUT );
Signature · 1 line
1.7.0
PATCH 9/16 arm/mx2/mbimx27: compile fixes with CONFIG_TOUCHSCREEN_ADS7846=y
Hi Uwe,
Le 24/05/2010 21:55, Uwe Kleine-K?nig a ?crit :
Quoted 13 lines
This fixes:
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:166: error: expected identifier or '(' before '||' tokenarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:204: error: variable 'eukrea_mbimx27_spi_0_data' has initializer but incomplete typearch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:205: error: unknown field 'chipselect' specified in initializerarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:205: warning: excess elements in struct initializerarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:205: warning: (near initialization for 'eukrea_mbimx27_spi_0_data')arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:206: error: unknown field 'num_chipselect' specified in initializerarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:206: warning: excess elements in struct initializerarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:206: warning: (near initialization for 'eukrea_mbimx27_spi_0_data')arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c: In function 'eukrea_mbimx27_baseboard_init':
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:239: error: implicit declaration of function 'ads7846_dev_init'
Quoted 2 lines
While at it add TOUCHSCREEN_ADS7846=m to
mx27_defconfig.
I already fixed this in my patchset for this board :
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-May/015826.html
Eric
PATCH 9/16 arm/mx2/mbimx27: compile fixes with CONFIG_TOUCHSCREEN_ADS7846=y
Hi Eric,
Quoted 16 lines · Eric B?nard
Hi Uwe,
Le 24/05/2010 21:55, Uwe Kleine-K?nig a ?crit :
Quoted 13 lines
This fixes:
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:166: error: expected identifier or '(' before '||' tokenarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:204: error: variable 'eukrea_mbimx27_spi_0_data' has initializer but incomplete typearch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:205: error: unknown field 'chipselect' specified in initializerarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:205: warning: excess elements in struct initializerarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:205: warning: (near initialization for 'eukrea_mbimx27_spi_0_data')arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:206: error: unknown field 'num_chipselect' specified in initializerarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:206: warning: excess elements in struct initializerarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:206: warning: (near initialization for 'eukrea_mbimx27_spi_0_data')arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c: In function 'eukrea_mbimx27_baseboard_init':
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:239: error: implicit declaration of function 'ads7846_dev_init'
Quoted 4 lines
Quoted 2 lines
While at it add TOUCHSCREEN_ADS7846=m to
mx27_defconfig.I already fixed this in my patchset for this board :
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-May/015826.html
What do you think about adding TOUCHSCREEN_ADS7846=m to mx27_defconfig?
Other than that I'm OK with your patch, too. I will remove this patch from my queue.
Best regards and thanks
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 9/16 arm/mx2/mbimx27: compile fixes with CONFIG_TOUCHSCREEN_ADS7846=y
Hi Uwe,
Le 24/05/2010 22:34, Uwe Kleine-K?nig a ?crit :
Quoted 2 lines
What do you think about adding TOUCHSCREEN_ADS7846=m to
mx27_defconfig?
in fact I also sent a patch to update the defconfig for our boards's peripherals (for our board : 8250, ADS7846, libertas, LEDs, keyboard + for most iMX27 boards : SPI, LCD, USB host + Gadget) :
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-May/015833.html
As a default, I put +CONFIG_TOUCHSCREEN_ADS7846=y : is it a problem to have it integrated and not configured as a module in the defconfig ?
Thanks,
Eric
PATCH 9/16 arm/mx2/mbimx27: compile fixes with CONFIG_TOUCHSCREEN_ADS7846=y
In reply to Uwe Kleine-KönigHi Eric,
Quoted 19 lines · Uwe Kleine-K?nig
Quoted 18 lines · Eric B?nard
Hi Uwe,
Le 24/05/2010 21:55, Uwe Kleine-K?nig a ?crit :
Quoted 15 lines
This fixes:
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:166: error: expected identifier or '(' before '||' tokenarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:204: error: variable 'eukrea_mbimx27_spi_0_data' has initializer but incomplete typearch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:205: error: unknown field 'chipselect' specified in initializerarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:205: warning: excess elements in struct initializerarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:205: warning: (near initialization for 'eukrea_mbimx27_spi_0_data')arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:206: error: unknown field 'num_chipselect' specified in initializerarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:206: warning: excess elements in struct initializerarch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:206: warning: (near initialization for 'eukrea_mbimx27_spi_0_data')arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c: In function 'eukrea_mbimx27_baseboard_init':
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c:239: error: implicit declaration of function 'ads7846_dev_init'While at it add TOUCHSCREEN_ADS7846=m to
mx27_defconfig.
Quoted 7 lines
Quoted 2 lines
I already fixed this in my patchset for this board :
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-May/015826.htmlWhat do you think about adding TOUCHSCREEN_ADS7846=m to
mx27_defconfig?Other than that I'm OK with your patch, too. I will remove this patch from my queue.
If we want to have ADS7846 at least compilable in .35 we should go with my patch as your's is (IMHO) too intrusive after -rc1.
Sascha?
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 9/16 arm/mx2/mbimx27: compile fixes with CONFIG_TOUCHSCREEN_ADS7846=y
Hi Uwe,
Le 22/06/2010 18:13, Uwe Kleine-K?nig a ?crit :
Quoted 8 lines · Uwe Kleine-K?nig
Quoted 4 lines
What do you think about adding TOUCHSCREEN_ADS7846=m to
mx27_defconfig?Other than that I'm OK with your patch, too. I will remove this patch from my queue.
If we want to have ADS7846 at least compilable in .35 we should go with my patch as your's is (IMHO) too intrusive after -rc1.
unless this has changed recently, this board is not in mx27_defconfig for 2.6.35-rc nor in Sasha's tree so adding TOUCHSCREEN_ADS7846=m to defconfig shouldn't break anything.
Eric
PATCH 9/16 arm/mx2/mbimx27: compile fixes with CONFIG_TOUCHSCREEN_ADS7846=y
In reply to Uwe Kleine-KönigHello,
Quoted 2 lines
If we want to have ADS7846 at least compilable in .35 we should go with my patch as your's is (IMHO) too intrusive after -rc1.
I have somehow missed that Eric's patch is already in Sascha's for-2.6.35 branch. So there is nothing to do.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 10/16 arm/mx3/kzm_arm11_01: fold board header in its only user
In reply to Uwe Kleine-König--- arch/arm/mach-mx3/mach-kzm_arm11_01.c | 18 ++++++++++- arch/arm/plat-mxc/include/mach/board-kzmarm11.h | 39 ----------------------- 2 files changed, 17 insertions(+), 40 deletions(-) delete mode 100644 arch/arm/plat-mxc/include/mach/board-kzmarm11.h
arch/arm/mach-mx3/mach-kzm_arm11_01.c +17 -1
@@ -37,7 +37,6 @@#include <asm/mach/map.h> #include <asm/mach/time.h> -#include <mach/board-kzmarm11.h> #include <mach/clock.h> #include <mach/common.h> #include <mach/imx-uart.h>
@@ -51,6 +50,23 @@ IMX_IO_ADDRESS(x, MX31_CS5) ?: \ MX31_IO_ADDRESS(x)) +/* +* KZM-ARM11-01 Board Control Registers on FPGA +*/ +#define KZM_ARM11_CTL1 (MX31_CS4_BASE_ADDR + 0x1000) +#define KZM_ARM11_CTL2 (MX31_CS4_BASE_ADDR + 0x1001) +#define KZM_ARM11_RSW1 (MX31_CS4_BASE_ADDR + 0x1002) +#define KZM_ARM11_BACK_LIGHT (MX31_CS4_BASE_ADDR + 0x1004) +#define KZM_ARM11_FPGA_REV (MX31_CS4_BASE_ADDR + 0x1008) +#define KZM_ARM11_7SEG_LED (MX31_CS4_BASE_ADDR + 0x1010) +#define KZM_ARM11_LEDS (MX31_CS4_BASE_ADDR + 0x1020) +#define KZM_ARM11_DIPSW2 (MX31_CS4_BASE_ADDR + 0x1003) + +/* +* External UART for touch panel on FPGA +*/ +#define KZM_ARM11_16550 (MX31_CS4_BASE_ADDR + 0x1050) +#if defined(CONFIG_SERIAL_8250 ) || defined(CONFIG_SERIAL_8250_MODULE )/* * KZM-ARM11-01 has an external UART on FPGA
arch/arm/plat-mxc/include/mach/board-kzmarm11.h deleted +0 -39
@@ -1,39 +0,0 @@ -/* -* Copyright (C) 2009 Yoichi Yuasa <[email protected]> -* -* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -#ifndef __ARM_ARCH_BOARD_KZM_ARM11_H -#define __ARM_ARCH_BOARD_KZM_ARM11_H - -/* -* KZM-ARM11-01 Board Control Registers on FPGA -*/ -#define KZM_ARM11_CTL1 (MX31_CS4_BASE_ADDR + 0x1000) -#define KZM_ARM11_CTL2 (MX31_CS4_BASE_ADDR + 0x1001) -#define KZM_ARM11_RSW1 (MX31_CS4_BASE_ADDR + 0x1002) -#define KZM_ARM11_BACK_LIGHT (MX31_CS4_BASE_ADDR + 0x1004) -#define KZM_ARM11_FPGA_REV (MX31_CS4_BASE_ADDR + 0x1008) -#define KZM_ARM11_7SEG_LED (MX31_CS4_BASE_ADDR + 0x1010) -#define KZM_ARM11_LEDS (MX31_CS4_BASE_ADDR + 0x1020) -#define KZM_ARM11_DIPSW2 (MX31_CS4_BASE_ADDR + 0x1003) - -/* -* External UART for touch panel on FPGA -*/ -#define KZM_ARM11_16550 (MX31_CS4_BASE_ADDR + 0x1050) - -#endif /* __ARM_ARCH_BOARD_KZM_ARM11_H */ -
Signature · 1 line
1.7.0
PATCH 11/16 arm/mx2/mx21ads: fold board header in its only user
In reply to Uwe Kleine-König--- arch/arm/mach-mx2/mach-mx21ads.c | 36 ++++++++++++++++- arch/arm/plat-mxc/include/mach/board-mx21ads.h | 52 ------------------------ 2 files changed, 35 insertions(+), 53 deletions(-) delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx21ads.h
arch/arm/mach-mx2/mach-mx21ads.c +35 -1
@@ -33,10 +33,44 @@#include <mach/iomux-mx21.h> #include <mach/mxc_nand.h> #include <mach/mmc.h> -#include <mach/board-mx21ads.h> #include "devices.h" +/* +* Memory-mapped I/O on MX21ADS base board +*/ +#define MX21ADS_MMIO_BASE_ADDR 0xf5000000 +#define MX21ADS_MMIO_SIZE SZ_16M + +#define MX21ADS_REG_ADDR (offset) (void __force __iomem *) \ + (MX21ADS_MMIO_BASE_ADDR + (offset)) + +#define MX21ADS_CS8900A_IRQ IRQ_GPIOE(11) +#define MX21ADS_CS8900A_IOBASE_REG MX21ADS_REG_ADDR(0x000000) +#define MX21ADS_ST16C255_IOBASE_REG MX21ADS_REG_ADDR(0x200000) +#define MX21ADS_VERSION_REG MX21ADS_REG_ADDR(0x400000) +#define MX21ADS_IO_REG MX21ADS_REG_ADDR(0x800000) + +/* MX21ADS_IO_REG bit definitions */ +#define MX21ADS_IO_SD_WP 0x0001/* read */ +#define MX21ADS_IO_TP6 0x0001/* write */ +#define MX21ADS_IO_SW_SEL 0x0002/* read */ +#define MX21ADS_IO_TP7 0x0002/* write */ +#define MX21ADS_IO_RESET_E_UART 0x0004 +#define MX21ADS_IO_RESET_BASE 0x0008 +#define MX21ADS_IO_CSI_CTL2 0x0010 +#define MX21ADS_IO_CSI_CTL1 0x0020 +#define MX21ADS_IO_CSI_CTL0 0x0040 +#define MX21ADS_IO_UART1_EN 0x0080 +#define MX21ADS_IO_UART4_EN 0x0100 +#define MX21ADS_IO_LCDON 0x0200 +#define MX21ADS_IO_IRDA_EN 0x0400 +#define MX21ADS_IO_IRDA_FIR_SEL 0x0800 +#define MX21ADS_IO_IRDA_MD0_B 0x1000 +#define MX21ADS_IO_IRDA_MD1 0x2000 +#define MX21ADS_IO_LED4_ON 0x4000 +#define MX21ADS_IO_LED3_ON 0x8000 +static unsigned int mx21ads_pins[] = {/* CS8900A */
arch/arm/plat-mxc/include/mach/board-mx21ads.h deleted +0 -52
52 lines not on this page · raw message
Signature · 1 line
1.7.0
PATCH 12/16 arm/mx2/mx27ads: fold board header in its only user
In reply to Uwe Kleine-KönigMoreover remove unused definitions.
--- arch/arm/mach-mx2/mach-mx27ads.c | 32 ++- arch/arm/plat-mxc/include/mach/board-mx27ads.h | 344 ------------------------ 2 files changed, 30 insertions(+), 346 deletions(-) delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx27ads.h
arch/arm/mach-mx2/mach-mx27ads.c +30 -2
@@ -34,7 +34,6 @@#include <mach/gpio.h> #include <mach/imx-uart.h> #include <mach/iomux-mx27.h> -#include <mach/board-mx27ads.h> #include <mach/mxc_nand.h> #include <mach/i2c.h> #include <mach/imxfb.h>
@@ -42,6 +41,36 @@#include "devices.h" +/* +* Base address of PBC controller, CS4 +*/ +#define PBC_BASE_ADDRESS 0xf4300000 +#define PBC_REG_ADDR (offset) (void __force __iomem *) \ + (PBC_BASE_ADDRESS + (offset)) + +/* When the PBC address connection is fixed in h/w, defined as 1 */ +#define PBC_ADDR_SH 0 + +/* Offsets for the PBC Controller register */ +/* +* PBC Board version register offset +*/ +#define PBC_VERSION_REG PBC_REG_ADDR(0x00000 >> PBC_ADDR_SH) +/* +* PBC Board control register 1 set address. +*/ +#define PBC_BCTRL1_SET_REG PBC_REG_ADDR(0x00008 >> PBC_ADDR_SH) +/* +* PBC Board control register 1 clear address. +*/ +#define PBC_BCTRL1_CLEAR_REG PBC_REG_ADDR(0x0000C >> PBC_ADDR_SH) + +/* PBC Board Control Register 1 bit definitions */ +#define PBC_BCTRL1_LCDON 0x0800/* Enable the LCD */ + +/* to determine the correct external crystal reference */ +#define CKIH_27MHZ_BIT_SET (1 << 3) +static unsigned int mx27ads_pins[] = {/* UART0 */ PE12_PF_UART1_TXD ,
@@ -342,4 +371,3 @@ MACHINE_START(MX27ADS, "Freescale i.MX27ADS") .init_machine = mx27ads_board_init, .timer = &mx27ads_timer,MACHINE_END -
arch/arm/plat-mxc/include/mach/board-mx27ads.h deleted +0 -344
344 lines not on this page · raw message
Signature · 1 line
1.7.0
PATCH 13/16 arm/mx3/qong: get rid of nearly empty header
In reply to Uwe Kleine-Königboard-qong.h only defined a single symbol that was used only once.
--- arch/arm/mach-mx3/mach-qong.c | 3 +-- arch/arm/plat-mxc/include/mach/board-qong.h | 17 ----------------- 2 files changed, 1 insertions(+), 19 deletions(-) delete mode 100644 arch/arm/plat-mxc/include/mach/board-qong.h
arch/arm/mach-mx3/mach-qong.c +1 -2
@@ -34,7 +34,6 @@#include <mach/common.h> #include <asm/page.h> #include <asm/setup.h> -#include <mach/board-qong.h> #include <mach/imx-uart.h> #include <mach/iomux-mx3.h> #include "devices.h"
@@ -116,7 +115,7 @@ static struct physmap_flash_data qong_flash_data = {static struct resource qong_flash_resource = { .start =MX31_CS0_BASE_ADDR , - .end =MX31_CS0_BASE_ADDR +QONG_NOR_SIZE -1 , + .end =MX31_CS0_BASE_ADDR +SZ_128M -1 , .flags =IORESOURCE_MEM , };
arch/arm/plat-mxc/include/mach/board-qong.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* -* Copyright 2009 Ilya Yanok, Emcraft Systems Ltd, <[email protected]> -*/ - -/* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_MXC_BOARD_QONG_H__ -#define __ASM_ARCH_MXC_BOARD_QONG_H__ - -/* NOR FLASH */ -#define QONG_NOR_SIZE (128*1024*1024) - -#endif /* __ASM_ARCH_MXC_BOARD_QONG_H__ */
Signature · 1 line
1.7.0
PATCH 14/16 arm/mx3/mx31_3ds: fold board header in its only user
In reply to Uwe Kleine-KönigMoreover remove unused definitions.
--- arch/arm/mach-mx3/mach-mx31_3ds.c | 41 +++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 6 deletions(-)
arch/arm/mach-mx3/mach-mx31_3ds.c +35 -6
@@ -41,12 +41,41 @@#include <mach/spi.h> #include "devices.h" -/*! -* @file mx31_3ds.c -* -* @brief This file contains the board-specific initialization routines. -* -* @ingroup System +/* Definitions for components on the Debug board */ + +/* Base address of CPLD controller on the Debug board */ +#define DEBUG_BASE_ADDRESS CS5_IO_ADDRESS(MX3x_CS5_BASE_ADDR) + +/* LAN9217 ethernet base address */ +#define LAN9217_BASE_ADDR MX3x_CS5_BASE_ADDR + +/* CPLD config and interrupt base address */ +#define CPLD_ADDR (DEBUG_BASE_ADDRESS + 0x20000) + +/* status, interrupt */ +#define CPLD_INT_STATUS_REG (CPLD_ADDR + 0x10) +#define CPLD_INT_MASK_REG (CPLD_ADDR + 0x38) +#define CPLD_INT_RESET_REG (CPLD_ADDR + 0x20) +/* magic word for debug CPLD */ +#define CPLD_MAGIC_NUMBER1_REG (CPLD_ADDR + 0x40) +#define CPLD_MAGIC_NUMBER2_REG (CPLD_ADDR + 0x48) +/* CPLD code version */ +#define CPLD_CODE_VER_REG (CPLD_ADDR + 0x50) +/* magic word for debug CPLD */ +#define CPLD_MAGIC_NUMBER3_REG (CPLD_ADDR + 0x58) + +/* CPLD IRQ line for external uart, external ethernet etc */ +#define EXPIO_PARENT_INT IOMUX_TO_IRQ(MX31_PIN_GPIO1_1) + +#define MXC_EXP_IO_BASE (MXC_BOARD_IRQ_START) +#define MXC_IRQ_TO_EXPIO (irq) ((irq) - MXC_EXP_IO_BASE) + +#define EXPIO_INT_ENET (MXC_EXP_IO_BASE + 0) + +#define MXC_MAX_EXP_IO_LINES 16 + +/* +* This file contains the board-specific initialization routines. */ static int mx31_3ds_pins[] = {
Signature · 1 line
1.7.0
Sascha Hauer
maintainerPATCH 14/16 arm/mx3/mx31_3ds: fold board header in its only user
Quoted 1 line · Uwe Kleine-K?nig
Moreover remove unused definitions.
The patch does not match the subject. Are there hunks missing?
Sascah
Quoted 62 lines
Signed-off-by Uwe Kleine-K?nig <[email protected]>--- arch/arm/mach-mx3/mach-mx31_3ds.c | 41 +++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 6 deletions(-)arch/arm/mach-mx3/mach-mx31_3ds.c +35
-6@@ -41,12 +41,41 @@#include <mach/spi.h> #include "devices.h" -/*! -* @file mx31_3ds.c -* -* @brief This file contains the board-specific initialization routines. -* -* @ingroup System +/* Definitions for components on the Debug board */ + +/* Base address of CPLD controller on the Debug board */ +#define DEBUG_BASE_ADDRESS CS5_IO_ADDRESS(MX3x_CS5_BASE_ADDR) + +/* LAN9217 ethernet base address */ +#define LAN9217_BASE_ADDR MX3x_CS5_BASE_ADDR + +/* CPLD config and interrupt base address */ +#define CPLD_ADDR (DEBUG_BASE_ADDRESS + 0x20000) + +/* status, interrupt */ +#define CPLD_INT_STATUS_REG (CPLD_ADDR + 0x10) +#define CPLD_INT_MASK_REG (CPLD_ADDR + 0x38) +#define CPLD_INT_RESET_REG (CPLD_ADDR + 0x20) +/* magic word for debug CPLD */ +#define CPLD_MAGIC_NUMBER1_REG (CPLD_ADDR + 0x40) +#define CPLD_MAGIC_NUMBER2_REG (CPLD_ADDR + 0x48) +/* CPLD code version */ +#define CPLD_CODE_VER_REG (CPLD_ADDR + 0x50) +/* magic word for debug CPLD */ +#define CPLD_MAGIC_NUMBER3_REG (CPLD_ADDR + 0x58) + +/* CPLD IRQ line for external uart, external ethernet etc */ +#define EXPIO_PARENT_INT IOMUX_TO_IRQ(MX31_PIN_GPIO1_1) + +#define MXC_EXP_IO_BASE (MXC_BOARD_IRQ_START) +#define MXC_IRQ_TO_EXPIO (irq) ((irq) - MXC_EXP_IO_BASE) + +#define EXPIO_INT_ENET (MXC_EXP_IO_BASE + 0) + +#define MXC_MAX_EXP_IO_LINES 16 + +/* +* This file contains the board-specific initialization routines. */ static int mx31_3ds_pins[] = {Signature · 1 line
1.7.0
Signature · 4 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 |
PATCH 14/16 arm/mx3/mx31_3ds: fold board header in its only user
In reply to Uwe Kleine-KönigHi Uwe,
Quoted 49 lines · Uwe Kleine-K?nig
Moreover remove unused definitions.
Signed-off-by Uwe Kleine-K?nig <[email protected]>--- arch/arm/mach-mx3/mach-mx31_3ds.c | 41 +++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 6 deletions(-)arch/arm/mach-mx3/mach-mx31_3ds.c +28
-6@@ -41,12 +41,41 @@#include <mach/spi.h> #include "devices.h" -/*! -* @file mx31_3ds.c -* -* @brief This file contains the board-specific initialization routines. -* -* @ingroup System +/* Definitions for components on the Debug board */ + +/* Base address of CPLD controller on the Debug board */ +#define DEBUG_BASE_ADDRESS CS5_IO_ADDRESS(MX3x_CS5_BASE_ADDR) + +/* LAN9217 ethernet base address */ +#define LAN9217_BASE_ADDR MX3x_CS5_BASE_ADDR + +/* CPLD config and interrupt base address */ +#define CPLD_ADDR (DEBUG_BASE_ADDRESS + 0x20000) + +/* status, interrupt */ +#define CPLD_INT_STATUS_REG (CPLD_ADDR + 0x10) +#define CPLD_INT_MASK_REG (CPLD_ADDR + 0x38) +#define CPLD_INT_RESET_REG (CPLD_ADDR + 0x20) +/* magic word for debug CPLD */ +#define CPLD_MAGIC_NUMBER1_REG (CPLD_ADDR + 0x40) +#define CPLD_MAGIC_NUMBER2_REG (CPLD_ADDR + 0x48) +/* CPLD code version */ +#define CPLD_CODE_VER_REG (CPLD_ADDR + 0x50) +/* magic word for debug CPLD */ +#define CPLD_MAGIC_NUMBER3_REG (CPLD_ADDR + 0x58) + +/* CPLD IRQ line for external uart, external ethernet etc */ +#define EXPIO_PARENT_INT IOMUX_TO_IRQ(MX31_PIN_GPIO1_1) + +#define MXC_EXP_IO_BASE (MXC_BOARD_IRQ_START) +#define MXC_IRQ_TO_EXPIO (irq) ((irq) - MXC_EXP_IO_BASE)
arch/arm/mach-mx3/mach-mx31_3ds.c line 81
Quoted 10 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +7
-0+ +#define EXPIO_INT_ENET (MXC_EXP_IO_BASE + 0) + +#define MXC_MAX_EXP_IO_LINES 16 + +/* +* This file contains the board-specific initialization routines. */ static int mx31_3ds_pins[] = {
I agree on this patch but it seems you missed to remove the header file plat-mxc/include/mach/board-mx31_3ds.h
Best Regards,
Signature · 4 lines
Alberto!
Be Persistent!
- Greg Kroah-Hartman (FOSDEM 2010)PATCH v2 13/16 arm/mx3/mx31_3ds: fold board header in its only user
In reply to Uwe Kleine-KönigMoreover remove unused definitions.
---
Hello Sascha, hello Alberto,
thanks for your feedback. This patch additionally removes board-mx31_3ds.h.
Best regards
Uwe
arch/arm/mach-mx3/mach-mx31_3ds.c | 41 +++++++++++++-- arch/arm/plat-mxc/include/mach/board-mx31_3ds.h | 59 ----------------------- 2 files changed, 35 insertions(+), 65 deletions(-) delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx31_3ds.h
arch/arm/mach-mx3/mach-mx31_3ds.c +35 -6
@@ -41,12 +41,41 @@#include <mach/spi.h> #include "devices.h" -/*! -* @file mx31_3ds.c -* -* @brief This file contains the board-specific initialization routines. -* -* @ingroup System +/* Definitions for components on the Debug board */ + +/* Base address of CPLD controller on the Debug board */ +#define DEBUG_BASE_ADDRESS CS5_IO_ADDRESS(MX3x_CS5_BASE_ADDR) + +/* LAN9217 ethernet base address */ +#define LAN9217_BASE_ADDR MX3x_CS5_BASE_ADDR + +/* CPLD config and interrupt base address */ +#define CPLD_ADDR (DEBUG_BASE_ADDRESS + 0x20000) + +/* status, interrupt */ +#define CPLD_INT_STATUS_REG (CPLD_ADDR + 0x10) +#define CPLD_INT_MASK_REG (CPLD_ADDR + 0x38) +#define CPLD_INT_RESET_REG (CPLD_ADDR + 0x20) +/* magic word for debug CPLD */ +#define CPLD_MAGIC_NUMBER1_REG (CPLD_ADDR + 0x40) +#define CPLD_MAGIC_NUMBER2_REG (CPLD_ADDR + 0x48) +/* CPLD code version */ +#define CPLD_CODE_VER_REG (CPLD_ADDR + 0x50) +/* magic word for debug CPLD */ +#define CPLD_MAGIC_NUMBER3_REG (CPLD_ADDR + 0x58) + +/* CPLD IRQ line for external uart, external ethernet etc */ +#define EXPIO_PARENT_INT IOMUX_TO_IRQ(MX31_PIN_GPIO1_1) + +#define MXC_EXP_IO_BASE (MXC_BOARD_IRQ_START) +#define MXC_IRQ_TO_EXPIO (irq) ((irq) - MXC_EXP_IO_BASE) + +#define EXPIO_INT_ENET (MXC_EXP_IO_BASE + 0) + +#define MXC_MAX_EXP_IO_LINES 16 + +/* +* This file contains the board-specific initialization routines. */ static int mx31_3ds_pins[] = {
arch/arm/plat-mxc/include/mach/board-mx31_3ds.h deleted +0 -59
59 lines not on this page · raw message
Signature · 1 line
1.7.0
PATCH 15/16 arm/mx3/mx31ads: fold board header in its only user
In reply to Uwe Kleine-KönigMoreover remove unused definitions.
--- arch/arm/mach-mx3/mach-mx31ads.c | 42 +++++++- arch/arm/plat-mxc/include/mach/board-mx31ads.h | 117 ------------------------ 2 files changed, 36 insertions(+), 123 deletions(-) delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx31ads.h
arch/arm/mach-mx3/mach-mx31ads.c +36 -6
@@ -45,12 +45,42 @@#include "devices.h" -/*! -* @file mx31ads.c -* -* @brief This file contains the board-specific initialization routines. -* -* @ingroup System +/* Base address of PBC controller */ +#define PBC_BASE_ADDRESS MX31_CS4_BASE_ADDR_VIRT +/* Offsets for the PBC Controller register */ + +/* PBC Board interrupt status register */ +#define PBC_INTSTATUS 0x000016 + +/* PBC Board interrupt current status register */ +#define PBC_INTCURR_STATUS 0x000018 + +/* PBC Interrupt mask register set address */ +#define PBC_INTMASK_SET 0x00001A + +/* PBC Interrupt mask register clear address */ +#define PBC_INTMASK_CLEAR 0x00001C + +/* External UART A */ +#define PBC_SC16C652_UARTA 0x010000 + +/* External UART B */ +#define PBC_SC16C652_UARTB 0x010010 + +#define PBC_INTSTATUS_REG (PBC_INTSTATUS + PBC_BASE_ADDRESS) +#define PBC_INTMASK_SET_REG (PBC_INTMASK_SET + PBC_BASE_ADDRESS) +#define PBC_INTMASK_CLEAR_REG (PBC_INTMASK_CLEAR + PBC_BASE_ADDRESS) +#define EXPIO_PARENT_INT IOMUX_TO_IRQ(MX31_PIN_GPIO1_4) + +#define MXC_EXP_IO_BASE (MXC_BOARD_IRQ_START) +#define MXC_IRQ_TO_EXPIO (irq) ((irq) - MXC_EXP_IO_BASE) + +#define EXPIO_INT_XUART_INTA (MXC_EXP_IO_BASE + 10) +#define EXPIO_INT_XUART_INTB (MXC_EXP_IO_BASE + 11) + +#define MXC_MAX_EXP_IO_LINES 16 +/* +* This file contains the board-specific initialization routines. */ #if defined(CONFIG_SERIAL_8250 ) || defined(CONFIG_SERIAL_8250_MODULE )
arch/arm/plat-mxc/include/mach/board-mx31ads.h deleted +0 -117
117 lines not on this page · raw message
Signature · 1 line
1.7.0
PATCH 16/16 arm/mxc: grammar fix
In reply to Uwe Kleine-König--- .../plat-mxc/include/mach/board-eukrea_cpuimx27.h | 2 +- arch/arm/plat-mxc/include/mach/board-mx31lilly.h | 2 +- arch/arm/plat-mxc/include/mach/board-mx31lite.h | 2 +- arch/arm/plat-mxc/include/mach/board-mx31moboard.h | 2 +- arch/arm/plat-mxc/include/mach/board-pcm038.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/plat-mxc/include/mach/board-eukrea_cpuimx27.h +1 -1
@@ -25,7 +25,7 @@#ifndef __ASSEMBLY__/* * This CPU module needs a baseboard to work. After basic initializing -* its own devices, it calls baseboard's init function. +* its own devices, it calls the baseboard's init function. * TODO: Add your own baseboard init function and call it from * inside eukrea_cpuimx27_init(). *
arch/arm/plat-mxc/include/mach/board-mx31lilly.h +1 -1
@@ -31,7 +31,7 @@ enum mx31lilly_boards {/* * This CPU module needs a baseboard to work. After basic initializing -* its own devices, it calls baseboard's init function. +* its own devices, it calls the baseboard's init function. */ extern void mx31lilly_db_init (void );
arch/arm/plat-mxc/include/mach/board-mx31lite.h +1 -1
@@ -32,7 +32,7 @@ enum mx31lite_boards {/* * This CPU module needs a baseboard to work. After basic initializing -* its own devices, it calls baseboard's init function. +* its own devices, it calls the baseboard's init function. */ extern void mx31lite_db_init (void );
arch/arm/plat-mxc/include/mach/board-mx31moboard.h +1 -1
@@ -30,7 +30,7 @@ enum mx31moboard_boards {/* * This CPU module needs a baseboard to work. After basic initializing -* its own devices, it calls baseboard's init function. +* its own devices, it calls the baseboard's init function. */ extern void mx31moboard_devboard_init (void );
arch/arm/plat-mxc/include/mach/board-pcm038.h +1 -1
@@ -22,7 +22,7 @@#ifndef __ASSEMBLY__/* * This CPU module needs a baseboard to work. After basic initializing -* its own devices, it calls baseboard's init function. +* its own devices, it calls the baseboard's init function. * TODO: Add your own baseboard init function and call it from * inside pcm038_init(). *
Signature · 1 line
1.7.0