RE: [PATCH-V3 2/4] arm:omap:am33xx: Update common OMAP machine specific sources

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> -----Original Message-----
> From: Hiremath, Vaibhav
> Sent: Tuesday, September 20, 2011 8:02 PM
> To: linux-omap@xxxxxxxxxxxxxxx
> Cc: Hilman, Kevin; paul@xxxxxxxxx; tony@xxxxxxxxxxx; linux-arm-
> kernel@xxxxxxxxxxxxxxxxxxx; Mohammed, Afzal; Hiremath, Vaibhav
> Subject: [PATCH-V3 2/4] arm:omap:am33xx: Update common OMAP machine
> specific sources
> 
> From: Afzal Mohammed <afzal@xxxxxx>
> 
> This patch updates the common machine specific source files for
> support for AM33XX/AM335x with cpu type, macros for identification of
> AM33XX/AM335X device.
> 
> Signed-off-by: Afzal Mohammed <afzal@xxxxxx>
> Signed-off-by: Vaibhav Hiremath <hvaibhav@xxxxxx>
> ---
>  arch/arm/mach-omap2/clock3xxx_data.c       |    6 +++++-
>  arch/arm/mach-omap2/common.c               |   16 ++++++++++++++++
>  arch/arm/mach-omap2/id.c                   |   10 ++++++++--
>  arch/arm/mach-omap2/io.c                   |   25
> +++++++++++++++++++++++++
>  arch/arm/mach-omap2/serial.c               |    6 +++---
>  arch/arm/plat-omap/include/plat/am33xx.h   |   25
> +++++++++++++++++++++++++
>  arch/arm/plat-omap/include/plat/common.h   |    1 +
>  arch/arm/plat-omap/include/plat/hardware.h |    1 +
>  arch/arm/plat-omap/include/plat/io.h       |   20 ++++++++++++++++++++
>  arch/arm/plat-omap/include/plat/omap34xx.h |    2 ++
>  arch/arm/plat-omap/io.c                    |    5 +++++
>  11 files changed, 111 insertions(+), 6 deletions(-)
>  create mode 100644 arch/arm/plat-omap/include/plat/am33xx.h
> 
> diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-
> omap2/clock3xxx_data.c
> index dadb8c6..2ee472c 100644
> --- a/arch/arm/mach-omap2/clock3xxx_data.c
> +++ b/arch/arm/mach-omap2/clock3xxx_data.c
> @@ -3493,6 +3493,9 @@ int __init omap3xxx_clk_init(void)
>  	} else if (cpu_is_ti816x()) {
>  		cpu_mask = RATE_IN_TI816X;
>  		cpu_clkflg = CK_TI816X;
> +	} else if (cpu_is_am33xx()) {
> +		cpu_mask = RATE_IN_AM33XX;
> +		cpu_clkflg = CK_AM33XX;
>  	} else if (cpu_is_omap34xx()) {
>  		if (omap_rev() == OMAP3430_REV_ES1_0) {
>  			cpu_mask = RATE_IN_3430ES1;
> @@ -3576,7 +3579,8 @@ int __init omap3xxx_clk_init(void)
>  	 * Lock DPLL5 -- here only until other device init code can
>  	 * handle this
>  	 */
> -	if (!cpu_is_ti816x() && (omap_rev() >= OMAP3430_REV_ES2_0))
> +	if (!cpu_is_ti816x() && !cpu_is_am33xx() &&
> +			(omap_rev() >= OMAP3430_REV_ES2_0))
>  		omap3_clk_lock_dpll5();
> 
>  	/* Avoid sleeping during omap3_core_dpll_m2_set_rate() */
> diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
> index 3f20cbb..395a9b6 100644
> --- a/arch/arm/mach-omap2/common.c
> +++ b/arch/arm/mach-omap2/common.c
> @@ -119,6 +119,22 @@ void __init omap2_set_globals_ti816x(void)
>  {
>  	__omap2_set_globals(&ti816x_globals);
>  }
> +
> +#define AM33XX_TAP_BASE		(AM33XX_CTRL_BASE + \
> +				TI816X_CONTROL_DEVICE_ID - 0x204)
> +
> +static struct omap_globals am33xx_globals = {
> +	.class  = OMAP343X_CLASS,
> +	.tap    = OMAP2_L4_IO_ADDRESS(AM33XX_TAP_BASE),
> +	.ctrl   = AM33XX_CTRL_BASE,
> +	.prm    = AM33XX_PRCM_BASE,
> +	.cm     = AM33XX_PRCM_BASE,
> +};
> +
> +void __init omap2_set_globals_am33xx(void)
> +{
> +	__omap2_set_globals(&am33xx_globals);
> +}
>  #endif
> 
>  #if defined(CONFIG_ARCH_OMAP4)
> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
> index d27daf9..540b6f1 100644
> --- a/arch/arm/mach-omap2/id.c
> +++ b/arch/arm/mach-omap2/id.c
> @@ -337,6 +337,10 @@ static void __init omap3_check_revision(const char
> **cpu_rev)
>  			break;
>  		}
>  		break;
> +	case 0xb944:
> +		omap_revision = AM335X_REV_ES1_0;
> +		*cpu_rev = "1.0";
> +		break;
>  	default:
>  		/* Unknown default to latest silicon rev as default */
>  		omap_revision = OMAP3630_REV_ES1_2;
> @@ -429,6 +433,8 @@ static void __init omap3_cpuinfo(const char *cpu_rev)
>  		cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505";
>  	} else if (cpu_is_ti816x()) {
>  		cpu_name = "TI816X";
> +	} else if (cpu_is_am335x()) {
> +		cpu_name =  "AM335X";
>  	} else if (omap3_has_iva() && omap3_has_sgx()) {
>  		/* OMAP3430, OMAP3525, OMAP3515, OMAP3503 devices */
>  		cpu_name = "OMAP3430/3530";
> @@ -469,8 +475,8 @@ void __init omap2_check_revision(void)
>  	} else if (cpu_is_omap34xx()) {
>  		omap3_check_revision(&cpu_rev);
> 
> -		/* TI816X doesn't have feature register */
> -		if (!cpu_is_ti816x())
> +		/* TI816X/AM335X doesn't have feature register */
> +		if (!cpu_is_ti816x() && !cpu_is_am33xx())
>  			omap3_check_features();
>  		else
>  			ti816x_check_features();
> diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
> index 40b6d47..ccd50de 100644
> --- a/arch/arm/mach-omap2/io.c
> +++ b/arch/arm/mach-omap2/io.c
> @@ -182,7 +182,24 @@ static struct map_desc omapti816x_io_desc[]
> __initdata = {
>  		.pfn		= __phys_to_pfn(L4_34XX_PHYS),
>  		.length		= L4_34XX_SIZE,
>  		.type		= MT_DEVICE
> +	}
> +};
> +#endif
> +
> +#ifdef CONFIG_SOC_OMAPAM33XX
> +static struct map_desc omapam33xx_io_desc[] __initdata = {
> +	{
> +		.virtual	= L4_34XX_VIRT,
> +		.pfn		= __phys_to_pfn(L4_34XX_PHYS),
> +		.length		= L4_34XX_SIZE,
> +		.type		= MT_DEVICE
>  	},
> +	{
> +		.virtual	= L4_WK_AM33XX_VIRT,
> +		.pfn		= __phys_to_pfn(L4_WK_AM33XX_PHYS),
> +		.length		= L4_WK_AM33XX_SIZE,
> +		.type		= MT_DEVICE
> +	}
>  };
>  #endif
> 
> @@ -286,6 +303,14 @@ void __init omapti816x_map_common_io(void)
>  }
>  #endif
> 
> +#ifdef CONFIG_SOC_OMAPAM33XX
> +void __init omapam33xx_map_common_io(void)
> +{
> +	iotable_init(omapam33xx_io_desc, ARRAY_SIZE(omapam33xx_io_desc));
> +	_omap2_map_common_io();
> +}
> +#endif
> +
>  #ifdef CONFIG_ARCH_OMAP4
>  void __init omap44xx_map_common_io(void)
>  {
> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
> index 466fc72..b7782ee 100644
> --- a/arch/arm/mach-omap2/serial.c
> +++ b/arch/arm/mach-omap2/serial.c
> @@ -486,7 +486,7 @@ static void omap_uart_idle_init(struct omap_uart_state
> *uart)
>  		mod_timer(&uart->timer, jiffies + uart->timeout);
>  	omap_uart_smart_idle_enable(uart, 0);
> 
> -	if (cpu_is_omap34xx() && !cpu_is_ti816x()) {
> +	if (cpu_is_omap34xx() && !(cpu_is_ti816x() || cpu_is_am33xx())) {
>  		u32 mod = (uart->num > 1) ? OMAP3430_PER_MOD : CORE_MOD;
>  		u32 wk_mask = 0;
>  		u32 padconf = 0;
> @@ -768,7 +768,7 @@ void __init omap_serial_init_port(struct
> omap_board_data *bdata)
>  	 */
>  	uart->regshift = p->regshift;
>  	uart->membase = p->membase;
> -	if (cpu_is_omap44xx() || cpu_is_ti816x())
> +	if (cpu_is_omap44xx() || cpu_is_ti816x() || cpu_is_am33xx())
>  		uart->errata |= UART_ERRATA_FIFO_FULL_ABORT;
>  	else if ((serial_read_reg(uart, UART_OMAP_MVER) & 0xFF)
>  			>= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV)
> @@ -851,7 +851,7 @@ void __init omap_serial_init_port(struct
> omap_board_data *bdata)
>  	}

Can I get rid of this if condition as well here with below change - 

-        * omap44xx, ti816x: Never read empty UART fifo
+        * all >omap3 family of devices: Never read empty UART fifo
         * omap3xxx: Never read empty UART fifo on UARTs
         * with IP rev >=0x52
         */
        uart->regshift = p->regshift;
        uart->membase = p->membase;
-       if (cpu_is_omap44xx() || cpu_is_ti816x() || cpu_is_am33xx())
-               uart->errata |= UART_ERRATA_FIFO_FULL_ABORT;
-       else if ((serial_read_reg(uart, UART_OMAP_MVER) & 0xFF)
-                       >= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV)
+
+       if ((serial_read_reg(uart, UART_OMAP_MVER) & 0xFF)
+                       < UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV)
+               uart->errata &= ~UART_ERRATA_FIFO_FULL_ABORT;
+       else
                uart->errata |= UART_ERRATA_FIFO_FULL_ABORT;

        if (uart->errata & UART_ERRATA_FIFO_FULL_ABORT) {


Thanks,
Vaibhav

> 
>  	/* Enable the MDR1 errata for OMAP3 */
> -	if (cpu_is_omap34xx() && !cpu_is_ti816x())
> +	if (cpu_is_omap34xx() && !(cpu_is_ti816x() || cpu_is_am33xx()))
>  		uart->errata |= UART_ERRATA_i202_MDR1_ACCESS;
>  }
> 
> diff --git a/arch/arm/plat-omap/include/plat/am33xx.h b/arch/arm/plat-
> omap/include/plat/am33xx.h
> new file mode 100644
> index 0000000..06c19bb
> --- /dev/null
> +++ b/arch/arm/plat-omap/include/plat/am33xx.h
> @@ -0,0 +1,25 @@
> +/*
> + * This file contains the address info for various AM33XX modules.
> + *
> + * Copyright (C) 2011 Texas Instruments, Inc. - http://www.ti.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 version 2.
> + *
> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any
> + * kind, whether express or implied; without even the implied warranty
> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +#ifndef __ASM_ARCH_AM33XX_H
> +#define __ASM_ARCH_AM33XX_H
> +
> +#define L4_SLOW_AM33XX_BASE	0x48000000
> +
> +#define AM33XX_SCM_BASE		0x44E10000
> +#define AM33XX_CTRL_BASE	AM33XX_SCM_BASE
> +#define AM33XX_PRCM_BASE	0x44E00000
> +
> +#endif /* __ASM_ARCH_AM33XX_H */
> diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-
> omap/include/plat/common.h
> index 4564cc6..6827e34 100644
> --- a/arch/arm/plat-omap/include/plat/common.h
> +++ b/arch/arm/plat-omap/include/plat/common.h
> @@ -67,6 +67,7 @@ void omap2_set_globals_243x(void);
>  void omap2_set_globals_3xxx(void);
>  void omap2_set_globals_443x(void);
>  void omap2_set_globals_ti816x(void);
> +void omap2_set_globals_am33xx(void);
> 
>  /* These get called from omap2_set_globals_xxxx(), do not call these */
>  void omap2_set_globals_tap(struct omap_globals *);
> diff --git a/arch/arm/plat-omap/include/plat/hardware.h b/arch/arm/plat-
> omap/include/plat/hardware.h
> index e87efe1..e6521e1 100644
> --- a/arch/arm/plat-omap/include/plat/hardware.h
> +++ b/arch/arm/plat-omap/include/plat/hardware.h
> @@ -287,5 +287,6 @@
>  #include <plat/omap34xx.h>
>  #include <plat/omap44xx.h>
>  #include <plat/ti816x.h>
> +#include <plat/am33xx.h>
> 
>  #endif	/* __ASM_ARCH_OMAP_HARDWARE_H */
> diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-
> omap/include/plat/io.h
> index d72ec85..0c54a00 100644
> --- a/arch/arm/plat-omap/include/plat/io.h
> +++ b/arch/arm/plat-omap/include/plat/io.h
> @@ -73,6 +73,9 @@
>  #define OMAP4_L3_IO_OFFSET	0xb4000000
>  #define OMAP4_L3_IO_ADDRESS(pa)	IOMEM((pa) + OMAP4_L3_IO_OFFSET) /* L3
> */
> 
> +#define AM33XX_L4_WK_IO_OFFSET	0xb5000000
> +#define AM33XX_L4_WK_IO_ADDRESS(pa)	IOMEM((pa) +
> AM33XX_L4_WK_IO_OFFSET)
> +
>  #define OMAP4_L3_PER_IO_OFFSET	0xb1100000
>  #define OMAP4_L3_PER_IO_ADDRESS(pa)	IOMEM((pa) +
> OMAP4_L3_PER_IO_OFFSET)
> 
> @@ -154,6 +157,15 @@
>  #define L4_34XX_SIZE		SZ_4M   /* 1MB of 128MB used, want 1MB sect
> */
> 
>  /*
> + * ----------------------------------------------------------------------
> ------
> + * AM33XX specific IO mapping
> + * ----------------------------------------------------------------------
> ------
> + */
> +#define L4_WK_AM33XX_PHYS		L4_WK_AM33XX_BASE
> +#define L4_WK_AM33XX_VIRT		(L4_WK_AM33XX_PHYS +
> AM33XX_L4_WK_IO_OFFSET)
> +#define L4_WK_AM33XX_SIZE		SZ_4M   /* 1MB of 128MB used, want 1MB
> sect */
> +
> +/*
>   * Need to look at the Size 4M for L4.
>   * VPOM3430 was not working for Int controller
>   */
> @@ -291,6 +303,14 @@ static inline void omapti816x_map_common_io(void)
>  }
>  #endif
> 
> +#ifdef CONFIG_SOC_OMAPAM33XX
> +extern void omapam33xx_map_common_io(void);
> +#else
> +static inline void omapam33xx_map_common_io(void)
> +{
> +}
> +#endif
> +
>  #ifdef CONFIG_ARCH_OMAP4
>  extern void omap44xx_map_common_io(void);
>  #else
> diff --git a/arch/arm/plat-omap/include/plat/omap34xx.h b/arch/arm/plat-
> omap/include/plat/omap34xx.h
> index b9e8588..0d818ac 100644
> --- a/arch/arm/plat-omap/include/plat/omap34xx.h
> +++ b/arch/arm/plat-omap/include/plat/omap34xx.h
> @@ -35,6 +35,8 @@
>  #define L4_EMU_34XX_BASE	0x54000000
>  #define L3_34XX_BASE		0x68000000
> 
> +#define L4_WK_AM33XX_BASE	0x44C00000
> +
>  #define OMAP3430_32KSYNCT_BASE	0x48320000
>  #define OMAP3430_CM_BASE	0x48004800
>  #define OMAP3430_PRM_BASE	0x48306800
> diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c
> index f1ecfa9..25a32b2 100644
> --- a/arch/arm/plat-omap/io.c
> +++ b/arch/arm/plat-omap/io.c
> @@ -88,6 +88,11 @@ void __iomem *omap_ioremap(unsigned long p, size_t size,
> unsigned int type)
>  	if (cpu_is_ti816x()) {
>  		if (BETWEEN(p, L4_34XX_PHYS, L4_34XX_SIZE))
>  			return XLATE(p, L4_34XX_PHYS, L4_34XX_VIRT);
> +	} else if (cpu_is_am33xx()) {
> +		if (BETWEEN(p, L4_34XX_PHYS, L4_34XX_SIZE))
> +			return XLATE(p, L4_34XX_PHYS, L4_34XX_VIRT);
> +		if (BETWEEN(p, L4_WK_AM33XX_PHYS, L4_WK_AM33XX_SIZE))
> +			return XLATE(p, L4_WK_AM33XX_PHYS, L4_WK_AM33XX_VIRT);
>  	} else if (cpu_is_omap34xx()) {
>  		if (BETWEEN(p, L3_34XX_PHYS, L3_34XX_SIZE))
>  			return XLATE(p, L3_34XX_PHYS, L3_34XX_VIRT);
> --
> 1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux