shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '63d2f83cdc8ada38440d3ac7e2088e499b76a3aa'

Browse Source 
* commit '63d2f83cdc8ada38440d3ac7e2088e499b76a3aa':
  soc: rockchip: sdmmc_vendor_storage: fix the issue of inaccurate calculation of free size
  usb: typec: tcpci: husb311: fix tx failure
  arm64: dts: rockchip: rk3576-vehicle-evb-v20: open spi dev

Change-Id: Ib87681205409e3187726d53c25b88018a165a383
This commit is contained in:
Tao Huang
2024-09-20 20:02:36 +08:00
parent f1445a34d3 63d2f83cdc
commit 9ac30d986a
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20.dtsi
View File

@@ -79,6 +79,7 @@
};
vcc3v3_lcd_n: vcc3v3-lcd0-n {
status = "disabled";
compatible = "regulator-fixed";
regulator-name = "vcc3v3_lcd0_n";
regulator-boot-on;
@@ -401,14 +402,13 @@
status = "okay";
};
&spi1 {
&spi0 {
status = "okay";
max-freq = <50000000>; /* spi internal clk, don't modify */
pinctrl-names = "default", "high_speed";
pinctrl-0 = <&spi1m1_csn0 &spi1m1_pins>;
spi_dev@0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0m0_csn0 &spi0m0_pins>;
spi-dev@0 {
compatible = "rockchip,spidev";
reg = <0>;
reg = <0x0>;
spi-max-frequency = <50000000>;
spi-lsb-first;
};

4
drivers/soc/rockchip/sdmmc_vendor_storage.c
View File

@@ -85,6 +85,7 @@ static int emmc_vendor_storage_init(void)
EMMC_VENDOR_PART_SIZE * max_index,
EMMC_VENDOR_PART_SIZE, 0))
goto error_exit;
g_vendor->free_size = sizeof(g_vendor->data) - g_vendor->free_offset;
} else {
memset((void *)g_vendor, 0, sizeof(*g_vendor));
g_vendor->version = 1;
@@ -160,8 +161,7 @@ static int emmc_vendor_write(u32 id, void *pbuf, u32 size)
item->size = size;
memcpy(&p_data[item->offset], pbuf, size);
g_vendor->free_offset = offset + align_size;
g_vendor->free_size -= (align_size -
alloc_size);
g_vendor->free_size = sizeof(g_vendor->data) - g_vendor->free_offset;
} else {
memcpy(&p_data[item->offset],
pbuf,

4
drivers/usb/typec/tcpm/tcpci_husb311.c
View File

@@ -207,6 +207,10 @@ static irqreturn_t husb311_irq(int irq, void *dev_id)
}
}
/* TCPCI Spec. Table 4-27 ResetTransmitBuffer */
if (status & (TCPC_ALERT_TX_SUCCESS | TCPC_ALERT_TX_DISCARDED | TCPC_ALERT_TX_FAILED))
husb311_write8(chip, TCPC_COMMAND, 0xdd);
return tcpci_irq(chip->tcpci);
}