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
292 lines
6.8 KiB
C
292 lines
6.8 KiB
C
/*
|
|
* drivers/mtd/nand/ams-delta.c
|
|
*
|
|
* Copyright (C) 2006 Jonathan McDowell <noodles@earth.li>
|
|
*
|
|
* Derived from drivers/mtd/toto.c
|
|
* Converted to platform driver by Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
|
|
* Partially stolen from drivers/mtd/nand/plat_nand.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.
|
|
*
|
|
* Overview:
|
|
* This is a device driver for the NAND flash device found on the
|
|
* Amstrad E3 (Delta).
|
|
*/
|
|
|
|
#include <linux/slab.h>
|
|
#include <linux/module.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/nand.h>
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/platform_data/gpio-omap.h>
|
|
|
|
#include <asm/io.h>
|
|
#include <asm/sizes.h>
|
|
|
|
#include <mach/board-ams-delta.h>
|
|
|
|
#include <mach/hardware.h>
|
|
|
|
/*
|
|
* MTD structure for E3 (Delta)
|
|
*/
|
|
static struct mtd_info *ams_delta_mtd = NULL;
|
|
|
|
/*
|
|
* Define partitions for flash devices
|
|
*/
|
|
|
|
static struct mtd_partition partition_info[] = {
|
|
{ .name = "Kernel",
|
|
.offset = 0,
|
|
.size = 3 * SZ_1M + SZ_512K },
|
|
{ .name = "u-boot",
|
|
.offset = 3 * SZ_1M + SZ_512K,
|
|
.size = SZ_256K },
|
|
{ .name = "u-boot params",
|
|
.offset = 3 * SZ_1M + SZ_512K + SZ_256K,
|
|
.size = SZ_256K },
|
|
{ .name = "Amstrad LDR",
|
|
.offset = 4 * SZ_1M,
|
|
.size = SZ_256K },
|
|
{ .name = "File system",
|
|
.offset = 4 * SZ_1M + 1 * SZ_256K,
|
|
.size = 27 * SZ_1M },
|
|
{ .name = "PBL reserved",
|
|
.offset = 32 * SZ_1M - 3 * SZ_256K,
|
|
.size = 3 * SZ_256K },
|
|
};
|
|
|
|
static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte)
|
|
{
|
|
struct nand_chip *this = mtd_to_nand(mtd);
|
|
void __iomem *io_base = (void __iomem *)nand_get_controller_data(this);
|
|
|
|
writew(0, io_base + OMAP_MPUIO_IO_CNTL);
|
|
writew(byte, this->IO_ADDR_W);
|
|
gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NWE, 0);
|
|
ndelay(40);
|
|
gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NWE, 1);
|
|
}
|
|
|
|
static u_char ams_delta_read_byte(struct mtd_info *mtd)
|
|
{
|
|
u_char res;
|
|
struct nand_chip *this = mtd_to_nand(mtd);
|
|
void __iomem *io_base = (void __iomem *)nand_get_controller_data(this);
|
|
|
|
gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NRE, 0);
|
|
ndelay(40);
|
|
writew(~0, io_base + OMAP_MPUIO_IO_CNTL);
|
|
res = readw(this->IO_ADDR_R);
|
|
gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NRE, 1);
|
|
|
|
return res;
|
|
}
|
|
|
|
static void ams_delta_write_buf(struct mtd_info *mtd, const u_char *buf,
|
|
int len)
|
|
{
|
|
int i;
|
|
|
|
for (i=0; i<len; i++)
|
|
ams_delta_write_byte(mtd, buf[i]);
|
|
}
|
|
|
|
static void ams_delta_read_buf(struct mtd_info *mtd, u_char *buf, int len)
|
|
{
|
|
int i;
|
|
|
|
for (i=0; i<len; i++)
|
|
buf[i] = ams_delta_read_byte(mtd);
|
|
}
|
|
|
|
/*
|
|
* Command control function
|
|
*
|
|
* ctrl:
|
|
* NAND_NCE: bit 0 -> bit 2
|
|
* NAND_CLE: bit 1 -> bit 7
|
|
* NAND_ALE: bit 2 -> bit 6
|
|
*/
|
|
static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd,
|
|
unsigned int ctrl)
|
|
{
|
|
|
|
if (ctrl & NAND_CTRL_CHANGE) {
|
|
gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NCE,
|
|
(ctrl & NAND_NCE) == 0);
|
|
gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_CLE,
|
|
(ctrl & NAND_CLE) != 0);
|
|
gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_ALE,
|
|
(ctrl & NAND_ALE) != 0);
|
|
}
|
|
|
|
if (cmd != NAND_CMD_NONE)
|
|
ams_delta_write_byte(mtd, cmd);
|
|
}
|
|
|
|
static int ams_delta_nand_ready(struct mtd_info *mtd)
|
|
{
|
|
return gpio_get_value(AMS_DELTA_GPIO_PIN_NAND_RB);
|
|
}
|
|
|
|
static const struct gpio _mandatory_gpio[] = {
|
|
{
|
|
.gpio = AMS_DELTA_GPIO_PIN_NAND_NCE,
|
|
.flags = GPIOF_OUT_INIT_HIGH,
|
|
.label = "nand_nce",
|
|
},
|
|
{
|
|
.gpio = AMS_DELTA_GPIO_PIN_NAND_NRE,
|
|
.flags = GPIOF_OUT_INIT_HIGH,
|
|
.label = "nand_nre",
|
|
},
|
|
{
|
|
.gpio = AMS_DELTA_GPIO_PIN_NAND_NWP,
|
|
.flags = GPIOF_OUT_INIT_HIGH,
|
|
.label = "nand_nwp",
|
|
},
|
|
{
|
|
.gpio = AMS_DELTA_GPIO_PIN_NAND_NWE,
|
|
.flags = GPIOF_OUT_INIT_HIGH,
|
|
.label = "nand_nwe",
|
|
},
|
|
{
|
|
.gpio = AMS_DELTA_GPIO_PIN_NAND_ALE,
|
|
.flags = GPIOF_OUT_INIT_LOW,
|
|
.label = "nand_ale",
|
|
},
|
|
{
|
|
.gpio = AMS_DELTA_GPIO_PIN_NAND_CLE,
|
|
.flags = GPIOF_OUT_INIT_LOW,
|
|
.label = "nand_cle",
|
|
},
|
|
};
|
|
|
|
/*
|
|
* Main initialization routine
|
|
*/
|
|
static int ams_delta_init(struct platform_device *pdev)
|
|
{
|
|
struct nand_chip *this;
|
|
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
void __iomem *io_base;
|
|
int err = 0;
|
|
|
|
if (!res)
|
|
return -ENXIO;
|
|
|
|
/* Allocate memory for MTD device structure and private data */
|
|
this = kzalloc(sizeof(struct nand_chip), GFP_KERNEL);
|
|
if (!this) {
|
|
printk (KERN_WARNING "Unable to allocate E3 NAND MTD device structure.\n");
|
|
err = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
ams_delta_mtd = nand_to_mtd(this);
|
|
ams_delta_mtd->owner = THIS_MODULE;
|
|
|
|
/*
|
|
* Don't try to request the memory region from here,
|
|
* it should have been already requested from the
|
|
* gpio-omap driver and requesting it again would fail.
|
|
*/
|
|
|
|
io_base = ioremap(res->start, resource_size(res));
|
|
if (io_base == NULL) {
|
|
dev_err(&pdev->dev, "ioremap failed\n");
|
|
err = -EIO;
|
|
goto out_free;
|
|
}
|
|
|
|
nand_set_controller_data(this, (void *)io_base);
|
|
|
|
/* Set address of NAND IO lines */
|
|
this->IO_ADDR_R = io_base + OMAP_MPUIO_INPUT_LATCH;
|
|
this->IO_ADDR_W = io_base + OMAP_MPUIO_OUTPUT;
|
|
this->read_byte = ams_delta_read_byte;
|
|
this->write_buf = ams_delta_write_buf;
|
|
this->read_buf = ams_delta_read_buf;
|
|
this->cmd_ctrl = ams_delta_hwcontrol;
|
|
if (gpio_request(AMS_DELTA_GPIO_PIN_NAND_RB, "nand_rdy") == 0) {
|
|
this->dev_ready = ams_delta_nand_ready;
|
|
} else {
|
|
this->dev_ready = NULL;
|
|
printk(KERN_NOTICE "Couldn't request gpio for Delta NAND ready.\n");
|
|
}
|
|
/* 25 us command delay time */
|
|
this->chip_delay = 30;
|
|
this->ecc.mode = NAND_ECC_SOFT;
|
|
this->ecc.algo = NAND_ECC_HAMMING;
|
|
|
|
platform_set_drvdata(pdev, io_base);
|
|
|
|
/* Set chip enabled, but */
|
|
err = gpio_request_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio));
|
|
if (err)
|
|
goto out_gpio;
|
|
|
|
/* Scan to find existence of the device */
|
|
if (nand_scan(ams_delta_mtd, 1)) {
|
|
err = -ENXIO;
|
|
goto out_mtd;
|
|
}
|
|
|
|
/* Register the partitions */
|
|
mtd_device_register(ams_delta_mtd, partition_info,
|
|
ARRAY_SIZE(partition_info));
|
|
|
|
goto out;
|
|
|
|
out_mtd:
|
|
gpio_free_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio));
|
|
out_gpio:
|
|
gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB);
|
|
iounmap(io_base);
|
|
out_free:
|
|
kfree(this);
|
|
out:
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* Clean up routine
|
|
*/
|
|
static int ams_delta_cleanup(struct platform_device *pdev)
|
|
{
|
|
void __iomem *io_base = platform_get_drvdata(pdev);
|
|
|
|
/* Release resources, unregister device */
|
|
nand_release(mtd_to_nand(ams_delta_mtd));
|
|
|
|
gpio_free_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio));
|
|
gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB);
|
|
iounmap(io_base);
|
|
|
|
/* Free the MTD device structure */
|
|
kfree(mtd_to_nand(ams_delta_mtd));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver ams_delta_nand_driver = {
|
|
.probe = ams_delta_init,
|
|
.remove = ams_delta_cleanup,
|
|
.driver = {
|
|
.name = "ams-delta-nand",
|
|
},
|
|
};
|
|
|
|
module_platform_driver(ams_delta_nand_driver);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Jonathan McDowell <noodles@earth.li>");
|
|
MODULE_DESCRIPTION("Glue layer for NAND flash on Amstrad E3 (Delta)");
|