Malta/SEAD3 kernel image size patches for 3.18

There is no point building the drivers for the i2c related devices if CONFIG_I2C is not enabled.

This also fixes a randconfig problem:

arch/mips/mti-sead3/sead3-pic32-i2c-drv.c: In function 'i2c_platform_probe':
arch/mips/mti-sead3/sead3-pic32-i2c-drv.c:345:2: error: implicit declaration of function 'i2c_add_numbered_adapter' [-Werror=implicit-function-declaration]

  ret = i2c_add_numbered_adapter(&priv->adap);
    ^

arch/mips/mti-sead3/sead3-pic32-i2c-drv.c: In function 'i2c_platform_remove':
arch/mips/mti-sead3/sead3-pic32-i2c-drv.c:361:2: error: implicit declaration of function 'i2c_del_adapter' [-Werror=implicit-function-declaration] i2c_del_adapter(&priv->adap);

Quoted 8 lines

There is no point building the drivers for the i2c related devices if CONFIG_I2C is not enabled.

This also fixes a randconfig problem:

arch/mips/mti-sead3/sead3-pic32-i2c-drv.c: In function 'i2c_platform_probe':
arch/mips/mti-sead3/sead3-pic32-i2c-drv.c:345:2: error: implicit declaration of function 'i2c_add_numbered_adapter' [-Werror=implicit-function-declaration]

Quoted 7 lines

  ret = i2c_add_numbered_adapter(&priv->adap);
    ^

arch/mips/mti-sead3/sead3-pic32-i2c-drv.c: In function 'i2c_platform_remove':
arch/mips/mti-sead3/sead3-pic32-i2c-drv.c:361:2: error: implicit declaration of function 'i2c_del_adapter' [-Werror=implicit-function-declaration] i2c_del_adapter(&priv->adap);

The platform devices should always be registered.

And why on earth is there an I2C drivers in arch? That should rather go to drivers/i2c/busses/.

Fixes the following build problem if CONFIG_I2C is disabled:

arch/mips/mti-sead3/sead3-pic32-i2c-drv.c: In function 'i2c_platform_probe':
arch/mips/mti-sead3/sead3-pic32-i2c-drv.c:345:2: error: implicit declaration of function 'i2c_add_numbered_adapter' [-Werror=implicit-function-declaration]

  ret = i2c_add_numbered_adapter(&priv->adap);
    ^

arch/mips/mti-sead3/sead3-pic32-i2c-drv.c: In function 'i2c_platform_remove':
arch/mips/mti-sead3/sead3-pic32-i2c-drv.c:361:2: error: implicit declaration of function 'i2c_del_adapter' [-Werror=implicit-function-declaration] i2c_del_adapter(&priv->adap);

Signed-off-by Ralf Baechle <[email protected]>

Cc Markos Chandras <[email protected]>

Cc Wolfram Sang <[email protected]>

Cc [email protected]

Cc [email protected]

Cc Chris Dearman <[email protected]>

drivers/i2c/busses/i2c-sead3.c new file +3 -0

new file mode 100644
index 0000000..1f787a6
@@ -0,0 +1,405 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive

drivers/i2c/busses/i2c-sead3.c new file +28 -0

+
+#define PIC32_I2CxCON		0x0000
+#define	 PIC32_I2CCON_ON	(1<<15)
+#define	 PIC32_I2CCON_ACKDT	(1<<5)
+#define	 PIC32_I2CCON_ACKEN	(1<<4)
+#define	 PIC32_I2CCON_RCEN	(1<<3)
+#define	 PIC32_I2CCON_PEN	(1<<2)
+#define	 PIC32_I2CCON_RSEN	(1<<1)
+#define	 PIC32_I2CCON_SEN	(1<<0)
+#define PIC32_I2CxCONCLR	0x0004
+#define PIC32_I2CxCONSET	0x0008
+#define PIC32_I2CxSTAT		0x0010
+#define PIC32_I2CxSTATCLR	0x0014
+#define	 PIC32_I2CSTAT_ACKSTAT	(1<<15)
+#define	 PIC32_I2CSTAT_TRSTAT	(1<<14)
+#define	 PIC32_I2CSTAT_BCL	(1<<10)
+#define	 PIC32_I2CSTAT_IWCOL	(1<<7)
+#define	 PIC32_I2CSTAT_I2COV	(1<<6)
+#define PIC32_I2CxBRG		0x0040
+#define PIC32_I2CxTRN		0x0050
+#define PIC32_I2CxRCV		0x0060
+
+static DEFINE_SPINLOCK(pic32_bus_lock);
+
+static void __iomem *bus_xfer	= (void __iomem *)0xbf000600;
+static void __iomem *bus_status = (void __iomem *)0xbf000060;
+
+#define DELAY() udelay(100)

