Changes in 4.9.220 bus: sunxi-rsb: Return correct data when mixing 16-bit and 8-bit reads net: vxge: fix wrong __VA_ARGS__ usage qlcnic: Fix bad kzalloc null test i2c: st: fix missing struct parameter description irqchip/versatile-fpga: Handle chained IRQs properly sched: Avoid scale real weight down to zero selftests/x86/ptrace_syscall_32: Fix no-vDSO segfault libata: Remove extra scsi_host_put() in ata_scsi_add_hosts() gfs2: Don't demote a glock until its revokes are written x86/boot: Use unsigned comparison for addresses locking/lockdep: Avoid recursion in lockdep_count_{for,back}ward_deps() btrfs: remove a BUG_ON() from merge_reloc_roots() btrfs: track reloc roots based on their commit root bytenr misc: rtsx: set correct pcr_ops for rts522A ASoC: fix regwmask ASoC: dapm: connect virtual mux with default value ASoC: dpcm: allow start or stop during pause for backend ASoC: topology: use name_prefix for new kcontrol usb: gadget: f_fs: Fix use after free issue as part of queue failure usb: gadget: composite: Inform controller driver of self-powered ALSA: usb-audio: Add mixer workaround for TRX40 and co ALSA: hda: Add driver blacklist ALSA: hda: Fix potential access overflow in beep helper ALSA: ice1724: Fix invalid access for enumerated ctl items ALSA: pcm: oss: Fix regression by buffer overflow fix media: ti-vpe: cal: fix disable_irqs to only the intended target acpi/x86: ignore unspecified bit positions in the ACPI global lock field thermal: devfreq_cooling: inline all stubs for CONFIG_DEVFREQ_THERMAL=n KEYS: reaching the keys quotas correctly irqchip/versatile-fpga: Apply clear-mask earlier MIPS: OCTEON: irq: Fix potential NULL pointer dereference ath9k: Handle txpower changes even when TPC is disabled signal: Extend exec_id to 64bits x86/entry/32: Add missing ASM_CLAC to general_protection entry KVM: s390: vsie: Fix region 1 ASCE sanity shadow address checks KVM: s390: vsie: Fix delivery of addressing exceptions KVM: x86: Allocate new rmap and large page tracking when moving memslot KVM: VMX: Always VMCLEAR in-use VMCSes during crash with kexec support KVM: VMX: fix crash cleanup when KVM wasn't used btrfs: drop block from cache on error in relocation crypto: mxs-dcp - fix scatterlist linearization for hash ALSA: hda: Initialize power_state field properly x86/speculation: Remove redundant arch_smt_update() invocation tools: gpio: Fix out-of-tree build regression mm: Use fixed constant in page_frag_alloc instead of size + 1 dm verity fec: fix memory leak in verity_fec_dtr scsi: zfcp: fix missing erp_lock in port recovery trigger for point-to-point arm64: armv8_deprecated: Fix undef_hook mask for thumb setend rtc: omap: Use define directive for PIN_CONFIG_ACTIVE_HIGH ext4: fix a data race at inode->i_blocks ocfs2: no need try to truncate file beyond i_size s390/diag: fix display of diagnose call statistics Input: i8042 - add Acer Aspire 5738z to nomux list kmod: make request_module() return an error when autoloading is disabled cpufreq: powernv: Fix use-after-free hfsplus: fix crash and filesystem corruption when deleting files libata: Return correct status in sata_pmp_eh_recover_pm() when ATA_DFLAG_DETACH is set powerpc/64/tm: Don't let userspace set regs->trap via sigreturn Btrfs: fix crash during unmount due to race with delayed inode workers drm/dp_mst: Fix clearing payload state on topology disable drm: Remove PageReserved manipulation from drm_pci_alloc ipmi: fix hung processes in __get_guid() powerpc/fsl_booke: Avoid creating duplicate tlb1 entry misc: echo: Remove unnecessary parentheses and simplify check for zero mfd: dln2: Fix sanity checking for endpoints hsr: check protocol version in hsr_newlink() net: ipv4: devinet: Fix crash when add/del multicast IP with autojoin net: qrtr: send msgs from local of same id as broadcast net: ipv6: do not consider routes via gateways for anycast address check scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic jbd2: improve comments about freeing data buffers whose page mapping is NULL ext4: fix incorrect group count in ext4_fill_super error message ext4: fix incorrect inodes per group in error message ASoC: Intel: mrfld: fix incorrect check on p->sink ASoC: Intel: mrfld: return error codes when an error occurs ALSA: usb-audio: Don't override ignore_ctl_error value from the map btrfs: check commit root generation in should_ignore_root mac80211_hwsim: Use kstrndup() in place of kasprintf() ext4: do not zeroout extents beyond i_disksize dm flakey: check for null arg_name in parse_features() kvm: x86: Host feature SSBD doesn't imply guest feature SPEC_CTRL_SSBD scsi: target: remove boilerplate code scsi: target: fix hang when multiple threads try to destroy the same iscsi session tracing: Fix the race between registering 'snapshot' event trigger and triggering 'snapshot' operation objtool: Fix switch table detection in .text.unlikely scsi: sg: add sg_remove_request in sg_common_write ALSA: hda: Don't release card at firmware loading error video: fbdev: sis: Remove unnecessary parentheses and commented code drm: NULL pointer dereference [null-pointer-deref] (CWE 476) problem Revert "gpio: set up initial state from .get_direction()" wil6210: increase firmware ready timeout wil6210: fix temperature debugfs scsi: ufs: make sure all interrupts are processed scsi: ufs: ufs-qcom: remove broken hci version quirk wil6210: rate limit wil_rx_refill error rtc: pm8xxx: Fix issue in RTC write path wil6210: fix length check in __wmi_send soc: qcom: smem: Use le32_to_cpu for comparison of: fix missing kobject init for !SYSFS && OF_DYNAMIC config arm64: cpu_errata: include required headers of: unittest: kmemleak in of_unittest_platform_populate() clk: at91: usb: continue if clk_hw_round_rate() return zero power: supply: bq27xxx_battery: Silence deferred-probe error clk: tegra: Fix Tegra PMC clock out parents NFS: direct.c: Fix memory leak of dreq when nfs_get_lock_context fails s390/cpuinfo: fix wrong output when CPU0 is offline powerpc/maple: Fix declaration made after definition ext4: do not commit super on read-only bdev percpu_counter: fix a data race at vm_committed_as compiler.h: fix error in BUILD_BUG_ON() reporting KVM: s390: vsie: Fix possible race when shadowing region 3 tables NFS: Fix memory leaks in nfs_pageio_stop_mirroring() ext2: fix empty body warnings when -Wextra is used ext2: fix debug reference to ext2_xattr_cache libnvdimm: Out of bounds read in __nd_ioctl() iommu/amd: Fix the configuration of GCR3 table root pointer fbdev: potential information leak in do_fb_ioctl() tty: evh_bytechan: Fix out of bounds accesses locktorture: Print ratio of acquisitions, not failures mtd: lpddr: Fix a double free in probe() mtd: phram: fix a double free issue in error path x86/CPU: Add native CPUID variants returning a single datum x86/microcode/intel: replace sync_core() with native_cpuid_reg(eax) x86/vdso: Fix lsl operand order Linux 4.9.220 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I130bead53d151b84c03bac575c0f3760e14538a6
132 lines
3.4 KiB
C
132 lines
3.4 KiB
C
/*
|
|
* Copyright (c) 2012, 2013, NVIDIA CORPORATION. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope 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.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <linux/io.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/clkdev.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/export.h>
|
|
#include <linux/clk/tegra.h>
|
|
|
|
#include "clk.h"
|
|
#include "clk-id.h"
|
|
|
|
#define PMC_CLK_OUT_CNTRL 0x1a8
|
|
#define PMC_DPD_PADS_ORIDE 0x1c
|
|
#define PMC_DPD_PADS_ORIDE_BLINK_ENB 20
|
|
#define PMC_CTRL 0
|
|
#define PMC_CTRL_BLINK_ENB 7
|
|
#define PMC_BLINK_TIMER 0x40
|
|
|
|
struct pmc_clk_init_data {
|
|
char *mux_name;
|
|
char *gate_name;
|
|
const char **parents;
|
|
int num_parents;
|
|
int mux_id;
|
|
int gate_id;
|
|
char *dev_name;
|
|
u8 mux_shift;
|
|
u8 gate_shift;
|
|
};
|
|
|
|
#define PMC_CLK(_num, _mux_shift, _gate_shift)\
|
|
{\
|
|
.mux_name = "clk_out_" #_num "_mux",\
|
|
.gate_name = "clk_out_" #_num,\
|
|
.parents = clk_out ##_num ##_parents,\
|
|
.num_parents = ARRAY_SIZE(clk_out ##_num ##_parents),\
|
|
.mux_id = tegra_clk_clk_out_ ##_num ##_mux,\
|
|
.gate_id = tegra_clk_clk_out_ ##_num,\
|
|
.dev_name = "extern" #_num,\
|
|
.mux_shift = _mux_shift,\
|
|
.gate_shift = _gate_shift,\
|
|
}
|
|
|
|
static DEFINE_SPINLOCK(clk_out_lock);
|
|
|
|
static const char *clk_out1_parents[] = { "osc", "osc_div2",
|
|
"osc_div4", "extern1",
|
|
};
|
|
|
|
static const char *clk_out2_parents[] = { "osc", "osc_div2",
|
|
"osc_div4", "extern2",
|
|
};
|
|
|
|
static const char *clk_out3_parents[] = { "osc", "osc_div2",
|
|
"osc_div4", "extern3",
|
|
};
|
|
|
|
static struct pmc_clk_init_data pmc_clks[] = {
|
|
PMC_CLK(1, 6, 2),
|
|
PMC_CLK(2, 14, 10),
|
|
PMC_CLK(3, 22, 18),
|
|
};
|
|
|
|
void __init tegra_pmc_clk_init(void __iomem *pmc_base,
|
|
struct tegra_clk *tegra_clks)
|
|
{
|
|
struct clk *clk;
|
|
struct clk **dt_clk;
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(pmc_clks); i++) {
|
|
struct pmc_clk_init_data *data;
|
|
|
|
data = pmc_clks + i;
|
|
|
|
dt_clk = tegra_lookup_dt_id(data->mux_id, tegra_clks);
|
|
if (!dt_clk)
|
|
continue;
|
|
|
|
clk = clk_register_mux(NULL, data->mux_name, data->parents,
|
|
data->num_parents, CLK_SET_RATE_NO_REPARENT,
|
|
pmc_base + PMC_CLK_OUT_CNTRL, data->mux_shift,
|
|
3, 0, &clk_out_lock);
|
|
*dt_clk = clk;
|
|
|
|
|
|
dt_clk = tegra_lookup_dt_id(data->gate_id, tegra_clks);
|
|
if (!dt_clk)
|
|
continue;
|
|
|
|
clk = clk_register_gate(NULL, data->gate_name, data->mux_name,
|
|
0, pmc_base + PMC_CLK_OUT_CNTRL,
|
|
data->gate_shift, 0, &clk_out_lock);
|
|
*dt_clk = clk;
|
|
clk_register_clkdev(clk, data->dev_name, data->gate_name);
|
|
}
|
|
|
|
/* blink */
|
|
writel_relaxed(0, pmc_base + PMC_BLINK_TIMER);
|
|
clk = clk_register_gate(NULL, "blink_override", "clk_32k", 0,
|
|
pmc_base + PMC_DPD_PADS_ORIDE,
|
|
PMC_DPD_PADS_ORIDE_BLINK_ENB, 0, NULL);
|
|
|
|
dt_clk = tegra_lookup_dt_id(tegra_clk_blink, tegra_clks);
|
|
if (!dt_clk)
|
|
return;
|
|
|
|
clk = clk_register_gate(NULL, "blink", "blink_override", 0,
|
|
pmc_base + PMC_CTRL,
|
|
PMC_CTRL_BLINK_ENB, 0, NULL);
|
|
clk_register_clkdev(clk, "blink", NULL);
|
|
*dt_clk = clk;
|
|
}
|
|
|