diff --git a/arch/loongarch/boot/dts/loongson/ls2k300_pai_pihat.dts b/arch/loongarch/boot/dts/loongson/ls2k300_pai_pihat.dts index d9d6cb2cd..ed024515f 100644 --- a/arch/loongarch/boot/dts/loongson/ls2k300_pai_pihat.dts +++ b/arch/loongarch/boot/dts/loongson/ls2k300_pai_pihat.dts @@ -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"; diff --git a/drivers/staging/rtl8188fu/hal/rtl8188f/rtl8188f_hal_init.c b/drivers/staging/rtl8188fu/hal/rtl8188f/rtl8188f_hal_init.c index 4ebf83347..370ba4298 100644 --- a/drivers/staging/rtl8188fu/hal/rtl8188f/rtl8188f_hal_init.c +++ b/drivers/staging/rtl8188fu/hal/rtl8188f/rtl8188f_hal_init.c @@ -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; diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 15a2ee32f..336b7d1bc 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -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); } diff --git a/sound/soc/loongson/ls-i2s.c b/sound/soc/loongson/ls-i2s.c index 9b88b6c8b..35897055c 100644 --- a/sound/soc/loongson/ls-i2s.c +++ b/sound/soc/loongson/ls-i2s.c @@ -23,20 +23,14 @@ #include #include +#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; diff --git a/sound/soc/loongson/ls-i2s.h b/sound/soc/loongson/ls-i2s.h index da8cc7474..02b81420b 100644 --- a/sound/soc/loongson/ls-i2s.h +++ b/sound/soc/loongson/ls-i2s.h @@ -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 diff --git a/sound/soc/loongson/ls-pcm.c b/sound/soc/loongson/ls-pcm.c index 7d3652305..cf176c2e5 100644 --- a/sound/soc/loongson/ls-pcm.c +++ b/sound/soc/loongson/ls-pcm.c @@ -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,