drivers/i2c/busses/i2c-sead3.c new file +10 -0

+
+static inline void check_ioclear(void)
+{
+	if (ioready()) {
+		do {
+			(void) readl(bus_xfer);
+			DELAY();
+		} while (ioready());
+	}
+}

drivers/i2c/busses/i2c-sead3.c new file +28 -0

+	DELAY();
+	wait_ioready();
+	status = readl(bus_xfer);
+	DELAY();
+	val = readl(bus_xfer);
+	wait_ioclear();
+
+	spin_unlock_irqrestore(&pic32_bus_lock, flags);
+
+	return val;
+}
+
+static void pic32_bus_writel(u32 val, u32 reg)
+{
+	unsigned long flags;
+	u32 status;
+
+	spin_lock_irqsave(&pic32_bus_lock, flags);
+
+	check_ioclear();
+	writel((0x10 << 24) | (reg & 0x00ffffff), bus_xfer);
+	DELAY();
+	writel(val, bus_xfer);
+	DELAY();
+	wait_ioready();
+	status = readl(bus_xfer);
+	wait_ioclear();
+

drivers/i2c/busses/i2c-sead3.c new file +64 -0

+
+static inline void pic32_i2c_start(struct pic32_i2c_platform_data *adap)
+{
+	pic32_bus_writel(PIC32_I2CCON_SEN, adap->base + PIC32_I2CxCONSET);
+}
+
+static inline void pic32_i2c_stop(struct pic32_i2c_platform_data *adap)
+{
+	pic32_bus_writel(PIC32_I2CCON_PEN, adap->base + PIC32_I2CxCONSET);
+}
+
+static inline void pic32_i2c_ack(struct pic32_i2c_platform_data *adap)
+{
+	pic32_bus_writel(PIC32_I2CCON_ACKDT, adap->base + PIC32_I2CxCONCLR);
+	pic32_bus_writel(PIC32_I2CCON_ACKEN, adap->base + PIC32_I2CxCONSET);
+}
+
+static inline void pic32_i2c_nack(struct pic32_i2c_platform_data *adap)
+{
+	pic32_bus_writel(PIC32_I2CCON_ACKDT, adap->base + PIC32_I2CxCONSET);
+	pic32_bus_writel(PIC32_I2CCON_ACKEN, adap->base + PIC32_I2CxCONSET);
+}
+
+static inline int pic32_i2c_idle(struct pic32_i2c_platform_data *adap)
+{
+	int i;
+
+	for (i = 0; i < adap->ctl_timeout; i++) {
+		if (((pic32_bus_readl(adap->base + PIC32_I2CxCON) &
+		      (PIC32_I2CCON_ACKEN | PIC32_I2CCON_RCEN |
+		       PIC32_I2CCON_PEN | PIC32_I2CCON_RSEN |
+		       PIC32_I2CCON_SEN)) == 0) &&
+		    ((pic32_bus_readl(adap->base + PIC32_I2CxSTAT) &
+		      (PIC32_I2CSTAT_TRSTAT)) == 0))
+			return 0;
+		udelay(1);
+	}
+	return -ETIMEDOUT;
+}
+
+static inline u32 pic32_i2c_master_write(struct pic32_i2c_platform_data *adap,
+		u32 byte)
+{
+	pic32_bus_writel(byte, adap->base + PIC32_I2CxTRN);
+	return pic32_bus_readl(adap->base + PIC32_I2CxSTAT) &
+			PIC32_I2CSTAT_IWCOL;
+}
+
+static inline u32 pic32_i2c_master_read(struct pic32_i2c_platform_data *adap)
+{
+	pic32_bus_writel(PIC32_I2CCON_RCEN, adap->base + PIC32_I2CxCONSET);
+	while (pic32_bus_readl(adap->base + PIC32_I2CxCON) & PIC32_I2CCON_RCEN)
+		;
+	pic32_bus_writel(PIC32_I2CSTAT_I2COV, adap->base + PIC32_I2CxSTATCLR);
+	return pic32_bus_readl(adap->base + PIC32_I2CxRCV);
+}
+
+static int pic32_i2c_address(struct pic32_i2c_platform_data *adap,
+		unsigned int addr, int rd)
+{
+	pic32_i2c_idle(adap);
+	pic32_i2c_start(adap);
+	pic32_i2c_idle(adap);
+

drivers/i2c/busses/i2c-sead3.c new file +29 -0

+	return 0;
+}
+
+static int sead3_i2c_read(struct pic32_i2c_platform_data *adap,
+		unsigned char *buf, unsigned int len)
+{
+	u32 data;
+	int i;
+
+	i = 0;
+	while (i < len) {
+		data = pic32_i2c_master_read(adap);
+		buf[i++] = data;
+		if (i < len)
+			pic32_i2c_ack(adap);
+		else
+			pic32_i2c_nack(adap);
+	}
+
+	pic32_i2c_stop(adap);
+	pic32_i2c_idle(adap);
+	return 0;
+}
+
+static int sead3_i2c_write(struct pic32_i2c_platform_data *adap,
+		unsigned char *buf, unsigned int len)
+{
+	int i;
+	u32 data;

drivers/i2c/busses/i2c-sead3.c new file +23 -0

+		i++;
+	}
+
+	pic32_i2c_stop(adap);
+	pic32_i2c_idle(adap);
+	return 0;
+}
+
+static int sead3_pic32_platform_xfer(struct i2c_adapter *i2c_adap,
+		struct i2c_msg *msgs, int num)
+{
+	struct pic32_i2c_platform_data *adap = i2c_adap->algo_data;
+	struct i2c_msg *p;
+	int i, err = 0;
+
+	for (i = 0; i < num; i++) {
+#define __BUFSIZE 80
+		int ii;
+		static char buf[__BUFSIZE];
+		char *b = buf;
+
+		p = &msgs[i];
+		b += sprintf(buf, " [%d bytes]", p->len);

drivers/i2c/busses/i2c-sead3.c new file +41 -0

+		if (p->flags & I2C_M_RD)
+			err = sead3_i2c_read(adap, p->buf, p->len);
+		else
+			err = sead3_i2c_write(adap, p->buf, p->len);
+	}
+
+	/* Return the number of messages processed, or the error code. */
+	if (err == 0)
+		err = num;
+
+	return err;
+}
+
+static u32 sead3_pic32_platform_func(struct i2c_adapter *adap)
+{
+	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
+}
+
+static const struct i2c_algorithm sead3_platform_algo = {
+	.master_xfer	= sead3_pic32_platform_xfer,
+	.functionality	= sead3_pic32_platform_func,
+};
+
+static void sead3_i2c_platform_setup(struct pic32_i2c_platform_data *priv)
+{
+	pic32_bus_writel(500, priv->base + PIC32_I2CxBRG);
+	pic32_bus_writel(PIC32_I2CCON_ON, priv->base + PIC32_I2CxCONCLR);
+	pic32_bus_writel(PIC32_I2CCON_ON, priv->base + PIC32_I2CxCONSET);
+	pic32_bus_writel(PIC32_I2CSTAT_BCL | PIC32_I2CSTAT_IWCOL,
+		priv->base + PIC32_I2CxSTATCLR);
+}
+
+static int sead3_i2c_platform_probe(struct platform_device *pdev)
+{
+	struct pic32_i2c_platform_data *priv;
+	struct resource *r;
+	int ret;
+
+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!r) {
+		ret = -ENODEV;

drivers/i2c/busses/i2c-sead3.c new file +35 -0

+		return 0;
+	}
+
+out_mem:
+	kfree(priv);
+out:
+	return ret;
+}
+
+static int sead3_i2c_platform_remove(struct platform_device *pdev)
+{
+	struct pic32_i2c_platform_data *priv = platform_get_drvdata(pdev);
+
+	platform_set_drvdata(pdev, NULL);
+	i2c_del_adapter(&priv->adap);
+	kfree(priv);
+	return 0;
+}
+
+#ifdef CONFIG_PM
+static int sead3_i2c_platform_suspend(struct platform_device *pdev,
+		pm_message_t state)
+{
+	dev_dbg(&pdev->dev, "i2c_platform_disable\n");
+	return 0;
+}
+
+static int sead3_i2c_platform_resume(struct platform_device *pdev)
+{
+	struct pic32_i2c_platform_data *priv = platform_get_drvdata(pdev);
+
+	dev_dbg(&pdev->dev, "sead3_i2c_platform_setup\n");
+	sead3_i2c_platform_setup(priv);
+
+	return 0;

drivers/i2c/busses/i2c-sead3.c new file +8 -0

+	},
+	.probe		= sead3_i2c_platform_probe,
+	.remove		= sead3_i2c_platform_remove,
+	.suspend	= sead3_i2c_platform_suspend,
+	.resume		= sead3_i2c_platform_resume,
+};
+
+static int __init sead3_i2c_platform_init(void)

