Merge 5.4.273 into android11-5.4-lts
Changes in 5.4.273
io_uring/unix: drop usage of io_uring socket
io_uring: drop any code related to SCM_RIGHTS
selftests: tls: use exact comparison in recv_partial
ASoC: rt5645: Make LattePanda board DMI match more precise
x86/xen: Add some null pointer checking to smp.c
MIPS: Clear Cause.BD in instruction_pointer_set
HID: multitouch: Add required quirk for Synaptics 0xcddc device
RDMA/mlx5: Relax DEVX access upon modify commands
net/iucv: fix the allocation size of iucv_path_table array
parisc/ftrace: add missing CONFIG_DYNAMIC_FTRACE check
block: sed-opal: handle empty atoms when parsing response
dm-verity, dm-crypt: align "struct bvec_iter" correctly
btrfs: fix data race at btrfs_use_block_rsv() when accessing block reserve
scsi: mpt3sas: Prevent sending diag_reset when the controller is ready
Bluetooth: rfcomm: Fix null-ptr-deref in rfcomm_check_security
firewire: core: use long bus reset on gap count error
ASoC: Intel: bytcr_rt5640: Add an extra entry for the Chuwi Vi8 tablet
Input: gpio_keys_polled - suppress deferred probe error for gpio
ASoC: wm8962: Enable oscillator if selecting WM8962_FLL_OSC
ASoC: wm8962: Enable both SPKOUTR_ENA and SPKOUTL_ENA in mono mode
ASoC: wm8962: Fix up incorrect error message in wm8962_set_fll
do_sys_name_to_handle(): use kzalloc() to fix kernel-infoleak
nbd: null check for nla_nest_start
fs/select: rework stack allocation hack for clang
aoe: fix the potential use-after-free problem in aoecmd_cfg_pkts
timekeeping: Fix cross-timestamp interpolation on counter wrap
timekeeping: Fix cross-timestamp interpolation corner case decision
timekeeping: Fix cross-timestamp interpolation for non-x86
wifi: ath10k: fix NULL pointer dereference in ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev()
b43: dma: Fix use true/false for bool type variable
wifi: b43: Stop/wake correct queue in DMA Tx path when QoS is disabled
wifi: b43: Stop/wake correct queue in PIO Tx path when QoS is disabled
b43: main: Fix use true/false for bool type
wifi: b43: Stop correct queue in DMA worker when QoS is disabled
wifi: b43: Disable QoS for bcm4331
wifi: wilc1000: fix declarations ordering
wifi: wilc1000: fix RCU usage in connect path
wifi: mwifiex: debugfs: Drop unnecessary error check for debugfs_create_dir()
sock_diag: annotate data-races around sock_diag_handlers[family]
af_unix: Annotate data-race of gc_in_progress in wait_for_unix_gc().
net: blackhole_dev: fix build warning for ethh set but not used
wifi: libertas: fix some memleaks in lbs_allocate_cmd_buffer()
arm64: dts: mediatek: mt7622: add missing "device_type" to memory nodes
bpf: Add typecast to bpf helpers to help BTF generation
bpf: Factor out bpf_spin_lock into helpers.
bpf: Mark bpf_spin_{lock,unlock}() helpers with notrace correctly
arm64: dts: qcom: db820c: Move non-soc entries out of /soc
arm64: dts: qcom: msm8996: Use node references in db820c
arm64: dts: qcom: msm8996: Move regulator consumers to db820c
arm64: dts: qcom: msm8996: Pad addresses
ACPI: processor_idle: Fix memory leak in acpi_processor_power_exit()
bus: tegra-aconnect: Update dependency to ARCH_TEGRA
iommu/amd: Mark interrupt as managed
wifi: brcmsmac: avoid function pointer casts
net: ena: cosmetic: fix line break issues
net: ena: Remove ena_select_queue
ARM: dts: arm: realview: Fix development chip ROM compatible value
ARM: dts: imx6dl-yapp4: Move phy reset into switch node
ARM: dts: imx6dl-yapp4: Fix typo in the QCA switch register address
ARM: dts: imx6dl-yapp4: Move the internal switch PHYs under the switch node
ACPI: scan: Fix device check notification handling
x86, relocs: Ignore relocations in .notes section
SUNRPC: fix some memleaks in gssx_dec_option_array
mmc: wmt-sdmmc: remove an incorrect release_mem_region() call in the .remove function
igb: move PEROUT and EXTTS isr logic to separate functions
igb: Fix missing time sync events
Bluetooth: Remove superfluous call to hci_conn_check_pending()
Bluetooth: hci_core: Fix possible buffer overflow
sr9800: Add check for usbnet_get_endpoints
bpf: Fix hashtab overflow check on 32-bit arches
bpf: Fix stackmap overflow check on 32-bit arches
ipv6: fib6_rules: flush route cache when rule is changed
net: ip_tunnel: make sure to pull inner header in ip_tunnel_rcv()
net: hns3: fix port duplex configure error in IMP reset
tcp: fix incorrect parameter validation in the do_tcp_getsockopt() function
l2tp: fix incorrect parameter validation in the pppol2tp_getsockopt() function
udp: fix incorrect parameter validation in the udp_lib_getsockopt() function
net: kcm: fix incorrect parameter validation in the kcm_getsockopt) function
net/x25: fix incorrect parameter validation in the x25_getsockopt() function
nfp: flower: handle acti_netdevs allocation failure
dm raid: fix false positive for requeue needed during reshape
dm: call the resume method on internal suspend
drm/tegra: dsi: Add missing check for of_find_device_by_node
gpu: host1x: mipi: Update tegra_mipi_request() to be node based
drm/tegra: dsi: Make use of the helper function dev_err_probe()
drm/tegra: dsi: Fix some error handling paths in tegra_dsi_probe()
drm/tegra: dsi: Fix missing pm_runtime_disable() in the error handling path of tegra_dsi_probe()
drm/tegra: output: Fix missing i2c_put_adapter() in the error handling paths of tegra_output_probe()
drm/rockchip: inno_hdmi: Fix video timing
drm: Don't treat 0 as -1 in drm_fixp2int_ceil
drm/rockchip: lvds: do not overwrite error code
dmaengine: tegra210-adma: Update dependency to ARCH_TEGRA
media: tc358743: register v4l2 async device only after successful setup
PCI/DPC: Print all TLP Prefixes, not just the first
perf record: Fix possible incorrect free in record__switch_output()
drm/amd/display: Fix potential NULL pointer dereferences in 'dcn10_set_output_transfer_func()'
perf evsel: Fix duplicate initialization of data->id in evsel__parse_sample()
media: em28xx: annotate unchecked call to media_device_register()
media: v4l2-tpg: fix some memleaks in tpg_alloc
media: v4l2-mem2mem: fix a memleak in v4l2_m2m_register_entity
media: edia: dvbdev: fix a use-after-free
clk: qcom: reset: Allow specifying custom reset delay
clk: qcom: reset: support resetting multiple bits
clk: qcom: reset: Commonize the de/assert functions
clk: qcom: reset: Ensure write completion on reset de/assertion
quota: simplify drop_dquot_ref()
quota: Fix potential NULL pointer dereference
quota: Fix rcu annotations of inode dquot pointers
PCI: switchtec: Fix an error handling path in switchtec_pci_probe()
perf thread_map: Free strlist on normal path in thread_map__new_by_tid_str()
drm/radeon/ni: Fix wrong firmware size logging in ni_init_microcode()
ALSA: seq: fix function cast warnings
perf stat: Avoid metric-only segv
media: imx: csc/scaler: fix v4l2_ctrl_handler memory leak
media: go7007: add check of return value of go7007_read_addr()
media: pvrusb2: remove redundant NULL check
media: pvrusb2: fix pvr2_stream_callback casts
clk: qcom: dispcc-sdm845: Adjust internal GDSC wait times
drm/mediatek: dsi: Fix DSI RGB666 formats and definitions
PCI: Mark 3ware-9650SE Root Port Extended Tags as broken
clk: hisilicon: hi3519: Release the correct number of gates in hi3519_clk_unregister()
drm/tegra: put drm_gem_object ref on error in tegra_fb_create
mfd: syscon: Call of_node_put() only when of_parse_phandle() takes a ref
mfd: altera-sysmgr: Call of_node_put() only when of_parse_phandle() takes a ref
crypto: arm/sha - fix function cast warnings
mtd: maps: physmap-core: fix flash size larger than 32-bit
mtd: rawnand: lpc32xx_mlc: fix irq handler prototype
ASoC: meson: axg-tdm-interface: fix mclk setup without mclk-fs
drm/amdgpu: Fix missing break in ATOM_ARG_IMM Case of atom_get_src_int()
media: pvrusb2: fix uaf in pvr2_context_set_notify
media: dvb-frontends: avoid stack overflow warnings with clang
media: go7007: fix a memleak in go7007_load_encoder
media: v4l2-core: correctly validate video and metadata ioctls
media: rename VFL_TYPE_GRABBER to _VIDEO
media: media/pci: rename VFL_TYPE_GRABBER to _VIDEO
media: ttpci: fix two memleaks in budget_av_attach
drm/mediatek: Fix a null pointer crash in mtk_drm_crtc_finish_page_flip
powerpc/hv-gpci: Fix the H_GET_PERF_COUNTER_INFO hcall return value checks
drm/msm/dpu: add division of drm_display_mode's hskew parameter
powerpc/embedded6xx: Fix no previous prototype for avr_uart_send() etc.
backlight: lm3630a: Initialize backlight_properties on init
backlight: lm3630a: Don't set bl->props.brightness in get_brightness
backlight: da9052: Fully initialize backlight_properties during probe
backlight: lm3639: Fully initialize backlight_properties during probe
backlight: lp8788: Fully initialize backlight_properties during probe
sparc32: Fix section mismatch in leon_pci_grpci
clk: Fix clk_core_get NULL dereference
ALSA: usb-audio: Stop parsing channels bits when all channels are found.
scsi: csiostor: Avoid function pointer casts
RDMA/device: Fix a race between mad_client and cm_client init
scsi: bfa: Fix function pointer type mismatch for hcb_qe->cbfn
net: sunrpc: Fix an off by one in rpc_sockaddr2uaddr()
watchdog: stm32_iwdg: initialize default timeout
NFS: Fix an off by one in root_nfs_cat()
afs: Revert "afs: Hide silly-rename files from userspace"
tty: vt: fix 20 vs 0x20 typo in EScsiignore
serial: max310x: fix syntax error in IRQ error message
tty: serial: samsung: fix tx_empty() to return TIOCSER_TEMT
kconfig: fix infinite loop when expanding a macro at the end of file
rtc: mt6397: select IRQ_DOMAIN instead of depending on it
serial: 8250_exar: Don't remove GPIO device on suspend
staging: greybus: fix get_channel_from_mode() failure path
usb: gadget: net2272: Use irqflags in the call to net2272_probe_fin
octeontx2-af: Use matching wake_up API variant in CGX command interface
s390/vtime: fix average steal time calculation
hsr: Fix uninit-value access in hsr_get_node()
packet: annotate data-races around ignore_outgoing
rds: introduce acquire/release ordering in acquire/release_in_xmit()
hsr: Handle failures in module init
net/bnx2x: Prevent access to a freed page in page_pool
octeontx2-af: Use separate handlers for interrupts
ARM: dts: sun8i-h2-plus-bananapi-m2-zero: add regulator nodes vcc-dram and vcc1v2
netfilter: nf_tables: do not compare internal table flags on updates
rcu: add a helper to report consolidated flavor QS
bpf: report RCU QS in cpumap kthread
spi: spi-mt65xx: Fix NULL pointer access in interrupt handler
regmap: Add missing map->bus check
Linux 5.4.273
Change-Id: I7b54c53c62f7ae93eddbd8d677f0d5de9547073e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
commit
960240ce53
@ -185,7 +185,7 @@ This will create the character device for you.
|
||||
|
||||
.. code-block:: c
|
||||
|
||||
err = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
|
||||
err = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
|
||||
if (err) {
|
||||
video_device_release(vdev); /* or kfree(my_vdev); */
|
||||
return err;
|
||||
@ -201,7 +201,7 @@ types exist:
|
||||
========================== ==================== ==============================
|
||||
:c:type:`vfl_devnode_type` Device name Usage
|
||||
========================== ==================== ==============================
|
||||
``VFL_TYPE_GRABBER`` ``/dev/videoX`` for video input/output devices
|
||||
``VFL_TYPE_VIDEO`` ``/dev/videoX`` for video input/output devices
|
||||
``VFL_TYPE_VBI`` ``/dev/vbiX`` for vertical blank data (i.e.
|
||||
closed captions, teletext)
|
||||
``VFL_TYPE_RADIO`` ``/dev/radioX`` for radio tuners
|
||||
|
||||
@ -649,7 +649,7 @@ video_device注册
|
||||
|
||||
接下来你需要注册视频设备：这会为你创建一个字符设备。
|
||||
|
||||
err = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
|
||||
err = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
|
||||
if (err) {
|
||||
video_device_release(vdev); /* or kfree(my_vdev); */
|
||||
return err;
|
||||
@ -660,7 +660,7 @@ video_device注册
|
||||
|
||||
注册哪种设备是根据类型（type）参数。存在以下类型：
|
||||
|
||||
VFL_TYPE_GRABBER: 用于视频输入/输出设备的 videoX
|
||||
VFL_TYPE_VIDEO: 用于视频输入/输出设备的 videoX
|
||||
VFL_TYPE_VBI: 用于垂直消隐数据的 vbiX (例如，隐藏式字幕，图文电视)
|
||||
VFL_TYPE_RADIO: 用于广播调谐器的 radioX
|
||||
|
||||
|
||||
2
Makefile
2
Makefile
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 5
|
||||
PATCHLEVEL = 4
|
||||
SUBLEVEL = 272
|
||||
SUBLEVEL = 273
|
||||
EXTRAVERSION =
|
||||
NAME = Kleptomaniac Octopus
|
||||
|
||||
|
||||
@ -435,7 +435,7 @@
|
||||
|
||||
/* Direct-mapped development chip ROM */
|
||||
pb1176_rom@10200000 {
|
||||
compatible = "direct-mapped";
|
||||
compatible = "mtd-rom";
|
||||
reg = <0x10200000 0x4000>;
|
||||
bank-width = <1>;
|
||||
};
|
||||
|
||||
@ -96,8 +96,6 @@
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_enet>;
|
||||
phy-mode = "rgmii-id";
|
||||
phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
|
||||
phy-reset-duration = <20>;
|
||||
phy-supply = <&sw2_reg>;
|
||||
status = "okay";
|
||||
|
||||
@ -110,17 +108,10 @@
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
phy_port2: phy@1 {
|
||||
reg = <1>;
|
||||
};
|
||||
|
||||
phy_port3: phy@2 {
|
||||
reg = <2>;
|
||||
};
|
||||
|
||||
switch@10 {
|
||||
compatible = "qca,qca8334";
|
||||
reg = <10>;
|
||||
reg = <0x10>;
|
||||
reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
|
||||
|
||||
switch_ports: ports {
|
||||
#address-cells = <1>;
|
||||
@ -141,15 +132,30 @@
|
||||
port@2 {
|
||||
reg = <2>;
|
||||
label = "eth2";
|
||||
phy-mode = "internal";
|
||||
phy-handle = <&phy_port2>;
|
||||
};
|
||||
|
||||
port@3 {
|
||||
reg = <3>;
|
||||
label = "eth1";
|
||||
phy-mode = "internal";
|
||||
phy-handle = <&phy_port3>;
|
||||
};
|
||||
};
|
||||
|
||||
mdio {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
phy_port2: ethernet-phy@1 {
|
||||
reg = <1>;
|
||||
};
|
||||
|
||||
phy_port3: ethernet-phy@2 {
|
||||
reg = <2>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -62,6 +62,30 @@
|
||||
states = <1100000 0>, <1300000 1>;
|
||||
};
|
||||
|
||||
reg_vcc_dram: vcc-dram {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc-dram";
|
||||
regulator-min-microvolt = <1500000>;
|
||||
regulator-max-microvolt = <1500000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
enable-active-high;
|
||||
gpio = <&r_pio 0 9 GPIO_ACTIVE_HIGH>; /* PL9 */
|
||||
vin-supply = <®_vcc5v0>;
|
||||
};
|
||||
|
||||
reg_vcc1v2: vcc1v2 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc1v2";
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <1200000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
enable-active-high;
|
||||
gpio = <&r_pio 0 8 GPIO_ACTIVE_HIGH>; /* PL8 */
|
||||
vin-supply = <®_vcc5v0>;
|
||||
};
|
||||
|
||||
wifi_pwrseq: wifi_pwrseq {
|
||||
compatible = "mmc-pwrseq-simple";
|
||||
reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
|
||||
|
||||
@ -25,8 +25,8 @@
|
||||
|
||||
#include "sha256_glue.h"
|
||||
|
||||
asmlinkage void sha256_block_data_order(u32 *digest, const void *data,
|
||||
unsigned int num_blks);
|
||||
asmlinkage void sha256_block_data_order(struct sha256_state *state,
|
||||
const u8 *data, int num_blks);
|
||||
|
||||
int crypto_sha256_arm_update(struct shash_desc *desc, const u8 *data,
|
||||
unsigned int len)
|
||||
@ -34,23 +34,20 @@ int crypto_sha256_arm_update(struct shash_desc *desc, const u8 *data,
|
||||
/* make sure casting to sha256_block_fn() is safe */
|
||||
BUILD_BUG_ON(offsetof(struct sha256_state, state) != 0);
|
||||
|
||||
return sha256_base_do_update(desc, data, len,
|
||||
(sha256_block_fn *)sha256_block_data_order);
|
||||
return sha256_base_do_update(desc, data, len, sha256_block_data_order);
|
||||
}
|
||||
EXPORT_SYMBOL(crypto_sha256_arm_update);
|
||||
|
||||
static int crypto_sha256_arm_final(struct shash_desc *desc, u8 *out)
|
||||
{
|
||||
sha256_base_do_finalize(desc,
|
||||
(sha256_block_fn *)sha256_block_data_order);
|
||||
sha256_base_do_finalize(desc, sha256_block_data_order);
|
||||
return sha256_base_finish(desc, out);
|
||||
}
|
||||
|
||||
int crypto_sha256_arm_finup(struct shash_desc *desc, const u8 *data,
|
||||
unsigned int len, u8 *out)
|
||||
{
|
||||
sha256_base_do_update(desc, data, len,
|
||||
(sha256_block_fn *)sha256_block_data_order);
|
||||
sha256_base_do_update(desc, data, len, sha256_block_data_order);
|
||||
return crypto_sha256_arm_final(desc, out);
|
||||
}
|
||||
EXPORT_SYMBOL(crypto_sha256_arm_finup);
|
||||
|
||||
@ -25,27 +25,25 @@ MODULE_ALIAS_CRYPTO("sha512");
|
||||
MODULE_ALIAS_CRYPTO("sha384-arm");
|
||||
MODULE_ALIAS_CRYPTO("sha512-arm");
|
||||
|
||||
asmlinkage void sha512_block_data_order(u64 *state, u8 const *src, int blocks);
|
||||
asmlinkage void sha512_block_data_order(struct sha512_state *state,
|
||||
u8 const *src, int blocks);
|
||||
|
||||
int sha512_arm_update(struct shash_desc *desc, const u8 *data,
|
||||
unsigned int len)
|
||||
{
|
||||
return sha512_base_do_update(desc, data, len,
|
||||
(sha512_block_fn *)sha512_block_data_order);
|
||||
return sha512_base_do_update(desc, data, len, sha512_block_data_order);
|
||||
}
|
||||
|
||||
static int sha512_arm_final(struct shash_desc *desc, u8 *out)
|
||||
{
|
||||
sha512_base_do_finalize(desc,
|
||||
(sha512_block_fn *)sha512_block_data_order);
|
||||
sha512_base_do_finalize(desc, sha512_block_data_order);
|
||||
return sha512_base_finish(desc, out);
|
||||
}
|
||||
|
||||
int sha512_arm_finup(struct shash_desc *desc, const u8 *data,
|
||||
unsigned int len, u8 *out)
|
||||
{
|
||||
sha512_base_do_update(desc, data, len,
|
||||
(sha512_block_fn *)sha512_block_data_order);
|
||||
sha512_base_do_update(desc, data, len, sha512_block_data_order);
|
||||
return sha512_arm_final(desc, out);
|
||||
}
|
||||
|
||||
|
||||
@ -71,6 +71,7 @@
|
||||
|
||||
memory@40000000 {
|
||||
reg = <0 0x40000000 0 0x40000000>;
|
||||
device_type = "memory";
|
||||
};
|
||||
|
||||
reg_1p8v: regulator-1p8v {
|
||||
|
||||
@ -57,6 +57,7 @@
|
||||
|
||||
memory@40000000 {
|
||||
reg = <0 0x40000000 0 0x20000000>;
|
||||
device_type = "memory";
|
||||
};
|
||||
|
||||
reg_1p8v: regulator-1p8v {
|
||||
|
||||
@ -77,425 +77,427 @@
|
||||
enable-gpios = <&pm8994_gpios 15 0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
soc {
|
||||
serial@7570000 {
|
||||
label = "BT-UART";
|
||||
status = "okay";
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&blsp1_uart1_default>;
|
||||
pinctrl-1 = <&blsp1_uart1_sleep>;
|
||||
&blsp1_uart1 {
|
||||
label = "BT-UART";
|
||||
status = "okay";
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&blsp1_uart1_default>;
|
||||
pinctrl-1 = <&blsp1_uart1_sleep>;
|
||||
|
||||
bluetooth {
|
||||
compatible = "qcom,qca6174-bt";
|
||||
bluetooth {
|
||||
compatible = "qcom,qca6174-bt";
|
||||
|
||||
/* bt_disable_n gpio */
|
||||
enable-gpios = <&pm8994_gpios 19 GPIO_ACTIVE_HIGH>;
|
||||
/* bt_disable_n gpio */
|
||||
enable-gpios = <&pm8994_gpios 19 GPIO_ACTIVE_HIGH>;
|
||||
|
||||
clocks = <&divclk4>;
|
||||
};
|
||||
};
|
||||
|
||||
serial@75b0000 {
|
||||
label = "LS-UART1";
|
||||
status = "okay";
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&blsp2_uart1_2pins_default>;
|
||||
pinctrl-1 = <&blsp2_uart1_2pins_sleep>;
|
||||
};
|
||||
|
||||
serial@75b1000 {
|
||||
label = "LS-UART0";
|
||||
status = "disabled";
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&blsp2_uart2_4pins_default>;
|
||||
pinctrl-1 = <&blsp2_uart2_4pins_sleep>;
|
||||
};
|
||||
|
||||
i2c@7577000 {
|
||||
/* On Low speed expansion */
|
||||
label = "LS-I2C0";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
i2c@75b6000 {
|
||||
/* On Low speed expansion */
|
||||
label = "LS-I2C1";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
spi@7575000 {
|
||||
/* On Low speed expansion */
|
||||
label = "LS-SPI0";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
i2c@75b5000 {
|
||||
/* On High speed expansion */
|
||||
label = "HS-I2C2";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
spi@75ba000{
|
||||
/* On High speed expansion */
|
||||
label = "HS-SPI1";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
sdhci@74a4900 {
|
||||
/* External SD card */
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
|
||||
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
|
||||
cd-gpios = <&msmgpio 38 0x1>;
|
||||
vmmc-supply = <&pm8994_l21>;
|
||||
vqmmc-supply = <&pm8994_l13>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
phy@627000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
ufshc@624000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
pinctrl@1010000 {
|
||||
gpio-line-names =
|
||||
"[SPI0_DOUT]", /* GPIO_0, BLSP1_SPI_MOSI, LSEC pin 14 */
|
||||
"[SPI0_DIN]", /* GPIO_1, BLSP1_SPI_MISO, LSEC pin 10 */
|
||||
"[SPI0_CS]", /* GPIO_2, BLSP1_SPI_CS_N, LSEC pin 12 */
|
||||
"[SPI0_SCLK]", /* GPIO_3, BLSP1_SPI_CLK, LSEC pin 8 */
|
||||
"[UART1_TxD]", /* GPIO_4, BLSP8_UART_TX, LSEC pin 11 */
|
||||
"[UART1_RxD]", /* GPIO_5, BLSP8_UART_RX, LSEC pin 13 */
|
||||
"[I2C1_SDA]", /* GPIO_6, BLSP8_I2C_SDA, LSEC pin 21 */
|
||||
"[I2C1_SCL]", /* GPIO_7, BLSP8_I2C_SCL, LSEC pin 19 */
|
||||
"GPIO-H", /* GPIO_8, LCD0_RESET_N, LSEC pin 30 */
|
||||
"TP93", /* GPIO_9 */
|
||||
"GPIO-G", /* GPIO_10, MDP_VSYNC_P, LSEC pin 29 */
|
||||
"[MDP_VSYNC_S]", /* GPIO_11, S HSEC pin 55 */
|
||||
"NC", /* GPIO_12 */
|
||||
"[CSI0_MCLK]", /* GPIO_13, CAM_MCLK0, P HSEC pin 15 */
|
||||
"[CAM_MCLK1]", /* GPIO_14, J14 pin 11 */
|
||||
"[CSI1_MCLK]", /* GPIO_15, CAM_MCLK2, P HSEC pin 17 */
|
||||
"TP99", /* GPIO_16 */
|
||||
"[I2C2_SDA]", /* GPIO_17, CCI_I2C_SDA0, P HSEC pin 34 */
|
||||
"[I2C2_SCL]", /* GPIO_18, CCI_I2C_SCL0, P HSEC pin 32 */
|
||||
"[CCI_I2C_SDA1]", /* GPIO_19, S HSEC pin 38 */
|
||||
"[CCI_I2C_SCL1]", /* GPIO_20, S HSEC pin 36 */
|
||||
"FLASH_STROBE_EN", /* GPIO_21, S HSEC pin 5 */
|
||||
"FLASH_STROBE_TRIG", /* GPIO_22, S HSEC pin 1 */
|
||||
"GPIO-K", /* GPIO_23, CAM2_RST_N, LSEC pin 33 */
|
||||
"GPIO-D", /* GPIO_24, LSEC pin 26 */
|
||||
"GPIO-I", /* GPIO_25, CAM0_RST_N, LSEC pin 31 */
|
||||
"GPIO-J", /* GPIO_26, CAM0_STANDBY_N, LSEC pin 32 */
|
||||
"BLSP6_I2C_SDA", /* GPIO_27 */
|
||||
"BLSP6_I2C_SCL", /* GPIO_28 */
|
||||
"GPIO-B", /* GPIO_29, TS0_RESET_N, LSEC pin 24 */
|
||||
"GPIO30", /* GPIO_30, S HSEC pin 4 */
|
||||
"HDMI_CEC", /* GPIO_31 */
|
||||
"HDMI_DDC_CLOCK", /* GPIO_32 */
|
||||
"HDMI_DDC_DATA", /* GPIO_33 */
|
||||
"HDMI_HOT_PLUG_DETECT", /* GPIO_34 */
|
||||
"PCIE0_RST_N", /* GPIO_35 */
|
||||
"PCIE0_CLKREQ_N", /* GPIO_36 */
|
||||
"PCIE0_WAKE", /* GPIO_37 */
|
||||
"SD_CARD_DET_N", /* GPIO_38 */
|
||||
"TSIF1_SYNC", /* GPIO_39, S HSEC pin 48 */
|
||||
"W_DISABLE_N", /* GPIO_40 */
|
||||
"[BLSP9_UART_TX]", /* GPIO_41 */
|
||||
"[BLSP9_UART_RX]", /* GPIO_42 */
|
||||
"[BLSP2_UART_CTS_N]", /* GPIO_43 */
|
||||
"[BLSP2_UART_RFR_N]", /* GPIO_44 */
|
||||
"[BLSP3_UART_TX]", /* GPIO_45 */
|
||||
"[BLSP3_UART_RX]", /* GPIO_46 */
|
||||
"[I2C0_SDA]", /* GPIO_47, LS_I2C0_SDA, LSEC pin 17 */
|
||||
"[I2C0_SCL]", /* GPIO_48, LS_I2C0_SCL, LSEC pin 15 */
|
||||
"[UART0_TxD]", /* GPIO_49, BLSP9_UART_TX, LSEC pin 5 */
|
||||
"[UART0_RxD]", /* GPIO_50, BLSP9_UART_RX, LSEC pin 7 */
|
||||
"[UART0_CTS]", /* GPIO_51, BLSP9_UART_CTS_N, LSEC pin 3 */
|
||||
"[UART0_RTS]", /* GPIO_52, BLSP9_UART_RFR_N, LSEC pin 9 */
|
||||
"[CODEC_INT1_N]", /* GPIO_53 */
|
||||
"[CODEC_INT2_N]", /* GPIO_54 */
|
||||
"[BLSP7_I2C_SDA]", /* GPIO_55 */
|
||||
"[BLSP7_I2C_SCL]", /* GPIO_56 */
|
||||
"MI2S_MCLK", /* GPIO_57, S HSEC pin 3 */
|
||||
"[PCM_CLK]", /* GPIO_58, QUA_MI2S_SCK, LSEC pin 18 */
|
||||
"[PCM_FS]", /* GPIO_59, QUA_MI2S_WS, LSEC pin 16 */
|
||||
"[PCM_DO]", /* GPIO_60, QUA_MI2S_DATA0, LSEC pin 20 */
|
||||
"[PCM_DI]", /* GPIO_61, QUA_MI2S_DATA1, LSEC pin 22 */
|
||||
"GPIO-E", /* GPIO_62, LSEC pin 27 */
|
||||
"TP87", /* GPIO_63 */
|
||||
"[CODEC_RST_N]", /* GPIO_64 */
|
||||
"[PCM1_CLK]", /* GPIO_65 */
|
||||
"[PCM1_SYNC]", /* GPIO_66 */
|
||||
"[PCM1_DIN]", /* GPIO_67 */
|
||||
"[PCM1_DOUT]", /* GPIO_68 */
|
||||
"AUDIO_REF_CLK", /* GPIO_69 */
|
||||
"SLIMBUS_CLK", /* GPIO_70 */
|
||||
"SLIMBUS_DATA0", /* GPIO_71 */
|
||||
"SLIMBUS_DATA1", /* GPIO_72 */
|
||||
"NC", /* GPIO_73 */
|
||||
"NC", /* GPIO_74 */
|
||||
"NC", /* GPIO_75 */
|
||||
"NC", /* GPIO_76 */
|
||||
"TP94", /* GPIO_77 */
|
||||
"NC", /* GPIO_78 */
|
||||
"TP95", /* GPIO_79 */
|
||||
"GPIO-A", /* GPIO_80, MEMS_RESET_N, LSEC pin 23 */
|
||||
"TP88", /* GPIO_81 */
|
||||
"TP89", /* GPIO_82 */
|
||||
"TP90", /* GPIO_83 */
|
||||
"TP91", /* GPIO_84 */
|
||||
"[SD_DAT0]", /* GPIO_85, BLSP12_SPI_MOSI, P HSEC pin 1 */
|
||||
"[SD_CMD]", /* GPIO_86, BLSP12_SPI_MISO, P HSEC pin 11 */
|
||||
"[SD_DAT3]", /* GPIO_87, BLSP12_SPI_CS_N, P HSEC pin 7 */
|
||||
"[SD_SCLK]", /* GPIO_88, BLSP12_SPI_CLK, P HSEC pin 9 */
|
||||
"TSIF1_CLK", /* GPIO_89, S HSEC pin 42 */
|
||||
"TSIF1_EN", /* GPIO_90, S HSEC pin 46 */
|
||||
"TSIF1_DATA", /* GPIO_91, S HSEC pin 44 */
|
||||
"NC", /* GPIO_92 */
|
||||
"TSIF2_CLK", /* GPIO_93, S HSEC pin 52 */
|
||||
"TSIF2_EN", /* GPIO_94, S HSEC pin 56 */
|
||||
"TSIF2_DATA", /* GPIO_95, S HSEC pin 54 */
|
||||
"TSIF2_SYNC", /* GPIO_96, S HSEC pin 58 */
|
||||
"NC", /* GPIO_97 */
|
||||
"CAM1_STANDBY_N", /* GPIO_98 */
|
||||
"NC", /* GPIO_99 */
|
||||
"NC", /* GPIO_100 */
|
||||
"[LCD1_RESET_N]", /* GPIO_101, S HSEC pin 51 */
|
||||
"BOOT_CONFIG1", /* GPIO_102 */
|
||||
"USB_HUB_RESET", /* GPIO_103 */
|
||||
"CAM1_RST_N", /* GPIO_104 */
|
||||
"NC", /* GPIO_105 */
|
||||
"NC", /* GPIO_106 */
|
||||
"NC", /* GPIO_107 */
|
||||
"NC", /* GPIO_108 */
|
||||
"NC", /* GPIO_109 */
|
||||
"NC", /* GPIO_110 */
|
||||
"NC", /* GPIO_111 */
|
||||
"NC", /* GPIO_112 */
|
||||
"PMI8994_BUA", /* GPIO_113 */
|
||||
"PCIE2_RST_N", /* GPIO_114 */
|
||||
"PCIE2_CLKREQ_N", /* GPIO_115 */
|
||||
"PCIE2_WAKE", /* GPIO_116 */
|
||||
"SSC_IRQ_0", /* GPIO_117 */
|
||||
"SSC_IRQ_1", /* GPIO_118 */
|
||||
"SSC_IRQ_2", /* GPIO_119 */
|
||||
"NC", /* GPIO_120 */
|
||||
"GPIO121", /* GPIO_121, S HSEC pin 2 */
|
||||
"NC", /* GPIO_122 */
|
||||
"SSC_IRQ_6", /* GPIO_123 */
|
||||
"SSC_IRQ_7", /* GPIO_124 */
|
||||
"GPIO-C", /* GPIO_125, TS_INT0, LSEC pin 25 */
|
||||
"BOOT_CONFIG5", /* GPIO_126 */
|
||||
"NC", /* GPIO_127 */
|
||||
"NC", /* GPIO_128 */
|
||||
"BOOT_CONFIG7", /* GPIO_129 */
|
||||
"PCIE1_RST_N", /* GPIO_130 */
|
||||
"PCIE1_CLKREQ_N", /* GPIO_131 */
|
||||
"PCIE1_WAKE", /* GPIO_132 */
|
||||
"GPIO-L", /* GPIO_133, CAM2_STANDBY_N, LSEC pin 34 */
|
||||
"NC", /* GPIO_134 */
|
||||
"NC", /* GPIO_135 */
|
||||
"BOOT_CONFIG8", /* GPIO_136 */
|
||||
"NC", /* GPIO_137 */
|
||||
"NC", /* GPIO_138 */
|
||||
"GPS_SSBI2", /* GPIO_139 */
|
||||
"GPS_SSBI1", /* GPIO_140 */
|
||||
"NC", /* GPIO_141 */
|
||||
"NC", /* GPIO_142 */
|
||||
"NC", /* GPIO_143 */
|
||||
"BOOT_CONFIG6", /* GPIO_144 */
|
||||
"NC", /* GPIO_145 */
|
||||
"NC", /* GPIO_146 */
|
||||
"NC", /* GPIO_147 */
|
||||
"NC", /* GPIO_148 */
|
||||
"NC"; /* GPIO_149 */
|
||||
};
|
||||
|
||||
qcom,spmi@400f000 {
|
||||
pmic@0 {
|
||||
gpios@c000 {
|
||||
gpio-line-names =
|
||||
"NC",
|
||||
"KEY_VOLP_N",
|
||||
"NC",
|
||||
"BL1_PWM",
|
||||
"GPIO-F", /* BL0_PWM, LSEC pin 28 */
|
||||
"BL1_EN",
|
||||
"NC",
|
||||
"WLAN_EN",
|
||||
"NC",
|
||||
"NC",
|
||||
"NC",
|
||||
"NC",
|
||||
"NC",
|
||||
"NC",
|
||||
"DIVCLK1",
|
||||
"DIVCLK2",
|
||||
"DIVCLK3",
|
||||
"DIVCLK4",
|
||||
"BT_EN",
|
||||
"PMIC_SLB",
|
||||
"PMIC_BUA",
|
||||
"USB_VBUS_DET";
|
||||
};
|
||||
|
||||
mpps@a000 {
|
||||
gpio-line-names =
|
||||
"VDDPX_BIAS",
|
||||
"WIFI_LED",
|
||||
"NC",
|
||||
"BT_LED",
|
||||
"PM_MPP05",
|
||||
"PM_MPP06",
|
||||
"PM_MPP07",
|
||||
"NC";
|
||||
};
|
||||
};
|
||||
|
||||
pmic@2 {
|
||||
gpios@c000 {
|
||||
gpio-line-names =
|
||||
"NC",
|
||||
"SPKR_AMP_EN1",
|
||||
"SPKR_AMP_EN2",
|
||||
"TP61",
|
||||
"NC",
|
||||
"USB2_VBUS_DET",
|
||||
"NC",
|
||||
"NC",
|
||||
"NC",
|
||||
"NC";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
phy@34000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
phy@7410000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
phy@7411000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
phy@7412000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
usb@6af8800 {
|
||||
status = "okay";
|
||||
extcon = <&usb3_id>;
|
||||
|
||||
dwc3@6a00000 {
|
||||
extcon = <&usb3_id>;
|
||||
dr_mode = "otg";
|
||||
};
|
||||
};
|
||||
|
||||
usb3_id: usb3-id {
|
||||
compatible = "linux,extcon-usb-gpio";
|
||||
id-gpio = <&pm8994_gpios 22 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&usb3_vbus_det_gpio>;
|
||||
};
|
||||
|
||||
usb@76f8800 {
|
||||
status = "okay";
|
||||
extcon = <&usb2_id>;
|
||||
|
||||
dwc3@7600000 {
|
||||
extcon = <&usb2_id>;
|
||||
dr_mode = "otg";
|
||||
maximum-speed = "high-speed";
|
||||
};
|
||||
};
|
||||
|
||||
usb2_id: usb2-id {
|
||||
compatible = "linux,extcon-usb-gpio";
|
||||
id-gpio = <&pmi8994_gpios 6 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&usb2_vbus_det_gpio>;
|
||||
};
|
||||
|
||||
wlan_en: wlan-en-1-8v {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&wlan_en_gpios>;
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "wlan-en-regulator";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
|
||||
gpio = <&pm8994_gpios 8 0>;
|
||||
|
||||
/* WLAN card specific delay */
|
||||
startup-delay-us = <70000>;
|
||||
enable-active-high;
|
||||
};
|
||||
|
||||
agnoc@0 {
|
||||
pcie@600000 {
|
||||
status = "okay";
|
||||
perst-gpio = <&msmgpio 35 GPIO_ACTIVE_LOW>;
|
||||
vddpe-3v3-supply = <&wlan_en>;
|
||||
};
|
||||
|
||||
pcie@608000 {
|
||||
status = "okay";
|
||||
perst-gpio = <&msmgpio 130 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
pcie@610000 {
|
||||
status = "okay";
|
||||
perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
};
|
||||
|
||||
slim_msm: slim@91c0000 {
|
||||
ngd@1 {
|
||||
wcd9335: codec@1{
|
||||
clock-names = "mclk", "slimbus";
|
||||
clocks = <&div1_mclk>,
|
||||
<&rpmcc RPM_SMD_BB_CLK1>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
mdss@900000 {
|
||||
status = "okay";
|
||||
|
||||
mdp@901000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
hdmi-phy@9a0600 {
|
||||
status = "okay";
|
||||
|
||||
vddio-supply = <&pm8994_l12>;
|
||||
vcca-supply = <&pm8994_l28>;
|
||||
#phy-cells = <0>;
|
||||
};
|
||||
|
||||
hdmi-tx@9a0000 {
|
||||
status = "okay";
|
||||
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;
|
||||
pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;
|
||||
|
||||
core-vdda-supply = <&pm8994_l12>;
|
||||
core-vcc-supply = <&pm8994_s4>;
|
||||
};
|
||||
};
|
||||
clocks = <&divclk4>;
|
||||
};
|
||||
};
|
||||
|
||||
&blsp2_uart1 {
|
||||
label = "LS-UART1";
|
||||
status = "okay";
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&blsp2_uart1_2pins_default>;
|
||||
pinctrl-1 = <&blsp2_uart1_2pins_sleep>;
|
||||
};
|
||||
|
||||
&blsp2_uart2 {
|
||||
label = "LS-UART0";
|
||||
status = "disabled";
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&blsp2_uart2_4pins_default>;
|
||||
pinctrl-1 = <&blsp2_uart2_4pins_sleep>;
|
||||
};
|
||||
|
||||
&blsp1_i2c2 {
|
||||
/* On Low speed expansion */
|
||||
label = "LS-I2C0";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&blsp2_i2c1 {
|
||||
/* On Low speed expansion */
|
||||
label = "LS-I2C1";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&blsp1_spi0 {
|
||||
/* On Low speed expansion */
|
||||
label = "LS-SPI0";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&blsp2_i2c0 {
|
||||
/* On High speed expansion */
|
||||
label = "HS-I2C2";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&blsp2_spi5 {
|
||||
/* On High speed expansion */
|
||||
label = "HS-SPI1";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&camss {
|
||||
vdda-supply = <&pm8994_l2>;
|
||||
};
|
||||
|
||||
&sdhc2 {
|
||||
/* External SD card */
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
|
||||
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
|
||||
cd-gpios = <&msmgpio 38 0x1>;
|
||||
vmmc-supply = <&pm8994_l21>;
|
||||
vqmmc-supply = <&pm8994_l13>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&ufsphy {
|
||||
status = "okay";
|
||||
|
||||
vdda-phy-supply = <&pm8994_l28>;
|
||||
vdda-pll-supply = <&pm8994_l12>;
|
||||
|
||||
vdda-phy-max-microamp = <18380>;
|
||||
vdda-pll-max-microamp = <9440>;
|
||||
|
||||
vddp-ref-clk-supply = <&pm8994_l25>;
|
||||
vddp-ref-clk-max-microamp = <100>;
|
||||
vddp-ref-clk-always-on;
|
||||
};
|
||||
|
||||
&ufshc {
|
||||
status = "okay";
|
||||
|
||||
vcc-supply = <&pm8994_l20>;
|
||||
vccq-supply = <&pm8994_l25>;
|
||||
vccq2-supply = <&pm8994_s4>;
|
||||
|
||||
vcc-max-microamp = <600000>;
|
||||
vccq-max-microamp = <450000>;
|
||||
vccq2-max-microamp = <450000>;
|
||||
};
|
||||
|
||||
&msmgpio {
|
||||
gpio-line-names =
|
||||
"[SPI0_DOUT]", /* GPIO_0, BLSP1_SPI_MOSI, LSEC pin 14 */
|
||||
"[SPI0_DIN]", /* GPIO_1, BLSP1_SPI_MISO, LSEC pin 10 */
|
||||
"[SPI0_CS]", /* GPIO_2, BLSP1_SPI_CS_N, LSEC pin 12 */
|
||||
"[SPI0_SCLK]", /* GPIO_3, BLSP1_SPI_CLK, LSEC pin 8 */
|
||||
"[UART1_TxD]", /* GPIO_4, BLSP8_UART_TX, LSEC pin 11 */
|
||||
"[UART1_RxD]", /* GPIO_5, BLSP8_UART_RX, LSEC pin 13 */
|
||||
"[I2C1_SDA]", /* GPIO_6, BLSP8_I2C_SDA, LSEC pin 21 */
|
||||
"[I2C1_SCL]", /* GPIO_7, BLSP8_I2C_SCL, LSEC pin 19 */
|
||||
"GPIO-H", /* GPIO_8, LCD0_RESET_N, LSEC pin 30 */
|
||||
"TP93", /* GPIO_9 */
|
||||
"GPIO-G", /* GPIO_10, MDP_VSYNC_P, LSEC pin 29 */
|
||||
"[MDP_VSYNC_S]", /* GPIO_11, S HSEC pin 55 */
|
||||
"NC", /* GPIO_12 */
|
||||
"[CSI0_MCLK]", /* GPIO_13, CAM_MCLK0, P HSEC pin 15 */
|
||||
"[CAM_MCLK1]", /* GPIO_14, J14 pin 11 */
|
||||
"[CSI1_MCLK]", /* GPIO_15, CAM_MCLK2, P HSEC pin 17 */
|
||||
"TP99", /* GPIO_16 */
|
||||
"[I2C2_SDA]", /* GPIO_17, CCI_I2C_SDA0, P HSEC pin 34 */
|
||||
"[I2C2_SCL]", /* GPIO_18, CCI_I2C_SCL0, P HSEC pin 32 */
|
||||
"[CCI_I2C_SDA1]", /* GPIO_19, S HSEC pin 38 */
|
||||
"[CCI_I2C_SCL1]", /* GPIO_20, S HSEC pin 36 */
|
||||
"FLASH_STROBE_EN", /* GPIO_21, S HSEC pin 5 */
|
||||
"FLASH_STROBE_TRIG", /* GPIO_22, S HSEC pin 1 */
|
||||
"GPIO-K", /* GPIO_23, CAM2_RST_N, LSEC pin 33 */
|
||||
"GPIO-D", /* GPIO_24, LSEC pin 26 */
|
||||
"GPIO-I", /* GPIO_25, CAM0_RST_N, LSEC pin 31 */
|
||||
"GPIO-J", /* GPIO_26, CAM0_STANDBY_N, LSEC pin 32 */
|
||||
"BLSP6_I2C_SDA", /* GPIO_27 */
|
||||
"BLSP6_I2C_SCL", /* GPIO_28 */
|
||||
"GPIO-B", /* GPIO_29, TS0_RESET_N, LSEC pin 24 */
|
||||
"GPIO30", /* GPIO_30, S HSEC pin 4 */
|
||||
"HDMI_CEC", /* GPIO_31 */
|
||||
"HDMI_DDC_CLOCK", /* GPIO_32 */
|
||||
"HDMI_DDC_DATA", /* GPIO_33 */
|
||||
"HDMI_HOT_PLUG_DETECT", /* GPIO_34 */
|
||||
"PCIE0_RST_N", /* GPIO_35 */
|
||||
"PCIE0_CLKREQ_N", /* GPIO_36 */
|
||||
"PCIE0_WAKE", /* GPIO_37 */
|
||||
"SD_CARD_DET_N", /* GPIO_38 */
|
||||
"TSIF1_SYNC", /* GPIO_39, S HSEC pin 48 */
|
||||
"W_DISABLE_N", /* GPIO_40 */
|
||||
"[BLSP9_UART_TX]", /* GPIO_41 */
|
||||
"[BLSP9_UART_RX]", /* GPIO_42 */
|
||||
"[BLSP2_UART_CTS_N]", /* GPIO_43 */
|
||||
"[BLSP2_UART_RFR_N]", /* GPIO_44 */
|
||||
"[BLSP3_UART_TX]", /* GPIO_45 */
|
||||
"[BLSP3_UART_RX]", /* GPIO_46 */
|
||||
"[I2C0_SDA]", /* GPIO_47, LS_I2C0_SDA, LSEC pin 17 */
|
||||
"[I2C0_SCL]", /* GPIO_48, LS_I2C0_SCL, LSEC pin 15 */
|
||||
"[UART0_TxD]", /* GPIO_49, BLSP9_UART_TX, LSEC pin 5 */
|
||||
"[UART0_RxD]", /* GPIO_50, BLSP9_UART_RX, LSEC pin 7 */
|
||||
"[UART0_CTS]", /* GPIO_51, BLSP9_UART_CTS_N, LSEC pin 3 */
|
||||
"[UART0_RTS]", /* GPIO_52, BLSP9_UART_RFR_N, LSEC pin 9 */
|
||||
"[CODEC_INT1_N]", /* GPIO_53 */
|
||||
"[CODEC_INT2_N]", /* GPIO_54 */
|
||||
"[BLSP7_I2C_SDA]", /* GPIO_55 */
|
||||
"[BLSP7_I2C_SCL]", /* GPIO_56 */
|
||||
"MI2S_MCLK", /* GPIO_57, S HSEC pin 3 */
|
||||
"[PCM_CLK]", /* GPIO_58, QUA_MI2S_SCK, LSEC pin 18 */
|
||||
"[PCM_FS]", /* GPIO_59, QUA_MI2S_WS, LSEC pin 16 */
|
||||
"[PCM_DO]", /* GPIO_60, QUA_MI2S_DATA0, LSEC pin 20 */
|
||||
"[PCM_DI]", /* GPIO_61, QUA_MI2S_DATA1, LSEC pin 22 */
|
||||
"GPIO-E", /* GPIO_62, LSEC pin 27 */
|
||||
"TP87", /* GPIO_63 */
|
||||
"[CODEC_RST_N]", /* GPIO_64 */
|
||||
"[PCM1_CLK]", /* GPIO_65 */
|
||||
"[PCM1_SYNC]", /* GPIO_66 */
|
||||
"[PCM1_DIN]", /* GPIO_67 */
|
||||
"[PCM1_DOUT]", /* GPIO_68 */
|
||||
"AUDIO_REF_CLK", /* GPIO_69 */
|
||||
"SLIMBUS_CLK", /* GPIO_70 */
|
||||
"SLIMBUS_DATA0", /* GPIO_71 */
|
||||
"SLIMBUS_DATA1", /* GPIO_72 */
|
||||
"NC", /* GPIO_73 */
|
||||
"NC", /* GPIO_74 */
|
||||
"NC", /* GPIO_75 */
|
||||
"NC", /* GPIO_76 */
|
||||
"TP94", /* GPIO_77 */
|
||||
"NC", /* GPIO_78 */
|
||||
"TP95", /* GPIO_79 */
|
||||
"GPIO-A", /* GPIO_80, MEMS_RESET_N, LSEC pin 23 */
|
||||
"TP88", /* GPIO_81 */
|
||||
"TP89", /* GPIO_82 */
|
||||
"TP90", /* GPIO_83 */
|
||||
"TP91", /* GPIO_84 */
|
||||
"[SD_DAT0]", /* GPIO_85, BLSP12_SPI_MOSI, P HSEC pin 1 */
|
||||
"[SD_CMD]", /* GPIO_86, BLSP12_SPI_MISO, P HSEC pin 11 */
|
||||
"[SD_DAT3]", /* GPIO_87, BLSP12_SPI_CS_N, P HSEC pin 7 */
|
||||
"[SD_SCLK]", /* GPIO_88, BLSP12_SPI_CLK, P HSEC pin 9 */
|
||||
"TSIF1_CLK", /* GPIO_89, S HSEC pin 42 */
|
||||
"TSIF1_EN", /* GPIO_90, S HSEC pin 46 */
|
||||
"TSIF1_DATA", /* GPIO_91, S HSEC pin 44 */
|
||||
"NC", /* GPIO_92 */
|
||||
"TSIF2_CLK", /* GPIO_93, S HSEC pin 52 */
|
||||
"TSIF2_EN", /* GPIO_94, S HSEC pin 56 */
|
||||
"TSIF2_DATA", /* GPIO_95, S HSEC pin 54 */
|
||||
"TSIF2_SYNC", /* GPIO_96, S HSEC pin 58 */
|
||||
"NC", /* GPIO_97 */
|
||||
"CAM1_STANDBY_N", /* GPIO_98 */
|
||||
"NC", /* GPIO_99 */
|
||||
"NC", /* GPIO_100 */
|
||||
"[LCD1_RESET_N]", /* GPIO_101, S HSEC pin 51 */
|
||||
"BOOT_CONFIG1", /* GPIO_102 */
|
||||
"USB_HUB_RESET", /* GPIO_103 */
|
||||
"CAM1_RST_N", /* GPIO_104 */
|
||||
"NC", /* GPIO_105 */
|
||||
"NC", /* GPIO_106 */
|
||||
"NC", /* GPIO_107 */
|
||||
"NC", /* GPIO_108 */
|
||||
"NC", /* GPIO_109 */
|
||||
"NC", /* GPIO_110 */
|
||||
"NC", /* GPIO_111 */
|
||||
"NC", /* GPIO_112 */
|
||||
"PMI8994_BUA", /* GPIO_113 */
|
||||
"PCIE2_RST_N", /* GPIO_114 */
|
||||
"PCIE2_CLKREQ_N", /* GPIO_115 */
|
||||
"PCIE2_WAKE", /* GPIO_116 */
|
||||
"SSC_IRQ_0", /* GPIO_117 */
|
||||
"SSC_IRQ_1", /* GPIO_118 */
|
||||
"SSC_IRQ_2", /* GPIO_119 */
|
||||
"NC", /* GPIO_120 */
|
||||
"GPIO121", /* GPIO_121, S HSEC pin 2 */
|
||||
"NC", /* GPIO_122 */
|
||||
"SSC_IRQ_6", /* GPIO_123 */
|
||||
"SSC_IRQ_7", /* GPIO_124 */
|
||||
"GPIO-C", /* GPIO_125, TS_INT0, LSEC pin 25 */
|
||||
"BOOT_CONFIG5", /* GPIO_126 */
|
||||
"NC", /* GPIO_127 */
|
||||
"NC", /* GPIO_128 */
|
||||
"BOOT_CONFIG7", /* GPIO_129 */
|
||||
"PCIE1_RST_N", /* GPIO_130 */
|
||||
"PCIE1_CLKREQ_N", /* GPIO_131 */
|
||||
"PCIE1_WAKE", /* GPIO_132 */
|
||||
"GPIO-L", /* GPIO_133, CAM2_STANDBY_N, LSEC pin 34 */
|
||||
"NC", /* GPIO_134 */
|
||||
"NC", /* GPIO_135 */
|
||||
"BOOT_CONFIG8", /* GPIO_136 */
|
||||
"NC", /* GPIO_137 */
|
||||
"NC", /* GPIO_138 */
|
||||
"GPS_SSBI2", /* GPIO_139 */
|
||||
"GPS_SSBI1", /* GPIO_140 */
|
||||
"NC", /* GPIO_141 */
|
||||
"NC", /* GPIO_142 */
|
||||
"NC", /* GPIO_143 */
|
||||
"BOOT_CONFIG6", /* GPIO_144 */
|
||||
"NC", /* GPIO_145 */
|
||||
"NC", /* GPIO_146 */
|
||||
"NC", /* GPIO_147 */
|
||||
"NC", /* GPIO_148 */
|
||||
"NC"; /* GPIO_149 */
|
||||
};
|
||||
|
||||
&pm8994_gpios {
|
||||
gpio-line-names =
|
||||
"NC",
|
||||
"KEY_VOLP_N",
|
||||
"NC",
|
||||
"BL1_PWM",
|
||||
"GPIO-F", /* BL0_PWM, LSEC pin 28 */
|
||||
"BL1_EN",
|
||||
"NC",
|
||||
"WLAN_EN",
|
||||
"NC",
|
||||
"NC",
|
||||
"NC",
|
||||
"NC",
|
||||
"NC",
|
||||
"NC",
|
||||
"DIVCLK1",
|
||||
"DIVCLK2",
|
||||
"DIVCLK3",
|
||||
"DIVCLK4",
|
||||
"BT_EN",
|
||||
"PMIC_SLB",
|
||||
"PMIC_BUA",
|
||||
"USB_VBUS_DET";
|
||||
};
|
||||
|
||||
&pm8994_mpps {
|
||||
gpio-line-names =
|
||||
"VDDPX_BIAS",
|
||||
"WIFI_LED",
|
||||
"NC",
|
||||
"BT_LED",
|
||||
"PM_MPP05",
|
||||
"PM_MPP06",
|
||||
"PM_MPP07",
|
||||
"NC";
|
||||
};
|
||||
|
||||
&pmi8994_gpios {
|
||||
gpio-line-names =
|
||||
"NC",
|
||||
"SPKR_AMP_EN1",
|
||||
"SPKR_AMP_EN2",
|
||||
"TP61",
|
||||
"NC",
|
||||
"USB2_VBUS_DET",
|
||||
"NC",
|
||||
"NC",
|
||||
"NC",
|
||||
"NC";
|
||||
};
|
||||
|
||||
&pcie_phy {
|
||||
status = "okay";
|
||||
|
||||
vdda-phy-supply = <&pm8994_l28>;
|
||||
vdda-pll-supply = <&pm8994_l12>;
|
||||
};
|
||||
|
||||
&usb3phy {
|
||||
status = "okay";
|
||||
|
||||
vdda-phy-supply = <&pm8994_l28>;
|
||||
vdda-pll-supply = <&pm8994_l12>;
|
||||
|
||||
};
|
||||
|
||||
&hsusb_phy1 {
|
||||
status = "okay";
|
||||
|
||||
vdda-pll-supply = <&pm8994_l12>;
|
||||
vdda-phy-dpdm-supply = <&pm8994_l24>;
|
||||
};
|
||||
|
||||
&hsusb_phy2 {
|
||||
status = "okay";
|
||||
|
||||
vdda-pll-supply = <&pm8994_l12>;
|
||||
vdda-phy-dpdm-supply = <&pm8994_l24>;
|
||||
};
|
||||
|
||||
&usb3 {
|
||||
status = "okay";
|
||||
extcon = <&usb3_id>;
|
||||
|
||||
dwc3@6a00000 {
|
||||
extcon = <&usb3_id>;
|
||||
dr_mode = "otg";
|
||||
};
|
||||
};
|
||||
|
||||
&usb2 {
|
||||
status = "okay";
|
||||
extcon = <&usb2_id>;
|
||||
|
||||
dwc3@7600000 {
|
||||
extcon = <&usb2_id>;
|
||||
dr_mode = "otg";
|
||||
maximum-speed = "high-speed";
|
||||
};
|
||||
};
|
||||
|
||||
&pcie0 {
|
||||
status = "okay";
|
||||
perst-gpio = <&msmgpio 35 GPIO_ACTIVE_LOW>;
|
||||
vddpe-3v3-supply = <&wlan_en>;
|
||||
vdda-supply = <&pm8994_l28>;
|
||||
};
|
||||
|
||||
&pcie1 {
|
||||
status = "okay";
|
||||
perst-gpio = <&msmgpio 130 GPIO_ACTIVE_LOW>;
|
||||
vdda-supply = <&pm8994_l28>;
|
||||
};
|
||||
|
||||
&pcie2 {
|
||||
status = "okay";
|
||||
perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>;
|
||||
vdda-supply = <&pm8994_l28>;
|
||||
};
|
||||
|
||||
&wcd9335 {
|
||||
clock-names = "mclk", "slimbus";
|
||||
clocks = <&div1_mclk>,
|
||||
<&rpmcc RPM_SMD_BB_CLK1>;
|
||||
|
||||
vdd-buck-supply = <&pm8994_s4>;
|
||||
vdd-buck-sido-supply = <&pm8994_s4>;
|
||||
vdd-tx-supply = <&pm8994_s4>;
|
||||
vdd-rx-supply = <&pm8994_s4>;
|
||||
vdd-io-supply = <&pm8994_s4>;
|
||||
};
|
||||
|
||||
&mdss {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&mdp {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&hdmi_phy {
|
||||
status = "okay";
|
||||
|
||||
vddio-supply = <&pm8994_l12>;
|
||||
vcca-supply = <&pm8994_l28>;
|
||||
#phy-cells = <0>;
|
||||
};
|
||||
|
||||
&hdmi {
|
||||
status = "okay";
|
||||
|
||||
pinctrl-names = "default", "sleep";
|
||||
pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;
|
||||
pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;
|
||||
|
||||
core-vdda-supply = <&pm8994_l12>;
|
||||
core-vcc-supply = <&pm8994_s4>;
|
||||
};
|
||||
|
||||
/ {
|
||||
gpio_keys {
|
||||
compatible = "gpio-keys";
|
||||
#address-cells = <1>;
|
||||
@ -667,6 +669,35 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
usb2_id: usb2-id {
|
||||
compatible = "linux,extcon-usb-gpio";
|
||||
id-gpio = <&pmi8994_gpios 6 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&usb2_vbus_det_gpio>;
|
||||
};
|
||||
|
||||
usb3_id: usb3-id {
|
||||
compatible = "linux,extcon-usb-gpio";
|
||||
id-gpio = <&pm8994_gpios 22 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&usb3_vbus_det_gpio>;
|
||||
};
|
||||
|
||||
wlan_en: wlan-en-1-8v {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&wlan_en_gpios>;
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "wlan-en-regulator";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
|
||||
gpio = <&pm8994_gpios 8 0>;
|
||||
|
||||
/* WLAN card specific delay */
|
||||
startup-delay-us = <70000>;
|
||||
enable-active-high;
|
||||
};
|
||||
};
|
||||
|
||||
&spmi_bus {
|
||||
|
||||
@ -584,7 +584,7 @@
|
||||
|
||||
rpm_msg_ram: memory@68000 {
|
||||
compatible = "qcom,rpm-msg-ram";
|
||||
reg = <0x68000 0x6000>;
|
||||
reg = <0x00068000 0x6000>;
|
||||
};
|
||||
|
||||
rng: rng@83000 {
|
||||
@ -596,28 +596,28 @@
|
||||
|
||||
tcsr_mutex_regs: syscon@740000 {
|
||||
compatible = "syscon";
|
||||
reg = <0x740000 0x20000>;
|
||||
reg = <0x00740000 0x20000>;
|
||||
};
|
||||
|
||||
tsens0: thermal-sensor@4a9000 {
|
||||
compatible = "qcom,msm8996-tsens";
|
||||
reg = <0x4a9000 0x1000>, /* TM */
|
||||
<0x4a8000 0x1000>; /* SROT */
|
||||
reg = <0x004a9000 0x1000>, /* TM */
|
||||
<0x004a8000 0x1000>; /* SROT */
|
||||
#qcom,sensors = <13>;
|
||||
#thermal-sensor-cells = <1>;
|
||||
};
|
||||
|
||||
tsens1: thermal-sensor@4ad000 {
|
||||
compatible = "qcom,msm8996-tsens";
|
||||
reg = <0x4ad000 0x1000>, /* TM */
|
||||
<0x4ac000 0x1000>; /* SROT */
|
||||
reg = <0x004ad000 0x1000>, /* TM */
|
||||
<0x004ac000 0x1000>; /* SROT */
|
||||
#qcom,sensors = <8>;
|
||||
#thermal-sensor-cells = <1>;
|
||||
};
|
||||
|
||||
tcsr: syscon@7a0000 {
|
||||
compatible = "qcom,tcsr-msm8996", "syscon";
|
||||
reg = <0x7a0000 0x18000>;
|
||||
reg = <0x007a0000 0x18000>;
|
||||
};
|
||||
|
||||
intc: interrupt-controller@9bc0000 {
|
||||
@ -633,7 +633,7 @@
|
||||
|
||||
apcs_glb: mailbox@9820000 {
|
||||
compatible = "qcom,msm8996-apcs-hmss-global";
|
||||
reg = <0x9820000 0x1000>;
|
||||
reg = <0x09820000 0x1000>;
|
||||
|
||||
#mbox-cells = <1>;
|
||||
};
|
||||
@ -643,7 +643,7 @@
|
||||
#clock-cells = <1>;
|
||||
#reset-cells = <1>;
|
||||
#power-domain-cells = <1>;
|
||||
reg = <0x300000 0x90000>;
|
||||
reg = <0x00300000 0x90000>;
|
||||
};
|
||||
|
||||
stm@3002000 {
|
||||
@ -1124,7 +1124,7 @@
|
||||
|
||||
kryocc: clock-controller@6400000 {
|
||||
compatible = "qcom,apcc-msm8996";
|
||||
reg = <0x6400000 0x90000>;
|
||||
reg = <0x06400000 0x90000>;
|
||||
#clock-cells = <1>;
|
||||
};
|
||||
|
||||
@ -1170,7 +1170,7 @@
|
||||
|
||||
blsp2_uart1: serial@75b0000 {
|
||||
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
|
||||
reg = <0x75b0000 0x1000>;
|
||||
reg = <0x075b0000 0x1000>;
|
||||
interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&gcc GCC_BLSP2_UART2_APPS_CLK>,
|
||||
<&gcc GCC_BLSP2_AHB_CLK>;
|
||||
@ -1236,7 +1236,7 @@
|
||||
sdhc2: sdhci@74a4900 {
|
||||
status = "disabled";
|
||||
compatible = "qcom,sdhci-msm-v4";
|
||||
reg = <0x74a4900 0x314>, <0x74a4000 0x800>;
|
||||
reg = <0x074a4900 0x314>, <0x074a4000 0x800>;
|
||||
reg-names = "hc_mem", "core_mem";
|
||||
|
||||
interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>,
|
||||
@ -1321,11 +1321,11 @@
|
||||
|
||||
spmi_bus: qcom,spmi@400f000 {
|
||||
compatible = "qcom,spmi-pmic-arb";
|
||||
reg = <0x400f000 0x1000>,
|
||||
<0x4400000 0x800000>,
|
||||
<0x4c00000 0x800000>,
|
||||
<0x5800000 0x200000>,
|
||||
<0x400a000 0x002100>;
|
||||
reg = <0x0400f000 0x1000>,
|
||||
<0x04400000 0x800000>,
|
||||
<0x04c00000 0x800000>,
|
||||
<0x05800000 0x200000>,
|
||||
<0x0400a000 0x002100>;
|
||||
reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";
|
||||
interrupt-names = "periph_irq";
|
||||
interrupts = <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>;
|
||||
@ -1339,20 +1339,10 @@
|
||||
|
||||
ufsphy: phy@627000 {
|
||||
compatible = "qcom,msm8996-ufs-phy-qmp-14nm";
|
||||
reg = <0x627000 0xda8>;
|
||||
reg = <0x00627000 0xda8>;
|
||||
reg-names = "phy_mem";
|
||||
#phy-cells = <0>;
|
||||
|
||||
vdda-phy-supply = <&pm8994_l28>;
|
||||
vdda-pll-supply = <&pm8994_l12>;
|
||||
|
||||
vdda-phy-max-microamp = <18380>;
|
||||
vdda-pll-max-microamp = <9440>;
|
||||
|
||||
vddp-ref-clk-supply = <&pm8994_l25>;
|
||||
vddp-ref-clk-max-microamp = <100>;
|
||||
vddp-ref-clk-always-on;
|
||||
|
||||
clock-names = "ref_clk_src", "ref_clk";
|
||||
clocks = <&rpmcc RPM_SMD_LN_BB_CLK>,
|
||||
<&gcc GCC_UFS_CLKREF_CLK>;
|
||||
@ -1362,20 +1352,12 @@
|
||||
|
||||
ufshc: ufshc@624000 {
|
||||
compatible = "qcom,ufshc";
|
||||
reg = <0x624000 0x2500>;
|
||||
reg = <0x00624000 0x2500>;
|
||||
interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
||||
phys = <&ufsphy>;
|
||||
phy-names = "ufsphy";
|
||||
|
||||
vcc-supply = <&pm8994_l20>;
|
||||
vccq-supply = <&pm8994_l25>;
|
||||
vccq2-supply = <&pm8994_s4>;
|
||||
|
||||
vcc-max-microamp = <600000>;
|
||||
vccq-max-microamp = <450000>;
|
||||
vccq2-max-microamp = <450000>;
|
||||
|
||||
power-domains = <&gcc UFS_GDSC>;
|
||||
|
||||
clock-names =
|
||||
@ -1429,7 +1411,7 @@
|
||||
#clock-cells = <1>;
|
||||
#reset-cells = <1>;
|
||||
#power-domain-cells = <1>;
|
||||
reg = <0x8c0000 0x40000>;
|
||||
reg = <0x008c0000 0x40000>;
|
||||
assigned-clocks = <&mmcc MMPLL9_PLL>,
|
||||
<&mmcc MMPLL1_PLL>,
|
||||
<&mmcc MMPLL3_PLL>,
|
||||
@ -1444,7 +1426,7 @@
|
||||
|
||||
qfprom@74000 {
|
||||
compatible = "qcom,qfprom";
|
||||
reg = <0x74000 0x8ff>;
|
||||
reg = <0x00074000 0x8ff>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
@ -1464,9 +1446,9 @@
|
||||
};
|
||||
};
|
||||
|
||||
phy@34000 {
|
||||
pcie_phy: phy@34000 {
|
||||
compatible = "qcom,msm8996-qmp-pcie-phy";
|
||||
reg = <0x34000 0x488>;
|
||||
reg = <0x00034000 0x488>;
|
||||
#clock-cells = <1>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
@ -1477,9 +1459,6 @@
|
||||
<&gcc GCC_PCIE_CLKREF_CLK>;
|
||||
clock-names = "aux", "cfg_ahb", "ref";
|
||||
|
||||
vdda-phy-supply = <&pm8994_l28>;
|
||||
vdda-pll-supply = <&pm8994_l12>;
|
||||
|
||||
resets = <&gcc GCC_PCIE_PHY_BCR>,
|
||||
<&gcc GCC_PCIE_PHY_COM_BCR>,
|
||||
<&gcc GCC_PCIE_PHY_COM_NOCSR_BCR>;
|
||||
@ -1487,9 +1466,9 @@
|
||||
status = "disabled";
|
||||
|
||||
pciephy_0: lane@35000 {
|
||||
reg = <0x035000 0x130>,
|
||||
<0x035200 0x200>,
|
||||
<0x035400 0x1dc>;
|
||||
reg = <0x00035000 0x130>,
|
||||
<0x00035200 0x200>,
|
||||
<0x00035400 0x1dc>;
|
||||
#phy-cells = <0>;
|
||||
|
||||
clock-output-names = "pcie_0_pipe_clk_src";
|
||||
@ -1500,9 +1479,9 @@
|
||||
};
|
||||
|
||||
pciephy_1: lane@36000 {
|
||||
reg = <0x036000 0x130>,
|
||||
<0x036200 0x200>,
|
||||
<0x036400 0x1dc>;
|
||||
reg = <0x00036000 0x130>,
|
||||
<0x00036200 0x200>,
|
||||
<0x00036400 0x1dc>;
|
||||
#phy-cells = <0>;
|
||||
|
||||
clock-output-names = "pcie_1_pipe_clk_src";
|
||||
@ -1513,9 +1492,9 @@
|
||||
};
|
||||
|
||||
pciephy_2: lane@37000 {
|
||||
reg = <0x037000 0x130>,
|
||||
<0x037200 0x200>,
|
||||
<0x037400 0x1dc>;
|
||||
reg = <0x00037000 0x130>,
|
||||
<0x00037200 0x200>,
|
||||
<0x00037400 0x1dc>;
|
||||
#phy-cells = <0>;
|
||||
|
||||
clock-output-names = "pcie_2_pipe_clk_src";
|
||||
@ -1526,9 +1505,9 @@
|
||||
};
|
||||
};
|
||||
|
||||
phy@7410000 {
|
||||
usb3phy: phy@7410000 {
|
||||
compatible = "qcom,msm8996-qmp-usb3-phy";
|
||||
reg = <0x7410000 0x1c4>;
|
||||
reg = <0x07410000 0x1c4>;
|
||||
#clock-cells = <1>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
@ -1539,18 +1518,15 @@
|
||||
<&gcc GCC_USB3_CLKREF_CLK>;
|
||||
clock-names = "aux", "cfg_ahb", "ref";
|
||||
|
||||
vdda-phy-supply = <&pm8994_l28>;
|
||||
vdda-pll-supply = <&pm8994_l12>;
|
||||
|
||||
resets = <&gcc GCC_USB3_PHY_BCR>,
|
||||
<&gcc GCC_USB3PHY_PHY_BCR>;
|
||||
reset-names = "phy", "common";
|
||||
status = "disabled";
|
||||
|
||||
ssusb_phy_0: lane@7410200 {
|
||||
reg = <0x7410200 0x200>,
|
||||
<0x7410400 0x130>,
|
||||
<0x7410600 0x1a8>;
|
||||
reg = <0x07410200 0x200>,
|
||||
<0x07410400 0x130>,
|
||||
<0x07410600 0x1a8>;
|
||||
#phy-cells = <0>;
|
||||
|
||||
clock-output-names = "usb3_phy_pipe_clk_src";
|
||||
@ -1561,16 +1537,13 @@
|
||||
|
||||
hsusb_phy1: phy@7411000 {
|
||||
compatible = "qcom,msm8996-qusb2-phy";
|
||||
reg = <0x7411000 0x180>;
|
||||
reg = <0x07411000 0x180>;
|
||||
#phy-cells = <0>;
|
||||
|
||||
clocks = <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>,
|
||||
<&gcc GCC_RX1_USB2_CLKREF_CLK>;
|
||||
clock-names = "cfg_ahb", "ref";
|
||||
|
||||
vdda-pll-supply = <&pm8994_l12>;
|
||||
vdda-phy-dpdm-supply = <&pm8994_l24>;
|
||||
|
||||
resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>;
|
||||
nvmem-cells = <&qusb2p_hstx_trim>;
|
||||
status = "disabled";
|
||||
@ -1578,16 +1551,13 @@
|
||||
|
||||
hsusb_phy2: phy@7412000 {
|
||||
compatible = "qcom,msm8996-qusb2-phy";
|
||||
reg = <0x7412000 0x180>;
|
||||
reg = <0x07412000 0x180>;
|
||||
#phy-cells = <0>;
|
||||
|
||||
clocks = <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>,
|
||||
<&gcc GCC_RX2_USB2_CLKREF_CLK>;
|
||||
clock-names = "cfg_ahb", "ref";
|
||||
|
||||
vdda-pll-supply = <&pm8994_l12>;
|
||||
vdda-phy-dpdm-supply = <&pm8994_l24>;
|
||||
|
||||
resets = <&gcc GCC_QUSB2PHY_SEC_BCR>;
|
||||
nvmem-cells = <&qusb2s_hstx_trim>;
|
||||
status = "disabled";
|
||||
@ -1595,7 +1565,7 @@
|
||||
|
||||
usb2: usb@76f8800 {
|
||||
compatible = "qcom,msm8996-dwc3", "qcom,dwc3";
|
||||
reg = <0x76f8800 0x400>;
|
||||
reg = <0x076f8800 0x400>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
@ -1615,7 +1585,7 @@
|
||||
|
||||
dwc3@7600000 {
|
||||
compatible = "snps,dwc3";
|
||||
reg = <0x7600000 0xcc00>;
|
||||
reg = <0x07600000 0xcc00>;
|
||||
interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>;
|
||||
phys = <&hsusb_phy2>;
|
||||
phy-names = "usb2-phy";
|
||||
@ -1626,7 +1596,7 @@
|
||||
|
||||
usb3: usb@6af8800 {
|
||||
compatible = "qcom,msm8996-dwc3", "qcom,dwc3";
|
||||
reg = <0x6af8800 0x400>;
|
||||
reg = <0x06af8800 0x400>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
@ -1647,7 +1617,7 @@
|
||||
|
||||
dwc3@6a00000 {
|
||||
compatible = "snps,dwc3";
|
||||
reg = <0x6a00000 0xcc00>;
|
||||
reg = <0x06a00000 0xcc00>;
|
||||
interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;
|
||||
phys = <&hsusb_phy1>, <&ssusb_phy_0>;
|
||||
phy-names = "usb2-phy", "usb3-phy";
|
||||
@ -1658,7 +1628,7 @@
|
||||
|
||||
vfe_smmu: iommu@da0000 {
|
||||
compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2";
|
||||
reg = <0xda0000 0x10000>;
|
||||
reg = <0x00da0000 0x10000>;
|
||||
|
||||
#global-interrupts = <1>;
|
||||
interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
|
||||
@ -1674,20 +1644,20 @@
|
||||
|
||||
camss: camss@a00000 {
|
||||
compatible = "qcom,msm8996-camss";
|
||||
reg = <0xa34000 0x1000>,
|
||||
<0xa00030 0x4>,
|
||||
<0xa35000 0x1000>,
|
||||
<0xa00038 0x4>,
|
||||
<0xa36000 0x1000>,
|
||||
<0xa00040 0x4>,
|
||||
<0xa30000 0x100>,
|
||||
<0xa30400 0x100>,
|
||||
<0xa30800 0x100>,
|
||||
<0xa30c00 0x100>,
|
||||
<0xa31000 0x500>,
|
||||
<0xa00020 0x10>,
|
||||
<0xa10000 0x1000>,
|
||||
<0xa14000 0x1000>;
|
||||
reg = <0x00a34000 0x1000>,
|
||||
<0x00a00030 0x4>,
|
||||
<0x00a35000 0x1000>,
|
||||
<0x00a00038 0x4>,
|
||||
<0x00a36000 0x1000>,
|
||||
<0x00a00040 0x4>,
|
||||
<0x00a30000 0x100>,
|
||||
<0x00a30400 0x100>,
|
||||
<0x00a30800 0x100>,
|
||||
<0x00a30c00 0x100>,
|
||||
<0x00a31000 0x500>,
|
||||
<0x00a00020 0x10>,
|
||||
<0x00a10000 0x1000>,
|
||||
<0x00a14000 0x1000>;
|
||||
reg-names = "csiphy0",
|
||||
"csiphy0_clk_mux",
|
||||
"csiphy1",
|
||||
@ -1795,7 +1765,6 @@
|
||||
"vfe1_stream",
|
||||
"vfe_ahb",
|
||||
"vfe_axi";
|
||||
vdda-supply = <&pm8994_l2>;
|
||||
iommus = <&vfe_smmu 0>,
|
||||
<&vfe_smmu 1>,
|
||||
<&vfe_smmu 2>,
|
||||
@ -1809,7 +1778,7 @@
|
||||
|
||||
adreno_smmu: iommu@b40000 {
|
||||
compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2";
|
||||
reg = <0xb40000 0x10000>;
|
||||
reg = <0x00b40000 0x10000>;
|
||||
|
||||
#global-interrupts = <1>;
|
||||
interrupts = <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
|
||||
@ -1826,7 +1795,7 @@
|
||||
|
||||
mdp_smmu: iommu@d00000 {
|
||||
compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2";
|
||||
reg = <0xd00000 0x10000>;
|
||||
reg = <0x00d00000 0x10000>;
|
||||
|
||||
#global-interrupts = <1>;
|
||||
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
|
||||
@ -1842,7 +1811,7 @@
|
||||
|
||||
lpass_q6_smmu: iommu@1600000 {
|
||||
compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2";
|
||||
reg = <0x1600000 0x20000>;
|
||||
reg = <0x01600000 0x20000>;
|
||||
#iommu-cells = <1>;
|
||||
power-domains = <&gcc HLOS1_VOTE_LPASS_CORE_GDSC>;
|
||||
|
||||
@ -1907,9 +1876,6 @@
|
||||
pinctrl-0 = <&pcie0_clkreq_default &pcie0_perst_default &pcie0_wake_default>;
|
||||
pinctrl-1 = <&pcie0_clkreq_sleep &pcie0_perst_default &pcie0_wake_sleep>;
|
||||
|
||||
|
||||
vdda-supply = <&pm8994_l28>;
|
||||
|
||||
linux,pci-domain = <0>;
|
||||
|
||||
clocks = <&gcc GCC_PCIE_0_PIPE_CLK>,
|
||||
@ -1962,8 +1928,6 @@
|
||||
pinctrl-0 = <&pcie1_clkreq_default &pcie1_perst_default &pcie1_wake_default>;
|
||||
pinctrl-1 = <&pcie1_clkreq_sleep &pcie1_perst_default &pcie1_wake_sleep>;
|
||||
|
||||
|
||||
vdda-supply = <&pm8994_l28>;
|
||||
linux,pci-domain = <1>;
|
||||
|
||||
clocks = <&gcc GCC_PCIE_1_PIPE_CLK>,
|
||||
@ -2015,8 +1979,6 @@
|
||||
pinctrl-0 = <&pcie2_clkreq_default &pcie2_perst_default &pcie2_wake_default>;
|
||||
pinctrl-1 = <&pcie2_clkreq_sleep &pcie2_perst_default &pcie2_wake_sleep >;
|
||||
|
||||
vdda-supply = <&pm8994_l28>;
|
||||
|
||||
linux,pci-domain = <2>;
|
||||
clocks = <&gcc GCC_PCIE_2_PIPE_CLK>,
|
||||
<&gcc GCC_PCIE_2_AUX_CLK>,
|
||||
@ -2036,7 +1998,7 @@
|
||||
{
|
||||
compatible = "qcom,bam-v1.7.0";
|
||||
qcom,controlled-remotely;
|
||||
reg = <0x9184000 0x32000>;
|
||||
reg = <0x09184000 0x32000>;
|
||||
num-channels = <31>;
|
||||
interrupts = <0 164 IRQ_TYPE_LEVEL_HIGH>;
|
||||
#dma-cells = <1>;
|
||||
@ -2046,7 +2008,7 @@
|
||||
|
||||
slim_msm: slim@91c0000 {
|
||||
compatible = "qcom,slim-ngd-v1.5.0";
|
||||
reg = <0x91c0000 0x2C000>;
|
||||
reg = <0x091c0000 0x2C000>;
|
||||
reg-names = "ctrl";
|
||||
interrupts = <0 163 IRQ_TYPE_LEVEL_HIGH>;
|
||||
dmas = <&slimbam 3>, <&slimbam 4>,
|
||||
@ -2081,12 +2043,6 @@
|
||||
|
||||
slim-ifc-dev = <&tasha_ifd>;
|
||||
|
||||
vdd-buck-supply = <&pm8994_s4>;
|
||||
vdd-buck-sido-supply = <&pm8994_s4>;
|
||||
vdd-tx-supply = <&pm8994_s4>;
|
||||
vdd-rx-supply = <&pm8994_s4>;
|
||||
vdd-io-supply = <&pm8994_s4>;
|
||||
|
||||
#sound-dai-cells = <1>;
|
||||
};
|
||||
};
|
||||
@ -2096,7 +2052,7 @@
|
||||
compatible = "qcom,adreno-530.2", "qcom,adreno";
|
||||
#stream-id-cells = <16>;
|
||||
|
||||
reg = <0xb00000 0x3f000>;
|
||||
reg = <0x00b00000 0x3f000>;
|
||||
reg-names = "kgsl_3d0_reg_memory";
|
||||
|
||||
interrupts = <0 300 IRQ_TYPE_LEVEL_HIGH>;
|
||||
@ -2167,9 +2123,9 @@
|
||||
mdss: mdss@900000 {
|
||||
compatible = "qcom,mdss";
|
||||
|
||||
reg = <0x900000 0x1000>,
|
||||
<0x9b0000 0x1040>,
|
||||
<0x9b8000 0x1040>;
|
||||
reg = <0x00900000 0x1000>,
|
||||
<0x009b0000 0x1040>,
|
||||
<0x009b8000 0x1040>;
|
||||
reg-names = "mdss_phys",
|
||||
"vbif_phys",
|
||||
"vbif_nrt_phys";
|
||||
@ -2189,7 +2145,7 @@
|
||||
|
||||
mdp: mdp@901000 {
|
||||
compatible = "qcom,mdp5";
|
||||
reg = <0x901000 0x90000>;
|
||||
reg = <0x00901000 0x90000>;
|
||||
reg-names = "mdp_phys";
|
||||
|
||||
interrupt-parent = <&mdss>;
|
||||
@ -2265,12 +2221,12 @@
|
||||
hdmi_phy: hdmi-phy@9a0600 {
|
||||
#phy-cells = <0>;
|
||||
compatible = "qcom,hdmi-phy-8996";
|
||||
reg = <0x9a0600 0x1c4>,
|
||||
<0x9a0a00 0x124>,
|
||||
<0x9a0c00 0x124>,
|
||||
<0x9a0e00 0x124>,
|
||||
<0x9a1000 0x124>,
|
||||
<0x9a1200 0x0c8>;
|
||||
reg = <0x009a0600 0x1c4>,
|
||||
<0x009a0a00 0x124>,
|
||||
<0x009a0c00 0x124>,
|
||||
<0x009a0e00 0x124>,
|
||||
<0x009a1000 0x124>,
|
||||
<0x009a1200 0x0c8>;
|
||||
reg-names = "hdmi_pll",
|
||||
"hdmi_tx_l0",
|
||||
"hdmi_tx_l1",
|
||||
|
||||
@ -60,6 +60,7 @@ static inline void instruction_pointer_set(struct pt_regs *regs,
|
||||
unsigned long val)
|
||||
{
|
||||
regs->cp0_epc = val;
|
||||
regs->cp0_cause &= ~CAUSEF_BD;
|
||||
}
|
||||
|
||||
/* Query offset/name of register from its name/offset */
|
||||
|
||||
@ -80,7 +80,7 @@ void notrace __hot ftrace_function_trampoline(unsigned long parent,
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
|
||||
#if defined(CONFIG_DYNAMIC_FTRACE) && defined(CONFIG_FUNCTION_GRAPH_TRACER)
|
||||
int ftrace_enable_ftrace_graph_caller(void)
|
||||
{
|
||||
return 0;
|
||||
|
||||
@ -153,6 +153,20 @@ static unsigned long single_gpci_request(u32 req, u32 starting_index,
|
||||
|
||||
ret = plpar_hcall_norets(H_GET_PERF_COUNTER_INFO,
|
||||
virt_to_phys(arg), HGPCI_REQ_BUFFER_SIZE);
|
||||
|
||||
/*
|
||||
* ret value as 'H_PARAMETER' with detail_rc as 'GEN_BUF_TOO_SMALL',
|
||||
* specifies that the current buffer size cannot accommodate
|
||||
* all the information and a partial buffer returned.
|
||||
* Since in this function we are only accessing data for a given starting index,
|
||||
* we don't need to accommodate whole data and can get required count by
|
||||
* accessing first entry data.
|
||||
* Hence hcall fails only incase the ret value is other than H_SUCCESS or
|
||||
* H_PARAMETER with detail_rc value as GEN_BUF_TOO_SMALL(0x1B).
|
||||
*/
|
||||
if (ret == H_PARAMETER && be32_to_cpu(arg->params.detail_rc) == 0x1B)
|
||||
ret = 0;
|
||||
|
||||
if (ret) {
|
||||
pr_devel("hcall failed: 0x%lx\n", ret);
|
||||
goto out;
|
||||
@ -217,6 +231,7 @@ static int h_gpci_event_init(struct perf_event *event)
|
||||
{
|
||||
u64 count;
|
||||
u8 length;
|
||||
unsigned long ret;
|
||||
|
||||
/* Not our event */
|
||||
if (event->attr.type != event->pmu->type)
|
||||
@ -247,13 +262,23 @@ static int h_gpci_event_init(struct perf_event *event)
|
||||
}
|
||||
|
||||
/* check if the request works... */
|
||||
if (single_gpci_request(event_get_request(event),
|
||||
ret = single_gpci_request(event_get_request(event),
|
||||
event_get_starting_index(event),
|
||||
event_get_secondary_index(event),
|
||||
event_get_counter_info_version(event),
|
||||
event_get_offset(event),
|
||||
length,
|
||||
&count)) {
|
||||
&count);
|
||||
|
||||
/*
|
||||
* ret value as H_AUTHORITY implies that partition is not permitted to retrieve
|
||||
* performance information, and required to set
|
||||
* "Enable Performance Information Collection" option.
|
||||
*/
|
||||
if (ret == H_AUTHORITY)
|
||||
return -EPERM;
|
||||
|
||||
if (ret) {
|
||||
pr_devel("gpci hcall failed\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@ -97,9 +97,6 @@ static void __init linkstation_init_IRQ(void)
|
||||
mpic_init(mpic);
|
||||
}
|
||||
|
||||
extern void avr_uart_configure(void);
|
||||
extern void avr_uart_send(const char);
|
||||
|
||||
static void __noreturn linkstation_restart(char *cmd)
|
||||
{
|
||||
local_irq_disable();
|
||||
|
||||
@ -156,4 +156,7 @@ int mpc10x_disable_store_gathering(struct pci_controller *hose);
|
||||
/* For MPC107 boards that use the built-in openpic */
|
||||
void mpc10x_set_openpic(void);
|
||||
|
||||
void avr_uart_configure(void);
|
||||
void avr_uart_send(const char c);
|
||||
|
||||
#endif /* __PPC_KERNEL_MPC10X_H */
|
||||
|
||||
@ -214,13 +214,13 @@ void vtime_flush(struct task_struct *tsk)
|
||||
virt_timer_expire();
|
||||
|
||||
steal = S390_lowcore.steal_timer;
|
||||
avg_steal = S390_lowcore.avg_steal_timer / 2;
|
||||
avg_steal = S390_lowcore.avg_steal_timer;
|
||||
if ((s64) steal > 0) {
|
||||
S390_lowcore.steal_timer = 0;
|
||||
account_steal_time(cputime_to_nsecs(steal));
|
||||
avg_steal += steal;
|
||||
}
|
||||
S390_lowcore.avg_steal_timer = avg_steal;
|
||||
S390_lowcore.avg_steal_timer = avg_steal / 2;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -696,7 +696,7 @@ err1:
|
||||
return err;
|
||||
}
|
||||
|
||||
static const struct of_device_id grpci1_of_match[] __initconst = {
|
||||
static const struct of_device_id grpci1_of_match[] = {
|
||||
{
|
||||
.name = "GAISLER_PCIFBRG",
|
||||
},
|
||||
|
||||
@ -887,7 +887,7 @@ err1:
|
||||
return err;
|
||||
}
|
||||
|
||||
static const struct of_device_id grpci2_of_match[] __initconst = {
|
||||
static const struct of_device_id grpci2_of_match[] = {
|
||||
{
|
||||
.name = "GAISLER_GRPCI2",
|
||||
},
|
||||
|
||||
@ -597,6 +597,14 @@ static void print_absolute_relocs(void)
|
||||
if (!(sec_applies->shdr.sh_flags & SHF_ALLOC)) {
|
||||
continue;
|
||||
}
|
||||
/*
|
||||
* Do not perform relocations in .notes section; any
|
||||
* values there are meant for pre-boot consumption (e.g.
|
||||
* startup_xen).
|
||||
*/
|
||||
if (sec_applies->shdr.sh_type == SHT_NOTE) {
|
||||
continue;
|
||||
}
|
||||
sh_symtab = sec_symtab->symtab;
|
||||
sym_strtab = sec_symtab->link->strtab;
|
||||
for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
|
||||
|
||||
@ -65,6 +65,8 @@ int xen_smp_intr_init(unsigned int cpu)
|
||||
char *resched_name, *callfunc_name, *debug_name;
|
||||
|
||||
resched_name = kasprintf(GFP_KERNEL, "resched%d", cpu);
|
||||
if (!resched_name)
|
||||
goto fail_mem;
|
||||
per_cpu(xen_resched_irq, cpu).name = resched_name;
|
||||
rc = bind_ipi_to_irqhandler(XEN_RESCHEDULE_VECTOR,
|
||||
cpu,
|
||||
@ -77,6 +79,8 @@ int xen_smp_intr_init(unsigned int cpu)
|
||||
per_cpu(xen_resched_irq, cpu).irq = rc;
|
||||
|
||||
callfunc_name = kasprintf(GFP_KERNEL, "callfunc%d", cpu);
|
||||
if (!callfunc_name)
|
||||
goto fail_mem;
|
||||
per_cpu(xen_callfunc_irq, cpu).name = callfunc_name;
|
||||
rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_VECTOR,
|
||||
cpu,
|
||||
@ -90,6 +94,9 @@ int xen_smp_intr_init(unsigned int cpu)
|
||||
|
||||
if (!xen_fifo_events) {
|
||||
debug_name = kasprintf(GFP_KERNEL, "debug%d", cpu);
|
||||
if (!debug_name)
|
||||
goto fail_mem;
|
||||
|
||||
per_cpu(xen_debug_irq, cpu).name = debug_name;
|
||||
rc = bind_virq_to_irqhandler(VIRQ_DEBUG, cpu,
|
||||
xen_debug_interrupt,
|
||||
@ -101,6 +108,9 @@ int xen_smp_intr_init(unsigned int cpu)
|
||||
}
|
||||
|
||||
callfunc_name = kasprintf(GFP_KERNEL, "callfuncsingle%d", cpu);
|
||||
if (!callfunc_name)
|
||||
goto fail_mem;
|
||||
|
||||
per_cpu(xen_callfuncsingle_irq, cpu).name = callfunc_name;
|
||||
rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_SINGLE_VECTOR,
|
||||
cpu,
|
||||
@ -114,6 +124,8 @@ int xen_smp_intr_init(unsigned int cpu)
|
||||
|
||||
return 0;
|
||||
|
||||
fail_mem:
|
||||
rc = -ENOMEM;
|
||||
fail:
|
||||
xen_smp_intr_free(cpu);
|
||||
return rc;
|
||||
|
||||
@ -65,6 +65,7 @@ enum opal_response_token {
|
||||
#define SHORT_ATOM_BYTE 0xBF
|
||||
#define MEDIUM_ATOM_BYTE 0xDF
|
||||
#define LONG_ATOM_BYTE 0xE3
|
||||
#define EMPTY_ATOM_BYTE 0xFF
|
||||
|
||||
#define OPAL_INVAL_PARAM 12
|
||||
#define OPAL_MANUFACTURED_INACTIVE 0x08
|
||||
|
||||
@ -893,16 +893,20 @@ static int response_parse(const u8 *buf, size_t length,
|
||||
token_length = response_parse_medium(iter, pos);
|
||||
else if (pos[0] <= LONG_ATOM_BYTE) /* long atom */
|
||||
token_length = response_parse_long(iter, pos);
|
||||
else if (pos[0] == EMPTY_ATOM_BYTE) /* empty atom */
|
||||
token_length = 1;
|
||||
else /* TOKEN */
|
||||
token_length = response_parse_token(iter, pos);
|
||||
|
||||
if (token_length < 0)
|
||||
return token_length;
|
||||
|
||||
if (pos[0] != EMPTY_ATOM_BYTE)
|
||||
num_entries++;
|
||||
|
||||
pos += token_length;
|
||||
total -= token_length;
|
||||
iter++;
|
||||
num_entries++;
|
||||
}
|
||||
|
||||
resp->num = num_entries;
|
||||
|
||||
@ -1533,6 +1533,8 @@ int acpi_processor_power_exit(struct acpi_processor *pr)
|
||||
acpi_processor_registered--;
|
||||
if (acpi_processor_registered == 0)
|
||||
cpuidle_unregister_driver(&acpi_idle_driver);
|
||||
|
||||
kfree(dev);
|
||||
}
|
||||
|
||||
pr->flags.power_setup_done = 0;
|
||||
|
||||
@ -322,18 +322,14 @@ static int acpi_scan_device_check(struct acpi_device *adev)
|
||||
* again).
|
||||
*/
|
||||
if (adev->handler) {
|
||||
dev_warn(&adev->dev, "Already enumerated\n");
|
||||
return -EALREADY;
|
||||
dev_dbg(&adev->dev, "Already enumerated\n");
|
||||
return 0;
|
||||
}
|
||||
error = acpi_bus_scan(adev->handle);
|
||||
if (error) {
|
||||
dev_warn(&adev->dev, "Namespace scan failure\n");
|
||||
return error;
|
||||
}
|
||||
if (!adev->handler) {
|
||||
dev_warn(&adev->dev, "Enumeration failure\n");
|
||||
error = -ENODEV;
|
||||
}
|
||||
} else {
|
||||
error = acpi_scan_device_not_present(adev);
|
||||
}
|
||||
|
||||
@ -420,13 +420,16 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff_head *qu
|
||||
rcu_read_lock();
|
||||
for_each_netdev_rcu(&init_net, ifp) {
|
||||
dev_hold(ifp);
|
||||
if (!is_aoe_netif(ifp))
|
||||
goto cont;
|
||||
if (!is_aoe_netif(ifp)) {
|
||||
dev_put(ifp);
|
||||
continue;
|
||||
}
|
||||
|
||||
skb = new_skb(sizeof *h + sizeof *ch);
|
||||
if (skb == NULL) {
|
||||
printk(KERN_INFO "aoe: skb alloc failure\n");
|
||||
goto cont;
|
||||
dev_put(ifp);
|
||||
continue;
|
||||
}
|
||||
skb_put(skb, sizeof *h + sizeof *ch);
|
||||
skb->dev = ifp;
|
||||
@ -441,9 +444,6 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff_head *qu
|
||||
h->major = cpu_to_be16(aoemajor);
|
||||
h->minor = aoeminor;
|
||||
h->cmd = AOECMD_CFG;
|
||||
|
||||
cont:
|
||||
dev_put(ifp);
|
||||
}
|
||||
rcu_read_unlock();
|
||||
}
|
||||
|
||||
@ -64,6 +64,7 @@ tx(int id) __must_hold(&txlock)
|
||||
pr_warn("aoe: packet could not be sent on %s. %s\n",
|
||||
ifp ? ifp->name : "netif",
|
||||
"consider increasing tx_queue_len");
|
||||
dev_put(ifp);
|
||||
spin_lock_irq(&txlock);
|
||||
}
|
||||
return 0;
|
||||
|
||||
@ -2313,6 +2313,12 @@ static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info)
|
||||
}
|
||||
|
||||
dev_list = nla_nest_start_noflag(reply, NBD_ATTR_DEVICE_LIST);
|
||||
if (!dev_list) {
|
||||
nlmsg_free(reply);
|
||||
ret = -EMSGSIZE;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (index == -1) {
|
||||
ret = idr_for_each(&nbd_index_idr, &status_cb, reply);
|
||||
if (ret) {
|
||||
|
||||
@ -136,11 +136,12 @@ config SUNXI_RSB
|
||||
|
||||
config TEGRA_ACONNECT
|
||||
tristate "Tegra ACONNECT Bus Driver"
|
||||
depends on ARCH_TEGRA_210_SOC
|
||||
depends on ARCH_TEGRA
|
||||
depends on OF && PM
|
||||
help
|
||||
Driver for the Tegra ACONNECT bus which is used to interface with
|
||||
the devices inside the Audio Processing Engine (APE) for Tegra210.
|
||||
the devices inside the Audio Processing Engine (APE) for
|
||||
Tegra210 and later.
|
||||
|
||||
config TEGRA_GMI
|
||||
tristate "Tegra Generic Memory Interface bus driver"
|
||||
|
||||
@ -427,6 +427,9 @@ static struct clk_core *clk_core_get(struct clk_core *core, u8 p_index)
|
||||
if (IS_ERR(hw))
|
||||
return ERR_CAST(hw);
|
||||
|
||||
if (!hw)
|
||||
return NULL;
|
||||
|
||||
return hw->core;
|
||||
}
|
||||
|
||||
|
||||
@ -130,7 +130,7 @@ static void hi3519_clk_unregister(struct platform_device *pdev)
|
||||
of_clk_del_provider(pdev->dev.of_node);
|
||||
|
||||
hisi_clk_unregister_gate(hi3519_gate_clks,
|
||||
ARRAY_SIZE(hi3519_mux_clks),
|
||||
ARRAY_SIZE(hi3519_gate_clks),
|
||||
crg->clk_data);
|
||||
hisi_clk_unregister_mux(hi3519_mux_clks,
|
||||
ARRAY_SIZE(hi3519_mux_clks),
|
||||
|
||||
@ -570,6 +570,8 @@ static struct clk_branch disp_cc_mdss_vsync_clk = {
|
||||
|
||||
static struct gdsc mdss_gdsc = {
|
||||
.gdscr = 0x3000,
|
||||
.en_few_wait_val = 0x6,
|
||||
.en_rest_wait_val = 0x5,
|
||||
.pd = {
|
||||
.name = "mdss_gdsc",
|
||||
},
|
||||
|
||||
@ -13,14 +13,16 @@
|
||||
|
||||
static int qcom_reset(struct reset_controller_dev *rcdev, unsigned long id)
|
||||
{
|
||||
struct qcom_reset_controller *rst = to_qcom_reset_controller(rcdev);
|
||||
|
||||
rcdev->ops->assert(rcdev, id);
|
||||
udelay(1);
|
||||
udelay(rst->reset_map[id].udelay ?: 1); /* use 1 us as default */
|
||||
rcdev->ops->deassert(rcdev, id);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
|
||||
static int qcom_reset_set_assert(struct reset_controller_dev *rcdev,
|
||||
unsigned long id, bool assert)
|
||||
{
|
||||
struct qcom_reset_controller *rst;
|
||||
const struct qcom_reset_map *map;
|
||||
@ -28,23 +30,24 @@ qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
|
||||
|
||||
rst = to_qcom_reset_controller(rcdev);
|
||||
map = &rst->reset_map[id];
|
||||
mask = BIT(map->bit);
|
||||
mask = map->bitmask ? map->bitmask : BIT(map->bit);
|
||||
|
||||
return regmap_update_bits(rst->regmap, map->reg, mask, mask);
|
||||
regmap_update_bits(rst->regmap, map->reg, mask, assert ? mask : 0);
|
||||
|
||||
/* Read back the register to ensure write completion, ignore the value */
|
||||
regmap_read(rst->regmap, map->reg, &mask);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)
|
||||
static int qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
|
||||
{
|
||||
struct qcom_reset_controller *rst;
|
||||
const struct qcom_reset_map *map;
|
||||
u32 mask;
|
||||
return qcom_reset_set_assert(rcdev, id, true);
|
||||
}
|
||||
|
||||
rst = to_qcom_reset_controller(rcdev);
|
||||
map = &rst->reset_map[id];
|
||||
mask = BIT(map->bit);
|
||||
|
||||
return regmap_update_bits(rst->regmap, map->reg, mask, 0);
|
||||
static int qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)
|
||||
{
|
||||
return qcom_reset_set_assert(rcdev, id, false);
|
||||
}
|
||||
|
||||
const struct reset_control_ops qcom_reset_ops = {
|
||||
|
||||
@ -11,6 +11,8 @@
|
||||
struct qcom_reset_map {
|
||||
unsigned int reg;
|
||||
u8 bit;
|
||||
u8 udelay;
|
||||
u32 bitmask;
|
||||
};
|
||||
|
||||
struct regmap;
|
||||
|
||||
@ -582,16 +582,16 @@ config TEGRA20_APB_DMA
|
||||
|
||||
config TEGRA210_ADMA
|
||||
tristate "NVIDIA Tegra210 ADMA support"
|
||||
depends on (ARCH_TEGRA_210_SOC || COMPILE_TEST)
|
||||
depends on (ARCH_TEGRA || COMPILE_TEST)
|
||||
select DMA_ENGINE
|
||||
select DMA_VIRTUAL_CHANNELS
|
||||
help
|
||||
Support for the NVIDIA Tegra210 ADMA controller driver. The
|
||||
DMA controller has multiple DMA channels and is used to service
|
||||
various audio clients in the Tegra210 audio processing engine
|
||||
(APE). This DMA controller transfers data from memory to
|
||||
peripheral and vice versa. It does not support memory to
|
||||
memory data transfer.
|
||||
Support for the NVIDIA Tegra210/Tegra186/Tegra194/Tegra234 ADMA
|
||||
controller driver. The DMA controller has multiple DMA channels
|
||||
and is used to service various audio clients in the Tegra210
|
||||
audio processing engine (APE). This DMA controller transfers
|
||||
data from memory to peripheral and vice versa. It does not
|
||||
support memory to memory data transfer.
|
||||
|
||||
config TIMB_DMA
|
||||
tristate "Timberdale FPGA DMA support"
|
||||
|
||||
@ -500,7 +500,19 @@ static void bm_work(struct work_struct *work)
|
||||
fw_notice(card, "phy config: new root=%x, gap_count=%d\n",
|
||||
new_root_id, gap_count);
|
||||
fw_send_phy_config(card, new_root_id, generation, gap_count);
|
||||
reset_bus(card, true);
|
||||
/*
|
||||
* Where possible, use a short bus reset to minimize
|
||||
* disruption to isochronous transfers. But in the event
|
||||
* of a gap count inconsistency, use a long bus reset.
|
||||
*
|
||||
* As noted in 1394a 8.4.6.2, nodes on a mixed 1394/1394a bus
|
||||
* may set different gap counts after a bus reset. On a mixed
|
||||
* 1394/1394a bus, a short bus reset can get doubled. Some
|
||||
* nodes may treat the double reset as one bus reset and others
|
||||
* may treat it as two, causing a gap count inconsistency
|
||||
* again. Using a long bus reset prevents this.
|
||||
*/
|
||||
reset_bus(card, card->gap_count != 0);
|
||||
/* Will allocate broadcast channel after the reset. */
|
||||
goto out;
|
||||
}
|
||||
|
||||
@ -308,7 +308,7 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr,
|
||||
DEBUG("IMM 0x%02X\n", val);
|
||||
return val;
|
||||
}
|
||||
return 0;
|
||||
break;
|
||||
case ATOM_ARG_PLL:
|
||||
idx = U8(*ptr);
|
||||
(*ptr)++;
|
||||
|
||||
@ -1470,6 +1470,9 @@ dcn10_set_output_transfer_func(struct pipe_ctx *pipe_ctx,
|
||||
{
|
||||
struct dpp *dpp = pipe_ctx->plane_res.dpp;
|
||||
|
||||
if (!stream)
|
||||
return false;
|
||||
|
||||
if (dpp == NULL)
|
||||
return false;
|
||||
|
||||
@ -1492,8 +1495,8 @@ dcn10_set_output_transfer_func(struct pipe_ctx *pipe_ctx,
|
||||
} else
|
||||
dpp->funcs->dpp_program_regamma_pwl(dpp, NULL, OPP_REGAMMA_BYPASS);
|
||||
|
||||
if (stream != NULL && stream->ctx != NULL &&
|
||||
stream->out_transfer_func != NULL) {
|
||||
if (stream->ctx &&
|
||||
stream->out_transfer_func) {
|
||||
log_tf(stream->ctx,
|
||||
stream->out_transfer_func,
|
||||
dpp->regamma_params.hw_points_num);
|
||||
|
||||
@ -73,11 +73,13 @@ static void mtk_drm_crtc_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)
|
||||
struct drm_crtc *crtc = &mtk_crtc->base;
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&crtc->dev->event_lock, flags);
|
||||
drm_crtc_send_vblank_event(crtc, mtk_crtc->event);
|
||||
drm_crtc_vblank_put(crtc);
|
||||
mtk_crtc->event = NULL;
|
||||
spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
|
||||
if (mtk_crtc->event) {
|
||||
spin_lock_irqsave(&crtc->dev->event_lock, flags);
|
||||
drm_crtc_send_vblank_event(crtc, mtk_crtc->event);
|
||||
drm_crtc_vblank_put(crtc);
|
||||
mtk_crtc->event = NULL;
|
||||
spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
|
||||
}
|
||||
}
|
||||
|
||||
static void mtk_drm_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)
|
||||
|
||||
@ -64,8 +64,8 @@
|
||||
#define DSI_PS_WC 0x3fff
|
||||
#define DSI_PS_SEL (3 << 16)
|
||||
#define PACKED_PS_16BIT_RGB565 (0 << 16)
|
||||
#define LOOSELY_PS_18BIT_RGB666 (1 << 16)
|
||||
#define PACKED_PS_18BIT_RGB666 (2 << 16)
|
||||
#define PACKED_PS_18BIT_RGB666 (1 << 16)
|
||||
#define LOOSELY_PS_24BIT_RGB666 (2 << 16)
|
||||
#define PACKED_PS_24BIT_RGB888 (3 << 16)
|
||||
|
||||
#define DSI_VSA_NL 0x20
|
||||
@ -321,10 +321,10 @@ static void mtk_dsi_ps_control_vact(struct mtk_dsi *dsi)
|
||||
ps_bpp_mode |= PACKED_PS_24BIT_RGB888;
|
||||
break;
|
||||
case MIPI_DSI_FMT_RGB666:
|
||||
ps_bpp_mode |= PACKED_PS_18BIT_RGB666;
|
||||
ps_bpp_mode |= LOOSELY_PS_24BIT_RGB666;
|
||||
break;
|
||||
case MIPI_DSI_FMT_RGB666_PACKED:
|
||||
ps_bpp_mode |= LOOSELY_PS_18BIT_RGB666;
|
||||
ps_bpp_mode |= PACKED_PS_18BIT_RGB666;
|
||||
break;
|
||||
case MIPI_DSI_FMT_RGB565:
|
||||
ps_bpp_mode |= PACKED_PS_16BIT_RGB565;
|
||||
@ -375,7 +375,7 @@ static void mtk_dsi_ps_control(struct mtk_dsi *dsi)
|
||||
dsi_tmp_buf_bpp = 3;
|
||||
break;
|
||||
case MIPI_DSI_FMT_RGB666:
|
||||
tmp_reg = LOOSELY_PS_18BIT_RGB666;
|
||||
tmp_reg = LOOSELY_PS_24BIT_RGB666;
|
||||
dsi_tmp_buf_bpp = 3;
|
||||
break;
|
||||
case MIPI_DSI_FMT_RGB666_PACKED:
|
||||
|
||||
@ -258,12 +258,14 @@ static void dpu_encoder_phys_vid_setup_timing_engine(
|
||||
mode.htotal >>= 1;
|
||||
mode.hsync_start >>= 1;
|
||||
mode.hsync_end >>= 1;
|
||||
mode.hskew >>= 1;
|
||||
|
||||
DPU_DEBUG_VIDENC(phys_enc,
|
||||
"split_role %d, halve horizontal %d %d %d %d\n",
|
||||
"split_role %d, halve horizontal %d %d %d %d %d\n",
|
||||
phys_enc->split_role,
|
||||
mode.hdisplay, mode.htotal,
|
||||
mode.hsync_start, mode.hsync_end);
|
||||
mode.hsync_start, mode.hsync_end,
|
||||
mode.hskew);
|
||||
}
|
||||
|
||||
drm_mode_to_intf_timing_params(phys_enc, &mode, &timing_params);
|
||||
|
||||
@ -826,7 +826,7 @@ int ni_init_microcode(struct radeon_device *rdev)
|
||||
err = 0;
|
||||
} else if (rdev->smc_fw->size != smc_req_size) {
|
||||
pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n",
|
||||
rdev->mc_fw->size, fw_name);
|
||||
rdev->smc_fw->size, fw_name);
|
||||
err = -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
@ -401,7 +401,7 @@ static int inno_hdmi_config_video_timing(struct inno_hdmi *hdmi,
|
||||
hdmi_writeb(hdmi, HDMI_VIDEO_EXT_HBLANK_L, value & 0xFF);
|
||||
hdmi_writeb(hdmi, HDMI_VIDEO_EXT_HBLANK_H, (value >> 8) & 0xFF);
|
||||
|
||||
value = mode->hsync_start - mode->hdisplay;
|
||||
value = mode->htotal - mode->hsync_start;
|
||||
hdmi_writeb(hdmi, HDMI_VIDEO_EXT_HDELAY_L, value & 0xFF);
|
||||
hdmi_writeb(hdmi, HDMI_VIDEO_EXT_HDELAY_H, (value >> 8) & 0xFF);
|
||||
|
||||
@ -416,7 +416,7 @@ static int inno_hdmi_config_video_timing(struct inno_hdmi *hdmi,
|
||||
value = mode->vtotal - mode->vdisplay;
|
||||
hdmi_writeb(hdmi, HDMI_VIDEO_EXT_VBLANK, value & 0xFF);
|
||||
|
||||
value = mode->vsync_start - mode->vdisplay;
|
||||
value = mode->vtotal - mode->vsync_start;
|
||||
hdmi_writeb(hdmi, HDMI_VIDEO_EXT_VDELAY, value & 0xFF);
|
||||
|
||||
value = mode->vsync_end - mode->vsync_start;
|
||||
|
||||
@ -366,7 +366,6 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
|
||||
goto err_put_port;
|
||||
} else if (ret) {
|
||||
DRM_DEV_ERROR(dev, "failed to find panel and bridge node\n");
|
||||
ret = -EPROBE_DEFER;
|
||||
goto err_put_port;
|
||||
}
|
||||
if (lvds->panel)
|
||||
|
||||
@ -1451,9 +1451,11 @@ static int tegra_dsi_ganged_probe(struct tegra_dsi *dsi)
|
||||
np = of_parse_phandle(dsi->dev->of_node, "nvidia,ganged-mode", 0);
|
||||
if (np) {
|
||||
struct platform_device *gangster = of_find_device_by_node(np);
|
||||
of_node_put(np);
|
||||
if (!gangster)
|
||||
return -EPROBE_DEFER;
|
||||
|
||||
dsi->slave = platform_get_drvdata(gangster);
|
||||
of_node_put(np);
|
||||
|
||||
if (!dsi->slave) {
|
||||
put_device(&gangster->dev);
|
||||
@ -1501,48 +1503,58 @@ static int tegra_dsi_probe(struct platform_device *pdev)
|
||||
|
||||
if (!pdev->dev.pm_domain) {
|
||||
dsi->rst = devm_reset_control_get(&pdev->dev, "dsi");
|
||||
if (IS_ERR(dsi->rst))
|
||||
return PTR_ERR(dsi->rst);
|
||||
if (IS_ERR(dsi->rst)) {
|
||||
err = PTR_ERR(dsi->rst);
|
||||
goto remove;
|
||||
}
|
||||
}
|
||||
|
||||
dsi->clk = devm_clk_get(&pdev->dev, NULL);
|
||||
if (IS_ERR(dsi->clk)) {
|
||||
dev_err(&pdev->dev, "cannot get DSI clock\n");
|
||||
return PTR_ERR(dsi->clk);
|
||||
err = dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk),
|
||||
"cannot get DSI clock\n");
|
||||
goto remove;
|
||||
}
|
||||
|
||||
dsi->clk_lp = devm_clk_get(&pdev->dev, "lp");
|
||||
if (IS_ERR(dsi->clk_lp)) {
|
||||
dev_err(&pdev->dev, "cannot get low-power clock\n");
|
||||
return PTR_ERR(dsi->clk_lp);
|
||||
err = dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk_lp),
|
||||
"cannot get low-power clock\n");
|
||||
goto remove;
|
||||
}
|
||||
|
||||
dsi->clk_parent = devm_clk_get(&pdev->dev, "parent");
|
||||
if (IS_ERR(dsi->clk_parent)) {
|
||||
dev_err(&pdev->dev, "cannot get parent clock\n");
|
||||
return PTR_ERR(dsi->clk_parent);
|
||||
err = dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk_parent),
|
||||
"cannot get parent clock\n");
|
||||
goto remove;
|
||||
}
|
||||
|
||||
dsi->vdd = devm_regulator_get(&pdev->dev, "avdd-dsi-csi");
|
||||
if (IS_ERR(dsi->vdd)) {
|
||||
dev_err(&pdev->dev, "cannot get VDD supply\n");
|
||||
return PTR_ERR(dsi->vdd);
|
||||
err = dev_err_probe(&pdev->dev, PTR_ERR(dsi->vdd),
|
||||
"cannot get VDD supply\n");
|
||||
goto remove;
|
||||
}
|
||||
|
||||
err = tegra_dsi_setup_clocks(dsi);
|
||||
if (err < 0) {
|
||||
dev_err(&pdev->dev, "cannot setup clocks\n");
|
||||
return err;
|
||||
goto remove;
|
||||
}
|
||||
|
||||
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
dsi->regs = devm_ioremap_resource(&pdev->dev, regs);
|
||||
if (IS_ERR(dsi->regs))
|
||||
return PTR_ERR(dsi->regs);
|
||||
if (IS_ERR(dsi->regs)) {
|
||||
err = PTR_ERR(dsi->regs);
|
||||
goto remove;
|
||||
}
|
||||
|
||||
dsi->mipi = tegra_mipi_request(&pdev->dev);
|
||||
if (IS_ERR(dsi->mipi))
|
||||
return PTR_ERR(dsi->mipi);
|
||||
dsi->mipi = tegra_mipi_request(&pdev->dev, pdev->dev.of_node);
|
||||
if (IS_ERR(dsi->mipi)) {
|
||||
err = PTR_ERR(dsi->mipi);
|
||||
goto remove;
|
||||
}
|
||||
|
||||
dsi->host.ops = &tegra_dsi_host_ops;
|
||||
dsi->host.dev = &pdev->dev;
|
||||
@ -1570,9 +1582,12 @@ static int tegra_dsi_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
|
||||
unregister:
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
mipi_dsi_host_unregister(&dsi->host);
|
||||
mipi_free:
|
||||
tegra_mipi_free(dsi->mipi);
|
||||
remove:
|
||||
tegra_output_remove(&dsi->output);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
@ -155,6 +155,7 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm,
|
||||
|
||||
if (gem->size < size) {
|
||||
err = -EINVAL;
|
||||
drm_gem_object_put(gem);
|
||||
goto unreference;
|
||||
}
|
||||
|
||||
|
||||
@ -127,8 +127,10 @@ int tegra_output_probe(struct tegra_output *output)
|
||||
GPIOD_IN,
|
||||
"HDMI hotplug detect");
|
||||
if (IS_ERR(output->hpd_gpio)) {
|
||||
if (PTR_ERR(output->hpd_gpio) != -ENOENT)
|
||||
return PTR_ERR(output->hpd_gpio);
|
||||
if (PTR_ERR(output->hpd_gpio) != -ENOENT) {
|
||||
err = PTR_ERR(output->hpd_gpio);
|
||||
goto put_i2c;
|
||||
}
|
||||
|
||||
output->hpd_gpio = NULL;
|
||||
}
|
||||
@ -137,7 +139,7 @@ int tegra_output_probe(struct tegra_output *output)
|
||||
err = gpiod_to_irq(output->hpd_gpio);
|
||||
if (err < 0) {
|
||||
dev_err(output->dev, "gpiod_to_irq(): %d\n", err);
|
||||
return err;
|
||||
goto put_i2c;
|
||||
}
|
||||
|
||||
output->hpd_irq = err;
|
||||
@ -150,7 +152,7 @@ int tegra_output_probe(struct tegra_output *output)
|
||||
if (err < 0) {
|
||||
dev_err(output->dev, "failed to request IRQ#%u: %d\n",
|
||||
output->hpd_irq, err);
|
||||
return err;
|
||||
goto put_i2c;
|
||||
}
|
||||
|
||||
output->connector.polled = DRM_CONNECTOR_POLL_HPD;
|
||||
@ -168,6 +170,12 @@ int tegra_output_probe(struct tegra_output *output)
|
||||
return -ENOMEM;
|
||||
|
||||
return 0;
|
||||
|
||||
put_i2c:
|
||||
if (output->ddc)
|
||||
i2c_put_adapter(output->ddc);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
void tegra_output_remove(struct tegra_output *output)
|
||||
|
||||
@ -206,9 +206,9 @@ static int tegra_mipi_power_down(struct tegra_mipi *mipi)
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct tegra_mipi_device *tegra_mipi_request(struct device *device)
|
||||
struct tegra_mipi_device *tegra_mipi_request(struct device *device,
|
||||
struct device_node *np)
|
||||
{
|
||||
struct device_node *np = device->of_node;
|
||||
struct tegra_mipi_device *dev;
|
||||
struct of_phandle_args args;
|
||||
int err;
|
||||
|
||||
@ -2090,6 +2090,10 @@ static const struct hid_device_id mt_devices[] = {
|
||||
HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
|
||||
USB_VENDOR_ID_SYNAPTICS, 0xcd7e) },
|
||||
|
||||
{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,
|
||||
HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
|
||||
USB_VENDOR_ID_SYNAPTICS, 0xcddc) },
|
||||
|
||||
{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,
|
||||
HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
|
||||
USB_VENDOR_ID_SYNAPTICS, 0xce08) },
|
||||
|
||||
@ -1700,7 +1700,7 @@ static int assign_client_id(struct ib_client *client)
|
||||
{
|
||||
int ret;
|
||||
|
||||
down_write(&clients_rwsem);
|
||||
lockdep_assert_held(&clients_rwsem);
|
||||
/*
|
||||
* The add/remove callbacks must be called in FIFO/LIFO order. To
|
||||
* achieve this we assign client_ids so they are sorted in
|
||||
@ -1709,14 +1709,11 @@ static int assign_client_id(struct ib_client *client)
|
||||
client->client_id = highest_client_id;
|
||||
ret = xa_insert(&clients, client->client_id, client, GFP_KERNEL);
|
||||
if (ret)
|
||||
goto out;
|
||||
return ret;
|
||||
|
||||
highest_client_id++;
|
||||
xa_set_mark(&clients, client->client_id, CLIENT_REGISTERED);
|
||||
|
||||
out:
|
||||
up_write(&clients_rwsem);
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void remove_client_id(struct ib_client *client)
|
||||
@ -1746,25 +1743,35 @@ int ib_register_client(struct ib_client *client)
|
||||
{
|
||||
struct ib_device *device;
|
||||
unsigned long index;
|
||||
bool need_unreg = false;
|
||||
int ret;
|
||||
|
||||
refcount_set(&client->uses, 1);
|
||||
init_completion(&client->uses_zero);
|
||||
|
||||
/*
|
||||
* The devices_rwsem is held in write mode to ensure that a racing
|
||||
* ib_register_device() sees a consisent view of clients and devices.
|
||||
*/
|
||||
down_write(&devices_rwsem);
|
||||
down_write(&clients_rwsem);
|
||||
ret = assign_client_id(client);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto out;
|
||||
|
||||
down_read(&devices_rwsem);
|
||||
need_unreg = true;
|
||||
xa_for_each_marked (&devices, index, device, DEVICE_REGISTERED) {
|
||||
ret = add_client_context(device, client);
|
||||
if (ret) {
|
||||
up_read(&devices_rwsem);
|
||||
ib_unregister_client(client);
|
||||
return ret;
|
||||
}
|
||||
if (ret)
|
||||
goto out;
|
||||
}
|
||||
up_read(&devices_rwsem);
|
||||
return 0;
|
||||
ret = 0;
|
||||
out:
|
||||
up_write(&clients_rwsem);
|
||||
up_write(&devices_rwsem);
|
||||
if (need_unreg && ret)
|
||||
ib_unregister_client(client);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(ib_register_client);
|
||||
|
||||
|
||||
@ -2811,7 +2811,7 @@ DECLARE_UVERBS_NAMED_METHOD(
|
||||
MLX5_IB_METHOD_DEVX_OBJ_MODIFY,
|
||||
UVERBS_ATTR_IDR(MLX5_IB_ATTR_DEVX_OBJ_MODIFY_HANDLE,
|
||||
UVERBS_IDR_ANY_OBJECT,
|
||||
UVERBS_ACCESS_WRITE,
|
||||
UVERBS_ACCESS_READ,
|
||||
UA_MANDATORY),
|
||||
UVERBS_ATTR_PTR_IN(
|
||||
MLX5_IB_ATTR_DEVX_OBJ_MODIFY_CMD_IN,
|
||||
|
||||
@ -325,12 +325,10 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
|
||||
|
||||
error = devm_gpio_request_one(dev, button->gpio,
|
||||
flags, button->desc ? : DRV_NAME);
|
||||
if (error) {
|
||||
dev_err(dev,
|
||||
"unable to claim gpio %u, err=%d\n",
|
||||
button->gpio, error);
|
||||
return error;
|
||||
}
|
||||
if (error)
|
||||
return dev_err_probe(dev, error,
|
||||
"unable to claim gpio %u\n",
|
||||
button->gpio);
|
||||
|
||||
bdata->gpiod = gpio_to_desc(button->gpio);
|
||||
if (!bdata->gpiod) {
|
||||
|
||||
@ -1745,6 +1745,9 @@ static int __init iommu_init_pci(struct amd_iommu *iommu)
|
||||
/* Prevent binding other PCI device drivers to IOMMU devices */
|
||||
iommu->dev->match_driver = false;
|
||||
|
||||
/* ACPI _PRT won't have an IRQ for IOMMU */
|
||||
iommu->dev->irq_managed = 1;
|
||||
|
||||
pci_read_config_dword(iommu->dev, cap_ptr + MMIO_CAP_HDR_OFFSET,
|
||||
&iommu->cap);
|
||||
pci_read_config_dword(iommu->dev, cap_ptr + MMIO_RANGE_OFFSET,
|
||||
|
||||
@ -46,11 +46,11 @@
|
||||
struct convert_context {
|
||||
struct completion restart;
|
||||
struct bio *bio_in;
|
||||
struct bio *bio_out;
|
||||
struct bvec_iter iter_in;
|
||||
struct bio *bio_out;
|
||||
struct bvec_iter iter_out;
|
||||
u64 cc_sector;
|
||||
atomic_t cc_pending;
|
||||
u64 cc_sector;
|
||||
union {
|
||||
struct skcipher_request *req;
|
||||
struct aead_request *req_aead;
|
||||
|
||||
@ -3343,14 +3343,14 @@ static int raid_map(struct dm_target *ti, struct bio *bio)
|
||||
struct mddev *mddev = &rs->md;
|
||||
|
||||
/*
|
||||
* If we're reshaping to add disk(s)), ti->len and
|
||||
* If we're reshaping to add disk(s), ti->len and
|
||||
* mddev->array_sectors will differ during the process
|
||||
* (ti->len > mddev->array_sectors), so we have to requeue
|
||||
* bios with addresses > mddev->array_sectors here or
|
||||
* there will occur accesses past EOD of the component
|
||||
* data images thus erroring the raid set.
|
||||
*/
|
||||
if (unlikely(bio_end_sector(bio) > mddev->array_sectors))
|
||||
if (unlikely(bio_has_data(bio) && bio_end_sector(bio) > mddev->array_sectors))
|
||||
return DM_MAPIO_REQUEUE;
|
||||
|
||||
md_handle_request(mddev, bio);
|
||||
|
||||
@ -73,11 +73,11 @@ struct dm_verity_io {
|
||||
/* original value of bio->bi_end_io */
|
||||
bio_end_io_t *orig_bi_end_io;
|
||||
|
||||
struct bvec_iter iter;
|
||||
|
||||
sector_t block;
|
||||
unsigned n_blocks;
|
||||
|
||||
struct bvec_iter iter;
|
||||
|
||||
struct work_struct work;
|
||||
|
||||
/*
|
||||
|
||||
@ -2961,6 +2961,9 @@ static void __dm_internal_suspend(struct mapped_device *md, unsigned suspend_fla
|
||||
|
||||
static void __dm_internal_resume(struct mapped_device *md)
|
||||
{
|
||||
int r;
|
||||
struct dm_table *map;
|
||||
|
||||
BUG_ON(!md->internal_suspend_count);
|
||||
|
||||
if (--md->internal_suspend_count)
|
||||
@ -2969,12 +2972,23 @@ static void __dm_internal_resume(struct mapped_device *md)
|
||||
if (dm_suspended_md(md))
|
||||
goto done; /* resume from nested suspend */
|
||||
|
||||
/*
|
||||
* NOTE: existing callers don't need to call dm_table_resume_targets
|
||||
* (which may fail -- so best to avoid it for now by passing NULL map)
|
||||
*/
|
||||
(void) __dm_resume(md, NULL);
|
||||
|
||||
map = rcu_dereference_protected(md->map, lockdep_is_held(&md->suspend_lock));
|
||||
r = __dm_resume(md, map);
|
||||
if (r) {
|
||||
/*
|
||||
* If a preresume method of some target failed, we are in a
|
||||
* tricky situation. We can't return an error to the caller. We
|
||||
* can't fake success because then the "resume" and
|
||||
* "postsuspend" methods would not be paired correctly, and it
|
||||
* would break various targets, for example it would cause list
|
||||
* corruption in the "origin" target.
|
||||
*
|
||||
* So, we fake normal suspend here, to make sure that the
|
||||
* "resume" and "postsuspend" methods will be paired correctly.
|
||||
*/
|
||||
DMERR("Preresume method failed: %d", r);
|
||||
set_bit(DMF_SUSPENDED, &md->flags);
|
||||
}
|
||||
done:
|
||||
clear_bit(DMF_SUSPENDED_INTERNALLY, &md->flags);
|
||||
smp_mb__after_atomic();
|
||||
|
||||
@ -113,6 +113,7 @@ int tpg_alloc(struct tpg_data *tpg, unsigned max_w)
|
||||
{
|
||||
unsigned pat;
|
||||
unsigned plane;
|
||||
int ret = 0;
|
||||
|
||||
tpg->max_line_width = max_w;
|
||||
for (pat = 0; pat < TPG_MAX_PAT_LINES; pat++) {
|
||||
@ -121,14 +122,18 @@ int tpg_alloc(struct tpg_data *tpg, unsigned max_w)
|
||||
|
||||
tpg->lines[pat][plane] =
|
||||
vzalloc(array3_size(max_w, 2, pixelsz));
|
||||
if (!tpg->lines[pat][plane])
|
||||
return -ENOMEM;
|
||||
if (!tpg->lines[pat][plane]) {
|
||||
ret = -ENOMEM;
|
||||
goto free_lines;
|
||||
}
|
||||
if (plane == 0)
|
||||
continue;
|
||||
tpg->downsampled_lines[pat][plane] =
|
||||
vzalloc(array3_size(max_w, 2, pixelsz));
|
||||
if (!tpg->downsampled_lines[pat][plane])
|
||||
return -ENOMEM;
|
||||
if (!tpg->downsampled_lines[pat][plane]) {
|
||||
ret = -ENOMEM;
|
||||
goto free_lines;
|
||||
}
|
||||
}
|
||||
}
|
||||
for (plane = 0; plane < TPG_MAX_PLANES; plane++) {
|
||||
@ -136,18 +141,45 @@ int tpg_alloc(struct tpg_data *tpg, unsigned max_w)
|
||||
|
||||
tpg->contrast_line[plane] =
|
||||
vzalloc(array_size(pixelsz, max_w));
|
||||
if (!tpg->contrast_line[plane])
|
||||
return -ENOMEM;
|
||||
if (!tpg->contrast_line[plane]) {
|
||||
ret = -ENOMEM;
|
||||
goto free_contrast_line;
|
||||
}
|
||||
tpg->black_line[plane] =
|
||||
vzalloc(array_size(pixelsz, max_w));
|
||||
if (!tpg->black_line[plane])
|
||||
return -ENOMEM;
|
||||
if (!tpg->black_line[plane]) {
|
||||
ret = -ENOMEM;
|
||||
goto free_contrast_line;
|
||||
}
|
||||
tpg->random_line[plane] =
|
||||
vzalloc(array3_size(max_w, 2, pixelsz));
|
||||
if (!tpg->random_line[plane])
|
||||
return -ENOMEM;
|
||||
if (!tpg->random_line[plane]) {
|
||||
ret = -ENOMEM;
|
||||
goto free_contrast_line;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
||||
free_contrast_line:
|
||||
for (plane = 0; plane < TPG_MAX_PLANES; plane++) {
|
||||
vfree(tpg->contrast_line[plane]);
|
||||
vfree(tpg->black_line[plane]);
|
||||
vfree(tpg->random_line[plane]);
|
||||
tpg->contrast_line[plane] = NULL;
|
||||
tpg->black_line[plane] = NULL;
|
||||
tpg->random_line[plane] = NULL;
|
||||
}
|
||||
free_lines:
|
||||
for (pat = 0; pat < TPG_MAX_PAT_LINES; pat++)
|
||||
for (plane = 0; plane < TPG_MAX_PLANES; plane++) {
|
||||
vfree(tpg->lines[pat][plane]);
|
||||
tpg->lines[pat][plane] = NULL;
|
||||
if (plane == 0)
|
||||
continue;
|
||||
vfree(tpg->downsampled_lines[pat][plane]);
|
||||
tpg->downsampled_lines[pat][plane] = NULL;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(tpg_alloc);
|
||||
|
||||
|
||||
@ -504,6 +504,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
|
||||
dvbdevfops = kmemdup(template->fops, sizeof(*dvbdevfops), GFP_KERNEL);
|
||||
if (!dvbdevfops) {
|
||||
kfree(dvbdev);
|
||||
*pdvbdev = NULL;
|
||||
mutex_unlock(&dvbdev_register_lock);
|
||||
return -ENOMEM;
|
||||
}
|
||||
@ -512,6 +513,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
|
||||
if (!new_node) {
|
||||
kfree(dvbdevfops);
|
||||
kfree(dvbdev);
|
||||
*pdvbdev = NULL;
|
||||
mutex_unlock(&dvbdev_register_lock);
|
||||
return -ENOMEM;
|
||||
}
|
||||
@ -545,6 +547,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
|
||||
}
|
||||
list_del (&dvbdev->list_head);
|
||||
kfree(dvbdev);
|
||||
*pdvbdev = NULL;
|
||||
up_write(&minor_rwsem);
|
||||
mutex_unlock(&dvbdev_register_lock);
|
||||
return -EINVAL;
|
||||
@ -567,6 +570,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
|
||||
dvb_media_device_free(dvbdev);
|
||||
list_del (&dvbdev->list_head);
|
||||
kfree(dvbdev);
|
||||
*pdvbdev = NULL;
|
||||
mutex_unlock(&dvbdev_register_lock);
|
||||
return ret;
|
||||
}
|
||||
@ -585,6 +589,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
|
||||
dvb_media_device_free(dvbdev);
|
||||
list_del (&dvbdev->list_head);
|
||||
kfree(dvbdev);
|
||||
*pdvbdev = NULL;
|
||||
mutex_unlock(&dvbdev_register_lock);
|
||||
return PTR_ERR(clsdev);
|
||||
}
|
||||
|
||||
@ -118,50 +118,32 @@ static const s32 stv0367cab_RF_LookUp2[RF_LOOKUP_TABLE2_SIZE][RF_LOOKUP_TABLE2_S
|
||||
}
|
||||
};
|
||||
|
||||
static
|
||||
int stv0367_writeregs(struct stv0367_state *state, u16 reg, u8 *data, int len)
|
||||
static noinline_for_stack
|
||||
int stv0367_writereg(struct stv0367_state *state, u16 reg, u8 data)
|
||||
{
|
||||
u8 buf[MAX_XFER_SIZE];
|
||||
u8 buf[3] = { MSB(reg), LSB(reg), data };
|
||||
struct i2c_msg msg = {
|
||||
.addr = state->config->demod_address,
|
||||
.flags = 0,
|
||||
.buf = buf,
|
||||
.len = len + 2
|
||||
.len = 3,
|
||||
};
|
||||
int ret;
|
||||
|
||||
if (2 + len > sizeof(buf)) {
|
||||
printk(KERN_WARNING
|
||||
"%s: i2c wr reg=%04x: len=%d is too big!\n",
|
||||
KBUILD_MODNAME, reg, len);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
||||
buf[0] = MSB(reg);
|
||||
buf[1] = LSB(reg);
|
||||
memcpy(buf + 2, data, len);
|
||||
|
||||
if (i2cdebug)
|
||||
printk(KERN_DEBUG "%s: [%02x] %02x: %02x\n", __func__,
|
||||
state->config->demod_address, reg, buf[2]);
|
||||
state->config->demod_address, reg, data);
|
||||
|
||||
ret = i2c_transfer(state->i2c, &msg, 1);
|
||||
if (ret != 1)
|
||||
printk(KERN_ERR "%s: i2c write error! ([%02x] %02x: %02x)\n",
|
||||
__func__, state->config->demod_address, reg, buf[2]);
|
||||
__func__, state->config->demod_address, reg, data);
|
||||
|
||||
return (ret != 1) ? -EREMOTEIO : 0;
|
||||
}
|
||||
|
||||
static int stv0367_writereg(struct stv0367_state *state, u16 reg, u8 data)
|
||||
{
|
||||
u8 tmp = data; /* see gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 */
|
||||
|
||||
return stv0367_writeregs(state, reg, &tmp, 1);
|
||||
}
|
||||
|
||||
static u8 stv0367_readreg(struct stv0367_state *state, u16 reg)
|
||||
static noinline_for_stack
|
||||
u8 stv0367_readreg(struct stv0367_state *state, u16 reg)
|
||||
{
|
||||
u8 b0[] = { 0, 0 };
|
||||
u8 b1[] = { 0 };
|
||||
|
||||
@ -2107,9 +2107,6 @@ static int tc358743_probe(struct i2c_client *client)
|
||||
state->mbus_fmt_code = MEDIA_BUS_FMT_RGB888_1X24;
|
||||
|
||||
sd->dev = &client->dev;
|
||||
err = v4l2_async_register_subdev(sd);
|
||||
if (err < 0)
|
||||
goto err_hdl;
|
||||
|
||||
mutex_init(&state->confctl_mutex);
|
||||
|
||||
@ -2167,6 +2164,10 @@ static int tc358743_probe(struct i2c_client *client)
|
||||
if (err)
|
||||
goto err_work_queues;
|
||||
|
||||
err = v4l2_async_register_subdev(sd);
|
||||
if (err < 0)
|
||||
goto err_work_queues;
|
||||
|
||||
v4l2_info(sd, "%s found @ 0x%x (%s)\n", client->name,
|
||||
client->addr << 1, client->adapter->name);
|
||||
|
||||
|
||||
@ -2964,7 +2964,7 @@ static int bttv_open(struct file *file)
|
||||
|
||||
dprintk("open dev=%s\n", video_device_node_name(vdev));
|
||||
|
||||
if (vdev->vfl_type == VFL_TYPE_GRABBER) {
|
||||
if (vdev->vfl_type == VFL_TYPE_VIDEO) {
|
||||
type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
||||
} else if (vdev->vfl_type == VFL_TYPE_VBI) {
|
||||
type = V4L2_BUF_TYPE_VBI_CAPTURE;
|
||||
@ -3905,7 +3905,7 @@ static int bttv_register_video(struct bttv *btv)
|
||||
if (no_overlay <= 0)
|
||||
btv->video_dev.device_caps |= V4L2_CAP_VIDEO_OVERLAY;
|
||||
|
||||
if (video_register_device(&btv->video_dev, VFL_TYPE_GRABBER,
|
||||
if (video_register_device(&btv->video_dev, VFL_TYPE_VIDEO,
|
||||
video_nr[btv->c.nr]) < 0)
|
||||
goto err;
|
||||
pr_info("%d: registered device %s\n",
|
||||
|
||||
@ -1272,7 +1272,7 @@ static int cobalt_node_register(struct cobalt *cobalt, int node)
|
||||
video_set_drvdata(vdev, s);
|
||||
ret = vb2_queue_init(q);
|
||||
if (!s->is_audio && ret == 0)
|
||||
ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
|
||||
ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
|
||||
else if (!s->is_dummy)
|
||||
ret = cobalt_alsa_init(s);
|
||||
|
||||
|
||||
@ -48,19 +48,19 @@ static struct {
|
||||
} cx18_stream_info[] = {
|
||||
{ /* CX18_ENC_STREAM_TYPE_MPG */
|
||||
"encoder MPEG",
|
||||
VFL_TYPE_GRABBER, 0,
|
||||
VFL_TYPE_VIDEO, 0,
|
||||
PCI_DMA_FROMDEVICE,
|
||||
V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
|
||||
V4L2_CAP_AUDIO | V4L2_CAP_TUNER
|
||||
},
|
||||
{ /* CX18_ENC_STREAM_TYPE_TS */
|
||||
"TS",
|
||||
VFL_TYPE_GRABBER, -1,
|
||||
VFL_TYPE_VIDEO, -1,
|
||||
PCI_DMA_FROMDEVICE,
|
||||
},
|
||||
{ /* CX18_ENC_STREAM_TYPE_YUV */
|
||||
"encoder YUV",
|
||||
VFL_TYPE_GRABBER, CX18_V4L2_ENC_YUV_OFFSET,
|
||||
VFL_TYPE_VIDEO, CX18_V4L2_ENC_YUV_OFFSET,
|
||||
PCI_DMA_FROMDEVICE,
|
||||
V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
|
||||
V4L2_CAP_STREAMING | V4L2_CAP_AUDIO | V4L2_CAP_TUNER
|
||||
@ -74,13 +74,13 @@ static struct {
|
||||
},
|
||||
{ /* CX18_ENC_STREAM_TYPE_PCM */
|
||||
"encoder PCM audio",
|
||||
VFL_TYPE_GRABBER, CX18_V4L2_ENC_PCM_OFFSET,
|
||||
VFL_TYPE_VIDEO, CX18_V4L2_ENC_PCM_OFFSET,
|
||||
PCI_DMA_FROMDEVICE,
|
||||
V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
|
||||
},
|
||||
{ /* CX18_ENC_STREAM_TYPE_IDX */
|
||||
"encoder IDX",
|
||||
VFL_TYPE_GRABBER, -1,
|
||||
VFL_TYPE_VIDEO, -1,
|
||||
PCI_DMA_FROMDEVICE,
|
||||
},
|
||||
{ /* CX18_ENC_STREAM_TYPE_RAD */
|
||||
@ -434,7 +434,7 @@ static int cx18_reg_dev(struct cx18 *cx, int type)
|
||||
name = video_device_node_name(&s->video_dev);
|
||||
|
||||
switch (vfl_type) {
|
||||
case VFL_TYPE_GRABBER:
|
||||
case VFL_TYPE_VIDEO:
|
||||
CX18_INFO("Registered device %s for %s (%d x %d.%02d kB)\n",
|
||||
name, s->name, cx->stream_buffers[type],
|
||||
cx->stream_buf_size[type] / 1024,
|
||||
|
||||
@ -1545,7 +1545,7 @@ int cx23885_417_register(struct cx23885_dev *dev)
|
||||
if (dev->tuner_type != TUNER_ABSENT)
|
||||
dev->v4l_device->device_caps |= V4L2_CAP_TUNER;
|
||||
err = video_register_device(dev->v4l_device,
|
||||
VFL_TYPE_GRABBER, -1);
|
||||
VFL_TYPE_VIDEO, -1);
|
||||
if (err < 0) {
|
||||
pr_info("%s: can't register mpeg device\n", dev->name);
|
||||
return err;
|
||||
|
||||
@ -1304,7 +1304,7 @@ int cx23885_video_register(struct cx23885_dev *dev)
|
||||
V4L2_CAP_AUDIO | V4L2_CAP_VIDEO_CAPTURE;
|
||||
if (dev->tuner_type != TUNER_ABSENT)
|
||||
dev->video_dev->device_caps |= V4L2_CAP_TUNER;
|
||||
err = video_register_device(dev->video_dev, VFL_TYPE_GRABBER,
|
||||
err = video_register_device(dev->video_dev, VFL_TYPE_VIDEO,
|
||||
video_nr[dev->nr]);
|
||||
if (err < 0) {
|
||||
pr_info("%s: can't register video device\n",
|
||||
|
||||
@ -757,7 +757,7 @@ int cx25821_video_register(struct cx25821_dev *dev)
|
||||
snprintf(vdev->name, sizeof(vdev->name), "%s #%d", dev->name, i);
|
||||
video_set_drvdata(vdev, chan);
|
||||
|
||||
err = video_register_device(vdev, VFL_TYPE_GRABBER,
|
||||
err = video_register_device(vdev, VFL_TYPE_VIDEO,
|
||||
video_nr[dev->nr]);
|
||||
|
||||
if (err < 0)
|
||||
|
||||
@ -1138,7 +1138,7 @@ static int blackbird_register_video(struct cx8802_dev *dev)
|
||||
V4L2_CAP_VIDEO_CAPTURE;
|
||||
if (dev->core->board.tuner_type != UNSET)
|
||||
dev->mpeg_dev.device_caps |= V4L2_CAP_TUNER;
|
||||
err = video_register_device(&dev->mpeg_dev, VFL_TYPE_GRABBER, -1);
|
||||
err = video_register_device(&dev->mpeg_dev, VFL_TYPE_VIDEO, -1);
|
||||
if (err < 0) {
|
||||
pr_info("can't register mpeg device\n");
|
||||
return err;
|
||||
|
||||
@ -1452,7 +1452,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
|
||||
V4L2_CAP_VIDEO_CAPTURE;
|
||||
if (core->board.tuner_type != UNSET)
|
||||
dev->video_dev.device_caps |= V4L2_CAP_TUNER;
|
||||
err = video_register_device(&dev->video_dev, VFL_TYPE_GRABBER,
|
||||
err = video_register_device(&dev->video_dev, VFL_TYPE_VIDEO,
|
||||
video_nr[core->nr]);
|
||||
if (err < 0) {
|
||||
pr_err("can't register video device\n");
|
||||
|
||||
@ -550,7 +550,7 @@ static int dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
IRQF_SHARED, DT3155_NAME, pd);
|
||||
if (err)
|
||||
goto err_iounmap;
|
||||
err = video_register_device(&pd->vdev, VFL_TYPE_GRABBER, -1);
|
||||
err = video_register_device(&pd->vdev, VFL_TYPE_VIDEO, -1);
|
||||
if (err)
|
||||
goto err_free_irq;
|
||||
dev_info(&pdev->dev, "/dev/video%i is ready\n", pd->vdev.minor);
|
||||
|
||||
@ -1651,7 +1651,7 @@ static int cio2_queue_init(struct cio2_device *cio2, struct cio2_queue *q)
|
||||
vdev->queue = &q->vbq;
|
||||
vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE_MPLANE | V4L2_CAP_STREAMING;
|
||||
video_set_drvdata(vdev, cio2);
|
||||
r = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
|
||||
r = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
|
||||
if (r) {
|
||||
dev_err(&cio2->pci_dev->dev,
|
||||
"failed to register video device (%d)\n", r);
|
||||
|
||||
@ -99,7 +99,7 @@ static struct {
|
||||
} ivtv_stream_info[] = {
|
||||
{ /* IVTV_ENC_STREAM_TYPE_MPG */
|
||||
"encoder MPG",
|
||||
VFL_TYPE_GRABBER, 0,
|
||||
VFL_TYPE_VIDEO, 0,
|
||||
PCI_DMA_FROMDEVICE, 0,
|
||||
V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER |
|
||||
V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
|
||||
@ -107,7 +107,7 @@ static struct {
|
||||
},
|
||||
{ /* IVTV_ENC_STREAM_TYPE_YUV */
|
||||
"encoder YUV",
|
||||
VFL_TYPE_GRABBER, IVTV_V4L2_ENC_YUV_OFFSET,
|
||||
VFL_TYPE_VIDEO, IVTV_V4L2_ENC_YUV_OFFSET,
|
||||
PCI_DMA_FROMDEVICE, 0,
|
||||
V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER |
|
||||
V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
|
||||
@ -123,7 +123,7 @@ static struct {
|
||||
},
|
||||
{ /* IVTV_ENC_STREAM_TYPE_PCM */
|
||||
"encoder PCM",
|
||||
VFL_TYPE_GRABBER, IVTV_V4L2_ENC_PCM_OFFSET,
|
||||
VFL_TYPE_VIDEO, IVTV_V4L2_ENC_PCM_OFFSET,
|
||||
PCI_DMA_FROMDEVICE, 0,
|
||||
V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
|
||||
&ivtv_v4l2_enc_fops
|
||||
@ -137,7 +137,7 @@ static struct {
|
||||
},
|
||||
{ /* IVTV_DEC_STREAM_TYPE_MPG */
|
||||
"decoder MPG",
|
||||
VFL_TYPE_GRABBER, IVTV_V4L2_DEC_MPG_OFFSET,
|
||||
VFL_TYPE_VIDEO, IVTV_V4L2_DEC_MPG_OFFSET,
|
||||
PCI_DMA_TODEVICE, 0,
|
||||
V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
|
||||
&ivtv_v4l2_dec_fops
|
||||
@ -158,7 +158,7 @@ static struct {
|
||||
},
|
||||
{ /* IVTV_DEC_STREAM_TYPE_YUV */
|
||||
"decoder YUV",
|
||||
VFL_TYPE_GRABBER, IVTV_V4L2_DEC_YUV_OFFSET,
|
||||
VFL_TYPE_VIDEO, IVTV_V4L2_DEC_YUV_OFFSET,
|
||||
PCI_DMA_TODEVICE, 0,
|
||||
V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
|
||||
&ivtv_v4l2_dec_fops
|
||||
@ -315,7 +315,7 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)
|
||||
name = video_device_node_name(&s->vdev);
|
||||
|
||||
switch (vfl_type) {
|
||||
case VFL_TYPE_GRABBER:
|
||||
case VFL_TYPE_VIDEO:
|
||||
IVTV_INFO("Registered device %s for %s (%d kB)\n",
|
||||
name, s->name, itv->options.kilobytes[type]);
|
||||
break;
|
||||
|
||||
@ -1711,7 +1711,7 @@ static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
|
||||
v4l2_ctrl_handler_setup(&meye.hdl);
|
||||
meye.vdev.ctrl_handler = &meye.hdl;
|
||||
|
||||
if (video_register_device(&meye.vdev, VFL_TYPE_GRABBER,
|
||||
if (video_register_device(&meye.vdev, VFL_TYPE_VIDEO,
|
||||
video_nr) < 0) {
|
||||
v4l2_err(v4l2_dev, "video_register_device failed\n");
|
||||
goto outvideoreg;
|
||||
|
||||
@ -1214,7 +1214,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
|
||||
if (saa7134_no_overlay <= 0)
|
||||
dev->video_dev->device_caps |= V4L2_CAP_VIDEO_OVERLAY;
|
||||
|
||||
err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,
|
||||
err = video_register_device(dev->video_dev,VFL_TYPE_VIDEO,
|
||||
video_nr[dev->nr]);
|
||||
if (err < 0) {
|
||||
pr_info("%s: can't register video device\n",
|
||||
|
||||
@ -294,7 +294,7 @@ static int empress_init(struct saa7134_dev *dev)
|
||||
dev->empress_dev->device_caps |= V4L2_CAP_TUNER;
|
||||
|
||||
video_set_drvdata(dev->empress_dev, dev);
|
||||
err = video_register_device(dev->empress_dev,VFL_TYPE_GRABBER,
|
||||
err = video_register_device(dev->empress_dev,VFL_TYPE_VIDEO,
|
||||
empress_nr[dev->nr]);
|
||||
if (err < 0) {
|
||||
pr_info("%s: can't register video device\n",
|
||||
|
||||
@ -294,7 +294,7 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
|
||||
vv_data.vid_ops.vidioc_enum_input = vidioc_enum_input;
|
||||
vv_data.vid_ops.vidioc_g_input = vidioc_g_input;
|
||||
vv_data.vid_ops.vidioc_s_input = vidioc_s_input;
|
||||
ret = saa7146_register_device(&hexium->video_dev, dev, "hexium gemini", VFL_TYPE_GRABBER);
|
||||
ret = saa7146_register_device(&hexium->video_dev, dev, "hexium gemini", VFL_TYPE_VIDEO);
|
||||
if (ret < 0) {
|
||||
pr_err("cannot register capture v4l2 device. skipping.\n");
|
||||
saa7146_vv_release(dev);
|
||||
|
||||
@ -368,7 +368,7 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
|
||||
vv_data.vid_ops.vidioc_enum_input = vidioc_enum_input;
|
||||
vv_data.vid_ops.vidioc_g_input = vidioc_g_input;
|
||||
vv_data.vid_ops.vidioc_s_input = vidioc_s_input;
|
||||
if (0 != saa7146_register_device(&hexium->video_dev, dev, "hexium orion", VFL_TYPE_GRABBER)) {
|
||||
if (0 != saa7146_register_device(&hexium->video_dev, dev, "hexium orion", VFL_TYPE_VIDEO)) {
|
||||
pr_err("cannot register capture v4l2 device. skipping.\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -714,7 +714,7 @@ static int mxb_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data
|
||||
vv_data.vid_ops.vidioc_g_register = vidioc_g_register;
|
||||
vv_data.vid_ops.vidioc_s_register = vidioc_s_register;
|
||||
#endif
|
||||
if (saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {
|
||||
if (saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_VIDEO)) {
|
||||
ERR("cannot register capture v4l2 device. skipping.\n");
|
||||
saa7146_vv_release(dev);
|
||||
return -1;
|
||||
|
||||
@ -1087,7 +1087,7 @@ int saa7164_encoder_register(struct saa7164_port *port)
|
||||
v4l2_ctrl_handler_setup(hdl);
|
||||
video_set_drvdata(port->v4l_device, port);
|
||||
result = video_register_device(port->v4l_device,
|
||||
VFL_TYPE_GRABBER, -1);
|
||||
VFL_TYPE_VIDEO, -1);
|
||||
if (result < 0) {
|
||||
printk(KERN_INFO "%s: can't register mpeg device\n",
|
||||
dev->name);
|
||||
|
||||
@ -1304,7 +1304,7 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,
|
||||
solo_enc->vfd->queue = &solo_enc->vidq;
|
||||
solo_enc->vfd->lock = &solo_enc->lock;
|
||||
video_set_drvdata(solo_enc->vfd, solo_enc);
|
||||
ret = video_register_device(solo_enc->vfd, VFL_TYPE_GRABBER, nr);
|
||||
ret = video_register_device(solo_enc->vfd, VFL_TYPE_VIDEO, nr);
|
||||
if (ret < 0)
|
||||
goto vdev_release;
|
||||
|
||||
|
||||
@ -692,7 +692,7 @@ int solo_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
|
||||
while (erase_off(solo_dev))
|
||||
/* Do nothing */;
|
||||
|
||||
ret = video_register_device(solo_dev->vfd, VFL_TYPE_GRABBER, nr);
|
||||
ret = video_register_device(solo_dev->vfd, VFL_TYPE_VIDEO, nr);
|
||||
if (ret < 0)
|
||||
goto fail;
|
||||
|
||||
|
||||
@ -1069,7 +1069,7 @@ static int sta2x11_vip_init_one(struct pci_dev *pdev,
|
||||
vip->video_dev.lock = &vip->v4l_lock;
|
||||
video_set_drvdata(&vip->video_dev, vip);
|
||||
|
||||
ret = video_register_device(&vip->video_dev, VFL_TYPE_GRABBER, -1);
|
||||
ret = video_register_device(&vip->video_dev, VFL_TYPE_VIDEO, -1);
|
||||
if (ret)
|
||||
goto vrelease;
|
||||
|
||||
|
||||
@ -831,7 +831,7 @@ int av7110_init_v4l(struct av7110 *av7110)
|
||||
if (FW_VERSION(av7110->arm_app) < 0x2623)
|
||||
vv_data->capabilities &= ~V4L2_CAP_SLICED_VBI_OUTPUT;
|
||||
|
||||
if (saa7146_register_device(&av7110->v4l_dev, dev, "av7110", VFL_TYPE_GRABBER)) {
|
||||
if (saa7146_register_device(&av7110->v4l_dev, dev, "av7110", VFL_TYPE_VIDEO)) {
|
||||
ERR("cannot register capture device. skipping\n");
|
||||
saa7146_vv_release(dev);
|
||||
return -ENODEV;
|
||||
|
||||
@ -1462,7 +1462,8 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
|
||||
budget_av->has_saa7113 = 1;
|
||||
err = saa7146_vv_init(dev, &vv_data);
|
||||
if (err != 0) {
|
||||
/* fixme: proper cleanup here */
|
||||
ttpci_budget_deinit(&budget_av->budget);
|
||||
kfree(budget_av);
|
||||
ERR("cannot init vv subsystem\n");
|
||||
return err;
|
||||
}
|
||||
@ -1470,10 +1471,11 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
|
||||
vv_data.vid_ops.vidioc_g_input = vidioc_g_input;
|
||||
vv_data.vid_ops.vidioc_s_input = vidioc_s_input;
|
||||
|
||||
if ((err = saa7146_register_device(&budget_av->vd, dev, "knc1", VFL_TYPE_GRABBER))) {
|
||||
/* fixme: proper cleanup here */
|
||||
ERR("cannot register capture v4l2 device\n");
|
||||
if ((err = saa7146_register_device(&budget_av->vd, dev, "knc1", VFL_TYPE_VIDEO))) {
|
||||
saa7146_vv_release(dev);
|
||||
ttpci_budget_deinit(&budget_av->budget);
|
||||
kfree(budget_av);
|
||||
ERR("cannot register capture v4l2 device\n");
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
@ -1162,7 +1162,7 @@ static int tw5864_video_input_init(struct tw5864_input *input, int video_nr)
|
||||
input->gop = GOP_SIZE;
|
||||
input->frame_interval = 1;
|
||||
|
||||
ret = video_register_device(&input->vdev, VFL_TYPE_GRABBER, video_nr);
|
||||
ret = video_register_device(&input->vdev, VFL_TYPE_VIDEO, video_nr);
|
||||
if (ret)
|
||||
goto free_v4l2_hdl;
|
||||
|
||||
|
||||
@ -962,7 +962,7 @@ int tw68_video_init2(struct tw68_dev *dev, int video_nr)
|
||||
dev->vdev.lock = &dev->lock;
|
||||
dev->vdev.queue = &dev->vidq;
|
||||
video_set_drvdata(&dev->vdev, dev);
|
||||
return video_register_device(&dev->vdev, VFL_TYPE_GRABBER, video_nr);
|
||||
return video_register_device(&dev->vdev, VFL_TYPE_VIDEO, video_nr);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -1282,7 +1282,7 @@ int tw686x_video_init(struct tw686x_dev *dev)
|
||||
vc->device = vdev;
|
||||
video_set_drvdata(vdev, vc);
|
||||
|
||||
err = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
|
||||
err = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
|
||||
if (err < 0)
|
||||
goto error;
|
||||
vc->num = vdev->num;
|
||||
|
||||
@ -3989,6 +3989,10 @@ static int em28xx_usb_probe(struct usb_interface *intf,
|
||||
* topology will likely change after the load of the em28xx subdrivers.
|
||||
*/
|
||||
#ifdef CONFIG_MEDIA_CONTROLLER
|
||||
/*
|
||||
* No need to check the return value, the device will still be
|
||||
* usable without media controller API.
|
||||
*/
|
||||
retval = media_device_register(dev->media_dev);
|
||||
#endif
|
||||
|
||||
|
||||
@ -80,7 +80,7 @@ static int go7007_load_encoder(struct go7007 *go)
|
||||
const struct firmware *fw_entry;
|
||||
char fw_name[] = "go7007/go7007fw.bin";
|
||||
void *bounce;
|
||||
int fw_len, rv = 0;
|
||||
int fw_len;
|
||||
u16 intr_val, intr_data;
|
||||
|
||||
if (go->boot_fw == NULL) {
|
||||
@ -109,9 +109,11 @@ static int go7007_load_encoder(struct go7007 *go)
|
||||
go7007_read_interrupt(go, &intr_val, &intr_data) < 0 ||
|
||||
(intr_val & ~0x1) != 0x5a5a) {
|
||||
v4l2_err(go, "error transferring firmware\n");
|
||||
rv = -1;
|
||||
kfree(go->boot_fw);
|
||||
go->boot_fw = NULL;
|
||||
return -1;
|
||||
}
|
||||
return rv;
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_FIRMWARE("go7007/go7007fw.bin");
|
||||
|
||||
@ -1198,7 +1198,9 @@ static int go7007_usb_probe(struct usb_interface *intf,
|
||||
u16 channel;
|
||||
|
||||
/* read channel number from GPIO[1:0] */
|
||||
go7007_read_addr(go, 0x3c81, &channel);
|
||||
if (go7007_read_addr(go, 0x3c81, &channel))
|
||||
goto allocfail;
|
||||
|
||||
channel &= 0x3;
|
||||
go->board_id = GO7007_BOARDID_ADLINK_MPG24;
|
||||
usb->board = board = &board_adlink_mpg24;
|
||||
|
||||
@ -90,8 +90,10 @@ static void pvr2_context_destroy(struct pvr2_context *mp)
|
||||
}
|
||||
|
||||
|
||||
static void pvr2_context_notify(struct pvr2_context *mp)
|
||||
static void pvr2_context_notify(void *ptr)
|
||||
{
|
||||
struct pvr2_context *mp = ptr;
|
||||
|
||||
pvr2_context_set_notify(mp,!0);
|
||||
}
|
||||
|
||||
@ -106,9 +108,7 @@ static void pvr2_context_check(struct pvr2_context *mp)
|
||||
pvr2_trace(PVR2_TRACE_CTXT,
|
||||
"pvr2_context %p (initialize)", mp);
|
||||
/* Finish hardware initialization */
|
||||
if (pvr2_hdw_initialize(mp->hdw,
|
||||
(void (*)(void *))pvr2_context_notify,
|
||||
mp)) {
|
||||
if (pvr2_hdw_initialize(mp->hdw, pvr2_context_notify, mp)) {
|
||||
mp->video_stream.stream =
|
||||
pvr2_hdw_get_video_stream(mp->hdw);
|
||||
/* Trigger interface initialization. By doing this
|
||||
@ -267,9 +267,9 @@ static void pvr2_context_exit(struct pvr2_context *mp)
|
||||
void pvr2_context_disconnect(struct pvr2_context *mp)
|
||||
{
|
||||
pvr2_hdw_disconnect(mp->hdw);
|
||||
mp->disconnect_flag = !0;
|
||||
if (!pvr2_context_shutok())
|
||||
pvr2_context_notify(mp);
|
||||
mp->disconnect_flag = !0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -88,8 +88,10 @@ static int pvr2_dvb_feed_thread(void *data)
|
||||
return stat;
|
||||
}
|
||||
|
||||
static void pvr2_dvb_notify(struct pvr2_dvb_adapter *adap)
|
||||
static void pvr2_dvb_notify(void *ptr)
|
||||
{
|
||||
struct pvr2_dvb_adapter *adap = ptr;
|
||||
|
||||
wake_up(&adap->buffer_wait_data);
|
||||
}
|
||||
|
||||
@ -149,7 +151,7 @@ static int pvr2_dvb_stream_do_start(struct pvr2_dvb_adapter *adap)
|
||||
}
|
||||
|
||||
pvr2_stream_set_callback(pvr->video_stream.stream,
|
||||
(pvr2_stream_callback) pvr2_dvb_notify, adap);
|
||||
pvr2_dvb_notify, adap);
|
||||
|
||||
ret = pvr2_stream_set_buffer_count(stream, PVR2_DVB_BUFFER_COUNT);
|
||||
if (ret < 0) return ret;
|
||||
|
||||
@ -1037,8 +1037,10 @@ static int pvr2_v4l2_open(struct file *file)
|
||||
}
|
||||
|
||||
|
||||
static void pvr2_v4l2_notify(struct pvr2_v4l2_fh *fhp)
|
||||
static void pvr2_v4l2_notify(void *ptr)
|
||||
{
|
||||
struct pvr2_v4l2_fh *fhp = ptr;
|
||||
|
||||
wake_up(&fhp->wait_data);
|
||||
}
|
||||
|
||||
@ -1071,7 +1073,7 @@ static int pvr2_v4l2_iosetup(struct pvr2_v4l2_fh *fh)
|
||||
|
||||
hdw = fh->channel.mc_head->hdw;
|
||||
sp = fh->pdi->stream->stream;
|
||||
pvr2_stream_set_callback(sp,(pvr2_stream_callback)pvr2_v4l2_notify,fh);
|
||||
pvr2_stream_set_callback(sp, pvr2_v4l2_notify, fh);
|
||||
pvr2_hdw_set_stream_type(hdw,fh->pdi->config);
|
||||
if ((ret = pvr2_hdw_set_streaming(hdw,!0)) < 0) return ret;
|
||||
return pvr2_ioread_set_enabled(fh->rhp,!0);
|
||||
@ -1202,11 +1204,6 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
|
||||
dip->minor_type = pvr2_v4l_type_video;
|
||||
nr_ptr = video_nr;
|
||||
caps |= V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_AUDIO;
|
||||
if (!dip->stream) {
|
||||
pr_err(KBUILD_MODNAME
|
||||
": Failed to set up pvrusb2 v4l video dev due to missing stream instance\n");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case VFL_TYPE_VBI:
|
||||
dip->config = pvr2_config_vbi;
|
||||
|
||||
@ -533,13 +533,23 @@ static int get_index(struct video_device *vdev)
|
||||
*/
|
||||
static void determine_valid_ioctls(struct video_device *vdev)
|
||||
{
|
||||
const u32 vid_caps = V4L2_CAP_VIDEO_CAPTURE |
|
||||
V4L2_CAP_VIDEO_CAPTURE_MPLANE |
|
||||
V4L2_CAP_VIDEO_OUTPUT |
|
||||
V4L2_CAP_VIDEO_OUTPUT_MPLANE |
|
||||
V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE;
|
||||
const u32 meta_caps = V4L2_CAP_META_CAPTURE |
|
||||
V4L2_CAP_META_OUTPUT;
|
||||
DECLARE_BITMAP(valid_ioctls, BASE_VIDIOC_PRIVATE);
|
||||
const struct v4l2_ioctl_ops *ops = vdev->ioctl_ops;
|
||||
bool is_vid = vdev->vfl_type == VFL_TYPE_GRABBER;
|
||||
bool is_vid = vdev->vfl_type == VFL_TYPE_VIDEO &&
|
||||
(vdev->device_caps & vid_caps);
|
||||
bool is_vbi = vdev->vfl_type == VFL_TYPE_VBI;
|
||||
bool is_radio = vdev->vfl_type == VFL_TYPE_RADIO;
|
||||
bool is_sdr = vdev->vfl_type == VFL_TYPE_SDR;
|
||||
bool is_tch = vdev->vfl_type == VFL_TYPE_TOUCH;
|
||||
bool is_meta = vdev->vfl_type == VFL_TYPE_VIDEO &&
|
||||
(vdev->device_caps & meta_caps);
|
||||
bool is_rx = vdev->vfl_dir != VFL_DIR_TX;
|
||||
bool is_tx = vdev->vfl_dir != VFL_DIR_RX;
|
||||
|
||||
@ -587,39 +597,31 @@ static void determine_valid_ioctls(struct video_device *vdev)
|
||||
set_bit(_IOC_NR(VIDIOC_ENUM_FREQ_BANDS), valid_ioctls);
|
||||
|
||||
if (is_vid || is_tch) {
|
||||
/* video and metadata specific ioctls */
|
||||
/* video and touch specific ioctls */
|
||||
if ((is_rx && (ops->vidioc_enum_fmt_vid_cap ||
|
||||
ops->vidioc_enum_fmt_vid_overlay ||
|
||||
ops->vidioc_enum_fmt_meta_cap)) ||
|
||||
(is_tx && (ops->vidioc_enum_fmt_vid_out ||
|
||||
ops->vidioc_enum_fmt_meta_out)))
|
||||
ops->vidioc_enum_fmt_vid_overlay)) ||
|
||||
(is_tx && ops->vidioc_enum_fmt_vid_out))
|
||||
set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);
|
||||
if ((is_rx && (ops->vidioc_g_fmt_vid_cap ||
|
||||
ops->vidioc_g_fmt_vid_cap_mplane ||
|
||||
ops->vidioc_g_fmt_vid_overlay ||
|
||||
ops->vidioc_g_fmt_meta_cap)) ||
|
||||
ops->vidioc_g_fmt_vid_overlay)) ||
|
||||
(is_tx && (ops->vidioc_g_fmt_vid_out ||
|
||||
ops->vidioc_g_fmt_vid_out_mplane ||
|
||||
ops->vidioc_g_fmt_vid_out_overlay ||
|
||||
ops->vidioc_g_fmt_meta_out)))
|
||||
ops->vidioc_g_fmt_vid_out_overlay)))
|
||||
set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);
|
||||
if ((is_rx && (ops->vidioc_s_fmt_vid_cap ||
|
||||
ops->vidioc_s_fmt_vid_cap_mplane ||
|
||||
ops->vidioc_s_fmt_vid_overlay ||
|
||||
ops->vidioc_s_fmt_meta_cap)) ||
|
||||
ops->vidioc_s_fmt_vid_overlay)) ||
|
||||
(is_tx && (ops->vidioc_s_fmt_vid_out ||
|
||||
ops->vidioc_s_fmt_vid_out_mplane ||
|
||||
ops->vidioc_s_fmt_vid_out_overlay ||
|
||||
ops->vidioc_s_fmt_meta_out)))
|
||||
ops->vidioc_s_fmt_vid_out_overlay)))
|
||||
set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);
|
||||
if ((is_rx && (ops->vidioc_try_fmt_vid_cap ||
|
||||
ops->vidioc_try_fmt_vid_cap_mplane ||
|
||||
ops->vidioc_try_fmt_vid_overlay ||
|
||||
ops->vidioc_try_fmt_meta_cap)) ||
|
||||
ops->vidioc_try_fmt_vid_overlay)) ||
|
||||
(is_tx && (ops->vidioc_try_fmt_vid_out ||
|
||||
ops->vidioc_try_fmt_vid_out_mplane ||
|
||||
ops->vidioc_try_fmt_vid_out_overlay ||
|
||||
ops->vidioc_try_fmt_meta_out)))
|
||||
ops->vidioc_try_fmt_vid_out_overlay)))
|
||||
set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_OVERLAY, vidioc_overlay);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_G_FBUF, vidioc_g_fbuf);
|
||||
@ -641,7 +643,21 @@ static void determine_valid_ioctls(struct video_device *vdev)
|
||||
set_bit(_IOC_NR(VIDIOC_S_CROP), valid_ioctls);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_G_SELECTION, vidioc_g_selection);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_S_SELECTION, vidioc_s_selection);
|
||||
} else if (is_vbi) {
|
||||
}
|
||||
if (is_meta && is_rx) {
|
||||
/* metadata capture specific ioctls */
|
||||
SET_VALID_IOCTL(ops, VIDIOC_ENUM_FMT, vidioc_enum_fmt_meta_cap);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_G_FMT, vidioc_g_fmt_meta_cap);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_S_FMT, vidioc_s_fmt_meta_cap);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_TRY_FMT, vidioc_try_fmt_meta_cap);
|
||||
} else if (is_meta && is_tx) {
|
||||
/* metadata output specific ioctls */
|
||||
SET_VALID_IOCTL(ops, VIDIOC_ENUM_FMT, vidioc_enum_fmt_meta_out);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_G_FMT, vidioc_g_fmt_meta_out);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_S_FMT, vidioc_s_fmt_meta_out);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_TRY_FMT, vidioc_try_fmt_meta_out);
|
||||
}
|
||||
if (is_vbi) {
|
||||
/* vbi specific ioctls */
|
||||
if ((is_rx && (ops->vidioc_g_fmt_vbi_cap ||
|
||||
ops->vidioc_g_fmt_sliced_vbi_cap)) ||
|
||||
@ -681,8 +697,8 @@ static void determine_valid_ioctls(struct video_device *vdev)
|
||||
set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
|
||||
}
|
||||
|
||||
if (is_vid || is_vbi || is_sdr || is_tch) {
|
||||
/* ioctls valid for video, metadata, vbi or sdr */
|
||||
if (is_vid || is_vbi || is_sdr || is_tch || is_meta) {
|
||||
/* ioctls valid for video, vbi, sdr, touch and metadata */
|
||||
SET_VALID_IOCTL(ops, VIDIOC_REQBUFS, vidioc_reqbufs);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_QUERYBUF, vidioc_querybuf);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_QBUF, vidioc_qbuf);
|
||||
@ -694,8 +710,8 @@ static void determine_valid_ioctls(struct video_device *vdev)
|
||||
SET_VALID_IOCTL(ops, VIDIOC_STREAMOFF, vidioc_streamoff);
|
||||
}
|
||||
|
||||
if (is_vid || is_vbi || is_tch) {
|
||||
/* ioctls valid for video or vbi */
|
||||
if (is_vid || is_vbi || is_tch || is_meta) {
|
||||
/* ioctls valid for video, vbi, touch and metadata */
|
||||
if (ops->vidioc_s_std)
|
||||
set_bit(_IOC_NR(VIDIOC_ENUMSTD), valid_ioctls);
|
||||
SET_VALID_IOCTL(ops, VIDIOC_S_STD, vidioc_s_std);
|
||||
@ -761,7 +777,7 @@ static int video_register_media_controller(struct video_device *vdev)
|
||||
vdev->entity.function = MEDIA_ENT_F_UNKNOWN;
|
||||
|
||||
switch (vdev->vfl_type) {
|
||||
case VFL_TYPE_GRABBER:
|
||||
case VFL_TYPE_VIDEO:
|
||||
intf_type = MEDIA_INTF_T_V4L_VIDEO;
|
||||
vdev->entity.function = MEDIA_ENT_F_IO_V4L;
|
||||
break;
|
||||
@ -869,7 +885,7 @@ int __video_register_device(struct video_device *vdev,
|
||||
|
||||
/* Part 1: check device type */
|
||||
switch (type) {
|
||||
case VFL_TYPE_GRABBER:
|
||||
case VFL_TYPE_VIDEO:
|
||||
name_base = "video";
|
||||
break;
|
||||
case VFL_TYPE_VBI:
|
||||
@ -913,7 +929,7 @@ int __video_register_device(struct video_device *vdev,
|
||||
* of 128-191 and just pick the first free minor there
|
||||
* (new style). */
|
||||
switch (type) {
|
||||
case VFL_TYPE_GRABBER:
|
||||
case VFL_TYPE_VIDEO:
|
||||
minor_offset = 0;
|
||||
minor_cnt = 64;
|
||||
break;
|
||||
|
||||
@ -950,12 +950,22 @@ static bool check_ext_ctrls(struct v4l2_ext_controls *c, unsigned long ioctl)
|
||||
|
||||
static int check_fmt(struct file *file, enum v4l2_buf_type type)
|
||||
{
|
||||
const u32 vid_caps = V4L2_CAP_VIDEO_CAPTURE |
|
||||
V4L2_CAP_VIDEO_CAPTURE_MPLANE |
|
||||
V4L2_CAP_VIDEO_OUTPUT |
|
||||
V4L2_CAP_VIDEO_OUTPUT_MPLANE |
|
||||
V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE;
|
||||
const u32 meta_caps = V4L2_CAP_META_CAPTURE |
|
||||
V4L2_CAP_META_OUTPUT;
|
||||
struct video_device *vfd = video_devdata(file);
|
||||
const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
|
||||
bool is_vid = vfd->vfl_type == VFL_TYPE_GRABBER;
|
||||
bool is_vid = vfd->vfl_type == VFL_TYPE_VIDEO &&
|
||||
(vfd->device_caps & vid_caps);
|
||||
bool is_vbi = vfd->vfl_type == VFL_TYPE_VBI;
|
||||
bool is_sdr = vfd->vfl_type == VFL_TYPE_SDR;
|
||||
bool is_tch = vfd->vfl_type == VFL_TYPE_TOUCH;
|
||||
bool is_meta = vfd->vfl_type == VFL_TYPE_VIDEO &&
|
||||
(vfd->device_caps & meta_caps);
|
||||
bool is_rx = vfd->vfl_dir != VFL_DIR_TX;
|
||||
bool is_tx = vfd->vfl_dir != VFL_DIR_RX;
|
||||
|
||||
@ -1014,11 +1024,11 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
|
||||
return 0;
|
||||
break;
|
||||
case V4L2_BUF_TYPE_META_CAPTURE:
|
||||
if (is_vid && is_rx && ops->vidioc_g_fmt_meta_cap)
|
||||
if (is_meta && is_rx && ops->vidioc_g_fmt_meta_cap)
|
||||
return 0;
|
||||
break;
|
||||
case V4L2_BUF_TYPE_META_OUTPUT:
|
||||
if (is_vid && is_tx && ops->vidioc_g_fmt_meta_out)
|
||||
if (is_meta && is_tx && ops->vidioc_g_fmt_meta_out)
|
||||
return 0;
|
||||
break;
|
||||
default:
|
||||
|
||||
@ -799,11 +799,17 @@ static int v4l2_m2m_register_entity(struct media_device *mdev,
|
||||
entity->function = function;
|
||||
|
||||
ret = media_entity_pads_init(entity, num_pads, pads);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
kfree(entity->name);
|
||||
entity->name = NULL;
|
||||
return ret;
|
||||
}
|
||||
ret = media_device_register_entity(mdev, entity);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
kfree(entity->name);
|
||||
entity->name = NULL;
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -109,7 +109,9 @@ struct regmap *altr_sysmgr_regmap_lookup_by_phandle(struct device_node *np,
|
||||
|
||||
dev = driver_find_device_by_of_node(&altr_sysmgr_driver.driver,
|
||||
(void *)sysmgr_np);
|
||||
of_node_put(sysmgr_np);
|
||||
if (property)
|
||||
of_node_put(sysmgr_np);
|
||||
|
||||
if (!dev)
|
||||
return ERR_PTR(-EPROBE_DEFER);
|
||||
|
||||
|
||||
@ -219,7 +219,9 @@ struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np,
|
||||
return ERR_PTR(-ENODEV);
|
||||
|
||||
regmap = syscon_node_to_regmap(syscon_np);
|
||||
of_node_put(syscon_np);
|
||||
|
||||
if (property)
|
||||
of_node_put(syscon_np);
|
||||
|
||||
return regmap;
|
||||
}
|
||||
|
||||
@ -889,7 +889,6 @@ static int wmt_mci_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct mmc_host *mmc;
|
||||
struct wmt_mci_priv *priv;
|
||||
struct resource *res;
|
||||
u32 reg_tmp;
|
||||
|
||||
mmc = platform_get_drvdata(pdev);
|
||||
@ -917,9 +916,6 @@ static int wmt_mci_remove(struct platform_device *pdev)
|
||||
clk_disable_unprepare(priv->clk_sdmmc);
|
||||
clk_put(priv->clk_sdmmc);
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
release_mem_region(res->start, resource_size(res));
|
||||
|
||||
mmc_free_host(mmc);
|
||||
|
||||
dev_info(&pdev->dev, "WMT MCI device removed\n");
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user