Changes in 4.9.229 power: supply: bq24257_charger: Replace depends on REGMAP_I2C with select clk: sunxi: Fix incorrect usage of round_down() i2c: piix4: Detect secondary SMBus controller on AMD AM4 chipsets iio: pressure: bmp280: Tolerate IRQ before registering clk: qcom: msm8916: Fix the address location of pll->config_reg backlight: lp855x: Ensure regulators are disabled on probe failure ARM: integrator: Add some Kconfig selections ALSA: isa/wavefront: prevent out of bounds write in ioctl scsi: qla2xxx: Fix issue with adapter's stopping state iio: bmp280: fix compensation of humidity i2c: pxa: clear all master action bits in i2c_pxa_stop_message() usblp: poison URBs upon disconnect PCI: aardvark: Don't blindly enable ASPM L0s and don't write to read-only register ps3disk: use the default segment boundary vfio/pci: fix memory leaks in alloc_perm_bits() mfd: wm8994: Fix driver operation if loaded as modules scsi: lpfc: Fix lpfc_nodelist leak when processing unsolicited event clk: clk-flexgen: fix clock-critical handling powerpc/perf/hv-24x7: Fix inconsistent output values incase multiple hv-24x7 events run nfsd: Fix svc_xprt refcnt leak when setup callback client failed powerpc/crashkernel: Take "mem=" option into account yam: fix possible memory leak in yam_init_driver mksysmap: Fix the mismatch of '.L' symbols in System.map scsi: sr: Fix sr_probe() missing deallocate of device minor scsi: ibmvscsi: Don't send host info in adapter info MAD after LPM ALSA: usb-audio: Improve frames size computation s390/qdio: put thinint indicator after early error tty: hvc: Fix data abort due to race in hvc_open staging: sm750fb: add missing case while setting FB_VISUAL i2c: pxa: fix i2c_pxa_scream_blue_murder() debug output serial: amba-pl011: Make sure we initialize the port.lock spinlock drivers: base: Fix NULL pointer exception in __platform_driver_probe() if a driver developer is foolish PCI: rcar: Fix incorrect programming of OB windows PCI/ASPM: Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges power: supply: lp8788: Fix an error handling path in 'lp8788_charger_probe()' power: supply: smb347-charger: IRQSTAT_D is volatile scsi: mpt3sas: Fix double free warnings dlm: remove BUG() before panic() clk: ti: composite: fix memory leak tty: n_gsm: Fix SOF skipping tty: n_gsm: Fix waking up upper tty layer when room available powerpc/pseries/ras: Fix FWNMI_VALID off by one powerpc/ps3: Fix kexec shutdown hang vfio-pci: Mask cap zero usb/ohci-platform: Fix a warning when hibernating drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation USB: host: ehci-mxc: Add error handling in ehci_mxc_drv_probe() tty: n_gsm: Fix bogus i++ in gsm_data_kick clk: samsung: exynos5433: Add IGNORE_UNUSED flag to sclk_i2s1 powerpc/64s/pgtable: fix an undefined behaviour PCI/PTM: Inherit Switch Downstream Port PTM settings from Upstream Port IB/cma: Fix ports memory leak in cma_configfs watchdog: da9062: No need to ping manually before setting timeout usb: dwc2: gadget: move gadget resume after the core is in L0 state USB: gadget: udc: s3c2410_udc: Remove pointless NULL check in s3c2410_udc_nuke usb: gadget: lpc32xx_udc: don't dereference ep pointer before null check usb: gadget: fix potential double-free in m66592_probe. usb: gadget: Fix issue with config_ep_by_speed function clk: bcm2835: Fix return type of bcm2835_register_gate net: sunrpc: Fix off-by-one issues in 'rpc_ntop6' NFSv4.1 fix rpc_call_done assignment for BIND_CONN_TO_SESSION extcon: adc-jack: Fix an error handling path in 'adc_jack_probe()' ASoC: fsl_asrc_dma: Fix dma_chan leak when config DMA channel failed openrisc: Fix issue with argument clobbering for clone/fork gfs2: Allow lock_nolock mount to specify jid=X scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj pinctrl: imxl: Fix an error handling path in 'imx1_pinctrl_core_probe()' crypto: omap-sham - add proper load balancing support for multicore lib/zlib: remove outdated and incorrect pre-increment optimization include/linux/bitops.h: avoid clang shift-count-overflow warnings elfnote: mark all .note sections SHF_ALLOC selftests/vm/pkeys: fix alloc_random_pkey() to make it really random selftests/net: in timestamping, strncpy needs to preserve null byte scsi: acornscsi: Fix an error handling path in acornscsi_probe() usb/xhci-plat: Set PM runtime as active on resume usb/ehci-platform: Set PM runtime as active on resume perf report: Fix NULL pointer dereference in hists__fprintf_nr_sample_events() bcache: fix potential deadlock problem in btree_gc_coalesce block: Fix use-after-free in blkdev_get() libata: Use per port sync for detach drm: encoder_slave: fix refcouting error for modules drm/dp_mst: Reformat drm_dp_check_act_status() a bit drm/qxl: Use correct notify port address when creating cursor ring selinux: fix double free ext4: fix partial cluster initialization when splitting extent drm/dp_mst: Increase ACT retry timeout to 3s x86/boot/compressed: Relax sed symbol type regex for LLVM ld.lld block: nr_sects_write(): Disable preemption on seqcount write s390: fix syscall_get_error for compat processes drm/i915: Whitelist context-local timestamp in the gen9 cmdparser crypto: algboss - don't wait during notifier callback kprobes: Fix to protect kick_kprobe_optimizer() by kprobe_mutex powerpc/kprobes: Fixes for kprobe_lookup_name() on BE x86/kprobes: Avoid kretprobe recursion bug kretprobe: Prevent triggering kretprobe from within kprobe_flush_task e1000e: Do not wake up the system via WOL if device wakeup is disabled sched/rt, net: Use CONFIG_PREEMPTION.patch net: core: device_rename: Use rwsem instead of a seqcount media: dvb_frontend: initialize variable s with FE_NONE instead of 0 media: dvb/frontend.h: move out a private internal structure media: dvb/frontend.h: document the uAPI file media: dvb_frontend: get rid of get_property() callback media: stv0288: get rid of set_property boilerplate media: stv6110: get rid of a srate dead code media: friio-fe: get rid of set_property() media: dvb_frontend: get rid of set_property() callback media: dvb_frontend: cleanup dvb_frontend_ioctl_properties() media: dvb_frontend: cleanup ioctl handling logic media: dvb_frontend: get rid of property cache's state media: dvb_frontend: better document the -EPERM condition media: dvb_frontend: fix return values for FE_SET_PROPERTY media: dvb_frontend: dtv_property_process_set() cleanups media: dvb_frontend: be sure to init dvb_frontend_handle_ioctl() return code media: dvb_frontend: Add unlocked_ioctl in dvb_frontend.c media: dvb_frontend: Add compat_ioctl callback media: dvb_frontend: Add commands implementation for compat ioct media: dvb_frontend: fix wrong cast in compat_ioctl media: dvb_frontend: fix return error code mtd: rawnand: Pass a nand_chip object to nand_release() mtd: rawnand: diskonchip: Fix the probe error path mtd: rawnand: sharpsl: Fix the probe error path mtd: rawnand: xway: Fix the probe error path mtd: rawnand: orion: Fix the probe error path mtd: rawnand: socrates: Fix the probe error path mtd: rawnand: plat_nand: Fix the probe error path mtd: rawnand: mtk: Fix the probe error path mtd: rawnand: tmio: Fix the probe error path scsi: scsi_devinfo: handle non-terminated strings l2tp: Allow duplicate session creation with UDP net: sched: export __netdev_watchdog_up() fix a braino in "sparc32: fix register window handling in genregs32_[gs]et()" mld: fix memory leak in ipv6_mc_destroy_dev() net: fix memleak in register_netdevice() net: usb: ax88179_178a: fix packet alignment padding rocker: fix incorrect error handling in dma_rings_init rxrpc: Fix notification call on completion of discarded calls tg3: driver sleeps indefinitely when EEH errors exceed eeh_max_freezes ip_tunnel: fix use-after-free in ip_tunnel_lookup() tcp_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT ip6_gre: fix use-after-free in ip6gre_tunnel_lookup() tcp: grow window for OOO packets only for SACK flows sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket net: Fix the arp error in some cases net: Do not clear the sock TX queue in sk_set_socket() net: core: reduce recursion limit value USB: ohci-sm501: Add missed iounmap() in remove usb: dwc2: Postponed gadget registration to the udc class driver usb: add USB_QUIRK_DELAY_INIT for Logitech C922 USB: ehci: reopen solution for Synopsys HC bug usb: host: ehci-exynos: Fix error check in exynos_ehci_probe() ALSA: usb-audio: add quirk for Denon DCD-1500RE xhci: Fix incorrect EP_STATE_MASK xhci: Fix enumeration issue when setting max packet size for FS devices. cdc-acm: Add DISABLE_ECHO quirk for Microchip/SMSC chip ALSA: usb-audio: uac1: Invalidate ctl on interrupt ALSA: usb-audio: Clean up mixer element list traverse ALSA: usb-audio: Fix OOB access of mixer element list xhci: Poll for U0 after disabling USB2 LPM cifs/smb3: Fix data inconsistent when punch hole cifs/smb3: Fix data inconsistent when zero file range efi/esrt: Fix reference count leak in esre_create_sysfs_entry. RDMA/mad: Fix possible memory leak in ib_mad_post_receive_mads() net: qed: fix left elements count calculation net: qed: fix NVMe login fails over VFs net: qed: fix excessive QM ILT lines consumption ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram() usb: gadget: udc: Potential Oops in error handling code netfilter: ipset: fix unaligned atomic access sched/core: Fix PI boosting between RT and DEADLINE tasks ata/libata: Fix usage of page address by page_address in ata_scsi_mode_select_xlat function net: alx: fix race condition in alx_remove s390/ptrace: fix setting syscall number kbuild: improve cc-option to clean up all temporary files blktrace: break out of blktrace setup on concurrent calls ALSA: hda: Add NVIDIA codec IDs 9a & 9d through a0 to patch table ACPI: sysfs: Fix pm_profile_attr type KVM: X86: Fix MSR range of APIC registers in X2APIC mode mm/slab: use memzero_explicit() in kzfree() ocfs2: load global_inode_alloc ocfs2: fix value of OCFS2_INVALID_SLOT ocfs2: fix panic on nfs server over ocfs2 arm64: perf: Report the PC value in REGS_ABI_32 mode tracing: Fix event trigger to accept redundant spaces drm/radeon: fix fb_div check in ni_init_smc_spll_table() sunrpc: fixed rollback in rpc_gssd_dummy_populate() SUNRPC: Properly set the @subbuf parameter of xdr_buf_subsegment() pNFS/flexfiles: Fix list corruption if the mirror count changes NFSv4 fix CLOSE not waiting for direct IO compeletion xfs: add agf freeblocks verify in xfs_agf_verify Revert "tty: hvc: Fix data abort due to race in hvc_open" Linux 4.9.229 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I0ce84c8f4c2c437fee36399c358c3dcc19fdfc1d
246 lines
6.5 KiB
C
246 lines
6.5 KiB
C
/*
|
|
* 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.
|
|
*
|
|
* Copyright © 2012 John Crispin <blogic@openwrt.org>
|
|
* Copyright © 2016 Hauke Mehrtens <hauke@hauke-m.de>
|
|
*/
|
|
|
|
#include <linux/mtd/nand.h>
|
|
#include <linux/of_gpio.h>
|
|
#include <linux/of_platform.h>
|
|
|
|
#include <lantiq_soc.h>
|
|
|
|
/* nand registers */
|
|
#define EBU_ADDSEL1 0x24
|
|
#define EBU_NAND_CON 0xB0
|
|
#define EBU_NAND_WAIT 0xB4
|
|
#define NAND_WAIT_RD BIT(0) /* NAND flash status output */
|
|
#define NAND_WAIT_WR_C BIT(3) /* NAND Write/Read complete */
|
|
#define EBU_NAND_ECC0 0xB8
|
|
#define EBU_NAND_ECC_AC 0xBC
|
|
|
|
/*
|
|
* nand commands
|
|
* The pins of the NAND chip are selected based on the address bits of the
|
|
* "register" read and write. There are no special registers, but an
|
|
* address range and the lower address bits are used to activate the
|
|
* correct line. For example when the bit (1 << 2) is set in the address
|
|
* the ALE pin will be activated.
|
|
*/
|
|
#define NAND_CMD_ALE BIT(2) /* address latch enable */
|
|
#define NAND_CMD_CLE BIT(3) /* command latch enable */
|
|
#define NAND_CMD_CS BIT(4) /* chip select */
|
|
#define NAND_CMD_SE BIT(5) /* spare area access latch */
|
|
#define NAND_CMD_WP BIT(6) /* write protect */
|
|
#define NAND_WRITE_CMD (NAND_CMD_CS | NAND_CMD_CLE)
|
|
#define NAND_WRITE_ADDR (NAND_CMD_CS | NAND_CMD_ALE)
|
|
#define NAND_WRITE_DATA (NAND_CMD_CS)
|
|
#define NAND_READ_DATA (NAND_CMD_CS)
|
|
|
|
/* we need to tel the ebu which addr we mapped the nand to */
|
|
#define ADDSEL1_MASK(x) (x << 4)
|
|
#define ADDSEL1_REGEN 1
|
|
|
|
/* we need to tell the EBU that we have nand attached and set it up properly */
|
|
#define BUSCON1_SETUP (1 << 22)
|
|
#define BUSCON1_BCGEN_RES (0x3 << 12)
|
|
#define BUSCON1_WAITWRC2 (2 << 8)
|
|
#define BUSCON1_WAITRDC2 (2 << 6)
|
|
#define BUSCON1_HOLDC1 (1 << 4)
|
|
#define BUSCON1_RECOVC1 (1 << 2)
|
|
#define BUSCON1_CMULT4 1
|
|
|
|
#define NAND_CON_CE (1 << 20)
|
|
#define NAND_CON_OUT_CS1 (1 << 10)
|
|
#define NAND_CON_IN_CS1 (1 << 8)
|
|
#define NAND_CON_PRE_P (1 << 7)
|
|
#define NAND_CON_WP_P (1 << 6)
|
|
#define NAND_CON_SE_P (1 << 5)
|
|
#define NAND_CON_CS_P (1 << 4)
|
|
#define NAND_CON_CSMUX (1 << 1)
|
|
#define NAND_CON_NANDM 1
|
|
|
|
struct xway_nand_data {
|
|
struct nand_chip chip;
|
|
unsigned long csflags;
|
|
void __iomem *nandaddr;
|
|
};
|
|
|
|
static u8 xway_readb(struct mtd_info *mtd, int op)
|
|
{
|
|
struct nand_chip *chip = mtd_to_nand(mtd);
|
|
struct xway_nand_data *data = nand_get_controller_data(chip);
|
|
|
|
return readb(data->nandaddr + op);
|
|
}
|
|
|
|
static void xway_writeb(struct mtd_info *mtd, int op, u8 value)
|
|
{
|
|
struct nand_chip *chip = mtd_to_nand(mtd);
|
|
struct xway_nand_data *data = nand_get_controller_data(chip);
|
|
|
|
writeb(value, data->nandaddr + op);
|
|
}
|
|
|
|
static void xway_select_chip(struct mtd_info *mtd, int select)
|
|
{
|
|
struct nand_chip *chip = mtd_to_nand(mtd);
|
|
struct xway_nand_data *data = nand_get_controller_data(chip);
|
|
|
|
switch (select) {
|
|
case -1:
|
|
ltq_ebu_w32_mask(NAND_CON_CE, 0, EBU_NAND_CON);
|
|
ltq_ebu_w32_mask(NAND_CON_NANDM, 0, EBU_NAND_CON);
|
|
spin_unlock_irqrestore(&ebu_lock, data->csflags);
|
|
break;
|
|
case 0:
|
|
spin_lock_irqsave(&ebu_lock, data->csflags);
|
|
ltq_ebu_w32_mask(0, NAND_CON_NANDM, EBU_NAND_CON);
|
|
ltq_ebu_w32_mask(0, NAND_CON_CE, EBU_NAND_CON);
|
|
break;
|
|
default:
|
|
BUG();
|
|
}
|
|
}
|
|
|
|
static void xway_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
|
|
{
|
|
if (cmd == NAND_CMD_NONE)
|
|
return;
|
|
|
|
if (ctrl & NAND_CLE)
|
|
xway_writeb(mtd, NAND_WRITE_CMD, cmd);
|
|
else if (ctrl & NAND_ALE)
|
|
xway_writeb(mtd, NAND_WRITE_ADDR, cmd);
|
|
|
|
while ((ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_WR_C) == 0)
|
|
;
|
|
}
|
|
|
|
static int xway_dev_ready(struct mtd_info *mtd)
|
|
{
|
|
return ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_RD;
|
|
}
|
|
|
|
static unsigned char xway_read_byte(struct mtd_info *mtd)
|
|
{
|
|
return xway_readb(mtd, NAND_READ_DATA);
|
|
}
|
|
|
|
static void xway_read_buf(struct mtd_info *mtd, u_char *buf, int len)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < len; i++)
|
|
buf[i] = xway_readb(mtd, NAND_WRITE_DATA);
|
|
}
|
|
|
|
static void xway_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < len; i++)
|
|
xway_writeb(mtd, NAND_WRITE_DATA, buf[i]);
|
|
}
|
|
|
|
/*
|
|
* Probe for the NAND device.
|
|
*/
|
|
static int xway_nand_probe(struct platform_device *pdev)
|
|
{
|
|
struct xway_nand_data *data;
|
|
struct mtd_info *mtd;
|
|
struct resource *res;
|
|
int err;
|
|
u32 cs;
|
|
u32 cs_flag = 0;
|
|
|
|
/* Allocate memory for the device structure (and zero it) */
|
|
data = devm_kzalloc(&pdev->dev, sizeof(struct xway_nand_data),
|
|
GFP_KERNEL);
|
|
if (!data)
|
|
return -ENOMEM;
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
data->nandaddr = devm_ioremap_resource(&pdev->dev, res);
|
|
if (IS_ERR(data->nandaddr))
|
|
return PTR_ERR(data->nandaddr);
|
|
|
|
nand_set_flash_node(&data->chip, pdev->dev.of_node);
|
|
mtd = nand_to_mtd(&data->chip);
|
|
mtd->dev.parent = &pdev->dev;
|
|
|
|
data->chip.cmd_ctrl = xway_cmd_ctrl;
|
|
data->chip.dev_ready = xway_dev_ready;
|
|
data->chip.select_chip = xway_select_chip;
|
|
data->chip.write_buf = xway_write_buf;
|
|
data->chip.read_buf = xway_read_buf;
|
|
data->chip.read_byte = xway_read_byte;
|
|
data->chip.chip_delay = 30;
|
|
|
|
data->chip.ecc.mode = NAND_ECC_SOFT;
|
|
data->chip.ecc.algo = NAND_ECC_HAMMING;
|
|
|
|
platform_set_drvdata(pdev, data);
|
|
nand_set_controller_data(&data->chip, data);
|
|
|
|
/* load our CS from the DT. Either we find a valid 1 or default to 0 */
|
|
err = of_property_read_u32(pdev->dev.of_node, "lantiq,cs", &cs);
|
|
if (!err && cs == 1)
|
|
cs_flag = NAND_CON_IN_CS1 | NAND_CON_OUT_CS1;
|
|
|
|
/* setup the EBU to run in NAND mode on our base addr */
|
|
ltq_ebu_w32(CPHYSADDR(data->nandaddr)
|
|
| ADDSEL1_MASK(3) | ADDSEL1_REGEN, EBU_ADDSEL1);
|
|
|
|
ltq_ebu_w32(BUSCON1_SETUP | BUSCON1_BCGEN_RES | BUSCON1_WAITWRC2
|
|
| BUSCON1_WAITRDC2 | BUSCON1_HOLDC1 | BUSCON1_RECOVC1
|
|
| BUSCON1_CMULT4, LTQ_EBU_BUSCON1);
|
|
|
|
ltq_ebu_w32(NAND_CON_NANDM | NAND_CON_CSMUX | NAND_CON_CS_P
|
|
| NAND_CON_SE_P | NAND_CON_WP_P | NAND_CON_PRE_P
|
|
| cs_flag, EBU_NAND_CON);
|
|
|
|
/* Scan to find existence of the device */
|
|
err = nand_scan(mtd, 1);
|
|
if (err)
|
|
return err;
|
|
|
|
err = mtd_device_register(mtd, NULL, 0);
|
|
if (err)
|
|
nand_cleanup(&data->chip);
|
|
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* Remove a NAND device.
|
|
*/
|
|
static int xway_nand_remove(struct platform_device *pdev)
|
|
{
|
|
struct xway_nand_data *data = platform_get_drvdata(pdev);
|
|
|
|
nand_release(&data->chip);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id xway_nand_match[] = {
|
|
{ .compatible = "lantiq,nand-xway" },
|
|
{},
|
|
};
|
|
|
|
static struct platform_driver xway_nand_driver = {
|
|
.probe = xway_nand_probe,
|
|
.remove = xway_nand_remove,
|
|
.driver = {
|
|
.name = "lantiq,nand-xway",
|
|
.of_match_table = xway_nand_match,
|
|
},
|
|
};
|
|
|
|
builtin_platform_driver(xway_nand_driver);
|