drivers/i2c/busses/i2c-sead3.c new file +4 -0

+
+MODULE_AUTHOR("Chris Dearman, MIPS Technologies INC.");
+MODULE_DESCRIPTION("SEAD3 PIC32 I2C driver");
+MODULE_LICENSE("GPL");

leds-sead3.c:(.text+0x7dc): undefined reference to led_classdev_unregister' leds-sead3.c:(.text+0x7e8): undefined reference to led_classdev_unregister'

Reviewed-by Steven J. Hill <[email protected]>

Signed-off-by Markos Chandras <[email protected]>

Fixes the following randconfig problem

leds-sead3.c:(.text+0x7dc): undefined reference to led_classdev_unregister' leds-sead3.c:(.text+0x7e8): undefined reference to led_classdev_unregister'

Signed-off-by Ralf Baechle <[email protected]>

---
 arch/mips/mti-sead3/Makefile     |  2 +-
 arch/mips/mti-sead3/leds-sead3.c | 90 ----------------------------------------
 drivers/leds/Kconfig             |  9 ++++
 drivers/leds/Makefile            |  1 +
 drivers/leds/leds-sead3.c        | 90 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 101 insertions(+), 91 deletions(-)
 delete mode 100644 arch/mips/mti-sead3/leds-sead3.c
 create mode 100644 drivers/leds/leds-sead3.c

