mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +00:00
e5476f57b3
Core GPIO library: - remove unused symbols - don't spam the kernel log with messages about hogs - remove old sysfs API cruft - improve handling of GPIO masks New drivers - add a driver for the BlueField-3 GPIO controller - add GPIO support for the TPS65219 PMIC Driver improvements: - extend the gpio-aggregator driver to support ramp-up/ramp-down delay - remove unnecessary CONFIG_OF guards from gpio-aggregator - readability improvements in gpio-tangier - switch i2c drivers back to using probe() now that it's been converted in the i2c subsystem to not taking the id parameter - remove unused inclusions of of_gpio.h in several drivers - make pm ops static in gpio-davinci and fix a comment - use more devres in drivers to shrink and simplify the code - add missing include in gpio-sa1100 - add HAS_IOPORT KConfig dependency where needed - add permissions checks before accessing pins in gpio-tegra186 - convert the gpio-zynq driver to using immutable irqchips - preserve output settings set by the bootloader in gpio-mpc8xxx Selftests: - tweak the variable naming in script tests Device tree updates: - convert gpio-mmio and gpio-stmpe to YAML - add parsing of GPIO hogs to gpio-vf610 - add bindings for the Cirrus EP93xx GPIO controller - add gpio-line-names property to the gpio-pca9570 bindings - extend the binding for x-powers,axp209 with another block -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAmSbB5YACgkQEacuoBRx 13I8xhAAoI9irAnAbh+Lgn0EdziMlqE6E8oohBtRY7rHK7Pi3IZNoATK3GT5bebF a0+EzqOTM22g2qIv41zkG7SyBgdkRg6Ld+/ogvlgddphhEGxY3MdRbSyPacHlzj1 BYnOJt+uQ46TwnzyTjVLn/1aGcD2LPB0j4rS1HnbsDHT8xGAjdq2O3YYNH7ZairA ZbIc/2Cpn4X1YWXX+s3a4B8w1eCEoRNG2Fvie6hmr518TSctP/MiFe6W7+eQrHwT GI491Rr4qT/lmRFVsxslYUPREUe/va8RM3uIC23zEkZYjsbRLJ2tvCGulm8D/H1n rUB9yXj+n5mCjTH7Gebg7J99NKpHo4uoXKrFhhetH9a0adsJCOwBr14YO8NP66jK hmZW8f8+QEAA4nhXx0VqpOp1FGw5unhPF/k8Apct8TeVJCv9i8g5QRreTf1030Hl l8x7JhsHlZGADGeLBPaNBIjuCB99YEMNtl4Ouzh7w1/1JsFcwI/cdASNxrsI4SCf Tl92+xAqZlfnnuHAQFiBBwKxnsHxclBwq3umMQD7kB3cdMELh2gqA3M8F+NGp5SB XMcE3gwDH53fXu74523G36sqNqkLNF0K974LwzSz0t4A8tSlwbt2esvzpxa0bDLe oqYD+TGAvX+uzr05KZ1kyUfD+95mMHsYY9sQWoUzHQelGmXV32M= =3KNJ -----END PGP SIGNATURE----- Merge tag 'gpio-updates-for-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux Pull gpio updates from Bartosz Golaszewski: "We have two new drivers, some improvements to the core code, lots of different updates to existing GPIO drivers and some dt-bindings on top. There's nothing controversial in here and almost everything has been in next for more than a week (95% a lot longer than this). The only thing that has spent less time in next is a new driver so no risk of regressions. The single merge pulls in changes that remove all usage of global GPIO numbers from arch/arm/mach-omap. Core GPIO library: - remove unused symbols - don't spam the kernel log with messages about hogs - remove old sysfs API cruft - improve handling of GPIO masks New drivers: - add a driver for the BlueField-3 GPIO controller - add GPIO support for the TPS65219 PMIC Driver improvements: - extend the gpio-aggregator driver to support ramp-up/ramp-down delay - remove unnecessary CONFIG_OF guards from gpio-aggregator - readability improvements in gpio-tangier - switch i2c drivers back to using probe() now that it's been converted in the i2c subsystem to not taking the id parameter - remove unused inclusions of of_gpio.h in several drivers - make pm ops static in gpio-davinci and fix a comment - use more devres in drivers to shrink and simplify the code - add missing include in gpio-sa1100 - add HAS_IOPORT KConfig dependency where needed - add permissions checks before accessing pins in gpio-tegra186 - convert the gpio-zynq driver to using immutable irqchips - preserve output settings set by the bootloader in gpio-mpc8xxx Selftests: - tweak the variable naming in script tests Device tree updates: - convert gpio-mmio and gpio-stmpe to YAML - add parsing of GPIO hogs to gpio-vf610 - add bindings for the Cirrus EP93xx GPIO controller - add gpio-line-names property to the gpio-pca9570 bindings - extend the binding for x-powers,axp209 with another block" * tag 'gpio-updates-for-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: (58 commits) of: unittest: drop assertions for GPIO hog messages gpiolib: Drop unused domain_ops memeber of GPIO IRQ chip gpio: synq: remove unused zynq_gpio_irq_reqres/zynq_gpio_irq_relres dt-bindings: gpio: gpio-vf610: Add parsing of hogs gpio: lpc18xx: Remove unused of_gpio.h inclusion gpio: xra1403: Remove unused of_gpio.h inclusion gpio: mpc8xxx: Remove unused of_gpio.h inclusion dt-bindings: gpio: Add Cirrus EP93xx gpio: mpc8xxx: latch GPIOs state on module load when configured as output selftests: gpio: gpio-sim: Use same variable name for sysfs pathname gpio: mlxbf3: Add gpio driver support gpio: delay: Remove duplicative functionality gpio: aggregator: Set up a parser of delay line parameters gpio: aggregator: Support delay for setting up individual GPIOs gpio: aggregator: Remove CONFIG_OF and of_match_ptr() protections dt-bindings: gpio: pca9570: add gpio-line-names property gpiolib: remove unused gpio_cansleep() gpio: tps65219: add GPIO support for TPS65219 PMIC gpio: zynq: fix zynqmp_gpio not an immutable chip warning gpio: davinci: make davinci_gpio_dev_pm_ops static ...
352 lines
9.0 KiB
C
352 lines
9.0 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* linux/arch/arm/mach-omap1/board-nokia770.c
|
|
*
|
|
* Modified from board-generic.c
|
|
*/
|
|
#include <linux/clkdev.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/gpio/consumer.h>
|
|
#include <linux/gpio/machine.h>
|
|
#include <linux/gpio/property.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/property.h>
|
|
#include <linux/input.h>
|
|
#include <linux/omapfb.h>
|
|
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/workqueue.h>
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/platform_data/keypad-omap.h>
|
|
#include <linux/platform_data/lcd-mipid.h>
|
|
#include <linux/platform_data/gpio-omap.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include "mux.h"
|
|
#include "hardware.h"
|
|
#include "usb.h"
|
|
#include "common.h"
|
|
#include "clock.h"
|
|
#include "mmc.h"
|
|
|
|
static const struct software_node nokia770_mpuio_gpiochip_node = {
|
|
.name = "mpuio",
|
|
};
|
|
|
|
static const struct software_node nokia770_gpiochip1_node = {
|
|
.name = "gpio-0-15",
|
|
};
|
|
|
|
static const struct software_node nokia770_gpiochip2_node = {
|
|
.name = "gpio-16-31",
|
|
};
|
|
|
|
static const struct software_node *nokia770_gpiochip_nodes[] = {
|
|
&nokia770_mpuio_gpiochip_node,
|
|
&nokia770_gpiochip1_node,
|
|
&nokia770_gpiochip2_node,
|
|
NULL
|
|
};
|
|
|
|
#define ADS7846_PENDOWN_GPIO 15
|
|
|
|
static const unsigned int nokia770_keymap[] = {
|
|
KEY(1, 0, GROUP_0 | KEY_UP),
|
|
KEY(2, 0, GROUP_1 | KEY_F5),
|
|
KEY(0, 1, GROUP_0 | KEY_LEFT),
|
|
KEY(1, 1, GROUP_0 | KEY_ENTER),
|
|
KEY(2, 1, GROUP_0 | KEY_RIGHT),
|
|
KEY(0, 2, GROUP_1 | KEY_ESC),
|
|
KEY(1, 2, GROUP_0 | KEY_DOWN),
|
|
KEY(2, 2, GROUP_1 | KEY_F4),
|
|
KEY(0, 3, GROUP_2 | KEY_F7),
|
|
KEY(1, 3, GROUP_2 | KEY_F8),
|
|
KEY(2, 3, GROUP_2 | KEY_F6),
|
|
};
|
|
|
|
static struct resource nokia770_kp_resources[] = {
|
|
[0] = {
|
|
.start = INT_KEYBOARD,
|
|
.end = INT_KEYBOARD,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static const struct matrix_keymap_data nokia770_keymap_data = {
|
|
.keymap = nokia770_keymap,
|
|
.keymap_size = ARRAY_SIZE(nokia770_keymap),
|
|
};
|
|
|
|
static struct omap_kp_platform_data nokia770_kp_data = {
|
|
.rows = 8,
|
|
.cols = 8,
|
|
.keymap_data = &nokia770_keymap_data,
|
|
.delay = 4,
|
|
};
|
|
|
|
static struct platform_device nokia770_kp_device = {
|
|
.name = "omap-keypad",
|
|
.id = -1,
|
|
.dev = {
|
|
.platform_data = &nokia770_kp_data,
|
|
},
|
|
.num_resources = ARRAY_SIZE(nokia770_kp_resources),
|
|
.resource = nokia770_kp_resources,
|
|
};
|
|
|
|
static struct platform_device *nokia770_devices[] __initdata = {
|
|
&nokia770_kp_device,
|
|
};
|
|
|
|
static struct mipid_platform_data nokia770_mipid_platform_data = { };
|
|
|
|
static const struct omap_lcd_config nokia770_lcd_config __initconst = {
|
|
.ctrl_name = "hwa742",
|
|
};
|
|
|
|
static const struct property_entry nokia770_mipid_props[] = {
|
|
PROPERTY_ENTRY_GPIO("reset-gpios", &nokia770_gpiochip1_node,
|
|
13, GPIO_ACTIVE_LOW),
|
|
{ }
|
|
};
|
|
|
|
static const struct software_node nokia770_mipid_swnode = {
|
|
.name = "lcd_mipid",
|
|
.properties = nokia770_mipid_props,
|
|
};
|
|
|
|
static void __init mipid_dev_init(void)
|
|
{
|
|
nokia770_mipid_platform_data.data_lines = 16;
|
|
|
|
omapfb_set_lcd_config(&nokia770_lcd_config);
|
|
}
|
|
|
|
static const struct property_entry nokia770_ads7846_props[] = {
|
|
PROPERTY_ENTRY_STRING("compatible", "ti,ads7846"),
|
|
PROPERTY_ENTRY_U32("touchscreen-size-x", 4096),
|
|
PROPERTY_ENTRY_U32("touchscreen-size-y", 4096),
|
|
PROPERTY_ENTRY_U32("touchscreen-max-pressure", 256),
|
|
PROPERTY_ENTRY_U32("touchscreen-average-samples", 10),
|
|
PROPERTY_ENTRY_U16("ti,x-plate-ohms", 180),
|
|
PROPERTY_ENTRY_U16("ti,debounce-tol", 3),
|
|
PROPERTY_ENTRY_U16("ti,debounce-rep", 1),
|
|
PROPERTY_ENTRY_GPIO("pendown-gpios", &nokia770_gpiochip1_node,
|
|
ADS7846_PENDOWN_GPIO, GPIO_ACTIVE_LOW),
|
|
{ }
|
|
};
|
|
|
|
static const struct software_node nokia770_ads7846_swnode = {
|
|
.name = "ads7846",
|
|
.properties = nokia770_ads7846_props,
|
|
};
|
|
|
|
static struct spi_board_info nokia770_spi_board_info[] __initdata = {
|
|
[0] = {
|
|
.modalias = "lcd_mipid",
|
|
.bus_num = 2,
|
|
.chip_select = 3,
|
|
.max_speed_hz = 12000000,
|
|
.platform_data = &nokia770_mipid_platform_data,
|
|
.swnode = &nokia770_mipid_swnode,
|
|
},
|
|
[1] = {
|
|
.modalias = "ads7846",
|
|
.bus_num = 2,
|
|
.chip_select = 0,
|
|
.max_speed_hz = 2500000,
|
|
.swnode = &nokia770_ads7846_swnode,
|
|
},
|
|
};
|
|
|
|
static void __init hwa742_dev_init(void)
|
|
{
|
|
clk_add_alias("hwa_sys_ck", NULL, "bclk", NULL);
|
|
}
|
|
|
|
/* assume no Mini-AB port */
|
|
|
|
static struct omap_usb_config nokia770_usb_config __initdata = {
|
|
.otg = 1,
|
|
.register_host = 1,
|
|
.register_dev = 1,
|
|
.hmc_mode = 16,
|
|
.pins[0] = 6,
|
|
.extcon = "tahvo-usb",
|
|
};
|
|
|
|
#if IS_ENABLED(CONFIG_MMC_OMAP)
|
|
|
|
static struct gpiod_lookup_table nokia770_mmc_gpio_table = {
|
|
.dev_id = "mmci-omap.1",
|
|
.table = {
|
|
/* Slot index 0, VSD power, GPIO 41 */
|
|
GPIO_LOOKUP_IDX("gpio-32-47", 9,
|
|
"vsd", 0, GPIO_ACTIVE_HIGH),
|
|
/* Slot index 0, switch, GPIO 23 */
|
|
GPIO_LOOKUP_IDX("gpio-16-31", 7,
|
|
"cover", 0, GPIO_ACTIVE_HIGH),
|
|
{ }
|
|
},
|
|
};
|
|
|
|
static struct omap_mmc_platform_data nokia770_mmc2_data = {
|
|
.nr_slots = 1,
|
|
.max_freq = 12000000,
|
|
.slots[0] = {
|
|
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
|
|
.name = "mmcblk",
|
|
},
|
|
};
|
|
|
|
static struct omap_mmc_platform_data *nokia770_mmc_data[OMAP16XX_NR_MMC];
|
|
|
|
static void __init nokia770_mmc_init(void)
|
|
{
|
|
gpiod_add_lookup_table(&nokia770_mmc_gpio_table);
|
|
/* Only the second MMC controller is used */
|
|
nokia770_mmc_data[1] = &nokia770_mmc2_data;
|
|
omap1_init_mmc(nokia770_mmc_data, OMAP16XX_NR_MMC);
|
|
}
|
|
|
|
#else
|
|
static inline void nokia770_mmc_init(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#if IS_ENABLED(CONFIG_I2C_CBUS_GPIO)
|
|
|
|
static const struct software_node_ref_args nokia770_cbus_gpio_refs[] = {
|
|
SOFTWARE_NODE_REFERENCE(&nokia770_mpuio_gpiochip_node, 9, 0),
|
|
SOFTWARE_NODE_REFERENCE(&nokia770_mpuio_gpiochip_node, 10, 0),
|
|
SOFTWARE_NODE_REFERENCE(&nokia770_mpuio_gpiochip_node, 11, 0),
|
|
};
|
|
|
|
static const struct property_entry nokia770_cbus_props[] = {
|
|
PROPERTY_ENTRY_REF_ARRAY("gpios", nokia770_cbus_gpio_refs),
|
|
{ }
|
|
};
|
|
|
|
static struct platform_device nokia770_cbus_device = {
|
|
.name = "i2c-cbus-gpio",
|
|
.id = 2,
|
|
};
|
|
|
|
static struct i2c_board_info nokia770_i2c_board_info_2[] __initdata = {
|
|
{
|
|
I2C_BOARD_INFO("retu", 0x01),
|
|
},
|
|
{
|
|
I2C_BOARD_INFO("tahvo", 0x02),
|
|
},
|
|
};
|
|
|
|
static void __init nokia770_cbus_init(void)
|
|
{
|
|
struct gpio_desc *d;
|
|
int irq;
|
|
|
|
d = gpiod_get(NULL, "retu_irq", GPIOD_IN);
|
|
if (IS_ERR(d)) {
|
|
pr_err("Unable to get CBUS Retu IRQ GPIO descriptor\n");
|
|
} else {
|
|
irq = gpiod_to_irq(d);
|
|
irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
|
|
nokia770_i2c_board_info_2[0].irq = irq;
|
|
}
|
|
d = gpiod_get(NULL, "tahvo_irq", GPIOD_IN);
|
|
if (IS_ERR(d)) {
|
|
pr_err("Unable to get CBUS Tahvo IRQ GPIO descriptor\n");
|
|
} else {
|
|
irq = gpiod_to_irq(d);
|
|
irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
|
|
nokia770_i2c_board_info_2[1].irq = irq;
|
|
}
|
|
i2c_register_board_info(2, nokia770_i2c_board_info_2,
|
|
ARRAY_SIZE(nokia770_i2c_board_info_2));
|
|
device_create_managed_software_node(&nokia770_cbus_device.dev,
|
|
nokia770_cbus_props, NULL);
|
|
platform_device_register(&nokia770_cbus_device);
|
|
}
|
|
#else /* CONFIG_I2C_CBUS_GPIO */
|
|
static void __init nokia770_cbus_init(void)
|
|
{
|
|
}
|
|
#endif /* CONFIG_I2C_CBUS_GPIO */
|
|
|
|
static struct gpiod_lookup_table nokia770_irq_gpio_table = {
|
|
.dev_id = NULL,
|
|
.table = {
|
|
/* GPIO used by SPI device 1 */
|
|
GPIO_LOOKUP("gpio-0-15", 15, "ads7846_irq",
|
|
GPIO_ACTIVE_HIGH),
|
|
/* GPIO used for retu IRQ */
|
|
GPIO_LOOKUP("gpio-48-63", 15, "retu_irq",
|
|
GPIO_ACTIVE_HIGH),
|
|
/* GPIO used for tahvo IRQ */
|
|
GPIO_LOOKUP("gpio-32-47", 8, "tahvo_irq",
|
|
GPIO_ACTIVE_HIGH),
|
|
/* GPIOs used by serial wakeup IRQs */
|
|
GPIO_LOOKUP_IDX("gpio-32-47", 5, "wakeup", 0,
|
|
GPIO_ACTIVE_HIGH),
|
|
GPIO_LOOKUP_IDX("gpio-16-31", 2, "wakeup", 1,
|
|
GPIO_ACTIVE_HIGH),
|
|
GPIO_LOOKUP_IDX("gpio-48-63", 1, "wakeup", 2,
|
|
GPIO_ACTIVE_HIGH),
|
|
{ }
|
|
},
|
|
};
|
|
|
|
static void __init omap_nokia770_init(void)
|
|
{
|
|
struct gpio_desc *d;
|
|
|
|
/* On Nokia 770, the SleepX signal is masked with an
|
|
* MPUIO line by default. It has to be unmasked for it
|
|
* to become functional */
|
|
|
|
/* SleepX mask direction */
|
|
omap_writew((omap_readw(0xfffb5008) & ~2), 0xfffb5008);
|
|
/* Unmask SleepX signal */
|
|
omap_writew((omap_readw(0xfffb5004) & ~2), 0xfffb5004);
|
|
|
|
software_node_register_node_group(nokia770_gpiochip_nodes);
|
|
platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices));
|
|
|
|
gpiod_add_lookup_table(&nokia770_irq_gpio_table);
|
|
d = gpiod_get(NULL, "ads7846_irq", GPIOD_IN);
|
|
if (IS_ERR(d))
|
|
pr_err("Unable to get ADS7846 IRQ GPIO descriptor\n");
|
|
else
|
|
nokia770_spi_board_info[1].irq = gpiod_to_irq(d);
|
|
|
|
spi_register_board_info(nokia770_spi_board_info,
|
|
ARRAY_SIZE(nokia770_spi_board_info));
|
|
omap_serial_init();
|
|
omap_register_i2c_bus(1, 100, NULL, 0);
|
|
hwa742_dev_init();
|
|
mipid_dev_init();
|
|
omap1_usb_init(&nokia770_usb_config);
|
|
nokia770_mmc_init();
|
|
nokia770_cbus_init();
|
|
}
|
|
|
|
MACHINE_START(NOKIA770, "Nokia 770")
|
|
.atag_offset = 0x100,
|
|
.map_io = omap1_map_io,
|
|
.init_early = omap1_init_early,
|
|
.init_irq = omap1_init_irq,
|
|
.init_machine = omap_nokia770_init,
|
|
.init_late = omap1_init_late,
|
|
.init_time = omap1_timer_init,
|
|
.restart = omap1_restart,
|
|
MACHINE_END
|