kernel: refresh 5.15 patches (#11715)

This commit is contained in:
Beginner-Go 2023-12-17 13:40:54 +00:00
parent fae6bc8dd8
commit b36db4e355
75 changed files with 153 additions and 231 deletions

View File

@ -14,7 +14,7 @@ use the same logic.
--- a/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -2756,7 +2756,12 @@ static int pl011_setup_port(struct devic @@ -2752,7 +2752,12 @@ static int pl011_setup_port(struct devic
if (IS_ERR(base)) if (IS_ERR(base))
return PTR_ERR(base); return PTR_ERR(base);

View File

@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -1730,6 +1730,23 @@ static void pl011_put_poll_char(struct u @@ -1726,6 +1726,23 @@ static void pl011_put_poll_char(struct u
#endif /* CONFIG_CONSOLE_POLL */ #endif /* CONFIG_CONSOLE_POLL */
@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static int pl011_hwinit(struct uart_port *port) static int pl011_hwinit(struct uart_port *port)
{ {
struct uart_amba_port *uap = struct uart_amba_port *uap =
@@ -1746,7 +1763,7 @@ static int pl011_hwinit(struct uart_port @@ -1742,7 +1759,7 @@ static int pl011_hwinit(struct uart_port
if (retval) if (retval)
return retval; return retval;
@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* Clear pending error and receive interrupts */ /* Clear pending error and receive interrupts */
pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS | pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS |
@@ -2452,7 +2469,7 @@ static int pl011_console_setup(struct co @@ -2448,7 +2465,7 @@ static int pl011_console_setup(struct co
plat->init(); plat->init();
} }
@ -68,7 +68,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
if (uap->vendor->fixed_options) { if (uap->vendor->fixed_options) {
baud = uap->fixed_baud; baud = uap->fixed_baud;
@@ -2669,6 +2686,7 @@ static struct uart_driver amba_reg = { @@ -2665,6 +2682,7 @@ static struct uart_driver amba_reg = {
.cons = AMBA_CONSOLE, .cons = AMBA_CONSOLE,
}; };
@ -76,7 +76,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
static int pl011_probe_dt_alias(int index, struct device *dev) static int pl011_probe_dt_alias(int index, struct device *dev)
{ {
struct device_node *np; struct device_node *np;
@@ -2700,6 +2718,7 @@ static int pl011_probe_dt_alias(int inde @@ -2696,6 +2714,7 @@ static int pl011_probe_dt_alias(int inde
return ret; return ret;
} }

View File

@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -1435,6 +1435,7 @@ static bool pl011_tx_char(struct uart_am @@ -1431,6 +1431,7 @@ static bool pl011_tx_char(struct uart_am
return false; /* unable to transmit character */ return false; /* unable to transmit character */
pl011_write(c, uap, REG_DR); pl011_write(c, uap, REG_DR);

View File

@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
- reg - reg
--- a/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -2847,6 +2847,11 @@ static int pl011_probe(struct amba_devic @@ -2843,6 +2843,11 @@ static int pl011_probe(struct amba_devic
if (IS_ERR(uap->clk)) if (IS_ERR(uap->clk))
return PTR_ERR(uap->clk); return PTR_ERR(uap->clk);

View File

@ -29,7 +29,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -1496,6 +1496,10 @@ static bool pl011_tx_chars(struct uart_a @@ -1492,6 +1492,10 @@ static bool pl011_tx_chars(struct uart_a
if (likely(from_irq) && count-- == 0) if (likely(from_irq) && count-- == 0)
break; break;

View File

@ -244,7 +244,7 @@ bcm2835-mmc: uninitialized_var is no more
static inline int mmc_blk_part_switch(struct mmc_card *card, static inline int mmc_blk_part_switch(struct mmc_card *card,
unsigned int part_type); unsigned int part_type);
static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
@@ -2942,6 +2949,8 @@ static int mmc_blk_probe(struct mmc_card @@ -2944,6 +2951,8 @@ static int mmc_blk_probe(struct mmc_card
{ {
struct mmc_blk_data *md; struct mmc_blk_data *md;
int ret = 0; int ret = 0;
@ -253,7 +253,7 @@ bcm2835-mmc: uninitialized_var is no more
/* /*
* Check that the card supports the command class(es) we need. * Check that the card supports the command class(es) we need.
@@ -2949,7 +2958,16 @@ static int mmc_blk_probe(struct mmc_card @@ -2951,7 +2960,16 @@ static int mmc_blk_probe(struct mmc_card
if (!(card->csd.cmdclass & CCC_BLOCK_READ)) if (!(card->csd.cmdclass & CCC_BLOCK_READ))
return -ENODEV; return -ENODEV;
@ -271,7 +271,7 @@ bcm2835-mmc: uninitialized_var is no more
card->complete_wq = alloc_workqueue("mmc_complete", card->complete_wq = alloc_workqueue("mmc_complete",
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
@@ -2964,6 +2982,17 @@ static int mmc_blk_probe(struct mmc_card @@ -2966,6 +2984,17 @@ static int mmc_blk_probe(struct mmc_card
goto out_free; goto out_free;
} }
@ -291,7 +291,7 @@ bcm2835-mmc: uninitialized_var is no more
goto out; goto out;
--- a/drivers/mmc/core/core.c --- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c
@@ -1812,7 +1812,8 @@ EXPORT_SYMBOL(mmc_erase); @@ -1817,7 +1817,8 @@ EXPORT_SYMBOL(mmc_erase);
int mmc_can_erase(struct mmc_card *card) int mmc_can_erase(struct mmc_card *card)
{ {

View File

@ -12,8 +12,8 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/tty/serial/sc16is7xx.c --- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c
@@ -696,6 +696,8 @@ static bool sc16is7xx_port_irq(struct sc @@ -708,6 +708,8 @@ static bool sc16is7xx_port_irq(struct sc
rxlen = sc16is7xx_port_read(port, SC16IS7XX_RXLVL_REG);
if (rxlen) if (rxlen)
sc16is7xx_handle_rx(port, rxlen, iir); sc16is7xx_handle_rx(port, rxlen, iir);
+ else + else

View File

@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
#define USB_VENDOR_ID_BELKIN 0x050d #define USB_VENDOR_ID_BELKIN 0x050d
#define USB_DEVICE_ID_FLIP_KVM 0x3201 #define USB_DEVICE_ID_FLIP_KVM 0x3201
@@ -1318,6 +1321,9 @@ @@ -1319,6 +1322,9 @@
#define USB_VENDOR_ID_XAT 0x2505 #define USB_VENDOR_ID_XAT 0x2505
#define USB_DEVICE_ID_XAT_CSR 0x0220 #define USB_DEVICE_ID_XAT_CSR 0x0220
@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
@@ -198,6 +199,7 @@ static const struct hid_device_id hid_qu @@ -199,6 +200,7 @@ static const struct hid_device_id hid_qu
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },

View File

@ -38,7 +38,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
regcache_cache_bypass(s->regmap, false); regcache_cache_bypass(s->regmap, false);
/* Put LCR back to the normal mode */ /* Put LCR back to the normal mode */
@@ -842,7 +843,7 @@ static unsigned int sc16is7xx_get_mctrl( @@ -854,7 +855,7 @@ static unsigned int sc16is7xx_get_mctrl(
/* DCD and DSR are not wired and CTS/RTS is handled automatically /* DCD and DSR are not wired and CTS/RTS is handled automatically
* so just indicate DSR and CAR asserted * so just indicate DSR and CAR asserted
*/ */
@ -47,7 +47,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
} }
static void sc16is7xx_set_mctrl(struct uart_port *port, unsigned int mctrl) static void sc16is7xx_set_mctrl(struct uart_port *port, unsigned int mctrl)
@@ -929,14 +930,19 @@ static void sc16is7xx_set_termios(struct @@ -941,14 +942,19 @@ static void sc16is7xx_set_termios(struct
regcache_cache_bypass(s->regmap, true); regcache_cache_bypass(s->regmap, true);
sc16is7xx_port_write(port, SC16IS7XX_XON1_REG, termios->c_cc[VSTART]); sc16is7xx_port_write(port, SC16IS7XX_XON1_REG, termios->c_cc[VSTART]);
sc16is7xx_port_write(port, SC16IS7XX_XOFF1_REG, termios->c_cc[VSTOP]); sc16is7xx_port_write(port, SC16IS7XX_XOFF1_REG, termios->c_cc[VSTOP]);

View File

@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -17523,6 +17523,14 @@ T: git git://linuxtv.org/media_tree.git @@ -17526,6 +17526,14 @@ T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
F: drivers/media/i2c/imx412.c F: drivers/media/i2c/imx412.c

View File

@ -132,7 +132,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
+... +...
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -17537,6 +17537,7 @@ M: Raspberry Pi Kernel Maintenance <kern @@ -17540,6 +17540,7 @@ M: Raspberry Pi Kernel Maintenance <kern
L: linux-media@vger.kernel.org L: linux-media@vger.kernel.org
S: Maintained S: Maintained
T: git git://linuxtv.org/media_tree.git T: git git://linuxtv.org/media_tree.git

View File

@ -157,7 +157,7 @@ Signed-off-by: Joerg Quinten <aBUGSworstnightmare@gmail.com>
static const struct drm_display_mode innolux_at070tn92_mode = { static const struct drm_display_mode innolux_at070tn92_mode = {
.clock = 33333, .clock = 33333,
.hdisplay = 800, .hdisplay = 800,
@@ -4666,6 +4698,9 @@ static const struct of_device_id platfor @@ -4667,6 +4699,9 @@ static const struct of_device_id platfor
.compatible = "innolux,at043tn24", .compatible = "innolux,at043tn24",
.data = &innolux_at043tn24, .data = &innolux_at043tn24,
}, { }, {

View File

@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
--- a/drivers/gpu/drm/panel/panel-simple.c --- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -3765,6 +3765,31 @@ static const struct panel_desc qishenglo @@ -3766,6 +3766,31 @@ static const struct panel_desc qishenglo
.connector_type = DRM_MODE_CONNECTOR_DPI, .connector_type = DRM_MODE_CONNECTOR_DPI,
}; };
@ -47,7 +47,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
static const struct display_timing rocktech_rk070er9427_timing = { static const struct display_timing rocktech_rk070er9427_timing = {
.pixelclock = { 26400000, 33300000, 46800000 }, .pixelclock = { 26400000, 33300000, 46800000 },
.hactive = { 800, 800, 800 }, .hactive = { 800, 800, 800 },
@@ -4845,6 +4870,9 @@ static const struct of_device_id platfor @@ -4846,6 +4871,9 @@ static const struct of_device_id platfor
.compatible = "qishenglong,gopher2b-lcd", .compatible = "qishenglong,gopher2b-lcd",
.data = &qishenglong_gopher2b_lcd, .data = &qishenglong_gopher2b_lcd,
}, { }, {

View File

@ -132,7 +132,7 @@ Signed-off-by: Lee Jackson <info@arducam.com>
+... +...
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -17541,6 +17541,14 @@ F: Documentation/devicetree/bindings/med @@ -17544,6 +17544,14 @@ F: Documentation/devicetree/bindings/med
F: Documentation/devicetree/bindings/media/i2c/imx477.yaml F: Documentation/devicetree/bindings/media/i2c/imx477.yaml
F: drivers/media/i2c/imx477.c F: drivers/media/i2c/imx477.c

View File

@ -46,7 +46,7 @@ Acked-by: Maxime Ripard <maxime@cerno.tech>
static const struct drm_display_mode giantplus_gpg482739qs5_mode = { static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
.clock = 9000, .clock = 9000,
.hdisplay = 480, .hdisplay = 480,
@@ -4708,6 +4734,9 @@ static const struct of_device_id platfor @@ -4709,6 +4735,9 @@ static const struct of_device_id platfor
.compatible = "friendlyarm,hd702e", .compatible = "friendlyarm,hd702e",
.data = &friendlyarm_hd702e, .data = &friendlyarm_hd702e,
}, { }, {

View File

@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
--- a/drivers/mmc/core/block.c --- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c
@@ -1886,7 +1886,11 @@ static void mmc_blk_mq_rw_recovery(struc @@ -1888,7 +1888,11 @@ static void mmc_blk_mq_rw_recovery(struc
return; return;
} }

View File

@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -1182,6 +1182,10 @@ config MIPS_MSC @@ -1183,6 +1183,10 @@ config MIPS_MSC
config SYNC_R4K config SYNC_R4K
bool bool

View File

@ -1,6 +1,6 @@
--- a/drivers/net/usb/rndis_host.c --- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c
@@ -630,6 +630,16 @@ static const struct driver_info zte_rndi @@ -601,6 +601,16 @@ static const struct driver_info rndis_po
.tx_fixup = rndis_tx_fixup, .tx_fixup = rndis_tx_fixup,
}; };
@ -17,7 +17,7 @@
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static const struct usb_device_id products [] = { static const struct usb_device_id products [] = {
@@ -666,6 +676,36 @@ static const struct usb_device_id produc @@ -627,6 +637,36 @@ static const struct usb_device_id produc
USB_INTERFACE_INFO(USB_CLASS_WIRELESS_CONTROLLER, 1, 3), USB_INTERFACE_INFO(USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
.driver_info = (unsigned long) &rndis_info, .driver_info = (unsigned long) &rndis_info,
}, { }, {

View File

@ -48,7 +48,7 @@
static void phylink_mac_pcs_get_state(struct phylink *pl, static void phylink_mac_pcs_get_state(struct phylink *pl,
struct phylink_link_state *state) struct phylink_link_state *state)
{ {
@@ -3015,6 +3014,52 @@ void phylink_mii_c22_pcs_get_state(struc @@ -2978,6 +2977,52 @@ void phylink_mii_c22_pcs_get_state(struc
EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_get_state); EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_get_state);
/** /**
@ -101,7 +101,7 @@
* phylink_mii_c22_pcs_set_advertisement() - configure the clause 37 PCS * phylink_mii_c22_pcs_set_advertisement() - configure the clause 37 PCS
* advertisement * advertisement
* @pcs: a pointer to a &struct mdio_device. * @pcs: a pointer to a &struct mdio_device.
@@ -3086,6 +3131,46 @@ int phylink_mii_c22_pcs_set_advertisemen @@ -3049,6 +3094,46 @@ int phylink_mii_c22_pcs_set_advertisemen
EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_set_advertisement); EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_set_advertisement);
/** /**

View File

@ -1,29 +0,0 @@
From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 31 Aug 2023 21:48:38 +0200
Subject: [PATCH] netfilter: nf_tables: ignore -EOPNOTSUPP on flowtable device
offload setup
On many embedded devices, it is common to configure flowtable offloading for
a mix of different devices, some of which have hardware offload support and
some of which don't.
The current code limits the ability of user space to properly set up such a
configuration by only allowing adding devices with hardware offload support to
a offload-enabled flowtable.
Given that offload-enabled flowtables also imply fallback to pure software
offloading, this limitation makes little sense.
Fix it by not bailing out when the offload setup returns -EOPNOTSUPP
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -7709,7 +7709,7 @@ static int nft_register_flowtable_net_ho
err = flowtable->data.type->setup(&flowtable->data,
hook->ops.dev,
FLOW_BLOCK_BIND);
- if (err < 0)
+ if (err < 0 && err != -EOPNOTSUPP)
goto err_unregister_net_hooks;
err = nf_register_net_hook(net, &hook->ops);

View File

@ -12,7 +12,7 @@
{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
--- a/drivers/usb/serial/option.c --- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c
@@ -2262,6 +2262,12 @@ static const struct usb_device_id option @@ -2266,6 +2266,12 @@ static const struct usb_device_id option
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a2, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a2, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff), /* Fibocom FM101-GL (laptop MBIM) */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff), /* Fibocom FM101-GL (laptop MBIM) */
.driver_info = RSVD(4) }, .driver_info = RSVD(4) },

View File

@ -17,7 +17,7 @@ Link: https://lore.kernel.org/r/20220515210048.483898-5-robimarko@gmail.com
--- a/drivers/clk/qcom/gcc-ipq8074.c --- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -3183,6 +3183,24 @@ static struct clk_branch gcc_nss_ptp_ref @@ -3177,6 +3177,24 @@ static struct clk_branch gcc_nss_ptp_ref
}, },
}; };
@ -42,7 +42,7 @@ Link: https://lore.kernel.org/r/20220515210048.483898-5-robimarko@gmail.com
static struct clk_branch gcc_nssnoc_ce_apb_clk = { static struct clk_branch gcc_nssnoc_ce_apb_clk = {
.halt_reg = 0x6830c, .halt_reg = 0x6830c,
.clkr = { .clkr = {
@@ -4655,6 +4673,7 @@ static struct clk_regmap *gcc_ipq8074_cl @@ -4649,6 +4667,7 @@ static struct clk_regmap *gcc_ipq8074_cl
[GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr, [GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
[GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr, [GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr, [GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,

View File

@ -15,7 +15,7 @@ Link: https://lore.kernel.org/r/20220515210048.483898-9-robimarko@gmail.com
--- a/drivers/clk/qcom/Kconfig --- a/drivers/clk/qcom/Kconfig
+++ b/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig
@@ -166,6 +166,7 @@ config IPQ_LCC_806X @@ -167,6 +167,7 @@ config IPQ_LCC_806X
config IPQ_GCC_8074 config IPQ_GCC_8074
tristate "IPQ8074 Global Clock Controller" tristate "IPQ8074 Global Clock Controller"
@ -33,7 +33,7 @@ Link: https://lore.kernel.org/r/20220515210048.483898-9-robimarko@gmail.com
#include "reset.h" #include "reset.h"
enum { enum {
@@ -4408,6 +4409,22 @@ static struct clk_branch gcc_pcie0_axi_s @@ -4402,6 +4403,22 @@ static struct clk_branch gcc_pcie0_axi_s
}, },
}; };
@ -56,7 +56,7 @@ Link: https://lore.kernel.org/r/20220515210048.483898-9-robimarko@gmail.com
static const struct alpha_pll_config ubi32_pll_config = { static const struct alpha_pll_config ubi32_pll_config = {
.l = 0x4e, .l = 0x4e,
.config_ctl_val = 0x200d4aa8, .config_ctl_val = 0x200d4aa8,
@@ -4811,6 +4828,11 @@ static const struct qcom_reset_map gcc_i @@ -4805,6 +4822,11 @@ static const struct qcom_reset_map gcc_i
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 }, [GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
}; };
@ -68,7 +68,7 @@ Link: https://lore.kernel.org/r/20220515210048.483898-9-robimarko@gmail.com
static const struct of_device_id gcc_ipq8074_match_table[] = { static const struct of_device_id gcc_ipq8074_match_table[] = {
{ .compatible = "qcom,gcc-ipq8074" }, { .compatible = "qcom,gcc-ipq8074" },
{ } { }
@@ -4833,6 +4855,8 @@ static const struct qcom_cc_desc gcc_ipq @@ -4827,6 +4849,8 @@ static const struct qcom_cc_desc gcc_ipq
.num_resets = ARRAY_SIZE(gcc_ipq8074_resets), .num_resets = ARRAY_SIZE(gcc_ipq8074_resets),
.clk_hws = gcc_ipq8074_hws, .clk_hws = gcc_ipq8074_hws,
.num_clk_hws = ARRAY_SIZE(gcc_ipq8074_hws), .num_clk_hws = ARRAY_SIZE(gcc_ipq8074_hws),

View File

@ -30,7 +30,7 @@ Signed-off-by: Baruch Siach <baruch.siach@siklu.com>
--- a/drivers/pci/controller/dwc/pcie-tegra194.c --- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -193,12 +193,6 @@ @@ -194,12 +194,6 @@
#define GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC_MASK GENMASK(23, 8) #define GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC_MASK GENMASK(23, 8)
#define GEN3_EQ_CONTROL_OFF_FB_MODE_MASK GENMASK(3, 0) #define GEN3_EQ_CONTROL_OFF_FB_MODE_MASK GENMASK(3, 0)

View File

@ -33,7 +33,7 @@ Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
extern const struct clk_ops clk_byte2_ops; extern const struct clk_ops clk_byte2_ops;
--- a/drivers/clk/qcom/clk-rcg2.c --- a/drivers/clk/qcom/clk-rcg2.c
+++ b/drivers/clk/qcom/clk-rcg2.c +++ b/drivers/clk/qcom/clk-rcg2.c
@@ -477,6 +477,13 @@ const struct clk_ops clk_rcg2_floor_ops @@ -471,6 +471,13 @@ const struct clk_ops clk_rcg2_floor_ops
}; };
EXPORT_SYMBOL_GPL(clk_rcg2_floor_ops); EXPORT_SYMBOL_GPL(clk_rcg2_floor_ops);

View File

@ -15,7 +15,7 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>
--- a/drivers/clk/qcom/gcc-ipq8074.c --- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -4826,6 +4826,7 @@ static const struct qcom_reset_map gcc_i @@ -4820,6 +4820,7 @@ static const struct qcom_reset_map gcc_i
[GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 }, [GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 },
[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 }, [GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 }, [GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },

View File

@ -17,7 +17,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
--- a/drivers/clk/qcom/gcc-ipq8074.c --- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -4827,6 +4827,20 @@ static const struct qcom_reset_map gcc_i @@ -4821,6 +4821,20 @@ static const struct qcom_reset_map gcc_i
[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 }, [GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 }, [GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
[GCC_WCSSAON_RESET] = { 0x59010, 0 }, [GCC_WCSSAON_RESET] = { 0x59010, 0 },

View File

@ -18,7 +18,7 @@ Link: https://lore.kernel.org/r/ebc2d340d566fa2d43127e253d5b8b134a87a78e.1630389
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -669,6 +669,89 @@ @@ -664,6 +664,89 @@
}; };
}; };

View File

@ -32,7 +32,7 @@ Link: https://lore.kernel.org/r/20211013105541.68045-3-bhupesh.sharma@linaro.org
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -201,7 +201,6 @@ @@ -195,7 +195,6 @@
#dma-cells = <1>; #dma-cells = <1>;
qcom,ee = <1>; qcom,ee = <1>;
qcom,controlled-remotely; qcom,controlled-remotely;

View File

@ -31,7 +31,7 @@ Link: https://lore.kernel.org/r/20211013105541.68045-4-bhupesh.sharma@linaro.org
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -346,9 +346,8 @@ @@ -341,9 +341,8 @@
compatible = "qcom,bam-v1.7.0"; compatible = "qcom,bam-v1.7.0";
reg = <0x0 0x07984000 0x0 0x1a000>; reg = <0x0 0x07984000 0x0 0x1a000>;
interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;

View File

@ -16,7 +16,7 @@ Link: https://lore.kernel.org/r/fcf41277cf8529437374a5c10b2b1fcad30cd7c2.1640587
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -425,6 +425,7 @@ @@ -420,6 +420,7 @@
linux,pci-domain = <0>; linux,pci-domain = <0>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
num-lanes = <1>; num-lanes = <1>;

View File

@ -18,7 +18,7 @@ Link: https://lore.kernel.org/r/4f4df55cf44cd0fd7d773aca171d4f48662fb1a5.1642704
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -747,7 +747,7 @@ @@ -742,7 +742,7 @@
snps,hird-threshold = /bits/ 8 <0x0>; snps,hird-threshold = /bits/ 8 <0x0>;
snps,dis_u2_susphy_quirk; snps,dis_u2_susphy_quirk;
snps,dis_u3_susphy_quirk; snps,dis_u3_susphy_quirk;

View File

@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -742,12 +742,13 @@ @@ -737,12 +737,13 @@
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
phys = <&qusb_phy_0>, <&usb0_ssphy>; phys = <&qusb_phy_0>, <&usb0_ssphy>;
phy-names = "usb2-phy", "usb3-phy"; phy-names = "usb2-phy", "usb3-phy";

View File

@ -15,7 +15,7 @@ Link: https://lore.kernel.org/r/1644334525-11577-3-git-send-email-quic_kathirav@
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -373,6 +373,8 @@ @@ -368,6 +368,8 @@
intc: interrupt-controller@b000000 { intc: interrupt-controller@b000000 {
compatible = "qcom,msm-qgic2"; compatible = "qcom,msm-qgic2";
@ -24,7 +24,7 @@ Link: https://lore.kernel.org/r/1644334525-11577-3-git-send-email-quic_kathirav@
interrupt-controller; interrupt-controller;
#interrupt-cells = <0x3>; #interrupt-cells = <0x3>;
reg = <0x0 0x0b000000 0x0 0x1000>, /*GICD*/ reg = <0x0 0x0b000000 0x0 0x1000>, /*GICD*/
@@ -380,6 +382,13 @@ @@ -375,6 +377,13 @@
<0x0 0x0b001000 0x0 0x1000>, /*GICH*/ <0x0 0x0b001000 0x0 0x1000>, /*GICH*/
<0x0 0x0b004000 0x0 0x1000>; /*GICV*/ <0x0 0x0b004000 0x0 0x1000>; /*GICV*/
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;

View File

@ -16,7 +16,7 @@ Link: https://lore.kernel.org/r/1643819709-5410-3-git-send-email-quic_kathirav@q
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -528,7 +528,6 @@ @@ -523,7 +523,6 @@
ranges; ranges;
compatible = "arm,armv7-timer-mem"; compatible = "arm,armv7-timer-mem";
reg = <0x0 0x0b120000 0x0 0x1000>; reg = <0x0 0x0b120000 0x0 0x1000>;

View File

@ -15,7 +15,7 @@ Link: https://lore.kernel.org/r/20220405063451.12011-2-krzysztof.kozlowski@linar
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -322,8 +322,8 @@ @@ -317,8 +317,8 @@
<&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>; <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
clock-names = "iface", "core"; clock-names = "iface", "core";
clock-frequency = <400000>; clock-frequency = <400000>;
@ -26,7 +26,7 @@ Link: https://lore.kernel.org/r/20220405063451.12011-2-krzysztof.kozlowski@linar
status = "disabled"; status = "disabled";
}; };
@@ -337,8 +337,8 @@ @@ -332,8 +332,8 @@
<&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>; <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>;
clock-names = "iface", "core"; clock-names = "iface", "core";
clock-frequency = <400000>; clock-frequency = <400000>;

View File

@ -14,7 +14,7 @@ Link: https://lore.kernel.org/r/20220405063451.12011-3-krzysztof.kozlowski@linar
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -318,9 +318,9 @@ @@ -313,9 +313,9 @@
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x078b6000 0x0 0x600>; reg = <0x0 0x078b6000 0x0 0x600>;
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
@ -27,7 +27,7 @@ Link: https://lore.kernel.org/r/20220405063451.12011-3-krzysztof.kozlowski@linar
clock-frequency = <400000>; clock-frequency = <400000>;
dmas = <&blsp_dma 14>, <&blsp_dma 15>; dmas = <&blsp_dma 14>, <&blsp_dma 15>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
@@ -333,9 +333,9 @@ @@ -328,9 +328,9 @@
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0x078b7000 0x0 0x600>; reg = <0x0 0x078b7000 0x0 0x600>;
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;

View File

@ -23,7 +23,7 @@ Link: https://lore.kernel.org/r/20220228123019.382037-7-bhupesh.sharma@linaro.or
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -681,7 +681,6 @@ @@ -676,7 +676,6 @@
reg = <0x0 0x78000 0x0 0x1C4>; reg = <0x0 0x78000 0x0 0x1C4>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
@ -31,7 +31,7 @@ Link: https://lore.kernel.org/r/20220228123019.382037-7-bhupesh.sharma@linaro.or
ranges; ranges;
clocks = <&gcc GCC_USB0_AUX_CLK>, clocks = <&gcc GCC_USB0_AUX_CLK>,
@@ -693,12 +692,13 @@ @@ -688,12 +687,13 @@
reset-names = "phy","common"; reset-names = "phy","common";
status = "disabled"; status = "disabled";

View File

@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -641,7 +641,7 @@ @@ -636,7 +636,7 @@
status = "disabled"; status = "disabled";
}; };
@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
compatible = "qcom,ipq6018-dwc3", "qcom,dwc3"; compatible = "qcom,ipq6018-dwc3", "qcom,dwc3";
reg = <0x0 0x070F8800 0x0 0x400>; reg = <0x0 0x070F8800 0x0 0x400>;
#address-cells = <2>; #address-cells = <2>;
@@ -718,7 +718,7 @@ @@ -713,7 +713,7 @@
status = "disabled"; status = "disabled";
}; };
@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
compatible = "qcom,ipq6018-dwc3", "qcom,dwc3"; compatible = "qcom,ipq6018-dwc3", "qcom,dwc3";
reg = <0x0 0x8AF8800 0x0 0x400>; reg = <0x0 0x8AF8800 0x0 0x400>;
#address-cells = <2>; #address-cells = <2>;
@@ -744,7 +744,7 @@ @@ -739,7 +739,7 @@
resets = <&gcc GCC_USB0_BCR>; resets = <&gcc GCC_USB0_BCR>;
status = "disabled"; status = "disabled";

View File

@ -15,7 +15,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -650,7 +650,7 @@ @@ -645,7 +645,7 @@
clocks = <&gcc GCC_USB1_MASTER_CLK>, clocks = <&gcc GCC_USB1_MASTER_CLK>,
<&gcc GCC_USB1_SLEEP_CLK>, <&gcc GCC_USB1_SLEEP_CLK>,
<&gcc GCC_USB1_MOCK_UTMI_CLK>; <&gcc GCC_USB1_MOCK_UTMI_CLK>;
@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
"sleep", "sleep",
"mock_utmi"; "mock_utmi";
@@ -729,8 +729,8 @@ @@ -724,8 +724,8 @@
<&gcc GCC_USB0_MASTER_CLK>, <&gcc GCC_USB0_MASTER_CLK>,
<&gcc GCC_USB0_SLEEP_CLK>, <&gcc GCC_USB0_SLEEP_CLK>,
<&gcc GCC_USB0_MOCK_UTMI_CLK>; <&gcc GCC_USB0_MOCK_UTMI_CLK>;

View File

@ -21,7 +21,7 @@ Link: https://lore.kernel.org/r/20220626105800.35586-1-david@ixit.cz
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -523,9 +523,9 @@ @@ -518,9 +518,9 @@
}; };
timer@b120000 { timer@b120000 {
@ -34,7 +34,7 @@ Link: https://lore.kernel.org/r/20220626105800.35586-1-david@ixit.cz
compatible = "arm,armv7-timer-mem"; compatible = "arm,armv7-timer-mem";
reg = <0x0 0x0b120000 0x0 0x1000>; reg = <0x0 0x0b120000 0x0 0x1000>;
@@ -533,49 +533,49 @@ @@ -528,49 +528,49 @@
frame-number = <0>; frame-number = <0>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;

View File

@ -16,7 +16,7 @@ Link: https://lore.kernel.org/r/20220526204248.832139-1-krzysztof.kozlowski@lina
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -321,7 +321,7 @@ @@ -316,7 +316,7 @@
clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>, clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>; <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
@ -25,7 +25,7 @@ Link: https://lore.kernel.org/r/20220526204248.832139-1-krzysztof.kozlowski@lina
dmas = <&blsp_dma 14>, <&blsp_dma 15>; dmas = <&blsp_dma 14>, <&blsp_dma 15>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
status = "disabled"; status = "disabled";
@@ -336,7 +336,7 @@ @@ -331,7 +331,7 @@
clocks = <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>, clocks = <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>; <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";

View File

@ -16,7 +16,7 @@ Link: https://lore.kernel.org/r/20220517070113.18023-10-krzysztof.kozlowski@lina
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -619,6 +619,7 @@ @@ -614,6 +614,7 @@
glink-edge { glink-edge {
interrupts = <GIC_SPI 321 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 321 IRQ_TYPE_EDGE_RISING>;

View File

@ -44,7 +44,7 @@ Link: https://lore.kernel.org/r/20220604153003.55172-1-robimarko@gmail.com
pinctrl-names = "default"; pinctrl-names = "default";
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -282,7 +282,7 @@ @@ -277,7 +277,7 @@
status = "disabled"; status = "disabled";
}; };
@ -53,7 +53,7 @@ Link: https://lore.kernel.org/r/20220604153003.55172-1-robimarko@gmail.com
compatible = "qcom,spi-qup-v2.2.1"; compatible = "qcom,spi-qup-v2.2.1";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@@ -297,7 +297,7 @@ @@ -292,7 +292,7 @@
status = "disabled"; status = "disabled";
}; };
@ -62,7 +62,7 @@ Link: https://lore.kernel.org/r/20220604153003.55172-1-robimarko@gmail.com
compatible = "qcom,spi-qup-v2.2.1"; compatible = "qcom,spi-qup-v2.2.1";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@@ -312,7 +312,7 @@ @@ -307,7 +307,7 @@
status = "disabled"; status = "disabled";
}; };
@ -71,7 +71,7 @@ Link: https://lore.kernel.org/r/20220604153003.55172-1-robimarko@gmail.com
compatible = "qcom,i2c-qup-v2.2.1"; compatible = "qcom,i2c-qup-v2.2.1";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@@ -327,7 +327,7 @@ @@ -322,7 +322,7 @@
status = "disabled"; status = "disabled";
}; };

View File

@ -16,7 +16,7 @@ Link: https://lore.kernel.org/r/20220705114032.22787-4-johan+linaro@kernel.org
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -699,7 +699,7 @@ @@ -694,7 +694,7 @@
<0x0 0x00078800 0x0 0x1F8>, /* PCS */ <0x0 0x00078800 0x0 0x1F8>, /* PCS */
<0x0 0x00078600 0x0 0x044>; /* PCS misc */ <0x0 0x00078600 0x0 0x044>; /* PCS misc */
#phy-cells = <0>; #phy-cells = <0>;

View File

@ -14,7 +14,7 @@ Link: https://lore.kernel.org/r/20220909092035.223915-6-krzysztof.kozlowski@lina
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -258,7 +258,7 @@ @@ -253,7 +253,7 @@
}; };
tcsr: syscon@1937000 { tcsr: syscon@1937000 {

View File

@ -1,49 +0,0 @@
From f5e303aefc06b7508d7a490f9a2d80e4dc134c70 Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Date: Fri, 9 Sep 2022 11:20:31 +0200
Subject: [PATCH] arm64: dts: qcom: ipq6018: switch TCSR mutex to MMIO
The TCSR mutex bindings allow device to be described only with address
space (so it uses MMIO, not syscon regmap). This seems reasonable as
TCSR mutex is actually a dedicated IO address space and it also fixes DT
schema checks:
qcom/ipq6018-cp01-c1.dtb: hwlock: 'reg' is a required property
qcom/ipq6018-cp01-c1.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+'
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220909092035.223915-12-krzysztof.kozlowski@linaro.org
---
arch/arm64/boot/dts/qcom/ipq6018.dtsi | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -129,12 +129,6 @@
};
};
- tcsr_mutex: hwlock {
- compatible = "qcom,tcsr-mutex";
- syscon = <&tcsr_mutex_regs 0 0x80>;
- #hwlock-cells = <1>;
- };
-
pmuv8: pmu {
compatible = "arm,cortex-a53-pmu";
interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) |
@@ -252,9 +246,10 @@
#reset-cells = <1>;
};
- tcsr_mutex_regs: syscon@1905000 {
- compatible = "syscon";
- reg = <0x0 0x01905000 0x0 0x8000>;
+ tcsr_mutex: hwlock@1905000 {
+ compatible = "qcom,ipq6018-tcsr-mutex", "qcom,tcsr-mutex";
+ reg = <0x0 0x01905000 0x0 0x1000>;
+ #hwlock-cells = <1>;
};
tcsr: syscon@1937000 {

View File

@ -10,7 +10,7 @@
static struct flow_dissector flow_keys_bonding __read_mostly; static struct flow_dissector flow_keys_bonding __read_mostly;
/*-------------------------- Forward declarations ---------------------------*/ /*-------------------------- Forward declarations ---------------------------*/
@@ -4109,6 +4112,23 @@ static int bond_get_lowest_level_rcu(str @@ -4115,6 +4118,23 @@ static int bond_get_lowest_level_rcu(str
} }
#endif #endif
@ -34,7 +34,7 @@
static void bond_get_stats(struct net_device *bond_dev, static void bond_get_stats(struct net_device *bond_dev,
struct rtnl_link_stats64 *stats) struct rtnl_link_stats64 *stats)
{ {
@@ -5441,6 +5461,10 @@ static void bond_destructor(struct net_d @@ -5447,6 +5467,10 @@ static void bond_destructor(struct net_d
if (bond->rr_tx_counter) if (bond->rr_tx_counter)
free_percpu(bond->rr_tx_counter); free_percpu(bond->rr_tx_counter);
@ -45,7 +45,7 @@
} }
void bond_setup(struct net_device *bond_dev) void bond_setup(struct net_device *bond_dev)
@@ -6014,7 +6038,14 @@ int bond_create(struct net *net, const c @@ -6020,7 +6044,14 @@ int bond_create(struct net *net, const c
bond_work_init_all(bond); bond_work_init_all(bond);

View File

@ -84,7 +84,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
} }
/* /*
@@ -312,12 +320,19 @@ static int __clk_rcg2_configure(struct c @@ -306,12 +314,19 @@ static int __clk_rcg2_configure(struct c
static int clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f) static int clk_rcg2_configure(struct clk_rcg2 *rcg, const struct freq_tbl *f)
{ {
int ret; int ret;
@ -105,7 +105,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
} }
static int __clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate, static int __clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -448,7 +463,7 @@ static int clk_rcg2_set_duty_cycle(struc @@ -442,7 +457,7 @@ static int clk_rcg2_set_duty_cycle(struc
if (ret) if (ret)
return ret; return ret;
@ -114,7 +114,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
} }
const struct clk_ops clk_rcg2_ops = { const struct clk_ops clk_rcg2_ops = {
@@ -910,7 +925,7 @@ static int clk_gfx3d_set_rate_and_parent @@ -904,7 +919,7 @@ static int clk_gfx3d_set_rate_and_parent
if (ret) if (ret)
return ret; return ret;
@ -123,7 +123,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
} }
static int clk_gfx3d_set_rate(struct clk_hw *hw, unsigned long rate, static int clk_gfx3d_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -1022,7 +1037,7 @@ static int clk_rcg2_shared_enable(struct @@ -1016,7 +1031,7 @@ static int clk_rcg2_shared_enable(struct
if (ret) if (ret)
return ret; return ret;
@ -132,7 +132,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
if (ret) if (ret)
return ret; return ret;
@@ -1053,7 +1068,7 @@ static void clk_rcg2_shared_disable(stru @@ -1047,7 +1062,7 @@ static void clk_rcg2_shared_disable(stru
regmap_write(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG, regmap_write(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG,
rcg->safe_src_index << CFG_SRC_SEL_SHIFT); rcg->safe_src_index << CFG_SRC_SEL_SHIFT);

View File

@ -31,7 +31,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
}, },
}, },
}; };
@@ -150,6 +151,7 @@ static struct clk_alpha_pll gpll6_main = @@ -148,6 +149,7 @@ static struct clk_alpha_pll gpll6_main =
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_alpha_pll_ops, .ops = &clk_alpha_pll_ops,
@ -39,7 +39,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
}, },
}, },
}; };
@@ -181,6 +183,7 @@ static struct clk_alpha_pll gpll4_main = @@ -178,6 +180,7 @@ static struct clk_alpha_pll gpll4_main =
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_alpha_pll_ops, .ops = &clk_alpha_pll_ops,
@ -47,7 +47,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
}, },
}, },
}; };
@@ -211,6 +214,7 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_s @@ -207,6 +210,7 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_s
.freq_tbl = ftbl_pcnoc_bfdcd_clk_src, .freq_tbl = ftbl_pcnoc_bfdcd_clk_src,
.hid_width = 5, .hid_width = 5,
.parent_map = gcc_xo_gpll0_gpll0_out_main_div2_map, .parent_map = gcc_xo_gpll0_gpll0_out_main_div2_map,
@ -55,7 +55,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "pcnoc_bfdcd_clk_src", .name = "pcnoc_bfdcd_clk_src",
.parent_data = gcc_xo_gpll0_gpll0_out_main_div2, .parent_data = gcc_xo_gpll0_gpll0_out_main_div2,
@@ -232,6 +236,7 @@ static struct clk_alpha_pll gpll2_main = @@ -228,6 +232,7 @@ static struct clk_alpha_pll gpll2_main =
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_alpha_pll_ops, .ops = &clk_alpha_pll_ops,
@ -63,7 +63,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
}, },
}, },
}; };
@@ -456,6 +461,7 @@ static struct clk_branch gcc_sleep_clk_s @@ -450,6 +455,7 @@ static struct clk_branch gcc_sleep_clk_s
}, },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch2_ops, .ops = &clk_branch2_ops,
@ -71,7 +71,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
}, },
}, },
}; };
@@ -960,6 +966,7 @@ static struct clk_rcg2 nss_crypto_clk_sr @@ -954,6 +960,7 @@ static struct clk_rcg2 nss_crypto_clk_sr
.mnd_width = 16, .mnd_width = 16,
.hid_width = 5, .hid_width = 5,
.parent_map = gcc_xo_nss_crypto_pll_gpll0_map, .parent_map = gcc_xo_nss_crypto_pll_gpll0_map,
@ -79,7 +79,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "nss_crypto_clk_src", .name = "nss_crypto_clk_src",
.parent_data = gcc_xo_nss_crypto_pll_gpll0, .parent_data = gcc_xo_nss_crypto_pll_gpll0,
@@ -1131,6 +1138,7 @@ static struct clk_rcg2 nss_ubi0_clk_src @@ -1125,6 +1132,7 @@ static struct clk_rcg2 nss_ubi0_clk_src
.freq_tbl = ftbl_nss_ubi_clk_src, .freq_tbl = ftbl_nss_ubi_clk_src,
.hid_width = 5, .hid_width = 5,
.parent_map = gcc_xo_ubi32_gpll0_gpll2_gpll4_gpll6_map, .parent_map = gcc_xo_ubi32_gpll0_gpll2_gpll4_gpll6_map,
@ -87,7 +87,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
.clkr.hw.init = &(struct clk_init_data){ .clkr.hw.init = &(struct clk_init_data){
.name = "nss_ubi0_clk_src", .name = "nss_ubi0_clk_src",
.parent_data = gcc_xo_ubi32_pll_gpll0_gpll2_gpll4_gpll6, .parent_data = gcc_xo_ubi32_pll_gpll0_gpll2_gpll4_gpll6,
@@ -1869,7 +1877,7 @@ static struct clk_branch gcc_apss_ahb_cl @@ -1863,7 +1871,7 @@ static struct clk_branch gcc_apss_ahb_cl
.parent_hws = (const struct clk_hw *[]){ .parent_hws = (const struct clk_hw *[]){
&apss_ahb_postdiv_clk_src.clkr.hw }, &apss_ahb_postdiv_clk_src.clkr.hw },
.num_parents = 1, .num_parents = 1,
@ -96,7 +96,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
.ops = &clk_branch2_ops, .ops = &clk_branch2_ops,
}, },
}, },
@@ -1891,11 +1899,13 @@ static struct clk_rcg2 system_noc_bfdcd_ @@ -1885,11 +1893,13 @@ static struct clk_rcg2 system_noc_bfdcd_
.freq_tbl = ftbl_system_noc_bfdcd_clk_src, .freq_tbl = ftbl_system_noc_bfdcd_clk_src,
.hid_width = 5, .hid_width = 5,
.parent_map = gcc_xo_gpll0_gpll6_gpll0_out_main_div2_map, .parent_map = gcc_xo_gpll0_gpll6_gpll0_out_main_div2_map,
@ -110,7 +110,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
}, },
}; };
@@ -1945,7 +1955,7 @@ static struct clk_branch gcc_apss_axi_cl @@ -1939,7 +1949,7 @@ static struct clk_branch gcc_apss_axi_cl
.parent_hws = (const struct clk_hw *[]){ .parent_hws = (const struct clk_hw *[]){
&apss_axi_clk_src.clkr.hw }, &apss_axi_clk_src.clkr.hw },
.num_parents = 1, .num_parents = 1,
@ -119,7 +119,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
.ops = &clk_branch2_ops, .ops = &clk_branch2_ops,
}, },
}, },
@@ -2314,7 +2324,7 @@ static struct clk_branch gcc_xo_clk = { @@ -2308,7 +2318,7 @@ static struct clk_branch gcc_xo_clk = {
.parent_hws = (const struct clk_hw *[]){ .parent_hws = (const struct clk_hw *[]){
&gcc_xo_clk_src.clkr.hw }, &gcc_xo_clk_src.clkr.hw },
.num_parents = 1, .num_parents = 1,
@ -128,7 +128,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
.ops = &clk_branch2_ops, .ops = &clk_branch2_ops,
}, },
}, },
@@ -3163,6 +3173,7 @@ static struct clk_branch gcc_nssnoc_ppe_ @@ -3157,6 +3167,7 @@ static struct clk_branch gcc_nssnoc_ppe_
.name = "gcc_nssnoc_ppe_cfg_clk", .name = "gcc_nssnoc_ppe_cfg_clk",
.parent_hws = (const struct clk_hw *[]){ .parent_hws = (const struct clk_hw *[]){
&nss_ppe_clk_src.clkr.hw }, &nss_ppe_clk_src.clkr.hw },
@ -136,7 +136,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
.flags = CLK_SET_RATE_PARENT, .flags = CLK_SET_RATE_PARENT,
.ops = &clk_branch2_ops, .ops = &clk_branch2_ops,
}, },
@@ -3521,7 +3532,7 @@ static struct clk_branch gcc_qdss_dap_cl @@ -3515,7 +3526,7 @@ static struct clk_branch gcc_qdss_dap_cl
.parent_hws = (const struct clk_hw *[]){ .parent_hws = (const struct clk_hw *[]){
&qdss_dap_sync_clk_src.hw }, &qdss_dap_sync_clk_src.hw },
.num_parents = 1, .num_parents = 1,

View File

@ -14,7 +14,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
--- a/drivers/clk/qcom/gcc-ipq6018.c --- a/drivers/clk/qcom/gcc-ipq6018.c
+++ b/drivers/clk/qcom/gcc-ipq6018.c +++ b/drivers/clk/qcom/gcc-ipq6018.c
@@ -223,6 +223,19 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_s @@ -219,6 +219,19 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_s
}, },
}; };
@ -34,7 +34,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static struct clk_alpha_pll gpll2_main = { static struct clk_alpha_pll gpll2_main = {
.offset = 0x4a000, .offset = 0x4a000,
.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT], .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
@@ -505,6 +518,19 @@ static struct clk_rcg2 snoc_nssnoc_bfdcd @@ -499,6 +512,19 @@ static struct clk_rcg2 snoc_nssnoc_bfdcd
}, },
}; };
@ -54,7 +54,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static const struct freq_tbl ftbl_apss_ahb_clk_src[] = { static const struct freq_tbl ftbl_apss_ahb_clk_src[] = {
F(24000000, P_XO, 1, 0, 0), F(24000000, P_XO, 1, 0, 0),
F(25000000, P_GPLL0_DIV2, 16, 0, 0), F(25000000, P_GPLL0_DIV2, 16, 0, 0),
@@ -1909,6 +1935,19 @@ static struct clk_rcg2 system_noc_bfdcd_ @@ -1903,6 +1929,19 @@ static struct clk_rcg2 system_noc_bfdcd_
}, },
}; };
@ -74,7 +74,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static const struct freq_tbl ftbl_ubi32_mem_noc_bfdcd_clk_src[] = { static const struct freq_tbl ftbl_ubi32_mem_noc_bfdcd_clk_src[] = {
F(24000000, P_XO, 1, 0, 0), F(24000000, P_XO, 1, 0, 0),
F(307670000, P_BIAS_PLL_NSS_NOC, 1.5, 0, 0), F(307670000, P_BIAS_PLL_NSS_NOC, 1.5, 0, 0),
@@ -1944,6 +1983,19 @@ static struct clk_rcg2 ubi32_mem_noc_bfd @@ -1938,6 +1977,19 @@ static struct clk_rcg2 ubi32_mem_noc_bfd
}, },
}; };
@ -94,7 +94,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static struct clk_branch gcc_apss_axi_clk = { static struct clk_branch gcc_apss_axi_clk = {
.halt_reg = 0x46020, .halt_reg = 0x46020,
.halt_check = BRANCH_HALT_VOTED, .halt_check = BRANCH_HALT_VOTED,
@@ -2138,6 +2190,22 @@ static struct clk_branch gcc_blsp1_qup5_ @@ -2132,6 +2184,22 @@ static struct clk_branch gcc_blsp1_qup5_
}, },
}; };
@ -117,7 +117,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static struct clk_branch gcc_blsp1_qup6_spi_apps_clk = { static struct clk_branch gcc_blsp1_qup6_spi_apps_clk = {
.halt_reg = 0x0700c, .halt_reg = 0x0700c,
.clkr = { .clkr = {
@@ -2681,6 +2749,454 @@ static struct clk_rcg2 lpass_q6_axim_clk @@ -2675,6 +2743,454 @@ static struct clk_rcg2 lpass_q6_axim_clk
}, },
}; };
@ -572,7 +572,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static struct freq_tbl ftbl_rbcpr_wcss_clk_src[] = { static struct freq_tbl ftbl_rbcpr_wcss_clk_src[] = {
F(24000000, P_XO, 1, 0, 0), F(24000000, P_XO, 1, 0, 0),
F(50000000, P_GPLL0, 16, 0, 0), F(50000000, P_GPLL0, 16, 0, 0),
@@ -2700,6 +3216,23 @@ static struct clk_rcg2 rbcpr_wcss_clk_sr @@ -2694,6 +3210,23 @@ static struct clk_rcg2 rbcpr_wcss_clk_sr
}, },
}; };
@ -596,7 +596,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static struct clk_branch gcc_lpass_core_axim_clk = { static struct clk_branch gcc_lpass_core_axim_clk = {
.halt_reg = 0x1F028, .halt_reg = 0x1F028,
.clkr = { .clkr = {
@@ -3522,6 +4055,22 @@ static struct clk_branch gcc_prng_ahb_cl @@ -3516,6 +4049,22 @@ static struct clk_branch gcc_prng_ahb_cl
}, },
}; };
@ -619,7 +619,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static struct clk_branch gcc_qdss_dap_clk = { static struct clk_branch gcc_qdss_dap_clk = {
.halt_reg = 0x29084, .halt_reg = 0x29084,
.clkr = { .clkr = {
@@ -4195,6 +4744,9 @@ static struct clk_hw *gcc_ipq6018_hws[] @@ -4189,6 +4738,9 @@ static struct clk_hw *gcc_ipq6018_hws[]
&gpll6_out_main_div2.hw, &gpll6_out_main_div2.hw,
&qdss_dap_sync_clk_src.hw, &qdss_dap_sync_clk_src.hw,
&qdss_tsctr_div2_clk_src.hw, &qdss_tsctr_div2_clk_src.hw,
@ -629,7 +629,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
}; };
static struct clk_regmap *gcc_ipq6018_clks[] = { static struct clk_regmap *gcc_ipq6018_clks[] = {
@@ -4292,6 +4844,7 @@ static struct clk_regmap *gcc_ipq6018_cl @@ -4286,6 +4838,7 @@ static struct clk_regmap *gcc_ipq6018_cl
[GCC_BLSP1_QUP4_SPI_APPS_CLK] = &gcc_blsp1_qup4_spi_apps_clk.clkr, [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_I2C_APPS_CLK] = &gcc_blsp1_qup5_i2c_apps_clk.clkr,
[GCC_BLSP1_QUP5_SPI_APPS_CLK] = &gcc_blsp1_qup5_spi_apps_clk.clkr, [GCC_BLSP1_QUP5_SPI_APPS_CLK] = &gcc_blsp1_qup5_spi_apps_clk.clkr,
@ -637,7 +637,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
[GCC_BLSP1_QUP6_SPI_APPS_CLK] = &gcc_blsp1_qup6_spi_apps_clk.clkr, [GCC_BLSP1_QUP6_SPI_APPS_CLK] = &gcc_blsp1_qup6_spi_apps_clk.clkr,
[GCC_BLSP1_UART1_APPS_CLK] = &gcc_blsp1_uart1_apps_clk.clkr, [GCC_BLSP1_UART1_APPS_CLK] = &gcc_blsp1_uart1_apps_clk.clkr,
[GCC_BLSP1_UART2_APPS_CLK] = &gcc_blsp1_uart2_apps_clk.clkr, [GCC_BLSP1_UART2_APPS_CLK] = &gcc_blsp1_uart2_apps_clk.clkr,
@@ -4357,6 +4910,7 @@ static struct clk_regmap *gcc_ipq6018_cl @@ -4351,6 +4904,7 @@ static struct clk_regmap *gcc_ipq6018_cl
[GCC_SYS_NOC_PCIE0_AXI_CLK] = &gcc_sys_noc_pcie0_axi_clk.clkr, [GCC_SYS_NOC_PCIE0_AXI_CLK] = &gcc_sys_noc_pcie0_axi_clk.clkr,
[GCC_PCIE0_PIPE_CLK] = &gcc_pcie0_pipe_clk.clkr, [GCC_PCIE0_PIPE_CLK] = &gcc_pcie0_pipe_clk.clkr,
[GCC_PRNG_AHB_CLK] = &gcc_prng_ahb_clk.clkr, [GCC_PRNG_AHB_CLK] = &gcc_prng_ahb_clk.clkr,
@ -645,7 +645,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
[GCC_QDSS_DAP_CLK] = &gcc_qdss_dap_clk.clkr, [GCC_QDSS_DAP_CLK] = &gcc_qdss_dap_clk.clkr,
[GCC_QPIC_AHB_CLK] = &gcc_qpic_ahb_clk.clkr, [GCC_QPIC_AHB_CLK] = &gcc_qpic_ahb_clk.clkr,
[GCC_QPIC_CLK] = &gcc_qpic_clk.clkr, [GCC_QPIC_CLK] = &gcc_qpic_clk.clkr,
@@ -4398,9 +4952,35 @@ static struct clk_regmap *gcc_ipq6018_cl @@ -4392,9 +4946,35 @@ static struct clk_regmap *gcc_ipq6018_cl
[PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr, [PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr, [GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,
[PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr, [PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
@ -681,7 +681,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
[GCC_LPASS_CORE_AXIM_CLK] = &gcc_lpass_core_axim_clk.clkr, [GCC_LPASS_CORE_AXIM_CLK] = &gcc_lpass_core_axim_clk.clkr,
[LPASS_CORE_AXIM_CLK_SRC] = &lpass_core_axim_clk_src.clkr, [LPASS_CORE_AXIM_CLK_SRC] = &lpass_core_axim_clk_src.clkr,
[GCC_LPASS_SNOC_CFG_CLK] = &gcc_lpass_snoc_cfg_clk.clkr, [GCC_LPASS_SNOC_CFG_CLK] = &gcc_lpass_snoc_cfg_clk.clkr,
@@ -4416,6 +4996,9 @@ static struct clk_regmap *gcc_ipq6018_cl @@ -4410,6 +4990,9 @@ static struct clk_regmap *gcc_ipq6018_cl
[GCC_MEM_NOC_UBI32_CLK] = &gcc_mem_noc_ubi32_clk.clkr, [GCC_MEM_NOC_UBI32_CLK] = &gcc_mem_noc_ubi32_clk.clkr,
[GCC_MEM_NOC_LPASS_CLK] = &gcc_mem_noc_lpass_clk.clkr, [GCC_MEM_NOC_LPASS_CLK] = &gcc_mem_noc_lpass_clk.clkr,
[GCC_SNOC_LPASS_CFG_CLK] = &gcc_snoc_lpass_cfg_clk.clkr, [GCC_SNOC_LPASS_CFG_CLK] = &gcc_snoc_lpass_cfg_clk.clkr,
@ -691,7 +691,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
[QDSS_STM_CLK_SRC] = &qdss_stm_clk_src.clkr, [QDSS_STM_CLK_SRC] = &qdss_stm_clk_src.clkr,
[QDSS_TRACECLKIN_CLK_SRC] = &qdss_traceclkin_clk_src.clkr, [QDSS_TRACECLKIN_CLK_SRC] = &qdss_traceclkin_clk_src.clkr,
}; };
@@ -4597,6 +5180,10 @@ static const struct qcom_cc_desc gcc_ipq @@ -4591,6 +5174,10 @@ static const struct qcom_cc_desc gcc_ipq
static int gcc_ipq6018_probe(struct platform_device *pdev) static int gcc_ipq6018_probe(struct platform_device *pdev)
{ {
struct regmap *regmap; struct regmap *regmap;

View File

@ -30,7 +30,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
} }
--- a/drivers/clk/qcom/gcc-ipq6018.c --- a/drivers/clk/qcom/gcc-ipq6018.c
+++ b/drivers/clk/qcom/gcc-ipq6018.c +++ b/drivers/clk/qcom/gcc-ipq6018.c
@@ -4711,15 +4711,18 @@ static struct clk_branch gcc_dcc_clk = { @@ -4705,15 +4705,18 @@ static struct clk_branch gcc_dcc_clk = {
static const struct alpha_pll_config ubi32_pll_config = { static const struct alpha_pll_config ubi32_pll_config = {
.l = 0x3e, .l = 0x3e,

View File

@ -19,7 +19,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
--- a/drivers/clk/qcom/gcc-ipq6018.c --- a/drivers/clk/qcom/gcc-ipq6018.c
+++ b/drivers/clk/qcom/gcc-ipq6018.c +++ b/drivers/clk/qcom/gcc-ipq6018.c
@@ -387,7 +387,7 @@ static const struct freq_tbl ftbl_nss_pp @@ -381,7 +381,7 @@ static const struct freq_tbl ftbl_nss_pp
static const struct clk_parent_data gcc_xo_bias_gpll0_gpll4_nss_ubi32[] = { static const struct clk_parent_data gcc_xo_bias_gpll0_gpll4_nss_ubi32[] = {
{ .fw_name = "xo" }, { .fw_name = "xo" },
@ -28,7 +28,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
{ .hw = &gpll0.clkr.hw }, { .hw = &gpll0.clkr.hw },
{ .hw = &gpll4.clkr.hw }, { .hw = &gpll4.clkr.hw },
{ .hw = &nss_crypto_pll.clkr.hw }, { .hw = &nss_crypto_pll.clkr.hw },
@@ -567,12 +567,12 @@ static const struct freq_tbl ftbl_nss_po @@ -561,12 +561,12 @@ static const struct freq_tbl ftbl_nss_po
static const struct clk_parent_data static const struct clk_parent_data
gcc_xo_uniphy0_rx_tx_uniphy1_rx_tx_ubi32_bias[] = { gcc_xo_uniphy0_rx_tx_uniphy1_rx_tx_ubi32_bias[] = {
{ .fw_name = "xo" }, { .fw_name = "xo" },
@ -46,7 +46,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
}; };
static const struct parent_map static const struct parent_map
@@ -614,12 +614,12 @@ static const struct freq_tbl ftbl_nss_po @@ -608,12 +608,12 @@ static const struct freq_tbl ftbl_nss_po
static const struct clk_parent_data static const struct clk_parent_data
gcc_xo_uniphy0_tx_rx_uniphy1_tx_rx_ubi32_bias[] = { gcc_xo_uniphy0_tx_rx_uniphy1_tx_rx_ubi32_bias[] = {
{ .fw_name = "xo" }, { .fw_name = "xo" },
@ -64,7 +64,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
}; };
static const struct parent_map static const struct parent_map
@@ -755,10 +755,10 @@ static const struct freq_tbl ftbl_nss_po @@ -749,10 +749,10 @@ static const struct freq_tbl ftbl_nss_po
static const struct clk_parent_data gcc_xo_uniphy0_rx_tx_ubi32_bias[] = { static const struct clk_parent_data gcc_xo_uniphy0_rx_tx_ubi32_bias[] = {
{ .fw_name = "xo" }, { .fw_name = "xo" },
@ -78,7 +78,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
}; };
static const struct parent_map gcc_xo_uniphy0_rx_tx_ubi32_bias_map[] = { static const struct parent_map gcc_xo_uniphy0_rx_tx_ubi32_bias_map[] = {
@@ -791,10 +791,10 @@ static const struct freq_tbl ftbl_nss_po @@ -785,10 +785,10 @@ static const struct freq_tbl ftbl_nss_po
static const struct clk_parent_data gcc_xo_uniphy0_tx_rx_ubi32_bias[] = { static const struct clk_parent_data gcc_xo_uniphy0_tx_rx_ubi32_bias[] = {
{ .fw_name = "xo" }, { .fw_name = "xo" },
@ -92,7 +92,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
}; };
static const struct parent_map gcc_xo_uniphy0_tx_rx_ubi32_bias_map[] = { static const struct parent_map gcc_xo_uniphy0_tx_rx_ubi32_bias_map[] = {
@@ -1955,12 +1955,11 @@ static const struct freq_tbl ftbl_ubi32_ @@ -1949,12 +1949,11 @@ static const struct freq_tbl ftbl_ubi32_
{ } { }
}; };

View File

@ -30,7 +30,7 @@ Signed-off-by: Baruch Siach <baruch.siach@siklu.com>
--- a/drivers/pci/controller/dwc/pcie-tegra194.c --- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -193,12 +193,6 @@ @@ -194,12 +194,6 @@
#define GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC_MASK GENMASK(23, 8) #define GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC_MASK GENMASK(23, 8)
#define GEN3_EQ_CONTROL_OFF_FB_MODE_MASK GENMASK(3, 0) #define GEN3_EQ_CONTROL_OFF_FB_MODE_MASK GENMASK(3, 0)

View File

@ -15,7 +15,7 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>
--- a/drivers/clk/qcom/gcc-ipq8074.c --- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -4790,6 +4790,7 @@ static const struct qcom_reset_map gcc_i @@ -4784,6 +4784,7 @@ static const struct qcom_reset_map gcc_i
[GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 }, [GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 },
[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 }, [GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 }, [GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },

View File

@ -18,7 +18,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
--- a/drivers/clk/qcom/Kconfig --- a/drivers/clk/qcom/Kconfig
+++ b/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig
@@ -134,6 +134,16 @@ config IPQ_APSS_6018 @@ -135,6 +135,16 @@ config IPQ_APSS_6018
Say Y if you want to support CPU frequency scaling on Say Y if you want to support CPU frequency scaling on
ipq based devices. ipq based devices.

View File

@ -17,7 +17,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
--- a/drivers/clk/qcom/gcc-ipq8074.c --- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -4791,6 +4791,20 @@ static const struct qcom_reset_map gcc_i @@ -4785,6 +4785,20 @@ static const struct qcom_reset_map gcc_i
[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 }, [GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 }, [GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
[GCC_WCSSAON_RESET] = { 0x59010, 0 }, [GCC_WCSSAON_RESET] = { 0x59010, 0 },

View File

@ -16,7 +16,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
--- a/drivers/clk/qcom/gcc-ipq8074.c --- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -4842,6 +4842,11 @@ static int gcc_ipq8074_probe(struct plat @@ -4836,6 +4836,11 @@ static int gcc_ipq8074_probe(struct plat
/* SW Workaround for UBI32 Huayra PLL */ /* SW Workaround for UBI32 Huayra PLL */
regmap_update_bits(regmap, 0x2501c, BIT(26), BIT(26)); regmap_update_bits(regmap, 0x2501c, BIT(26), BIT(26));

View File

@ -19,7 +19,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
--- a/drivers/clk/qcom/gcc-ipq8074.c --- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -4847,6 +4847,9 @@ static int gcc_ipq8074_probe(struct plat @@ -4841,6 +4841,9 @@ static int gcc_ipq8074_probe(struct plat
/* Disable SW_COLLAPSE for USB1 GDSCR */ /* Disable SW_COLLAPSE for USB1 GDSCR */
regmap_update_bits(regmap, 0x3f078, BIT(0), 0x0); regmap_update_bits(regmap, 0x3f078, BIT(0), 0x0);

View File

@ -16,7 +16,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
--- a/drivers/clk/qcom/gcc-ipq8074.c --- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -3183,6 +3183,24 @@ static struct clk_branch gcc_nss_ptp_ref @@ -3177,6 +3177,24 @@ static struct clk_branch gcc_nss_ptp_ref
}, },
}; };
@ -41,7 +41,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
static struct clk_branch gcc_nssnoc_ce_apb_clk = { static struct clk_branch gcc_nssnoc_ce_apb_clk = {
.halt_reg = 0x6830c, .halt_reg = 0x6830c,
.clkr = { .clkr = {
@@ -4655,6 +4673,7 @@ static struct clk_regmap *gcc_ipq8074_cl @@ -4649,6 +4667,7 @@ static struct clk_regmap *gcc_ipq8074_cl
[GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr, [GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
[GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr, [GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr, [GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,

View File

@ -10,7 +10,7 @@
static struct flow_dissector flow_keys_bonding __read_mostly; static struct flow_dissector flow_keys_bonding __read_mostly;
/*-------------------------- Forward declarations ---------------------------*/ /*-------------------------- Forward declarations ---------------------------*/
@@ -4109,6 +4112,23 @@ static int bond_get_lowest_level_rcu(str @@ -4115,6 +4118,23 @@ static int bond_get_lowest_level_rcu(str
} }
#endif #endif
@ -34,7 +34,7 @@
static void bond_get_stats(struct net_device *bond_dev, static void bond_get_stats(struct net_device *bond_dev,
struct rtnl_link_stats64 *stats) struct rtnl_link_stats64 *stats)
{ {
@@ -5441,6 +5461,10 @@ static void bond_destructor(struct net_d @@ -5447,6 +5467,10 @@ static void bond_destructor(struct net_d
if (bond->rr_tx_counter) if (bond->rr_tx_counter)
free_percpu(bond->rr_tx_counter); free_percpu(bond->rr_tx_counter);
@ -45,7 +45,7 @@
} }
void bond_setup(struct net_device *bond_dev) void bond_setup(struct net_device *bond_dev)
@@ -6014,7 +6038,14 @@ int bond_create(struct net *net, const c @@ -6020,7 +6044,14 @@ int bond_create(struct net *net, const c
bond_work_init_all(bond); bond_work_init_all(bond);

View File

@ -37,7 +37,7 @@
* managed to set the command line, unless CONFIG_CMDLINE_FORCE * managed to set the command line, unless CONFIG_CMDLINE_FORCE
--- a/arch/arm64/Kconfig --- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig
@@ -2059,6 +2059,14 @@ config CMDLINE_FORCE @@ -2060,6 +2060,14 @@ config CMDLINE_FORCE
endchoice endchoice

View File

@ -54,9 +54,9 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
side of CZ.NIC's Turris Omnia router. There are 12 RGB LEDs on the side of CZ.NIC's Turris Omnia router. There are 12 RGB LEDs on the
--- a/drivers/leds/leds-turris-omnia.c --- a/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c +++ b/drivers/leds/leds-turris-omnia.c
@@ -41,6 +41,39 @@ struct omnia_leds { @@ -72,6 +72,39 @@ static int omnia_cmd_read_u8(const struc
struct omnia_led leds[]; return -EIO;
}; }
+static struct led_hw_trigger_type omnia_hw_trigger_type; +static struct led_hw_trigger_type omnia_hw_trigger_type;
+ +
@ -94,7 +94,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
static int omnia_led_brightness_set_blocking(struct led_classdev *cdev, static int omnia_led_brightness_set_blocking(struct led_classdev *cdev,
enum led_brightness brightness) enum led_brightness brightness)
{ {
@@ -112,6 +145,8 @@ static int omnia_led_register(struct i2c @@ -143,6 +176,8 @@ static int omnia_led_register(struct i2c
cdev = &led->mc_cdev.led_cdev; cdev = &led->mc_cdev.led_cdev;
cdev->max_brightness = 255; cdev->max_brightness = 255;
cdev->brightness_set_blocking = omnia_led_brightness_set_blocking; cdev->brightness_set_blocking = omnia_led_brightness_set_blocking;
@ -102,8 +102,8 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
+ cdev->default_trigger = omnia_hw_trigger.name; + cdev->default_trigger = omnia_hw_trigger.name;
/* put the LED into software mode */ /* put the LED into software mode */
ret = i2c_smbus_write_byte_data(client, CMD_LED_MODE, ret = omnia_cmd_write_u8(client, CMD_LED_MODE,
@@ -228,6 +263,12 @@ static int omnia_leds_probe(struct i2c_c @@ -249,6 +284,12 @@ static int omnia_leds_probe(struct i2c_c
mutex_init(&leds->lock); mutex_init(&leds->lock);

View File

@ -17,7 +17,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
--- a/drivers/leds/leds-turris-omnia.c --- a/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c +++ b/drivers/leds/leds-turris-omnia.c
@@ -131,10 +131,13 @@ static int omnia_led_register(struct i2c @@ -162,10 +162,13 @@ static int omnia_led_register(struct i2c
} }
led->subled_info[0].color_index = LED_COLOR_ID_RED; led->subled_info[0].color_index = LED_COLOR_ID_RED;

View File

@ -20,7 +20,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
--- a/drivers/leds/leds-turris-omnia.c --- a/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c +++ b/drivers/leds/leds-turris-omnia.c
@@ -146,7 +146,7 @@ static int omnia_led_register(struct i2c @@ -177,7 +177,7 @@ static int omnia_led_register(struct i2c
init_data.fwnode = &np->fwnode; init_data.fwnode = &np->fwnode;
cdev = &led->mc_cdev.led_cdev; cdev = &led->mc_cdev.led_cdev;

View File

@ -14,7 +14,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -4246,6 +4246,7 @@ static const struct net_device_ops mtk_n @@ -4618,6 +4618,7 @@ static const struct net_device_ops mtk_n
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
{ {
@ -22,7 +22,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
const __be32 *_id = of_get_property(np, "reg", NULL); const __be32 *_id = of_get_property(np, "reg", NULL);
phy_interface_t phy_mode; phy_interface_t phy_mode;
struct phylink *phylink; struct phylink *phylink;
@@ -4385,6 +4386,9 @@ static int mtk_add_mac(struct mtk_eth *e @@ -4787,6 +4788,9 @@ static int mtk_add_mac(struct mtk_eth *e
register_netdevice_notifier(&mac->device_notifier); register_netdevice_notifier(&mac->device_notifier);
} }

View File

@ -95,7 +95,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
phydev->mii_ts->link_state(phydev->mii_ts, phydev); phydev->mii_ts->link_state(phydev->mii_ts, phydev);
--- a/drivers/net/phy/phylink.c --- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c
@@ -1370,7 +1370,8 @@ void phylink_destroy(struct phylink *pl) @@ -1334,7 +1334,8 @@ void phylink_destroy(struct phylink *pl)
} }
EXPORT_SYMBOL_GPL(phylink_destroy); EXPORT_SYMBOL_GPL(phylink_destroy);

View File

@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1487,16 +1487,20 @@ static int stmmac_init_rx_buffers(struct @@ -1488,16 +1488,20 @@ static int stmmac_init_rx_buffers(struct
{ {
struct stmmac_rx_queue *rx_q = &dma_conf->rx_queue[queue]; struct stmmac_rx_queue *rx_q = &dma_conf->rx_queue[queue];
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i]; struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (!buf->sec_page) if (!buf->sec_page)
return -ENOMEM; return -ENOMEM;
@@ -4633,6 +4637,10 @@ static inline void stmmac_rx_refill(stru @@ -4634,6 +4638,10 @@ static inline void stmmac_rx_refill(stru
struct stmmac_rx_queue *rx_q = &priv->dma_conf.rx_queue[queue]; struct stmmac_rx_queue *rx_q = &priv->dma_conf.rx_queue[queue];
int dirty = stmmac_rx_dirty(priv, queue); int dirty = stmmac_rx_dirty(priv, queue);
unsigned int entry = rx_q->dirty_rx; unsigned int entry = rx_q->dirty_rx;
@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
while (dirty-- > 0) { while (dirty-- > 0) {
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[entry]; struct stmmac_rx_buffer *buf = &rx_q->buf_pool[entry];
@@ -4645,13 +4653,13 @@ static inline void stmmac_rx_refill(stru @@ -4646,13 +4654,13 @@ static inline void stmmac_rx_refill(stru
p = rx_q->dma_rx + entry; p = rx_q->dma_rx + entry;
if (!buf->page) { if (!buf->page) {

View File

@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -12691,6 +12691,7 @@ F: include/uapi/linux/meye.h @@ -12694,6 +12694,7 @@ F: include/uapi/linux/meye.h
MOTORCOMM PHY DRIVER MOTORCOMM PHY DRIVER
M: Peter Geis <pgwipeout@gmail.com> M: Peter Geis <pgwipeout@gmail.com>

View File

@ -25,7 +25,7 @@ Subject: [PATCH] r8169: add LED configuration from OF
TxDescStartAddrLow = 0x20, TxDescStartAddrLow = 0x20,
TxDescStartAddrHigh = 0x24, TxDescStartAddrHigh = 0x24,
TxHDescStartAddrLow = 0x28, TxHDescStartAddrLow = 0x28,
@@ -5274,6 +5276,22 @@ done: @@ -5309,6 +5311,22 @@ done:
rtl_rar_set(tp, mac_addr); rtl_rar_set(tp, mac_addr);
} }
@ -48,7 +48,7 @@ Subject: [PATCH] r8169: add LED configuration from OF
static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
struct rtl8169_private *tp; struct rtl8169_private *tp;
@@ -5438,6 +5456,7 @@ static int rtl_init_one(struct pci_dev * @@ -5473,6 +5491,7 @@ static int rtl_init_one(struct pci_dev *
if (!tp->counters) if (!tp->counters)
return -ENOMEM; return -ENOMEM;

View File

@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
--- a/drivers/mmc/core/core.c --- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c
@@ -1364,6 +1364,8 @@ void mmc_power_off(struct mmc_host *host @@ -1369,6 +1369,8 @@ void mmc_power_off(struct mmc_host *host
mmc_pwrseq_power_off(host); mmc_pwrseq_power_off(host);

View File

@ -31,7 +31,7 @@ Signed-off-by: wevsty <ty@wevs.org>
reg = <0x0 0xff100000 0x0 0x1000>; reg = <0x0 0xff100000 0x0 0x1000>;
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1937,6 +1937,16 @@ @@ -1939,6 +1939,16 @@
}; };
}; };

View File

@ -179,7 +179,7 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
GATE(0, "clk_ddrupctl", "clk_ddr", CLK_IGNORE_UNUSED, GATE(0, "clk_ddrupctl", "clk_ddr", CLK_IGNORE_UNUSED,
--- a/drivers/clk/rockchip/clk.h --- a/drivers/clk/rockchip/clk.h
+++ b/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h
@@ -418,7 +418,8 @@ struct clk *rockchip_clk_register_mmc(co @@ -399,7 +399,8 @@ struct clk *rockchip_clk_register_mmc(co
* DDRCLK flags, including method of setting the rate * DDRCLK flags, including method of setting the rate
* ROCKCHIP_DDRCLK_SIP: use SIP call to bl31 to change ddrclk rate. * ROCKCHIP_DDRCLK_SIP: use SIP call to bl31 to change ddrclk rate.
*/ */

View File

@ -557,7 +557,7 @@ Signed-off-by: hmz007 <hmz007@gmail.com>
data->regs = devm_platform_ioremap_resource(pdev, 0); data->regs = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(data->regs)) if (IS_ERR(data->regs))
@@ -202,21 +582,95 @@ static int rockchip_dfi_probe(struct pla @@ -203,21 +583,95 @@ static int rockchip_dfi_probe(struct pla
if (IS_ERR(data->regmap_pmu)) if (IS_ERR(data->regmap_pmu))
return PTR_ERR(data->regmap_pmu); return PTR_ERR(data->regmap_pmu);

View File

@ -81,7 +81,7 @@ and performance for all other cases.
--- a/net/ipv4/tcp_input.c --- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c
@@ -5384,6 +5384,7 @@ static bool tcp_prune_ofo_queue(struct s @@ -5388,6 +5388,7 @@ static bool tcp_prune_ofo_queue(struct s
static int tcp_prune_queue(struct sock *sk) static int tcp_prune_queue(struct sock *sk)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
@ -89,7 +89,7 @@ and performance for all other cases.
NET_INC_STATS(sock_net(sk), LINUX_MIB_PRUNECALLED); NET_INC_STATS(sock_net(sk), LINUX_MIB_PRUNECALLED);
@@ -5395,6 +5396,39 @@ static int tcp_prune_queue(struct sock * @@ -5399,6 +5400,39 @@ static int tcp_prune_queue(struct sock *
if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf)
return 0; return 0;
@ -129,7 +129,7 @@ and performance for all other cases.
tcp_collapse_ofo_queue(sk); tcp_collapse_ofo_queue(sk);
if (!skb_queue_empty(&sk->sk_receive_queue)) if (!skb_queue_empty(&sk->sk_receive_queue))
tcp_collapse(sk, &sk->sk_receive_queue, NULL, tcp_collapse(sk, &sk->sk_receive_queue, NULL,
@@ -5414,6 +5448,8 @@ static int tcp_prune_queue(struct sock * @@ -5418,6 +5452,8 @@ static int tcp_prune_queue(struct sock *
if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf)
return 0; return 0;
@ -140,7 +140,7 @@ and performance for all other cases.
* and hopefully then we'll have sufficient space. * and hopefully then we'll have sufficient space.
--- a/net/ipv4/tcp_ipv4.c --- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c
@@ -3214,6 +3214,8 @@ static int __net_init tcp_sk_init(struct @@ -3211,6 +3211,8 @@ static int __net_init tcp_sk_init(struct
else else
net->ipv4.tcp_congestion_control = &tcp_reno; net->ipv4.tcp_congestion_control = &tcp_reno;