i2c: s3c2410: move mach/regs-iic.h into i2c-s3c2410 device driver
PATCH 1/2 i2c: s3c2410: move mach/regs-iic.h into i2c-s3c2410 device driver
The register definitions are only used in the driver itself. This also removes the last dependency on plat/ includes from the i2c driver.
--- arch/arm/mach-s3c24xx/mach-rx1950.c | 1 - arch/arm/plat-samsung/devs.c | 1 - arch/arm/plat-samsung/include/plat/regs-iic.h | 56 ------------------------- drivers/i2c/busses/i2c-s3c2410.c | 41 ++++++++++++++++++- 4 files changed, 40 insertions(+), 59 deletions(-) delete mode 100644 arch/arm/plat-samsung/include/plat/regs-iic.h
arch/arm/mach-s3c24xx/mach-rx1950.c +0 -1
@@ -56,7 +56,6 @@#include <plat/cpu.h> #include <plat/devs.h> #include <plat/pm.h> -#include <plat/regs-iic.h> #include <plat/regs-serial.h> #include <plat/samsung-time.h>
arch/arm/plat-samsung/devs.c +0 -1
@@ -62,7 +62,6 @@#include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/usb-ohci-s3c2410.h> #include <plat/usb-phy.h> -#include <plat/regs-iic.h> #include <plat/regs-serial.h> #include <plat/regs-spi.h> #include <linux/platform_data/spi-s3c64xx.h>
arch/arm/plat-samsung/include/plat/regs-iic.h deleted +0 -56
56 lines not on this page · raw message
drivers/i2c/busses/i2c-s3c2410.c +40 -1
49 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 2/2 i2c: s3c2410: fixup the styling of the newly moved register definitions
Make them conform more to established standards.
--- drivers/i2c/busses/i2c-s3c2410.c | 50 ++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 26 deletions(-)
drivers/i2c/busses/i2c-s3c2410.c +25 -27
@@ -46,35 +46,33 @@/* see s3c2410x user guide, v1.1, section 9 (p447) for more info */ -#define S3C2410_IICREG (x) (x) - -#define S3C2410_IICCON S3C2410_IICREG(0x00) -#define S3C2410_IICSTAT S3C2410_IICREG(0x04) -#define S3C2410_IICADD S3C2410_IICREG(0x08) -#define S3C2410_IICDS S3C2410_IICREG(0x0C) -#define S3C2440_IICLC S3C2410_IICREG(0x10) - -#define S3C2410_IICCON_ACKEN (1<<7) -#define S3C2410_IICCON_TXDIV_16 (0<<6) -#define S3C2410_IICCON_TXDIV_512 (1<<6) -#define S3C2410_IICCON_IRQEN (1<<5) -#define S3C2410_IICCON_IRQPEND (1<<4) -#define S3C2410_IICCON_SCALE (x) ((x)&15) +#define S3C2410_IICCON 0x00 +#define S3C2410_IICSTAT 0x04 +#define S3C2410_IICADD 0x08 +#define S3C2410_IICDS 0x0C +#define S3C2440_IICLC 0x10 + +#define S3C2410_IICCON_ACKEN (1 << 7) +#define S3C2410_IICCON_TXDIV_16 (0 << 6) +#define S3C2410_IICCON_TXDIV_512 (1 << 6) +#define S3C2410_IICCON_IRQEN (1 << 5) +#define S3C2410_IICCON_IRQPEND (1 << 4) +#define S3C2410_IICCON_SCALE (x) ((x) & 0xf)#define S3C2410_IICCON_SCALEMASK (0xf) -#define S3C2410_IICSTAT_MASTER_RX (2<<6) -#define S3C2410_IICSTAT_MASTER_TX (3<<6) -#define S3C2410_IICSTAT_SLAVE_RX (0<<6) -#define S3C2410_IICSTAT_SLAVE_TX (1<<6) -#define S3C2410_IICSTAT_MODEMASK (3<<6) +#define S3C2410_IICSTAT_MASTER_RX (2 << 6) +#define S3C2410_IICSTAT_MASTER_TX (3 << 6) +#define S3C2410_IICSTAT_SLAVE_RX (0 << 6) +#define S3C2410_IICSTAT_SLAVE_TX (1 << 6) +#define S3C2410_IICSTAT_MODEMASK (3 << 6) -#define S3C2410_IICSTAT_START (1<<5) -#define S3C2410_IICSTAT_BUSBUSY (1<<5) -#define S3C2410_IICSTAT_TXRXEN (1<<4) -#define S3C2410_IICSTAT_ARBITR (1<<3) -#define S3C2410_IICSTAT_ASSLAVE (1<<2) -#define S3C2410_IICSTAT_ADDR0 (1<<1) -#define S3C2410_IICSTAT_LASTBIT (1<<0) +#define S3C2410_IICSTAT_START (1 << 5) +#define S3C2410_IICSTAT_BUSBUSY (1 << 5) +#define S3C2410_IICSTAT_TXRXEN (1 << 4) +#define S3C2410_IICSTAT_ARBITR (1 << 3) +#define S3C2410_IICSTAT_ASSLAVE (1 << 2) +#define S3C2410_IICSTAT_ADDR0 (1 << 1) +#define S3C2410_IICSTAT_LASTBIT (1 << 0)#define S3C2410_IICLC_SDA_DELAY0 (0 << 0)#define S3C2410_IICLC_SDA_DELAY5 (1 << 0)
@@ -82,7 +80,7 @@#define S3C2410_IICLC_SDA_DELAY15 (3 << 0)#define S3C2410_IICLC_SDA_DELAY_MASK (3 << 0) -#define S3C2410_IICLC_FILTER_ON (1<<2) +#define S3C2410_IICLC_FILTER_ON (1 << 2)/* Treat S3C2410 as baseline hardware, anything else is supported via quirks */ #define QUIRK_S3C2440 (1 << 0)
Signature · 1 line
1.7.2.3
PATCH 1/2 i2c: s3c2410: move mach/regs-iic.h into i2c-s3c2410 device driver
In reply to Heiko StübnerQuoted 157 lines · Heiko St?bner
The register definitions are only used in the driver itself. This also removes the last dependency on plat/ includes from the i2c driver.
Signed-off-by Heiko Stuebner <[email protected]>--- arch/arm/mach-s3c24xx/mach-rx1950.c | 1 - arch/arm/plat-samsung/devs.c | 1 - arch/arm/plat-samsung/include/plat/regs-iic.h | 56 ------------------------- drivers/i2c/busses/i2c-s3c2410.c | 41 ++++++++++++++++++- 4 files changed, 40 insertions(+), 59 deletions(-) delete mode 100644 arch/arm/plat-samsung/include/plat/regs-iic.harch/arm/mach- renamed from arch/arm/mach-s3c24xx/mach-rx1950.c +0
-0
s3c24xx/mach-rx1950.c
index 799af43..64b52a9 100644arch/arm/mach-s3c24xx/mach-rx1950.c +0
-1@@ -56,7 +56,6 @@#include <plat/cpu.h> #include <plat/devs.h> #include <plat/pm.h> -#include <plat/regs-iic.h> #include <plat/regs-serial.h> #include <plat/samsung-time.h> arch/arm/plat-samsung/devs.c +0
-1@@ -62,7 +62,6 @@#include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/usb-ohci-s3c2410.h> #include <plat/usb-phy.h> -#include <plat/regs-iic.h> #include <plat/regs-serial.h> #include <plat/regs-spi.h> #include <linux/platform_data/spi-s3c64xx.h> arch/arm/plat- renamed from arch/arm/plat-samsung/include/plat/regs-iic.h +0
-0
samsung/include/plat/regs-iic.h
deleted file mode 100644
index 2f7c17d..0000000arch/arm/plat-samsung/include/plat/regs-iic.h deleted +0
-56@@ -1,56 +0,0 @@ -/* arch/arm/mach-s3c2410/include/mach/regs-iic.h -* -* Copyright (c) 2004 Simtec Electronics <[email protected]> -* http://www.simtec.co.uk/products/SWLINUX/ -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* S3C2410 I2C Controller -*/ - -#ifndef __ASM_ARCH_REGS_IIC_H -#define __ASM_ARCH_REGS_IIC_H __FILE__ - -/* see s3c2410x user guide, v1.1, section 9 (p447) for more info */ - -#define S3C2410_IICREG (x) (x) - -#define S3C2410_IICCON S3C2410_IICREG(0x00) -#define S3C2410_IICSTAT S3C2410_IICREG(0x04) -#define S3C2410_IICADD S3C2410_IICREG(0x08) -#define S3C2410_IICDS S3C2410_IICREG(0x0C) -#define S3C2440_IICLC S3C2410_IICREG(0x10) - -#define S3C2410_IICCON_ACKEN (1<<7) -#define S3C2410_IICCON_TXDIV_16 (0<<6) -#define S3C2410_IICCON_TXDIV_512 (1<<6) -#define S3C2410_IICCON_IRQEN (1<<5) -#define S3C2410_IICCON_IRQPEND (1<<4) -#define S3C2410_IICCON_SCALE (x) ((x)&15) -#define S3C2410_IICCON_SCALEMASK (0xf) - -#define S3C2410_IICSTAT_MASTER_RX (2<<6) -#define S3C2410_IICSTAT_MASTER_TX (3<<6) -#define S3C2410_IICSTAT_SLAVE_RX (0<<6) -#define S3C2410_IICSTAT_SLAVE_TX (1<<6) -#define S3C2410_IICSTAT_MODEMASK (3<<6) - -#define S3C2410_IICSTAT_START (1<<5) -#define S3C2410_IICSTAT_BUSBUSY (1<<5) -#define S3C2410_IICSTAT_TXRXEN (1<<4) -#define S3C2410_IICSTAT_ARBITR (1<<3) -#define S3C2410_IICSTAT_ASSLAVE (1<<2) -#define S3C2410_IICSTAT_ADDR0 (1<<1) -#define S3C2410_IICSTAT_LASTBIT (1<<0) - -#define S3C2410_IICLC_SDA_DELAY0 (0 << 0) -#define S3C2410_IICLC_SDA_DELAY5 (1 << 0) -#define S3C2410_IICLC_SDA_DELAY10 (2 << 0) -#define S3C2410_IICLC_SDA_DELAY15 (3 << 0) -#define S3C2410_IICLC_SDA_DELAY_MASK (3 << 0) - -#define S3C2410_IICLC_FILTER_ON (1<<2) - -#endif /* __ASM_ARCH_REGS_IIC_H */ drivers/i2c/busses/i2c- renamed from drivers/i2c/busses/i2c-s3c2410.c +0
-0
s3c2410.c
index a290d08..5cc4f71 100644drivers/i2c/busses/i2c-s3c2410.c +40
-1@@ -42,9 +42,48 @@#include <asm/irq.h> -#include <plat/regs-iic.h> #include <linux/platform_data/i2c-s3c2410.h> +/* see s3c2410x user guide, v1.1, section 9 (p447) for more info */ + +#define S3C2410_IICREG (x) (x) + +#define S3C2410_IICCON S3C2410_IICREG(0x00) +#define S3C2410_IICSTAT S3C2410_IICREG(0x04) +#define S3C2410_IICADD S3C2410_IICREG(0x08) +#define S3C2410_IICDS S3C2410_IICREG(0x0C) +#define S3C2440_IICLC S3C2410_IICREG(0x10) + +#define S3C2410_IICCON_ACKEN (1<<7) +#define S3C2410_IICCON_TXDIV_16 (0<<6) +#define S3C2410_IICCON_TXDIV_512 (1<<6) +#define S3C2410_IICCON_IRQEN (1<<5) +#define S3C2410_IICCON_IRQPEND (1<<4) +#define S3C2410_IICCON_SCALE (x) ((x)&15) +#define S3C2410_IICCON_SCALEMASK (0xf) + +#define S3C2410_IICSTAT_MASTER_RX (2<<6) +#define S3C2410_IICSTAT_MASTER_TX (3<<6) +#define S3C2410_IICSTAT_SLAVE_RX (0<<6) +#define S3C2410_IICSTAT_SLAVE_TX (1<<6) +#define S3C2410_IICSTAT_MODEMASK (3<<6) + +#define S3C2410_IICSTAT_START (1<<5) +#define S3C2410_IICSTAT_BUSBUSY (1<<5) +#define S3C2410_IICSTAT_TXRXEN (1<<4) +#define S3C2410_IICSTAT_ARBITR (1<<3) +#define S3C2410_IICSTAT_ASSLAVE (1<<2) +#define S3C2410_IICSTAT_ADDR0 (1<<1) +#define S3C2410_IICSTAT_LASTBIT (1<<0) + +#define S3C2410_IICLC_SDA_DELAY0 (0 << 0) +#define S3C2410_IICLC_SDA_DELAY5 (1 << 0) +#define S3C2410_IICLC_SDA_DELAY10 (2 << 0) +#define S3C2410_IICLC_SDA_DELAY15 (3 << 0) +#define S3C2410_IICLC_SDA_DELAY_MASK (3 << 0) + +#define S3C2410_IICLC_FILTER_ON (1<<2) +/* Treat S3C2410 as baseline hardware, anything else is supported via quirks */ #define QUIRK_S3C2440 (1 << 0)
Quoted 3 lines
#define
QUIRK_HDMIPHY(1 << 1)
--
1.7.2.3
Looks good to me on this series:
Hi Wolfram, if you're ok on this, please pick up into your tree with my ack.
Thanks.
- Kukjin
PATCH 1/2 i2c: s3c2410: move mach/regs-iic.h into i2c-s3c2410 device driver
Hi Kukjin,
(please don't quote the whole patch for those few lines)
Quoted 4 lines
Looks good to me on this series:
Acked-by Kukjin Kim <[email protected]>Hi Wolfram, if you're ok on this, please pick up into your tree with my ack.
Will do, but not for 3.9 anymore. Thanks!
PATCH 1/2 i2c: s3c2410: move mach/regs-iic.h into i2c-s3c2410 device driver
In reply to Heiko StübnerQuoted 162 lines · Kukjin Kim
Quoted 153 lines · Heiko St?bner
The register definitions are only used in the driver itself. This also removes the last dependency on plat/ includes from the i2c driver.
Signed-off-by Heiko Stuebner <[email protected]>--- arch/arm/mach-s3c24xx/mach-rx1950.c | 1 - arch/arm/plat-samsung/devs.c | 1 - arch/arm/plat-samsung/include/plat/regs-iic.h | 56 ------------------------- drivers/i2c/busses/i2c-s3c2410.c | 41 ++++++++++++++++++- 4 files changed, 40 insertions(+), 59 deletions(-) delete mode100644
arch/arm/plat-samsung/include/plat/regs-iic.harch/arm/mach- renamed from arch/arm/mach-s3c24xx/mach-rx1950.c +0
-0
s3c24xx/mach-rx1950.cindex 799af43..64b52a9 100644arch/arm/mach-s3c24xx/mach-rx1950.c +0
-1@@ -56,7 +56,6 @@#include <plat/cpu.h> #include <plat/devs.h> #include <plat/pm.h> -#include <plat/regs-iic.h> #include <plat/regs-serial.h> #include <plat/samsung-time.h> (quoted diff) +0
-0
b/arch/arm/plat-samsung/devs.cindex e1124d9..6317a9e 100644arch/arm/plat-samsung/devs.c +0
-1@@ -62,7 +62,6 @@#include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/usb-ohci-s3c2410.h> #include <plat/usb-phy.h> -#include <plat/regs-iic.h> #include <plat/regs-serial.h> #include <plat/regs-spi.h> #include <linux/platform_data/spi-s3c64xx.h> (quoted diff) +0
-0b/arch/arm/plat-
samsung/include/plat/regs-iic.hdeleted file mode 100644 index 2f7c17d..0000000arch/arm/plat-samsung/include/plat/regs-iic.h deleted +0
-6@@ -1,56 +0,0 @@ -/* arch/arm/mach-s3c2410/include/mach/regs-iic.h -* -* Copyright (c) 2004 Simtec Electronics <[email protected]> -* http://www.simtec.co.uk/products/SWLINUX/ -* -* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * S3C2410 I2C Controllerarch/arm/plat-samsung/include/plat/regs-iic.h deleted +0
-46-*/ - -#ifndef __ASM_ARCH_REGS_IIC_H -#define __ASM_ARCH_REGS_IIC_H __FILE__ - -/* see s3c2410x user guide, v1.1, section 9 (p447) for more info */ - -#define S3C2410_IICREG (x) (x) - -#define S3C2410_IICCON S3C2410_IICREG(0x00) -#define S3C2410_IICSTAT S3C2410_IICREG(0x04) -#define S3C2410_IICADD S3C2410_IICREG(0x08) -#define S3C2410_IICDS S3C2410_IICREG(0x0C) -#define S3C2440_IICLC S3C2410_IICREG(0x10) - -#define S3C2410_IICCON_ACKEN (1<<7) -#define S3C2410_IICCON_TXDIV_16 (0<<6) -#define S3C2410_IICCON_TXDIV_512 (1<<6) -#define S3C2410_IICCON_IRQEN (1<<5) -#define S3C2410_IICCON_IRQPEND (1<<4) -#define S3C2410_IICCON_SCALE (x) ((x)&15) -#define S3C2410_IICCON_SCALEMASK (0xf) - -#define S3C2410_IICSTAT_MASTER_RX (2<<6) -#define S3C2410_IICSTAT_MASTER_TX (3<<6) -#define S3C2410_IICSTAT_SLAVE_RX (0<<6) -#define S3C2410_IICSTAT_SLAVE_TX (1<<6) -#define S3C2410_IICSTAT_MODEMASK (3<<6) - -#define S3C2410_IICSTAT_START (1<<5) -#define S3C2410_IICSTAT_BUSBUSY (1<<5) -#define S3C2410_IICSTAT_TXRXEN (1<<4) -#define S3C2410_IICSTAT_ARBITR (1<<3) -#define S3C2410_IICSTAT_ASSLAVE (1<<2) -#define S3C2410_IICSTAT_ADDR0 (1<<1) -#define S3C2410_IICSTAT_LASTBIT (1<<0) - -#define S3C2410_IICLC_SDA_DELAY0 (0 << 0) -#define S3C2410_IICLC_SDA_DELAY5 (1 << 0) -#define S3C2410_IICLC_SDA_DELAY10 (2 << 0) -#define S3C2410_IICLC_SDA_DELAY15 (3 << 0) -#define S3C2410_IICLC_SDA_DELAY_MASK (3 << 0) - -#define S3C2410_IICLC_FILTER_ON (1<<2) - -#endif /* __ASM_ARCH_REGS_IIC_H */ (quoted diff) +0
-0b/drivers/i2c/busses/i2c-
s3c2410.cindex a290d08..5cc4f71 100644drivers/i2c/busses/i2c-s3c2410.c +40
-1@@ -42,9 +42,48 @@#include <asm/irq.h> -#include <plat/regs-iic.h> #include <linux/platform_data/i2c-s3c2410.h> +/* see s3c2410x user guide, v1.1, section 9 (p447) for more info */ + +#define S3C2410_IICREG (x) (x) + +#define S3C2410_IICCON S3C2410_IICREG(0x00) +#define S3C2410_IICSTAT S3C2410_IICREG(0x04) +#define S3C2410_IICADD S3C2410_IICREG(0x08) +#define S3C2410_IICDS S3C2410_IICREG(0x0C) +#define S3C2440_IICLC S3C2410_IICREG(0x10) + +#define S3C2410_IICCON_ACKEN (1<<7) +#define S3C2410_IICCON_TXDIV_16 (0<<6) +#define S3C2410_IICCON_TXDIV_512 (1<<6) +#define S3C2410_IICCON_IRQEN (1<<5) +#define S3C2410_IICCON_IRQPEND (1<<4) +#define S3C2410_IICCON_SCALE (x) ((x)&15) +#define S3C2410_IICCON_SCALEMASK (0xf) + +#define S3C2410_IICSTAT_MASTER_RX (2<<6) +#define S3C2410_IICSTAT_MASTER_TX (3<<6) +#define S3C2410_IICSTAT_SLAVE_RX (0<<6) +#define S3C2410_IICSTAT_SLAVE_TX (1<<6) +#define S3C2410_IICSTAT_MODEMASK (3<<6) + +#define S3C2410_IICSTAT_START (1<<5) +#define S3C2410_IICSTAT_BUSBUSY (1<<5) +#define S3C2410_IICSTAT_TXRXEN (1<<4) +#define S3C2410_IICSTAT_ARBITR (1<<3) +#define S3C2410_IICSTAT_ASSLAVE (1<<2) +#define S3C2410_IICSTAT_ADDR0 (1<<1) +#define S3C2410_IICSTAT_LASTBIT (1<<0) + +#define S3C2410_IICLC_SDA_DELAY0 (0 << 0) +#define S3C2410_IICLC_SDA_DELAY5 (1 << 0) +#define S3C2410_IICLC_SDA_DELAY10 (2 << 0) +#define S3C2410_IICLC_SDA_DELAY15 (3 << 0) +#define S3C2410_IICLC_SDA_DELAY_MASK (3 << 0) + +#define S3C2410_IICLC_FILTER_ON (1<<2) +/* Treat S3C2410 as baseline hardware, anything else is supported via Quoted 5 lines
quirks */
#defineQUIRK_S3C2440(1 << 0)
#defineQUIRK_HDMIPHY(1 << 1)
--
1.7.2.3Looks good to me on this series:
Quoted 4 lines
Acked-by Kukjin Kim <[email protected]>Hi Wolfram, if you're ok on this, please pick up into your tree with my ack.
Re-sending due to changing of Wolfram's e-mail address.
Thanks.
- Kukjin
PATCH 1/2 i2c: s3c2410: move mach/regs-iic.h into i2c-s3c2410 device driver
In reply to Heiko StübnerQuoted 5 lines · Heiko St?bner
The register definitions are only used in the driver itself. This also removes the last dependency on plat/ includes from the i2c driver.
Signed-off-by Heiko Stuebner <[email protected]>
What tree is this against? I can't apply it on top of v3.8 or 3.9-rc3.
PATCH 1/2 i2c: s3c2410: move mach/regs-iic.h into i2c-s3c2410 device driver
Hi Wolfram,
Am Donnerstag, 21. M?rz 2013, 10:57:58 schrieb Wolfram Sang:
Quoted 8 lines · Heiko St?bner
Quoted 5 lines
The register definitions are only used in the driver itself. This also removes the last dependency on plat/ includes from the i2c driver.
Signed-off-by Heiko Stuebner <[email protected]>What tree is this against? I can't apply it on top of v3.8 or 3.9-rc3.
I'm not sure anymore ... probably some linux-next. I'll redo them on top of your (i2c) for-next branch.
Heiko
PATCH 1/2 i2c: s3c2410: move mach/regs-iic.h into i2c-s3c2410 device driver
Quoted 2 lines
I'm not sure anymore ... probably some linux-next. I'll redo them on top of your (i2c) for-next branch.
Thanks, but please use 3.9-rc3.