This patch adds the board specific data for the CG2900
driver on a UX500 board.
Signed-off-by: Par-Gunnar Hjalmdahl <[email protected]>
Acked-by: Linus Walleij <[email protected]>
---
arch/arm/mach-ux500/Makefile | 4 +
arch/arm/mach-ux500/board-mop500.c | 160 ++++++++++++++++
arch/arm/mach-ux500/devices-cg2900.c | 349 ++++++++++++++++++++++++++++++++++
arch/arm/mach-ux500/devices-cg2900.h | 19 ++
4 files changed, 532 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-ux500/devices-cg2900.c
create mode 100644 arch/arm/mach-ux500/devices-cg2900.h
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index b549a8f..47c92fa 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -2,6 +2,9 @@
# Makefile for the linux kernel, U8500 machine.
#
+ccflags-y := \
+ -Idrivers/staging/cg2900/include
+
obj-y := clock.o cpu.o devices.o devices-common.o \
id.o usb.o
obj-$(CONFIG_UX500_SOC_DB5500) += cpu-db5500.o dma-db5500.o
@@ -18,3 +21,4 @@ obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
obj-$(CONFIG_U5500_MODEM_IRQ) += modem-irq-db5500.o
obj-$(CONFIG_U5500_MBOX) += mbox-db5500.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
+obj-$(CONFIG_CG2900) += devices-cg2900.o
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index d8e5a52..352280a 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -26,10 +26,14 @@
#include <linux/gpio_keys.h>
#include <linux/mfd/tps6105x.h>
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <plat/i2c.h>
+#include <plat/pincfg.h>
#include <plat/ste_dma40.h>
#include <mach/hardware.h>
@@ -38,9 +42,12 @@
#include <mach/irqs.h>
#include "ste-dma40-db8500.h"
+#include "devices-cg2900.h"
#include "devices-db8500.h"
#include "board-mop500.h"
#include "board-mop500-regulators.h"
+#include "pins-db8500.h"
+#include "cg2900.h"
static struct ab8500_platform_data ab8500_platdata = {
.irq_base = MOP500_AB8500_IRQ_BASE,
@@ -300,6 +307,136 @@ static struct pl022_ssp_controller ssp0_platform_data = {
.num_chipselect = 5,
};
+#ifdef CONFIG_CG2900
+#define CG2900_BT_ENABLE_GPIO 170
+#define CG2900_GBF_ENA_RESET_GPIO 171
+#define CG2900_BT_CTS_GPIO 0
+
+enum cg2900_gpio_pull_sleep cg2900_sleep_gpio[21] = {
+ CG2900_NO_PULL, /* GPIO 0: PTA_CONFX */
+ CG2900_PULL_DN, /* GPIO 1: PTA_STATUS */
+ CG2900_NO_PULL, /* GPIO 2: UART_CTSN */
+ CG2900_PULL_UP, /* GPIO 3: UART_RTSN */
+ CG2900_PULL_UP, /* GPIO 4: UART_TXD */
+ CG2900_NO_PULL, /* GPIO 5: UART_RXD */
+ CG2900_PULL_DN, /* GPIO 6: IOM_DOUT */
+ CG2900_NO_PULL, /* GPIO 7: IOM_FSC */
+ CG2900_NO_PULL, /* GPIO 8: IOM_CLK */
+ CG2900_NO_PULL, /* GPIO 9: IOM_DIN */
+ CG2900_PULL_DN, /* GPIO 10: PWR_REQ */
+ CG2900_PULL_DN, /* GPIO 11: HOST_WAKEUP */
+ CG2900_PULL_DN, /* GPIO 12: IIS_DOUT */
+ CG2900_NO_PULL, /* GPIO 13: IIS_WS */
+ CG2900_NO_PULL, /* GPIO 14: IIS_CLK */
+ CG2900_NO_PULL, /* GPIO 15: IIS_DIN */
+ CG2900_PULL_DN, /* GPIO 16: PTA_FREQ */
+ CG2900_PULL_DN, /* GPIO 17: PTA_RF_ACTIVE */
+ CG2900_NO_PULL, /* GPIO 18: NotConnected (J6428) */
+ CG2900_NO_PULL, /* GPIO 19: EXT_DUTY_CYCLE */
+ CG2900_NO_PULL, /* GPIO 20: EXT_FRM_SYNCH */
+};
+
+static struct platform_device ux500_cg2900_device = {
+ .name = "cg2900",
+};
+
+#ifdef CONFIG_CG2900_CHIP
+static struct platform_device ux500_cg2900_chip_device = {
+ .name = "cg2900-chip",
+ .dev = {
+ .parent = &ux500_cg2900_device.dev,
+ },
+};
+#endif /* CONFIG_CG2900_CHIP */
+
+#ifdef CONFIG_STLC2690_CHIP
+static struct platform_device ux500_stlc2690_chip_device = {
+ .name = "stlc2690-chip",
+ .dev = {
+ .parent = &ux500_cg2900_device.dev,
+ },
+};
+#endif /* CONFIG_STLC2690_CHIP */
+
+#ifdef CONFIG_CG2900_TEST
+static struct cg2900_platform_data cg2900_test_platform_data = {
+ .bus = HCI_VIRTUAL,
+ .gpio_sleep = cg2900_sleep_gpio,
+};
+
+static struct platform_device ux500_cg2900_test_device = {
+ .name = "cg2900-test",
+ .dev = {
+ .parent = &ux500_cg2900_device.dev,
+ .platform_data = &cg2900_test_platform_data,
+ },
+};
+#endif /* CONFIG_CG2900_TEST */
+
+#ifdef CONFIG_CG2900_UART
+static struct resource cg2900_uart_resources[] = {
+ {
+ .start = CG2900_GBF_ENA_RESET_GPIO,
+ .end = CG2900_GBF_ENA_RESET_GPIO,
+ .flags = IORESOURCE_IO,
+ .name = "gbf_ena_reset",
+ },
+ {
+ .start = CG2900_BT_ENABLE_GPIO,
+ .end = CG2900_BT_ENABLE_GPIO,
+ .flags = IORESOURCE_IO,
+ .name = "bt_enable",
+ },
+ {
+ .start = CG2900_BT_CTS_GPIO,
+ .end = CG2900_BT_CTS_GPIO,
+ .flags = IORESOURCE_IO,
+ .name = "cts_gpio",
+ },
+ {
+ .start = NOMADIK_GPIO_TO_IRQ(CG2900_BT_CTS_GPIO),
+ .end = NOMADIK_GPIO_TO_IRQ(CG2900_BT_CTS_GPIO),
+ .flags = IORESOURCE_IRQ,
+ .name = "cts_irq",
+ },
+};
+
+static pin_cfg_t cg2900_uart_enabled[] = {
+ GPIO0_U0_CTSn | PIN_INPUT_PULLUP,
+ GPIO1_U0_RTSn | PIN_OUTPUT_HIGH,
+ GPIO2_U0_RXD | PIN_INPUT_PULLUP,
+ GPIO3_U0_TXD | PIN_OUTPUT_HIGH
+};
+
+static pin_cfg_t cg2900_uart_disabled[] = {
+ GPIO0_GPIO | PIN_INPUT_PULLUP, /* CTS pull up. */
+ GPIO1_GPIO | PIN_OUTPUT_HIGH, /* RTS high-flow off. */
+ GPIO2_GPIO | PIN_INPUT_PULLUP, /* RX pull down. */
+ GPIO3_GPIO | PIN_OUTPUT_LOW /* TX low - break on. */
+};
+
+static struct cg2900_platform_data cg2900_uart_platform_data = {
+ .bus = HCI_UART,
+ .gpio_sleep = cg2900_sleep_gpio,
+ .uart = {
+ .n_uart_gpios = 4,
+ .uart_enabled = cg2900_uart_enabled,
+ .uart_disabled = cg2900_uart_disabled,
+ },
+};
+
+static struct platform_device ux500_cg2900_uart_device = {
+ .name = "cg2900-uart",
+ .dev = {
+ .platform_data = &cg2900_uart_platform_data,
+ .parent = &ux500_cg2900_device.dev,
+ },
+ .num_resources = ARRAY_SIZE(cg2900_uart_resources),
+ .resource = cg2900_uart_resources,
+};
+#endif /* CONFIG_CG2900_UART */
+#endif /* CONFIG_CG2900 */
+
static void __init mop500_spi_init(void)
{
db8500_add_ssp0(&ssp0_platform_data);
@@ -417,6 +554,29 @@ static void __init mop500_init_machine(void)
platform_device_register(&ab8500_device);
+#ifdef CONFIG_CG2900
+#ifdef CONFIG_CG2900_TEST
+ dcg2900_init_platdata(&cg2900_test_platform_data);
+#endif /* CONFIG_CG2900_TEST */
+#ifdef CONFIG_CG2900_UART
+ dcg2900_init_platdata(&cg2900_uart_platform_data);
+#endif /* CONFIG_CG2900_UART */
+
+ platform_device_register(&ux500_cg2900_device);
+#ifdef CONFIG_CG2900_UART
+ platform_device_register(&ux500_cg2900_uart_device);
+#endif /* CONFIG_CG2900_UART */
+#ifdef CONFIG_CG2900_TEST
+ platform_device_register(&ux500_cg2900_test_device);
+#endif /* CONFIG_CG2900_TEST */
+#ifdef CONFIG_CG2900_CHIP
+ platform_device_register(&ux500_cg2900_chip_device);
+#endif /* CONFIG_CG2900_CHIP */
+#ifdef CONFIG_STLC2690_CHIP
+ platform_device_register(&ux500_stlc2690_chip_device);
+#endif /* CONFIG_STLC2690_CHIP */
+#endif /* CONFIG_CG2900 */
+
i2c_register_board_info(0, mop500_i2c0_devices,
ARRAY_SIZE(mop500_i2c0_devices));
i2c_register_board_info(2, mop500_i2c2_devices,
diff --git a/arch/arm/mach-ux500/devices-cg2900.c b/arch/arm/mach-ux500/devices-cg2900.c
new file mode 100644
index 0000000..525c871
--- /dev/null
+++ b/arch/arm/mach-ux500/devices-cg2900.c
@@ -0,0 +1,349 @@
+/*
+ * arch/arm/mach-ux500/devices-cg2900.c
+ *
+ * Copyright (C) ST-Ericsson SA 2010
+ * Authors:
+ * Par-Gunnar Hjalmdahl ([email protected]) for ST-Ericsson.
+ * Henrik Possung ([email protected]) for ST-Ericsson.
+ * Josef Kindberg ([email protected]) for ST-Ericsson.
+ * Dariusz Szymszak ([email protected]) for ST-Ericsson.
+ * Kjell Andersson ([email protected]) for ST-Ericsson.
+ * License terms: GNU General Public License (GPL), version 2
+ *
+ * Board specific device support for the Linux Bluetooth HCI H:4 Driver
+ * for ST-Ericsson connectivity controller.
+ */
+#define NAME "devices-cg2900"
+#define pr_fmt(fmt) NAME ": " fmt "\n"
+
+#include <asm/byteorder.h>
+#include <asm-generic/errno-base.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/sched.h>
+#include <linux/skbuff.h>
+#include <linux/spinlock.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <plat/pincfg.h>
+
+#include "cg2900.h"
+
+#ifdef CONFIG_CG2900
+
+#define BT_VS_POWER_SWITCH_OFF 0xFD40
+
+#define H4_HEADER_LENGTH 0x01
+#define BT_HEADER_LENGTH 0x03
+
+#define STLC2690_HCI_REV 0x0600
+#define CG2900_PG1_HCI_REV 0x0101
+#define CG2900_PG2_HCI_REV 0x0200
+#define CG2900_PG1_SPECIAL_HCI_REV 0x0700
+
+#define CHIP_INITIAL_HIGH_TIMEOUT 5 /* ms */
+#define CHIP_INITIAL_LOW_TIMEOUT 2 /* us */
+
+struct vs_power_sw_off_cmd {
+ __le16 op_code;
+ u8 len;
+ u8 gpio_0_7_pull_up;
+ u8 gpio_8_15_pull_up;
+ u8 gpio_16_20_pull_up;
+ u8 gpio_0_7_pull_down;
+ u8 gpio_8_15_pull_down;
+ u8 gpio_16_20_pull_down;
+} __attribute__((packed));
+
+struct dcg2900_info {
+ int gbf_gpio;
+ int bt_gpio;
+ bool sleep_gpio_set;
+ u8 gpio_0_7_pull_up;
+ u8 gpio_8_15_pull_up;
+ u8 gpio_16_20_pull_up;
+ u8 gpio_0_7_pull_down;
+ u8 gpio_8_15_pull_down;
+ u8 gpio_16_20_pull_down;
+ spinlock_t pdb_toggle_lock;
+};
+
+static void dcg2900_enable_chip(struct cg2900_chip_dev *dev)
+{
+ struct dcg2900_info *info = dev->b_data;
+ unsigned long flags;
+
+ if (info->gbf_gpio == -1)
+ return;
+
+ /*
+ * Due to a bug in some CG2900 we cannot just set GPIO high to enable
+ * the chip. We must do the following:
+ * 1: Set PDB high
+ * 2: Wait a few milliseconds
+ * 3: Set PDB low
+ * 4: Wait 2 microseconds
+ * 5: Set PDB high
+ * We disable interrupts step 3-5 to assure that step 4 does not take
+ * too long time (which would invalidate the fix).
+ */
+ gpio_set_value(info->gbf_gpio, 1);
+
+ schedule_timeout_uninterruptible(
+ msecs_to_jiffies(CHIP_INITIAL_HIGH_TIMEOUT));
+
+ spin_lock_irqsave(&info->pdb_toggle_lock, flags);
+ gpio_set_value(info->gbf_gpio, 0);
+ udelay(CHIP_INITIAL_LOW_TIMEOUT);
+ gpio_set_value(info->gbf_gpio, 1);
+ spin_unlock_irqrestore(&info->pdb_toggle_lock, flags);
+}
+
+static void dcg2900_disable_chip(struct cg2900_chip_dev *dev)
+{
+ struct dcg2900_info *info = dev->b_data;
+
+ if (info->gbf_gpio != -1)
+ gpio_set_value(info->gbf_gpio, 0);
+}
+
+static struct sk_buff *dcg2900_get_power_switch_off_cmd
+ (struct cg2900_chip_dev *dev, u16 *op_code)
+{
+ struct sk_buff *skb;
+ struct vs_power_sw_off_cmd *cmd;
+ struct dcg2900_info *info;
+ int i;
+
+ /* If connected chip does not support the command return NULL */
+ if (CG2900_PG1_SPECIAL_HCI_REV != dev->chip.hci_revision &&
+ CG2900_PG1_HCI_REV != dev->chip.hci_revision &&
+ CG2900_PG2_HCI_REV != dev->chip.hci_revision)
+ return NULL;
+
+ dev_dbg(dev->dev, "Generating PowerSwitchOff command\n");
+
+ info = dev->b_data;
+
+ skb = alloc_skb(sizeof(*cmd) + H4_HEADER_LENGTH, GFP_KERNEL);
+ if (!skb) {
+ dev_err(dev->dev, "Could not allocate skb\n");
+ return NULL;
+ }
+
+ skb_reserve(skb, H4_HEADER_LENGTH);
+ cmd = (struct vs_power_sw_off_cmd *)skb_put(skb, sizeof(*cmd));
+ cmd->op_code = cpu_to_le16(BT_VS_POWER_SWITCH_OFF);
+ cmd->len = sizeof(*cmd) - BT_HEADER_LENGTH;
+ /*
+ * Enter system specific GPIO settings here:
+ * Section data[3-5] is GPIO pull-up selection
+ * Section data[6-8] is GPIO pull-down selection
+ * Each section is a bitfield where
+ * - byte 0 bit 0 is GPIO 0
+ * - byte 0 bit 1 is GPIO 1
+ * - up to
+ * - byte 2 bit 4 which is GPIO 20
+ * where each bit means:
+ * - 0: No pull-up / no pull-down
+ * - 1: Pull-up / pull-down
+ * All GPIOs are set as input.
+ */
+ if (!info->sleep_gpio_set) {
+ struct cg2900_platform_data *pf_data;
+
+ pf_data = dev_get_platdata(dev->dev);
+ for (i = 0; i < 8; i++) {
+ if (pf_data->gpio_sleep[i] == CG2900_PULL_UP)
+ info->gpio_0_7_pull_up |= (1 << i);
+ else if (pf_data->gpio_sleep[i] == CG2900_PULL_DN)
+ info->gpio_0_7_pull_down |= (1 << i);
+ }
+ for (i = 8; i < 16; i++) {
+ if (pf_data->gpio_sleep[i] == CG2900_PULL_UP)
+ info->gpio_8_15_pull_up |= (1 << (i - 8));
+ else if (pf_data->gpio_sleep[i] == CG2900_PULL_DN)
+ info->gpio_8_15_pull_down |= (1 << (i - 8));
+ }
+ for (i = 16; i < 21; i++) {
+ if (pf_data->gpio_sleep[i] == CG2900_PULL_UP)
+ info->gpio_16_20_pull_up |= (1 << (i - 16));
+ else if (pf_data->gpio_sleep[i] == CG2900_PULL_DN)
+ info->gpio_16_20_pull_down |= (1 << (i - 16));
+ }
+ info->sleep_gpio_set = true;
+ }
+ cmd->gpio_0_7_pull_up = info->gpio_0_7_pull_up;
+ cmd->gpio_8_15_pull_up = info->gpio_8_15_pull_up;
+ cmd->gpio_16_20_pull_up = info->gpio_16_20_pull_up;
+ cmd->gpio_0_7_pull_down = info->gpio_0_7_pull_down;
+ cmd->gpio_8_15_pull_down = info->gpio_8_15_pull_down;
+ cmd->gpio_16_20_pull_down = info->gpio_16_20_pull_down;
+
+
+ if (op_code)
+ *op_code = BT_VS_POWER_SWITCH_OFF;
+
+ return skb;
+}
+
+static int dcg2900_init(struct cg2900_chip_dev *dev)
+{
+ int err = 0;
+ struct dcg2900_info *info;
+ struct resource *resource;
+ const char *gbf_name;
+ const char *bt_name = NULL;
+
+ /* First retrieve and save the resources */
+ info = kzalloc(sizeof(*info), GFP_KERNEL);
+ if (!info) {
+ dev_err(dev->dev, "Could not allocate dcg2900_info\n");
+ return -ENOMEM;
+ }
+
+ spin_lock_init(&info->pdb_toggle_lock);
+
+ if (!dev->pdev->num_resources) {
+ dev_dbg(dev->dev, "No resources available\n");
+ info->gbf_gpio = -1;
+ info->bt_gpio = -1;
+ goto finished;
+ }
+
+ resource = platform_get_resource_byname(dev->pdev, IORESOURCE_IO,
+ "gbf_ena_reset");
+ if (!resource) {
+ dev_err(dev->dev, "GBF GPIO does not exist\n");
+ err = -EINVAL;
+ goto err_handling;
+ }
+ info->gbf_gpio = resource->start;
+ gbf_name = resource->name;
+
+ resource = platform_get_resource_byname(dev->pdev, IORESOURCE_IO,
+ "bt_enable");
+ /* BT Enable GPIO may not exist */
+ if (resource) {
+ info->bt_gpio = resource->start;
+ bt_name = resource->name;
+ }
+
+ /* Now setup the GPIOs */
+ err = gpio_request(info->gbf_gpio, gbf_name);
+ if (err < 0) {
+ dev_err(dev->dev, "gpio_request failed with err: %d\n", err);
+ goto err_handling;
+ }
+
+ err = gpio_direction_output(info->gbf_gpio, 0);
+ if (err < 0) {
+ dev_err(dev->dev, "gpio_direction_output failed with err: %d\n",
+ err);
+ goto err_handling_free_gpio_gbf;
+ }
+
+ if (!bt_name) {
+ info->bt_gpio = -1;
+ goto finished;
+ }
+
+ err = gpio_request(info->bt_gpio, bt_name);
+ if (err < 0) {
+ dev_err(dev->dev, "gpio_request failed with err: %d\n", err);
+ goto err_handling_free_gpio_gbf;
+ }
+
+ err = gpio_direction_output(info->bt_gpio, 1);
+ if (err < 0) {
+ dev_err(dev->dev, "gpio_direction_output failed with err: %d\n",
+ err);
+ goto err_handling_free_gpio_bt;
+ }
+
+finished:
+ dev->b_data = info;
+ return 0;
+
+err_handling_free_gpio_bt:
+ gpio_free(info->bt_gpio);
+err_handling_free_gpio_gbf:
+ gpio_free(info->gbf_gpio);
+err_handling:
+ kfree(info);
+ return err;
+}
+
+static void dcg2900_exit(struct cg2900_chip_dev *dev)
+{
+ struct dcg2900_info *info = dev->b_data;
+
+ dcg2900_disable_chip(dev);
+ if (info->bt_gpio != -1)
+ gpio_free(info->bt_gpio);
+ if (info->gbf_gpio != -1)
+ gpio_free(info->gbf_gpio);
+ kfree(info);
+ dev->b_data = NULL;
+}
+
+#ifdef CONFIG_CG2900_UART
+static int dcg2900_disable_uart(struct cg2900_chip_dev *dev)
+{
+ int err;
+ struct cg2900_platform_data *pdata = dev_get_platdata(dev->dev);
+
+ /*
+ * Without this delay we get interrupt on CTS immediately
+ * due to some turbulences on this line.
+ */
+ mdelay(4);
+
+ /* Disable UART functions. */
+ err = nmk_config_pins(pdata->uart.uart_disabled,
+ pdata->uart.n_uart_gpios);
+ if (err)
+ goto error;
+
+ return 0;
+
+error:
+ (void)nmk_config_pins(pdata->uart.uart_enabled,
+ pdata->uart.n_uart_gpios);
+ dev_err(dev->dev, "Cannot set interrupt (%d)\n", err);
+ return err;
+}
+
+static int dcg2900_enable_uart(struct cg2900_chip_dev *dev)
+{
+ int err;
+ struct cg2900_platform_data *pdata = dev_get_platdata(dev->dev);
+
+ /* Restore UART settings. */
+ err = nmk_config_pins(pdata->uart.uart_enabled,
+ pdata->uart.n_uart_gpios);
+ if (err)
+ dev_err(dev->dev, "Unable to enable UART (%d)\n", err);
+
+ return err;
+}
+#endif /* CONFIG_CG2900_UART */
+
+void dcg2900_init_platdata(struct cg2900_platform_data *data)
+{
+ data->init = dcg2900_init;
+ data->exit = dcg2900_exit;
+ data->enable_chip = dcg2900_enable_chip;
+ data->disable_chip = dcg2900_disable_chip;
+ data->get_power_switch_off_cmd = dcg2900_get_power_switch_off_cmd;
+#ifdef CONFIG_CG2900_UART
+ data->uart.enable_uart = dcg2900_enable_uart;
+ data->uart.disable_uart = dcg2900_disable_uart;
+#endif /* CONFIG_CG2900_UART */
+}
+#endif /* CONFIG_CG2900 */
diff --git a/arch/arm/mach-ux500/devices-cg2900.h b/arch/arm/mach-ux500/devices-cg2900.h
new file mode 100644
index 0000000..a43e60e
--- /dev/null
+++ b/arch/arm/mach-ux500/devices-cg2900.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * Author: Par-Gunnar Hjalmdahl <[email protected]>
+ * License terms: GNU General Public License (GPL), version 2.
+ */
+
+#ifndef __DEVICES_CG2900_H
+#define __DEVICES_CG2900_H
+
+#include "cg2900.h"
+
+/**
+ * dcg2900_init_platdata() - Initializes platform data with callback functions.
+ * @data: Platform data.
+ */
+extern void dcg2900_init_platdata(struct cg2900_platform_data *data);
+
+#endif /* __DEVICES_CG2900_H */
--
1.7.4.1
Hi Linus,
> > As this touches ARM specific code, I need an ack from the ARM
> maintainer
> > before I can take this through the staging tree. =A0Is there any way to
> > make it part of your drivers/staging/ submission? =A0There are other
> > examples in the staging tree already that do this, why not do that
> here
> > as well?
>=20
> Hm yeah maybe it's possible if you move devices-cg2900.*
> to staging/cg2900, then split off the stuff in board-mop500.c into
> some drivers/staging/cg2900/board-mop500-cg2900.c which
> adds the device in some proper initcall.
>=20
> Do you think it can be done P-G? I might have overestimated
> the work involved in moving that stuff to /staging.
>=20
> Yours,
> Linus Walleij
As Arnd requested yesterday, I can move most of devices-cg2900, maybe all,
to the staging folder (probably to cg2900_lib.c). I will then minimize
whatever is needed in board-mop500.c. I will see what I can do.
Thanks,
/P-G
2011/3/23 Greg KH <[email protected]>:
>> =A0arch/arm/mach-ux500/Makefile =A0 =A0 =A0 =A0 | =A0 =A04 +
>> =A0arch/arm/mach-ux500/board-mop500.c =A0 | =A0160 ++++++++++++++++
>> =A0arch/arm/mach-ux500/devices-cg2900.c | =A0349 +++++++++++++++++++++++=
+++++++++++
>> =A0arch/arm/mach-ux500/devices-cg2900.h | =A0 19 ++
>> =A04 files changed, 532 insertions(+), 0 deletions(-)
>> =A0create mode 100644 arch/arm/mach-ux500/devices-cg2900.c
>> =A0create mode 100644 arch/arm/mach-ux500/devices-cg2900.h
>
> As this touches ARM specific code, I need an ack from the ARM maintainer
> before I can take this through the staging tree. =A0Is there any way to
> make it part of your drivers/staging/ submission? =A0There are other
> examples in the staging tree already that do this, why not do that here
> as well?
Hm yeah maybe it's possible if you move devices-cg2900.*
to staging/cg2900, then split off the stuff in board-mop500.c into
some drivers/staging/cg2900/board-mop500-cg2900.c which
adds the device in some proper initcall.
Do you think it can be done P-G? I might have overestimated
the work involved in moving that stuff to /staging.
Yours,
Linus Walleij
On Wednesday 23 March 2011, Par-Gunnar HJALMDAHL wrote:
> I will see how I can fix this. I'm not 100% how I will solve the
> "asking the hardware" part, but as you say we might be able to do
> this in a better way by doing it from the main staging driver instead.
The easiest way to do this would be to have separate board files for
devices with and without cg2900 and identify the hardware based on the
board number. If all ux500 boards have a cg2900, that would be trivial ;-)
Arnd
Hi Arnd,
=20
> > diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-
> ux500/Makefile
> > index b549a8f..47c92fa 100644
> > --- a/arch/arm/mach-ux500/Makefile
> > +++ b/arch/arm/mach-ux500/Makefile
> > @@ -2,6 +2,9 @@
> > # Makefile for the linux kernel, U8500 machine.
> > #
> >
> > +ccflags-y :=3D \
> > + -Idrivers/staging/cg2900/include
> > +
> > obj-y :=3D clock.o cpu.o devices.o
> devices-common.o \
> > id.o usb.o
>=20
> Could we keep this more self-contained? Just register a
> single device with the necessary resources and let the
> staging driver figure out how to initialize it, rather
> than splitting it between mach-ux500 and drivers/staging.
>=20
I will see what I can do.
> > +#ifdef CONFIG_CG2900
> > +#define CG2900_BT_ENABLE_GPIO 170
> > +#define CG2900_GBF_ENA_RESET_GPIO 171
> > +#define CG2900_BT_CTS_GPIO 0
>=20
> Don't make hardware definitions depending on Kconfig symbols.
> Just describe what the hardware looks like if present, and
> let the board code figure out if it's actually there.
>=20
Will fix.
> > +static struct platform_device ux500_cg2900_device =3D {
> > + .name =3D "cg2900",
> > +};
> > +
> > +#ifdef CONFIG_CG2900_CHIP
> > +static struct platform_device ux500_cg2900_chip_device =3D {
> > + .name =3D "cg2900-chip",
> > + .dev =3D {
> > + .parent =3D &ux500_cg2900_device.dev,
> > + },
> > +};
> > +#endif /* CONFIG_CG2900_CHIP */
> > +
> > +#ifdef CONFIG_STLC2690_CHIP
> > +static struct platform_device ux500_stlc2690_chip_device =3D {
> > + .name =3D "stlc2690-chip",
> > + .dev =3D {
> > + .parent =3D &ux500_cg2900_device.dev,
> > + },
> > +};
> > +#endif /* CONFIG_STLC2690_CHIP */
> > +
> > +#ifdef CONFIG_CG2900_TEST
> > +static struct cg2900_platform_data cg2900_test_platform_data =3D {
> > + .bus =3D HCI_VIRTUAL,
> > + .gpio_sleep =3D cg2900_sleep_gpio,
> > +};
>=20
> Also, don't make the device registration dependent on the Kconfig.
> Make sure that the hardware is there by asking the hardware, then
> register it, even if we don't compile the driver using it.
>=20
> I assume that this would get much simpler if you register everything
> from the .probe function of the main "cg2900" device.
>=20
I will see how I can fix this. I'm not 100% how I will solve the
"asking the hardware" part, but as you say we might be able to do
this in a better way by doing it from the main staging driver instead.
> > diff --git a/arch/arm/mach-ux500/devices-cg2900.c b/arch/arm/mach-
> ux500/devices-cg2900.c
> > new file mode 100644
> > index 0000000..525c871
> > --- /dev/null
> > +++ b/arch/arm/mach-ux500/devices-cg2900.c
>=20
> As far as I can tell, everything in this file can simply become part of
> the
> staging driver. I'm fine with basically anything that compiles going
> into
> drivers/staging, but we should keep the platform code outside of
> staging
> clean of stuff that might have to change as part of the staging
> process.
>=20
> Arnd
I agree that we can probably move at least most of the code, maybe all.
I will check and update.
Thanks,
/P-G
On Wednesday 23 March 2011, Par-Gunnar Hjalmdahl wrote:
> This patch adds the board specific data for the CG2900
> driver on a UX500 board.
Thanks for the follow-up in staging. I hope this will make the work
of getting this driver into shape done more easily as we have a
code base to discuss.
> diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
> index b549a8f..47c92fa 100644
> --- a/arch/arm/mach-ux500/Makefile
> +++ b/arch/arm/mach-ux500/Makefile
> @@ -2,6 +2,9 @@
> # Makefile for the linux kernel, U8500 machine.
> #
>
> +ccflags-y := \
> + -Idrivers/staging/cg2900/include
> +
> obj-y := clock.o cpu.o devices.o devices-common.o \
> id.o usb.o
Could we keep this more self-contained? Just register a
single device with the necessary resources and let the
staging driver figure out how to initialize it, rather
than splitting it between mach-ux500 and drivers/staging.
> +#ifdef CONFIG_CG2900
> +#define CG2900_BT_ENABLE_GPIO 170
> +#define CG2900_GBF_ENA_RESET_GPIO 171
> +#define CG2900_BT_CTS_GPIO 0
Don't make hardware definitions depending on Kconfig symbols.
Just describe what the hardware looks like if present, and
let the board code figure out if it's actually there.
> +static struct platform_device ux500_cg2900_device = {
> + .name = "cg2900",
> +};
> +
> +#ifdef CONFIG_CG2900_CHIP
> +static struct platform_device ux500_cg2900_chip_device = {
> + .name = "cg2900-chip",
> + .dev = {
> + .parent = &ux500_cg2900_device.dev,
> + },
> +};
> +#endif /* CONFIG_CG2900_CHIP */
> +
> +#ifdef CONFIG_STLC2690_CHIP
> +static struct platform_device ux500_stlc2690_chip_device = {
> + .name = "stlc2690-chip",
> + .dev = {
> + .parent = &ux500_cg2900_device.dev,
> + },
> +};
> +#endif /* CONFIG_STLC2690_CHIP */
> +
> +#ifdef CONFIG_CG2900_TEST
> +static struct cg2900_platform_data cg2900_test_platform_data = {
> + .bus = HCI_VIRTUAL,
> + .gpio_sleep = cg2900_sleep_gpio,
> +};
Also, don't make the device registration dependent on the Kconfig.
Make sure that the hardware is there by asking the hardware, then
register it, even if we don't compile the driver using it.
I assume that this would get much simpler if you register everything
from the .probe function of the main "cg2900" device.
> diff --git a/arch/arm/mach-ux500/devices-cg2900.c b/arch/arm/mach-ux500/devices-cg2900.c
> new file mode 100644
> index 0000000..525c871
> --- /dev/null
> +++ b/arch/arm/mach-ux500/devices-cg2900.c
As far as I can tell, everything in this file can simply become part of the
staging driver. I'm fine with basically anything that compiles going into
drivers/staging, but we should keep the platform code outside of staging
clean of stuff that might have to change as part of the staging process.
Arnd
Hi Greg,
> -----Original Message-----
> From: Greg KH [mailto:[email protected]]
> Sent: den 23 mars 2011 15:27
> To: Par-Gunnar HJALMDAHL
> Cc: [email protected]; Linus Walleij; linux-
> [email protected]; [email protected]; Pavan Savoy;
> Vitaly Wool; Alan Cox; Arnd Bergmann; Marcel Holtmann; Lukasz
> Rymanowski; Linus WALLEIJ; Par-Gunnar Hjalmdahl; Lee Jones
> Subject: Re: [PATCH 2/2] mach-ux500: Add CG2900 devices
>=20
> On Wed, Mar 23, 2011 at 03:00:03PM +0100, Par-Gunnar Hjalmdahl wrote:
> > This patch adds the board specific data for the CG2900
> > driver on a UX500 board.
> >
> > Signed-off-by: Par-Gunnar Hjalmdahl <par-
> [email protected]>
> > Acked-by: Linus Walleij <[email protected]>
> > ---
> > arch/arm/mach-ux500/Makefile | 4 +
> > arch/arm/mach-ux500/board-mop500.c | 160 ++++++++++++++++
> > arch/arm/mach-ux500/devices-cg2900.c | 349
> ++++++++++++++++++++++++++++++++++
> > arch/arm/mach-ux500/devices-cg2900.h | 19 ++
> > 4 files changed, 532 insertions(+), 0 deletions(-)
> > create mode 100644 arch/arm/mach-ux500/devices-cg2900.c
> > create mode 100644 arch/arm/mach-ux500/devices-cg2900.h
>=20
> As this touches ARM specific code, I need an ack from the ARM
> maintainer
> before I can take this through the staging tree. Is there any way to
> make it part of your drivers/staging/ submission? There are other
> examples in the staging tree already that do this, why not do that here
> as well?
>=20
> thanks,
>=20
> greg k-h
I've been discussing this with Linus Walleij, who is the maintainer of
arch/arm/mach-ux500.
He suggested that I should let this be a separate patch and that I
should include it in the same patch set where he would pick the patch
from it.
I guess he will respond soon since he's on cc.
/P-G
On Wed, Mar 23, 2011 at 03:00:03PM +0100, Par-Gunnar Hjalmdahl wrote:
> This patch adds the board specific data for the CG2900
> driver on a UX500 board.
>
> Signed-off-by: Par-Gunnar Hjalmdahl <[email protected]>
> Acked-by: Linus Walleij <[email protected]>
> ---
> arch/arm/mach-ux500/Makefile | 4 +
> arch/arm/mach-ux500/board-mop500.c | 160 ++++++++++++++++
> arch/arm/mach-ux500/devices-cg2900.c | 349 ++++++++++++++++++++++++++++++++++
> arch/arm/mach-ux500/devices-cg2900.h | 19 ++
> 4 files changed, 532 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/mach-ux500/devices-cg2900.c
> create mode 100644 arch/arm/mach-ux500/devices-cg2900.h
As this touches ARM specific code, I need an ack from the ARM maintainer
before I can take this through the staging tree. Is there any way to
make it part of your drivers/staging/ submission? There are other
examples in the staging tree already that do this, why not do that here
as well?
thanks,
greg k-h