Changes in 4.9.313 floppy: disable FDRAWCMD by default Revert "net: ethernet: stmmac: fix altr_tse_pcs function when using a fixed-link" lightnvm: disable the subsystem USB: quirks: add a Realtek card reader USB: quirks: add STRING quirk for VCOM device USB: serial: whiteheat: fix heap overflow in WHITEHEAT_GET_DTR_RTS USB: serial: cp210x: add PIDs for Kamstrup USB Meter Reader USB: serial: option: add support for Cinterion MV32-WA/MV32-WB USB: serial: option: add Telit 0x1057, 0x1058, 0x1075 compositions xhci: stop polling roothubs after shutdown iio: dac: ad5592r: Fix the missing return value. iio: dac: ad5446: Fix read_raw not returning set value iio: magnetometer: ak8975: Fix the error handling in ak8975_power_on() usb: misc: fix improper handling of refcount in uss720_probe() usb: gadget: uvc: Fix crash when encoding data for usb request usb: gadget: configfs: clear deactivation flag in configfs_composite_unbind() serial: 8250: Also set sticky MCR bits in console restoration serial: 8250: Correct the clock for EndRun PTP/1588 PCIe device hex2bin: make the function hex_to_bin constant-time hex2bin: fix access beyond string end ARM: dts: imx6qdl-apalis: Fix sgtl5000 detection issue phy: samsung: Fix missing of_node_put() in exynos_sata_phy_probe phy: samsung: exynos5250-sata: fix missing device put in probe error paths ARM: OMAP2+: Fix refcount leak in omap_gic_of_init ARM: dts: Fix mmc order for omap3-gta04 mtd: rawnand: Fix return value check of wait_for_completion_timeout pinctrl: pistachio: fix use of irq_of_parse_and_map() ip_gre: Make o_seqno start from 0 in native mode tcp: fix potential xmit stalls caused by TCP_NOTSENT_LOWAT bus: sunxi-rsb: Fix the return value of sunxi_rsb_device_create() clk: sunxi: sun9i-mmc: check return value after calling platform_get_resource() bnx2x: fix napi API usage sequence ASoC: wm8731: Disable the regulator when probing fails drivers: net: hippi: Fix deadlock in rr_close() x86/cpu: Load microcode during restore_processor_state() tty: n_gsm: fix wrong signal octet encoding in convergence layer type 2 tty: n_gsm: fix malformed counter for out of frame data tty: n_gsm: fix insufficient txframe size tty: n_gsm: fix missing explicit ldisc flush tty: n_gsm: fix wrong command retry handling tty: n_gsm: fix wrong command frame length field encoding tty: n_gsm: fix incorrect UA handling MIPS: Fix CP0 counter erratum detection for R4k CPUs parisc: Merge model and model name into one line in /proc/cpuinfo ALSA: fireworks: fix wrong return count shorter than expected by 4 bytes Revert "SUNRPC: attempt AF_LOCAL connect on setup" firewire: fix potential uaf in outbound_phy_packet_callback() firewire: remove check of list iterator against head past the loop body firewire: core: extend card->lock in fw_core_handle_bus_reset ASoC: wm8958: Fix change notifications for DSP controls can: grcan: grcan_close(): fix deadlock can: grcan: use ofdev->dev when allocating DMA memory nfc: replace improper check device_is_registered() in netlink related functions nfc: nfcmrvl: main: reorder destructive operations in nfcmrvl_nci_unregister_dev to avoid bugs NFC: netlink: fix sleep in atomic bug when firmware download timeout hwmon: (adt7470) Fix warning on module removal ASoC: dmaengine: Restore NULL prepare_slave_config() callback net: emaclite: Add error handling for of_address_to_resource() smsc911x: allow using IRQ0 btrfs: always log symlinks in full mode net: igmp: respect RCU rules in ip_mc_source() and ip_mc_msfilter() kvm: x86/cpuid: Only provide CPUID leaf 0xA if host has architectural PMU net: sched: prevent UAF on tc_ctl_tfilter when temporarily dropping rtnl_lock net: ipv6: ensure we call ipv6_mc_down() at most once dm: fix mempool NULL pointer race when completing IO dm: interlock pending dm_io and dm_wait_for_bios_completion Linux 4.9.313 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I41ea8ad0456765c772594463a2780545c066bbca
214 lines
5.3 KiB
C
214 lines
5.3 KiB
C
/*
|
|
* Copyright 2015 Chen-Yu Tsai
|
|
*
|
|
* Chen-Yu Tsai <wens@csie.org>
|
|
*
|
|
* 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.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/init.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/reset.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/reset-controller.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/spinlock.h>
|
|
|
|
#define SUN9I_MMC_WIDTH 4
|
|
|
|
#define SUN9I_MMC_GATE_BIT 16
|
|
#define SUN9I_MMC_RESET_BIT 18
|
|
|
|
struct sun9i_mmc_clk_data {
|
|
spinlock_t lock;
|
|
void __iomem *membase;
|
|
struct clk *clk;
|
|
struct reset_control *reset;
|
|
struct clk_onecell_data clk_data;
|
|
struct reset_controller_dev rcdev;
|
|
};
|
|
|
|
static int sun9i_mmc_reset_assert(struct reset_controller_dev *rcdev,
|
|
unsigned long id)
|
|
{
|
|
struct sun9i_mmc_clk_data *data = container_of(rcdev,
|
|
struct sun9i_mmc_clk_data,
|
|
rcdev);
|
|
unsigned long flags;
|
|
void __iomem *reg = data->membase + SUN9I_MMC_WIDTH * id;
|
|
u32 val;
|
|
|
|
clk_prepare_enable(data->clk);
|
|
spin_lock_irqsave(&data->lock, flags);
|
|
|
|
val = readl(reg);
|
|
writel(val & ~BIT(SUN9I_MMC_RESET_BIT), reg);
|
|
|
|
spin_unlock_irqrestore(&data->lock, flags);
|
|
clk_disable_unprepare(data->clk);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int sun9i_mmc_reset_deassert(struct reset_controller_dev *rcdev,
|
|
unsigned long id)
|
|
{
|
|
struct sun9i_mmc_clk_data *data = container_of(rcdev,
|
|
struct sun9i_mmc_clk_data,
|
|
rcdev);
|
|
unsigned long flags;
|
|
void __iomem *reg = data->membase + SUN9I_MMC_WIDTH * id;
|
|
u32 val;
|
|
|
|
clk_prepare_enable(data->clk);
|
|
spin_lock_irqsave(&data->lock, flags);
|
|
|
|
val = readl(reg);
|
|
writel(val | BIT(SUN9I_MMC_RESET_BIT), reg);
|
|
|
|
spin_unlock_irqrestore(&data->lock, flags);
|
|
clk_disable_unprepare(data->clk);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int sun9i_mmc_reset_reset(struct reset_controller_dev *rcdev,
|
|
unsigned long id)
|
|
{
|
|
sun9i_mmc_reset_assert(rcdev, id);
|
|
udelay(10);
|
|
sun9i_mmc_reset_deassert(rcdev, id);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct reset_control_ops sun9i_mmc_reset_ops = {
|
|
.assert = sun9i_mmc_reset_assert,
|
|
.deassert = sun9i_mmc_reset_deassert,
|
|
.reset = sun9i_mmc_reset_reset,
|
|
};
|
|
|
|
static int sun9i_a80_mmc_config_clk_probe(struct platform_device *pdev)
|
|
{
|
|
struct device_node *np = pdev->dev.of_node;
|
|
struct sun9i_mmc_clk_data *data;
|
|
struct clk_onecell_data *clk_data;
|
|
const char *clk_name = np->name;
|
|
const char *clk_parent;
|
|
struct resource *r;
|
|
int count, i, ret;
|
|
|
|
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
|
if (!data)
|
|
return -ENOMEM;
|
|
|
|
spin_lock_init(&data->lock);
|
|
|
|
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!r)
|
|
return -EINVAL;
|
|
/* one clock/reset pair per word */
|
|
count = DIV_ROUND_UP((resource_size(r)), SUN9I_MMC_WIDTH);
|
|
data->membase = devm_ioremap_resource(&pdev->dev, r);
|
|
if (IS_ERR(data->membase))
|
|
return PTR_ERR(data->membase);
|
|
|
|
clk_data = &data->clk_data;
|
|
clk_data->clk_num = count;
|
|
clk_data->clks = devm_kcalloc(&pdev->dev, count, sizeof(struct clk *),
|
|
GFP_KERNEL);
|
|
if (!clk_data->clks)
|
|
return -ENOMEM;
|
|
|
|
data->clk = devm_clk_get(&pdev->dev, NULL);
|
|
if (IS_ERR(data->clk)) {
|
|
dev_err(&pdev->dev, "Could not get clock\n");
|
|
return PTR_ERR(data->clk);
|
|
}
|
|
|
|
data->reset = devm_reset_control_get(&pdev->dev, NULL);
|
|
if (IS_ERR(data->reset)) {
|
|
dev_err(&pdev->dev, "Could not get reset control\n");
|
|
return PTR_ERR(data->reset);
|
|
}
|
|
|
|
ret = reset_control_deassert(data->reset);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "Reset deassert err %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
clk_parent = __clk_get_name(data->clk);
|
|
for (i = 0; i < count; i++) {
|
|
of_property_read_string_index(np, "clock-output-names",
|
|
i, &clk_name);
|
|
|
|
clk_data->clks[i] = clk_register_gate(&pdev->dev, clk_name,
|
|
clk_parent, 0,
|
|
data->membase + SUN9I_MMC_WIDTH * i,
|
|
SUN9I_MMC_GATE_BIT, 0,
|
|
&data->lock);
|
|
|
|
if (IS_ERR(clk_data->clks[i])) {
|
|
ret = PTR_ERR(clk_data->clks[i]);
|
|
goto err_clk_register;
|
|
}
|
|
}
|
|
|
|
ret = of_clk_add_provider(np, of_clk_src_onecell_get, clk_data);
|
|
if (ret)
|
|
goto err_clk_provider;
|
|
|
|
data->rcdev.owner = THIS_MODULE;
|
|
data->rcdev.nr_resets = count;
|
|
data->rcdev.ops = &sun9i_mmc_reset_ops;
|
|
data->rcdev.of_node = pdev->dev.of_node;
|
|
|
|
ret = reset_controller_register(&data->rcdev);
|
|
if (ret)
|
|
goto err_rc_reg;
|
|
|
|
platform_set_drvdata(pdev, data);
|
|
|
|
return 0;
|
|
|
|
err_rc_reg:
|
|
of_clk_del_provider(np);
|
|
|
|
err_clk_provider:
|
|
for (i = 0; i < count; i++)
|
|
clk_unregister(clk_data->clks[i]);
|
|
|
|
err_clk_register:
|
|
reset_control_assert(data->reset);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static const struct of_device_id sun9i_a80_mmc_config_clk_dt_ids[] = {
|
|
{ .compatible = "allwinner,sun9i-a80-mmc-config-clk" },
|
|
{ /* sentinel */ }
|
|
};
|
|
|
|
static struct platform_driver sun9i_a80_mmc_config_clk_driver = {
|
|
.driver = {
|
|
.name = "sun9i-a80-mmc-config-clk",
|
|
.suppress_bind_attrs = true,
|
|
.of_match_table = sun9i_a80_mmc_config_clk_dt_ids,
|
|
},
|
|
.probe = sun9i_a80_mmc_config_clk_probe,
|
|
};
|
|
builtin_platform_driver(sun9i_a80_mmc_config_clk_driver);
|