F: fs/coda/
F: include/linux/coda*.h
+COMMON CLK FRAMEWORK
+M: Mike Turquette <mturquette@ti.com>
+M: Mike Turquette <mturquette@linaro.org>
+L: linux-arm-kernel@lists.infradead.org (same as CLK API & CLKDEV)
+T: git git://git.linaro.org/people/mturquette/linux.git
+S: Maintained
+F: drivers/clk/clk.c
+F: drivers/clk/clk-*
+F: include/linux/clk-pr*
+
COMMON INTERNET FILE SYSTEM (CIFS)
M: Steve French <sfrench@samba.org>
L: linux-cifs@vger.kernel.org
F: drivers/net/ethernet/ti/cpmac.c
CPU FREQUENCY DRIVERS
--M: Dave Jones <davej@redhat.com>
L: cpufreq@vger.kernel.org
--W: http://www.codemonkey.org.uk/projects/cpufreq/
--T: git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
S: Maintained
F: drivers/cpufreq/
F: include/linux/cpufreq.h
F: drivers/net/wireless/iwlegacy/
INTEL WIRELESS WIFI LINK (iwlwifi)
+ M: Johannes Berg <johannes.berg@intel.com>
M: Wey-Yi Guy <wey-yi.w.guy@intel.com>
M: Intel Linux Wireless <ilw@linux.intel.com>
L: linux-wireless@vger.kernel.org
S: Maintained
F: drivers/pinctrl/
+ +PIN CONTROLLER - ST SPEAR
+ +M: Viresh Kumar <viresh.kumar@st.com>
+ +L: spear-devel@list.st.com
+ +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +W: http://www.st.com/spear
+ +S: Maintained
+ +F: driver/pinctrl/spear/
+ +
PKTCDVD DRIVER
M: Peter Osterlund <petero2@telia.com>
S: Maintained
F: drivers/scsi/st*
SCTP PROTOCOL
--M: Vlad Yasevich <vladislav.yasevich@hp.com>
++M: Vlad Yasevich <vyasevich@gmail.com>
M: Sridhar Samudrala <sri@us.ibm.com>
L: linux-sctp@vger.kernel.org
W: http://lksctp.sourceforge.net
--S: Supported
++S: Maintained
F: Documentation/networking/sctp.txt
F: include/linux/sctp.h
F: include/net/sctp/
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W: http://www.st.com/spear
S: Maintained
-F: arch/arm/mach-spear*/clock.c
-F: arch/arm/plat-spear/clock.c
-F: arch/arm/plat-spear/include/plat/clock.h
-
-SPEAR PAD MULTIPLEXING SUPPORT
-M: Viresh Kumar <viresh.kumar@st.com>
-L: spear-devel@list.st.com
-L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W: http://www.st.com/spear
-S: Maintained
-F: arch/arm/plat-spear/include/plat/padmux.h
-F: arch/arm/plat-spear/padmux.c
-F: arch/arm/mach-spear*/spear*xx.c
-F: arch/arm/mach-spear*/include/mach/generic.h
-F: arch/arm/mach-spear3xx/spear3*0.c
-F: arch/arm/mach-spear3xx/spear3*0_evb.c
-F: arch/arm/mach-spear6xx/spear600.c
-F: arch/arm/mach-spear6xx/spear600_evb.c
+F: drivers/clk/spear/
- SPEAR PAD MULTIPLEXING SUPPORT
- M: Viresh Kumar <viresh.kumar@st.com>
- L: spear-devel@list.st.com
- L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- W: http://www.st.com/spear
- S: Maintained
- F: arch/arm/plat-spear/include/plat/padmux.h
- F: arch/arm/plat-spear/padmux.c
- F: arch/arm/mach-spear*/spear*xx.c
- F: arch/arm/mach-spear*/include/mach/generic.h
- F: arch/arm/mach-spear3xx/spear3*0.c
- F: arch/arm/mach-spear3xx/spear3*0_evb.c
- F: arch/arm/mach-spear6xx/spear600.c
- F: arch/arm/mach-spear6xx/spear600_evb.c
-
SPI SUBSYSTEM
M: Grant Likely <grant.likely@secretlab.ca>
L: spi-devel-general@lists.sourceforge.net
F: fs/xfs/
XILINX AXI ETHERNET DRIVER
- M: Ariane Keller <ariane.keller@tik.ee.ethz.ch>
- M: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
+ M: Anirudha Sarangi <anirudh@xilinx.com>
+ M: John Linn <John.Linn@xilinx.com>
S: Maintained
F: drivers/net/ethernet/xilinx/xilinx_axienet*
select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
select CLKSRC_MMIO
++ select COMMON_CLK
select HAVE_CLK_PREPARE
++ select PINCTRL
help
Support for Freescale MXS-based family of processors
select ARM_AMBA
select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
+ select COMMON_CLK
select CLKSRC_MMIO
select GENERIC_CLOCKEVENTS
select HAVE_CLK
source "arch/arm/Kconfig-nommu"
endif
++config ARM_ERRATA_326103
++ bool "ARM errata: FSR write bit incorrect on a SWP to read-only memory"
++ depends on CPU_V6
++ help
++ Executing a SWP instruction to read-only memory does not set bit 11
++ of the FSR on the ARM 1136 prior to r1p0. This causes the kernel to
++ treat the access as a read, preventing a COW from occurring and
++ causing the faulting task to livelock.
++
config ARM_ERRATA_411920
bool "ARM errata: Invalidation of the Instruction Cache operation can fail"
depends on CPU_V6 || CPU_V6K
#ifndef __MACH_MXS_COMMON_H__
#define __MACH_MXS_COMMON_H__
--struct clk;
--
extern const u32 *mxs_get_ocotp(void);
extern int mxs_reset_block(void __iomem *);
--extern void mxs_timer_init(struct clk *, int);
++extern void mxs_timer_init(int);
extern void mxs_restart(char, const char *);
extern int mxs_saif_clkmux_select(unsigned int clkmux);
++ extern void mx23_soc_init(void);
extern int mx23_register_gpios(void);
extern int mx23_clocks_init(void);
extern void mx23_map_io(void);
extern void mx23_init_irq(void);
++ extern void mx28_soc_init(void);
extern int mx28_register_gpios(void);
extern int mx28_clocks_init(void);
extern void mx28_map_io(void);
extern void icoll_init_irq(void);
--extern int mxs_clkctrl_timeout(unsigned int reg_offset, unsigned int mask);
--
#endif /* __MACH_MXS_COMMON_H__ */
#include <linux/platform_device.h>
#include <linux/jiffies.h>
#include <linux/io.h>
++ #include <linux/pinctrl/consumer.h>
#include <mach/common.h>
return -EINVAL;
init_completion(&i2c->cmd_complete);
++ i2c->cmd_err = 0;
flags = stop ? MXS_I2C_CTRL0_POST_SEND_STOP : 0;
if (i2c->cmd_err == -ENXIO)
mxs_i2c_reset(i2c);
++ else
++ writel(MXS_I2C_QUEUECTRL_QUEUE_RUN,
++ i2c->regs + MXS_I2C_QUEUECTRL_CLR);
dev_dbg(i2c->dev, "Done with err=%d\n", i2c->cmd_err);
MXS_I2C_CTRL1_SLAVE_STOP_IRQ | MXS_I2C_CTRL1_SLAVE_IRQ))
/* MXS_I2C_CTRL1_OVERSIZE_XFER_TERM_IRQ is only for slaves */
i2c->cmd_err = -EIO;
-- else
-- i2c->cmd_err = 0;
is_last_cmd = (readl(i2c->regs + MXS_I2C_QUEUESTAT) &
MXS_I2C_QUEUESTAT_WRITE_QUEUE_CNT_MASK) == 0;
struct device *dev = &pdev->dev;
struct mxs_i2c_dev *i2c;
struct i2c_adapter *adap;
++ struct pinctrl *pinctrl;
struct resource *res;
resource_size_t res_size;
int err, irq;
++ pinctrl = devm_pinctrl_get_select_default(dev);
++ if (IS_ERR(pinctrl))
++ return PTR_ERR(pinctrl);
++
i2c = devm_kzalloc(dev, sizeof(struct mxs_i2c_dev), GFP_KERNEL);
if (!i2c)
return -ENOMEM;
if (ret)
return -EBUSY;
-- writel(MXS_I2C_QUEUECTRL_QUEUE_RUN,
-- i2c->regs + MXS_I2C_QUEUECTRL_CLR);
writel(MXS_I2C_CTRL0_SFTRST, i2c->regs + MXS_I2C_CTRL0_SET);
platform_set_drvdata(pdev, NULL);
projects / deliverable / linux.git / commitdiff