arch/mips/mti-sead3/Makefile +1 -1

index febf433..aa8a857 100644
@@ -15,7 +15,7 @@ obj-y                         := sead3-lcd.o sead3-display.o sead3-init.o \
 
 obj-y                          += sead3-i2c-dev.o sead3-i2c.o \
                                   sead3-pic32-i2c-drv.o sead3-pic32-bus.o \
-                                  leds-sead3.o sead3-leds.o
+                                  sead3-leds.o
 
 obj-$(CONFIG_EARLY_PRINTK)     += sead3-console.o
 obj-$(CONFIG_USB_EHCI_HCD)     += sead3-ehci.o

arch/mips/mti-sead3/leds-sead3.c deleted +0 -90

deleted file mode 100644
index e5632e6..0000000
@@ -1,90 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
- */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/leds.h>
-#include <linux/err.h>
-#include <linux/io.h>
-
-#define DRVNAME "sead3-led"
-
-static void sead3_pled_set(struct led_classdev *led_cdev,
-               enum led_brightness value)
-{
-       pr_debug("sead3_pled_set\n");
-       writel(value, (void __iomem *)0xBF000210);      /* FIXME */
-}
-
-static void sead3_fled_set(struct led_classdev *led_cdev,
-               enum led_brightness value)
-{
-       pr_debug("sead3_fled_set\n");
-       writel(value, (void __iomem *)0xBF000218);      /* FIXME */
-}
-
-static struct led_classdev sead3_pled = {
-       .name           = "sead3::pled",
-       .brightness_set = sead3_pled_set,
-       .flags          = LED_CORE_SUSPENDRESUME,
-};
-
-static struct led_classdev sead3_fled = {
-       .name           = "sead3::fled",
-       .brightness_set = sead3_fled_set,
-       .flags          = LED_CORE_SUSPENDRESUME,
-};
-
-static int sead3_led_probe(struct platform_device *pdev)
-{
-       int ret;
-
-       ret = led_classdev_register(&pdev->dev, &sead3_pled);
-       if (ret < 0)
-               return ret;
-
-       ret = led_classdev_register(&pdev->dev, &sead3_fled);
-       if (ret < 0)
-               led_classdev_unregister(&sead3_pled);
-
-       return ret;
-}
-
-static int sead3_led_remove(struct platform_device *pdev)
-{
-       led_classdev_unregister(&sead3_pled);
-       led_classdev_unregister(&sead3_fled);
-       return 0;
-}
-
-static struct platform_driver sead3_led_driver = {
-       .probe          = sead3_led_probe,
-       .remove         = sead3_led_remove,
-       .driver         = {
-               .name           = DRVNAME,
-               .owner          = THIS_MODULE,
-       },
-};
-
-static int __init sead3_led_init(void)
-{
-       return platform_driver_register(&sead3_led_driver);
-}
-
-static void __exit sead3_led_exit(void)
-{
-       platform_driver_unregister(&sead3_led_driver);
-}
-
-module_init(sead3_led_init);
-module_exit(sead3_led_exit);
-
-MODULE_AUTHOR("Kristian Kielhofner <[email protected]>");
-MODULE_DESCRIPTION("SEAD3 LED driver");
-MODULE_LICENSE("GPL");

