这个git diff中包含了lcd，audio mic和speaker。
diff --git a/build/boards/cv180x/cv1800b_milkv_duo_sd/dts_riscv/cv1800b_milkv_duo_sd.dts b/build/boards/cv180x/cv1800b_milkv_duo_sd/dts_riscv/cv1800b_milkv_duo_sd.dts
index 8f66e40d8..290169a33 100644
--- a/build/boards/cv180x/cv1800b_milkv_duo_sd/dts_riscv/cv1800b_milkv_duo_sd.dts
+++ b/build/boards/cv180x/cv1800b_milkv_duo_sd/dts_riscv/cv1800b_milkv_duo_sd.dts
@@ -8,7 +8,66 @@
snsr-reset = <&portc 8 GPIO_ACTIVE_LOW>, <&portc 8 GPIO_ACTIVE_LOW>, <&portc 8 GPIO_ACTIVE_LOW>;
};
+&spi2 {
+ status = "okay";
+
+ /delete-node/ spidev@0;
+
+
+ st7789v: st7789v@0{
+ compatible = "sitronix,st7789v";
+ reg = <0>;
+ status = "okay";
+ spi-max-frequency = <48000000>;
+ spi-cpol;
+ spi-cpha;
+ rotate = <90>;
+ fps = <30>;
+ rgb;
+ buswidth = <8>;
+
+ //dc-gpios = <&port 21 GPIO_ACTIVE_HIGH>; //DC
+ dc-gpios = <&porta 23 GPIO_ACTIVE_HIGH>; //DC
+ reset-gpios = <&porta 15 GPIO_ACTIVE_HIGH>; //RES
+ led-gpios = <&porta 14 GPIO_ACTIVE_HIGH>; //BL
+
+ debug = <0x0>;
+ };
+
+};
+
+&i2s2 {
+ status = "okay";
+ #sound-dai-cells = <0>;
+};
+
+&i2s0 {
+ status = "okay";
+ #sound-dai-cells = <0>;
+};
+
+
+
/ {
+
+
+ /* codec */
+ max98357a: max98357a {
+ #sound-dai-cells = <0>;
+ compatible = "maxim,max98357a";
+ status = "okay";
+ /*sdmode-gpios = <&gpio1 14 0>;*/
+ /* max98357a has gain & sd_mode gpio. but codec driver just has sdmode */
+ };
+
+ /* machine -- sound card*/
+ /* #ifdef CV1835_EXT_CARD_3_EN */
+ /* sound_ext3 use external codec */
+ sound {
+ compatible = "cvitek,cv1835-max98357a";
+ };
+
+
};
diff --git a/build/boards/cv180x/cv1800b_milkv_duo_sd/linux/cvitek_cv1800b_milkv_duo_sd_defconfig b/build/boards/cv180x/cv1800b_milkv_duo_sd/linux/cvitek_cv1800b_milkv_duo_sd_defconfig
index 6c05a05df..f72a6d6ab 100644
--- a/build/boards/cv180x/cv1800b_milkv_duo_sd/linux/cvitek_cv1800b_milkv_duo_sd_defconfig
+++ b/build/boards/cv180x/cv1800b_milkv_duo_sd/linux/cvitek_cv1800b_milkv_duo_sd_defconfig
@@ -153,10 +153,10 @@ CONFIG_SND_HDA_PREALLOC_SIZE=1
# CONFIG_SND_USB is not set
CONFIG_SND_SOC=y
CONFIG_SND_SOC_CV182XA_CV182XAADC=y
-CONFIG_SND_SOC_CV182XA_CV182XADAC=y
+# CONFIG_SND_SOC_CV182XA_CV182XADAC=y
CONFIG_SND_CV1835_I2S=y
CONFIG_SND_SOC_CV182XAADC=y
-CONFIG_SND_SOC_CV182XADAC=y
+# CONFIG_SND_SOC_CV182XADAC=y
CONFIG_SND_SOC_CV1835_USE_AUDIO_PLL=y
CONFIG_CV1835_I2S_SUBSYS=y
CONFIG_USB=y
@@ -260,3 +260,88 @@ CONFIG_ADVISE_SYSCALLS=n
CONFIG_SIGNALFD=n
CONFIG_TIMERFD=n
CONFIG_EPOLL=n
+
+# -----------------------------------------------------------
+# youkai add
+# CONFIG_IIO=y
+# CONFIG_BH1750=y
+# CONFIG_TCS3472=y
+# CONFIG_INV_MPU6050_IIO=y
+# CONFIG_INV_MPU6050_I2C=y
+# CONFIG_SENSORS_HMC5843=y
+# CONFIG_SENSORS_HMC5843_I2C=y
+
+# sensor bmp180
+# CONFIG_BMP280=y
+# CONFIG_BMP280_I2C=y
+
+# spi lcd -- st7735
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_DESIGNWARE=y
+CONFIG_SPI_DW_MMIO=y
+CONFIG_SPI_SPIDEV=y
+CONFIG_FB=y
+CONFIG_FB_TFT=y
+# CONFIG_FB_TFT_ST7735R=y
+CONFIG_FB_TFT_ST7789V=y
+
+# CONFIG_TINYDRM_ST7735R=y
+
+# lcd display kernel log
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_FB=y
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x16=y
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_VGA_CONSOLE=y
+
+# # no compatible
+# CONFIG_TCS3472=y
+
+# sound -- max98357a
+CONFIG_SND_SOC_CV1835_MAX98357A=y
+CONFIG_SND_SOC_MAX98357A=y
+
+CONFIG_SND_PROC_FS=y
+
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_CV1835_I2S=y
+CONFIG_CV1835_I2S_SUBSYS=y
+CONFIG_SND_SOC_CV1835_CONCURRENT_I2S=y
+# CONFIG_SND_SOC_ADAU1372_SPI is not set
+# CONFIG_SND_SOC_ADAU1372=y
+# CONFIG_SND_SOC_ADAU_UTILS=y
+# CONFIG_SND_SOC_ADAU1372_I2C=y
+# CONFIG_SND_SOC_CV1835_ADAU1372=y
+# CONFIG_SND_SOC_CV1835_USE_AUDIO_PLL=y
+# CONFIG_SND_SOC_CV1835_CV1835PDM=y
+# CONFIG_SND_SOC_CV1835PDM=y
+
+# sound -- adc mic
+# CONFIG_SND_SOC_CV180X_CV180XADC=y
+# CONFIG_SND_SOC_CV1800ADC=y
+# CONFIG_SND_SOC_CV182XA_CV182XAADC=y
+# CONFIG_SND_SOC_CV182XAADC=y
+# CONFIG_SND_SOC_CV1835_CV1835ADC_V2=y
+# CONFIG_SND_SOC_CV1835_CV1835ADC=y
+# CONFIG_SND_SOC_CV1835ADC=y
+# CONFIG_SND_SOC_CV1835_CV1835DAC=y
+# CONFIG_SND_SOC_CV1835DAC=y
+
+# -----------------------------------------------------------
\ No newline at end of file
diff --git a/build/boards/cv180x/cv1800b_milkv_duo_sd/u-boot/cvi_board_init.c b/build/boards/cv180x/cv1800b_milkv_duo_sd/u-boot/cvi_board_init.c
index 25c95da75..817728b31 100644
--- a/build/boards/cv180x/cv1800b_milkv_duo_sd/u-boot/cvi_board_init.c
+++ b/build/boards/cv180x/cv1800b_milkv_duo_sd/u-boot/cvi_board_init.c
@@ -15,18 +15,36 @@ int cvi_board_init(void)
PINMUX_CONFIG(SPINOR_CS_X, XGPIOA_24);
PINMUX_CONFIG(IIC0_SDA, XGPIOA_29);
PINMUX_CONFIG(IIC0_SCL, XGPIOA_28);
- // sd1
- PINMUX_CONFIG(SD1_D3, PWR_GPIO_18);
- PINMUX_CONFIG(SD1_D2, PWR_GPIO_19);
- PINMUX_CONFIG(SD1_D1, PWR_GPIO_20);
- PINMUX_CONFIG(SD1_D0, PWR_GPIO_21);
- PINMUX_CONFIG(SD1_CMD, PWR_GPIO_22);
- PINMUX_CONFIG(SD1_CLK, PWR_GPIO_23);
+ // // sd1
+ // PINMUX_CONFIG(SD1_D3, PWR_GPIO_18);
+ // PINMUX_CONFIG(SD1_D2, PWR_GPIO_19);
+ // PINMUX_CONFIG(SD1_D1, PWR_GPIO_20);
+ // PINMUX_CONFIG(SD1_D0, PWR_GPIO_21);
+ // PINMUX_CONFIG(SD1_CMD, PWR_GPIO_22);
+ // PINMUX_CONFIG(SD1_CLK, PWR_GPIO_23);
//default to gpio
PINMUX_CONFIG(PAD_MIPIRX1P, XGPIOC_9);
PINMUX_CONFIG(PAD_MIPIRX0N, XGPIOC_10);
PINMUX_CONFIG(USB_VBUS_DET, XGPIOB_6);
PINMUX_CONFIG(PWR_SEQ2, PWR_GPIO_4);
+
+ //spi2 -- st7735
+ // PINMUX_CONFIG(SD1_D3, SPI2_CS_X); //CS
+ // PINMUX_CONFIG(SD1_D0, SPI2_SDI);
+ // PINMUX_CONFIG(SD1_CMD, SPI2_SDO); //SDA
+ // PINMUX_CONFIG(SD1_CLK, SPI2_SCK); //SCL
+ pinmux_config(PINMUX_SPI2);
+ //PINMUX_CONFIG(SD1_D0, PWR_GPIO_21); //DC
+ PINMUX_CONFIG(SPINOR_MISO, XGPIOA_23); //DC
+ PINMUX_CONFIG(SD0_PWR_EN, XGPIOA_14); //BL
+ PINMUX_CONFIG(SPK_EN, XGPIOA_15); //RES
+
+ // I2s -- max98357a
+ PINMUX_CONFIG(PAD_ETH_TXP, IIS2_LRCK);
+ PINMUX_CONFIG(PAD_ETH_TXM, IIS2_BCLK);
+ PINMUX_CONFIG(PAD_ETH_RXP, IIS2_DO);
+ PINMUX_CONFIG(PAD_ETH_RXM, IIS2_DI);
+
return 0;
}
diff --git a/build/boards/default/dts/cv180x/cv180x_asic_qfn.dtsi b/build/boards/default/dts/cv180x/cv180x_asic_qfn.dtsi
index 4c5b10dfa..cde34eeca 100644
--- a/build/boards/default/dts/cv180x/cv180x_asic_qfn.dtsi
+++ b/build/boards/default/dts/cv180x/cv180x_asic_qfn.dtsi
@@ -53,7 +53,7 @@
/ {
/delete-node/ wifi-sd@4320000;
/delete-node/ i2s@04110000;
- /delete-node/ i2s@04120000;
+ /* /delete-node/ i2s@04120000; */
/delete-node/ sound_ext1;
/delete-node/ sound_ext2;
/delete-node/ sound_PDM;
diff --git a/build/boards/default/dts/cv180x/cv180x_base.dtsi b/build/boards/default/dts/cv180x/cv180x_base.dtsi
index fcc07d2ff..b05f088a8 100644
--- a/build/boards/default/dts/cv180x/cv180x_base.dtsi
+++ b/build/boards/default/dts/cv180x/cv180x_base.dtsi
@@ -232,6 +232,7 @@
clocks = <&clk CV180X_CLK_SPI>;
#address-cells = <1>;
#size-cells = <0>;
+ bias-pull-up; //youkai add
};
spi3:spi3@041B0000 {
diff --git a/linux_5.10/drivers/staging/fbtft/fb_st7789v.c b/linux_5.10/drivers/staging/fbtft/fb_st7789v.c
index 3a280cc18..58f5752b5 100644
--- a/linux_5.10/drivers/staging/fbtft/fb_st7789v.c
+++ b/linux_5.10/drivers/staging/fbtft/fb_st7789v.c
@@ -80,67 +80,112 @@ enum st7789v_command {
*
* Return: 0 on success, < 0 if error occurred.
*/
-static int init_display(struct fbtft_par *par)
-{
- /* turn off sleep mode */
- write_reg(par, MIPI_DCS_EXIT_SLEEP_MODE);
- mdelay(120);
+// static int init_display(struct fbtft_par *par)
+// {
+// /* turn off sleep mode */
+// write_reg(par, MIPI_DCS_EXIT_SLEEP_MODE);
+// mdelay(120);
- /* set pixel format to RGB-565 */
- write_reg(par, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT);
- if (HSD20_IPS)
- write_reg(par, PORCTRL, 0x05, 0x05, 0x00, 0x33, 0x33);
+// /* set pixel format to RGB-565 */
+// write_reg(par, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT);
+// if (HSD20_IPS)
+// write_reg(par, PORCTRL, 0x05, 0x05, 0x00, 0x33, 0x33);
- else
- write_reg(par, PORCTRL, 0x08, 0x08, 0x00, 0x22, 0x22);
+// else
+// write_reg(par, PORCTRL, 0x08, 0x08, 0x00, 0x22, 0x22);
- /*
- * VGH = 13.26V
- * VGL = -10.43V
- */
- if (HSD20_IPS)
- write_reg(par, GCTRL, 0x75);
- else
- write_reg(par, GCTRL, 0x35);
+// /*
+// * VGH = 13.26V
+// * VGL = -10.43V
+// */
+// if (HSD20_IPS)
+// write_reg(par, GCTRL, 0x75);
+// else
+// write_reg(par, GCTRL, 0x35);
- /*
- * VDV and VRH register values come from command write
- * (instead of NVM)
- */
- write_reg(par, VDVVRHEN, 0x01, 0xFF);
+// /*
+// * VDV and VRH register values come from command write
+// * (instead of NVM)
+// */
+// write_reg(par, VDVVRHEN, 0x01, 0xFF);
- /*
- * VAP = 4.1V + (VCOM + VCOM offset + 0.5 * VDV)
- * VAN = -4.1V + (VCOM + VCOM offset + 0.5 * VDV)
- */
- if (HSD20_IPS)
- write_reg(par, VRHS, 0x13);
- else
- write_reg(par, VRHS, 0x0B);
+// /*
+// * VAP = 4.1V + (VCOM + VCOM offset + 0.5 * VDV)
+// * VAN = -4.1V + (VCOM + VCOM offset + 0.5 * VDV)
+// */
+// if (HSD20_IPS)
+// write_reg(par, VRHS, 0x13);
+// else
+// write_reg(par, VRHS, 0x0B);
- /* VDV = 0V */
- write_reg(par, VDVS, 0x20);
+// /* VDV = 0V */
+// write_reg(par, VDVS, 0x20);
- /* VCOM = 0.9V */
- if (HSD20_IPS)
- write_reg(par, VCOMS, 0x22);
- else
- write_reg(par, VCOMS, 0x20);
+// /* VCOM = 0.9V */
+// if (HSD20_IPS)
+// write_reg(par, VCOMS, 0x22);
+// else
+// write_reg(par, VCOMS, 0x20);
- /* VCOM offset = 0V */
- write_reg(par, VCMOFSET, 0x20);
+// /* VCOM offset = 0V */
+// write_reg(par, VCMOFSET, 0x20);
- /*
- * AVDD = 6.8V
- * AVCL = -4.8V
- * VDS = 2.3V
- */
- write_reg(par, PWCTRL1, 0xA4, 0xA1);
+// /*
+// * AVDD = 6.8V
+// * AVCL = -4.8V
+// * VDS = 2.3V
+// */
+// write_reg(par, PWCTRL1, 0xA4, 0xA1);
+
+// write_reg(par, MIPI_DCS_SET_DISPLAY_ON);
+
+// if (HSD20_IPS)
+// write_reg(par, MIPI_DCS_ENTER_INVERT_MODE);
+
+// return 0;
+// }
+
+// st7735
+//youkai add
+static int init_display(struct fbtft_par *par)
+{
+ par->fbtftops.reset(par);//硬复位
+
+ mdelay(50);
+ write_reg(par,0x11);//软复位
+ mdelay(100);
+ //下面添加初始化函数write_reg 参数分别为：结构体指针，写命令，写数据....(后都为数据)
+ //ST7735s Frame Rate
+ write_reg(par,0xB1,0x05,0x3c,0x3c);
+
+ write_reg(par,0xB2,0x05,0x3c,0x3c);
+
+ write_reg(par,0xB3,0x05,0x3c,0x3c,0x05,0x3c,0x3c);
+
+
+ write_reg(par,0xB4,0x03); //Column inversion
+
+ //ST7735s Power Sequence
+ write_reg(par,0xC0,0x28,0x08,0x04);
+
+ write_reg(par,0xC1,0xc0);
- write_reg(par, MIPI_DCS_SET_DISPLAY_ON);
+ write_reg(par,0xC2,0x0d,0x00);
+
+ write_reg(par,0xC3,0x8d,0x2a); //VCOM
+
+ write_reg(par,0xc4,0x8d,0xee); //MX, MY, RGB mode
+ write_reg(par,0xc5,0x1a);
+ write_reg(par,0x36,0xc0);
+ //ST7735s Gamma Sequence
+ write_reg(par,0xe0,0x04,0x22,0x07,0x0a,0x2e,0x30,0x25,0x2a,0x28,0x26,0x2e,0x3a,0x00,0x01,0x03,0x13);
- if (HSD20_IPS)
- write_reg(par, MIPI_DCS_ENTER_INVERT_MODE);
+ write_reg(par,0xe1,0x04,0x16,0x06,0x0d,0x2d,0x26,0x23,0x27,0x27,0x25,0x2d,0x3b,0x00,0x01,0x04,0x13);
+
+ write_reg(par,0x3A,0x05); //65k mode
+
+ write_reg(par,0x29);//Display on
+ mdelay(100);
return 0;
}
@@ -221,8 +266,8 @@ static int set_gamma(struct fbtft_par *par, u32 *curves)
for (i = 0; i < par->gamma.num_curves; i++) {
c = i * par->gamma.num_values;
- for (j = 0; j < par->gamma.num_values; j++)
- curves[c + j] &= gamma_par_mask[j];
+ // for (j = 0; j < par->gamma.num_values; j++)
+ // curves[c + j] &= gamma_par_mask[j];
write_reg(par, PVGAMCTRL + i,
curves[c + 0], curves[c + 1], curves[c + 2],
curves[c + 3], curves[c + 4], curves[c + 5],
@@ -252,8 +297,8 @@ static int blank(struct fbtft_par *par, bool on)
static struct fbtft_display display = {
.regwidth = 8,
- .width = 240,
- .height = 320,
+ .width = 128,//240,
+ .height = 160,//320,
.gamma_num = 2,
.gamma_len = 14,
.gamma = HSD20_IPS_GAMMA,
diff --git a/linux_5.10/drivers/staging/fbtft/fbtft-core.c b/linux_5.10/drivers/staging/fbtft/fbtft-core.c
index 4f362dad4..97b139d46 100644
--- a/linux_5.10/drivers/staging/fbtft/fbtft-core.c
+++ b/linux_5.10/drivers/staging/fbtft/fbtft-core.c
@@ -30,6 +30,9 @@
#include "fbtft.h"
#include "internal.h"
+#include <linux/gpio.h> //add
+#include <linux/of_gpio.h> //add
+
static unsigned long debug;
module_param(debug, ulong, 0000);
MODULE_PARM_DESC(debug, "override device debug level");
@@ -71,68 +74,151 @@ void fbtft_dbg_hex(const struct device *dev, int groupsize,
}
EXPORT_SYMBOL(fbtft_dbg_hex);
+// default
+// static int fbtft_request_one_gpio(struct fbtft_par *par,
+// const char *name, int index,
+// struct gpio_desc **gpiop)
+// {
+// struct device *dev = par->info->device;
+// int ret = 0;
+
+// *gpiop = devm_gpiod_get_index_optional(dev, name, index,
+// GPIOD_OUT_HIGH);
+// if (IS_ERR(*gpiop)) {
+// ret = PTR_ERR(*gpiop);
+// dev_err(dev,
+// "Failed to request %s GPIO: %d\n", name, ret);
+// return ret;
+// }
+// fbtft_par_dbg(DEBUG_REQUEST_GPIOS, par, "%s: '%s' GPIO\n",
+// __func__, name);
+
+// return ret;
+// }
+
+// static int fbtft_request_gpios(struct fbtft_par *par)
+// {
+// int i;
+// int ret;
+
+// ret = fbtft_request_one_gpio(par, "reset", 0, &par->gpio.reset);
+// if (ret)
+// return ret;
+// ret = fbtft_request_one_gpio(par, "dc", 0, &par->gpio.dc);
+// if (ret)
+// return ret;
+// ret = fbtft_request_one_gpio(par, "rd", 0, &par->gpio.rd);
+// if (ret)
+// return ret;
+// ret = fbtft_request_one_gpio(par, "wr", 0, &par->gpio.wr);
+// if (ret)
+// return ret;
+// ret = fbtft_request_one_gpio(par, "cs", 0, &par->gpio.cs);
+// if (ret)
+// return ret;
+// ret = fbtft_request_one_gpio(par, "latch", 0, &par->gpio.latch);
+// if (ret)
+// return ret;
+// for (i = 0; i < 16; i++) {
+// ret = fbtft_request_one_gpio(par, "db", i,
+// &par->gpio.db[i]);
+// if (ret)
+// return ret;
+// ret = fbtft_request_one_gpio(par, "led", i,
+// &par->gpio.led[i]);
+// if (ret)
+// return ret;
+// ret = fbtft_request_one_gpio(par, "aux", i,
+// &par->gpio.aux[i]);
+// if (ret)
+// return ret;
+// }
+
+// return 0;
+// }
+
+//https://blog.csdn.net/qq_46604211/article/details/116449891
static int fbtft_request_one_gpio(struct fbtft_par *par,
- const char *name, int index,
- struct gpio_desc **gpiop)
+ const char *name, int index,
+ struct gpio_desc **gpiop)
{
- struct device *dev = par->info->device;
- int ret = 0;
-
- *gpiop = devm_gpiod_get_index_optional(dev, name, index,
- GPIOD_OUT_HIGH);
- if (IS_ERR(*gpiop)) {
- ret = PTR_ERR(*gpiop);
- dev_err(dev,
- "Failed to request %s GPIO: %d\n", name, ret);
- return ret;
- }
- fbtft_par_dbg(DEBUG_REQUEST_GPIOS, par, "%s: '%s' GPIO\n",
- __func__, name);
-
- return ret;
+ struct device *dev = par->info->device;
+ struct device_node *node = dev->of_node;
+ int gpio, flags, ret = 0;
+ enum of_gpio_flags of_flags;
+ if (of_find_property(node, name, NULL)) {
+ gpio = of_get_named_gpio_flags(node, name, index, &of_flags);
+ if (gpio == -ENOENT)
+ return 0;
+ if (gpio == -EPROBE_DEFER)
+ return gpio;
+ if (gpio < 0) {
+ dev_err(dev,
+ "failed to get '%s' from DT\n", name);
+ return gpio;
+ }
+ //active low translates to initially low
+ flags = (of_flags & OF_GPIO_ACTIVE_LOW) ? GPIOF_OUT_INIT_LOW :
+ GPIOF_OUT_INIT_HIGH;
+ ret = devm_gpio_request_one(dev, gpio, flags,
+ dev->driver->name);
+ if (ret) {
+ dev_err(dev,
+ "gpio_request_one('%s'=%d) failed with %d\n",
+ name, gpio, ret);
+ return ret;
+ }
+
+ *gpiop = gpio_to_desc(gpio);
+ fbtft_par_dbg(DEBUG_REQUEST_GPIOS, par, "%s: '%s' = GPIO%d\n",
+ __func__, name, gpio);
+ }
+
+ return ret;
}
static int fbtft_request_gpios(struct fbtft_par *par)
{
- int i;
- int ret;
-
- ret = fbtft_request_one_gpio(par, "reset", 0, &par->gpio.reset);
- if (ret)
- return ret;
- ret = fbtft_request_one_gpio(par, "dc", 0, &par->gpio.dc);
- if (ret)
- return ret;
- ret = fbtft_request_one_gpio(par, "rd", 0, &par->gpio.rd);
- if (ret)
- return ret;
- ret = fbtft_request_one_gpio(par, "wr", 0, &par->gpio.wr);
- if (ret)
- return ret;
- ret = fbtft_request_one_gpio(par, "cs", 0, &par->gpio.cs);
- if (ret)
- return ret;
- ret = fbtft_request_one_gpio(par, "latch", 0, &par->gpio.latch);
- if (ret)
- return ret;
- for (i = 0; i < 16; i++) {
- ret = fbtft_request_one_gpio(par, "db", i,
- &par->gpio.db[i]);
- if (ret)
- return ret;
- ret = fbtft_request_one_gpio(par, "led", i,
- &par->gpio.led[i]);
- if (ret)
- return ret;
- ret = fbtft_request_one_gpio(par, "aux", i,
- &par->gpio.aux[i]);
- if (ret)
- return ret;
- }
-
- return 0;
+ int i;
+ int ret;
+
+ ret = fbtft_request_one_gpio(par, "reset-gpios", 0, &par->gpio.reset);
+ if (ret)
+ return ret;
+ ret = fbtft_request_one_gpio(par, "dc-gpios", 0, &par->gpio.dc);
+ if (ret)
+ return ret;
+ ret = fbtft_request_one_gpio(par, "rd-gpios", 0, &par->gpio.rd);
+ if (ret)
+ return ret;
+ ret = fbtft_request_one_gpio(par, "wr-gpios", 0, &par->gpio.wr);
+ if (ret)
+ return ret;
+ ret = fbtft_request_one_gpio(par, "cs-gpios", 0, &par->gpio.cs);
+ if (ret)
+ return ret;
+ ret = fbtft_request_one_gpio(par, "latch-gpios", 0, &par->gpio.latch);
+ if (ret)
+ return ret;
+ for (i = 0; i < 16; i++) {
+ ret = fbtft_request_one_gpio(par, "db-gpios", i,
+ &par->gpio.db[i]);
+ if (ret)
+ return ret;
+ ret = fbtft_request_one_gpio(par, "led-gpios", i,
+ &par->gpio.led[i]);
+ if (ret)
+ return ret;
+ ret = fbtft_request_one_gpio(par, "aux-gpios", i,
+ &par->gpio.aux[i]);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
}
+
#ifdef CONFIG_FB_BACKLIGHT
static int fbtft_backlight_update_status(struct backlight_device *bd)
{
@@ -222,17 +308,32 @@ static void fbtft_set_addr_win(struct fbtft_par *par, int xs, int ys, int xe,
write_reg(par, MIPI_DCS_WRITE_MEMORY_START);
}
+//作者：Leesans https://www.bilibili.com/read/cv9947785/ 出处：bilibili
static void fbtft_reset(struct fbtft_par *par)
{
- if (!par->gpio.reset)
- return;
- fbtft_par_dbg(DEBUG_RESET, par, "%s()\n", __func__);
- gpiod_set_value_cansleep(par->gpio.reset, 1);
- usleep_range(20, 40);
- gpiod_set_value_cansleep(par->gpio.reset, 0);
- msleep(120);
+ if (!par->gpio.reset)
+ return;
+ fbtft_par_dbg(DEBUG_RESET, par, "%s()\n", __func__);
+ gpiod_set_value_cansleep(par->gpio.reset, 1);
+ msleep(10);
+ gpiod_set_value_cansleep(par->gpio.reset, 0);
+ msleep(200);
+ gpiod_set_value_cansleep(par->gpio.reset, 1);
+ msleep(10);
}
+// defalut
+// static void fbtft_reset(struct fbtft_par *par)
+// {
+// if (!par->gpio.reset)
+// return;
+// fbtft_par_dbg(DEBUG_RESET, par, "%s()\n", __func__);
+// gpiod_set_value_cansleep(par->gpio.reset, 1);
+// usleep_range(20, 40);
+// gpiod_set_value_cansleep(par->gpio.reset, 0);
+// msleep(120);
+// }
+
static void fbtft_update_display(struct fbtft_par *par, unsigned int start_line,
unsigned int end_line)
{
diff --git a/linux_5.10/sound/soc/cvitek/Kconfig b/linux_5.10/sound/soc/cvitek/Kconfig
index b2540aa8e..0fec0c832 100644
--- a/linux_5.10/sound/soc/cvitek/Kconfig
+++ b/linux_5.10/sound/soc/cvitek/Kconfig
@@ -190,3 +190,16 @@ config SND_SOC_CV1835_LT9611
tristate "Support for the lt9611 card"
help
lt9611 codec enable.
+
+config SND_SOC_CV1835_MAX98357A
+ tristate "Support for the max98357a card"
+ help
+ max98357a codec enable.
+
+config CONFIG_SND_SOC_CV1800ADC
+ tristate "Support for the CV1800ADC card"
+ help
+ Say Y or M if you want to add support for CV1800 ADC connect
+ to CVITEK CV180 I2S device.
+ Then select it for built in or module.
+ Say N, if not support
diff --git a/linux_5.10/sound/soc/cvitek/Makefile b/linux_5.10/sound/soc/cvitek/Makefile
index b2a6d8b54..39922b868 100644
--- a/linux_5.10/sound/soc/cvitek/Makefile
+++ b/linux_5.10/sound/soc/cvitek/Makefile
@@ -79,3 +79,9 @@ endif
obj-$(CONFIG_CV1835_I2S_SUBSYS) += cv1835_i2s_subsys.o
obj-$(CONFIG_SND_SOC_CV1835_LT9611) += cv1835_lt9611.o
+
+# youkai add
+obj-$(CONFIG_SND_SOC_CV1835_MAX98357A) += cv1835_max98357a.o
+
+obj-$(CONFIG_SND_SOC_CV1800ADC) += cv181x_cv181xadc.o
+obj-$(CONFIG_SND_SOC_CV1800ADC) += cv181xadc.o
diff --git a/u-boot-2021.10/include/configs/cv180x-asic.h b/u-boot-2021.10/include/configs/cv180x-asic.h
index 08b70193f..5d3404817 100644
--- a/u-boot-2021.10/include/configs/cv180x-asic.h
+++ b/u-boot-2021.10/include/configs/cv180x-asic.h
@@ -280,7 +280,7 @@
#endif
#define SET_BOOTARGS "setenv bootargs ${root} ${mtdparts} " \
- "console=$consoledev,$baudrate $othbootargs;"
+ "console=tty0 console=$consoledev,$baudrate $othbootargs;"
#define SD_BOOTM_COMMAND \
SET_BOOTARGS \