Changes in 4.9.311 USB: serial: pl2303: add IBM device IDs USB: serial: simple: add Nokia phone driver netdevice: add the case if dev is NULL virtio_console: break out of buf poll on remove ethernet: sun: Free the coherent when failing in probing af_key: add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register block: Add a helper to validate the block size virtio-blk: Use blk_validate_block_size() to validate block size USB: usb-storage: Fix use of bitfields for hardware data in ene_ub6250.c coresight: Fix TRCCONFIGR.QE sysfs interface iio: inkern: apply consumer scale on IIO_VAL_INT cases iio: inkern: make a best effort on offset calculation clk: uniphier: Fix fixed-rate initialization ptrace: Check PTRACE_O_SUSPEND_SECCOMP permission on PTRACE_SEIZE SUNRPC: avoid race between mod_timer() and del_timer_sync() NFSD: prevent underflow in nfssvc_decode_writeargs() can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path jffs2: fix use-after-free in jffs2_clear_xattr_subsystem jffs2: fix memory leak in jffs2_do_mount_fs jffs2: fix memory leak in jffs2_scan_medium mm/pages_alloc.c: don't create ZONE_MOVABLE beyond the end of a node mempolicy: mbind_range() set_policy() after vma_merge() scsi: libsas: Fix sas_ata_qc_issue() handling of NCQ NON DATA commands Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads" ALSA: cs4236: fix an incorrect NULL check on list iterator drivers: hamradio: 6pack: fix UAF bug caused by mod_timer() video: fbdev: sm712fb: Fix crash in smtcfb_read() video: fbdev: atari: Atari 2 bpp (STe) palette bugfix ARM: dts: exynos: fix UART3 pins configuration in Exynos5250 ARM: dts: exynos: add missing HDMI supplies on SMDK5250 ARM: dts: exynos: add missing HDMI supplies on SMDK5420 carl9170: fix missing bit-wise or operator for tx_params thermal: int340x: Increase bitmap size lib/raid6/test: fix multiple definition linking error DEC: Limit PMAX memory probing to R3k systems media: davinci: vpif: fix unbalanced runtime PM get brcmfmac: firmware: Allocate space for default boardrev in nvram brcmfmac: pcie: Replace brcmf_pcie_copy_mem_todev with memcpy_toio PCI: pciehp: Clear cmd_busy bit in polling mode crypto: authenc - Fix sleep in atomic context in decrypt_tail crypto: mxs-dcp - Fix scatterlist processing spi: tegra114: Add missing IRQ check in tegra_spi_probe selftests/x86: Add validity check and allow field splitting hwmon: (pmbus) Add mutex to regulator ops hwmon: (sch56xx-common) Replace WDOG_ACTIVE with WDOG_HW_RUNNING PM: hibernate: fix __setup handler error handling PM: suspend: fix return value of __setup handler crypto: vmx - add missing dependencies crypto: ccp - ccp_dmaengine_unregister release dma channels hwmon: (pmbus) Add Vin unit off handling clocksource: acpi_pm: fix return value of __setup handler sched/debug: Remove mpol_get/put and task_lock/unlock from sched_show_numa perf/core: Fix address filter parser for multiple filters perf/x86/intel/pt: Fix address filter config for 32-bit kernel video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe() video: fbdev: fbcvt.c: fix printing in fb_cvt_print_name() ARM: dts: qcom: ipq4019: fix sleep clock soc: ti: wkup_m3_ipc: Fix IRQ check in wkup_m3_ipc_probe media: usb: go7007: s2250-board: fix leak in probe() ASoC: ti: davinci-i2s: Add check for clk_enable() ALSA: spi: Add check for clk_enable() arm64: dts: ns2: Fix spi-cpol and spi-cpha property arm64: dts: broadcom: Fix sata nodename printk: fix return value of printk.devkmsg __setup handler ASoC: mxs-saif: Handle errors for clk_enable ASoC: atmel_ssc_dai: Handle errors for clk_enable memory: emif: Add check for setup_interrupts memory: emif: check the pointer temp in get_device_details() ALSA: firewire-lib: fix uninitialized flag for AV/C deferred transaction ASoC: atmel: Add missing of_node_put() in at91sam9g20ek_audio_probe ASoC: wm8350: Handle error for wm8350_register_irq ASoC: fsi: Add check for clk_enable video: fbdev: omapfb: Add missing of_node_put() in dvic_probe_of ASoC: dmaengine: do not use a NULL prepare_slave_config() callback ASoC: mxs: Fix error handling in mxs_sgtl5000_probe ASoC: imx-es8328: Fix error return code in imx_es8328_probe() mtd: onenand: Check for error irq drm/edid: Don't clear formats if using deep color ath9k_htc: fix uninit value bugs ray_cs: Check ioremap return value power: supply: ab8500: Fix memory leak in ab8500_fg_sysfs_init HID: i2c-hid: fix GET/SET_REPORT for unnumbered reports iwlwifi: Fix -EIO error code that is never returned scsi: pm8001: Fix command initialization in pm80XX_send_read_log() scsi: pm8001: Fix command initialization in pm8001_chip_ssp_tm_req() scsi: pm8001: Fix payload initialization in pm80xx_set_thermal_config() scsi: pm8001: Fix abort all task initialization TOMOYO: fix __setup handlers return values ext2: correct max file size computing drm/tegra: Fix reference leak in tegra_dsi_ganged_probe KVM: x86: Fix emulation in writing cr8 KVM: x86/emulator: Defer not-present segment check in __load_segment_descriptor() i2c: xiic: Make bus names unique power: supply: wm8350-power: Handle error for wm8350_register_irq power: supply: wm8350-power: Add missing free in free_charger_irq powerpc/sysdev: fix incorrect use to determine if list is empty mfd: mc13xxx: Add check for mc13xxx_irq_request MIPS: RB532: fix return value of __setup handler USB: storage: ums-realtek: fix error code in rts51x_read_mem() af_netlink: Fix shift out of bounds in group mask calculation i2c: mux: demux-pinctrl: do not deactivate a master that is not active mfd: asic3: Add missing iounmap() on error asic3_mfd_probe mxser: fix xmit_buf leak in activate when LSR == 0xff pwm: lpc18xx-sct: Initialize driver data and hardware before pwmchip_add() iio: adc: Add check for devm_request_threaded_irq clk: qcom: clk-rcg2: Update the frac table for pixel clock remoteproc: qcom_wcnss: Add missing of_node_put() in wcnss_alloc_memory_region clk: loongson1: Terminate clk_div_table with sentinel element clk: clps711x: Terminate clk_div_table with sentinel element clk: tegra: tegra124-emc: Fix missing put_device() call in emc_ensure_emc_driver NFS: remove unneeded check in decode_devicenotify_args() pinctrl: mediatek: Fix missing of_node_put() in mtk_pctrl_init pinctrl: nomadik: Add missing of_node_put() in nmk_pinctrl_probe pinctrl/rockchip: Add missing of_node_put() in rockchip_pinctrl_probe tty: hvc: fix return value of __setup handler kgdboc: fix return value of __setup handler kgdbts: fix return value of __setup handler jfs: fix divide error in dbNextAG netfilter: nf_conntrack_tcp: preserve liberal flag in tcp options net: phy: broadcom: Fix brcm_fet_config_init() qlcnic: dcb: default to returning -EOPNOTSUPP net/x25: Fix null-ptr-deref caused by x25_disconnect selinux: use correct type for context length loop: use sysfs_emit() in the sysfs xxx show() Fix incorrect type in assignment of ipv6 port for audit irqchip/nvic: Release nvic_base upon failure ACPICA: Avoid walking the ACPI Namespace if it is not there ACPI/APEI: Limit printable size of BERT table data PM: core: keep irq flags in device_pm_check_callbacks() spi: tegra20: Use of_device_get_match_data() ext4: don't BUG if someone dirty pages without asking ext4 first ntfs: add sanity check on allocation size video: fbdev: nvidiafb: Use strscpy() to prevent buffer overflow video: fbdev: w100fb: Reset global state video: fbdev: cirrusfb: check pixclock to avoid divide by zero video: fbdev: omapfb: acx565akm: replace snprintf with sysfs_emit ARM: dts: qcom: fix gic_irq_domain_translate warnings for msm8960 ARM: dts: bcm2837: Add the missing L1/L2 cache information video: fbdev: omapfb: panel-dsi-cm: Use sysfs_emit() instead of snprintf() video: fbdev: omapfb: panel-tpo-td043mtea1: Use sysfs_emit() instead of snprintf() ASoC: soc-core: skip zero num_dai component in searching dai name media: cx88-mpeg: clear interrupt status register before streaming video ARM: tegra: tamonten: Fix I2C3 pad setting ARM: mmp: Fix failure to remove sram device video: fbdev: sm712fb: Fix crash in smtcfb_write() media: hdpvr: initialize dev->worker at hdpvr_register_videodev mmc: host: Return an error when ->enable_sdio_irq() ops is missing scsi: qla2xxx: Fix incorrect reporting of task management failure KVM: Prevent module exit until all VMs are freed ubifs: Add missing iput if do_tmpfile() failed in rename whiteout ubifs: setflags: Make dirtied_ino_d 8 bytes aligned gfs2: Make sure FITRIM minlen is rounded up to fs block size pinctrl: pinconf-generic: Print arguments for bias-pull-* ACPI: CPPC: Avoid out of bounds access when parsing _CPC data mm/mmap: return 1 from stack_guard_gap __setup() handler mm/memcontrol: return 1 from cgroup.memory __setup() handler ubi: fastmap: Return error code if memory allocation fails in add_aeb() ASoC: topology: Allow TLV control to be either read or write ARM: dts: spear1340: Update serial node properties ARM: dts: spear13xx: Update SPI dma properties openvswitch: Fixed nd target mask field in the flow dump. KVM: x86: Forbid VMM to set SYNIC/STIMER MSRs when SynIC wasn't activated rtc: wm8350: Handle error for wm8350_register_irq ARM: 9187/1: JIVE: fix return value of __setup handler KVM: x86/svm: Clear reserved bits written to PerfEvtSeln MSRs ath5k: fix OOB in ath5k_eeprom_read_pcal_info_5111 ptp: replace snprintf with sysfs_emit powerpc: dts: t104xrdb: fix phy type for FMAN 4/5 scsi: mvsas: Replace snprintf() with sysfs_emit() scsi: bfa: Replace snprintf() with sysfs_emit() iommu/arm-smmu-v3: fix event handling soft lockup dm ioctl: prevent potential spectre v1 gadget scsi: pm8001: Fix pm8001_mpi_task_abort_resp() scsi: aha152x: Fix aha152x_setup() __setup handler return value bnxt_en: Eliminate unintended link toggle during FW reset MIPS: fix fortify panic when copying asm exception handlers scsi: libfc: Fix use after free in fc_exch_abts_resp() usb: dwc3: omap: fix "unbalanced disables for smps10_out1" on omap5evm xtensa: fix DTC warning unit_address_format Bluetooth: Fix use after free in hci_send_acl init/main.c: return 1 from handled __setup() functions w1: w1_therm: fixes w1_seq for ds28ea00 sensors SUNRPC/call_alloc: async tasks mustn't block waiting for memory serial: samsung_tty: do not unlock port->lock for uart_write_wakeup() virtio_console: eliminate anonymous module_init & module_exit jfs: prevent NULL deref in diFree mm: fix race between MADV_FREE reclaim and blkdev direct IO read scsi: zorro7xx: Fix a resource leak in zorro7xx_remove_one() net: stmmac: Fix unset max_speed difference between DT and non-DT platforms drm/imx: Fix memory leak in imx_pd_connector_get_modes drbd: Fix five use after free bugs in get_initial_state mmmremap.c: avoid pointless invalidate_range_start/end on mremap(old_size=0) mm/mempolicy: fix mpol_new leak in shared_policy_replace x86/pm: Save the MSR validity status at context setup x86/speculation: Restore speculation related MSRs during S3 resume arm64: patch_text: Fixup last cpu should be master tools build: Use $(shell ) instead of `` to get embedded libperl's ccopts dmaengine: Revert "dmaengine: shdma: Fix runtime PM imbalance on error" mm: don't skip swap entry even if zap_details specified arm64: module: remove (NOLOAD) from linker script xfrm: policy: match with both mark and mask on user interfaces veth: Ensure eth header is in skb's linear part net: ethernet: stmmac: fix altr_tse_pcs function when using a fixed-link nfc: nci: add flush_workqueue to prevent uaf cifs: potential buffer overflow in handling symlinks drm/amdkfd: Check for potential null return of kmalloc_array() scsi: ibmvscsis: Increase INITIAL_SRP_LIMIT to 1024 net: micrel: fix KS8851_MLL Kconfig gpu: ipu-v3: Fix dev_dbg frequency output scsi: mvsas: Add PCI ID of RocketRaid 2640 drivers: net: slip: fix NPD bug in sl_tx_timeout() mm, page_alloc: fix build_zonerefs_node() mm: kmemleak: take a full lowmem check in kmemleak_*_phys() ALSA: pcm: Test for "silence" field in struct "pcm_format_data" ARM: davinci: da850-evm: Avoid NULL pointer dereference smp: Fix offline cpu check in flush_smp_call_function_queue() i2c: pasemi: Wait for write xfers to finish gcc-plugins: latent_entropy: use /dev/urandom Linux 4.9.311 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ia8f55c5ae2f0eb71b0893d8271a10dfd3c78b3b8
191 lines
5.9 KiB
C
191 lines
5.9 KiB
C
/*
|
|
* Cirrus Logic CLPS711X CLK driver
|
|
*
|
|
* Copyright (C) 2014 Alexander Shiyan <shc_work@mail.ru>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/clkdev.h>
|
|
#include <linux/io.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/mfd/syscon/clps711x.h>
|
|
|
|
#include <dt-bindings/clock/clps711x-clock.h>
|
|
|
|
#define CLPS711X_SYSCON1 (0x0100)
|
|
#define CLPS711X_SYSCON2 (0x1100)
|
|
#define CLPS711X_SYSFLG2 (CLPS711X_SYSCON2 + SYSFLG_OFFSET)
|
|
#define CLPS711X_PLLR (0xa5a8)
|
|
|
|
#define CLPS711X_EXT_FREQ (13000000)
|
|
#define CLPS711X_OSC_FREQ (3686400)
|
|
|
|
static const struct clk_div_table spi_div_table[] = {
|
|
{ .val = 0, .div = 32, },
|
|
{ .val = 1, .div = 8, },
|
|
{ .val = 2, .div = 2, },
|
|
{ .val = 3, .div = 1, },
|
|
{ /* sentinel */ }
|
|
};
|
|
|
|
static const struct clk_div_table timer_div_table[] = {
|
|
{ .val = 0, .div = 256, },
|
|
{ .val = 1, .div = 1, },
|
|
{ /* sentinel */ }
|
|
};
|
|
|
|
struct clps711x_clk {
|
|
spinlock_t lock;
|
|
struct clk_hw_onecell_data clk_data;
|
|
};
|
|
|
|
static struct clps711x_clk * __init _clps711x_clk_init(void __iomem *base,
|
|
u32 fref)
|
|
{
|
|
u32 tmp, f_cpu, f_pll, f_bus, f_tim, f_pwm, f_spi;
|
|
struct clps711x_clk *clps711x_clk;
|
|
unsigned i;
|
|
|
|
if (!base)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
clps711x_clk = kzalloc(sizeof(*clps711x_clk) +
|
|
sizeof(*clps711x_clk->clk_data.hws) * CLPS711X_CLK_MAX,
|
|
GFP_KERNEL);
|
|
if (!clps711x_clk)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
spin_lock_init(&clps711x_clk->lock);
|
|
|
|
/* Read PLL multiplier value and sanity check */
|
|
tmp = readl(base + CLPS711X_PLLR) >> 24;
|
|
if (((tmp >= 10) && (tmp <= 50)) || !fref)
|
|
f_pll = DIV_ROUND_UP(CLPS711X_OSC_FREQ * tmp, 2);
|
|
else
|
|
f_pll = fref;
|
|
|
|
tmp = readl(base + CLPS711X_SYSFLG2);
|
|
if (tmp & SYSFLG2_CKMODE) {
|
|
f_cpu = CLPS711X_EXT_FREQ;
|
|
f_bus = CLPS711X_EXT_FREQ;
|
|
f_spi = DIV_ROUND_CLOSEST(CLPS711X_EXT_FREQ, 96);
|
|
f_pll = 0;
|
|
f_pwm = DIV_ROUND_CLOSEST(CLPS711X_EXT_FREQ, 128);
|
|
} else {
|
|
f_cpu = f_pll;
|
|
if (f_cpu > 36864000)
|
|
f_bus = DIV_ROUND_UP(f_cpu, 2);
|
|
else
|
|
f_bus = 36864000 / 2;
|
|
f_spi = DIV_ROUND_CLOSEST(f_cpu, 576);
|
|
f_pwm = DIV_ROUND_CLOSEST(f_cpu, 768);
|
|
}
|
|
|
|
if (tmp & SYSFLG2_CKMODE) {
|
|
if (readl(base + CLPS711X_SYSCON2) & SYSCON2_OSTB)
|
|
f_tim = DIV_ROUND_CLOSEST(CLPS711X_EXT_FREQ, 26);
|
|
else
|
|
f_tim = DIV_ROUND_CLOSEST(CLPS711X_EXT_FREQ, 24);
|
|
} else
|
|
f_tim = DIV_ROUND_CLOSEST(f_cpu, 144);
|
|
|
|
tmp = readl(base + CLPS711X_SYSCON1);
|
|
/* Timer1 in free running mode.
|
|
* Counter will wrap around to 0xffff when it underflows
|
|
* and will continue to count down.
|
|
*/
|
|
tmp &= ~(SYSCON1_TC1M | SYSCON1_TC1S);
|
|
/* Timer2 in prescale mode.
|
|
* Value writen is automatically re-loaded when
|
|
* the counter underflows.
|
|
*/
|
|
tmp |= SYSCON1_TC2M | SYSCON1_TC2S;
|
|
writel(tmp, base + CLPS711X_SYSCON1);
|
|
|
|
clps711x_clk->clk_data.hws[CLPS711X_CLK_DUMMY] =
|
|
clk_hw_register_fixed_rate(NULL, "dummy", NULL, 0, 0);
|
|
clps711x_clk->clk_data.hws[CLPS711X_CLK_CPU] =
|
|
clk_hw_register_fixed_rate(NULL, "cpu", NULL, 0, f_cpu);
|
|
clps711x_clk->clk_data.hws[CLPS711X_CLK_BUS] =
|
|
clk_hw_register_fixed_rate(NULL, "bus", NULL, 0, f_bus);
|
|
clps711x_clk->clk_data.hws[CLPS711X_CLK_PLL] =
|
|
clk_hw_register_fixed_rate(NULL, "pll", NULL, 0, f_pll);
|
|
clps711x_clk->clk_data.hws[CLPS711X_CLK_TIMERREF] =
|
|
clk_hw_register_fixed_rate(NULL, "timer_ref", NULL, 0, f_tim);
|
|
clps711x_clk->clk_data.hws[CLPS711X_CLK_TIMER1] =
|
|
clk_hw_register_divider_table(NULL, "timer1", "timer_ref", 0,
|
|
base + CLPS711X_SYSCON1, 5, 1, 0,
|
|
timer_div_table, &clps711x_clk->lock);
|
|
clps711x_clk->clk_data.hws[CLPS711X_CLK_TIMER2] =
|
|
clk_hw_register_divider_table(NULL, "timer2", "timer_ref", 0,
|
|
base + CLPS711X_SYSCON1, 7, 1, 0,
|
|
timer_div_table, &clps711x_clk->lock);
|
|
clps711x_clk->clk_data.hws[CLPS711X_CLK_PWM] =
|
|
clk_hw_register_fixed_rate(NULL, "pwm", NULL, 0, f_pwm);
|
|
clps711x_clk->clk_data.hws[CLPS711X_CLK_SPIREF] =
|
|
clk_hw_register_fixed_rate(NULL, "spi_ref", NULL, 0, f_spi);
|
|
clps711x_clk->clk_data.hws[CLPS711X_CLK_SPI] =
|
|
clk_hw_register_divider_table(NULL, "spi", "spi_ref", 0,
|
|
base + CLPS711X_SYSCON1, 16, 2, 0,
|
|
spi_div_table, &clps711x_clk->lock);
|
|
clps711x_clk->clk_data.hws[CLPS711X_CLK_UART] =
|
|
clk_hw_register_fixed_factor(NULL, "uart", "bus", 0, 1, 10);
|
|
clps711x_clk->clk_data.hws[CLPS711X_CLK_TICK] =
|
|
clk_hw_register_fixed_rate(NULL, "tick", NULL, 0, 64);
|
|
for (i = 0; i < CLPS711X_CLK_MAX; i++)
|
|
if (IS_ERR(clps711x_clk->clk_data.hws[i]))
|
|
pr_err("clk %i: register failed with %ld\n",
|
|
i, PTR_ERR(clps711x_clk->clk_data.hws[i]));
|
|
|
|
return clps711x_clk;
|
|
}
|
|
|
|
void __init clps711x_clk_init(void __iomem *base)
|
|
{
|
|
struct clps711x_clk *clps711x_clk;
|
|
|
|
clps711x_clk = _clps711x_clk_init(base, 73728000);
|
|
|
|
BUG_ON(IS_ERR(clps711x_clk));
|
|
|
|
/* Clocksource */
|
|
clk_hw_register_clkdev(clps711x_clk->clk_data.hws[CLPS711X_CLK_TIMER1],
|
|
NULL, "clps711x-timer.0");
|
|
clk_hw_register_clkdev(clps711x_clk->clk_data.hws[CLPS711X_CLK_TIMER2],
|
|
NULL, "clps711x-timer.1");
|
|
|
|
/* Drivers */
|
|
clk_hw_register_clkdev(clps711x_clk->clk_data.hws[CLPS711X_CLK_PWM],
|
|
NULL, "clps711x-pwm");
|
|
clk_hw_register_clkdev(clps711x_clk->clk_data.hws[CLPS711X_CLK_UART],
|
|
NULL, "clps711x-uart.0");
|
|
clk_hw_register_clkdev(clps711x_clk->clk_data.hws[CLPS711X_CLK_UART],
|
|
NULL, "clps711x-uart.1");
|
|
}
|
|
|
|
#ifdef CONFIG_OF
|
|
static void __init clps711x_clk_init_dt(struct device_node *np)
|
|
{
|
|
void __iomem *base = of_iomap(np, 0);
|
|
struct clps711x_clk *clps711x_clk;
|
|
u32 fref = 0;
|
|
|
|
WARN_ON(of_property_read_u32(np, "startup-frequency", &fref));
|
|
|
|
clps711x_clk = _clps711x_clk_init(base, fref);
|
|
BUG_ON(IS_ERR(clps711x_clk));
|
|
|
|
clps711x_clk->clk_data.num = CLPS711X_CLK_MAX;
|
|
of_clk_add_hw_provider(np, of_clk_hw_onecell_get,
|
|
&clps711x_clk->clk_data);
|
|
}
|
|
CLK_OF_DECLARE(clps711x, "cirrus,ep7209-clk", clps711x_clk_init_dt);
|
|
#endif
|