mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 05:41:55 +00:00
f948ad0787
- New driver for AMD-8111 southbridge GPIOs - New driver for Wolfson Micro Arizona devices - Propagate device tree parse errors - Probe deferral finalizations - all expected calls to GPIO will now hopefully request deferral where apropriate - Misc updates to TCA6424, WM8994, LPC32xx, PCF857x, Samsung MXC, OMAP and PCA953X drivers. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQEHMDAAoJEEEQszewGV1zwPYP/jkxBzvEl+iEO0RFwT4PtmCi Y8JOJNT1bw/3MHPcRT12E+gzj01S9GldbuaUObcudmnnynpjeC0S8JNhSKGD9uHa TTcCcMbZiKzJyZr/OL8EId7W1FGUO+51uB4hqEKCHMWRY/PBIjKxhvtj+BKEWyvn OVhWCxo2O7lv7rzeKiPc8WJMiodLS1urbZEyz7IADZtT3m8vu146rEQRvbNSSXa0 AJfl494XX1sbv0tzYzvE66+vjvvkgsjHq3O7On5b2svdnZGpAL/6CjEUVrpBXr4K NPKuq9TsLfVMH3w3xvQ70PoA7M0L+KvKcdjTvgZpf2KLIU7dwoL91PzAupcjSTr1 SkcTPtNFxuaRy0cFD+ZAwL2eIOGaNxk6N4tj1da35QjCUkNROHG5K6ByIL1e1ewO NuxAyn7QLrYdmXzBc5/DhZiBA0ShqoYg4oEgBDZklOKqjT3mqmjQbDq8i0Qy197W lb3Barg+WWm+NW1kmPYnrOJUZXa1ApVHuz8db7OrcUy5kTcUhVTY3DcQzFgG1CZT H284c9Zm8WaP814jE8SzLMGeFaCuI63xFMNkpnba11Bt+8Cr1I+LjWSd+ttCFdVm W9t/fMEX1bVpVrbTKMvcwm7AwnoeOUEwJCqAICLe5OE/1mEvanyjNXX4wfFP58jv OlQ/a9REqoOLAvvbV2qp =tujx -----END PGP SIGNATURE----- Merge tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio Pull GPIO changes from Linus Walleij: - New driver for AMD-8111 southbridge GPIOs - New driver for Wolfson Micro Arizona devices - Propagate device tree parse errors - Probe deferral finalizations - all expected calls to GPIO will now hopefully request deferral where apropriate - Misc updates to TCA6424, WM8994, LPC32xx, PCF857x, Samsung MXC, OMAP and PCA953X drivers. Fix up gpio_idx conflicts in drivers/gpio/gpio-mxc.c * tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: gpio: of_get_named_gpio_flags() return -EPROBE_DEFER if GPIO not yet available gpiolib: Defer failed gpio requests by default MAINTAINERS: add entry OMAP GPIO driver gpio/pca953x: increase variables size to support 24 bit of data GPIO: PCA953X: Increase size of invert variable to support 24 bit gpio/omap: move bank->dbck initialization to omap_gpio_mod_init() gpio/mxc: use the edge_sel feature if available gpio: propagate of_parse_phandle_with_args errors gpio: samsung: add flags specifier to device-tree binding gpiolib: Add support for Wolfson Microelectronics Arizona class devices gpio: gpio-lpc32xx: Add gpio_to_irq mapping gpio: pcf857x: share 8/16 bit access functions gpio: LPC32xx: Driver cleanup MAINTAINERS: Add Wolfson gpiolib drivers to the Wolfson entry gpiolib: wm8994: Convert to devm_kzalloc() gpiolib: wm8994: Use irq_domain mappings for gpios gpio: add a driver for GPIO pins found on AMD-8111 south bridge chips gpio/tca6424: merge I2C transactions, remove cast gpio/of: fix a typo of comment message
105 lines
3.2 KiB
C
105 lines
3.2 KiB
C
/*
|
|
* Copyright (C) 1999,2000 Arm Limited
|
|
* Copyright (C) 2000 Deep Blue Solutions Ltd
|
|
* Copyright (C) 2002 Shane Nay (shane@minirl.com)
|
|
* Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
|
|
* - add MX31 specific definitions
|
|
*
|
|
* 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 <linux/mm.h>
|
|
#include <linux/init.h>
|
|
#include <linux/err.h>
|
|
#include <linux/pinctrl/machine.h>
|
|
|
|
#include <asm/pgtable.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <mach/common.h>
|
|
#include <mach/devices-common.h>
|
|
#include <mach/hardware.h>
|
|
#include <mach/mx25.h>
|
|
#include <mach/iomux-v3.h>
|
|
|
|
/*
|
|
* This table defines static virtual address mappings for I/O regions.
|
|
* These are the mappings common across all MX25 boards.
|
|
*/
|
|
static struct map_desc mx25_io_desc[] __initdata = {
|
|
imx_map_entry(MX25, AVIC, MT_DEVICE_NONSHARED),
|
|
imx_map_entry(MX25, AIPS1, MT_DEVICE_NONSHARED),
|
|
imx_map_entry(MX25, AIPS2, MT_DEVICE_NONSHARED),
|
|
};
|
|
|
|
/*
|
|
* This function initializes the memory map. It is called during the
|
|
* system startup to create static physical to virtual memory mappings
|
|
* for the IO modules.
|
|
*/
|
|
void __init mx25_map_io(void)
|
|
{
|
|
iotable_init(mx25_io_desc, ARRAY_SIZE(mx25_io_desc));
|
|
}
|
|
|
|
void __init imx25_init_early(void)
|
|
{
|
|
mxc_set_cpu_type(MXC_CPU_MX25);
|
|
mxc_iomux_v3_init(MX25_IO_ADDRESS(MX25_IOMUXC_BASE_ADDR));
|
|
mxc_arch_reset_init(MX25_IO_ADDRESS(MX25_WDOG_BASE_ADDR));
|
|
}
|
|
|
|
void __init mx25_init_irq(void)
|
|
{
|
|
mxc_init_irq(MX25_IO_ADDRESS(MX25_AVIC_BASE_ADDR));
|
|
}
|
|
|
|
static struct sdma_script_start_addrs imx25_sdma_script __initdata = {
|
|
.ap_2_ap_addr = 729,
|
|
.uart_2_mcu_addr = 904,
|
|
.per_2_app_addr = 1255,
|
|
.mcu_2_app_addr = 834,
|
|
.uartsh_2_mcu_addr = 1120,
|
|
.per_2_shp_addr = 1329,
|
|
.mcu_2_shp_addr = 1048,
|
|
.ata_2_mcu_addr = 1560,
|
|
.mcu_2_ata_addr = 1479,
|
|
.app_2_per_addr = 1189,
|
|
.app_2_mcu_addr = 770,
|
|
.shp_2_per_addr = 1407,
|
|
.shp_2_mcu_addr = 979,
|
|
};
|
|
|
|
static struct sdma_platform_data imx25_sdma_pdata __initdata = {
|
|
.fw_name = "sdma-imx25.bin",
|
|
.script_addrs = &imx25_sdma_script,
|
|
};
|
|
|
|
static const struct resource imx25_audmux_res[] __initconst = {
|
|
DEFINE_RES_MEM(MX25_AUDMUX_BASE_ADDR, SZ_16K),
|
|
};
|
|
|
|
void __init imx25_soc_init(void)
|
|
{
|
|
/* i.mx25 has the i.mx35 type gpio */
|
|
mxc_register_gpio("imx35-gpio", 0, MX25_GPIO1_BASE_ADDR, SZ_16K, MX25_INT_GPIO1, 0);
|
|
mxc_register_gpio("imx35-gpio", 1, MX25_GPIO2_BASE_ADDR, SZ_16K, MX25_INT_GPIO2, 0);
|
|
mxc_register_gpio("imx35-gpio", 2, MX25_GPIO3_BASE_ADDR, SZ_16K, MX25_INT_GPIO3, 0);
|
|
mxc_register_gpio("imx35-gpio", 3, MX25_GPIO4_BASE_ADDR, SZ_16K, MX25_INT_GPIO4, 0);
|
|
|
|
pinctrl_provide_dummies();
|
|
/* i.mx25 has the i.mx35 type sdma */
|
|
imx_add_imx_sdma("imx35-sdma", MX25_SDMA_BASE_ADDR, MX25_INT_SDMA, &imx25_sdma_pdata);
|
|
/* i.mx25 has the i.mx31 type audmux */
|
|
platform_device_register_simple("imx31-audmux", 0, imx25_audmux_res,
|
|
ARRAY_SIZE(imx25_audmux_res));
|
|
}
|