kernel: bump 6.1 to 6.1.84 (#12046)
This commit is contained in:
Beginner
GitHub
parent
7d7e578142
commit
b171813f46
|
|
@ -1,2 +1,2 @@
|
|||
LINUX_VERSION-6.1 = .83
|
||||
LINUX_KERNEL_HASH-6.1.83 = 88b69611093613ce4494527685f833af0c31b986dcbeda7086f69f18f9e0b190
|
||||
LINUX_VERSION-6.1 = .84
|
||||
LINUX_KERNEL_HASH-6.1.84 = af97d2ebe14765d0db3af6560309daf08535da25bfad36e5fb3e436f22a1707a
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
}
|
||||
EXPORT_SYMBOL(drm_panel_init);
|
||||
|
||||
@@ -289,16 +292,18 @@ int of_drm_get_panel_orientation(const s
|
||||
@@ -294,16 +297,18 @@ int of_drm_get_panel_orientation(const s
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
|
|
|
|||
|
|
@ -1185,7 +1185,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
|||
}
|
||||
--- a/drivers/usb/core/hub.c
|
||||
+++ b/drivers/usb/core/hub.c
|
||||
@@ -5677,7 +5677,7 @@ static void port_event(struct usb_hub *h
|
||||
@@ -5686,7 +5686,7 @@ static void port_event(struct usb_hub *h
|
||||
port_dev->over_current_count++;
|
||||
port_over_current_notify(port_dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||
static inline int mmc_blk_part_switch(struct mmc_card *card,
|
||||
unsigned int part_type);
|
||||
static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
|
||||
@@ -3040,6 +3047,8 @@ static int mmc_blk_probe(struct mmc_card
|
||||
@@ -3042,6 +3049,8 @@ static int mmc_blk_probe(struct mmc_card
|
||||
{
|
||||
struct mmc_blk_data *md;
|
||||
int ret = 0;
|
||||
|
|
@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||
|
||||
/*
|
||||
* Check that the card supports the command class(es) we need.
|
||||
@@ -3047,7 +3056,16 @@ static int mmc_blk_probe(struct mmc_card
|
||||
@@ -3049,7 +3058,16 @@ static int mmc_blk_probe(struct mmc_card
|
||||
if (!(card->csd.cmdclass & CCC_BLOCK_READ))
|
||||
return -ENODEV;
|
||||
|
||||
|
|
@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||
|
||||
card->complete_wq = alloc_workqueue("mmc_complete",
|
||||
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
|
||||
@@ -3062,6 +3080,17 @@ static int mmc_blk_probe(struct mmc_card
|
||||
@@ -3064,6 +3082,17 @@ static int mmc_blk_probe(struct mmc_card
|
||||
goto out_free;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
|
||||
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
|
||||
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
|
||||
@@ -1773,7 +1773,7 @@ int vchiq_mmal_component_enable(struct v
|
||||
@@ -1774,7 +1774,7 @@ int vchiq_mmal_component_enable(struct v
|
||||
|
||||
ret = enable_component(instance, component);
|
||||
if (ret == 0)
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
/* deals with receipt of buffer to host message */
|
||||
static void buffer_to_host_cb(struct vchiq_mmal_instance *instance,
|
||||
struct mmal_msg *msg, u32 msg_len)
|
||||
@@ -1330,6 +1423,7 @@ static int port_disable(struct vchiq_mma
|
||||
@@ -1331,6 +1424,7 @@ static int port_disable(struct vchiq_mma
|
||||
mmalbuf->mmal_flags = 0;
|
||||
mmalbuf->dts = MMAL_TIME_UNKNOWN;
|
||||
mmalbuf->pts = MMAL_TIME_UNKNOWN;
|
||||
|
|
@ -242,7 +242,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
port->buffer_cb(instance,
|
||||
port, 0, mmalbuf);
|
||||
}
|
||||
@@ -1631,6 +1725,43 @@ int mmal_vchi_buffer_cleanup(struct mmal
|
||||
@@ -1632,6 +1726,43 @@ int mmal_vchi_buffer_cleanup(struct mmal
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup);
|
||||
|
||||
|
|
@ -286,7 +286,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
/* Initialise a mmal component and its ports
|
||||
*
|
||||
*/
|
||||
@@ -1680,6 +1811,7 @@ int vchiq_mmal_component_init(struct vch
|
||||
@@ -1681,6 +1812,7 @@ int vchiq_mmal_component_init(struct vch
|
||||
ret = port_info_get(instance, &component->control);
|
||||
if (ret < 0)
|
||||
goto release_component;
|
||||
|
|
@ -294,7 +294,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
|
||||
for (idx = 0; idx < component->inputs; idx++) {
|
||||
component->input[idx].type = MMAL_PORT_TYPE_INPUT;
|
||||
@@ -1690,6 +1822,7 @@ int vchiq_mmal_component_init(struct vch
|
||||
@@ -1691,6 +1823,7 @@ int vchiq_mmal_component_init(struct vch
|
||||
ret = port_info_get(instance, &component->input[idx]);
|
||||
if (ret < 0)
|
||||
goto release_component;
|
||||
|
|
@ -302,7 +302,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
}
|
||||
|
||||
for (idx = 0; idx < component->outputs; idx++) {
|
||||
@@ -1701,6 +1834,7 @@ int vchiq_mmal_component_init(struct vch
|
||||
@@ -1702,6 +1835,7 @@ int vchiq_mmal_component_init(struct vch
|
||||
ret = port_info_get(instance, &component->output[idx]);
|
||||
if (ret < 0)
|
||||
goto release_component;
|
||||
|
|
@ -310,7 +310,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
}
|
||||
|
||||
for (idx = 0; idx < component->clocks; idx++) {
|
||||
@@ -1712,6 +1846,7 @@ int vchiq_mmal_component_init(struct vch
|
||||
@@ -1713,6 +1847,7 @@ int vchiq_mmal_component_init(struct vch
|
||||
ret = port_info_get(instance, &component->clock[idx]);
|
||||
if (ret < 0)
|
||||
goto release_component;
|
||||
|
|
@ -318,7 +318,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
}
|
||||
|
||||
*component_out = component;
|
||||
@@ -1737,7 +1872,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i
|
||||
@@ -1738,7 +1873,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i
|
||||
int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance,
|
||||
struct vchiq_mmal_component *component)
|
||||
{
|
||||
|
|
@ -327,7 +327,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
|
||||
if (mutex_lock_interruptible(&instance->vchiq_mutex))
|
||||
return -EINTR;
|
||||
@@ -1749,6 +1884,13 @@ int vchiq_mmal_component_finalise(struct
|
||||
@@ -1750,6 +1885,13 @@ int vchiq_mmal_component_finalise(struct
|
||||
|
||||
component->in_use = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
|
||||
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
|
||||
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
|
||||
@@ -1899,6 +1899,8 @@ int vchiq_mmal_component_finalise(struct
|
||||
@@ -1900,6 +1900,8 @@ int vchiq_mmal_component_finalise(struct
|
||||
for (idx = 0; idx < component->clocks; idx++)
|
||||
free_event_context(&component->clock[idx]);
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
|
||||
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
|
||||
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
|
||||
@@ -1765,9 +1765,26 @@ static void free_event_context(struct vc
|
||||
@@ -1766,9 +1766,26 @@ static void free_event_context(struct vc
|
||||
{
|
||||
struct mmal_msg_context *ctx = port->event_context;
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
}
|
||||
|
||||
/* Initialise a mmal component and its ports
|
||||
@@ -1865,6 +1882,7 @@ int vchiq_mmal_component_init(struct vch
|
||||
@@ -1866,6 +1883,7 @@ int vchiq_mmal_component_init(struct vch
|
||||
|
||||
release_component:
|
||||
destroy_component(instance, component);
|
||||
|
|
@ -49,7 +49,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
unlock:
|
||||
if (component)
|
||||
component->in_use = 0;
|
||||
@@ -1880,7 +1898,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i
|
||||
@@ -1881,7 +1899,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i
|
||||
int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance,
|
||||
struct vchiq_mmal_component *component)
|
||||
{
|
||||
|
|
@ -58,7 +58,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|||
|
||||
if (mutex_lock_interruptible(&instance->vchiq_mutex))
|
||||
return -EINTR;
|
||||
@@ -1892,14 +1910,7 @@ int vchiq_mmal_component_finalise(struct
|
||||
@@ -1893,14 +1911,7 @@ int vchiq_mmal_component_finalise(struct
|
||||
|
||||
component->in_use = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
|
||||
--- a/drivers/usb/host/xhci.c
|
||||
+++ b/drivers/usb/host/xhci.c
|
||||
@@ -1641,6 +1641,109 @@ command_cleanup:
|
||||
@@ -1643,6 +1643,109 @@ command_cleanup:
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||
* non-error returns are a promise to giveback() the urb later
|
||||
* we drop ownership so next owner (or urb unlink) can get it
|
||||
*/
|
||||
@@ -5469,6 +5572,7 @@ static const struct hc_driver xhci_hc_dr
|
||||
@@ -5471,6 +5574,7 @@ static const struct hc_driver xhci_hc_dr
|
||||
.endpoint_reset = xhci_endpoint_reset,
|
||||
.check_bandwidth = xhci_check_bandwidth,
|
||||
.reset_bandwidth = xhci_reset_bandwidth,
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
} else if (msg->u.buffer_from_host.buffer_header.length == 0) {
|
||||
/* empty buffer */
|
||||
if (msg->u.buffer_from_host.buffer_header.flags &
|
||||
@@ -1528,6 +1551,9 @@ int vchiq_mmal_port_parameter_set(struct
|
||||
@@ -1529,6 +1552,9 @@ int vchiq_mmal_port_parameter_set(struct
|
||||
|
||||
mutex_unlock(&instance->vchiq_mutex);
|
||||
|
||||
|
|
@ -101,7 +101,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(vchiq_mmal_port_parameter_set);
|
||||
@@ -1696,6 +1722,31 @@ int vchiq_mmal_submit_buffer(struct vchi
|
||||
@@ -1697,6 +1723,31 @@ int vchiq_mmal_submit_buffer(struct vchi
|
||||
unsigned long flags = 0;
|
||||
int ret;
|
||||
|
||||
|
|
@ -133,7 +133,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
ret = buffer_from_host(instance, port, buffer);
|
||||
if (ret == -EINVAL) {
|
||||
/* Port is disabled. Queue for when it is enabled. */
|
||||
@@ -1729,6 +1780,16 @@ int mmal_vchi_buffer_cleanup(struct mmal
|
||||
@@ -1730,6 +1781,16 @@ int mmal_vchi_buffer_cleanup(struct mmal
|
||||
release_msg_context(msg_context);
|
||||
buf->msg_context = NULL;
|
||||
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
|
||||
vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
|
||||
|
||||
@@ -1086,9 +1101,9 @@ static int create_component(struct vchiq
|
||||
@@ -1087,9 +1102,9 @@ static int create_component(struct vchiq
|
||||
component->outputs = rmsg->u.component_create_reply.output_num;
|
||||
component->clocks = rmsg->u.component_create_reply.clock_num;
|
||||
|
||||
|
|
@ -185,7 +185,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
|
||||
release_msg:
|
||||
vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
|
||||
@@ -1257,10 +1272,9 @@ static int port_action_port(struct vchiq
|
||||
@@ -1258,10 +1273,9 @@ static int port_action_port(struct vchiq
|
||||
|
||||
ret = -rmsg->u.port_action_reply.status;
|
||||
|
||||
|
|
@ -199,7 +199,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
|
||||
release_msg:
|
||||
vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
|
||||
@@ -1304,11 +1318,11 @@ static int port_action_handle(struct vch
|
||||
@@ -1305,11 +1319,11 @@ static int port_action_handle(struct vch
|
||||
|
||||
ret = -rmsg->u.port_action_reply.status;
|
||||
|
||||
|
|
@ -216,7 +216,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
|
||||
release_msg:
|
||||
vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
|
||||
@@ -1347,9 +1361,9 @@ static int port_parameter_set(struct vch
|
||||
@@ -1348,9 +1362,9 @@ static int port_parameter_set(struct vch
|
||||
|
||||
ret = -rmsg->u.port_parameter_set_reply.status;
|
||||
|
||||
|
|
@ -229,7 +229,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
|
||||
release_msg:
|
||||
vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
|
||||
@@ -1407,8 +1421,9 @@ static int port_parameter_get(struct vch
|
||||
@@ -1408,8 +1422,9 @@ static int port_parameter_get(struct vch
|
||||
/* Always report the size of the returned parameter to the caller */
|
||||
*value_size = rmsg->u.port_parameter_get_reply.size;
|
||||
|
||||
|
|
@ -241,7 +241,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
|
||||
release_msg:
|
||||
vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
|
||||
@@ -1665,7 +1680,7 @@ int vchiq_mmal_port_connect_tunnel(struc
|
||||
@@ -1666,7 +1681,7 @@ int vchiq_mmal_port_connect_tunnel(struc
|
||||
if (!dst) {
|
||||
/* do not make new connection */
|
||||
ret = 0;
|
||||
|
|
@ -250,7 +250,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
goto release_unlock;
|
||||
}
|
||||
|
||||
@@ -1683,14 +1698,14 @@ int vchiq_mmal_port_connect_tunnel(struc
|
||||
@@ -1684,14 +1699,14 @@ int vchiq_mmal_port_connect_tunnel(struc
|
||||
/* set new format */
|
||||
ret = port_info_set(instance, dst);
|
||||
if (ret) {
|
||||
|
|
@ -267,7 +267,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
goto release_unlock;
|
||||
}
|
||||
|
||||
@@ -1699,9 +1714,9 @@ int vchiq_mmal_port_connect_tunnel(struc
|
||||
@@ -1700,9 +1715,9 @@ int vchiq_mmal_port_connect_tunnel(struc
|
||||
MMAL_MSG_PORT_ACTION_TYPE_CONNECT,
|
||||
dst->component->handle, dst->handle);
|
||||
if (ret < 0) {
|
||||
|
|
@ -280,7 +280,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
goto release_unlock;
|
||||
}
|
||||
src->connected = dst;
|
||||
@@ -1726,7 +1741,8 @@ int vchiq_mmal_submit_buffer(struct vchi
|
||||
@@ -1727,7 +1742,8 @@ int vchiq_mmal_submit_buffer(struct vchi
|
||||
* videobuf2 won't let us have the dmabuf there.
|
||||
*/
|
||||
if (port->zero_copy && buffer->dma_buf && !buffer->vcsm_handle) {
|
||||
|
|
@ -290,7 +290,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
ret = vc_sm_cma_import_dmabuf(buffer->dma_buf,
|
||||
&buffer->vcsm_handle);
|
||||
if (ret) {
|
||||
@@ -1742,8 +1758,8 @@ int vchiq_mmal_submit_buffer(struct vchi
|
||||
@@ -1743,8 +1759,8 @@ int vchiq_mmal_submit_buffer(struct vchi
|
||||
vc_sm_cma_free(buffer->vcsm_handle);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -301,7 +301,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
}
|
||||
|
||||
ret = buffer_from_host(instance, port, buffer);
|
||||
@@ -1782,8 +1798,8 @@ int mmal_vchi_buffer_cleanup(struct mmal
|
||||
@@ -1783,8 +1799,8 @@ int mmal_vchi_buffer_cleanup(struct mmal
|
||||
if (buf->vcsm_handle) {
|
||||
int ret;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|||
|
||||
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
|
||||
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
|
||||
@@ -1500,6 +1500,8 @@ static int port_enable(struct vchiq_mmal
|
||||
@@ -1501,6 +1501,8 @@ static int port_enable(struct vchiq_mmal
|
||||
|
||||
port->enabled = 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
|||
|
||||
--- a/drivers/mmc/core/block.c
|
||||
+++ b/drivers/mmc/core/block.c
|
||||
@@ -1970,7 +1970,7 @@ static void mmc_blk_mq_rw_recovery(struc
|
||||
@@ -1972,7 +1972,7 @@ static void mmc_blk_mq_rw_recovery(struc
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
|||
|
||||
--- a/drivers/usb/host/xhci.c
|
||||
+++ b/drivers/usb/host/xhci.c
|
||||
@@ -1730,7 +1730,7 @@ static void xhci_fixup_endpoint(struct u
|
||||
@@ -1732,7 +1732,7 @@ static void xhci_fixup_endpoint(struct u
|
||||
return;
|
||||
}
|
||||
ctrl_ctx->add_flags = xhci_get_endpoint_flag_from_index(ep_index);
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||
* hardware interrupt, we use a timer-based system. The original
|
||||
--- a/drivers/tty/serial/8250/8250_port.c
|
||||
+++ b/drivers/tty/serial/8250/8250_port.c
|
||||
@@ -1559,6 +1559,9 @@ static void serial8250_stop_tx(struct ua
|
||||
@@ -1553,6 +1553,9 @@ static void serial8250_stop_tx(struct ua
|
||||
serial_icr_write(up, UART_ACR, up->acr);
|
||||
}
|
||||
serial8250_rpm_put(up);
|
||||
|
|
@ -81,7 +81,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||
}
|
||||
|
||||
static inline void __start_tx(struct uart_port *port)
|
||||
@@ -1669,6 +1672,9 @@ static void serial8250_start_tx(struct u
|
||||
@@ -1663,6 +1666,9 @@ static void serial8250_start_tx(struct u
|
||||
struct uart_8250_port *up = up_to_u8250p(port);
|
||||
struct uart_8250_em485 *em485 = up->em485;
|
||||
|
||||
|
|
@ -91,7 +91,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||
if (!port->x_char && uart_circ_empty(&port->state->xmit))
|
||||
return;
|
||||
|
||||
@@ -1889,6 +1895,9 @@ unsigned int serial8250_modem_status(str
|
||||
@@ -1883,6 +1889,9 @@ unsigned int serial8250_modem_status(str
|
||||
uart_handle_cts_change(port, status & UART_MSR_CTS);
|
||||
|
||||
wake_up_interruptible(&port->state->port.delta_msr_wait);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
|
|||
|
||||
--- a/fs/f2fs/segment.c
|
||||
+++ b/fs/f2fs/segment.c
|
||||
@@ -663,9 +663,7 @@ init_thread:
|
||||
@@ -665,9 +665,7 @@ init_thread:
|
||||
"f2fs_flush-%u:%u", MAJOR(dev), MINOR(dev));
|
||||
if (IS_ERR(fcc->f2fs_issue_flush)) {
|
||||
err = PTR_ERR(fcc->f2fs_issue_flush);
|
||||
|
|
@ -46,7 +46,7 @@ Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
|
|||
}
|
||||
|
||||
return err;
|
||||
@@ -5062,11 +5060,9 @@ int f2fs_build_segment_manager(struct f2
|
||||
@@ -5064,11 +5062,9 @@ int f2fs_build_segment_manager(struct f2
|
||||
|
||||
init_f2fs_rwsem(&sm_info->curseg_lock);
|
||||
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ This reverts commit c0ea202fbc855d60bc4a0603ca52a9e80654b327.
|
|||
|
||||
--- a/drivers/usb/phy/phy-generic.c
|
||||
+++ b/drivers/usb/phy/phy-generic.c
|
||||
@@ -272,13 +272,6 @@ int usb_phy_gen_create_phy(struct device
|
||||
return dev_err_probe(dev, PTR_ERR(nop->vbus_draw),
|
||||
"could not get vbus regulator\n");
|
||||
@@ -265,13 +265,6 @@ int usb_phy_gen_create_phy(struct device
|
||||
return -EPROBE_DEFER;
|
||||
}
|
||||
|
||||
- nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus");
|
||||
- if (PTR_ERR(nop->vbus_draw) == -ENODEV)
|
||||
|
|
|
|||
|
|
@ -361,7 +361,7 @@ Signed-off-by: T.J. Mercier <tjmercier@google.com>
|
|||
static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
|
||||
--- a/mm/page_alloc.c
|
||||
+++ b/mm/page_alloc.c
|
||||
@@ -7943,6 +7943,7 @@ static void __init free_area_init_node(i
|
||||
@@ -7945,6 +7945,7 @@ static void __init free_area_init_node(i
|
||||
pgdat_set_deferred_range(pgdat);
|
||||
|
||||
free_area_init_core(pgdat);
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
|||
|
||||
#define QUECTEL_VENDOR_ID 0x2c7c
|
||||
/* These Quectel products use Quectel's vendor ID */
|
||||
@@ -1147,6 +1152,11 @@ static const struct usb_device_id option
|
||||
@@ -1152,6 +1157,11 @@ static const struct usb_device_id option
|
||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
|
||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
|
||||
.driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
|
||||
|
|
@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
|||
/* Quectel products using Qualcomm vendor ID */
|
||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
|
||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
|
||||
@@ -1188,6 +1198,11 @@ static const struct usb_device_id option
|
||||
@@ -1193,6 +1203,11 @@ static const struct usb_device_id option
|
||||
.driver_info = ZLP },
|
||||
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
||||
.driver_info = RSVD(4) },
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
|
|||
|
||||
--- a/mm/page_alloc.c
|
||||
+++ b/mm/page_alloc.c
|
||||
@@ -7897,7 +7897,7 @@ static void __init alloc_node_mem_map(st
|
||||
@@ -7899,7 +7899,7 @@ static void __init alloc_node_mem_map(st
|
||||
if (pgdat == NODE_DATA(0)) {
|
||||
mem_map = NODE_DATA(0)->node_mem_map;
|
||||
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|||
|
||||
/*
|
||||
* Define if arch has non-standard setup. This is a _PCI_ standard
|
||||
@@ -864,6 +867,12 @@ struct ata_port {
|
||||
@@ -865,6 +868,12 @@ struct ata_port {
|
||||
#ifdef CONFIG_ATA_ACPI
|
||||
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
|
||||
--- a/drivers/usb/serial/option.c
|
||||
+++ b/drivers/usb/serial/option.c
|
||||
@@ -2272,6 +2272,12 @@ static const struct usb_device_id option
|
||||
@@ -2277,6 +2277,12 @@ static const struct usb_device_id option
|
||||
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a3, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */
|
||||
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff), /* Fibocom FM101-GL (laptop MBIM) */
|
||||
.driver_info = RSVD(4) },
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
};
|
||||
|
||||
port@4 {
|
||||
@@ -240,7 +239,22 @@
|
||||
@@ -241,7 +240,22 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
/* eMMC is shared pin with parallel NAND */
|
||||
emmc_pins_default: emmc-pins-default {
|
||||
mux {
|
||||
@@ -517,11 +531,11 @@
|
||||
@@ -518,11 +532,11 @@
|
||||
};
|
||||
|
||||
&sata {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
@@ -524,6 +524,65 @@
|
||||
status = "okay";
|
||||
@@ -539,6 +539,65 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
+&bch {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
@@ -565,7 +565,7 @@
|
||||
@@ -580,7 +580,7 @@
|
||||
reg = <0x140000 0x0080000>;
|
||||
};
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
label = "Factory";
|
||||
reg = <0x1c0000 0x0100000>;
|
||||
};
|
||||
@@ -626,5 +626,6 @@
|
||||
@@ -641,5 +641,6 @@
|
||||
&wmac {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&wmac_pins>;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
@@ -538,6 +538,7 @@
|
||||
@@ -553,6 +553,7 @@
|
||||
spi-tx-bus-width = <4>;
|
||||
spi-rx-bus-width = <4>;
|
||||
nand-ecc-engine = <&snfi>;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
},
|
||||
[PORT_NPCM] = {
|
||||
.name = "Nuvoton 16550",
|
||||
@@ -2773,6 +2773,11 @@ serial8250_do_set_termios(struct uart_po
|
||||
@@ -2767,6 +2767,11 @@ serial8250_do_set_termios(struct uart_po
|
||||
unsigned long flags;
|
||||
unsigned int baud, quot, frac = 0;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -18,7 +18,7 @@ Link: https://lore.kernel.org/r/20221107132901.489240-3-robimarko@gmail.com
|
|||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -4665,6 +4665,20 @@ static const struct qcom_reset_map gcc_i
|
||||
@@ -4667,6 +4667,20 @@ static const struct qcom_reset_map gcc_i
|
||||
[GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 },
|
||||
[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
|
||||
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com
|
|||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -674,7 +674,7 @@ static struct clk_rcg2 pcie0_aux_clk_src
|
||||
@@ -675,7 +675,7 @@ static struct clk_rcg2 pcie0_aux_clk_src
|
||||
};
|
||||
|
||||
static const struct clk_parent_data gcc_pcie20_phy0_pipe_clk_xo[] = {
|
||||
|
|
@ -31,7 +31,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com
|
|||
{ .fw_name = "xo", .name = "xo" },
|
||||
};
|
||||
|
||||
@@ -727,7 +727,7 @@ static struct clk_rcg2 pcie1_aux_clk_src
|
||||
@@ -728,7 +728,7 @@ static struct clk_rcg2 pcie1_aux_clk_src
|
||||
};
|
||||
|
||||
static const struct clk_parent_data gcc_pcie20_phy1_pipe_clk_xo[] = {
|
||||
|
|
@ -40,7 +40,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com
|
|||
{ .fw_name = "xo", .name = "xo" },
|
||||
};
|
||||
|
||||
@@ -1131,7 +1131,7 @@ static const struct freq_tbl ftbl_nss_no
|
||||
@@ -1133,7 +1133,7 @@ static const struct freq_tbl ftbl_nss_no
|
||||
|
||||
static const struct clk_parent_data gcc_xo_bias_pll_nss_noc_clk_gpll0_gpll2[] = {
|
||||
{ .fw_name = "xo", .name = "xo" },
|
||||
|
|
@ -49,7 +49,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com
|
|||
{ .hw = &gpll0.clkr.hw },
|
||||
{ .hw = &gpll2.clkr.hw },
|
||||
};
|
||||
@@ -1356,7 +1356,7 @@ static const struct freq_tbl ftbl_nss_pp
|
||||
@@ -1358,7 +1358,7 @@ static const struct freq_tbl ftbl_nss_pp
|
||||
|
||||
static const struct clk_parent_data gcc_xo_bias_gpll0_gpll4_nss_ubi32[] = {
|
||||
{ .fw_name = "xo", .name = "xo" },
|
||||
|
|
@ -58,7 +58,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com
|
|||
{ .hw = &gpll0.clkr.hw },
|
||||
{ .hw = &gpll4.clkr.hw },
|
||||
{ .hw = &nss_crypto_pll.clkr.hw },
|
||||
@@ -1407,10 +1407,10 @@ static const struct freq_tbl ftbl_nss_po
|
||||
@@ -1409,10 +1409,10 @@ static const struct freq_tbl ftbl_nss_po
|
||||
|
||||
static const struct clk_parent_data gcc_xo_uniphy0_rx_tx_ubi32_bias[] = {
|
||||
{ .fw_name = "xo", .name = "xo" },
|
||||
|
|
@ -72,7 +72,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com
|
|||
};
|
||||
|
||||
static const struct parent_map gcc_xo_uniphy0_rx_tx_ubi32_bias_map[] = {
|
||||
@@ -1459,10 +1459,10 @@ static const struct freq_tbl ftbl_nss_po
|
||||
@@ -1461,10 +1461,10 @@ static const struct freq_tbl ftbl_nss_po
|
||||
|
||||
static const struct clk_parent_data gcc_xo_uniphy0_tx_rx_ubi32_bias[] = {
|
||||
{ .fw_name = "xo", .name = "xo" },
|
||||
|
|
@ -86,7 +86,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com
|
|||
};
|
||||
|
||||
static const struct parent_map gcc_xo_uniphy0_tx_rx_ubi32_bias_map[] = {
|
||||
@@ -1690,12 +1690,12 @@ static const struct freq_tbl ftbl_nss_po
|
||||
@@ -1692,12 +1692,12 @@ static const struct freq_tbl ftbl_nss_po
|
||||
|
||||
static const struct clk_parent_data gcc_xo_uniphy0_rx_tx_uniphy1_rx_tx_ubi32_bias[] = {
|
||||
{ .fw_name = "xo", .name = "xo" },
|
||||
|
|
@ -104,7 +104,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com
|
|||
};
|
||||
|
||||
static const struct parent_map
|
||||
@@ -1752,12 +1752,12 @@ static const struct freq_tbl ftbl_nss_po
|
||||
@@ -1754,12 +1754,12 @@ static const struct freq_tbl ftbl_nss_po
|
||||
|
||||
static const struct clk_parent_data gcc_xo_uniphy0_tx_rx_uniphy1_tx_rx_ubi32_bias[] = {
|
||||
{ .fw_name = "xo", .name = "xo" },
|
||||
|
|
@ -122,7 +122,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com
|
|||
};
|
||||
|
||||
static const struct parent_map
|
||||
@@ -1814,10 +1814,10 @@ static const struct freq_tbl ftbl_nss_po
|
||||
@@ -1816,10 +1816,10 @@ static const struct freq_tbl ftbl_nss_po
|
||||
|
||||
static const struct clk_parent_data gcc_xo_uniphy2_rx_tx_ubi32_bias[] = {
|
||||
{ .fw_name = "xo", .name = "xo" },
|
||||
|
|
@ -136,7 +136,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com
|
|||
};
|
||||
|
||||
static const struct parent_map gcc_xo_uniphy2_rx_tx_ubi32_bias_map[] = {
|
||||
@@ -1871,10 +1871,10 @@ static const struct freq_tbl ftbl_nss_po
|
||||
@@ -1873,10 +1873,10 @@ static const struct freq_tbl ftbl_nss_po
|
||||
|
||||
static const struct clk_parent_data gcc_xo_uniphy2_tx_rx_ubi32_bias[] = {
|
||||
{ .fw_name = "xo", .name = "xo" },
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
|
|||
|
||||
--- a/drivers/pci/controller/dwc/pcie-qcom.c
|
||||
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
|
||||
@@ -1762,6 +1762,7 @@ static const struct of_device_id qcom_pc
|
||||
@@ -1771,6 +1771,7 @@ static const struct of_device_id qcom_pc
|
||||
{ .compatible = "qcom,pcie-ipq8064", .data = &cfg_2_1_0 },
|
||||
{ .compatible = "qcom,pcie-ipq8064-v2", .data = &cfg_2_1_0 },
|
||||
{ .compatible = "qcom,pcie-ipq8074", .data = &cfg_2_3_3 },
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -928,7 +928,7 @@ static struct clk_rcg2 usb0_mock_utmi_cl
|
||||
@@ -930,7 +930,7 @@ static struct clk_rcg2 usb0_mock_utmi_cl
|
||||
};
|
||||
|
||||
static const struct clk_parent_data gcc_usb3phy_0_cc_pipe_clk_xo[] = {
|
||||
|
|
@ -27,7 +27,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|||
{ .fw_name = "xo", .name = "xo" },
|
||||
};
|
||||
|
||||
@@ -996,7 +996,7 @@ static struct clk_rcg2 usb1_mock_utmi_cl
|
||||
@@ -998,7 +998,7 @@ static struct clk_rcg2 usb1_mock_utmi_cl
|
||||
};
|
||||
|
||||
static const struct clk_parent_data gcc_usb3phy_1_cc_pipe_clk_xo[] = {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ Link: https://lore.kernel.org/r/1682413909-24927-1-git-send-email-mantas@8device
|
|||
|
||||
--- a/drivers/clk/qcom/gcc-ipq6018.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq6018.c
|
||||
@@ -1702,7 +1702,7 @@ static struct clk_rcg2 usb0_mock_utmi_cl
|
||||
@@ -1703,7 +1703,7 @@ static struct clk_rcg2 usb0_mock_utmi_cl
|
||||
.name = "usb0_mock_utmi_clk_src",
|
||||
.parent_data = gcc_xo_gpll6_gpll0_gpll0_out_main_div2,
|
||||
.num_parents = 4,
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ Link: https://lore.kernel.org/r/20230526190855.2941291-1-robimarko@gmail.com
|
|||
|
||||
--- a/drivers/clk/qcom/gcc-ipq6018.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq6018.c
|
||||
@@ -4143,15 +4143,20 @@ static struct clk_branch gcc_dcc_clk = {
|
||||
@@ -4145,15 +4145,20 @@ static struct clk_branch gcc_dcc_clk = {
|
||||
|
||||
static const struct alpha_pll_config ubi32_pll_config = {
|
||||
.l = 0x3e,
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ Link: https://lore.kernel.org/r/20230601213416.3373599-1-arnd@kernel.org
|
|||
|
||||
--- a/drivers/clk/qcom/gcc-ipq6018.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq6018.c
|
||||
@@ -4144,8 +4144,6 @@ static struct clk_branch gcc_dcc_clk = {
|
||||
@@ -4146,8 +4146,6 @@ static struct clk_branch gcc_dcc_clk = {
|
||||
static const struct alpha_pll_config ubi32_pll_config = {
|
||||
.l = 0x3e,
|
||||
.alpha = 0x6667,
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||
|
||||
--- a/drivers/clk/qcom/gcc-ipq6018.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq6018.c
|
||||
@@ -2120,6 +2120,26 @@ static struct clk_branch gcc_blsp1_qup5_
|
||||
@@ -2122,6 +2122,26 @@ static struct clk_branch gcc_blsp1_qup5_
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -47,7 +47,7 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|||
static struct clk_branch gcc_blsp1_qup6_spi_apps_clk = {
|
||||
.halt_reg = 0x0700c,
|
||||
.clkr = {
|
||||
@@ -4276,6 +4296,7 @@ static struct clk_regmap *gcc_ipq6018_cl
|
||||
@@ -4278,6 +4298,7 @@ static struct clk_regmap *gcc_ipq6018_cl
|
||||
[GCC_BLSP1_QUP4_SPI_APPS_CLK] = &gcc_blsp1_qup4_spi_apps_clk.clkr,
|
||||
[GCC_BLSP1_QUP5_I2C_APPS_CLK] = &gcc_blsp1_qup5_i2c_apps_clk.clkr,
|
||||
[GCC_BLSP1_QUP5_SPI_APPS_CLK] = &gcc_blsp1_qup5_spi_apps_clk.clkr,
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
|||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -1676,13 +1676,21 @@ static struct clk_regmap_div nss_port4_t
|
||||
@@ -1678,13 +1678,21 @@ static struct clk_regmap_div nss_port4_t
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
|||
F(156250000, P_UNIPHY1_RX, 2, 0, 0),
|
||||
F(312500000, P_UNIPHY1_RX, 1, 0, 0),
|
||||
{ }
|
||||
@@ -1738,13 +1746,21 @@ static struct clk_regmap_div nss_port5_r
|
||||
@@ -1740,13 +1748,21 @@ static struct clk_regmap_div nss_port5_r
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -75,7 +75,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
|||
F(156250000, P_UNIPHY1_TX, 2, 0, 0),
|
||||
F(312500000, P_UNIPHY1_TX, 1, 0, 0),
|
||||
{ }
|
||||
@@ -1800,13 +1816,21 @@ static struct clk_regmap_div nss_port5_t
|
||||
@@ -1802,13 +1818,21 @@ static struct clk_regmap_div nss_port5_t
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -101,7 +101,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
|||
F(156250000, P_UNIPHY2_RX, 2, 0, 0),
|
||||
F(312500000, P_UNIPHY2_RX, 1, 0, 0),
|
||||
{ }
|
||||
@@ -1857,13 +1881,21 @@ static struct clk_regmap_div nss_port6_r
|
||||
@@ -1859,13 +1883,21 @@ static struct clk_regmap_div nss_port6_r
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>
|
|||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -4711,6 +4711,7 @@ static const struct qcom_reset_map gcc_i
|
||||
@@ -4713,6 +4713,7 @@ static const struct qcom_reset_map gcc_i
|
||||
[GCC_NSSPORT4_RESET] = { .reg = 0x68014, .bitmask = BIT(27) | GENMASK(9, 8) },
|
||||
[GCC_NSSPORT5_RESET] = { .reg = 0x68014, .bitmask = BIT(28) | GENMASK(11, 10) },
|
||||
[GCC_NSSPORT6_RESET] = { .reg = 0x68014, .bitmask = BIT(29) | GENMASK(13, 12) },
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ Change-Id: I85bb1c127a4794ae9347d5babbbfd6490f6abcc7
|
|||
static const struct freq_tbl ftbl_apss_ahb_clk_src[] = {
|
||||
F(24000000, P_XO, 1, 0, 0),
|
||||
F(25000000, P_GPLL0_DIV2, 16, 0, 0),
|
||||
@@ -1891,6 +1917,19 @@ static struct clk_rcg2 system_noc_bfdcd_
|
||||
@@ -1893,6 +1919,19 @@ static struct clk_rcg2 system_noc_bfdcd_
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -71,7 +71,7 @@ Change-Id: I85bb1c127a4794ae9347d5babbbfd6490f6abcc7
|
|||
static const struct freq_tbl ftbl_ubi32_mem_noc_bfdcd_clk_src[] = {
|
||||
F(24000000, P_XO, 1, 0, 0),
|
||||
F(307670000, P_BIAS_PLL_NSS_NOC, 1.5, 0, 0),
|
||||
@@ -1926,6 +1965,19 @@ static struct clk_rcg2 ubi32_mem_noc_bfd
|
||||
@@ -1928,6 +1967,19 @@ static struct clk_rcg2 ubi32_mem_noc_bfd
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -91,7 +91,7 @@ Change-Id: I85bb1c127a4794ae9347d5babbbfd6490f6abcc7
|
|||
static struct clk_branch gcc_apss_axi_clk = {
|
||||
.halt_reg = 0x46020,
|
||||
.halt_check = BRANCH_HALT_VOTED,
|
||||
@@ -2683,6 +2735,454 @@ static struct clk_rcg2 lpass_q6_axim_clk
|
||||
@@ -2685,6 +2737,454 @@ static struct clk_rcg2 lpass_q6_axim_clk
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -546,7 +546,7 @@ Change-Id: I85bb1c127a4794ae9347d5babbbfd6490f6abcc7
|
|||
static struct freq_tbl ftbl_rbcpr_wcss_clk_src[] = {
|
||||
F(24000000, P_XO, 1, 0, 0),
|
||||
F(50000000, P_GPLL0, 16, 0, 0),
|
||||
@@ -2702,6 +3202,22 @@ static struct clk_rcg2 rbcpr_wcss_clk_sr
|
||||
@@ -2704,6 +3204,22 @@ static struct clk_rcg2 rbcpr_wcss_clk_sr
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -569,7 +569,7 @@ Change-Id: I85bb1c127a4794ae9347d5babbbfd6490f6abcc7
|
|||
static struct clk_branch gcc_lpass_core_axim_clk = {
|
||||
.halt_reg = 0x1F028,
|
||||
.clkr = {
|
||||
@@ -3523,6 +4039,22 @@ static struct clk_branch gcc_prng_ahb_cl
|
||||
@@ -3525,6 +4041,22 @@ static struct clk_branch gcc_prng_ahb_cl
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -592,7 +592,7 @@ Change-Id: I85bb1c127a4794ae9347d5babbbfd6490f6abcc7
|
|||
static struct clk_branch gcc_qdss_dap_clk = {
|
||||
.halt_reg = 0x29084,
|
||||
.clkr = {
|
||||
@@ -3533,7 +4065,7 @@ static struct clk_branch gcc_qdss_dap_cl
|
||||
@@ -3535,7 +4067,7 @@ static struct clk_branch gcc_qdss_dap_cl
|
||||
.parent_hws = (const struct clk_hw *[]){
|
||||
&qdss_dap_sync_clk_src.hw },
|
||||
.num_parents = 1,
|
||||
|
|
@ -601,7 +601,7 @@ Change-Id: I85bb1c127a4794ae9347d5babbbfd6490f6abcc7
|
|||
.ops = &clk_branch2_ops,
|
||||
},
|
||||
},
|
||||
@@ -4199,6 +4731,9 @@ static struct clk_hw *gcc_ipq6018_hws[]
|
||||
@@ -4201,6 +4733,9 @@ static struct clk_hw *gcc_ipq6018_hws[]
|
||||
&gpll6_out_main_div2.hw,
|
||||
&qdss_dap_sync_clk_src.hw,
|
||||
&qdss_tsctr_div2_clk_src.hw,
|
||||
|
|
@ -611,7 +611,7 @@ Change-Id: I85bb1c127a4794ae9347d5babbbfd6490f6abcc7
|
|||
};
|
||||
|
||||
static struct clk_regmap *gcc_ipq6018_clks[] = {
|
||||
@@ -4362,6 +4897,7 @@ static struct clk_regmap *gcc_ipq6018_cl
|
||||
@@ -4364,6 +4899,7 @@ static struct clk_regmap *gcc_ipq6018_cl
|
||||
[GCC_SYS_NOC_PCIE0_AXI_CLK] = &gcc_sys_noc_pcie0_axi_clk.clkr,
|
||||
[GCC_PCIE0_PIPE_CLK] = &gcc_pcie0_pipe_clk.clkr,
|
||||
[GCC_PRNG_AHB_CLK] = &gcc_prng_ahb_clk.clkr,
|
||||
|
|
@ -619,7 +619,7 @@ Change-Id: I85bb1c127a4794ae9347d5babbbfd6490f6abcc7
|
|||
[GCC_QDSS_DAP_CLK] = &gcc_qdss_dap_clk.clkr,
|
||||
[GCC_QPIC_AHB_CLK] = &gcc_qpic_ahb_clk.clkr,
|
||||
[GCC_QPIC_CLK] = &gcc_qpic_clk.clkr,
|
||||
@@ -4403,9 +4939,35 @@ static struct clk_regmap *gcc_ipq6018_cl
|
||||
@@ -4405,9 +4941,35 @@ static struct clk_regmap *gcc_ipq6018_cl
|
||||
[PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
|
||||
[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,
|
||||
[PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
|
||||
|
|
@ -655,7 +655,7 @@ Change-Id: I85bb1c127a4794ae9347d5babbbfd6490f6abcc7
|
|||
[GCC_LPASS_CORE_AXIM_CLK] = &gcc_lpass_core_axim_clk.clkr,
|
||||
[LPASS_CORE_AXIM_CLK_SRC] = &lpass_core_axim_clk_src.clkr,
|
||||
[GCC_LPASS_SNOC_CFG_CLK] = &gcc_lpass_snoc_cfg_clk.clkr,
|
||||
@@ -4421,6 +4983,9 @@ static struct clk_regmap *gcc_ipq6018_cl
|
||||
@@ -4423,6 +4985,9 @@ static struct clk_regmap *gcc_ipq6018_cl
|
||||
[GCC_MEM_NOC_UBI32_CLK] = &gcc_mem_noc_ubi32_clk.clkr,
|
||||
[GCC_MEM_NOC_LPASS_CLK] = &gcc_mem_noc_lpass_clk.clkr,
|
||||
[GCC_SNOC_LPASS_CFG_CLK] = &gcc_snoc_lpass_cfg_clk.clkr,
|
||||
|
|
|
|||
Loading…
Reference in New Issue