mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 5.15 to 5.15.77 (#10369)
Manually rebased: bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch lantiq/patches-5.15/0028-NET-lantiq-various-etop-fixes.patch All other patches automatically rebased Co-authored-by: John Audia <therealgraysky@proton.me> Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
parent
316e63374b
commit
c026408fae
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.15 = .76
|
||||
LINUX_KERNEL_HASH-5.15.76 = 9007a020c419e3625b980e361be09f70ebd99e156ccb66129a981483d065d57f
|
||||
LINUX_VERSION-5.15 = .77
|
||||
LINUX_KERNEL_HASH-5.15.77 = 142f841f33796a84c62fae2f2b96d2120bd8bbf9e0aac4ce157692cdb0afe9f9
|
||||
|
@ -706,7 +706,7 @@
|
||||
EXPORT_SYMBOL(xfrm_parse_spi);
|
||||
--- a/net/ipv4/tcp_input.c
|
||||
+++ b/net/ipv4/tcp_input.c
|
||||
@@ -4151,14 +4151,16 @@ static bool tcp_parse_aligned_timestamp(
|
||||
@@ -4152,14 +4152,16 @@ static bool tcp_parse_aligned_timestamp(
|
||||
{
|
||||
const __be32 *ptr = (const __be32 *)(th + 1);
|
||||
|
||||
|
@ -230,7 +230,7 @@ bcm2835-mmc: uninitialized_var is no more
|
||||
|
||||
--- a/drivers/mmc/core/block.c
|
||||
+++ b/drivers/mmc/core/block.c
|
||||
@@ -171,6 +171,13 @@ static DEFINE_MUTEX(open_lock);
|
||||
@@ -172,6 +172,13 @@ static DEFINE_MUTEX(open_lock);
|
||||
module_param(perdev_minors, int, 0444);
|
||||
MODULE_PARM_DESC(perdev_minors, "Minors numbers to allocate per device");
|
||||
|
||||
@ -244,7 +244,7 @@ bcm2835-mmc: uninitialized_var is no more
|
||||
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,
|
||||
@@ -2928,6 +2935,8 @@ static int mmc_blk_probe(struct mmc_card
|
||||
@@ -2936,6 +2943,8 @@ static int mmc_blk_probe(struct mmc_card
|
||||
{
|
||||
struct mmc_blk_data *md;
|
||||
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.
|
||||
@@ -2935,7 +2944,16 @@ static int mmc_blk_probe(struct mmc_card
|
||||
@@ -2943,7 +2952,16 @@ static int mmc_blk_probe(struct mmc_card
|
||||
if (!(card->csd.cmdclass & CCC_BLOCK_READ))
|
||||
return -ENODEV;
|
||||
|
||||
@ -271,7 +271,7 @@ bcm2835-mmc: uninitialized_var is no more
|
||||
|
||||
card->complete_wq = alloc_workqueue("mmc_complete",
|
||||
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
|
||||
@@ -2950,6 +2968,17 @@ static int mmc_blk_probe(struct mmc_card
|
||||
@@ -2958,6 +2976,17 @@ static int mmc_blk_probe(struct mmc_card
|
||||
goto out_free;
|
||||
}
|
||||
|
||||
|
@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
||||
|
||||
--- a/drivers/usb/host/xhci.c
|
||||
+++ b/drivers/usb/host/xhci.c
|
||||
@@ -1612,6 +1612,109 @@ command_cleanup:
|
||||
@@ -1618,6 +1618,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
|
||||
*/
|
||||
@@ -5437,6 +5540,7 @@ static const struct hc_driver xhci_hc_dr
|
||||
@@ -5443,6 +5546,7 @@ static const struct hc_driver xhci_hc_dr
|
||||
.endpoint_reset = xhci_endpoint_reset,
|
||||
.check_bandwidth = xhci_check_bandwidth,
|
||||
.reset_bandwidth = xhci_reset_bandwidth,
|
||||
|
@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
||||
|
||||
--- a/drivers/usb/host/xhci-mem.c
|
||||
+++ b/drivers/usb/host/xhci-mem.c
|
||||
@@ -2516,9 +2516,11 @@ int xhci_mem_init(struct xhci_hcd *xhci,
|
||||
@@ -2520,9 +2520,11 @@ int xhci_mem_init(struct xhci_hcd *xhci,
|
||||
* Event ring setup: Allocate a normal ring, but also setup
|
||||
* the event ring segment table (ERST). Section 4.9.3.
|
||||
*/
|
||||
@ -36,7 +36,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
||||
if (!xhci->event_ring)
|
||||
goto fail;
|
||||
if (xhci_check_trb_in_td_math(xhci) < 0)
|
||||
@@ -2531,7 +2533,7 @@ int xhci_mem_init(struct xhci_hcd *xhci,
|
||||
@@ -2535,7 +2537,7 @@ int xhci_mem_init(struct xhci_hcd *xhci,
|
||||
/* set ERST count with the number of entries in the segment table */
|
||||
val = readl(&xhci->ir_set->erst_size);
|
||||
val &= ERST_SIZE_MASK;
|
||||
|
@ -42,7 +42,7 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
|
||||
============
|
||||
--- a/include/uapi/linux/videodev2.h
|
||||
+++ b/include/uapi/linux/videodev2.h
|
||||
@@ -1882,6 +1882,7 @@ struct v4l2_querymenu {
|
||||
@@ -1883,6 +1883,7 @@ struct v4l2_querymenu {
|
||||
#define V4L2_CTRL_FLAG_HAS_PAYLOAD 0x0100
|
||||
#define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE 0x0200
|
||||
#define V4L2_CTRL_FLAG_MODIFY_LAYOUT 0x0400
|
||||
|
@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||
|
||||
--- a/drivers/usb/host/xhci-pci.c
|
||||
+++ b/drivers/usb/host/xhci-pci.c
|
||||
@@ -304,6 +304,7 @@ static void xhci_pci_quirks(struct devic
|
||||
@@ -291,6 +291,7 @@ static void xhci_pci_quirks(struct devic
|
||||
if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
|
||||
xhci->quirks |= XHCI_LPM_SUPPORT;
|
||||
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
|
||||
@ -50,11 +50,11 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||
addr = xhci_trb_virt_to_dma(new_seg, new_deq);
|
||||
--- a/drivers/usb/host/xhci.h
|
||||
+++ b/drivers/usb/host/xhci.h
|
||||
@@ -1904,6 +1904,7 @@ struct xhci_hcd {
|
||||
#define XHCI_BROKEN_D3COLD BIT_ULL(41)
|
||||
@@ -1905,6 +1905,7 @@ struct xhci_hcd {
|
||||
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)
|
||||
#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)
|
||||
+#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(44)
|
||||
#define XHCI_RESET_TO_DEFAULT BIT_ULL(44)
|
||||
+#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(45)
|
||||
|
||||
unsigned int num_active_eps;
|
||||
unsigned int limit_active_eps;
|
||||
|
@ -145,7 +145,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||
if (ret)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -1816,7 +1820,7 @@ int xhci_alloc_erst(struct xhci_hcd *xhc
|
||||
@@ -1820,7 +1824,7 @@ int xhci_alloc_erst(struct xhci_hcd *xhc
|
||||
for (val = 0; val < evt_ring->num_segs; val++) {
|
||||
entry = &erst->entries[val];
|
||||
entry->seg_addr = cpu_to_le64(seg->dma);
|
||||
@ -226,7 +226,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||
}
|
||||
--- a/drivers/usb/host/xhci.c
|
||||
+++ b/drivers/usb/host/xhci.c
|
||||
@@ -870,8 +870,8 @@ static void xhci_clear_command_ring(stru
|
||||
@@ -876,8 +876,8 @@ static void xhci_clear_command_ring(stru
|
||||
seg = ring->deq_seg;
|
||||
do {
|
||||
memset(seg->trbs, 0,
|
||||
@ -237,7 +237,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||
cpu_to_le32(~TRB_CYCLE);
|
||||
seg = seg->next;
|
||||
} while (seg != ring->deq_seg);
|
||||
@@ -882,7 +882,7 @@ static void xhci_clear_command_ring(stru
|
||||
@@ -888,7 +888,7 @@ static void xhci_clear_command_ring(stru
|
||||
ring->enq_seg = ring->deq_seg;
|
||||
ring->enqueue = ring->dequeue;
|
||||
|
||||
|
@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||
cycle_state, type, max_packet, flags);
|
||||
--- a/drivers/usb/host/xhci-pci.c
|
||||
+++ b/drivers/usb/host/xhci-pci.c
|
||||
@@ -305,6 +305,7 @@ static void xhci_pci_quirks(struct devic
|
||||
@@ -292,6 +292,7 @@ static void xhci_pci_quirks(struct devic
|
||||
xhci->quirks |= XHCI_LPM_SUPPORT;
|
||||
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
|
||||
xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
|
||||
@ -63,11 +63,11 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
|
||||
--- a/drivers/usb/host/xhci.h
|
||||
+++ b/drivers/usb/host/xhci.h
|
||||
@@ -1906,6 +1906,7 @@ struct xhci_hcd {
|
||||
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)
|
||||
@@ -1907,6 +1907,7 @@ struct xhci_hcd {
|
||||
#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)
|
||||
#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(44)
|
||||
+#define XHCI_VLI_TRB_CACHE_BUG BIT_ULL(45)
|
||||
#define XHCI_RESET_TO_DEFAULT BIT_ULL(44)
|
||||
#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(45)
|
||||
+#define XHCI_VLI_TRB_CACHE_BUG BIT_ULL(46)
|
||||
|
||||
unsigned int num_active_eps;
|
||||
unsigned int limit_active_eps;
|
||||
|
@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||
|
||||
--- a/drivers/usb/host/xhci-pci.c
|
||||
+++ b/drivers/usb/host/xhci-pci.c
|
||||
@@ -306,6 +306,7 @@ static void xhci_pci_quirks(struct devic
|
||||
@@ -293,6 +293,7 @@ static void xhci_pci_quirks(struct devic
|
||||
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
|
||||
xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
|
||||
xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG;
|
||||
@ -86,11 +86,11 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||
first_trb = false;
|
||||
--- a/drivers/usb/host/xhci.h
|
||||
+++ b/drivers/usb/host/xhci.h
|
||||
@@ -1907,6 +1907,7 @@ struct xhci_hcd {
|
||||
#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)
|
||||
#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(44)
|
||||
#define XHCI_VLI_TRB_CACHE_BUG BIT_ULL(45)
|
||||
+#define XHCI_VLI_SS_BULK_OUT_BUG BIT_ULL(46)
|
||||
@@ -1908,6 +1908,7 @@ struct xhci_hcd {
|
||||
#define XHCI_RESET_TO_DEFAULT BIT_ULL(44)
|
||||
#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(45)
|
||||
#define XHCI_VLI_TRB_CACHE_BUG BIT_ULL(46)
|
||||
+#define XHCI_VLI_SS_BULK_OUT_BUG BIT_ULL(47)
|
||||
|
||||
unsigned int num_active_eps;
|
||||
unsigned int limit_active_eps;
|
||||
|
@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||
|
||||
--- a/drivers/mmc/core/block.c
|
||||
+++ b/drivers/mmc/core/block.c
|
||||
@@ -1875,7 +1875,11 @@ static void mmc_blk_mq_rw_recovery(struc
|
||||
@@ -1883,7 +1883,11 @@ static void mmc_blk_mq_rw_recovery(struc
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -127,11 +127,11 @@ it on BCM4708 family.
|
||||
/*
|
||||
--- a/drivers/usb/host/xhci.h
|
||||
+++ b/drivers/usb/host/xhci.h
|
||||
@@ -1904,6 +1904,7 @@ struct xhci_hcd {
|
||||
#define XHCI_BROKEN_D3COLD BIT_ULL(41)
|
||||
@@ -1905,6 +1905,7 @@ struct xhci_hcd {
|
||||
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)
|
||||
#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)
|
||||
+#define XHCI_FAKE_DOORBELL BIT_ULL(44)
|
||||
#define XHCI_RESET_TO_DEFAULT BIT_ULL(44)
|
||||
+#define XHCI_FAKE_DOORBELL BIT_ULL(45)
|
||||
|
||||
unsigned int num_active_eps;
|
||||
unsigned int limit_active_eps;
|
||||
|
@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
||||
|
||||
--- a/drivers/pci/controller/pci-aardvark.c
|
||||
+++ b/drivers/pci/controller/pci-aardvark.c
|
||||
@@ -1889,6 +1889,27 @@ static int advk_pcie_remove(struct platf
|
||||
@@ -1887,6 +1887,27 @@ static int advk_pcie_remove(struct platf
|
||||
advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_REG);
|
||||
advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_STATUS_REG);
|
||||
|
||||
|
@ -21,7 +21,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
||||
|
||||
--- a/drivers/pci/controller/pci-aardvark.c
|
||||
+++ b/drivers/pci/controller/pci-aardvark.c
|
||||
@@ -1927,6 +1927,9 @@ static int advk_pcie_remove(struct platf
|
||||
@@ -1925,6 +1925,9 @@ static int advk_pcie_remove(struct platf
|
||||
val &= ~LINK_TRAINING_EN;
|
||||
advk_writel(pcie, val, PCIE_CORE_CTRL0_REG);
|
||||
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
||||
|
||||
--- a/drivers/pci/controller/pci-aardvark.c
|
||||
+++ b/drivers/pci/controller/pci-aardvark.c
|
||||
@@ -1930,6 +1930,10 @@ static int advk_pcie_remove(struct platf
|
||||
@@ -1928,6 +1928,10 @@ static int advk_pcie_remove(struct platf
|
||||
/* Free config space for emulated root bridge */
|
||||
pci_bridge_emul_cleanup(&pcie->bridge);
|
||||
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
||||
|
||||
--- a/drivers/pci/controller/pci-aardvark.c
|
||||
+++ b/drivers/pci/controller/pci-aardvark.c
|
||||
@@ -1934,6 +1934,11 @@ static int advk_pcie_remove(struct platf
|
||||
@@ -1932,6 +1932,11 @@ static int advk_pcie_remove(struct platf
|
||||
if (pcie->reset_gpio)
|
||||
gpiod_set_value_cansleep(pcie->reset_gpio, 1);
|
||||
|
||||
|
@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
||||
|
||||
--- a/drivers/pci/controller/pci-aardvark.c
|
||||
+++ b/drivers/pci/controller/pci-aardvark.c
|
||||
@@ -1649,6 +1649,9 @@ static int advk_pcie_enable_phy(struct a
|
||||
@@ -1647,6 +1647,9 @@ static int advk_pcie_enable_phy(struct a
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
device, it has to decide which ones to send first, which ones to
|
||||
--- a/net/sched/sch_api.c
|
||||
+++ b/net/sched/sch_api.c
|
||||
@@ -2285,7 +2285,7 @@ static int __init pktsched_init(void)
|
||||
@@ -2286,7 +2286,7 @@ static int __init pktsched_init(void)
|
||||
return err;
|
||||
}
|
||||
|
||||
@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
register_qdisc(&pfifo_head_drop_qdisc_ops);
|
||||
--- a/net/sched/sch_fq_codel.c
|
||||
+++ b/net/sched/sch_fq_codel.c
|
||||
@@ -709,7 +709,7 @@ static const struct Qdisc_class_ops fq_c
|
||||
@@ -707,7 +707,7 @@ static const struct Qdisc_class_ops fq_c
|
||||
.walk = fq_codel_walk,
|
||||
};
|
||||
|
||||
@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
.cl_ops = &fq_codel_class_ops,
|
||||
.id = "fq_codel",
|
||||
.priv_size = sizeof(struct fq_codel_sched_data),
|
||||
@@ -724,6 +724,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
|
||||
@@ -722,6 +722,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
|
||||
.dump_stats = fq_codel_dump_stats,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
@ -110,7 +110,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
||||
depends on NETFILTER_ADVANCED
|
||||
--- a/net/netfilter/nf_conntrack_core.c
|
||||
+++ b/net/netfilter/nf_conntrack_core.c
|
||||
@@ -2878,6 +2878,10 @@ int nf_conntrack_init_net(struct net *ne
|
||||
@@ -2886,6 +2886,10 @@ int nf_conntrack_init_net(struct net *ne
|
||||
nf_conntrack_helper_pernet_init(net);
|
||||
nf_conntrack_proto_pernet_init(net);
|
||||
|
||||
|
@ -12,9 +12,9 @@
|
||||
struct list_head *br_ip_list);
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -913,6 +913,10 @@ struct sk_buff {
|
||||
#endif
|
||||
@@ -915,6 +915,10 @@ struct sk_buff {
|
||||
__u8 slow_gro:1;
|
||||
__u8 scm_io_uring:1;
|
||||
|
||||
+#ifdef CONFIG_SHORTCUT_FE
|
||||
+ __u8 fast_forwarded:1;
|
||||
|
@ -338,7 +338,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
||||
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
|
||||
return -1;
|
||||
|
||||
@@ -1525,6 +1686,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
|
||||
@@ -1526,6 +1687,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
|
||||
t->parms.link = p->link;
|
||||
t->parms.proto = p->proto;
|
||||
t->parms.fwmark = p->fwmark;
|
||||
@ -353,7 +353,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
||||
dst_cache_reset(&t->dst_cache);
|
||||
ip6_tnl_link_config(t);
|
||||
return 0;
|
||||
@@ -1563,6 +1732,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
|
||||
@@ -1564,6 +1733,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
|
||||
p->flowinfo = u->flowinfo;
|
||||
p->link = u->link;
|
||||
p->proto = u->proto;
|
||||
@ -361,7 +361,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
||||
memcpy(p->name, u->name, sizeof(u->name));
|
||||
}
|
||||
|
||||
@@ -1949,6 +2119,15 @@ static int ip6_tnl_validate(struct nlatt
|
||||
@@ -1950,6 +2120,15 @@ static int ip6_tnl_validate(struct nlatt
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -377,7 +377,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
||||
static void ip6_tnl_netlink_parms(struct nlattr *data[],
|
||||
struct __ip6_tnl_parm *parms)
|
||||
{
|
||||
@@ -1986,6 +2165,46 @@ static void ip6_tnl_netlink_parms(struct
|
||||
@@ -1987,6 +2166,46 @@ static void ip6_tnl_netlink_parms(struct
|
||||
|
||||
if (data[IFLA_IPTUN_FWMARK])
|
||||
parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
|
||||
@ -424,7 +424,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
||||
}
|
||||
|
||||
static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
|
||||
@@ -2101,6 +2320,12 @@ static void ip6_tnl_dellink(struct net_d
|
||||
@@ -2102,6 +2321,12 @@ static void ip6_tnl_dellink(struct net_d
|
||||
|
||||
static size_t ip6_tnl_get_size(const struct net_device *dev)
|
||||
{
|
||||
@ -437,7 +437,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
||||
return
|
||||
/* IFLA_IPTUN_LINK */
|
||||
nla_total_size(4) +
|
||||
@@ -2130,6 +2355,24 @@ static size_t ip6_tnl_get_size(const str
|
||||
@@ -2131,6 +2356,24 @@ static size_t ip6_tnl_get_size(const str
|
||||
nla_total_size(0) +
|
||||
/* IFLA_IPTUN_FWMARK */
|
||||
nla_total_size(4) +
|
||||
@ -462,7 +462,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
||||
0;
|
||||
}
|
||||
|
||||
@@ -2137,6 +2380,9 @@ static int ip6_tnl_fill_info(struct sk_b
|
||||
@@ -2138,6 +2381,9 @@ static int ip6_tnl_fill_info(struct sk_b
|
||||
{
|
||||
struct ip6_tnl *tunnel = netdev_priv(dev);
|
||||
struct __ip6_tnl_parm *parm = &tunnel->parms;
|
||||
@ -472,7 +472,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
||||
|
||||
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
|
||||
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
|
||||
@@ -2146,9 +2392,27 @@ static int ip6_tnl_fill_info(struct sk_b
|
||||
@@ -2147,9 +2393,27 @@ static int ip6_tnl_fill_info(struct sk_b
|
||||
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
|
||||
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
|
||||
nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
|
||||
@ -501,7 +501,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
|
||||
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
|
||||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
|
||||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
|
||||
@@ -2188,6 +2452,7 @@ static const struct nla_policy ip6_tnl_p
|
||||
@@ -2189,6 +2453,7 @@ static const struct nla_policy ip6_tnl_p
|
||||
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
|
||||
[IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG },
|
||||
[IFLA_IPTUN_FWMARK] = { .type = NLA_U32 },
|
||||
|
@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/20210905165816.655275-1-robimarko@gmail.com
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 19 +++++++++++++++++++
|
||||
1 file changed, 19 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 6b9ac0550490..c37de90616fa 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -293,6 +293,25 @@ gcc: gcc@1800000 {
|
||||
@@ -293,6 +293,25 @@
|
||||
#reset-cells = <0x1>;
|
||||
};
|
||||
|
||||
@ -43,6 +41,3 @@ index 6b9ac0550490..c37de90616fa 100644
|
||||
sdhc_1: sdhci@7824900 {
|
||||
compatible = "qcom,sdhci-msm-v4";
|
||||
reg = <0x7824900 0x500>, <0x7824000 0x800>;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/20210831052325.21229-1-shawn.guo@linaro.org
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index c37de90616fa..5acbacecbf4f 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -212,7 +212,7 @@ prng: rng@e3000 {
|
||||
@@ -212,7 +212,7 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@ -27,6 +25,3 @@ index c37de90616fa..5acbacecbf4f 100644
|
||||
compatible = "qcom,bam-v1.7.0";
|
||||
reg = <0x00704000 0x20000>;
|
||||
interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/20211001145421.18302-1-amadeus@jmu.edu.cn
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 5acbacecbf4f..9e700963a1e3 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -430,6 +430,21 @@ blsp1_i2c3: i2c@78b7000 {
|
||||
@@ -430,6 +430,21 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@ -40,6 +38,3 @@ index 5acbacecbf4f..9e700963a1e3 100644
|
||||
blsp1_i2c6: i2c@78ba000 {
|
||||
compatible = "qcom,i2c-qup-v2.2.1";
|
||||
#address-cells = <1>;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -17,11 +17,9 @@ Link: https://lore.kernel.org/r/20210929034253.24570-4-shawn.guo@linaro.org
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 9e700963a1e3..69ce2dd644ab 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -91,7 +91,6 @@ soc: soc {
|
||||
@@ -91,7 +91,6 @@
|
||||
ssphy_1: phy@58000 {
|
||||
compatible = "qcom,ipq8074-qmp-usb3-phy";
|
||||
reg = <0x00058000 0x1c4>;
|
||||
@ -29,7 +27,7 @@ index 9e700963a1e3..69ce2dd644ab 100644
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
@@ -112,6 +111,7 @@ usb1_ssphy: lane@58200 {
|
||||
@@ -112,6 +111,7 @@
|
||||
<0x00058800 0x1f8>, /* PCS */
|
||||
<0x00058600 0x044>; /* PCS misc*/
|
||||
#phy-cells = <0>;
|
||||
@ -37,7 +35,7 @@ index 9e700963a1e3..69ce2dd644ab 100644
|
||||
clocks = <&gcc GCC_USB1_PIPE_CLK>;
|
||||
clock-names = "pipe0";
|
||||
clock-output-names = "gcc_usb1_pipe_clk_src";
|
||||
@@ -134,7 +134,6 @@ qusb_phy_1: phy@59000 {
|
||||
@@ -134,7 +134,6 @@
|
||||
ssphy_0: phy@78000 {
|
||||
compatible = "qcom,ipq8074-qmp-usb3-phy";
|
||||
reg = <0x00078000 0x1c4>;
|
||||
@ -45,7 +43,7 @@ index 9e700963a1e3..69ce2dd644ab 100644
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
@@ -155,6 +154,7 @@ usb0_ssphy: lane@78200 {
|
||||
@@ -155,6 +154,7 @@
|
||||
<0x00078800 0x1f8>, /* PCS */
|
||||
<0x00078600 0x044>; /* PCS misc*/
|
||||
#phy-cells = <0>;
|
||||
@ -53,6 +51,3 @@ index 9e700963a1e3..69ce2dd644ab 100644
|
||||
clocks = <&gcc GCC_USB0_PIPE_CLK>;
|
||||
clock-names = "pipe0";
|
||||
clock-output-names = "gcc_usb0_pipe_clk_src";
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -23,11 +23,9 @@ Link: https://lore.kernel.org/r/20210929034253.24570-5-shawn.guo@linaro.org
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 69ce2dd644ab..56c1b4cfc6ba 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -105,7 +105,7 @@ ssphy_1: phy@58000 {
|
||||
@@ -105,7 +105,7 @@
|
||||
reset-names = "phy","common";
|
||||
status = "disabled";
|
||||
|
||||
@ -36,7 +34,7 @@ index 69ce2dd644ab..56c1b4cfc6ba 100644
|
||||
reg = <0x00058200 0x130>, /* Tx */
|
||||
<0x00058400 0x200>, /* Rx */
|
||||
<0x00058800 0x1f8>, /* PCS */
|
||||
@@ -148,7 +148,7 @@ ssphy_0: phy@78000 {
|
||||
@@ -148,7 +148,7 @@
|
||||
reset-names = "phy","common";
|
||||
status = "disabled";
|
||||
|
||||
@ -45,6 +43,3 @@ index 69ce2dd644ab..56c1b4cfc6ba 100644
|
||||
reg = <0x00078200 0x130>, /* Tx */
|
||||
<0x00078400 0x200>, /* Rx */
|
||||
<0x00078800 0x1f8>, /* PCS */
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -19,11 +19,9 @@ Link: https://lore.kernel.org/r/20210929034253.24570-9-shawn.guo@linaro.org
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 46 +++++++++++++++++++++------
|
||||
1 file changed, 36 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 56c1b4cfc6ba..4512fcac0f9a 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -174,34 +174,60 @@ qusb_phy_0: phy@79000 {
|
||||
@@ -174,34 +174,60 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@ -94,6 +92,3 @@ index 56c1b4cfc6ba..4512fcac0f9a 100644
|
||||
};
|
||||
|
||||
prng: rng@e3000 {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/20211007115846.26255-1-robimarko@gmail.com
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 4512fcac0f9a..6ee54f89f973 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -230,6 +230,18 @@ pcie_phy1: phy@8e200 {
|
||||
@@ -230,6 +230,18 @@
|
||||
};
|
||||
};
|
||||
|
||||
@ -36,6 +34,3 @@ index 4512fcac0f9a..6ee54f89f973 100644
|
||||
prng: rng@e3000 {
|
||||
compatible = "qcom,prng-ee";
|
||||
reg = <0x000e3000 0x1000>;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/20220106212512.1970828-1-robimarko@gmail.com
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 20 ++++++++++++++++++++
|
||||
1 file changed, 20 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 6ee54f89f973..954f85c460ed 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -76,6 +76,20 @@ psci {
|
||||
@@ -76,6 +76,20 @@
|
||||
method = "smc";
|
||||
};
|
||||
|
||||
@ -38,7 +36,7 @@ index 6ee54f89f973..954f85c460ed 100644
|
||||
firmware {
|
||||
scm {
|
||||
compatible = "qcom,scm-ipq8074", "qcom,scm";
|
||||
@@ -331,6 +345,12 @@ gcc: gcc@1800000 {
|
||||
@@ -331,6 +345,12 @@
|
||||
#reset-cells = <0x1>;
|
||||
};
|
||||
|
||||
@ -51,6 +49,3 @@ index 6ee54f89f973..954f85c460ed 100644
|
||||
spmi_bus: spmi@200f000 {
|
||||
compatible = "qcom,spmi-pmic-arb";
|
||||
reg = <0x0200f000 0x001000>,
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/1641560078-860-1-git-send-email-quic_kathirav@qu
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 954f85c460ed..9e8e907290a4 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -88,6 +88,11 @@ smem@4ab00000 {
|
||||
@@ -88,6 +88,11 @@
|
||||
|
||||
hwlocks = <&tcsr_mutex 0>;
|
||||
};
|
||||
@ -30,6 +28,3 @@ index 954f85c460ed..9e8e907290a4 100644
|
||||
};
|
||||
|
||||
firmware {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/1644334525-11577-2-git-send-email-quic_kathirav@
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 9e8e907290a4..c98443d4798f 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -634,9 +634,18 @@ dwc_1: dwc3@8c00000 {
|
||||
@@ -634,9 +634,18 @@
|
||||
|
||||
intc: interrupt-controller@b000000 {
|
||||
compatible = "qcom,msm-qgic2";
|
||||
@ -36,6 +34,3 @@ index 9e8e907290a4..c98443d4798f 100644
|
||||
};
|
||||
|
||||
timer {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/1643819709-5410-2-git-send-email-quic_kathirav@q
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index c98443d4798f..664fba3632b1 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -670,7 +670,6 @@ timer@b120000 {
|
||||
@@ -670,7 +670,6 @@
|
||||
ranges;
|
||||
compatible = "arm,armv7-timer-mem";
|
||||
reg = <0x0b120000 0x1000>;
|
||||
@ -26,6 +24,3 @@ index c98443d4798f..664fba3632b1 100644
|
||||
|
||||
frame@b120000 {
|
||||
frame-number = <0>;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/20220405063451.12011-2-krzysztof.kozlowski@linar
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 664fba3632b1..61fc121dce7b 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -471,8 +471,8 @@ blsp1_i2c2: i2c@78b6000 {
|
||||
@@ -471,8 +471,8 @@
|
||||
<&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
|
||||
clock-names = "iface", "core";
|
||||
clock-frequency = <400000>;
|
||||
@ -29,7 +27,7 @@ index 664fba3632b1..61fc121dce7b 100644
|
||||
pinctrl-0 = <&i2c_0_pins>;
|
||||
pinctrl-names = "default";
|
||||
status = "disabled";
|
||||
@@ -488,8 +488,8 @@ blsp1_i2c3: i2c@78b7000 {
|
||||
@@ -488,8 +488,8 @@
|
||||
<&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>;
|
||||
clock-names = "iface", "core";
|
||||
clock-frequency = <100000>;
|
||||
@ -40,7 +38,7 @@ index 664fba3632b1..61fc121dce7b 100644
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -503,8 +503,8 @@ blsp1_i2c5: i2c@78b9000 {
|
||||
@@ -503,8 +503,8 @@
|
||||
<&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>;
|
||||
clock-names = "iface", "core";
|
||||
clock-frequency = <400000>;
|
||||
@ -51,7 +49,7 @@ index 664fba3632b1..61fc121dce7b 100644
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -518,8 +518,8 @@ blsp1_i2c6: i2c@78ba000 {
|
||||
@@ -518,8 +518,8 @@
|
||||
<&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>;
|
||||
clock-names = "iface", "core";
|
||||
clock-frequency = <100000>;
|
||||
@ -62,6 +60,3 @@ index 664fba3632b1..61fc121dce7b 100644
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/20220405063451.12011-3-krzysztof.kozlowski@linar
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 24 ++++++++++++------------
|
||||
1 file changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 61fc121dce7b..e771ceea7453 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -467,9 +467,9 @@ blsp1_i2c2: i2c@78b6000 {
|
||||
@@ -467,9 +467,9 @@
|
||||
#size-cells = <0>;
|
||||
reg = <0x078b6000 0x600>;
|
||||
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
|
||||
@ -30,7 +28,7 @@ index 61fc121dce7b..e771ceea7453 100644
|
||||
clock-frequency = <400000>;
|
||||
dmas = <&blsp_dma 14>, <&blsp_dma 15>;
|
||||
dma-names = "tx", "rx";
|
||||
@@ -484,9 +484,9 @@ blsp1_i2c3: i2c@78b7000 {
|
||||
@@ -484,9 +484,9 @@
|
||||
#size-cells = <0>;
|
||||
reg = <0x078b7000 0x600>;
|
||||
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
|
||||
@ -43,7 +41,7 @@ index 61fc121dce7b..e771ceea7453 100644
|
||||
clock-frequency = <100000>;
|
||||
dmas = <&blsp_dma 16>, <&blsp_dma 17>;
|
||||
dma-names = "tx", "rx";
|
||||
@@ -499,9 +499,9 @@ blsp1_i2c5: i2c@78b9000 {
|
||||
@@ -499,9 +499,9 @@
|
||||
#size-cells = <0>;
|
||||
reg = <0x78b9000 0x600>;
|
||||
interrupts = <GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH>;
|
||||
@ -56,7 +54,7 @@ index 61fc121dce7b..e771ceea7453 100644
|
||||
clock-frequency = <400000>;
|
||||
dmas = <&blsp_dma 20>, <&blsp_dma 21>;
|
||||
dma-names = "tx", "rx";
|
||||
@@ -514,9 +514,9 @@ blsp1_i2c6: i2c@78ba000 {
|
||||
@@ -514,9 +514,9 @@
|
||||
#size-cells = <0>;
|
||||
reg = <0x078ba000 0x600>;
|
||||
interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
|
||||
@ -69,6 +67,3 @@ index 61fc121dce7b..e771ceea7453 100644
|
||||
clock-frequency = <100000>;
|
||||
dmas = <&blsp_dma 22>, <&blsp_dma 23>;
|
||||
dma-names = "tx", "rx";
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -15,11 +15,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index e771ceea7453..51c3eb1bd393 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -578,7 +578,7 @@ usb_0: usb@8af8800 {
|
||||
@@ -578,7 +578,7 @@
|
||||
resets = <&gcc GCC_USB0_BCR>;
|
||||
status = "disabled";
|
||||
|
||||
@ -28,7 +26,7 @@ index e771ceea7453..51c3eb1bd393 100644
|
||||
compatible = "snps,dwc3";
|
||||
reg = <0x8a00000 0xcd00>;
|
||||
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
|
||||
@@ -618,7 +618,7 @@ usb_1: usb@8cf8800 {
|
||||
@@ -618,7 +618,7 @@
|
||||
resets = <&gcc GCC_USB1_BCR>;
|
||||
status = "disabled";
|
||||
|
||||
@ -37,6 +35,3 @@ index e771ceea7453..51c3eb1bd393 100644
|
||||
compatible = "snps,dwc3";
|
||||
reg = <0x8c00000 0xcd00>;
|
||||
interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,11 +14,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 51c3eb1bd393..4d3ecb09de9c 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -553,7 +553,7 @@ qpic_nand: nand-controller@79b0000 {
|
||||
@@ -553,7 +553,7 @@
|
||||
};
|
||||
|
||||
usb_0: usb@8af8800 {
|
||||
@ -27,7 +25,7 @@ index 51c3eb1bd393..4d3ecb09de9c 100644
|
||||
reg = <0x08af8800 0x400>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
@@ -593,7 +593,7 @@ dwc_0: usb@8a00000 {
|
||||
@@ -593,7 +593,7 @@
|
||||
};
|
||||
|
||||
usb_1: usb@8cf8800 {
|
||||
@ -36,6 +34,3 @@ index 51c3eb1bd393..4d3ecb09de9c 100644
|
||||
reg = <0x08cf8800 0x400>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,11 +13,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 4d3ecb09de9c..697f46e17903 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -563,8 +563,8 @@ usb_0: usb@8af8800 {
|
||||
@@ -563,8 +563,8 @@
|
||||
<&gcc GCC_USB0_MASTER_CLK>,
|
||||
<&gcc GCC_USB0_SLEEP_CLK>,
|
||||
<&gcc GCC_USB0_MOCK_UTMI_CLK>;
|
||||
@ -28,7 +26,7 @@ index 4d3ecb09de9c..697f46e17903 100644
|
||||
"sleep",
|
||||
"mock_utmi";
|
||||
|
||||
@@ -603,8 +603,8 @@ usb_1: usb@8cf8800 {
|
||||
@@ -603,8 +603,8 @@
|
||||
<&gcc GCC_USB1_MASTER_CLK>,
|
||||
<&gcc GCC_USB1_SLEEP_CLK>,
|
||||
<&gcc GCC_USB1_MOCK_UTMI_CLK>;
|
||||
@ -39,6 +37,3 @@ index 4d3ecb09de9c..697f46e17903 100644
|
||||
"sleep",
|
||||
"mock_utmi";
|
||||
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/20220526204248.832139-1-krzysztof.kozlowski@lina
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 697f46e17903..6a4bcf3ef94e 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -119,7 +119,7 @@ ssphy_1: phy@58000 {
|
||||
@@ -119,7 +119,7 @@
|
||||
<&xo>;
|
||||
clock-names = "aux", "cfg_ahb", "ref";
|
||||
|
||||
@ -27,7 +25,7 @@ index 697f46e17903..6a4bcf3ef94e 100644
|
||||
<&gcc GCC_USB3PHY_1_PHY_BCR>;
|
||||
reset-names = "phy","common";
|
||||
status = "disabled";
|
||||
@@ -162,7 +162,7 @@ ssphy_0: phy@78000 {
|
||||
@@ -162,7 +162,7 @@
|
||||
<&xo>;
|
||||
clock-names = "aux", "cfg_ahb", "ref";
|
||||
|
||||
@ -36,6 +34,3 @@ index 697f46e17903..6a4bcf3ef94e 100644
|
||||
<&gcc GCC_USB3PHY_0_PHY_BCR>;
|
||||
reset-names = "phy","common";
|
||||
status = "disabled";
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -21,11 +21,9 @@ Link: https://lore.kernel.org/r/20220514215424.1007718-2-bhupesh.sharma@linaro.o
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 6a4bcf3ef94e..3658f41393e1 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -375,7 +375,7 @@ spmi_bus: spmi@200f000 {
|
||||
@@ -375,7 +375,7 @@
|
||||
cell-index = <0>;
|
||||
};
|
||||
|
||||
@ -34,6 +32,3 @@ index 6a4bcf3ef94e..3658f41393e1 100644
|
||||
compatible = "qcom,sdhci-msm-v4";
|
||||
reg = <0x7824900 0x500>, <0x7824000 0x800>;
|
||||
reg-names = "hc_mem", "core_mem";
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -28,11 +28,9 @@ Link: https://lore.kernel.org/r/20220514215424.1007718-5-bhupesh.sharma@linaro.o
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 3658f41393e1..cdeb6e3f9a92 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -384,10 +384,10 @@ sdhc_1: mmc@7824900 {
|
||||
@@ -384,10 +384,10 @@
|
||||
<GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "hc_irq", "pwr_irq";
|
||||
|
||||
@ -47,6 +45,3 @@ index 3658f41393e1..cdeb6e3f9a92 100644
|
||||
max-frequency = <384000000>;
|
||||
mmc-ddr-1_8v;
|
||||
mmc-hs200-1_8v;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,8 +13,6 @@ Link: https://lore.kernel.org/r/20220515210048.483898-4-robimarko@gmail.com
|
||||
include/dt-bindings/clock/qcom,gcc-ipq8074.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/dt-bindings/clock/qcom,gcc-ipq8074.h b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
|
||||
index 8e2bec1c91bf..5f0928785d7a 100644
|
||||
--- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h
|
||||
+++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
|
||||
@@ -233,6 +233,7 @@
|
||||
@ -25,6 +23,3 @@ index 8e2bec1c91bf..5f0928785d7a 100644
|
||||
|
||||
#define GCC_BLSP1_BCR 0
|
||||
#define GCC_BLSP1_QUP1_BCR 1
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -15,11 +15,9 @@ Link: https://lore.kernel.org/r/20220515210048.483898-5-robimarko@gmail.com
|
||||
drivers/clk/qcom/gcc-ipq8074.c | 19 +++++++++++++++++++
|
||||
1 file changed, 19 insertions(+)
|
||||
|
||||
diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
index d6d5defb82c9..bbd8c8f0ed6f 100644
|
||||
--- a/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_clk = {
|
||||
@@ -3183,6 +3183,24 @@ static struct clk_branch gcc_nss_ptp_ref
|
||||
},
|
||||
};
|
||||
|
||||
@ -44,7 +42,7 @@ index d6d5defb82c9..bbd8c8f0ed6f 100644
|
||||
static struct clk_branch gcc_nssnoc_ce_apb_clk = {
|
||||
.halt_reg = 0x6830c,
|
||||
.clkr = {
|
||||
@@ -4655,6 +4673,7 @@ static struct clk_regmap *gcc_ipq8074_clks[] = {
|
||||
@@ -4655,6 +4673,7 @@ static struct clk_regmap *gcc_ipq8074_cl
|
||||
[GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
|
||||
[GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
|
||||
[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,
|
||||
@ -52,6 +50,3 @@ index d6d5defb82c9..bbd8c8f0ed6f 100644
|
||||
};
|
||||
|
||||
static const struct qcom_reset_map gcc_ipq8074_resets[] = {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,8 +13,6 @@ Link: https://lore.kernel.org/r/20220515210048.483898-8-robimarko@gmail.com
|
||||
include/dt-bindings/clock/qcom,gcc-ipq8074.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/include/dt-bindings/clock/qcom,gcc-ipq8074.h b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
|
||||
index 5f0928785d7a..e4991d303708 100644
|
||||
--- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h
|
||||
+++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
|
||||
@@ -368,4 +368,7 @@
|
||||
@ -25,6 +23,3 @@ index 5f0928785d7a..e4991d303708 100644
|
||||
+#define USB1_GDSC 1
|
||||
+
|
||||
#endif
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,8 +13,6 @@ Link: https://lore.kernel.org/r/20220515210048.483898-9-robimarko@gmail.com
|
||||
drivers/clk/qcom/gcc-ipq8074.c | 24 ++++++++++++++++++++++++
|
||||
2 files changed, 25 insertions(+)
|
||||
|
||||
diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
|
||||
index 9ef007b3cf9b..3c84e34353a4 100644
|
||||
--- a/drivers/clk/qcom/Kconfig
|
||||
+++ b/drivers/clk/qcom/Kconfig
|
||||
@@ -166,6 +166,7 @@ config IPQ_LCC_806X
|
||||
@ -25,8 +23,6 @@ index 9ef007b3cf9b..3c84e34353a4 100644
|
||||
help
|
||||
Support for global clock controller on ipq8074 devices.
|
||||
Say Y if you want to use peripheral devices such as UART, SPI,
|
||||
diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
index bbd8c8f0ed6f..42d185fe19c8 100644
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -22,6 +22,7 @@
|
||||
@ -37,7 +33,7 @@ index bbd8c8f0ed6f..42d185fe19c8 100644
|
||||
#include "reset.h"
|
||||
|
||||
enum {
|
||||
@@ -4408,6 +4409,22 @@ static struct clk_branch gcc_pcie0_axi_s_bridge_clk = {
|
||||
@@ -4408,6 +4409,22 @@ static struct clk_branch gcc_pcie0_axi_s
|
||||
},
|
||||
};
|
||||
|
||||
@ -60,7 +56,7 @@ index bbd8c8f0ed6f..42d185fe19c8 100644
|
||||
static const struct alpha_pll_config ubi32_pll_config = {
|
||||
.l = 0x4e,
|
||||
.config_ctl_val = 0x200d4aa8,
|
||||
@@ -4811,6 +4828,11 @@ static const struct qcom_reset_map gcc_ipq8074_resets[] = {
|
||||
@@ -4811,6 +4828,11 @@ static const struct qcom_reset_map gcc_i
|
||||
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
|
||||
};
|
||||
|
||||
@ -72,7 +68,7 @@ index bbd8c8f0ed6f..42d185fe19c8 100644
|
||||
static const struct of_device_id gcc_ipq8074_match_table[] = {
|
||||
{ .compatible = "qcom,gcc-ipq8074" },
|
||||
{ }
|
||||
@@ -4833,6 +4855,8 @@ static const struct qcom_cc_desc gcc_ipq8074_desc = {
|
||||
@@ -4833,6 +4855,8 @@ static const struct qcom_cc_desc gcc_ipq
|
||||
.num_resets = ARRAY_SIZE(gcc_ipq8074_resets),
|
||||
.clk_hws = gcc_ipq8074_hws,
|
||||
.num_clk_hws = ARRAY_SIZE(gcc_ipq8074_hws),
|
||||
@ -81,6 +77,3 @@ index bbd8c8f0ed6f..42d185fe19c8 100644
|
||||
};
|
||||
|
||||
static int gcc_ipq8074_probe(struct platform_device *pdev)
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,11 +13,9 @@ Link: https://lore.kernel.org/r/20220515210048.483898-11-robimarko@gmail.com
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index cdeb6e3f9a92..a6cb0dafcc17 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -347,6 +347,7 @@ gcc: gcc@1800000 {
|
||||
@@ -347,6 +347,7 @@
|
||||
compatible = "qcom,gcc-ipq8074";
|
||||
reg = <0x01800000 0x80000>;
|
||||
#clock-cells = <0x1>;
|
||||
@ -25,7 +23,7 @@ index cdeb6e3f9a92..a6cb0dafcc17 100644
|
||||
#reset-cells = <0x1>;
|
||||
};
|
||||
|
||||
@@ -575,6 +576,8 @@ usb_0: usb@8af8800 {
|
||||
@@ -575,6 +576,8 @@
|
||||
<133330000>,
|
||||
<19200000>;
|
||||
|
||||
@ -34,7 +32,7 @@ index cdeb6e3f9a92..a6cb0dafcc17 100644
|
||||
resets = <&gcc GCC_USB0_BCR>;
|
||||
status = "disabled";
|
||||
|
||||
@@ -615,6 +618,8 @@ usb_1: usb@8cf8800 {
|
||||
@@ -615,6 +618,8 @@
|
||||
<133330000>,
|
||||
<19200000>;
|
||||
|
||||
@ -43,6 +41,3 @@ index cdeb6e3f9a92..a6cb0dafcc17 100644
|
||||
resets = <&gcc GCC_USB1_BCR>;
|
||||
status = "disabled";
|
||||
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -19,11 +19,9 @@ Link: https://lore.kernel.org/r/20220704113318.623102-1-robimarko@gmail.com
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index a6cb0dafcc17..3779563527fa 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -653,14 +653,6 @@ v2m@0 {
|
||||
@@ -653,14 +653,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
@ -38,7 +36,7 @@ index a6cb0dafcc17..3779563527fa 100644
|
||||
watchdog: watchdog@b017000 {
|
||||
compatible = "qcom,kpss-wdt";
|
||||
reg = <0xb017000 0x1000>;
|
||||
@@ -852,4 +844,12 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
|
||||
@@ -852,4 +844,12 @@
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
@ -51,6 +49,3 @@ index a6cb0dafcc17..3779563527fa 100644
|
||||
+ <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
|
||||
+ };
|
||||
};
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -15,11 +15,9 @@ Link: https://lore.kernel.org/r/20220704143554.1180927-2-robimarko@gmail.com
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 3779563527fa..c4f9bec9a39b 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -389,6 +389,7 @@ sdhc_1: mmc@7824900 {
|
||||
@@ -389,6 +389,7 @@
|
||||
<&gcc GCC_SDCC1_APPS_CLK>,
|
||||
<&xo>;
|
||||
clock-names = "iface", "core", "xo";
|
||||
@ -27,6 +25,3 @@ index 3779563527fa..c4f9bec9a39b 100644
|
||||
max-frequency = <384000000>;
|
||||
mmc-ddr-1_8v;
|
||||
mmc-hs200-1_8v;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,11 +14,9 @@ Link: https://lore.kernel.org/r/20220705114032.22787-5-johan+linaro@kernel.org
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index c4f9bec9a39b..edcb6a500175 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -130,7 +130,7 @@ usb1_ssphy: phy@58200 {
|
||||
@@ -130,7 +130,7 @@
|
||||
<0x00058800 0x1f8>, /* PCS */
|
||||
<0x00058600 0x044>; /* PCS misc*/
|
||||
#phy-cells = <0>;
|
||||
@ -27,7 +25,7 @@ index c4f9bec9a39b..edcb6a500175 100644
|
||||
clocks = <&gcc GCC_USB1_PIPE_CLK>;
|
||||
clock-names = "pipe0";
|
||||
clock-output-names = "gcc_usb1_pipe_clk_src";
|
||||
@@ -173,7 +173,7 @@ usb0_ssphy: phy@78200 {
|
||||
@@ -173,7 +173,7 @@
|
||||
<0x00078800 0x1f8>, /* PCS */
|
||||
<0x00078600 0x044>; /* PCS misc*/
|
||||
#phy-cells = <0>;
|
||||
@ -36,6 +34,3 @@ index c4f9bec9a39b..edcb6a500175 100644
|
||||
clocks = <&gcc GCC_USB0_PIPE_CLK>;
|
||||
clock-names = "pipe0";
|
||||
clock-output-names = "gcc_usb0_pipe_clk_src";
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -18,11 +18,9 @@ Link: https://lore.kernel.org/r/20220707173733.404947-4-robimarko@gmail.com
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index edcb6a500175..14487a39fb6c 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -662,6 +662,14 @@ watchdog: watchdog@b017000 {
|
||||
@@ -662,6 +662,14 @@
|
||||
timeout-sec = <30>;
|
||||
};
|
||||
|
||||
@ -37,6 +35,3 @@ index edcb6a500175..14487a39fb6c 100644
|
||||
timer@b120000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -18,8 +18,6 @@ Link: https://lore.kernel.org/r/20220708133846.599735-1-robimarko@gmail.com
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 3 +++
|
||||
3 files changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
|
||||
index cc08dc4eb56a..3308e37f6abb 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
|
||||
@@ -5,8 +5,6 @@
|
||||
@ -31,8 +29,6 @@ index cc08dc4eb56a..3308e37f6abb 100644
|
||||
model = "Qualcomm Technologies, Inc. IPQ8074-HK01";
|
||||
compatible = "qcom,ipq8074-hk01", "qcom,ipq8074";
|
||||
interrupt-parent = <&intc>;
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi b/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
|
||||
index 07e670829676..0043cc23cf7d 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
|
||||
@@ -7,9 +7,6 @@
|
||||
@ -45,8 +41,6 @@ index 07e670829676..0043cc23cf7d 100644
|
||||
interrupt-parent = <&intc>;
|
||||
|
||||
aliases {
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 14487a39fb6c..e516d13b8f98 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -7,6 +7,9 @@
|
||||
@ -59,6 +53,3 @@ index 14487a39fb6c..e516d13b8f98 100644
|
||||
model = "Qualcomm Technologies, Inc. IPQ8074";
|
||||
compatible = "qcom,ipq8074";
|
||||
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -17,8 +17,6 @@ Link: https://lore.kernel.org/r/20220708133846.599735-2-robimarko@gmail.com
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 1 +
|
||||
3 files changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
|
||||
index 3308e37f6abb..ef30053136e3 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
|
||||
@@ -7,7 +7,6 @@
|
||||
@ -29,8 +27,6 @@ index 3308e37f6abb..ef30053136e3 100644
|
||||
|
||||
aliases {
|
||||
serial0 = &blsp1_uart5;
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi b/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
|
||||
index 0043cc23cf7d..c479a3fd0f40 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
|
||||
@@ -7,8 +7,6 @@
|
||||
@ -42,11 +38,9 @@ index 0043cc23cf7d..c479a3fd0f40 100644
|
||||
aliases {
|
||||
serial0 = &blsp1_uart5;
|
||||
};
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index e516d13b8f98..d53675fc1595 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -12,6 +12,7 @@ / {
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
model = "Qualcomm Technologies, Inc. IPQ8074";
|
||||
compatible = "qcom,ipq8074";
|
||||
@ -54,6 +48,3 @@ index e516d13b8f98..d53675fc1595 100644
|
||||
|
||||
clocks {
|
||||
sleep_clk: sleep_clk {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -19,8 +19,6 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
drivers/regulator/qcom_spmi-regulator.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
|
||||
index 41424a3366d0..49e5fe168391 100644
|
||||
--- a/drivers/regulator/qcom_spmi-regulator.c
|
||||
+++ b/drivers/regulator/qcom_spmi-regulator.c
|
||||
@@ -164,6 +164,7 @@ enum spmi_regulator_subtype {
|
||||
@ -31,7 +29,7 @@ index 41424a3366d0..49e5fe168391 100644
|
||||
};
|
||||
|
||||
enum spmi_common_regulator_registers {
|
||||
@@ -544,6 +545,10 @@ static struct spmi_voltage_range hfs430_ranges[] = {
|
||||
@@ -544,6 +545,10 @@ static struct spmi_voltage_range hfs430_
|
||||
SPMI_VOLTAGE_RANGE(0, 320000, 320000, 2040000, 2040000, 8000),
|
||||
};
|
||||
|
||||
@ -50,7 +48,7 @@ index 41424a3366d0..49e5fe168391 100644
|
||||
|
||||
static inline int spmi_vreg_read(struct spmi_regulator *vreg, u16 addr, u8 *buf,
|
||||
int len)
|
||||
@@ -1458,6 +1464,7 @@ static const struct regulator_ops spmi_hfs430_ops = {
|
||||
@@ -1458,6 +1464,7 @@ static const struct regulator_ops spmi_h
|
||||
|
||||
static const struct spmi_regulator_mapping supported_regulators[] = {
|
||||
/* type subtype dig_min dig_max ltype ops setpoints hpm_min */
|
||||
@ -58,6 +56,3 @@ index 41424a3366d0..49e5fe168391 100644
|
||||
SPMI_VREG(BUCK, GP_CTL, 0, INF, SMPS, smps, smps, 100000),
|
||||
SPMI_VREG(BUCK, HFS430, 0, INF, HFS430, hfs430, hfs430, 10000),
|
||||
SPMI_VREG(LDO, N300, 0, INF, LDO, ldo, nldo1, 10000),
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -20,8 +20,6 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
drivers/regulator/qcom_spmi-regulator.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
|
||||
index 49e5fe168391..828e97b873df 100644
|
||||
--- a/drivers/regulator/qcom_spmi-regulator.c
|
||||
+++ b/drivers/regulator/qcom_spmi-regulator.c
|
||||
@@ -165,6 +165,7 @@ enum spmi_regulator_subtype {
|
||||
@ -32,7 +30,7 @@ index 49e5fe168391..828e97b873df 100644
|
||||
};
|
||||
|
||||
enum spmi_common_regulator_registers {
|
||||
@@ -549,6 +550,10 @@ static struct spmi_voltage_range ht_p150_ranges[] = {
|
||||
@@ -549,6 +550,10 @@ static struct spmi_voltage_range ht_p150
|
||||
SPMI_VOLTAGE_RANGE(0, 1616000, 1616000, 3304000, 3304000, 8000),
|
||||
};
|
||||
|
||||
@ -43,7 +41,7 @@ index 49e5fe168391..828e97b873df 100644
|
||||
static DEFINE_SPMI_SET_POINTS(pldo);
|
||||
static DEFINE_SPMI_SET_POINTS(nldo1);
|
||||
static DEFINE_SPMI_SET_POINTS(nldo2);
|
||||
@@ -570,6 +575,7 @@ static DEFINE_SPMI_SET_POINTS(ht_lvpldo);
|
||||
@@ -570,6 +575,7 @@ static DEFINE_SPMI_SET_POINTS(ht_lvpldo)
|
||||
static DEFINE_SPMI_SET_POINTS(ht_nldo);
|
||||
static DEFINE_SPMI_SET_POINTS(hfs430);
|
||||
static DEFINE_SPMI_SET_POINTS(ht_p150);
|
||||
@ -51,7 +49,7 @@ index 49e5fe168391..828e97b873df 100644
|
||||
|
||||
static inline int spmi_vreg_read(struct spmi_regulator *vreg, u16 addr, u8 *buf,
|
||||
int len)
|
||||
@@ -1464,6 +1470,7 @@ static const struct regulator_ops spmi_hfs430_ops = {
|
||||
@@ -1464,6 +1470,7 @@ static const struct regulator_ops spmi_h
|
||||
|
||||
static const struct spmi_regulator_mapping supported_regulators[] = {
|
||||
/* type subtype dig_min dig_max ltype ops setpoints hpm_min */
|
||||
@ -59,6 +57,3 @@ index 49e5fe168391..828e97b873df 100644
|
||||
SPMI_VREG(LDO, HT_P150, 0, INF, HFS430, hfs430, ht_p150, 10000),
|
||||
SPMI_VREG(BUCK, GP_CTL, 0, INF, SMPS, smps, smps, 100000),
|
||||
SPMI_VREG(BUCK, HFS430, 0, INF, HFS430, hfs430, hfs430, 10000),
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -28,11 +28,9 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
drivers/regulator/qcom_spmi-regulator.c | 23 +++++++++++++++++++++++
|
||||
1 file changed, 23 insertions(+)
|
||||
|
||||
diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
|
||||
index 828e97b873df..13521d47d589 100644
|
||||
--- a/drivers/regulator/qcom_spmi-regulator.c
|
||||
+++ b/drivers/regulator/qcom_spmi-regulator.c
|
||||
@@ -2101,6 +2101,28 @@ static const struct spmi_regulator_data pm8005_regulators[] = {
|
||||
@@ -2101,6 +2101,28 @@ static const struct spmi_regulator_data
|
||||
{ }
|
||||
};
|
||||
|
||||
@ -61,7 +59,7 @@ index 828e97b873df..13521d47d589 100644
|
||||
static const struct spmi_regulator_data pms405_regulators[] = {
|
||||
{ "s3", 0x1a00, "vdd_s3"},
|
||||
{ }
|
||||
@@ -2117,6 +2139,7 @@ static const struct of_device_id qcom_spmi_regulator_match[] = {
|
||||
@@ -2117,6 +2139,7 @@ static const struct of_device_id qcom_sp
|
||||
{ .compatible = "qcom,pmi8994-regulators", .data = &pmi8994_regulators },
|
||||
{ .compatible = "qcom,pm660-regulators", .data = &pm660_regulators },
|
||||
{ .compatible = "qcom,pm660l-regulators", .data = &pm660l_regulators },
|
||||
@ -69,6 +67,3 @@ index 828e97b873df..13521d47d589 100644
|
||||
{ .compatible = "qcom,pms405-regulators", .data = &pms405_regulators },
|
||||
{ }
|
||||
};
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -12,11 +12,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
|
||||
index b2562e893139..fe1d3b260e27 100644
|
||||
--- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
|
||||
+++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
|
||||
@@ -1167,6 +1167,8 @@ static const struct of_device_id pmic_gpio_of_match[] = {
|
||||
@@ -1167,6 +1167,8 @@ static const struct of_device_id pmic_gp
|
||||
{ .compatible = "qcom,pmi8998-gpio", .data = (void *) 14 },
|
||||
{ .compatible = "qcom,pmk8350-gpio", .data = (void *) 4 },
|
||||
{ .compatible = "qcom,pmm8155au-gpio", .data = (void *) 10 },
|
||||
@ -25,6 +23,3 @@ index b2562e893139..fe1d3b260e27 100644
|
||||
{ .compatible = "qcom,pmr735a-gpio", .data = (void *) 4 },
|
||||
{ .compatible = "qcom,pmr735b-gpio", .data = (void *) 4 },
|
||||
/* pms405 has 12 GPIOs with holes on 1, 9, and 10 */
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,8 +13,6 @@ Link: https://lore.kernel.org/r/20211017161218.2378176-2-bjorn.andersson@linaro.
|
||||
drivers/mfd/qcom-spmi-pmic.c | 30 +++++++++++++++---------------
|
||||
1 file changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c
|
||||
index a35d5cf16faa..8be07102a468 100644
|
||||
--- a/drivers/mfd/qcom-spmi-pmic.c
|
||||
+++ b/drivers/mfd/qcom-spmi-pmic.c
|
||||
@@ -40,27 +40,27 @@
|
||||
@ -60,6 +58,3 @@ index a35d5cf16faa..8be07102a468 100644
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,8 +14,6 @@ Link: https://lore.kernel.org/r/20211017161218.2378176-4-bjorn.andersson@linaro.
|
||||
drivers/mfd/qcom-spmi-pmic.c | 17 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
|
||||
diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c
|
||||
index 8be07102a468..1cacc00aa6c9 100644
|
||||
--- a/drivers/mfd/qcom-spmi-pmic.c
|
||||
+++ b/drivers/mfd/qcom-spmi-pmic.c
|
||||
@@ -31,6 +31,8 @@
|
||||
@ -41,7 +39,7 @@ index 8be07102a468..1cacc00aa6c9 100644
|
||||
|
||||
static const struct of_device_id pmic_spmi_id_table[] = {
|
||||
{ .compatible = "qcom,pm660", .data = (void *)PM660_SUBTYPE },
|
||||
@@ -45,9 +54,15 @@ static const struct of_device_id pmic_spmi_id_table[] = {
|
||||
@@ -45,9 +54,15 @@ static const struct of_device_id pmic_sp
|
||||
{ .compatible = "qcom,pm8004", .data = (void *)PM8004_SUBTYPE },
|
||||
{ .compatible = "qcom,pm8005", .data = (void *)PM8005_SUBTYPE },
|
||||
{ .compatible = "qcom,pm8019", .data = (void *)PM8019_SUBTYPE },
|
||||
@ -57,7 +55,7 @@ index 8be07102a468..1cacc00aa6c9 100644
|
||||
{ .compatible = "qcom,pm8909", .data = (void *)PM8909_SUBTYPE },
|
||||
{ .compatible = "qcom,pm8916", .data = (void *)PM8916_SUBTYPE },
|
||||
{ .compatible = "qcom,pm8941", .data = (void *)PM8941_SUBTYPE },
|
||||
@@ -60,6 +75,8 @@ static const struct of_device_id pmic_spmi_id_table[] = {
|
||||
@@ -60,6 +75,8 @@ static const struct of_device_id pmic_sp
|
||||
{ .compatible = "qcom,pmi8962", .data = (void *)PMI8962_SUBTYPE },
|
||||
{ .compatible = "qcom,pmi8994", .data = (void *)PMI8994_SUBTYPE },
|
||||
{ .compatible = "qcom,pmi8998", .data = (void *)PMI8998_SUBTYPE },
|
||||
@ -66,6 +64,3 @@ index 8be07102a468..1cacc00aa6c9 100644
|
||||
{ .compatible = "qcom,spmi-pmic", .data = (void *)COMMON_SUBTYPE },
|
||||
{ }
|
||||
};
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,11 +14,9 @@ Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
|
||||
drivers/iio/adc/qcom-spmi-adc5.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c
|
||||
index 87438d1e5c0b..7bd3745884f0 100644
|
||||
--- a/drivers/iio/adc/qcom-spmi-adc5.c
|
||||
+++ b/drivers/iio/adc/qcom-spmi-adc5.c
|
||||
@@ -589,6 +589,8 @@ static const struct adc5_channels adc5_chans_rev2[ADC5_MAX_CHANNEL] = {
|
||||
@@ -589,6 +589,8 @@ static const struct adc5_channels adc5_c
|
||||
SCALE_HW_CALIB_DEFAULT)
|
||||
[ADC5_1P25VREF] = ADC5_CHAN_VOLT("vref_1p25", 0,
|
||||
SCALE_HW_CALIB_DEFAULT)
|
||||
@ -27,6 +25,3 @@ index 87438d1e5c0b..7bd3745884f0 100644
|
||||
[ADC5_VPH_PWR] = ADC5_CHAN_VOLT("vph_pwr", 1,
|
||||
SCALE_HW_CALIB_DEFAULT)
|
||||
[ADC5_VBAT_SNS] = ADC5_CHAN_VOLT("vbat_sns", 1,
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -15,8 +15,6 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
||||
drivers/phy/qualcomm/phy-qcom-qmp.c | 14 ++++++++++++--
|
||||
1 file changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
|
||||
index ed69d455ac0e..4a0e8dd9c97d 100644
|
||||
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
|
||||
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
|
||||
@@ -2842,6 +2842,9 @@ struct qmp_phy_cfg {
|
||||
@ -29,7 +27,7 @@ index ed69d455ac0e..4a0e8dd9c97d 100644
|
||||
/* true, if PCS block has no separate SW_RESET register */
|
||||
bool no_pcs_sw_reset;
|
||||
};
|
||||
@@ -5138,8 +5141,15 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np)
|
||||
@@ -5138,8 +5141,15 @@ static int phy_pipe_clk_register(struct
|
||||
|
||||
init.ops = &clk_fixed_rate_ops;
|
||||
|
||||
@ -47,6 +45,3 @@ index ed69d455ac0e..4a0e8dd9c97d 100644
|
||||
fixed->hw.init = &init;
|
||||
|
||||
ret = devm_clk_hw_register(qmp->dev, &fixed->hw);
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -16,11 +16,9 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
||||
drivers/phy/qualcomm/phy-qcom-qmp.c | 160 ++++++++++++++++++++++++++++
|
||||
1 file changed, 160 insertions(+)
|
||||
|
||||
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
|
||||
index 4a0e8dd9c97d..0219a34f1047 100644
|
||||
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
|
||||
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
|
||||
@@ -812,6 +812,133 @@ static const struct qmp_phy_init_tbl ipq8074_pcie_pcs_tbl[] = {
|
||||
@@ -812,6 +812,133 @@ static const struct qmp_phy_init_tbl ipq
|
||||
QMP_PHY_INIT_CFG_L(QPHY_START_CTRL, 0x3),
|
||||
};
|
||||
|
||||
@ -154,7 +152,7 @@ index 4a0e8dd9c97d..0219a34f1047 100644
|
||||
static const struct qmp_phy_init_tbl sdm845_qmp_pcie_serdes_tbl[] = {
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_BIAS_EN_CLKBUFLR_EN, 0x14),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_SELECT, 0x30),
|
||||
@@ -3167,6 +3294,36 @@ static const struct qmp_phy_cfg ipq8074_pciephy_cfg = {
|
||||
@@ -3167,6 +3294,36 @@ static const struct qmp_phy_cfg ipq8074_
|
||||
.pwrdn_delay_max = 1005, /* us */
|
||||
};
|
||||
|
||||
@ -191,16 +189,13 @@ index 4a0e8dd9c97d..0219a34f1047 100644
|
||||
static const struct qmp_phy_cfg ipq6018_pciephy_cfg = {
|
||||
.type = PHY_TYPE_PCIE,
|
||||
.nlanes = 1,
|
||||
@@ -5542,6 +5699,9 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = {
|
||||
}, {
|
||||
@@ -5543,6 +5700,9 @@ static const struct of_device_id qcom_qm
|
||||
.compatible = "qcom,ipq8074-qmp-pcie-phy",
|
||||
.data = &ipq8074_pciephy_cfg,
|
||||
+ }, {
|
||||
}, {
|
||||
+ .compatible = "qcom,ipq8074-qmp-gen3-pcie-phy",
|
||||
+ .data = &ipq8074_pciephy_gen3_cfg,
|
||||
}, {
|
||||
+ }, {
|
||||
.compatible = "qcom,ipq6018-qmp-pcie-phy",
|
||||
.data = &ipq6018_pciephy_cfg,
|
||||
--
|
||||
2.37.2
|
||||
|
||||
}, {
|
||||
|
@ -14,8 +14,6 @@ Link: https://lore.kernel.org/r/20210905171131.660885-1-robimarko@gmail.com
|
||||
drivers/soc/qcom/socinfo.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
|
||||
index 5beb452f2401..302a6a895c2f 100644
|
||||
--- a/drivers/soc/qcom/socinfo.c
|
||||
+++ b/drivers/soc/qcom/socinfo.c
|
||||
@@ -281,19 +281,31 @@ static const struct soc_id soc_id[] = {
|
||||
@ -50,6 +48,3 @@ index 5beb452f2401..302a6a895c2f 100644
|
||||
{ 402, "IPQ6018" },
|
||||
{ 403, "IPQ6028" },
|
||||
{ 421, "IPQ6000" },
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,8 +13,6 @@ Signed-off-by: Baruch Siach <baruch.siach@siklu.com>
|
||||
drivers/pci/controller/dwc/pcie-tegra194.c | 6 ------
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
|
||||
index 7d6e9b7576be..ea87809ee298 100644
|
||||
--- a/drivers/pci/controller/dwc/pcie-designware.h
|
||||
+++ b/drivers/pci/controller/dwc/pcie-designware.h
|
||||
@@ -74,6 +74,12 @@
|
||||
@ -30,8 +28,6 @@ index 7d6e9b7576be..ea87809ee298 100644
|
||||
#define PCIE_PORT_MULTI_LANE_CTRL 0x8C0
|
||||
#define PORT_MLTI_UPCFG_SUPPORT BIT(7)
|
||||
|
||||
diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
index bdd84765e646..1381b00702fa 100644
|
||||
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
@@ -193,12 +193,6 @@
|
||||
@ -47,6 +43,3 @@ index bdd84765e646..1381b00702fa 100644
|
||||
#define PORT_LOGIC_AMBA_ERROR_RESPONSE_DEFAULT 0x8D0
|
||||
#define AMBA_ERROR_RESPONSE_CRS_SHIFT 3
|
||||
#define AMBA_ERROR_RESPONSE_CRS_MASK GENMASK(1, 0)
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,8 +13,6 @@ Signed-off-by: Baruch Siach <baruch.siach@siklu.com>
|
||||
drivers/pci/controller/dwc/pcie-qcom.c | 15 +++++++++++++--
|
||||
1 file changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
|
||||
index 4c599699e3c8..f49de615c9c4 100644
|
||||
--- a/drivers/pci/controller/dwc/pcie-qcom.c
|
||||
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
|
||||
@@ -69,7 +69,18 @@
|
||||
@ -37,7 +35,7 @@ index 4c599699e3c8..f49de615c9c4 100644
|
||||
|
||||
#define PCIE20_PARF_Q2A_FLUSH 0x1AC
|
||||
|
||||
@@ -1125,7 +1136,7 @@ static int qcom_pcie_post_init_2_3_3(struct qcom_pcie *pcie)
|
||||
@@ -1125,7 +1136,7 @@ static int qcom_pcie_post_init_2_3_3(str
|
||||
|
||||
writel(PCI_COMMAND_MASTER, pci->dbi_base + PCI_COMMAND);
|
||||
writel(DBI_RO_WR_EN, pci->dbi_base + PCIE20_MISC_CONTROL_1_REG);
|
||||
@ -46,6 +44,3 @@ index 4c599699e3c8..f49de615c9c4 100644
|
||||
|
||||
val = readl(pci->dbi_base + offset + PCI_EXP_LNKCAP);
|
||||
val &= ~PCI_EXP_LNKCAP_ASPMS;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -21,8 +21,6 @@ Signed-off-by: Baruch Siach <baruch.siach@siklu.com>
|
||||
drivers/pci/controller/dwc/pcie-qcom.c | 135 +++++++++++++++++++
|
||||
2 files changed, 136 insertions(+)
|
||||
|
||||
diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
|
||||
index ea87809ee298..279c3778a13b 100644
|
||||
--- a/drivers/pci/controller/dwc/pcie-designware.h
|
||||
+++ b/drivers/pci/controller/dwc/pcie-designware.h
|
||||
@@ -76,6 +76,7 @@
|
||||
@ -33,8 +31,6 @@ index ea87809ee298..279c3778a13b 100644
|
||||
#define GEN3_RELATED_OFF_GEN3_EQ_DISABLE BIT(16)
|
||||
#define GEN3_RELATED_OFF_RATE_SHADOW_SEL_SHIFT 24
|
||||
#define GEN3_RELATED_OFF_RATE_SHADOW_SEL_MASK GENMASK(25, 24)
|
||||
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
|
||||
index f49de615c9c4..f50de3408add 100644
|
||||
--- a/drivers/pci/controller/dwc/pcie-qcom.c
|
||||
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
|
||||
@@ -52,6 +52,10 @@
|
||||
@ -68,7 +64,7 @@ index f49de615c9c4..f50de3408add 100644
|
||||
};
|
||||
|
||||
struct qcom_pcie;
|
||||
@@ -1276,6 +1286,121 @@ static void qcom_pcie_post_deinit_2_7_0(struct qcom_pcie *pcie)
|
||||
@@ -1276,6 +1286,121 @@ static void qcom_pcie_post_deinit_2_7_0(
|
||||
clk_disable_unprepare(res->pipe_clk);
|
||||
}
|
||||
|
||||
@ -190,7 +186,7 @@ index f49de615c9c4..f50de3408add 100644
|
||||
static int qcom_pcie_link_up(struct dw_pcie *pci)
|
||||
{
|
||||
u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP);
|
||||
@@ -1467,6 +1592,15 @@ static const struct qcom_pcie_ops ops_1_9_0 = {
|
||||
@@ -1467,6 +1592,15 @@ static const struct qcom_pcie_ops ops_1_
|
||||
.config_sid = qcom_pcie_config_sid_sm8250,
|
||||
};
|
||||
|
||||
@ -206,7 +202,7 @@ index f49de615c9c4..f50de3408add 100644
|
||||
static const struct dw_pcie_ops dw_pcie_ops = {
|
||||
.link_up = qcom_pcie_link_up,
|
||||
.start_link = qcom_pcie_start_link,
|
||||
@@ -1565,6 +1699,7 @@ static const struct of_device_id qcom_pcie_match[] = {
|
||||
@@ -1565,6 +1699,7 @@ static const struct of_device_id qcom_pc
|
||||
{ .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 },
|
||||
{ .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 },
|
||||
{ .compatible = "qcom,pcie-sm8250", .data = &ops_1_9_0 },
|
||||
@ -214,6 +210,3 @@ index f49de615c9c4..f50de3408add 100644
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -17,11 +17,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 35 +++++++++++++++++++++++++++
|
||||
1 file changed, 35 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index d53675fc1595..5985dfff073d 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -85,6 +85,26 @@ reserved-memory {
|
||||
@@ -85,6 +85,26 @@
|
||||
#size-cells = <2>;
|
||||
ranges;
|
||||
|
||||
@ -48,7 +46,7 @@ index d53675fc1595..5985dfff073d 100644
|
||||
smem@4ab00000 {
|
||||
compatible = "qcom,smem";
|
||||
reg = <0x0 0x4ab00000 0x0 0x00100000>;
|
||||
@@ -97,6 +117,21 @@ memory@4ac00000 {
|
||||
@@ -97,6 +117,21 @@
|
||||
no-map;
|
||||
reg = <0x0 0x4ac00000 0x0 0x00400000>;
|
||||
};
|
||||
@ -70,6 +68,3 @@ index d53675fc1595..5985dfff073d 100644
|
||||
};
|
||||
|
||||
firmware {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -21,8 +21,6 @@ Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
|
||||
drivers/clk/qcom/clk-rcg2.c | 7 +++++++
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h
|
||||
index 99efcc7f8d88..248115a018bc 100644
|
||||
--- a/drivers/clk/qcom/clk-rcg.h
|
||||
+++ b/drivers/clk/qcom/clk-rcg.h
|
||||
@@ -164,6 +164,7 @@ struct clk_rcg2_gfx3d {
|
||||
@ -33,11 +31,9 @@ index 99efcc7f8d88..248115a018bc 100644
|
||||
extern const struct clk_ops clk_edp_pixel_ops;
|
||||
extern const struct clk_ops clk_byte_ops;
|
||||
extern const struct clk_ops clk_byte2_ops;
|
||||
diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c
|
||||
index c3823cc32edc..fdbbda1f2ba4 100644
|
||||
--- a/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 = {
|
||||
@@ -477,6 +477,13 @@ const struct clk_ops clk_rcg2_floor_ops
|
||||
};
|
||||
EXPORT_SYMBOL_GPL(clk_rcg2_floor_ops);
|
||||
|
||||
@ -51,6 +47,3 @@ index c3823cc32edc..fdbbda1f2ba4 100644
|
||||
struct frac_entry {
|
||||
int num;
|
||||
int den;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -26,8 +26,6 @@ Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
|
||||
drivers/clk/qcom/apss-ipq6018.c | 13 ++++++-------
|
||||
1 file changed, 6 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/clk/qcom/apss-ipq6018.c b/drivers/clk/qcom/apss-ipq6018.c
|
||||
index d78ff2f310bf..be952d417ded 100644
|
||||
--- a/drivers/clk/qcom/apss-ipq6018.c
|
||||
+++ b/drivers/clk/qcom/apss-ipq6018.c
|
||||
@@ -16,7 +16,7 @@
|
||||
@ -39,7 +37,7 @@ index d78ff2f310bf..be952d417ded 100644
|
||||
|
||||
enum {
|
||||
P_XO,
|
||||
@@ -33,16 +33,15 @@ static const struct parent_map parents_apcs_alias0_clk_src_map[] = {
|
||||
@@ -33,16 +33,15 @@ static const struct parent_map parents_a
|
||||
{ P_APSS_PLL_EARLY, 5 },
|
||||
};
|
||||
|
||||
@ -61,6 +59,3 @@ index d78ff2f310bf..be952d417ded 100644
|
||||
.flags = CLK_SET_RATE_PARENT,
|
||||
},
|
||||
};
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -17,8 +17,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
drivers/clk/qcom/apss-ipq-pll.c | 12 +++++++++---
|
||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/clk/qcom/apss-ipq-pll.c b/drivers/clk/qcom/apss-ipq-pll.c
|
||||
index bef7899ad0d6..ba77749b16c4 100644
|
||||
--- a/drivers/clk/qcom/apss-ipq-pll.c
|
||||
+++ b/drivers/clk/qcom/apss-ipq-pll.c
|
||||
@@ -2,6 +2,7 @@
|
||||
@ -38,7 +36,7 @@ index bef7899ad0d6..ba77749b16c4 100644
|
||||
.l = 0x37,
|
||||
.config_ctl_val = 0x04141200,
|
||||
.config_ctl_hi_val = 0x0,
|
||||
@@ -54,6 +55,7 @@ static const struct regmap_config ipq_pll_regmap_config = {
|
||||
@@ -54,6 +55,7 @@ static const struct regmap_config ipq_pl
|
||||
|
||||
static int apss_ipq_pll_probe(struct platform_device *pdev)
|
||||
{
|
||||
@ -46,7 +44,7 @@ index bef7899ad0d6..ba77749b16c4 100644
|
||||
struct device *dev = &pdev->dev;
|
||||
struct regmap *regmap;
|
||||
void __iomem *base;
|
||||
@@ -67,7 +69,11 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
|
||||
@@ -67,7 +69,11 @@ static int apss_ipq_pll_probe(struct pla
|
||||
if (IS_ERR(regmap))
|
||||
return PTR_ERR(regmap);
|
||||
|
||||
@ -59,7 +57,7 @@ index bef7899ad0d6..ba77749b16c4 100644
|
||||
|
||||
ret = devm_clk_register_regmap(dev, &ipq_pll.clkr);
|
||||
if (ret)
|
||||
@@ -78,7 +84,7 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
|
||||
@@ -78,7 +84,7 @@ static int apss_ipq_pll_probe(struct pla
|
||||
}
|
||||
|
||||
static const struct of_device_id apss_ipq_pll_match_table[] = {
|
||||
@ -68,6 +66,3 @@ index bef7899ad0d6..ba77749b16c4 100644
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -17,8 +17,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
drivers/clk/qcom/apss-ipq-pll.c | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/clk/qcom/apss-ipq-pll.c b/drivers/clk/qcom/apss-ipq-pll.c
|
||||
index ba77749b16c4..a4016f3854c2 100644
|
||||
--- a/drivers/clk/qcom/apss-ipq-pll.c
|
||||
+++ b/drivers/clk/qcom/apss-ipq-pll.c
|
||||
@@ -39,10 +39,14 @@ static struct clk_alpha_pll ipq_pll = {
|
||||
@ -38,6 +36,3 @@ index ba77749b16c4..a4016f3854c2 100644
|
||||
};
|
||||
|
||||
static const struct regmap_config ipq_pll_regmap_config = {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -20,11 +20,9 @@ utilize match data provided by previous commit
|
||||
drivers/clk/qcom/apss-ipq-pll.c | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/drivers/clk/qcom/apss-ipq-pll.c b/drivers/clk/qcom/apss-ipq-pll.c
|
||||
index a4016f3854c2..a5aea27eb867 100644
|
||||
--- a/drivers/clk/qcom/apss-ipq-pll.c
|
||||
+++ b/drivers/clk/qcom/apss-ipq-pll.c
|
||||
@@ -49,6 +49,18 @@ static const struct alpha_pll_config ipq6018_pll_config = {
|
||||
@@ -49,6 +49,18 @@ static const struct alpha_pll_config ipq
|
||||
.test_ctl_hi_val = 0x4000,
|
||||
};
|
||||
|
||||
@ -43,7 +41,7 @@ index a4016f3854c2..a5aea27eb867 100644
|
||||
static const struct regmap_config ipq_pll_regmap_config = {
|
||||
.reg_bits = 32,
|
||||
.reg_stride = 4,
|
||||
@@ -89,6 +101,7 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
|
||||
@@ -89,6 +101,7 @@ static int apss_ipq_pll_probe(struct pla
|
||||
|
||||
static const struct of_device_id apss_ipq_pll_match_table[] = {
|
||||
{ .compatible = "qcom,ipq6018-a53pll", .data = &ipq6018_pll_config },
|
||||
@ -51,6 +49,3 @@ index a4016f3854c2..a5aea27eb867 100644
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -18,11 +18,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 5985dfff073d..5b62d7590fc6 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -703,7 +703,7 @@ watchdog: watchdog@b017000 {
|
||||
@@ -703,7 +703,7 @@
|
||||
|
||||
apcs_glb: mailbox@b111000 {
|
||||
compatible = "qcom,ipq8074-apcs-apps-global";
|
||||
@ -31,6 +29,3 @@ index 5985dfff073d..5b62d7590fc6 100644
|
||||
|
||||
#clock-cells = <1>;
|
||||
#mbox-cells = <1>;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -11,11 +11,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 5b62d7590fc6..bace14b742a1 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -709,6 +709,14 @@ apcs_glb: mailbox@b111000 {
|
||||
@@ -709,6 +709,14 @@
|
||||
#mbox-cells = <1>;
|
||||
};
|
||||
|
||||
@ -30,6 +28,3 @@ index 5b62d7590fc6..bace14b742a1 100644
|
||||
timer@b120000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -26,11 +26,9 @@ Changes in v5:
|
||||
drivers/mailbox/qcom-apcs-ipc-mailbox.c | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
|
||||
index 82ccfaf14b24..0d8d1b17ba45 100644
|
||||
--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
|
||||
+++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
|
||||
@@ -33,10 +33,6 @@ static const struct qcom_apcs_ipc_data ipq6018_apcs_data = {
|
||||
@@ -33,10 +33,6 @@ static const struct qcom_apcs_ipc_data i
|
||||
.offset = 8, .clk_name = "qcom,apss-ipq6018-clk"
|
||||
};
|
||||
|
||||
@ -41,7 +39,7 @@ index 82ccfaf14b24..0d8d1b17ba45 100644
|
||||
static const struct qcom_apcs_ipc_data msm8916_apcs_data = {
|
||||
.offset = 8, .clk_name = "qcom-apcs-msm8916-clk"
|
||||
};
|
||||
@@ -160,7 +156,7 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev)
|
||||
@@ -160,7 +156,7 @@ static int qcom_apcs_ipc_remove(struct p
|
||||
/* .data is the offset of the ipc register within the global block */
|
||||
static const struct of_device_id qcom_apcs_ipc_of_match[] = {
|
||||
{ .compatible = "qcom,ipq6018-apcs-apps-global", .data = &ipq6018_apcs_data },
|
||||
@ -50,6 +48,3 @@ index 82ccfaf14b24..0d8d1b17ba45 100644
|
||||
{ .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data },
|
||||
{ .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data },
|
||||
{ .compatible = "qcom,msm8953-apcs-kpss-global", .data = &msm8994_apcs_data },
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,11 +14,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index bace14b742a1..7d4ff7d8a239 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -704,8 +704,9 @@ watchdog: watchdog@b017000 {
|
||||
@@ -704,8 +704,9 @@
|
||||
apcs_glb: mailbox@b111000 {
|
||||
compatible = "qcom,ipq8074-apcs-apps-global";
|
||||
reg = <0x0b111000 0x1000>;
|
||||
@ -29,6 +27,3 @@ index bace14b742a1..7d4ff7d8a239 100644
|
||||
#mbox-cells = <1>;
|
||||
};
|
||||
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -11,8 +11,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
drivers/pci/controller/dwc/pcie-qcom.c | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
|
||||
index f50de3408add..5aec3510b5c9 100644
|
||||
--- a/drivers/pci/controller/dwc/pcie-qcom.c
|
||||
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
|
||||
@@ -184,7 +184,7 @@ struct qcom_pcie_resources_2_7_0 {
|
||||
@ -24,7 +22,7 @@ index f50de3408add..5aec3510b5c9 100644
|
||||
struct reset_control *rst;
|
||||
};
|
||||
|
||||
@@ -1296,8 +1296,10 @@ static int qcom_pcie_get_resources_2_9_0(struct qcom_pcie *pcie)
|
||||
@@ -1296,8 +1296,10 @@ static int qcom_pcie_get_resources_2_9_0
|
||||
res->clks[0].id = "iface";
|
||||
res->clks[1].id = "axi_m";
|
||||
res->clks[2].id = "axi_s";
|
||||
@ -37,7 +35,7 @@ index f50de3408add..5aec3510b5c9 100644
|
||||
|
||||
ret = devm_clk_bulk_get(dev, ARRAY_SIZE(res->clks), res->clks);
|
||||
if (ret < 0)
|
||||
@@ -1700,6 +1702,7 @@ static const struct of_device_id qcom_pcie_match[] = {
|
||||
@@ -1700,6 +1702,7 @@ static const struct of_device_id qcom_pc
|
||||
{ .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 },
|
||||
{ .compatible = "qcom,pcie-sm8250", .data = &ops_1_9_0 },
|
||||
{ .compatible = "qcom,pcie-ipq6018", .data = &ops_2_9_0 },
|
||||
@ -45,6 +43,3 @@ index f50de3408add..5aec3510b5c9 100644
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,11 +14,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 93 +++++++++++++++------------
|
||||
1 file changed, 52 insertions(+), 41 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 7d4ff7d8a239..019c8e302273 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -232,59 +232,61 @@ qusb_phy_0: phy@79000 {
|
||||
@@ -232,59 +232,61 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@ -100,7 +98,7 @@ index 7d4ff7d8a239..019c8e302273 100644
|
||||
};
|
||||
};
|
||||
|
||||
@@ -686,7 +688,7 @@ intc: interrupt-controller@b000000 {
|
||||
@@ -686,7 +688,7 @@
|
||||
reg = <0x0b000000 0x1000>, <0x0b002000 0x1000>;
|
||||
ranges = <0 0xb00a000 0xffd>;
|
||||
|
||||
@ -109,7 +107,7 @@ index 7d4ff7d8a239..019c8e302273 100644
|
||||
compatible = "arm,gic-v2m-frame";
|
||||
msi-controller;
|
||||
reg = <0x0 0xffd>;
|
||||
@@ -787,6 +789,7 @@ pcie1: pci@10000000 {
|
||||
@@ -787,6 +789,7 @@
|
||||
linux,pci-domain = <1>;
|
||||
bus-range = <0x00 0xff>;
|
||||
num-lanes = <1>;
|
||||
@ -117,7 +115,7 @@ index 7d4ff7d8a239..019c8e302273 100644
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
|
||||
@@ -794,12 +797,12 @@ pcie1: pci@10000000 {
|
||||
@@ -794,12 +797,12 @@
|
||||
phy-names = "pciephy";
|
||||
|
||||
ranges = <0x81000000 0 0x10200000 0x10200000
|
||||
@ -135,7 +133,7 @@ index 7d4ff7d8a239..019c8e302273 100644
|
||||
#interrupt-cells = <1>;
|
||||
interrupt-map-mask = <0 0 0 0x7>;
|
||||
interrupt-map = <0 0 0 1 &intc 0 142
|
||||
@@ -839,16 +842,18 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
|
||||
@@ -839,16 +842,18 @@
|
||||
};
|
||||
|
||||
pcie0: pci@20000000 {
|
||||
@ -160,7 +158,7 @@ index 7d4ff7d8a239..019c8e302273 100644
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
|
||||
@@ -856,12 +861,12 @@ pcie0: pci@20000000 {
|
||||
@@ -856,12 +861,12 @@
|
||||
phy-names = "pciephy";
|
||||
|
||||
ranges = <0x81000000 0 0x20200000 0x20200000
|
||||
@ -178,7 +176,7 @@ index 7d4ff7d8a239..019c8e302273 100644
|
||||
#interrupt-cells = <1>;
|
||||
interrupt-map-mask = <0 0 0 0x7>;
|
||||
interrupt-map = <0 0 0 1 &intc 0 75
|
||||
@@ -877,27 +882,33 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
|
||||
@@ -877,27 +882,33 @@
|
||||
<&gcc GCC_PCIE0_AXI_M_CLK>,
|
||||
<&gcc GCC_PCIE0_AXI_S_CLK>,
|
||||
<&gcc GCC_PCIE0_AHB_CLK>,
|
||||
@ -216,6 +214,3 @@ index 7d4ff7d8a239..019c8e302273 100644
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,8 +13,6 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
|
||||
drivers/remoteproc/qcom_q6v5_wcss.c | 65 +++++++++++++++++++++--------
|
||||
1 file changed, 47 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
index 20d50ec7eff1..0e5484020296 100644
|
||||
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
@@ -91,19 +91,6 @@ enum {
|
||||
@ -67,7 +65,7 @@ index 20d50ec7eff1..0e5484020296 100644
|
||||
static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
|
||||
{
|
||||
int ret;
|
||||
@@ -240,6 +243,12 @@ static int q6v5_wcss_start(struct rproc *rproc)
|
||||
@@ -240,6 +243,12 @@ static int q6v5_wcss_start(struct rproc
|
||||
struct q6v5_wcss *wcss = rproc->priv;
|
||||
int ret;
|
||||
|
||||
@ -80,7 +78,7 @@ index 20d50ec7eff1..0e5484020296 100644
|
||||
qcom_q6v5_prepare(&wcss->q6v5);
|
||||
|
||||
/* Release Q6 and WCSS reset */
|
||||
@@ -732,6 +741,7 @@ static int q6v5_wcss_stop(struct rproc *rproc)
|
||||
@@ -732,6 +741,7 @@ static int q6v5_wcss_stop(struct rproc *
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -88,7 +86,7 @@ index 20d50ec7eff1..0e5484020296 100644
|
||||
qcom_q6v5_unprepare(&wcss->q6v5);
|
||||
|
||||
return 0;
|
||||
@@ -896,7 +906,21 @@ static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss)
|
||||
@@ -896,7 +906,21 @@ static int q6v5_alloc_memory_region(stru
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -111,7 +109,7 @@ index 20d50ec7eff1..0e5484020296 100644
|
||||
{
|
||||
int ret;
|
||||
|
||||
@@ -986,7 +1010,7 @@ static int q6v5_wcss_init_clock(struct q6v5_wcss *wcss)
|
||||
@@ -986,7 +1010,7 @@ static int q6v5_wcss_init_clock(struct q
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -120,7 +118,7 @@ index 20d50ec7eff1..0e5484020296 100644
|
||||
{
|
||||
wcss->cx_supply = devm_regulator_get(wcss->dev, "cx");
|
||||
if (IS_ERR(wcss->cx_supply))
|
||||
@@ -1030,12 +1054,14 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
|
||||
@@ -1030,12 +1054,14 @@ static int q6v5_wcss_probe(struct platfo
|
||||
if (ret)
|
||||
goto free_rproc;
|
||||
|
||||
@ -138,7 +136,7 @@ index 20d50ec7eff1..0e5484020296 100644
|
||||
if (ret)
|
||||
goto free_rproc;
|
||||
}
|
||||
@@ -1082,6 +1108,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
|
||||
@@ -1082,6 +1108,7 @@ static int q6v5_wcss_remove(struct platf
|
||||
}
|
||||
|
||||
static const struct wcss_data wcss_ipq8074_res_init = {
|
||||
@ -146,7 +144,7 @@ index 20d50ec7eff1..0e5484020296 100644
|
||||
.firmware_name = "IPQ8074/q6_fw.mdt",
|
||||
.crash_reason_smem = WCSS_CRASH_REASON,
|
||||
.aon_reset_required = true,
|
||||
@@ -1091,6 +1118,8 @@ static const struct wcss_data wcss_ipq8074_res_init = {
|
||||
@@ -1091,6 +1118,8 @@ static const struct wcss_data wcss_ipq80
|
||||
};
|
||||
|
||||
static const struct wcss_data wcss_qcs404_res_init = {
|
||||
@ -155,6 +153,3 @@ index 20d50ec7eff1..0e5484020296 100644
|
||||
.crash_reason_smem = WCSS_CRASH_REASON,
|
||||
.firmware_name = "wcnss.mdt",
|
||||
.version = WCSS_QCS404,
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -12,8 +12,6 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
|
||||
drivers/remoteproc/qcom_q6v5_wcss.c | 43 +++++++++++++++++++++++++++--
|
||||
1 file changed, 40 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
index 0e5484020296..7d173b7816b8 100644
|
||||
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
@@ -18,6 +18,7 @@
|
||||
@ -50,7 +48,7 @@ index 0e5484020296..7d173b7816b8 100644
|
||||
};
|
||||
|
||||
static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
|
||||
@@ -251,6 +257,15 @@ static int q6v5_wcss_start(struct rproc *rproc)
|
||||
@@ -251,6 +257,15 @@ static int q6v5_wcss_start(struct rproc
|
||||
|
||||
qcom_q6v5_prepare(&wcss->q6v5);
|
||||
|
||||
@ -66,7 +64,7 @@ index 0e5484020296..7d173b7816b8 100644
|
||||
/* Release Q6 and WCSS reset */
|
||||
ret = reset_control_deassert(wcss->wcss_reset);
|
||||
if (ret) {
|
||||
@@ -285,6 +300,7 @@ static int q6v5_wcss_start(struct rproc *rproc)
|
||||
@@ -285,6 +300,7 @@ static int q6v5_wcss_start(struct rproc
|
||||
if (ret)
|
||||
goto wcss_q6_reset;
|
||||
|
||||
@ -74,7 +72,7 @@ index 0e5484020296..7d173b7816b8 100644
|
||||
ret = qcom_q6v5_wait_for_start(&wcss->q6v5, 5 * HZ);
|
||||
if (ret == -ETIMEDOUT)
|
||||
dev_err(wcss->dev, "start timed out\n");
|
||||
@@ -717,6 +733,15 @@ static int q6v5_wcss_stop(struct rproc *rproc)
|
||||
@@ -717,6 +733,15 @@ static int q6v5_wcss_stop(struct rproc *
|
||||
struct q6v5_wcss *wcss = rproc->priv;
|
||||
int ret;
|
||||
|
||||
@ -90,7 +88,7 @@ index 0e5484020296..7d173b7816b8 100644
|
||||
/* WCSS powerdown */
|
||||
if (wcss->requires_force_stop) {
|
||||
ret = qcom_q6v5_request_stop(&wcss->q6v5, NULL);
|
||||
@@ -741,6 +766,7 @@ static int q6v5_wcss_stop(struct rproc *rproc)
|
||||
@@ -741,6 +766,7 @@ static int q6v5_wcss_stop(struct rproc *
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -98,7 +96,7 @@ index 0e5484020296..7d173b7816b8 100644
|
||||
clk_disable_unprepare(wcss->prng_clk);
|
||||
qcom_q6v5_unprepare(&wcss->q6v5);
|
||||
|
||||
@@ -764,9 +790,15 @@ static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
|
||||
@@ -764,9 +790,15 @@ static int q6v5_wcss_load(struct rproc *
|
||||
struct q6v5_wcss *wcss = rproc->priv;
|
||||
int ret;
|
||||
|
||||
@ -117,7 +115,7 @@ index 0e5484020296..7d173b7816b8 100644
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -1032,6 +1064,9 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
|
||||
@@ -1032,6 +1064,9 @@ static int q6v5_wcss_probe(struct platfo
|
||||
if (!desc)
|
||||
return -EINVAL;
|
||||
|
||||
@ -127,7 +125,7 @@ index 0e5484020296..7d173b7816b8 100644
|
||||
rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops,
|
||||
desc->firmware_name, sizeof(*wcss));
|
||||
if (!rproc) {
|
||||
@@ -1045,6 +1080,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
|
||||
@@ -1045,6 +1080,7 @@ static int q6v5_wcss_probe(struct platfo
|
||||
|
||||
wcss->version = desc->version;
|
||||
wcss->requires_force_stop = desc->requires_force_stop;
|
||||
@ -135,7 +133,7 @@ index 0e5484020296..7d173b7816b8 100644
|
||||
|
||||
ret = q6v5_wcss_init_mmio(wcss, pdev);
|
||||
if (ret)
|
||||
@@ -1115,6 +1151,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
|
||||
@@ -1115,6 +1151,7 @@ static const struct wcss_data wcss_ipq80
|
||||
.wcss_q6_reset_required = true,
|
||||
.ops = &q6v5_wcss_ipq8074_ops,
|
||||
.requires_force_stop = true,
|
||||
@ -143,6 +141,3 @@ index 0e5484020296..7d173b7816b8 100644
|
||||
};
|
||||
|
||||
static const struct wcss_data wcss_qcs404_res_init = {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -16,8 +16,6 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
|
||||
drivers/remoteproc/qcom_q6v5_wcss.c | 33 +++++++++++++++++++++++++----
|
||||
1 file changed, 29 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
index 7d173b7816b8..60ed0c046693 100644
|
||||
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
@@ -139,6 +139,7 @@ struct q6v5_wcss {
|
||||
@ -38,7 +36,7 @@ index 7d173b7816b8..60ed0c046693 100644
|
||||
unsigned int crash_reason_smem;
|
||||
u32 version;
|
||||
bool aon_reset_required;
|
||||
@@ -788,8 +790,29 @@ static void *q6v5_wcss_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *i
|
||||
@@ -788,8 +790,29 @@ static void *q6v5_wcss_da_to_va(struct r
|
||||
static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
|
||||
{
|
||||
struct q6v5_wcss *wcss = rproc->priv;
|
||||
@ -68,7 +66,7 @@ index 7d173b7816b8..60ed0c046693 100644
|
||||
if (wcss->need_mem_protection)
|
||||
ret = qcom_mdt_load(wcss->dev, fw, rproc->firmware,
|
||||
WCNSS_PAS_ID, wcss->mem_region,
|
||||
@@ -1068,7 +1091,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
|
||||
@@ -1068,7 +1091,7 @@ static int q6v5_wcss_probe(struct platfo
|
||||
return -EPROBE_DEFER;
|
||||
|
||||
rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops,
|
||||
@ -77,7 +75,7 @@ index 7d173b7816b8..60ed0c046693 100644
|
||||
if (!rproc) {
|
||||
dev_err(&pdev->dev, "failed to allocate rproc\n");
|
||||
return -ENOMEM;
|
||||
@@ -1081,6 +1104,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
|
||||
@@ -1081,6 +1104,7 @@ static int q6v5_wcss_probe(struct platfo
|
||||
wcss->version = desc->version;
|
||||
wcss->requires_force_stop = desc->requires_force_stop;
|
||||
wcss->need_mem_protection = desc->need_mem_protection;
|
||||
@ -85,7 +83,7 @@ index 7d173b7816b8..60ed0c046693 100644
|
||||
|
||||
ret = q6v5_wcss_init_mmio(wcss, pdev);
|
||||
if (ret)
|
||||
@@ -1145,7 +1169,8 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
|
||||
@@ -1145,7 +1169,8 @@ static int q6v5_wcss_remove(struct platf
|
||||
|
||||
static const struct wcss_data wcss_ipq8074_res_init = {
|
||||
.init_clock = ipq8074_init_clock,
|
||||
@ -95,7 +93,7 @@ index 7d173b7816b8..60ed0c046693 100644
|
||||
.crash_reason_smem = WCSS_CRASH_REASON,
|
||||
.aon_reset_required = true,
|
||||
.wcss_q6_reset_required = true,
|
||||
@@ -1158,7 +1183,7 @@ static const struct wcss_data wcss_qcs404_res_init = {
|
||||
@@ -1158,7 +1183,7 @@ static const struct wcss_data wcss_qcs40
|
||||
.init_clock = qcs404_init_clock,
|
||||
.init_regulator = qcs404_init_regulator,
|
||||
.crash_reason_smem = WCSS_CRASH_REASON,
|
||||
@ -104,6 +102,3 @@ index 7d173b7816b8..60ed0c046693 100644
|
||||
.version = WCSS_QCS404,
|
||||
.aon_reset_required = false,
|
||||
.wcss_q6_reset_required = false,
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -12,11 +12,9 @@ Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
|
||||
drivers/remoteproc/qcom_q6v5_wcss.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
index 60ed0c046693..e32efdc660d2 100644
|
||||
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
@@ -1174,6 +1174,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
|
||||
@@ -1174,6 +1174,7 @@ static const struct wcss_data wcss_ipq80
|
||||
.crash_reason_smem = WCSS_CRASH_REASON,
|
||||
.aon_reset_required = true,
|
||||
.wcss_q6_reset_required = true,
|
||||
@ -24,6 +22,3 @@ index 60ed0c046693..e32efdc660d2 100644
|
||||
.ops = &q6v5_wcss_ipq8074_ops,
|
||||
.requires_force_stop = true,
|
||||
.need_mem_protection = true,
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -12,8 +12,6 @@ Signed-off-by: Sricharan R <sricharan@codeaurora.org>
|
||||
drivers/remoteproc/qcom_q6v5_wcss.c | 22 ++++++++++++++--------
|
||||
1 file changed, 14 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
index e32efdc660d2..16fc5a33adaf 100644
|
||||
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
@@ -86,7 +86,7 @@
|
||||
@ -33,7 +31,7 @@ index e32efdc660d2..16fc5a33adaf 100644
|
||||
const char *ssr_name;
|
||||
const char *sysmon_name;
|
||||
int ssctl_id;
|
||||
@@ -874,10 +875,13 @@ static int q6v5_wcss_init_reset(struct q6v5_wcss *wcss,
|
||||
@@ -874,10 +875,13 @@ static int q6v5_wcss_init_reset(struct q
|
||||
}
|
||||
}
|
||||
|
||||
@ -51,7 +49,7 @@ index e32efdc660d2..16fc5a33adaf 100644
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -925,9 +929,9 @@ static int q6v5_wcss_init_mmio(struct q6v5_wcss *wcss,
|
||||
@@ -925,9 +929,9 @@ static int q6v5_wcss_init_mmio(struct q6
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@ -64,7 +62,7 @@ index e32efdc660d2..16fc5a33adaf 100644
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -1174,6 +1178,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
|
||||
@@ -1174,6 +1178,7 @@ static const struct wcss_data wcss_ipq80
|
||||
.crash_reason_smem = WCSS_CRASH_REASON,
|
||||
.aon_reset_required = true,
|
||||
.wcss_q6_reset_required = true,
|
||||
@ -72,7 +70,7 @@ index e32efdc660d2..16fc5a33adaf 100644
|
||||
.ssr_name = "q6wcss",
|
||||
.ops = &q6v5_wcss_ipq8074_ops,
|
||||
.requires_force_stop = true,
|
||||
@@ -1188,6 +1193,7 @@ static const struct wcss_data wcss_qcs404_res_init = {
|
||||
@@ -1188,6 +1193,7 @@ static const struct wcss_data wcss_qcs40
|
||||
.version = WCSS_QCS404,
|
||||
.aon_reset_required = false,
|
||||
.wcss_q6_reset_required = false,
|
||||
@ -80,6 +78,3 @@ index e32efdc660d2..16fc5a33adaf 100644
|
||||
.ssr_name = "mpss",
|
||||
.sysmon_name = "wcnss",
|
||||
.ssctl_id = 0x12,
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -23,11 +23,9 @@ Changes in v6:
|
||||
drivers/thermal/qcom/tsens.h | 2 ++
|
||||
6 files changed, 38 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
|
||||
index 67c1748cdf73..ee584e5b07e5 100644
|
||||
--- a/drivers/thermal/qcom/tsens-8960.c
|
||||
+++ b/drivers/thermal/qcom/tsens-8960.c
|
||||
@@ -269,6 +269,7 @@ static const struct tsens_ops ops_8960 = {
|
||||
@@ -269,6 +269,7 @@ static const struct tsens_ops ops_8960 =
|
||||
static struct tsens_features tsens_8960_feat = {
|
||||
.ver_major = VER_0,
|
||||
.crit_int = 0,
|
||||
@ -35,11 +33,9 @@ index 67c1748cdf73..ee584e5b07e5 100644
|
||||
.adc = 1,
|
||||
.srot_split = 0,
|
||||
.max_sensors = 11,
|
||||
diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c
|
||||
index f136cb350238..6effb822bf3c 100644
|
||||
--- a/drivers/thermal/qcom/tsens-v0_1.c
|
||||
+++ b/drivers/thermal/qcom/tsens-v0_1.c
|
||||
@@ -539,6 +539,7 @@ static int calibrate_9607(struct tsens_priv *priv)
|
||||
@@ -539,6 +539,7 @@ static int calibrate_9607(struct tsens_p
|
||||
static struct tsens_features tsens_v0_1_feat = {
|
||||
.ver_major = VER_0_1,
|
||||
.crit_int = 0,
|
||||
@ -47,11 +43,9 @@ index f136cb350238..6effb822bf3c 100644
|
||||
.adc = 1,
|
||||
.srot_split = 1,
|
||||
.max_sensors = 11,
|
||||
diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c
|
||||
index 573e261ccca7..a4f561a6e582 100644
|
||||
--- a/drivers/thermal/qcom/tsens-v1.c
|
||||
+++ b/drivers/thermal/qcom/tsens-v1.c
|
||||
@@ -302,6 +302,7 @@ static int calibrate_8976(struct tsens_priv *priv)
|
||||
@@ -302,6 +302,7 @@ static int calibrate_8976(struct tsens_p
|
||||
static struct tsens_features tsens_v1_feat = {
|
||||
.ver_major = VER_1_X,
|
||||
.crit_int = 0,
|
||||
@ -59,8 +53,6 @@ index 573e261ccca7..a4f561a6e582 100644
|
||||
.adc = 1,
|
||||
.srot_split = 1,
|
||||
.max_sensors = 11,
|
||||
diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c
|
||||
index b293ed32174b..129cdb247381 100644
|
||||
--- a/drivers/thermal/qcom/tsens-v2.c
|
||||
+++ b/drivers/thermal/qcom/tsens-v2.c
|
||||
@@ -31,6 +31,7 @@
|
||||
@ -71,11 +63,9 @@ index b293ed32174b..129cdb247381 100644
|
||||
.adc = 0,
|
||||
.srot_split = 1,
|
||||
.max_sensors = 16,
|
||||
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
|
||||
index 99a8d9f3e03c..11172afbc5da 100644
|
||||
--- a/drivers/thermal/qcom/tsens.c
|
||||
+++ b/drivers/thermal/qcom/tsens.c
|
||||
@@ -531,6 +531,27 @@ static irqreturn_t tsens_irq_thread(int irq, void *data)
|
||||
@@ -531,6 +531,27 @@ static irqreturn_t tsens_irq_thread(int
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
@ -103,7 +93,7 @@ index 99a8d9f3e03c..11172afbc5da 100644
|
||||
static int tsens_set_trips(void *_sensor, int low, int high)
|
||||
{
|
||||
struct tsens_sensor *s = _sensor;
|
||||
@@ -1075,13 +1096,18 @@ static int tsens_register(struct tsens_priv *priv)
|
||||
@@ -1075,13 +1096,18 @@ static int tsens_register(struct tsens_p
|
||||
tsens_mC_to_hw(priv->sensor, 0));
|
||||
}
|
||||
|
||||
@ -128,8 +118,6 @@ index 99a8d9f3e03c..11172afbc5da 100644
|
||||
|
||||
return ret;
|
||||
}
|
||||
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
|
||||
index 1471a2c00f15..4614177944d6 100644
|
||||
--- a/drivers/thermal/qcom/tsens.h
|
||||
+++ b/drivers/thermal/qcom/tsens.h
|
||||
@@ -495,6 +495,7 @@ enum regfield_ids {
|
||||
@ -148,6 +136,3 @@ index 1471a2c00f15..4614177944d6 100644
|
||||
unsigned int adc:1;
|
||||
unsigned int srot_split:1;
|
||||
unsigned int has_watchdog:1;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -21,11 +21,9 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
||||
drivers/thermal/qcom/tsens.h | 4 ++++
|
||||
6 files changed, 14 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
|
||||
index ee584e5b07e5..4585904fb380 100644
|
||||
--- a/drivers/thermal/qcom/tsens-8960.c
|
||||
+++ b/drivers/thermal/qcom/tsens-8960.c
|
||||
@@ -273,6 +273,8 @@ static struct tsens_features tsens_8960_feat = {
|
||||
@@ -273,6 +273,8 @@ static struct tsens_features tsens_8960_
|
||||
.adc = 1,
|
||||
.srot_split = 0,
|
||||
.max_sensors = 11,
|
||||
@ -34,11 +32,9 @@ index ee584e5b07e5..4585904fb380 100644
|
||||
};
|
||||
|
||||
struct tsens_plat_data data_8960 = {
|
||||
diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c
|
||||
index 6effb822bf3c..2c203ff374e6 100644
|
||||
--- a/drivers/thermal/qcom/tsens-v0_1.c
|
||||
+++ b/drivers/thermal/qcom/tsens-v0_1.c
|
||||
@@ -543,6 +543,8 @@ static struct tsens_features tsens_v0_1_feat = {
|
||||
@@ -543,6 +543,8 @@ static struct tsens_features tsens_v0_1_
|
||||
.adc = 1,
|
||||
.srot_split = 1,
|
||||
.max_sensors = 11,
|
||||
@ -47,11 +43,9 @@ index 6effb822bf3c..2c203ff374e6 100644
|
||||
};
|
||||
|
||||
static const struct reg_field tsens_v0_1_regfields[MAX_REGFIELDS] = {
|
||||
diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c
|
||||
index a4f561a6e582..1d7f8a80bd13 100644
|
||||
--- a/drivers/thermal/qcom/tsens-v1.c
|
||||
+++ b/drivers/thermal/qcom/tsens-v1.c
|
||||
@@ -306,6 +306,8 @@ static struct tsens_features tsens_v1_feat = {
|
||||
@@ -306,6 +306,8 @@ static struct tsens_features tsens_v1_fe
|
||||
.adc = 1,
|
||||
.srot_split = 1,
|
||||
.max_sensors = 11,
|
||||
@ -60,11 +54,9 @@ index a4f561a6e582..1d7f8a80bd13 100644
|
||||
};
|
||||
|
||||
static const struct reg_field tsens_v1_regfields[MAX_REGFIELDS] = {
|
||||
diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c
|
||||
index 129cdb247381..9babc69bfd22 100644
|
||||
--- a/drivers/thermal/qcom/tsens-v2.c
|
||||
+++ b/drivers/thermal/qcom/tsens-v2.c
|
||||
@@ -35,6 +35,8 @@ static struct tsens_features tsens_v2_feat = {
|
||||
@@ -35,6 +35,8 @@ static struct tsens_features tsens_v2_fe
|
||||
.adc = 0,
|
||||
.srot_split = 1,
|
||||
.max_sensors = 16,
|
||||
@ -73,11 +65,9 @@ index 129cdb247381..9babc69bfd22 100644
|
||||
};
|
||||
|
||||
static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = {
|
||||
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
|
||||
index 11172afbc5da..e11861581970 100644
|
||||
--- a/drivers/thermal/qcom/tsens.c
|
||||
+++ b/drivers/thermal/qcom/tsens.c
|
||||
@@ -572,8 +572,8 @@ static int tsens_set_trips(void *_sensor, int low, int high)
|
||||
@@ -572,8 +572,8 @@ static int tsens_set_trips(void *_sensor
|
||||
dev_dbg(dev, "[%u] %s: proposed thresholds: (%d:%d)\n",
|
||||
hw_id, __func__, low, high);
|
||||
|
||||
@ -88,8 +78,6 @@ index 11172afbc5da..e11861581970 100644
|
||||
|
||||
high_val = tsens_mC_to_hw(s, cl_high);
|
||||
low_val = tsens_mC_to_hw(s, cl_low);
|
||||
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
|
||||
index 4614177944d6..747004476347 100644
|
||||
--- a/drivers/thermal/qcom/tsens.h
|
||||
+++ b/drivers/thermal/qcom/tsens.h
|
||||
@@ -501,6 +501,8 @@ enum regfield_ids {
|
||||
@ -110,6 +98,3 @@ index 4614177944d6..747004476347 100644
|
||||
};
|
||||
|
||||
/**
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -15,11 +15,9 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
||||
drivers/thermal/qcom/tsens.h | 2 +-
|
||||
3 files changed, 21 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c
|
||||
index 9babc69bfd22..29a61d2d6ca3 100644
|
||||
--- a/drivers/thermal/qcom/tsens-v2.c
|
||||
+++ b/drivers/thermal/qcom/tsens-v2.c
|
||||
@@ -39,6 +39,17 @@ static struct tsens_features tsens_v2_feat = {
|
||||
@@ -39,6 +39,17 @@ static struct tsens_features tsens_v2_fe
|
||||
.trip_max_temp = 120000,
|
||||
};
|
||||
|
||||
@ -50,25 +48,21 @@ index 9babc69bfd22..29a61d2d6ca3 100644
|
||||
/* Kept around for backward compatibility with old msm8996.dtsi */
|
||||
struct tsens_plat_data data_8996 = {
|
||||
.num_sensors = 13,
|
||||
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
|
||||
index e11861581970..60b65bd2e7a3 100644
|
||||
--- a/drivers/thermal/qcom/tsens.c
|
||||
+++ b/drivers/thermal/qcom/tsens.c
|
||||
@@ -990,6 +990,9 @@ static const struct of_device_id tsens_table[] = {
|
||||
{
|
||||
@@ -991,6 +991,9 @@ static const struct of_device_id tsens_t
|
||||
.compatible = "qcom,ipq8064-tsens",
|
||||
.data = &data_8960,
|
||||
+ }, {
|
||||
}, {
|
||||
+ .compatible = "qcom,ipq8074-tsens",
|
||||
+ .data = &data_ipq8074,
|
||||
}, {
|
||||
+ }, {
|
||||
.compatible = "qcom,mdm9607-tsens",
|
||||
.data = &data_9607,
|
||||
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
|
||||
index 747004476347..8dd990d944ad 100644
|
||||
}, {
|
||||
--- a/drivers/thermal/qcom/tsens.h
|
||||
+++ b/drivers/thermal/qcom/tsens.h
|
||||
@@ -599,6 +599,6 @@ extern struct tsens_plat_data data_8916, data_8939, data_8974, data_9607;
|
||||
@@ -599,6 +599,6 @@ extern struct tsens_plat_data data_8916,
|
||||
extern struct tsens_plat_data data_tsens_v1, data_8976;
|
||||
|
||||
/* TSENS v2 targets */
|
||||
@ -76,6 +70,3 @@ index 747004476347..8dd990d944ad 100644
|
||||
+extern struct tsens_plat_data data_8996, data_ipq8074, data_tsens_v2;
|
||||
|
||||
#endif /* __QCOM_TSENS_H__ */
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -19,11 +19,9 @@ Changes in v5:
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 96 +++++++++++++++++++++++++++
|
||||
1 file changed, 96 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 019c8e302273..9707136f08e1 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -310,6 +310,16 @@ prng: rng@e3000 {
|
||||
@@ -310,6 +310,16 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@ -40,7 +38,7 @@ index 019c8e302273..9707136f08e1 100644
|
||||
cryptobam: dma-controller@704000 {
|
||||
compatible = "qcom,bam-v1.7.0";
|
||||
reg = <0x00704000 0x20000>;
|
||||
@@ -920,4 +930,90 @@ timer {
|
||||
@@ -920,4 +930,90 @@
|
||||
<GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
|
||||
<GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
|
||||
};
|
||||
@ -131,6 +129,3 @@ index 019c8e302273..9707136f08e1 100644
|
||||
+ };
|
||||
+ };
|
||||
};
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,11 +13,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
drivers/mfd/qcom-spmi-pmic.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c
|
||||
index 1cacc00aa6c9..664de43df690 100644
|
||||
--- a/drivers/mfd/qcom-spmi-pmic.c
|
||||
+++ b/drivers/mfd/qcom-spmi-pmic.c
|
||||
@@ -76,6 +76,7 @@ static const struct of_device_id pmic_spmi_id_table[] = {
|
||||
@@ -76,6 +76,7 @@ static const struct of_device_id pmic_sp
|
||||
{ .compatible = "qcom,pmi8994", .data = (void *)PMI8994_SUBTYPE },
|
||||
{ .compatible = "qcom,pmi8998", .data = (void *)PMI8998_SUBTYPE },
|
||||
{ .compatible = "qcom,pmk8002", .data = (void *)PMK8002_SUBTYPE },
|
||||
@ -25,6 +23,3 @@ index 1cacc00aa6c9..664de43df690 100644
|
||||
{ .compatible = "qcom,smb2351", .data = (void *)SMB2351_SUBTYPE },
|
||||
{ .compatible = "qcom,spmi-pmic", .data = (void *)COMMON_SUBTYPE },
|
||||
{ }
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -28,9 +28,6 @@ regulator subnodes
|
||||
1 file changed, 125 insertions(+)
|
||||
create mode 100644 arch/arm64/boot/dts/qcom/pmp8074.dtsi
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/pmp8074.dtsi b/arch/arm64/boot/dts/qcom/pmp8074.dtsi
|
||||
new file mode 100644
|
||||
index 000000000000..ceb2e6358b3d
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/qcom/pmp8074.dtsi
|
||||
@@ -0,0 +1,125 @@
|
||||
@ -159,6 +156,3 @@ index 000000000000..ceb2e6358b3d
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -15,8 +15,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
|
||||
index ef30053136e3..f2b2691cc463 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts
|
||||
@@ -3,6 +3,7 @@
|
||||
@ -27,7 +25,7 @@ index ef30053136e3..f2b2691cc463 100644
|
||||
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. IPQ8074-HK01";
|
||||
@@ -82,6 +83,7 @@ nand@0 {
|
||||
@@ -82,6 +83,7 @@
|
||||
|
||||
&sdhc_1 {
|
||||
status = "okay";
|
||||
@ -35,6 +33,3 @@ index ef30053136e3..f2b2691cc463 100644
|
||||
};
|
||||
|
||||
&qusb_phy_0 {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -11,8 +11,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 9707136f08e1..b9030cb8fbf3 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -5,6 +5,7 @@
|
||||
@ -23,7 +21,7 @@ index 9707136f08e1..b9030cb8fbf3 100644
|
||||
|
||||
/ {
|
||||
#address-cells = <2>;
|
||||
@@ -38,6 +39,8 @@ CPU0: cpu@0 {
|
||||
@@ -38,6 +39,8 @@
|
||||
reg = <0x0>;
|
||||
next-level-cache = <&L2_0>;
|
||||
enable-method = "psci";
|
||||
@ -32,7 +30,7 @@ index 9707136f08e1..b9030cb8fbf3 100644
|
||||
};
|
||||
|
||||
CPU1: cpu@1 {
|
||||
@@ -46,6 +49,8 @@ CPU1: cpu@1 {
|
||||
@@ -46,6 +49,8 @@
|
||||
enable-method = "psci";
|
||||
reg = <0x1>;
|
||||
next-level-cache = <&L2_0>;
|
||||
@ -41,7 +39,7 @@ index 9707136f08e1..b9030cb8fbf3 100644
|
||||
};
|
||||
|
||||
CPU2: cpu@2 {
|
||||
@@ -54,6 +59,8 @@ CPU2: cpu@2 {
|
||||
@@ -54,6 +59,8 @@
|
||||
enable-method = "psci";
|
||||
reg = <0x2>;
|
||||
next-level-cache = <&L2_0>;
|
||||
@ -50,7 +48,7 @@ index 9707136f08e1..b9030cb8fbf3 100644
|
||||
};
|
||||
|
||||
CPU3: cpu@3 {
|
||||
@@ -62,6 +69,8 @@ CPU3: cpu@3 {
|
||||
@@ -62,6 +69,8 @@
|
||||
enable-method = "psci";
|
||||
reg = <0x3>;
|
||||
next-level-cache = <&L2_0>;
|
||||
@ -59,6 +57,3 @@ index 9707136f08e1..b9030cb8fbf3 100644
|
||||
};
|
||||
|
||||
L2_0: l2-cache {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -12,11 +12,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index b9030cb8fbf3..bcf2163f527f 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -29,7 +29,7 @@ xo: xo {
|
||||
@@ -29,7 +29,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
@ -25,6 +23,3 @@ index b9030cb8fbf3..bcf2163f527f 100644
|
||||
#address-cells = <0x1>;
|
||||
#size-cells = <0x0>;
|
||||
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -12,11 +12,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index bcf2163f527f..8094bef3f28f 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -41,6 +41,7 @@ CPU0: cpu@0 {
|
||||
@@ -41,6 +41,7 @@
|
||||
enable-method = "psci";
|
||||
clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
|
||||
clock-names = "cpu";
|
||||
@ -24,7 +22,7 @@ index bcf2163f527f..8094bef3f28f 100644
|
||||
};
|
||||
|
||||
CPU1: cpu@1 {
|
||||
@@ -51,6 +52,7 @@ CPU1: cpu@1 {
|
||||
@@ -51,6 +52,7 @@
|
||||
next-level-cache = <&L2_0>;
|
||||
clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
|
||||
clock-names = "cpu";
|
||||
@ -32,7 +30,7 @@ index bcf2163f527f..8094bef3f28f 100644
|
||||
};
|
||||
|
||||
CPU2: cpu@2 {
|
||||
@@ -61,6 +63,7 @@ CPU2: cpu@2 {
|
||||
@@ -61,6 +63,7 @@
|
||||
next-level-cache = <&L2_0>;
|
||||
clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
|
||||
clock-names = "cpu";
|
||||
@ -40,7 +38,7 @@ index bcf2163f527f..8094bef3f28f 100644
|
||||
};
|
||||
|
||||
CPU3: cpu@3 {
|
||||
@@ -71,6 +74,7 @@ CPU3: cpu@3 {
|
||||
@@ -71,6 +74,7 @@
|
||||
next-level-cache = <&L2_0>;
|
||||
clocks = <&apcs_glb APCS_ALIAS0_CORE_CLK>;
|
||||
clock-names = "cpu";
|
||||
@ -48,6 +46,3 @@ index bcf2163f527f..8094bef3f28f 100644
|
||||
};
|
||||
|
||||
L2_0: l2-cache {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,8 +14,6 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>
|
||||
include/dt-bindings/clock/qcom,gcc-ipq8074.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/dt-bindings/clock/qcom,gcc-ipq8074.h b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
|
||||
index e4991d303708..7b425cede707 100644
|
||||
--- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h
|
||||
+++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
|
||||
@@ -367,6 +367,7 @@
|
||||
@ -26,6 +24,3 @@ index e4991d303708..7b425cede707 100644
|
||||
|
||||
#define USB0_GDSC 0
|
||||
#define USB1_GDSC 1
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,11 +13,9 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>
|
||||
drivers/clk/qcom/gcc-ipq8074.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
index 42d185fe19c8..7954a730aad2 100644
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -4826,6 +4826,7 @@ static const struct qcom_reset_map gcc_ipq8074_resets[] = {
|
||||
@@ -4826,6 +4826,7 @@ 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 },
|
||||
@ -25,6 +23,3 @@ index 42d185fe19c8..7954a730aad2 100644
|
||||
};
|
||||
|
||||
static struct gdsc *gcc_ipq8074_gdscs[] = {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -11,8 +11,6 @@ Change-Id: Ia82edb7ee52f2bd010c099f151179d69a953ac88
|
||||
drivers/remoteproc/qcom_q6v5_wcss.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
index 16fc5a33adaf..92c240976f55 100644
|
||||
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
|
||||
@@ -161,6 +161,7 @@ struct wcss_data {
|
||||
@ -23,7 +21,7 @@ index 16fc5a33adaf..92c240976f55 100644
|
||||
};
|
||||
|
||||
static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
|
||||
@@ -1147,6 +1148,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
|
||||
@@ -1147,6 +1148,7 @@ static int q6v5_wcss_probe(struct platfo
|
||||
desc->sysmon_name,
|
||||
desc->ssctl_id);
|
||||
|
||||
@ -31,7 +29,7 @@ index 16fc5a33adaf..92c240976f55 100644
|
||||
ret = rproc_add(rproc);
|
||||
if (ret)
|
||||
goto free_rproc;
|
||||
@@ -1183,6 +1185,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
|
||||
@@ -1183,6 +1185,7 @@ static const struct wcss_data wcss_ipq80
|
||||
.ops = &q6v5_wcss_ipq8074_ops,
|
||||
.requires_force_stop = true,
|
||||
.need_mem_protection = true,
|
||||
@ -39,7 +37,7 @@ index 16fc5a33adaf..92c240976f55 100644
|
||||
};
|
||||
|
||||
static const struct wcss_data wcss_qcs404_res_init = {
|
||||
@@ -1199,6 +1202,7 @@ static const struct wcss_data wcss_qcs404_res_init = {
|
||||
@@ -1199,6 +1202,7 @@ static const struct wcss_data wcss_qcs40
|
||||
.ssctl_id = 0x12,
|
||||
.ops = &q6v5_wcss_qcs404_ops,
|
||||
.requires_force_stop = false,
|
||||
@ -47,6 +45,3 @@ index 16fc5a33adaf..92c240976f55 100644
|
||||
};
|
||||
|
||||
static const struct of_device_id q6v5_wcss_of_match[] = {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -14,11 +14,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 81 +++++++++++++++++++++++++++
|
||||
1 file changed, 81 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 8094bef3f28f..6c18e2f91f49 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -153,6 +153,32 @@ scm {
|
||||
@@ -153,6 +153,32 @@
|
||||
};
|
||||
};
|
||||
|
||||
@ -51,7 +49,7 @@ index 8094bef3f28f..6c18e2f91f49 100644
|
||||
soc: soc {
|
||||
#address-cells = <0x1>;
|
||||
#size-cells = <0x1>;
|
||||
@@ -421,6 +447,11 @@ tcsr_mutex: hwlock@1905000 {
|
||||
@@ -421,6 +447,11 @@
|
||||
#hwlock-cells = <1>;
|
||||
};
|
||||
|
||||
@ -63,7 +61,7 @@ index 8094bef3f28f..6c18e2f91f49 100644
|
||||
spmi_bus: spmi@200f000 {
|
||||
compatible = "qcom,spmi-pmic-arb";
|
||||
reg = <0x0200f000 0x001000>,
|
||||
@@ -934,6 +965,56 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
|
||||
@@ -934,6 +965,56 @@
|
||||
"axi_s_sticky";
|
||||
status = "disabled";
|
||||
};
|
||||
@ -120,6 +118,3 @@ index 8094bef3f28f..6c18e2f91f49 100644
|
||||
};
|
||||
|
||||
timer {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -13,11 +13,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 111 ++++++++++++++++++++++++++
|
||||
1 file changed, 111 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 6c18e2f91f49..6b743a0a740f 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -1015,6 +1015,117 @@ rpm_requests {
|
||||
@@ -1015,6 +1015,117 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -135,6 +133,3 @@ index 6c18e2f91f49..6b743a0a740f 100644
|
||||
};
|
||||
|
||||
timer {
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -24,11 +24,9 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
|
||||
drivers/clk/qcom/reset.h | 1 +
|
||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/clk/qcom/reset.c b/drivers/clk/qcom/reset.c
|
||||
index 819d194be8f7..8ad7b50dd534 100644
|
||||
--- a/drivers/clk/qcom/reset.c
|
||||
+++ b/drivers/clk/qcom/reset.c
|
||||
@@ -28,7 +28,7 @@ qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
|
||||
@@ -28,7 +28,7 @@ qcom_reset_assert(struct reset_controlle
|
||||
|
||||
rst = to_qcom_reset_controller(rcdev);
|
||||
map = &rst->reset_map[id];
|
||||
@ -37,7 +35,7 @@ index 819d194be8f7..8ad7b50dd534 100644
|
||||
|
||||
return regmap_update_bits(rst->regmap, map->reg, mask, mask);
|
||||
}
|
||||
@@ -42,7 +42,7 @@ qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)
|
||||
@@ -42,7 +42,7 @@ qcom_reset_deassert(struct reset_control
|
||||
|
||||
rst = to_qcom_reset_controller(rcdev);
|
||||
map = &rst->reset_map[id];
|
||||
@ -46,8 +44,6 @@ index 819d194be8f7..8ad7b50dd534 100644
|
||||
|
||||
return regmap_update_bits(rst->regmap, map->reg, mask, 0);
|
||||
}
|
||||
diff --git a/drivers/clk/qcom/reset.h b/drivers/clk/qcom/reset.h
|
||||
index 2a08b5e282c7..0410f83bf2bb 100644
|
||||
--- a/drivers/clk/qcom/reset.h
|
||||
+++ b/drivers/clk/qcom/reset.h
|
||||
@@ -11,6 +11,7 @@
|
||||
@ -58,6 +54,3 @@ index 2a08b5e282c7..0410f83bf2bb 100644
|
||||
};
|
||||
|
||||
struct regmap;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -15,11 +15,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
include/dt-bindings/clock/qcom,gcc-ipq8074.h | 14 ++++++++++++++
|
||||
2 files changed, 28 insertions(+)
|
||||
|
||||
diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
index 7954a730aad2..069ad3b5bca0 100644
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -4827,6 +4827,20 @@ static const struct qcom_reset_map gcc_ipq8074_resets[] = {
|
||||
@@ -4827,6 +4827,20 @@ static const struct qcom_reset_map gcc_i
|
||||
[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
|
||||
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
|
||||
[GCC_WCSSAON_RESET] = { 0x59010, 0 },
|
||||
@ -40,8 +38,6 @@ index 7954a730aad2..069ad3b5bca0 100644
|
||||
};
|
||||
|
||||
static struct gdsc *gcc_ipq8074_gdscs[] = {
|
||||
diff --git a/include/dt-bindings/clock/qcom,gcc-ipq8074.h b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
|
||||
index 7b425cede707..1e9ef05a36dd 100644
|
||||
--- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h
|
||||
+++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
|
||||
@@ -368,6 +368,20 @@
|
||||
@ -65,6 +61,3 @@ index 7b425cede707..1e9ef05a36dd 100644
|
||||
|
||||
#define USB0_GDSC 0
|
||||
#define USB1_GDSC 1
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -11,11 +11,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
index 6b743a0a740f..f30bf5ef6aab 100644
|
||||
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
|
||||
@@ -15,7 +15,7 @@ / {
|
||||
@@ -15,7 +15,7 @@
|
||||
compatible = "qcom,ipq8074";
|
||||
interrupt-parent = <&intc>;
|
||||
|
||||
@ -24,6 +22,3 @@ index 6b743a0a740f..f30bf5ef6aab 100644
|
||||
sleep_clk: sleep_clk {
|
||||
compatible = "fixed-clock";
|
||||
clock-frequency = <32768>;
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -19,8 +19,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
create mode 100644 drivers/power/qcom/apm.c
|
||||
create mode 100644 include/linux/power/qcom/apm.h
|
||||
|
||||
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
|
||||
index 696bf77a7042..235f3cbf2a54 100644
|
||||
--- a/drivers/power/Kconfig
|
||||
+++ b/drivers/power/Kconfig
|
||||
@@ -1,3 +1,4 @@
|
||||
@ -28,8 +26,6 @@ index 696bf77a7042..235f3cbf2a54 100644
|
||||
source "drivers/power/reset/Kconfig"
|
||||
source "drivers/power/supply/Kconfig"
|
||||
+source "drivers/power/qcom/Kconfig"
|
||||
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
|
||||
index effbf0377f32..cd239e730b2b 100644
|
||||
--- a/drivers/power/Makefile
|
||||
+++ b/drivers/power/Makefile
|
||||
@@ -1,3 +1,4 @@
|
||||
@ -37,9 +33,6 @@ index effbf0377f32..cd239e730b2b 100644
|
||||
obj-$(CONFIG_POWER_RESET) += reset/
|
||||
obj-$(CONFIG_POWER_SUPPLY) += supply/
|
||||
+obj-$(CONFIG_QCOM_APM) += qcom/
|
||||
diff --git a/drivers/power/qcom/Kconfig b/drivers/power/qcom/Kconfig
|
||||
new file mode 100644
|
||||
index 000000000000..01993a6179d1
|
||||
--- /dev/null
|
||||
+++ b/drivers/power/qcom/Kconfig
|
||||
@@ -0,0 +1,7 @@
|
||||
@ -50,16 +43,10 @@ index 000000000000..01993a6179d1
|
||||
+ memory arrays. Interfaces with regulator drivers to ensure
|
||||
+ SRAM Vmin requirements are met across different performance
|
||||
+ levels.
|
||||
diff --git a/drivers/power/qcom/Makefile b/drivers/power/qcom/Makefile
|
||||
new file mode 100644
|
||||
index 000000000000..43a288e62ef1
|
||||
--- /dev/null
|
||||
+++ b/drivers/power/qcom/Makefile
|
||||
@@ -0,0 +1 @@
|
||||
+obj-$(CONFIG_QCOM_APM) += apm.o
|
||||
diff --git a/drivers/power/qcom/apm.c b/drivers/power/qcom/apm.c
|
||||
new file mode 100644
|
||||
index 000000000000..bd93358e3d34
|
||||
--- /dev/null
|
||||
+++ b/drivers/power/qcom/apm.c
|
||||
@@ -0,0 +1,944 @@
|
||||
@ -1007,9 +994,6 @@ index 000000000000..bd93358e3d34
|
||||
+
|
||||
+MODULE_DESCRIPTION("MSM Array Power Mux driver");
|
||||
+MODULE_LICENSE("GPL v2");
|
||||
diff --git a/include/linux/power/qcom/apm.h b/include/linux/power/qcom/apm.h
|
||||
new file mode 100644
|
||||
index 000000000000..432683578b76
|
||||
--- /dev/null
|
||||
+++ b/include/linux/power/qcom/apm.h
|
||||
@@ -0,0 +1,48 @@
|
||||
@ -1061,6 +1045,3 @@ index 000000000000..432683578b76
|
||||
+{ return -EPERM; }
|
||||
+#endif
|
||||
+#endif
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user