drivers/leds/Kconfig +0 -0

index a210338..b86aa85 100644

drivers/leds/Kconfig +3 -0

+         This driver can also be built as a module. If so the module
+         will be called leds-sead3.
+
 comment "LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)"
 
 config LEDS_BLINKM

drivers/leds/Makefile +1 -0

index a2b1647..4f22241 100644
@@ -56,6 +56,7 @@ obj-$(CONFIG_LEDS_BLINKM)             += leds-blinkm.o
 obj-$(CONFIG_LEDS_SYSCON)              += leds-syscon.o
 obj-$(CONFIG_LEDS_VERSATILE)           += leds-versatile.o
 obj-$(CONFIG_LEDS_MENF21BMC)           += leds-menf21bmc.o
+obj-$(CONFIG_LEDS_SEAD3)               += leds-sead3.o
 
 # LED SPI Drivers
 obj-$(CONFIG_LEDS_DAC124S085)          += leds-dac124s085.o

drivers/leds/leds-sead3.c new file +5 -0

new file mode 100644
index 0000000..0cf79f5
@@ -0,0 +1,90 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *

drivers/leds/leds-sead3.c new file +4 -0

+}
+
+static struct led_classdev sead3_pled = {
+       .name           = "sead3::pled",

drivers/leds/leds-sead3.c new file +35 -0

+static int sead3_led_probe(struct platform_device *pdev)
+{
+       int ret;
+
+       ret = led_classdev_register(&pdev->dev, &sead3_pled);
+       if (ret < 0)
+               return ret;
+
+       ret = led_classdev_register(&pdev->dev, &sead3_fled);
+       if (ret < 0)
+               led_classdev_unregister(&sead3_pled);
+
+       return ret;
+}
+
+static int sead3_led_remove(struct platform_device *pdev)
+{
+       led_classdev_unregister(&sead3_pled);
+       led_classdev_unregister(&sead3_fled);
+
+       return 0;
+}
+
+static struct platform_driver sead3_led_driver = {
+       .probe          = sead3_led_probe,
+       .remove         = sead3_led_remove,
+       .driver         = {
+               .name           = "sead3-led",
+               .owner          = THIS_MODULE,
+       },
+};
+
+static int __init sead3_led_init(void)
+{
+       return platform_driver_register(&sead3_led_driver);

drivers/leds/leds-sead3.c new file +4 -1

+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("SEAD3 LED driver");
+MODULE_AUTHOR("Kristian Kielhofner <[email protected]>");
+MODULE_ALIAS("platform:sead3-led");
--

1.9.3