diff options
Diffstat (limited to 'arch')
38 files changed, 1974 insertions, 36 deletions
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index bcd94a0569..0ecfb3e4b3 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -119,6 +119,7 @@ obj-$(CONFIG_MACH_TECHNEXION_WANDBOARD) += technexion-wandboard/ obj-$(CONFIG_MACH_TNY_A9260) += tny-a926x/ obj-$(CONFIG_MACH_TNY_A9263) += tny-a926x/ obj-$(CONFIG_MACH_TNY_A9G20) += tny-a926x/ +obj-$(CONFIG_MACH_KINDLE_MX50) += kindle-mx50/ obj-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += toradex-colibri-t20/ obj-$(CONFIG_MACH_TOSHIBA_AC100) += toshiba-ac100/ obj-$(CONFIG_MACH_TQMA53) += tqma53/ diff --git a/arch/arm/boards/at91sam9m10ihd/hw_version.c b/arch/arm/boards/at91sam9m10ihd/hw_version.c index 96fb02d801..cab26b0ac4 100644 --- a/arch/arm/boards/at91sam9m10ihd/hw_version.c +++ b/arch/arm/boards/at91sam9m10ihd/hw_version.c @@ -195,8 +195,8 @@ static void at91sam9m10ihd_devices_detect_one(const char *name) dev_add_param_fixed(dev, "board", info.board_name); sprintf(str, "%.2s", info.vendor_country); dev_add_param_fixed(dev, "country", str); - dev_add_param_int_ro(dev, "year", info.year, "%d"); - dev_add_param_int_ro(dev, "week", info.week, "%d"); + dev_add_param_uint32_fixed(dev, "year", info.year, "%u"); + dev_add_param_uint32_fixed(dev, "week", info.week, "%u"); sprintf(str, "%c", info.revision_code); dev_add_param_fixed(dev, "revision_code", str); sprintf(str, "%c", info.revision_id); diff --git a/arch/arm/boards/at91sam9x5ek/hw_version.c b/arch/arm/boards/at91sam9x5ek/hw_version.c index d1ca036fe9..10563cf98b 100644 --- a/arch/arm/boards/at91sam9x5ek/hw_version.c +++ b/arch/arm/boards/at91sam9x5ek/hw_version.c @@ -221,8 +221,8 @@ static void at91sam9x5ek_devices_detect_one(const char *name) dev_add_param_fixed(dev, "board", info.board_name); sprintf(str, "%.2s", info.vendor_country); dev_add_param_fixed(dev, "country", str); - dev_add_param_int_ro(dev, "year", info.year, "%d"); - dev_add_param_int_ro(dev, "week", info.week, "%d"); + dev_add_param_uint32_fixed(dev, "year", info.year, "%u"); + dev_add_param_uint32_fixed(dev, "week", info.week, "%u"); sprintf(str, "%c", info.revision_code); dev_add_param_fixed(dev, "revision_code", str); sprintf(str, "%c", info.revision_id); diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c index 5717c45020..18a9a10a86 100644 --- a/arch/arm/boards/beaglebone/board.c +++ b/arch/arm/boards/beaglebone/board.c @@ -87,7 +87,7 @@ static int beaglebone_devices_init(void) defaultenv_append_directory(defaultenv_beaglebone); - globalvar_add_simple("board.variant", black ? "boneblack" : "bone"); + globalvar_add_simple_string_fixed("board.variant", black ? "boneblack" : "bone"); printf("detected 'BeagleBone %s'\n", black ? "Black" : "White"); diff --git a/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c b/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c index c94cb355e2..d0907c11f0 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c +++ b/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c @@ -105,7 +105,7 @@ void cfa10036_detect_hw(void) return; } - globalvar_add_simple("board.variant", board_name); + globalvar_add_simple_string_fixed("board.variant", board_name); pr_info("Booting on a CFA10036 with %s\n", board_name); } diff --git a/arch/arm/boards/kindle-mx50/Makefile b/arch/arm/boards/kindle-mx50/Makefile new file mode 100644 index 0000000000..76ad17a1c2 --- /dev/null +++ b/arch/arm/boards/kindle-mx50/Makefile @@ -0,0 +1,4 @@ +obj-y += board.o flash-header-kindle-lpddr1.dcd.o flash-header-kindle-lpddr2.dcd.o +extra-y += flash-header-kindle-lpddr1.dcd.S flash-header-kindle-lpddr1.dcd flash-header-kindle-lpddr2.dcd.S flash-header-kindle-lpddr2.dcd +lwl-y += lowlevel.o +bbenv-y += defaultenv-kindle-mx50 diff --git a/arch/arm/boards/kindle-mx50/board.c b/arch/arm/boards/kindle-mx50/board.c new file mode 100644 index 0000000000..fa4beb7f3c --- /dev/null +++ b/arch/arm/boards/kindle-mx50/board.c @@ -0,0 +1,162 @@ +/* + * Copyright (C) 2007 Sascha Hauer, Pengutronix + * Copyright (C) 2017 Alexander Kurz <akurz@blala.de> + * + * 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. + * + */ + +#include <common.h> +#include <envfs.h> +#include <environment.h> +#include <init.h> +#include <io.h> +#include <driver.h> +#include <param.h> +#include <magicvar.h> +#include <partition.h> +#include <libfile.h> +#include <globalvar.h> +#include <asm/armlinux.h> +#include <generated/mach-types.h> +#include <linux/sizes.h> +#include <usb/fsl_usb2.h> +#include <mach/generic.h> +#include <mach/imx50-regs.h> +#include <mach/imx5.h> +#include <mach/revision.h> + +/* 16 byte id for serial number */ +#define ATAG_SERIAL16 0x5441000a +/* 16 byte id for a board revision */ +#define ATAG_REVISION16 0x5441000b + +struct char16_tag { + char data[16]; +}; + +static struct tag *setup_16char_tag(struct tag *params, uint32_t tag, + const char *value) +{ + struct char16_tag *target; + target = ((void *) params) + sizeof(struct tag_header); + params->hdr.tag = tag; + params->hdr.size = tag_size(char16_tag); + memcpy(target->data, value, sizeof target->data); + return tag_next(params); +} + +static const char *get_env_16char_tag(const char *tag) +{ + static const char *default16 = "0000000000000000"; + const char *value; + value = getenv(tag); + if (!value) { + pr_err("env var %s not found, using default\n", tag); + return default16; + } + if (strlen(value) != 16) { + pr_err("env var %s: expecting 16 characters, using default\n", + tag); + return default16; + } + pr_info("%s: %s\n", tag, value); + return value; +} + +BAREBOX_MAGICVAR_NAMED(global_atags_serial16, global.board.serial16, + "Pass the kindle Serial as vendor-specific ATAG to linux"); +BAREBOX_MAGICVAR_NAMED(global_atags_revision16, global.board.revision16, + "Pass the kindle BoardId as vendor-specific ATAG to linux"); + +/* The Kindle Kernel expects two custom ATAGs, ATAG_REVISION16 describing + * the board and ATAG_SERIAL16 to identify the individual device. + */ +struct tag *kindle_mx50_append_atags(struct tag *params) +{ + params = setup_16char_tag(params, ATAG_SERIAL16, + get_env_16char_tag("global.board.serial16")); + params = setup_16char_tag(params, ATAG_REVISION16, + get_env_16char_tag("global.board.revision16")); + return params; +} + +static char *serial16; +static char *revision16; +static char *mac; + +static void kindle_rev_init(void) +{ + int ret; + size_t size; + void *buf; + const char userdata[] = "/dev/disk0.boot0.userdata"; + ret = read_file_2(userdata, &size, &buf, 128); + if (ret && ret != -EFBIG) { + pr_err("Could not read board info from %s\n", userdata); + return; + } + + serial16 = xzalloc(17); + revision16 = xzalloc(17); + mac = xzalloc(17); + + memcpy(serial16, buf, 16); + memcpy(revision16, buf + 96, 16); + memcpy(mac, buf + 48, 16); + + globalvar_add_simple_string("board.serial16", &serial16); + globalvar_add_simple_string("board.revision16", &revision16); + globalvar_add_simple_string("board.mac", &mac); + + free(buf); +} + +static int kindle_mx50_late_init(void) +{ + armlinux_set_revision(0x50000 | imx_silicon_revision()); + /* Compatibility ATAGs for original kernel */ + armlinux_set_atag_appender(kindle_mx50_append_atags); + + kindle_rev_init(); + + return 0; +} +late_initcall(kindle_mx50_late_init); + +static int kindle_mx50_mem_init(void) +{ + arm_add_mem_device("ram0", MX50_CSD0_BASE_ADDR, SZ_256M); + return 0; +} +mem_initcall(kindle_mx50_mem_init); + +static int kindle_mx50_devices_init(void) +{ + struct device_d *dev; + /* Probe the eMMC to allow reading the board serial and revision */ + dev = get_device_by_name("mci0"); + if (dev) + dev_set_param(dev, "probe", "1"); + + defaultenv_append_directory(defaultenv_kindle_mx50); + + return 0; +} +device_initcall(kindle_mx50_devices_init); + +static int kindle_mx50_postcore_init(void) +{ + imx50_init_lowlevel(800); + + return 0; +} +postcore_initcall(kindle_mx50_postcore_init); diff --git a/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/boot/mmc_kernel b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/boot/mmc_kernel new file mode 100644 index 0000000000..a43ee0cc92 --- /dev/null +++ b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/boot/mmc_kernel @@ -0,0 +1,15 @@ +#!/bin/sh +# Boot the Amazon factory-shipped kernel uimage stored on +# the eMMC at CONFIG_MMC_BOOTFLASH_ADDR 0x41000 + +# Purge the OF tree to enable passing of ATAGs +oftree -f + +# The same machine type introduced with freescale ENGR00124359 +armlinux_architecture=2955 + +armlinux_system_serial="$global.board.ocotp_serial" + +global linux.bootargs.dyn.root="root=/dev/mmcblk0p1 rootwait ro" + +bootm -c /dev/disk0.kernel diff --git a/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/init/usbconsole b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/init/usbconsole new file mode 100644 index 0000000000..4fe12113cc --- /dev/null +++ b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/init/usbconsole @@ -0,0 +1,21 @@ +#!/bin/sh + +if test "$global.model" = "Amazon Kindle D01100"; then + if gpio_get_value 18; then; else + usbserial + global.autoboot_timeout=60 + fi +fi + +if test "$global.model" = "Amazon Kindle D01200"; then + sleep 5 + if gpio_get_value 0; then + usbserial + global.autoboot_timeout=60 + fi +fi + +if test "$global.model" = "Amazon Kindle EY21"; then + usbserial + global.autoboot_timeout=10 +fi diff --git a/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/nv/autoboot_timeout b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/nv/autoboot_timeout new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/nv/autoboot_timeout @@ -0,0 +1 @@ +3 diff --git a/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/nv/boot.default b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/nv/boot.default new file mode 100644 index 0000000000..3118b7af45 --- /dev/null +++ b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/nv/boot.default @@ -0,0 +1 @@ +mmc_kernel diff --git a/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/nv/linux.bootargs.consoleblank b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/nv/linux.bootargs.consoleblank new file mode 100644 index 0000000000..efc4ee63d4 --- /dev/null +++ b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/nv/linux.bootargs.consoleblank @@ -0,0 +1 @@ +consoleblank=0 diff --git a/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/nv/linux.bootargs.eink b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/nv/linux.bootargs.eink new file mode 100644 index 0000000000..2ff3618376 --- /dev/null +++ b/arch/arm/boards/kindle-mx50/defaultenv-kindle-mx50/nv/linux.bootargs.eink @@ -0,0 +1 @@ +fslepdc video=mxcepdcfb:E60,bpp=8 diff --git a/arch/arm/boards/kindle-mx50/flash-header-kindle-lpddr1.imxcfg b/arch/arm/boards/kindle-mx50/flash-header-kindle-lpddr1.imxcfg new file mode 100644 index 0000000000..e6b6098973 --- /dev/null +++ b/arch/arm/boards/kindle-mx50/flash-header-kindle-lpddr1.imxcfg @@ -0,0 +1,166 @@ +# DCD i.MX50 SoC setup using 256MiB LPDDR1 +# Copyright (C) 2017 Alexander Kurz <akurz@blala.de> +# +# Initial DCD setup according to Freescale ENGR00124359 +# with adaption for LPDDR1 ENGR00025557 +# Copyright (C) 2010 Freescale Semiconductor, Inc. + +soc imx50 +loadaddr 0x70020000 +dcdofs 0x400 + +# Switch pll1_sw_clk to step_clk +wm 32 0x53fd400c 0x00000004 +# Setup PLL1 to 800MHz +wm 32 0x63f80000 0x00001232 +wm 32 0x63f80004 0x00000002 +wm 32 0x63f80008 0x00000080 +wm 32 0x63f8000c 0x00000002 +wm 32 0x63f80010 0x00000001 +wm 32 0x63f8001c 0x00000080 +wm 32 0x63f80020 0x00000002 +wm 32 0x63f80024 0x00000001 +wm 32 0x63f80000 0x00001232 +check 8 while_any_bit_clear 0x63f80000 0x01 +# Switch pll1_sw_clk to pll1 +wm 32 0x53fd400c 0x00000000 + +# CGR +wm 32 0x53fd4068 0xffffffff +wm 32 0x53fd406c 0xffffffff +wm 32 0x53fd4070 0xffffffff +wm 32 0x53fd4074 0xffffffff +wm 32 0x53fd4078 0xffffffff +wm 32 0x53fd407c 0xffffffff +wm 32 0x53fd4080 0xffffffff +wm 32 0x53fd4084 0xffffffff +wm 32 0x53FD4098 0x80000004 + +# CCM DDR div 4 / 200MHz +wm 32 0x53fd4098 0x80000004 +check 32 while_all_bits_set 0x53fd408c 0x00000004 + +# IOMUX +wm 32 0x53fa8490 0x00180000 +wm 32 0x53fa8494 0x00180000 +wm 32 0x53fa86ac 0x00000000 +wm 32 0x53fa8668 0x00180000 +wm 32 0x53fa866c 0x00000000 +wm 32 0x53fa8670 0x00000000 +wm 32 0x53fa868c 0x00000000 +wm 32 0x53fa8698 0x00180000 +wm 32 0x53fa86a0 0x00180000 +wm 32 0x53fa86a4 0x00180000 +wm 32 0x53fa86a8 0x00180000 +wm 32 0x53fa86b4 0x00180000 + +# set SW_PAD_CTL_GRP_NANDF to Low output voltage +wm 32 0x53fa86c0 0x2000 + +wm 32 0x53fa8498 0x00180200 +wm 32 0x53fa849c 0x00180200 +wm 32 0x53fa84c8 0x00180000 +wm 32 0x53fa84cc 0x00180080 +wm 32 0x53fa84f0 0x00180000 +wm 32 0x53fa84f4 0x00180080 +wm 32 0x53fa84fc 0x00180080 +wm 32 0x53fa8500 0x00180000 +wm 32 0x53fa8524 0x00180080 +wm 32 0x53fa8528 0x00180000 + +# ZQ Load +wm 32 0x1400012C 0x00000817 +wm 32 0x14000128 0x09180000 +wm 32 0x14000124 0x00310000 +wm 32 0x14000124 0x00200000 +wm 32 0x14000128 0x09180010 +wm 32 0x14000124 0x00310000 +wm 32 0x14000124 0x00200000 + +# DRAM_CTL +wm 32 0x14000000 0x00000100 +wm 32 0x14000008 0x00009c40 +wm 32 0x14000014 0x02000000 +wm 32 0x14000018 0x01010006 +wm 32 0x1400001c 0x080b0201 +wm 32 0x14000020 0x02000303 +wm 32 0x14000024 0x0036b002 +wm 32 0x14000028 0x00000606 +wm 32 0x1400002c 0x06030400 +wm 32 0x14000030 0x01000000 +wm 32 0x14000034 0x00000a02 +wm 32 0x14000038 0x00000003 +wm 32 0x1400003c 0x00001801 +wm 32 0x14000040 0x00050612 +wm 32 0x14000044 0x00000200 +wm 32 0x14000048 0x001c001c +wm 32 0x1400004c 0x00010000 +wm 32 0x1400005c 0x01000000 +wm 32 0x14000060 0x00000001 +wm 32 0x14000064 0x00000000 +wm 32 0x14000068 0x00320000 +wm 32 0x1400006c 0x00000000 +wm 32 0x14000070 0x00000000 +wm 32 0x14000074 0x00320000 +wm 32 0x14000080 0x02000000 +wm 32 0x14000084 0x00000100 +wm 32 0x14000088 0x02400040 +wm 32 0x1400008c 0x01000000 +wm 32 0x14000090 0x0a000100 +wm 32 0x14000094 0x01011f1f +wm 32 0x14000098 0x01010101 +wm 32 0x1400009c 0x00030101 +wm 32 0x140000a4 0x00010000 +wm 32 0x140000a8 0x00000000 +wm 32 0x140000ac 0x0000ffff +wm 32 0x140000c8 0x02020101 +wm 32 0x140000cc 0x00000000 +wm 32 0x140000d0 0x01000202 +wm 32 0x140000d4 0x00000200 +wm 32 0x140000d8 0x00000001 +wm 32 0x140000dc 0x0000ffff +wm 32 0x140000e0 0x00000000 +wm 32 0x140000e4 0x02020000 +wm 32 0x140000e8 0x02020202 +wm 32 0x140000ec 0x00000202 +wm 32 0x140000f0 0x01010064 +wm 32 0x140000f4 0x01010101 +wm 32 0x140000f8 0x00010101 +wm 32 0x140000fc 0x00000064 +wm 32 0x14000104 0x02000602 +wm 32 0x14000108 0x06120000 +wm 32 0x1400010c 0x06120612 +wm 32 0x14000110 0x06120612 +wm 32 0x14000114 0x01030612 +wm 32 0x14000118 0x00010002 +wm 32 0x1400011c 0x00001000 + +# DDR PHY +wm 32 0x14000200 0x00000000 +wm 32 0x14000204 0x00000000 +wm 32 0x14000208 0x35002725 +wm 32 0x14000210 0x35002725 +wm 32 0x14000218 0x35002725 +wm 32 0x14000220 0x35002725 +wm 32 0x14000228 0x35002725 +wm 32 0x1400020c 0x380002d0 +wm 32 0x14000214 0x380002d0 +wm 32 0x1400021c 0x380002d0 +wm 32 0x14000224 0x380002d0 +wm 32 0x1400022c 0x380002d0 +wm 32 0x14000230 0x00000000 +wm 32 0x14000234 0x00800006 +wm 32 0x14000238 0x60101414 +wm 32 0x14000240 0x60101414 +wm 32 0x14000248 0x60101414 +wm 32 0x14000250 0x60101414 +wm 32 0x14000258 0x60101414 +wm 32 0x1400023c 0x00101001 +wm 32 0x14000244 0x00101001 +wm 32 0x1400024c 0x00101001 +wm 32 0x14000254 0x00101001 +wm 32 0x1400025c 0x00102201 + +# start DDR +wm 32 0x14000000 0x00000101 +check 32 while_any_bit_clear 0x140000a8 0x00000010 diff --git a/arch/arm/boards/kindle-mx50/flash-header-kindle-lpddr2.imxcfg b/arch/arm/boards/kindle-mx50/flash-header-kindle-lpddr2.imxcfg new file mode 100644 index 0000000000..ffceac34b5 --- /dev/null +++ b/arch/arm/boards/kindle-mx50/flash-header-kindle-lpddr2.imxcfg @@ -0,0 +1,176 @@ +# DCD i.MX50 SoC setup using 256MiB LPDDR2 +# Copyright (C) 2017 Alexander Kurz <akurz@blala.de> +# +# Initial DCD setup according to Freescale ENGR00124359 with adaption from +# Kindle_src_5.6.1.1_2634130033 uboot_2009.08 imx50_yoshi flash_header. +# Copyright (C) 2010 Freescale Semiconductor, Inc. + +soc imx50 +loadaddr 0x70020000 + +dcdofs 0x400 + +# Switch pll1_sw_clk to step_clk +wm 32 0x53fd400c 0x00000004 +# Setup PLL1 to 800MHz +wm 32 0x63f80000 0x00001236 +wm 32 0x63f80004 0x00000002 +wm 32 0x63f80008 0x00000080 +wm 32 0x63f8000c 0x000000b3 +wm 32 0x63f80010 0x000000b4 +wm 32 0x63f8001c 0x00000080 +wm 32 0x63f80020 0x000000b3 +wm 32 0x63f80024 0x000000b4 +wm 32 0x63f80000 0x00001236 +check 8 while_any_bit_clear 0x63f80000 0x01 +# Switch pll1_sw_clk to pll1 +wm 32 0x53fd400c 0x00000000 + +# CGR +wm 32 0x53fd4068 0xffffffff +wm 32 0x53fd406c 0xffffffff +wm 32 0x53fd4070 0xffffffff +wm 32 0x53fd4074 0xffffffff +wm 32 0x53fd4078 0xffffffff +wm 32 0x53fd407c 0xffffffff +wm 32 0x53fd4080 0xffffffff +wm 32 0x53fd4084 0xffffffff +wm 32 0x53FD4098 0x80000004 + +# CCM DDR div 3 / 266MHz +wm 32 0x53fd4098 0x80000003 +check 32 while_all_bits_set 0x53fd408c 0x00000004 + +# IOMUX +wm 32 0x53fa86ac 0x04000000 +wm 32 0x53fa8668 0x00200000 +wm 32 0x53fa866c 0x00000200 +wm 32 0x53fa8670 0x00000000 +wm 32 0x53fa868c 0x00000000 +wm 32 0x53fa8698 0x00200000 +wm 32 0x53fa86a0 0x00200000 +wm 32 0x53fa86a4 0x00200000 +wm 32 0x53fa86a8 0x00200000 +wm 32 0x53fa86b4 0x00200000 + +# set SW_PAD_CTL_GRP_NANDF to Low output voltage +wm 32 0x53fa86c0 0x2000 + +wm 32 0x53fa8490 0x00200000 +wm 32 0x53fa8494 0x00200000 +wm 32 0x53fa8498 0x00200000 +wm 32 0x53fa849c 0x00200000 +wm 32 0x53fa84c8 0x00200000 +wm 32 0x53fa84cc 0x00200000 +wm 32 0x53fa84f0 0x00200000 +wm 32 0x53fa84f4 0x00200000 +wm 32 0x53fa84fc 0x00200000 +wm 32 0x53fa8500 0x00200000 +wm 32 0x53fa8524 0x00200000 +wm 32 0x53fa8528 0x00200000 + +# ZQ Load +wm 32 0x1400012C 0x00000817 +wm 32 0x14000128 0x09180000 +wm 32 0x14000124 0x00310000 +wm 32 0x14000124 0x00200000 +wm 32 0x14000128 0x09180010 +wm 32 0x14000124 0x00310000 +wm 32 0x14000124 0x00200000 + +# DRAM_CTL +wm 32 0x14000000 0x00000500 +wm 32 0x14000008 0x0000001b +wm 32 0x1400000c 0x0000d056 +wm 32 0x14000010 0x0000010b +wm 32 0x14000014 0x00000a6b +wm 32 0x14000018 0x02020d0c +wm 32 0x1400001c 0x0c110302 +wm 32 0x14000020 0x05020503 +wm 32 0x14000024 0x0048eb05 +wm 32 0x14000028 0x00000606 +wm 32 0x1400002c 0x09040501 +wm 32 0x14000030 0x02000000 +wm 32 0x14000034 0x00000e02 +wm 32 0x14000038 0x00000006 +wm 32 0x1400003c 0x00002301 +wm 32 0x14000040 0x00050408 +wm 32 0x14000044 0x00000300 +wm 32 0x14000048 0x00260026 +wm 32 0x1400004c 0x00010000 +wm 32 0x14000050 0x00000000 +wm 32 0x14000054 0x00000000 +wm 32 0x14000058 0x00000000 +wm 32 0x1400005c 0x02000000 +wm 32 0x14000060 0x00000002 +wm 32 0x14000064 0x00000000 +wm 32 0x14000068 0x00000000 +wm 32 0x1400006c 0x00040042 +wm 32 0x14000070 0x00000001 +wm 32 0x14000074 0x00000000 +wm 32 0x14000078 0x00040042 +wm 32 0x1400007c 0x00000001 +wm 32 0x14000080 0x010b0000 +wm 32 0x14000084 0x00000060 +wm 32 0x14000088 0x02400018 +wm 32 0x1400008c 0x01000e00 +wm 32 0x14000090 0x0a010101 +wm 32 0x14000094 0x01011f1f +wm 32 0x14000098 0x01010101 +wm 32 0x1400009c 0x00030101 +wm 32 0x140000a0 0x00010000 +wm 32 0x140000a4 0x00010000 +wm 32 0x140000a8 0x00000000 +wm 32 0x140000ac 0x0000ffff +wm 32 0x140000c8 0x02020101 +wm 32 0x140000cc 0x01000000 +wm 32 0x140000d0 0x01000201 +wm 32 0x140000d4 0x00000200 +wm 32 0x140000d8 0x00000102 +wm 32 0x140000dc 0x0000ffff +wm 32 0x140000e0 0x0000ff00 +wm 32 0x140000e4 0x02020000 +wm 32 0x140000e8 0x02020202 +wm 32 0x140000ec 0x00000202 +wm 32 0x140000f0 0x01010064 +wm 32 0x140000f4 0x01010101 +wm 32 0x140000f8 0x00010101 +wm 32 0x140000fc 0x00000064 +wm 32 0x14000100 0x00000000 +wm 32 0x14000104 0x02000802 +wm 32 0x14000108 0x04080000 +wm 32 0x1400010c 0x04080408 +wm 32 0x14000110 0x04080408 +wm 32 0x14000114 0x03060408 +wm 32 0x14000118 0x00010002 +wm 32 0x1400011c 0x00001000 + +# DDR PHY +wm 32 0x14000200 0x00000000 +wm 32 0x14000204 0x00000000 +wm 32 0x14000208 0x35003a27 +wm 32 0x14000210 0x35003a27 +wm 32 0x14000218 0x35003a27 +wm 32 0x14000220 0x35003a27 +wm 32 0x14000228 0x35003a27 +wm 32 0x1400020c 0x380002e1 +wm 32 0x14000214 0x380002e1 +wm 32 0x1400021c 0x380002e1 +wm 32 0x14000224 0x380002e1 +wm 32 0x1400022c 0x380002e1 +wm 32 0x14000230 0x00000000 +wm 32 0x14000234 0x00810006 +wm 32 0x14000238 0x60101014 +wm 32 0x14000240 0x60101014 +wm 32 0x14000248 0x60101014 +wm 32 0x14000250 0x60101014 +wm 32 0x14000258 0x60101014 +wm 32 0x1400023c 0x00100b01 +wm 32 0x14000244 0x00100b01 +wm 32 0x1400024c 0x00100b01 +wm 32 0x14000254 0x00100b01 +wm 32 0x1400025c 0x00100b01 + +# start DDR +wm 32 0x14000000 0x00000501 +check 32 while_any_bit_clear 0x140000a8 0x00000010 diff --git a/arch/arm/boards/kindle-mx50/lowlevel.c b/arch/arm/boards/kindle-mx50/lowlevel.c new file mode 100644 index 0000000000..dc321b533b --- /dev/null +++ b/arch/arm/boards/kindle-mx50/lowlevel.c @@ -0,0 +1,50 @@ +#include <common.h> +#include <linux/sizes.h> +#include <io.h> +#include <asm/barebox-arm-head.h> +#include <asm/barebox-arm.h> +#include <asm/sections.h> +#include <asm/cache.h> +#include <asm/mmu.h> +#include <mach/imx50-regs.h> +#include <mach/generic.h> + +extern char __dtb_imx50_kindle_d01100_start[]; +extern char __dtb_imx50_kindle_d01200_start[]; +extern char __dtb_imx50_kindle_ey21_start[]; + +ENTRY_FUNCTION(start_imx50_kindle_d01100, r0, r1, r2) +{ + void *fdt; + + imx5_cpu_lowlevel_init(); + arm_setup_stack(MX50_IRAM_BASE_ADDR + MX50_IRAM_SIZE - 8); + + fdt = __dtb_imx50_kindle_d01100_start - get_runtime_offset(); + + barebox_arm_entry(MX50_CSD0_BASE_ADDR, SZ_256M, fdt); +} + +ENTRY_FUNCTION(start_imx50_kindle_d01200, r0, r1, r2) +{ + void *fdt; + + imx5_cpu_lowlevel_init(); + arm_setup_stack(MX50_IRAM_BASE_ADDR + MX50_IRAM_SIZE - 8); + + fdt = __dtb_imx50_kindle_d01200_start - get_runtime_offset(); + + barebox_arm_entry(MX50_CSD0_BASE_ADDR, SZ_256M, fdt); +} + +ENTRY_FUNCTION(start_imx50_kindle_ey21, r0, r1, r2) +{ + void *fdt; + + imx5_cpu_lowlevel_init(); + arm_setup_stack(MX50_IRAM_BASE_ADDR + MX50_IRAM_SIZE - 8); + + fdt = __dtb_imx50_kindle_ey21_start - get_runtime_offset(); + + barebox_arm_entry(MX50_CSD0_BASE_ADDR, SZ_256M, fdt); +} diff --git a/arch/arm/boards/phytec-som-am335x/board.c b/arch/arm/boards/phytec-som-am335x/board.c index 7f62453d93..dc3b84a806 100644 --- a/arch/arm/boards/phytec-som-am335x/board.c +++ b/arch/arm/boards/phytec-som-am335x/board.c @@ -112,6 +112,7 @@ static int physom_devices_init(void) xloadslots, ARRAY_SIZE(xloadslots)); am33xx_bbu_nand_slots_register_handler("nand", nandslots, ARRAY_SIZE(nandslots)); + am33xx_bbu_emmc_mlo_register_handler("MLO.emmc", "/dev/mmc1"); if (IS_ENABLED(CONFIG_SHELL_NONE)) return am33xx_of_register_bootdevice(); diff --git a/arch/arm/boards/phytec-som-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c index ed9453bdda..31b2761024 100644 --- a/arch/arm/boards/phytec-som-imx6/board.c +++ b/arch/arm/boards/phytec-som-imx6/board.c @@ -152,7 +152,7 @@ static int physom_imx6_devices_init(void) phyflex_err006282_workaround(); pfla02_module_revision = get_module_rev(); - globalvar_add_simple_int("board.revision", &pfla02_module_revision, "%u"); + globalvar_add_simple_uint32_fixed("board.revision", pfla02_module_revision, "%u"); pr_info("Module Revision: %u\n", pfla02_module_revision); barebox_set_hostname("phyFLEX-i.MX6"); diff --git a/arch/arm/boards/sama5d3xek/hw_version.c b/arch/arm/boards/sama5d3xek/hw_version.c index c809c37742..e5077854e3 100644 --- a/arch/arm/boards/sama5d3xek/hw_version.c +++ b/arch/arm/boards/sama5d3xek/hw_version.c @@ -227,8 +227,8 @@ static void at91sama5d3xek_devices_detect_one(const char *name) dev_add_param_fixed(dev, "board", bname); sprintf(str, "%.2s", info.vendor_country); dev_add_param_fixed(dev, "country", str); - dev_add_param_int_ro(dev, "year", info.year, "%d"); - dev_add_param_int_ro(dev, "week", info.week, "%d"); + dev_add_param_uint32_fixed(dev, "year", info.year, "%u"); + dev_add_param_uint32_fixed(dev, "week", info.week, "%u"); sprintf(str, "%c", info.revision_board); dev_add_param_fixed(dev, "revision_board", str); sprintf(str, "%c", info.revision_schema); diff --git a/arch/arm/boards/solidrun-microsom/board.c b/arch/arm/boards/solidrun-microsom/board.c index b9041687e4..155199ff78 100644 --- a/arch/arm/boards/solidrun-microsom/board.c +++ b/arch/arm/boards/solidrun-microsom/board.c @@ -78,7 +78,9 @@ static void microsom_eth_init(void) static int hummingboard_device_init(void) { if (!of_machine_is_compatible("solidrun,hummingboard/dl") && - !of_machine_is_compatible("solidrun,hummingboard/q")) + !of_machine_is_compatible("solidrun,hummingboard/q") && + !of_machine_is_compatible("solidrun,hummingboard2/dl") && + !of_machine_is_compatible("solidrun,hummingboard2/q")) return 0; microsom_eth_init(); @@ -108,13 +110,26 @@ device_initcall(h100_device_init); static int hummingboard_late_init(void) { + bool emmc_present = false; + if (!of_machine_is_compatible("solidrun,hummingboard/dl") && !of_machine_is_compatible("solidrun,hummingboard/q") && + !of_machine_is_compatible("solidrun,hummingboard2/dl") && + !of_machine_is_compatible("solidrun,hummingboard2/q") && !of_machine_is_compatible("auvidea,h100")) return 0; + if (of_machine_is_compatible("solidrun,hummingboard2/dl") || + of_machine_is_compatible("solidrun,hummingboard2/q")) + emmc_present = true; + imx6_bbu_internal_mmc_register_handler("sdcard", "/dev/mmc1.barebox", - BBU_HANDLER_FLAG_DEFAULT); + emmc_present ? 0 : BBU_HANDLER_FLAG_DEFAULT); + + if (emmc_present) { + imx6_bbu_internal_mmc_register_handler("emmc", + "/dev/mmc2.barebox", BBU_HANDLER_FLAG_DEFAULT); + } return 0; } diff --git a/arch/arm/boards/solidrun-microsom/lowlevel.c b/arch/arm/boards/solidrun-microsom/lowlevel.c index 7b97f2e947..cc15958d64 100644 --- a/arch/arm/boards/solidrun-microsom/lowlevel.c +++ b/arch/arm/boards/solidrun-microsom/lowlevel.c @@ -5,6 +5,8 @@ extern char __dtb_imx6dl_hummingboard_start[]; extern char __dtb_imx6q_hummingboard_start[]; +extern char __dtb_imx6dl_hummingboard2_start[]; +extern char __dtb_imx6q_hummingboard2_start[]; extern char __dtb_imx6q_h100_start[]; ENTRY_FUNCTION(start_hummingboard_microsom_i1, r0, r1, r2) @@ -47,6 +49,46 @@ ENTRY_FUNCTION(start_hummingboard_microsom_i4, r0, r1, r2) imx6q_barebox_entry(fdt); } +ENTRY_FUNCTION(start_hummingboard2_microsom_i1, r0, r1, r2) +{ + void *fdt; + + imx6_cpu_lowlevel_init(); + + fdt = __dtb_imx6dl_hummingboard2_start - get_runtime_offset(); + imx6q_barebox_entry(fdt); +} + +ENTRY_FUNCTION(start_hummingboard2_microsom_i2, r0, r1, r2) +{ + void *fdt; + + imx6_cpu_lowlevel_init(); + + fdt = __dtb_imx6dl_hummingboard2_start - get_runtime_offset(); + imx6q_barebox_entry(fdt); +} + +ENTRY_FUNCTION(start_hummingboard2_microsom_i2ex, r0, r1, r2) +{ + void *fdt; + + imx6_cpu_lowlevel_init(); + + fdt = __dtb_imx6q_hummingboard2_start - get_runtime_offset(); + imx6q_barebox_entry(fdt); +} + +ENTRY_FUNCTION(start_hummingboard2_microsom_i4, r0, r1, r2) +{ + void *fdt; + + imx6_cpu_lowlevel_init(); + + fdt = __dtb_imx6q_hummingboard2_start - get_runtime_offset(); + imx6q_barebox_entry(fdt); +} + ENTRY_FUNCTION(start_h100_microsom_i2ex, r0, r1, r2) { void *fdt; diff --git a/arch/arm/boards/vscom-baltos/board.c b/arch/arm/boards/vscom-baltos/board.c index 39f40a6061..1a4dc30936 100644 --- a/arch/arm/boards/vscom-baltos/board.c +++ b/arch/arm/boards/vscom-baltos/board.c @@ -64,7 +64,7 @@ static int baltos_read_eeprom(void) { struct bsp_vs_hwparam hw_param; size_t size; - char *buf, var_buf[32]; + char *buf; int rc; unsigned char mac_addr[6]; @@ -107,8 +107,7 @@ static int baltos_read_eeprom(void) hw_param.SystemId = 0; } - sprintf(var_buf, "%d", hw_param.SystemId); - globalvar_add_simple("board.id", var_buf); + globalvar_add_simple_uint32_fixed("board.id", hw_param.SystemId, "%u"); /* enable mPCIe slot */ gpio_direction_output(100, 1); @@ -131,7 +130,7 @@ static int baltos_devices_init(void) if (!of_machine_is_compatible("vscom,onrisc")) return 0; - globalvar_add_simple("board.variant", "baltos"); + globalvar_add_simple_string_fixed("board.variant", "baltos"); if (bootsource_get() == BOOTSOURCE_MMC) omap_set_bootmmc_devname("mmc0"); diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index df67cd0a92..ab837cc55f 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -1,6 +1,7 @@ CONFIG_ARCH_IMX=y CONFIG_IMX_MULTI_BOARDS=y CONFIG_MACH_EFIKA_MX_SMARTBOOK=y +CONFIG_MACH_KINDLE_MX50=y CONFIG_MACH_EMBEDSKY_E9=y CONFIG_MACH_FREESCALE_MX51_PDK=y CONFIG_MACH_CCMX53=y diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig index dab3d7a45e..cfbccb5a14 100644 --- a/arch/arm/configs/mvebu_defconfig +++ b/arch/arm/configs/mvebu_defconfig @@ -112,6 +112,7 @@ CONFIG_USB_STORAGE=y CONFIG_MCI=y CONFIG_MCI_STARTUP=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y +CONFIG_MCI_DOVE=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_LED_GPIO_OF=y diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 96e54d815f..2342d35a4b 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -12,6 +12,7 @@ pbl-dtb-$(CONFIG_MACH_BEAGLEBONE) += am335x-bone.dtb.o am335x-boneblack.dtb.o am pbl-dtb-$(CONFIG_MACH_CM_FX6) += imx6dl-cm-fx6.dtb.o imx6q-cm-fx6.dtb.o imx6q-utilite.dtb.o pbl-dtb-$(CONFIG_MACH_DFI_FS700_M60) += imx6q-dfi-fs700-m60-6q.dtb.o imx6dl-dfi-fs700-m60-6s.dtb.o pbl-dtb-$(CONFIG_MACH_DUCKBILL) += imx28-duckbill.dtb.o +pbl-dtb-$(CONFIG_MACH_KINDLE_MX50) += imx50-kindle-d01100.dtb.o imx50-kindle-d01200.dtb.o imx50-kindle-ey21.dtb.o pbl-dtb-$(CONFIG_MACH_EFIKA_MX_SMARTBOOK) += imx51-genesi-efika-sb.dtb.o pbl-dtb-$(CONFIG_MACH_ELTEC_HIPERCAM) += imx6dl-eltec-hipercam.dtb.o pbl-dtb-$(CONFIG_MACH_EMBEST_RIOTBOARD) += imx6s-riotboard.dtb.o @@ -69,7 +70,9 @@ pbl-dtb-$(CONFIG_MACH_SOCFPGA_REFLEX_ACHILLES) += socfpga_arria10_achilles.dtb.o pbl-dtb-$(CONFIG_MACH_SOCFPGA_TERASIC_DE0_NANO_SOC) += socfpga_cyclone5_de0_nano_soc.dtb.o pbl-dtb-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += socfpga_cyclone5_sockit.dtb.o pbl-dtb-$(CONFIG_MACH_SOLIDRUN_CUBOX) += dove-cubox-bb.dtb.o -pbl-dtb-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += imx6dl-hummingboard.dtb.o imx6q-hummingboard.dtb.o imx6q-h100.dtb.o +pbl-dtb-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += imx6dl-hummingboard.dtb.o imx6q-hummingboard.dtb.o \ + imx6dl-hummingboard2.dtb.o imx6q-hummingboard2.dtb.o \ + imx6q-h100.dtb.o pbl-dtb-$(CONFIG_MACH_TECHNEXION_WANDBOARD) += imx6q-wandboard.dtb.o imx6dl-wandboard.dtb.o pbl-dtb-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += tegra20-colibri-iris.dtb.o pbl-dtb-$(CONFIG_MACH_TOSHIBA_AC100) += tegra20-paz00.dtb.o diff --git a/arch/arm/dts/imx50-kindle-common.dtsi b/arch/arm/dts/imx50-kindle-common.dtsi new file mode 100644 index 0000000000..a6ea504f6c --- /dev/null +++ b/arch/arm/dts/imx50-kindle-common.dtsi @@ -0,0 +1,322 @@ +/* + * Copyright 2017 Alexander Kurz <akurz@blala.de> + * Copyright 2013 Greg Ungerer <gerg@uclinux.org> + * Copyright 2011 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd. + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include "imx50.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + /* this is a dummy fixed-voltage "regulator", mainly to satisfy + * the esdhc implementation requiring vmmc-supply and vqmmc-supply + */ + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + reg_3p3v: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "3P3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; +}; + +&iomuxc { + imx50-kindle { + pinctrl_uart1: uart1grp { + fsl,pins = < + MX50_PAD_UART1_TXD__UART1_TXD_MUX 0xe4 + MX50_PAD_UART1_RXD__UART1_RXD_MUX 0xe4 + >; + }; + + pinctrl_ecspi2: ecspi2grp { + fsl,pins = < + MX50_PAD_ECSPI2_SCLK__ECSPI2_SCLK 0x84 + MX50_PAD_ECSPI2_MOSI__ECSPI2_MOSI 0x84 + MX50_PAD_ECSPI2_MISO__ECSPI2_MISO 0x84 + MX50_PAD_ECSPI2_SS0__GPIO4_19 0x84 + >; + }; + + pinctrl_cspi: cspigrp { + fsl,pins = < + MX50_PAD_CSPI_SCLK__CSPI_SCLK 0xc4 + MX50_PAD_CSPI_MISO__CSPI_MISO 0xc4 + MX50_PAD_CSPI_MOSI__CSPI_MOSI 0xc4 + MX50_PAD_CSPI_SS0__GPIO4_11 0xe4 + >; + }; + + pinctrl_pmic: pmicgrp { + fsl,pins = < + MX50_PAD_UART1_CTS__GPIO6_8 0x84 + MX50_PAD_EPDC_PWRCTRL0__GPIO3_29 0x84 + >; + }; + + pinctrl_esdhc3: esdhc3grp { + fsl,pins = < + MX50_PAD_SD3_CMD__ESDHC3_CMD 0xd4 + MX50_PAD_SD3_CLK__ESDHC3_CLK 0x00 + MX50_PAD_SD3_D0__ESDHC3_DAT0 0xd4 + MX50_PAD_SD3_D1__ESDHC3_DAT1 0xd4 + MX50_PAD_SD3_D2__ESDHC3_DAT2 0xd4 + MX50_PAD_SD3_D3__ESDHC3_DAT3 0xd4 + MX50_PAD_SD3_D4__ESDHC3_DAT4 0xd4 + MX50_PAD_SD3_D5__ESDHC3_DAT5 0xd4 + MX50_PAD_SD3_D6__ESDHC3_DAT6 0xd4 + MX50_PAD_SD3_D7__ESDHC3_DAT7 0xd4 + >; + }; + + pinctrl_esdhc2: esdhc2grp { + fsl,pins = < + MX50_PAD_SD2_CMD__ESDHC2_CMD 0x84 + MX50_PAD_SD2_CLK__ESDHC2_CLK 0x84 + MX50_PAD_SD2_D0__ESDHC2_DAT0 0x84 + MX50_PAD_SD2_D1__ESDHC2_DAT1 0x84 + MX50_PAD_SD2_D2__ESDHC2_DAT2 0x84 + MX50_PAD_SD2_D3__ESDHC2_DAT3 0x84 + + MX50_PAD_EIM_DA5__GPIO1_5 0xe4 /* wake-on-lan */ + MX50_PAD_SD3_WP__GPIO5_28 0x84 /* power */ + MX50_PAD_DISP_RS__GPIO2_17 0xe4 /* ? */ + >; + }; + + pinctrl_i2c1: i2c1grp { + fsl,pins = < + MX50_PAD_I2C1_SCL__I2C1_SCL 0x4000002c + MX50_PAD_I2C1_SDA__I2C1_SDA 0x4000002c + >; + }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX50_PAD_I2C2_SCL__I2C2_SCL 0x4000002c + MX50_PAD_I2C2_SDA__I2C2_SDA 0x4000002c + >; + }; + + pinctrl_i2c3: i2c3grp { + fsl,pins = < + MX50_PAD_I2C3_SCL__I2C3_SCL 0x4000002c + MX50_PAD_I2C3_SDA__I2C3_SDA 0x4000002c + >; + }; + + pinctrl_charger_detect: chargerdetectgrp { + fsl,pins = < + MX50_PAD_OWIRE__GPIO6_26 0x84 + >; + }; + }; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; + status = "okay"; +}; + +&esdhc3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_esdhc3>; + non-removable; + vmmc-supply = <®_3p3v>; + vqmmc-supply = <®_3p3v>; + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + kernel: kernel@0x41000 { + label = "kernel"; + reg = <0x41000 0xe00000>; + }; + + diags_kernel: diags_kernel@0xe41000 { + label = "diags_kernel"; + reg = <0xe41000 0xe00000>; + }; + }; + + boot0-partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + imx_header: imx_header@0x400 { + label = "imx_header"; + reg = <0x400 0x800>; + }; + + self: self@0x1000 { + label = "self"; + reg = <0x1000 0x3e000>; + }; + + userdata: userdata@0x3f000 { + label = "userdata"; + reg = <0x3f000 0x1400>; + }; + }; +}; + +&ecspi2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ecspi2>; + fsl,spi-num-chipselects = <1>; + cs-gpios = <&gpio4 19 0>; + status = "okay"; + + flash: m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + spi-max-frequency = <1000000>; + reg = <0>; + }; +}; + +&cspi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_cspi>; + fsl,spi-num-chipselects = <1>; + cs-gpios = <&gpio4 11 0>; + status = "okay"; + + pmic: mc13892@0 { + compatible = "fsl,mc13892"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pmic>; + spi-max-frequency = <1000000>; + spi-cs-high; + reg = <0>; + interrupt-parent = <&gpio6>; + interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; + fsl,mc13xxx-uses-rtc; + + regulators { + sw1_reg: sw1 { + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <1375000>; + regulator-boot-on; + regulator-always-on; + }; + + sw2_reg: sw2 { + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1850000>; + regulator-boot-on; + regulator-always-on; + }; + + sw3_reg: sw3 { + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1850000>; + regulator-boot-on; + regulator-always-on; + }; + + sw4_reg: sw4 { + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1850000>; + regulator-boot-on; + regulator-always-on; + }; + + vdig_reg: vdig { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-boot-on; + }; + + vpll_reg: vpll { + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + vusb2_reg: vusb2 { + regulator-min-microvolt = <2400000>; + regulator-max-microvolt = <2775000>; + regulator-boot-on; + regulator-always-on; + }; + + vvideo_reg: vvideo { + regulator-min-microvolt = <2775000>; + regulator-max-microvolt = <2775000>; + }; + + vaudio_reg: vaudio { + regulator-min-microvolt = <2300000>; + regulator-max-microvolt = <3000000>; + }; + + vsd_reg: vsd { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3150000>; + }; + + vcam_reg: vcam { + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <3000000>; + }; + + vgen1_reg: vgen1 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + }; + + vgen2_reg: vgen2 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <3150000>; + regulator-always-on; + }; + + vgen3_reg: vgen3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + }; + + leds { + #address-cells = <1>; + #size-cells = <0>; + led-control = <0 0xff8 0 0>; + ledg { + reg = <2>; + label = "pmic_ledsg"; + linux,default-trigger = "heartbeat"; + }; + }; + }; +}; + +&usbotg { + phy_type = "utmi"; + dr_mode = "peripheral"; + status = "okay"; +}; diff --git a/arch/arm/dts/imx50-kindle-d01100.dts b/arch/arm/dts/imx50-kindle-d01100.dts new file mode 100644 index 0000000000..edbc929120 --- /dev/null +++ b/arch/arm/dts/imx50-kindle-d01100.dts @@ -0,0 +1,71 @@ +/* + * Copyright 2017 Alexander Kurz <akurz@blala.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx50-kindle-common.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + model = "Amazon Kindle D01100"; + compatible = "fsl,imx50"; + + chosen { + linux,stdout-path = &uart1; + }; + + memory { + device_type = "memory"; + reg = <0x70000000 0x10000000>; + }; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + imx50-kindle-d01100 { + pinctrl_hog: hoggrp { + fsl,pins = < + MX50_PAD_EIM_EB1__GPIO1_20 0xc0 + MX50_PAD_EIM_EB0__GPIO1_19 0xc0 + MX50_PAD_EIM_CS2__GPIO1_16 0xc0 + MX50_PAD_EIM_CS1__GPIO1_17 0xc0 + MX50_PAD_EIM_CS0__GPIO1_18 0xc0 + MX50_PAD_SSI_RXC__GPIO6_5 0x84 + >; + }; + }; +}; + +&i2c2 { + clock-frequency = <50000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; + + max14656@35 { + compatible = "maxim,max14656"; + reg = <0x35>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_charger_detect>; + interrupt-parent = <&gpio6>; + interrupts = <26 IRQ_TYPE_LEVEL_HIGH>; + }; + + smart-battery@55 { + compatible = "ti,bq27210"; + reg = <0x55>; + ti,i2c-retry-count = <2>; + ti,poll-retry-count = <10>; + }; +}; diff --git a/arch/arm/dts/imx50-kindle-d01200.dts b/arch/arm/dts/imx50-kindle-d01200.dts new file mode 100644 index 0000000000..8f93c1b520 --- /dev/null +++ b/arch/arm/dts/imx50-kindle-d01200.dts @@ -0,0 +1,86 @@ +/* + * Copyright 2017 Alexander Kurz <akurz@blala.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx50-kindle-common.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + model = "Amazon Kindle D01200"; + compatible = "fsl,imx50"; + + chosen { + linux,stdout-path = &uart1; + }; + + memory { + device_type = "memory"; + reg = <0x70000000 0x10000000>; + }; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + imx50-kindle-d01200 { + pinctrl_hog: hoggrp { + fsl,pins = < + MX50_PAD_EIM_DA0__GPIO1_0 0xc0 + MX50_PAD_SSI_RXC__GPIO6_5 0x84 + >; + }; + }; +}; + +&i2c1 { + clock-frequency = <50000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1>; + status = "okay"; + + mma8453: mma8453@1c { + compatible = "fsl,mma8453"; + reg = <0x1c>; + }; +}; + +&i2c2 { + clock-frequency = <50000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; + + max14656@35 { + compatible = "maxim,max14656"; + reg = <0x35>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_charger_detect>; + interrupt-parent = <&gpio6>; + interrupts = <26 IRQ_TYPE_LEVEL_HIGH>; + }; + + smart-battery@55 { + compatible = "ti,bq27210"; + reg = <0x55>; + ti,i2c-retry-count = <2>; + ti,poll-retry-count = <10>; + }; +}; + +&i2c3 { + clock-frequency = <50000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; +}; diff --git a/arch/arm/dts/imx50-kindle-ey21.dts b/arch/arm/dts/imx50-kindle-ey21.dts new file mode 100644 index 0000000000..1b8f2ad89a --- /dev/null +++ b/arch/arm/dts/imx50-kindle-ey21.dts @@ -0,0 +1,66 @@ +/* + * Copyright 2017 Alexander Kurz <akurz@blala.de> + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; +#include "imx50-kindle-common.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + model = "Amazon Kindle EY21"; + compatible = "fsl,imx50"; + + memory { + device_type = "memory"; + reg = <0x70000000 0x10000000>; + }; +}; + +&iomuxc { + imx50-kindle-ey21 { + pinctrl_gpiokey: gpiokeygrp { + fsl,pins = < + MX50_PAD_EIM_EB1__GPIO1_20 0x40 + >; + }; + }; +}; + +&i2c2 { + clock-frequency = <50000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; + + max14656@35 { + compatible = "maxim,max14656"; + reg = <0x35>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_charger_detect>; + interrupt-parent = <&gpio6>; + interrupts = <26 IRQ_TYPE_LEVEL_HIGH>; + }; + + smart-battery@55 { + compatible = "ti,bq27210"; + reg = <0x55>; + ti,i2c-retry-count = <2>; + ti,poll-retry-count = <10>; + }; +}; + +&i2c3 { + clock-frequency = <50000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; +}; diff --git a/arch/arm/dts/imx50.dtsi b/arch/arm/dts/imx50.dtsi new file mode 100644 index 0000000000..8737d4f33f --- /dev/null +++ b/arch/arm/dts/imx50.dtsi @@ -0,0 +1,40 @@ +#include <arm/imx50.dtsi> + +/ { + soc { + aips@50000000 { /* AIPS1 */ + usbphy0: usbphy@0 { + compatible = "usb-nop-xceiv"; + clocks = <&clks IMX5_CLK_USB_PHY1_GATE>; + clock-names = "main_clk"; + status = "okay"; + }; + + usbphy1: usbphy@1 { + compatible = "usb-nop-xceiv"; + clocks = <&clks IMX5_CLK_USB_PHY2_GATE>; + clock-names = "main_clk"; + status = "okay"; + }; + + usbmisc: usbmisc@53f80800 { + #index-cells = <1>; + compatible = "fsl,imx53-usbmisc"; + reg = <0x53f80800 0x200>; + clocks = <&clks IMX5_CLK_USBOH3_GATE>; + }; + }; + }; +}; + +&usbotg { + clocks = <&clks IMX5_CLK_USBOH3_GATE>; + fsl,usbmisc = <&usbmisc 0>; + fsl,usbphy = <&usbphy0>; +}; + +&usbh1 { + clocks = <&clks IMX5_CLK_USBOH3_GATE>; + fsl,usbmisc = <&usbmisc 0>; + fsl,usbphy = <&usbphy0>; +}; diff --git a/arch/arm/dts/imx6dl-hummingboard2.dts b/arch/arm/dts/imx6dl-hummingboard2.dts new file mode 100644 index 0000000000..40ef174411 --- /dev/null +++ b/arch/arm/dts/imx6dl-hummingboard2.dts @@ -0,0 +1,71 @@ +/* + * Device Tree file for SolidRun HummingBoard2 + * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com> + * Based on work by Russell King + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file 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. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ +/dts-v1/; + +#include <arm/imx6dl.dtsi> +#include "imx6qdl-hummingboard2.dtsi" + +/ { + model = "SolidRun HummingBoard2 Solo/DualLite"; + compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl"; +}; + +&ocotp { + barebox,provide-mac-address = <&fec 0x620>; +}; + +&usdhc3 { + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "barebox"; + reg = <0x0 0xe0000>; + }; + + partition@e0000 { + label = "barebox-environment"; + reg = <0xe0000 0x20000>; + }; +}; diff --git a/arch/arm/dts/imx6q-hummingboard2.dts b/arch/arm/dts/imx6q-hummingboard2.dts new file mode 100644 index 0000000000..89065581b8 --- /dev/null +++ b/arch/arm/dts/imx6q-hummingboard2.dts @@ -0,0 +1,87 @@ +/* + * Device Tree file for SolidRun HummingBoard2 + * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com> + * Based on work by Russell King + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file 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. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ +/dts-v1/; + +#include <arm/imx6q.dtsi> +#include "imx6qdl-hummingboard2.dtsi" +#include "imx6q.dtsi" + +/ { + model = "SolidRun HummingBoard2 Dual/Quad"; + compatible = "solidrun,hummingboard2/q", "fsl,imx6q"; + + chosen { + environment@0 { + compatible = "barebox,environment"; + device-path = &usdhc3, "partname:barebox-environment"; + }; + }; +}; + +&sata { + status = "okay"; + fsl,transmit-level-mV = <1104>; + fsl,transmit-boost-mdB = <0>; + fsl,transmit-atten-16ths = <9>; + fsl,no-spread-spectrum; +}; + +&ocotp { + barebox,provide-mac-address = <&fec 0x620>; +}; + +&usdhc3 { + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "barebox"; + reg = <0x0 0xe0000>; + }; + + partition@e0000 { + label = "barebox-environment"; + reg = <0xe0000 0x20000>; + }; +}; diff --git a/arch/arm/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/dts/imx6qdl-hummingboard2.dtsi new file mode 100644 index 0000000000..2a5f389378 --- /dev/null +++ b/arch/arm/dts/imx6qdl-hummingboard2.dtsi @@ -0,0 +1,536 @@ +/* + * Device Tree file for SolidRun HummingBoard2 + * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file 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. + * + * This file 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. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ +#include <arm/imx6qdl-microsom.dtsi> +#include <arm/imx6qdl-microsom-ar8035.dtsi> + +/ { + chosen { + stdout-path = &uart1; + }; + + ir_recv: ir-receiver { + compatible = "gpio-ir-receiver"; + gpios = <&gpio7 9 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_gpio7_9>; + linux,rc-map-name = "rc-rc6-mce"; + }; + + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "VCC_3V2"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + reg_1p8v: regulator-1p8v { + compatible = "regulator-fixed"; + regulator-name = "VCC_1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + reg_usbh2_vbus: regulator-usb-h1-vbus { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_usbh1_vbus>; + regulator-name = "V_USB2"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + reg_usbotg_vbus: regulator-usb-otg-vbus { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_usbotg_vbus>; + regulator-name = "V_USB1"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + reg_usbh3_vbus: regulator-usb-h2-vbus { + compatible = "regulator-fixed"; + enable-active-high; + enable-gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_usbh2_vbus>; + regulator-name = "V_USB3"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + reg_usbh4_vbus: regulator-usb-h3-vbus { + compatible = "regulator-fixed"; + enable-active-high; + enable-gpio = <&gpio7 10 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_usbh3_vbus>; + regulator-name = "V_USB4"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + reg_usdhc2_vmmc: reg-usdhc2-vmmc { + compatible = "regulator-fixed"; + gpio = <&gpio4 30 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_vmmc>; + regulator-boot-on; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "V_SD"; + startup-delay-us = <1000>; + }; + + sound-sgtl5000 { + audio-codec = <&sgtl5000>; + audio-routing = + "MIC_IN", "Mic Jack", + "Mic Jack", "Mic Bias", + "Headphone Jack", "HP_OUT"; + compatible = "fsl,imx-audio-sgtl5000"; + model = "On-board Codec"; + mux-ext-port = <5>; + mux-int-port = <1>; + ssi-controller = <&ssi1>; + }; +}; + +&audmux { + status = "okay"; +}; + +&ecspi2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_ecspi2>; + cs-gpios = <&gpio2 26 0>; + status = "okay"; +}; + +&hdmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_hdmi>; + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + +&i2c1 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_i2c1>; + status = "okay"; + + pcf8523: rtc@68 { + compatible = "nxp,pcf8523"; + reg = <0x68>; + }; + + sgtl5000: codec@0a { + clocks = <&clks IMX6QDL_CLK_CKO>; + compatible = "fsl,sgtl5000"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_sgtl5000>; + reg = <0x0a>; + VDDA-supply = <®_3p3v>; + VDDIO-supply = <®_3p3v>; + VDDD-supply = <®_1p8v>; + }; +}; + +&i2c2 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_i2c2>; + status = "okay"; +}; + +&i2c3 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_i2c3>; + status = "okay"; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + hummingboard2 { + pinctrl_hog: hoggrp { + fsl,pins = < + /* + * 36 pin headers GPIO description. The pins + * numbering as following - + * + * 3.2v 5v 74 75 + * 73 72 71 70 + * 69 68 67 66 + * + * 77 78 79 76 + * 65 64 61 60 + * 53 52 51 50 + * 49 48 166 132 + * 95 94 90 91 + * GND 54 24 204 + * + * The GPIO numbers can be extracted using + * signal name from below. + * Example - + * MX6QDL_PAD_EIM_DA10__GPIO3_IO10 is + * GPIO(3,10) which is (3-1)*32+10 = gpio 74 + * + * i.e. The mapping of GPIO(X,Y) to Linux gpio + * number is : gpio number = (X-1) * 32 + Y + */ + /* DI1_PIN15 */ + MX6QDL_PAD_EIM_DA10__GPIO3_IO10 0x400130b1 + /* DI1_PIN02 */ + MX6QDL_PAD_EIM_DA11__GPIO3_IO11 0x400130b1 + /* DISP1_DATA00 */ + MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x400130b1 + /* DISP1_DATA01 */ + MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x400130b1 + /* DISP1_DATA02 */ + MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x400130b1 + /* DISP1_DATA03 */ + MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x400130b1 + /* DISP1_DATA04 */ + MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x400130b1 + /* DISP1_DATA05 */ + MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x400130b1 + /* DISP1_DATA06 */ + MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x400130b1 + /* DISP1_DATA07 */ + MX6QDL_PAD_EIM_DA2__GPIO3_IO02 0x400130b1 + /* DI1_D0_CS */ + MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x400130b1 + /* DI1_D1_CS */ + MX6QDL_PAD_EIM_DA14__GPIO3_IO14 0x400130b1 + /* DI1_PIN01 */ + MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x400130b1 + /* DI1_PIN03 */ + MX6QDL_PAD_EIM_DA12__GPIO3_IO12 0x400130b1 + /* DISP1_DATA08 */ + MX6QDL_PAD_EIM_DA1__GPIO3_IO01 0x400130b1 + /* DISP1_DATA09 */ + MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x400130b1 + /* DISP1_DATA10 */ + MX6QDL_PAD_EIM_EB1__GPIO2_IO29 0x400130b1 + /* DISP1_DATA11 */ + MX6QDL_PAD_EIM_EB0__GPIO2_IO28 0x400130b1 + /* DISP1_DATA12 */ + MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x400130b1 + /* DISP1_DATA13 */ + MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x400130b1 + /* DISP1_DATA14 */ + MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x400130b1 + /* DISP1_DATA15 */ + MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x400130b1 + /* DISP1_DATA16 */ + MX6QDL_PAD_EIM_A21__GPIO2_IO17 0x400130b1 + /* DISP1_DATA17 */ + MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x400130b1 + /* DISP1_DATA18 */ + MX6QDL_PAD_EIM_A23__GPIO6_IO06 0x400130b1 + /* DISP1_DATA19 */ + MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x400130b1 + /* DISP1_DATA20 */ + MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x400130b1 + /* DISP1_DATA21 */ + MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x400130b1 + /* DISP1_DATA22 */ + MX6QDL_PAD_EIM_D26__GPIO3_IO26 0x400130b1 + /* DISP1_DATA23 */ + MX6QDL_PAD_EIM_D27__GPIO3_IO27 0x400130b1 + /* DI1_DISP_CLK */ + MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x400130b1 + /* SPDIF_IN */ + MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x400130b1 + /* SPDIF_OUT */ + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x400130b1 + + /* MikroBUS GPIO pin number 10 */ + MX6QDL_PAD_EIM_LBA__GPIO2_IO27 0x400130b1 + >; + }; + + pinctrl_hummingboard2_ecspi2: hummingboard2-ecspi2grp { + fsl,pins = < + MX6QDL_PAD_EIM_OE__ECSPI2_MISO 0x100b1 + MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI 0x100b1 + MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK 0x100b1 + MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x000b1 /* CS */ + >; + }; + + pinctrl_hummingboard2_gpio7_9: hummingboard2-gpio7_9 { + fsl,pins = < + MX6QDL_PAD_SD4_CMD__GPIO7_IO09 0x80000000 + >; + }; + + pinctrl_hummingboard2_hdmi: hummingboard2-hdmi { + fsl,pins = < + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 + >; + }; + + pinctrl_hummingboard2_i2c1: hummingboard2-i2c1 { + fsl,pins = < + MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1 + >; + }; + + pinctrl_hummingboard2_i2c2: hummingboard2-i2c2 { + fsl,pins = < + MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 + MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 + >; + }; + + pinctrl_hummingboard2_i2c3: hummingboard2-i2c3 { + fsl,pins = < + MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 + >; + }; + + pinctrl_hummingboard2_mipi: hummingboard2_mipi { + fsl,pins = < + MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x4001b8b1 + MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x4001b8b1 + MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x130b0 + >; + }; + + pinctrl_hummingboard2_pcie_reset: hummingboard2-pcie-reset { + fsl,pins = < + MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x1b0b1 + >; + }; + + pinctrl_hummingboard2_pwm1: pwm1grp { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b1 + >; + }; + + pinctrl_hummingboard2_sgtl5000: hummingboard2-sgtl5000 { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT19__AUD5_RXD 0x130b0 + MX6QDL_PAD_KEY_COL0__AUD5_TXC 0x130b0 + MX6QDL_PAD_KEY_ROW0__AUD5_TXD 0x110b0 + MX6QDL_PAD_KEY_COL1__AUD5_TXFS 0x130b0 + MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0 + >; + }; + + pinctrl_hummingboard2_usbh1_vbus: hummingboard2-usbh1-vbus { + fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0>; + }; + + pinctrl_hummingboard2_usbh2_vbus: hummingboard2-usbh2-vbus { + fsl,pins = <MX6QDL_PAD_SD4_DAT5__GPIO2_IO13 0x1b0b0>; + }; + + pinctrl_hummingboard2_usbh3_vbus: hummingboard2-usbh3-vbus { + fsl,pins = <MX6QDL_PAD_SD4_CLK__GPIO7_IO10 0x1b0b0>; + }; + + pinctrl_hummingboard2_usbotg_id: hummingboard2-usbotg-id { + /* + * Similar to pinctrl_usbotg_2, but we want it + * pulled down for a fixed host connection. + */ + fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>; + }; + + pinctrl_hummingboard2_usbotg_vbus: hummingboard2-usbotg-vbus { + fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0>; + }; + + pinctrl_hummingboard2_usdhc2_aux: hummingboard2-usdhc2-aux { + fsl,pins = < + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1f071 + MX6QDL_PAD_KEY_ROW1__SD2_VSELECT 0x1b071 + >; + }; + + pinctrl_hummingboard2_usdhc2: hummingboard2-usdhc2 { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059 + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059 + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059 + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059 + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059 + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059 + >; + }; + + pinctrl_hummingboard2_usdhc2_100mhz: hummingboard2-usdhc2-100mhz { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x170b9 + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x100b9 + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170b9 + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170b9 + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170b9 + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130b9 + >; + }; + + pinctrl_hummingboard2_usdhc2_200mhz: hummingboard2-usdhc2-200mhz { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x170f9 + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x100f9 + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170f9 + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170f9 + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170f9 + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130f9 + >; + }; + + pinctrl_hummingboard2_vmmc: hummingboard2-vmmc { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0 + >; + }; + + pinctrl_hummingboard2_usdhc3: hummingboard2-usdhc3 { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059 + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059 + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059 + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059 + MX6QDL_PAD_SD3_RST__SD3_RESET 0x17059 + >; + }; + + pinctrl_hummingboard2_uart3: hummingboard2-uart3 { + fsl,pins = < + MX6QDL_PAD_EIM_D25__UART3_TX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D24__UART3_RX_DATA 0x40013000 + >; + }; + }; +}; + +&pcie { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_pcie_reset>; + reset-gpio = <&gpio2 11 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +&pwm1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_pwm1>; + status = "okay"; +}; + +&ssi1 { + status = "okay"; +}; + +&usbh1 { + disable-over-current; + status = "okay"; +}; + +&usbotg { + disable-over-current; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_usbotg_id>; + vbus-supply = <®_usbotg_vbus>; + status = "okay"; +}; + +&usdhc2 { + pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-0 = < + &pinctrl_hummingboard2_usdhc2_aux + &pinctrl_hummingboard2_usdhc2 + >; + pinctrl-1 = < + &pinctrl_hummingboard2_usdhc2_aux + &pinctrl_hummingboard2_usdhc2_100mhz + >; + pinctrl-2 = < + &pinctrl_hummingboard2_usdhc2_aux + &pinctrl_hummingboard2_usdhc2_200mhz + >; + vmmc-supply = <®_usdhc2_vmmc>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_usdhc3>; + vmmc-supply = <®_3p3v>; + vqmmc-supply = <®_3p3v>; + bus-width = <8>; + non-removable; + status = "okay"; +}; + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_uart3>; + status = "okay"; +}; diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi index 274c491804..b3a7f69ffe 100644 --- a/arch/arm/dts/socfpga.dtsi +++ b/arch/arm/dts/socfpga.dtsi @@ -10,22 +10,6 @@ aliases { mmc0 = &mmc; }; - - soc { - qspi: spi@ff705000 { - compatible = "cdns,qspi-nor"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0xff705000 0x1000>, - <0xffa00000 0x1000>; - interrupts = <0 151 4>; - ext-decoder = <0>; /* external decoder */ - fifo-depth = <128>; - clocks = <&qspi_clk>; - clock-names = "qspi_clk"; - status = "disabled"; - }; - }; }; &osc2 { clock-frequency = <0>; diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 9c03a5935e..80f53ce124 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -212,6 +212,20 @@ config MACH_PCM038 Say Y here if you are using Phytec's phyCORE-i.MX27 (pcm038) equipped with a Freescale i.MX27 Processor +config MACH_KINDLE_MX50 + bool "i.MX50 based Amazon Kindle 4 and 5" + select ARCH_IMX50 + select SPI + select DRIVER_SPI_IMX + select I2C + select I2C_IMX + select MFD_MC13XXX + select ARM_BOARD_APPEND_ATAG + help + Say Y here if you are using the fourth or fifth generation Amazon + Kindle Model No. D01100 (Kindle Wi-Fi), D01200 (Kindle Touch) or + EY21 (Kindle Paperwhite). + config MACH_EFIKA_MX_SMARTBOOK bool "Efika MX smartbook" select ARCH_IMX51 diff --git a/arch/arm/mach-omap/am33xx_bbu_emmc.c b/arch/arm/mach-omap/am33xx_bbu_emmc.c index 3220575cd4..d3adb3744c 100644 --- a/arch/arm/mach-omap/am33xx_bbu_emmc.c +++ b/arch/arm/mach-omap/am33xx_bbu_emmc.c @@ -39,7 +39,7 @@ static int emmc_mlo_handler(struct bbu_handler *handler, struct bbu_data *data) if (ret != 0) return ret; - fd = open(handler->devicefile, O_WRONLY); + fd = open(handler->devicefile, O_RDWR); if (fd < 0) { pr_err("could not open %s: %s\n", handler->devicefile, errno_str()); diff --git a/arch/arm/mach-socfpga/include/mach/cyclone5-sequencer.h b/arch/arm/mach-socfpga/include/mach/cyclone5-sequencer.h index dd0378af34..d2da21d13f 100644 --- a/arch/arm/mach-socfpga/include/mach/cyclone5-sequencer.h +++ b/arch/arm/mach-socfpga/include/mach/cyclone5-sequencer.h @@ -369,7 +369,7 @@ static const uint32_t ac_rom_init[]; /* parameter variable holder */ -typedef struct param_type { +typedef struct sequencer_param_type { t_btfld dm_correct_mask; t_btfld read_correct_mask; t_btfld read_correct_mask_vg; diff --git a/arch/ppc/boards/pcm030/eeprom.c b/arch/ppc/boards/pcm030/eeprom.c index aa00f361cd..34bce85b94 100644 --- a/arch/ppc/boards/pcm030/eeprom.c +++ b/arch/ppc/boards/pcm030/eeprom.c @@ -53,7 +53,7 @@ static void pcm030_read_factory_data(const struct pcm030_eeprom *buf) continue; board = xstrndup(&buf->product[u], l); u += l + 1; - globalvar_add_simple("model.type", board); + globalvar_add_simple_string_fixed("model.type", board); free(board); } @@ -62,7 +62,7 @@ static void pcm030_read_factory_data(const struct pcm030_eeprom *buf) continue; serial = xstrndup(&buf->product[u], l); u += l + 1; - globalvar_add_simple("model.serial", serial); + globalvar_add_simple_string_fixed("model.serial", serial); free(serial); } |