mirror of
https://gitee.com/open-loongarch/linux-5.10.git
synced 2026-10-25 12:47:11 +08:00
update to 6fa43e4291
2K300:drivers/w1: w1.c: Disable one-wire print 2K300:drivers/staging: rtl8188fu: Remove "request firmware rtlwifi/rtl8188fufw.bin" debug info 2K300:sound/soc/loongson: Fix 24bit sound file cannot play Many 24bit sound files are S24_3LE formate, 2k300:DTS:update dtb to fix pi hat funcation
This commit is contained in:
@@ -6,18 +6,23 @@
|
||||
#include "ls2k300_pai_common.dtsi"
|
||||
|
||||
/ {
|
||||
humidity_sensor {
|
||||
compatible = "dht11-sensor";
|
||||
SHT11-gpios = <&gpio 61 GPIO_ACTIVE_HIGH>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
onewire {
|
||||
compatible = "w1-gpio";
|
||||
gpios = <&gpio 68 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
|
||||
&pinmux {
|
||||
gpio_63_60_pins: pinmux_G60_G63_as_gpio {
|
||||
pinctrl-single,bits = <0xc 0x00000000 0xff000000>;
|
||||
};
|
||||
};
|
||||
|
||||
&gpio {
|
||||
pinctrl-0 = <&gpio_63_60_pins>;
|
||||
pinctrl-names = "default";
|
||||
};
|
||||
|
||||
&uart2 {
|
||||
status = "ok"
|
||||
};
|
||||
@@ -39,7 +44,7 @@
|
||||
};
|
||||
|
||||
&spi1 {
|
||||
status = "okay";
|
||||
status = "disable"
|
||||
|
||||
spidev0@0 {
|
||||
compatible = "rohm,dh2228fv";
|
||||
|
||||
@@ -1120,14 +1120,17 @@ s32 rtl8188f_FirmwareDownload(PADAPTER padapter, BOOLEAN bUsedqFw)
|
||||
rtw_btcoex_PreLoadFirmware(padapter);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_DEBUG_RTL871X
|
||||
dev_info(&psdpriv->pusbdev->dev, "request firmware %s\n",fw_name);
|
||||
#endif
|
||||
if (request_firmware(&fw, fw_name, &psdpriv->pusbdev->dev)) {
|
||||
dev_err(&psdpriv->pusbdev->dev, "Firmware %s not available\n", fw_name);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_DEBUG_RTL871X
|
||||
dev_info(&psdpriv->pusbdev->dev, "request firmware %s loaded\n",fw_name);
|
||||
|
||||
#endif
|
||||
|
||||
if (fw->size > FW_8188F_SIZE) {
|
||||
rtStatus = _FAIL;
|
||||
|
||||
+2
-2
@@ -740,7 +740,7 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
|
||||
atomic_set(&sl->refcnt, 1);
|
||||
atomic_inc(&sl->master->refcnt);
|
||||
dev->slave_count++;
|
||||
dev_info(&dev->dev, "Attaching one wire slave %02x.%012llx crc %02x\n",
|
||||
dev_dbg(&dev->dev, "Attaching one wire slave %02x.%012llx crc %02x\n",
|
||||
rn->family, (unsigned long long)rn->id, rn->crc);
|
||||
|
||||
/* slave modules need to be loaded in a context with unlocked mutex */
|
||||
@@ -752,7 +752,7 @@ int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
|
||||
f = w1_family_registered(rn->family);
|
||||
if (!f) {
|
||||
f= &w1_default_family;
|
||||
dev_info(&dev->dev, "Family %x for %02x.%012llx.%02x is not registered.\n",
|
||||
dev_dbg(&dev->dev, "Family %x for %02x.%012llx.%02x is not registered.\n",
|
||||
rn->family, rn->family,
|
||||
(unsigned long long)rn->id, rn->crc);
|
||||
}
|
||||
|
||||
@@ -23,20 +23,14 @@
|
||||
#include <linux/pci.h>
|
||||
#include <linux/acpi.h>
|
||||
|
||||
#include "ls-i2s.h"
|
||||
|
||||
#define PCM_STEREO_OUT_NAME "I2S PCM Stereo out"
|
||||
#define PCM_STEREO_IN_NAME "I2S PCM Stereo in"
|
||||
|
||||
#define IISRXADDR 0x0c
|
||||
#define IISTXADDR 0x10
|
||||
|
||||
#define PSC_I2S_RATES SNDRV_PCM_RATE_8000_96000
|
||||
|
||||
#define PSC_I2S_FORMATS ( SNDRV_PCM_FMTBIT_S8 | \
|
||||
SNDRV_PCM_FMTBIT_S16_LE | \
|
||||
SNDRV_PCM_FMTBIT_S20_3LE | \
|
||||
SNDRV_PCM_FMTBIT_S24_LE | \
|
||||
SNDRV_PCM_FMTBIT_S32_LE)
|
||||
|
||||
static struct ls_pcm_dma_params ls_i2s_pcm_stereo_out;
|
||||
static struct ls_pcm_dma_params ls_i2s_pcm_stereo_in;
|
||||
static unsigned int revision_id;
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
#ifndef __LS_I2S_H__
|
||||
#define __LS_I2S_H__
|
||||
|
||||
#define PSC_I2S_RATES SNDRV_PCM_RATE_8000_96000
|
||||
|
||||
#define PSC_I2S_FORMATS ( SNDRV_PCM_FMTBIT_S8 | \
|
||||
SNDRV_PCM_FMTBIT_S16_LE | \
|
||||
SNDRV_PCM_FMTBIT_S20_3LE | \
|
||||
SNDRV_PCM_FMTBIT_S24_3LE | \
|
||||
SNDRV_PCM_FMTBIT_S32_LE)
|
||||
|
||||
bool ls_i2s_is_slave_mode(void);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -58,8 +58,8 @@ static const struct snd_pcm_hardware ls_pcm_hardware = {
|
||||
SNDRV_PCM_INFO_MMAP_VALID |
|
||||
SNDRV_PCM_INFO_RESUME |
|
||||
SNDRV_PCM_INFO_PAUSE,
|
||||
.formats = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE),
|
||||
.rates = SNDRV_PCM_RATE_8000_96000,
|
||||
.formats = PSC_I2S_FORMATS,
|
||||
.rates = PSC_I2S_RATES,
|
||||
.channels_min = 2,
|
||||
.channels_max = 2,
|
||||
.period_bytes_min = 128,
|
||||
|
||||
Reference in New Issue
Block a user