mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 00:21:59 +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
233 lines
7.1 KiB
C
233 lines
7.1 KiB
C
/*
|
|
* Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
|
|
*
|
|
* 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
|
|
*
|
|
* Create static mapping between physical to virtual memory.
|
|
*/
|
|
|
|
#include <linux/mm.h>
|
|
#include <linux/init.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/pinctrl/machine.h>
|
|
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <mach/common.h>
|
|
#include <mach/devices-common.h>
|
|
#include <mach/iomux-v3.h>
|
|
|
|
/*
|
|
* Define the MX50 memory map.
|
|
*/
|
|
static struct map_desc mx50_io_desc[] __initdata = {
|
|
imx_map_entry(MX50, TZIC, MT_DEVICE),
|
|
imx_map_entry(MX50, SPBA0, MT_DEVICE),
|
|
imx_map_entry(MX50, AIPS1, MT_DEVICE),
|
|
imx_map_entry(MX50, AIPS2, MT_DEVICE),
|
|
};
|
|
|
|
/*
|
|
* Define the MX51 memory map.
|
|
*/
|
|
static struct map_desc mx51_io_desc[] __initdata = {
|
|
imx_map_entry(MX51, TZIC, MT_DEVICE),
|
|
imx_map_entry(MX51, IRAM, MT_DEVICE),
|
|
imx_map_entry(MX51, AIPS1, MT_DEVICE),
|
|
imx_map_entry(MX51, SPBA0, MT_DEVICE),
|
|
imx_map_entry(MX51, AIPS2, MT_DEVICE),
|
|
};
|
|
|
|
/*
|
|
* Define the MX53 memory map.
|
|
*/
|
|
static struct map_desc mx53_io_desc[] __initdata = {
|
|
imx_map_entry(MX53, TZIC, MT_DEVICE),
|
|
imx_map_entry(MX53, AIPS1, MT_DEVICE),
|
|
imx_map_entry(MX53, SPBA0, MT_DEVICE),
|
|
imx_map_entry(MX53, AIPS2, MT_DEVICE),
|
|
};
|
|
|
|
/*
|
|
* 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 mx50_map_io(void)
|
|
{
|
|
iotable_init(mx50_io_desc, ARRAY_SIZE(mx50_io_desc));
|
|
}
|
|
|
|
void __init mx51_map_io(void)
|
|
{
|
|
iotable_init(mx51_io_desc, ARRAY_SIZE(mx51_io_desc));
|
|
}
|
|
|
|
void __init mx53_map_io(void)
|
|
{
|
|
iotable_init(mx53_io_desc, ARRAY_SIZE(mx53_io_desc));
|
|
}
|
|
|
|
void __init imx50_init_early(void)
|
|
{
|
|
mxc_set_cpu_type(MXC_CPU_MX50);
|
|
mxc_iomux_v3_init(MX50_IO_ADDRESS(MX50_IOMUXC_BASE_ADDR));
|
|
mxc_arch_reset_init(MX50_IO_ADDRESS(MX50_WDOG_BASE_ADDR));
|
|
}
|
|
|
|
void __init imx51_init_early(void)
|
|
{
|
|
mxc_set_cpu_type(MXC_CPU_MX51);
|
|
mxc_iomux_v3_init(MX51_IO_ADDRESS(MX51_IOMUXC_BASE_ADDR));
|
|
mxc_arch_reset_init(MX51_IO_ADDRESS(MX51_WDOG1_BASE_ADDR));
|
|
}
|
|
|
|
void __init imx53_init_early(void)
|
|
{
|
|
mxc_set_cpu_type(MXC_CPU_MX53);
|
|
mxc_iomux_v3_init(MX53_IO_ADDRESS(MX53_IOMUXC_BASE_ADDR));
|
|
mxc_arch_reset_init(MX53_IO_ADDRESS(MX53_WDOG1_BASE_ADDR));
|
|
}
|
|
|
|
void __init mx50_init_irq(void)
|
|
{
|
|
tzic_init_irq(MX50_IO_ADDRESS(MX50_TZIC_BASE_ADDR));
|
|
}
|
|
|
|
void __init mx51_init_irq(void)
|
|
{
|
|
tzic_init_irq(MX51_IO_ADDRESS(MX51_TZIC_BASE_ADDR));
|
|
}
|
|
|
|
void __init mx53_init_irq(void)
|
|
{
|
|
tzic_init_irq(MX53_IO_ADDRESS(MX53_TZIC_BASE_ADDR));
|
|
}
|
|
|
|
static struct sdma_script_start_addrs imx51_sdma_script __initdata = {
|
|
.ap_2_ap_addr = 642,
|
|
.uart_2_mcu_addr = 817,
|
|
.mcu_2_app_addr = 747,
|
|
.mcu_2_shp_addr = 961,
|
|
.ata_2_mcu_addr = 1473,
|
|
.mcu_2_ata_addr = 1392,
|
|
.app_2_per_addr = 1033,
|
|
.app_2_mcu_addr = 683,
|
|
.shp_2_per_addr = 1251,
|
|
.shp_2_mcu_addr = 892,
|
|
};
|
|
|
|
static struct sdma_platform_data imx51_sdma_pdata __initdata = {
|
|
.fw_name = "sdma-imx51.bin",
|
|
.script_addrs = &imx51_sdma_script,
|
|
};
|
|
|
|
static struct sdma_script_start_addrs imx53_sdma_script __initdata = {
|
|
.ap_2_ap_addr = 642,
|
|
.app_2_mcu_addr = 683,
|
|
.mcu_2_app_addr = 747,
|
|
.uart_2_mcu_addr = 817,
|
|
.shp_2_mcu_addr = 891,
|
|
.mcu_2_shp_addr = 960,
|
|
.uartsh_2_mcu_addr = 1032,
|
|
.spdif_2_mcu_addr = 1100,
|
|
.mcu_2_spdif_addr = 1134,
|
|
.firi_2_mcu_addr = 1193,
|
|
.mcu_2_firi_addr = 1290,
|
|
};
|
|
|
|
static struct sdma_platform_data imx53_sdma_pdata __initdata = {
|
|
.fw_name = "sdma-imx53.bin",
|
|
.script_addrs = &imx53_sdma_script,
|
|
};
|
|
|
|
static const struct resource imx50_audmux_res[] __initconst = {
|
|
DEFINE_RES_MEM(MX50_AUDMUX_BASE_ADDR, SZ_16K),
|
|
};
|
|
|
|
static const struct resource imx51_audmux_res[] __initconst = {
|
|
DEFINE_RES_MEM(MX51_AUDMUX_BASE_ADDR, SZ_16K),
|
|
};
|
|
|
|
static const struct resource imx53_audmux_res[] __initconst = {
|
|
DEFINE_RES_MEM(MX53_AUDMUX_BASE_ADDR, SZ_16K),
|
|
};
|
|
|
|
void __init imx50_soc_init(void)
|
|
{
|
|
/* i.mx50 has the i.mx35 type gpio */
|
|
mxc_register_gpio("imx35-gpio", 0, MX50_GPIO1_BASE_ADDR, SZ_16K, MX50_INT_GPIO1_LOW, MX50_INT_GPIO1_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 1, MX50_GPIO2_BASE_ADDR, SZ_16K, MX50_INT_GPIO2_LOW, MX50_INT_GPIO2_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 2, MX50_GPIO3_BASE_ADDR, SZ_16K, MX50_INT_GPIO3_LOW, MX50_INT_GPIO3_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 3, MX50_GPIO4_BASE_ADDR, SZ_16K, MX50_INT_GPIO4_LOW, MX50_INT_GPIO4_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 4, MX50_GPIO5_BASE_ADDR, SZ_16K, MX50_INT_GPIO5_LOW, MX50_INT_GPIO5_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 5, MX50_GPIO6_BASE_ADDR, SZ_16K, MX50_INT_GPIO6_LOW, MX50_INT_GPIO6_HIGH);
|
|
|
|
/* i.mx50 has the i.mx31 type audmux */
|
|
platform_device_register_simple("imx31-audmux", 0, imx50_audmux_res,
|
|
ARRAY_SIZE(imx50_audmux_res));
|
|
}
|
|
|
|
void __init imx51_soc_init(void)
|
|
{
|
|
/* i.mx51 has the i.mx35 type gpio */
|
|
mxc_register_gpio("imx35-gpio", 0, MX51_GPIO1_BASE_ADDR, SZ_16K, MX51_INT_GPIO1_LOW, MX51_INT_GPIO1_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 1, MX51_GPIO2_BASE_ADDR, SZ_16K, MX51_INT_GPIO2_LOW, MX51_INT_GPIO2_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 2, MX51_GPIO3_BASE_ADDR, SZ_16K, MX51_INT_GPIO3_LOW, MX51_INT_GPIO3_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 3, MX51_GPIO4_BASE_ADDR, SZ_16K, MX51_INT_GPIO4_LOW, MX51_INT_GPIO4_HIGH);
|
|
|
|
pinctrl_provide_dummies();
|
|
|
|
/* i.mx51 has the i.mx35 type sdma */
|
|
imx_add_imx_sdma("imx35-sdma", MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata);
|
|
|
|
/* Setup AIPS registers */
|
|
imx_set_aips(MX51_IO_ADDRESS(MX51_AIPS1_BASE_ADDR));
|
|
imx_set_aips(MX51_IO_ADDRESS(MX51_AIPS2_BASE_ADDR));
|
|
|
|
/* i.mx51 has the i.mx31 type audmux */
|
|
platform_device_register_simple("imx31-audmux", 0, imx51_audmux_res,
|
|
ARRAY_SIZE(imx51_audmux_res));
|
|
}
|
|
|
|
void __init imx53_soc_init(void)
|
|
{
|
|
/* i.mx53 has the i.mx35 type gpio */
|
|
mxc_register_gpio("imx35-gpio", 0, MX53_GPIO1_BASE_ADDR, SZ_16K, MX53_INT_GPIO1_LOW, MX53_INT_GPIO1_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 1, MX53_GPIO2_BASE_ADDR, SZ_16K, MX53_INT_GPIO2_LOW, MX53_INT_GPIO2_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 2, MX53_GPIO3_BASE_ADDR, SZ_16K, MX53_INT_GPIO3_LOW, MX53_INT_GPIO3_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 3, MX53_GPIO4_BASE_ADDR, SZ_16K, MX53_INT_GPIO4_LOW, MX53_INT_GPIO4_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 4, MX53_GPIO5_BASE_ADDR, SZ_16K, MX53_INT_GPIO5_LOW, MX53_INT_GPIO5_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 5, MX53_GPIO6_BASE_ADDR, SZ_16K, MX53_INT_GPIO6_LOW, MX53_INT_GPIO6_HIGH);
|
|
mxc_register_gpio("imx35-gpio", 6, MX53_GPIO7_BASE_ADDR, SZ_16K, MX53_INT_GPIO7_LOW, MX53_INT_GPIO7_HIGH);
|
|
|
|
pinctrl_provide_dummies();
|
|
/* i.mx53 has the i.mx35 type sdma */
|
|
imx_add_imx_sdma("imx35-sdma", MX53_SDMA_BASE_ADDR, MX53_INT_SDMA, &imx53_sdma_pdata);
|
|
|
|
/* Setup AIPS registers */
|
|
imx_set_aips(MX53_IO_ADDRESS(MX53_AIPS1_BASE_ADDR));
|
|
imx_set_aips(MX53_IO_ADDRESS(MX53_AIPS2_BASE_ADDR));
|
|
|
|
/* i.mx53 has the i.mx31 type audmux */
|
|
platform_device_register_simple("imx31-audmux", 0, imx53_audmux_res,
|
|
ARRAY_SIZE(imx53_audmux_res));
|
|
}
|
|
|
|
void __init imx51_init_late(void)
|
|
{
|
|
mx51_neon_fixup();
|
|
imx51_pm_init();
|
|
}
|
|
|
|
void __init imx53_init_late(void)
|
|
{
|
|
imx53_pm_init();
|
|
}
|