* [PATCH v3] davinci: Initial support for MityDSP-L138/MityARM-1808
@ 2010-09-02 17:58 Michael Williamson
2010-09-02 18:05 ` Sergei Shtylyov
2010-09-02 18:10 ` Kevin Hilman
0 siblings, 2 replies; 4+ messages in thread
From: Michael Williamson @ 2010-09-02 17:58 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds initial support for the MityDSP-L138 and MityDSP-1808 system
on Module (SOM) under the machine name "mityomapl138". These SOMs are based
on the da850 davinci CPU architecture. Information on these SOMs may be
found at http://www.mitydsp.com.
Basic support for the console UART, NAND, and EMAC (MII interface) is
included in this patch.
Signed-off-by: Michael Williamson <michael.williamson@criticallink.com>
---
Changes since v2:
1) Remove defaulting this board from Kconfig.
2) Add MITYOMAPL138 board to da8xx_omapl_defconfig.
3) Fix tabs alignment per comment.
The new defconfig file was generated by:
make da8xx_omapl_defconfig
make menuconfig
select MITYOMAPL138 option
make savedefconfig
cp defconfig arch/arm/configs/da8xx_omapl_defconfig
I think the other 3 lines were a result of updated KConfig options
in the current baseline.
arch/arm/configs/da8xx_omapl_defconfig | 4 +-
arch/arm/mach-davinci/Kconfig | 8 +
arch/arm/mach-davinci/Makefile | 1 +
arch/arm/mach-davinci/board-mityomapl138.c | 220 +++++++++++++++++++++++
arch/arm/mach-davinci/include/mach/uncompress.h | 1 +
5 files changed, 232 insertions(+), 2 deletions(-)
diff --git a/arch/arm/configs/da8xx_omapl_defconfig b/arch/arm/configs/da8xx_omapl_defconfig
index 3952a4e..38e58e8 100644
--- a/arch/arm/configs/da8xx_omapl_defconfig
+++ b/arch/arm/configs/da8xx_omapl_defconfig
@@ -17,6 +17,7 @@ CONFIG_MODVERSIONS=y
CONFIG_ARCH_DAVINCI=y
CONFIG_ARCH_DAVINCI_DA830=y
CONFIG_ARCH_DAVINCI_DA850=y
+CONFIG_MACH_MITYOMAPL138=y
CONFIG_DAVINCI_RESET_CLOCKS=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
@@ -73,6 +74,7 @@ CONFIG_SERIO_LIBPS2=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=3
+CONFIG_SERIAL_8250_RUNTIME_UARTS=3
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_DAVINCI=y
@@ -83,7 +85,6 @@ CONFIG_REGULATOR_DUMMY=y
CONFIG_REGULATOR_TPS6507X=y
CONFIG_FB=y
CONFIG_FB_DA8XX=y
-# CONFIG_VGA_CONSOLE is not set
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_LOGO=y
CONFIG_SOUND=m
@@ -95,7 +96,6 @@ CONFIG_SND_DAVINCI_SOC=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_XFS_FS=m
-CONFIG_INOTIFY=y
CONFIG_AUTOFS4_FS=m
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 2bf03e9..9aca60c 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -185,6 +185,14 @@ config MACH_TNETV107X
help
Say Y here to select the TI TNETV107X Evaluation Module.
+config MACH_MITYOMAPL138
+ bool "Critical Link MityDSP-L138/MityARM-1808 SoM"
+ depends on ARCH_DAVINCI_DA850
+ help
+ Say Y here to select the Critical Link MityDSP-L138/MityARM-1808
+ System on Module. Information on this SoM may be found at
+ http://www.mitydsp.com
+
config DAVINCI_MUX
bool "DAVINCI multiplexing support"
depends on ARCH_DAVINCI
diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile
index eab4c0f..3e966e8 100644
--- a/arch/arm/mach-davinci/Makefile
+++ b/arch/arm/mach-davinci/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_MACH_DAVINCI_DM365_EVM) += board-dm365-evm.o
obj-$(CONFIG_MACH_DAVINCI_DA830_EVM) += board-da830-evm.o
obj-$(CONFIG_MACH_DAVINCI_DA850_EVM) += board-da850-evm.o
obj-$(CONFIG_MACH_TNETV107X) += board-tnetv107x-evm.o
+obj-$(CONFIG_MACH_MITYOMAPL138) += board-mityomapl138.o
# Power Management
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
new file mode 100644
index 0000000..78c972b
--- /dev/null
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -0,0 +1,220 @@
+/*
+ * Critical Link MityOMAP-L138 SoM
+ *
+ * Copyright (C) 2010 Critical Link LLC - http://www.criticallink.com
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of
+ * any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/console.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/common.h>
+#include <mach/cp_intc.h>
+#include <mach/da8xx.h>
+#include <mach/nand.h>
+#include <mach/mux.h>
+
+#define MITYOMAPL138_PHY_MASK 0x08 /* hardcoded for now */
+#define MITYOMAPL138_MDIO_FREQUENCY (2200000) /* PHY bus frequency */
+
+/*
+ * MityDSP-L138 includes a 256 MByte large-page NAND flash
+ * (128K blocks).
+ */
+struct mtd_partition mityomapl138_nandflash_partition[] = {
+ {
+ .name = "rootfs",
+ .offset = 0,
+ .size = SZ_128M,
+ .mask_flags = 0, /* MTD_WRITEABLE, */
+ },
+ {
+ .name = "homefs",
+ .offset = MTDPART_OFS_APPEND,
+ .size = MTDPART_SIZ_FULL,
+ .mask_flags = 0,
+ },
+};
+
+static struct davinci_nand_pdata mityomapl138_nandflash_data = {
+ .parts = mityomapl138_nandflash_partition,
+ .nr_parts = ARRAY_SIZE(mityomapl138_nandflash_partition),
+ .ecc_mode = NAND_ECC_HW,
+ .options = NAND_USE_FLASH_BBT | NAND_BUSWIDTH_16,
+ .ecc_bits = 1, /* 4 bit mode is not supported with 16 bit NAND */
+};
+
+static struct resource mityomapl138_nandflash_resource[] = {
+ {
+ .start = DA8XX_AEMIF_CS3_BASE,
+ .end = DA8XX_AEMIF_CS3_BASE + SZ_512K + 2 * SZ_1K - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = DA8XX_AEMIF_CTL_BASE,
+ .end = DA8XX_AEMIF_CTL_BASE + SZ_32K - 1,
+ .flags = IORESOURCE_MEM,
+ },
+};
+
+static struct platform_device mityomapl138_nandflash_device = {
+ .name = "davinci_nand",
+ .id = 0,
+ .dev = {
+ .platform_data = &mityomapl138_nandflash_data,
+ },
+ .num_resources = ARRAY_SIZE(mityomapl138_nandflash_resource),
+ .resource = mityomapl138_nandflash_resource,
+};
+
+static struct platform_device *mityomapl138_devices[] __initdata = {
+ &mityomapl138_nandflash_device,
+};
+
+static void __init mityomapl138_setup_nand(void)
+{
+ platform_add_devices(mityomapl138_devices,
+ ARRAY_SIZE(mityomapl138_devices));
+}
+
+static struct davinci_uart_config mityomapl138_uart_config __initdata = {
+ .enabled_uarts = 0x7,
+};
+
+static const short mityomap_mii_pins[] = {
+ DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3,
+ DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER,
+ DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3,
+ DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, DA850_MDIO_CLK,
+ DA850_MDIO_D,
+ -1
+};
+
+static const short mityomap_rmii_pins[] = {
+ DA850_RMII_TXD_0, DA850_RMII_TXD_1, DA850_RMII_TXEN,
+ DA850_RMII_CRS_DV, DA850_RMII_RXD_0, DA850_RMII_RXD_1,
+ DA850_RMII_RXER, DA850_RMII_MHZ_50_CLK, DA850_MDIO_CLK,
+ DA850_MDIO_D,
+ -1
+};
+
+static void __init mityomapl138_config_emac(void)
+{
+ void __iomem *cfg_chip3_base;
+ int ret;
+ u32 val;
+ struct davinci_soc_info *soc_info = &davinci_soc_info;
+ soc_info->emac_pdata->rmii_en = 0; /* hardcoded for now */
+
+ cfg_chip3_base = DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG);
+ val = __raw_readl(cfg_chip3_base);
+
+ if (soc_info->emac_pdata->rmii_en) {
+ val |= BIT(8);
+ ret = davinci_cfg_reg_list(mityomap_rmii_pins);
+ pr_info("RMII PHY configured\n");
+ } else {
+ val &= ~BIT(8);
+ ret = davinci_cfg_reg_list(mityomap_mii_pins);
+ pr_info("MII PHY configured\n");
+ }
+
+ if (ret) {
+ pr_warning("mii/rmii mux setup failed: %d\n", ret);
+ return;
+ }
+
+ /* configure the CFGCHIP3 register for RMII or MII */
+ __raw_writel(val, cfg_chip3_base);
+
+ soc_info->emac_pdata->phy_mask = MITYOMAPL138_PHY_MASK;
+ pr_debug("setting phy_mask to %x\n", soc_info->emac_pdata->phy_mask);
+ soc_info->emac_pdata->mdio_max_freq = MITYOMAPL138_MDIO_FREQUENCY;
+
+ ret = da8xx_register_emac();
+ if (ret)
+ pr_warning("emac registration failed: %d\n", ret);
+}
+
+static struct davinci_pm_config da850_pm_pdata = {
+ .sleepcount = 128,
+};
+
+static struct platform_device da850_pm_device = {
+ .name = "pm-davinci",
+ .dev = {
+ .platform_data = &da850_pm_pdata,
+ },
+ .id = -1,
+};
+
+static void __init mityomapl138_init(void)
+{
+ int ret;
+
+ /* for now, no special EDMA channels are reserved */
+ ret = da850_register_edma(NULL);
+ if (ret)
+ pr_warning("edma registration failed: %d\n", ret);
+
+ ret = da8xx_register_watchdog();
+ if (ret)
+ pr_warning("watchdog registration failed: %d\n", ret);
+
+ davinci_serial_init(&mityomapl138_uart_config);
+
+ mityomapl138_setup_nand();
+
+ mityomapl138_config_emac();
+
+ ret = da8xx_register_rtc();
+ if (ret)
+ pr_warning("rtc setup failed: %d\n", ret);
+
+ ret = da850_register_cpufreq("pll0_sysclk3");
+ if (ret)
+ pr_warning("cpufreq registration failed: %d\n", ret);
+
+ ret = da8xx_register_cpuidle();
+ if (ret)
+ pr_warning("cpuidle registration failed: %d\n", ret);
+
+ ret = da850_register_pm(&da850_pm_device);
+ if (ret)
+ pr_warning("da850_evm_init: suspend registration failed: %d\n",
+ ret);
+}
+
+#ifdef CONFIG_SERIAL_8250_CONSOLE
+static int __init mityomapl138_console_init(void)
+{
+ if (!machine_is_mityomapl138())
+ return 0;
+
+ return add_preferred_console("ttyS", 1, "115200");
+}
+console_initcall(mityomapl138_console_init);
+#endif
+
+static void __init mityomapl138_map_io(void)
+{
+ da850_init();
+}
+
+MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808")
+ .phys_io = IO_PHYS,
+ .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
+ .boot_params = (DA8XX_DDR_BASE + 0x100),
+ .map_io = mityomapl138_map_io,
+ .init_irq = cp_intc_init,
+ .timer = &davinci_timer,
+ .init_machine = mityomapl138_init,
+MACHINE_END
diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h
index 15a6192..d370391 100644
--- a/arch/arm/mach-davinci/include/mach/uncompress.h
+++ b/arch/arm/mach-davinci/include/mach/uncompress.h
@@ -88,6 +88,7 @@ static inline void __arch_decomp_setup(unsigned long arch_id)
/* DA8xx boards */
DEBUG_LL_DA8XX(davinci_da830_evm, 2);
DEBUG_LL_DA8XX(davinci_da850_evm, 2);
+ DEBUG_LL_DA8XX(mityomapl138, 1);
/* TNETV107x boards */
DEBUG_LL_TNETV107X(tnetv107x, 1);
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v3] davinci: Initial support for MityDSP-L138/MityARM-1808
2010-09-02 17:58 [PATCH v3] davinci: Initial support for MityDSP-L138/MityARM-1808 Michael Williamson
@ 2010-09-02 18:05 ` Sergei Shtylyov
2010-09-02 18:17 ` Kevin Hilman
2010-09-02 18:10 ` Kevin Hilman
1 sibling, 1 reply; 4+ messages in thread
From: Sergei Shtylyov @ 2010-09-02 18:05 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
Michael Williamson wrote:
> This patch adds initial support for the MityDSP-L138 and MityDSP-1808 system
> on Module (SOM) under the machine name "mityomapl138". These SOMs are based
> on the da850 davinci CPU architecture. Information on these SOMs may be
> found at http://www.mitydsp.com.
> Basic support for the console UART, NAND, and EMAC (MII interface) is
> included in this patch.
> Signed-off-by: Michael Williamson <michael.williamson@criticallink.com>
[...]
> diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
> new file mode 100644
> index 0000000..78c972b
> --- /dev/null
> +++ b/arch/arm/mach-davinci/board-mityomapl138.c
> @@ -0,0 +1,220 @@
[...]
> +static const short mityomap_mii_pins[] = {
> + DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3,
> + DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER,
> + DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3,
> + DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, DA850_MDIO_CLK,
> + DA850_MDIO_D,
> + -1
> +};
> +
> +static const short mityomap_rmii_pins[] = {
> + DA850_RMII_TXD_0, DA850_RMII_TXD_1, DA850_RMII_TXEN,
> + DA850_RMII_CRS_DV, DA850_RMII_RXD_0, DA850_RMII_RXD_1,
> + DA850_RMII_RXER, DA850_RMII_MHZ_50_CLK, DA850_MDIO_CLK,
> + DA850_MDIO_D,
> + -1
> +};
> +
> +static void __init mityomapl138_config_emac(void)
> +{
> + void __iomem *cfg_chip3_base;
> + int ret;
> + u32 val;
> + struct davinci_soc_info *soc_info = &davinci_soc_info;
Should be an empty line here...
> + soc_info->emac_pdata->rmii_en = 0; /* hardcoded for now */
> +
> + cfg_chip3_base = DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG);
> + val = __raw_readl(cfg_chip3_base);
> +
> + if (soc_info->emac_pdata->rmii_en) {
If it's hard coded to 0, why handle the other case?
> + val |= BIT(8);
> + ret = davinci_cfg_reg_list(mityomap_rmii_pins);
> + pr_info("RMII PHY configured\n");
> + } else {
> + val &= ~BIT(8);
> + ret = davinci_cfg_reg_list(mityomap_mii_pins);
> + pr_info("MII PHY configured\n");
> + }
WBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v3] davinci: Initial support for MityDSP-L138/MityARM-1808
2010-09-02 18:05 ` Sergei Shtylyov
@ 2010-09-02 18:17 ` Kevin Hilman
0 siblings, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2010-09-02 18:17 UTC (permalink / raw)
To: linux-arm-kernel
Sergei Shtylyov <sshtylyov@mvista.com> writes:
> Hello.
>
> Michael Williamson wrote:
>
>> This patch adds initial support for the MityDSP-L138 and MityDSP-1808 system
>> on Module (SOM) under the machine name "mityomapl138". These SOMs are based
>> on the da850 davinci CPU architecture. Information on these SOMs may be
>> found at http://www.mitydsp.com.
>
>> Basic support for the console UART, NAND, and EMAC (MII interface) is
>> included in this patch.
>
>> Signed-off-by: Michael Williamson <michael.williamson@criticallink.com>
>
> [...]
>
>> diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
>> new file mode 100644
>> index 0000000..78c972b
>> --- /dev/null
>> +++ b/arch/arm/mach-davinci/board-mityomapl138.c
>> @@ -0,0 +1,220 @@
> [...]
>> +static const short mityomap_mii_pins[] = {
>> + DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3,
>> + DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER,
>> + DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3,
>> + DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, DA850_MDIO_CLK,
>> + DA850_MDIO_D,
>> + -1
>> +};
>> +
>> +static const short mityomap_rmii_pins[] = {
>> + DA850_RMII_TXD_0, DA850_RMII_TXD_1, DA850_RMII_TXEN,
>> + DA850_RMII_CRS_DV, DA850_RMII_RXD_0, DA850_RMII_RXD_1,
>> + DA850_RMII_RXER, DA850_RMII_MHZ_50_CLK, DA850_MDIO_CLK,
>> + DA850_MDIO_D,
>> + -1
>> +};
>> +
>> +static void __init mityomapl138_config_emac(void)
>> +{
>> + void __iomem *cfg_chip3_base;
>> + int ret;
>> + u32 val;
>> + struct davinci_soc_info *soc_info = &davinci_soc_info;
>
> Should be an empty line here...
I'll add this before pushing.
>> + soc_info->emac_pdata->rmii_en = 0; /* hardcoded for now */
>> +
>> + cfg_chip3_base = DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG);
>> + val = __raw_readl(cfg_chip3_base);
>> +
>> + if (soc_info->emac_pdata->rmii_en) {
>
> If it's hard coded to 0, why handle the other case?
He's planning to add support for the other options in subsequent
patches, so I'm OK with leaving this as is.
>> + val |= BIT(8);
>> + ret = davinci_cfg_reg_list(mityomap_rmii_pins);
>> + pr_info("RMII PHY configured\n");
>> + } else {
>> + val &= ~BIT(8);
>> + ret = davinci_cfg_reg_list(mityomap_mii_pins);
>> + pr_info("MII PHY configured\n");
>> + }
>
> WBR, Sergei
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3] davinci: Initial support for MityDSP-L138/MityARM-1808
2010-09-02 17:58 [PATCH v3] davinci: Initial support for MityDSP-L138/MityARM-1808 Michael Williamson
2010-09-02 18:05 ` Sergei Shtylyov
@ 2010-09-02 18:10 ` Kevin Hilman
1 sibling, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2010-09-02 18:10 UTC (permalink / raw)
To: linux-arm-kernel
Michael Williamson <michael.williamson@criticallink.com> writes:
> This patch adds initial support for the MityDSP-L138 and MityDSP-1808 system
> on Module (SOM) under the machine name "mityomapl138". These SOMs are based
> on the da850 davinci CPU architecture. Information on these SOMs may be
> found at http://www.mitydsp.com.
>
> Basic support for the console UART, NAND, and EMAC (MII interface) is
> included in this patch.
>
> Signed-off-by: Michael Williamson <michael.williamson@criticallink.com>
Thanks, applying and queueing for 2.6.37 (with one minor change
below...)
> ---
> Changes since v2:
> 1) Remove defaulting this board from Kconfig.
> 2) Add MITYOMAPL138 board to da8xx_omapl_defconfig.
> 3) Fix tabs alignment per comment.
>
> The new defconfig file was generated by:
> make da8xx_omapl_defconfig
> make menuconfig
> select MITYOMAPL138 option
> make savedefconfig
> cp defconfig arch/arm/configs/da8xx_omapl_defconfig
>
> I think the other 3 lines were a result of updated KConfig options
> in the current baseline.
Yes, but to minimize unrelated defconfig diffs upstream, I'm going to
remove the 3 unrelated ones when applying this patch.
Soon we will hopefully be getting rid of defconfigs all together, but
until that is sorted out, we need to minimize diffs against defconfigs,
especially ones that are not related to the patch.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-09-02 18:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-02 17:58 [PATCH v3] davinci: Initial support for MityDSP-L138/MityARM-1808 Michael Williamson
2010-09-02 18:05 ` Sergei Shtylyov
2010-09-02 18:17 ` Kevin Hilman
2010-09-02 18:10 ` Kevin Hilman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox