kernel: bump to 4.14.203, 4.19.154
Resolve conflicted: - 210-dwc2_defaults.patch Refreshed all patches. Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
This commit is contained in:
parent
89fc2f40af
commit
e0aceee93a
@ -7,12 +7,12 @@ ifdef CONFIG_TESTING_KERNEL
|
||||
endif
|
||||
|
||||
LINUX_VERSION-4.9 = .241
|
||||
LINUX_VERSION-4.14 = .202
|
||||
LINUX_VERSION-4.19 = .152
|
||||
LINUX_VERSION-4.14 = .203
|
||||
LINUX_VERSION-4.19 = .154
|
||||
|
||||
LINUX_KERNEL_HASH-4.9.241 = c4c6d04f91d881e68524bda6062b5c1835f285bd03344bf8f2eaeef3394bb32c
|
||||
LINUX_KERNEL_HASH-4.14.202 = 95c717ab5b0bdd2333e829f0507385fbe3424ceee810727f3a8551a0c74be328
|
||||
LINUX_KERNEL_HASH-4.19.152 = a5a6aa9c2c2810efa72b5d9723de86ccea3f965b2dd748d15e82d5fac23a055d
|
||||
LINUX_KERNEL_HASH-4.14.203 = ac963bb6086eee98bea1981ef79606078bd3c8dc9f939cdfa7c9e63a900e3931
|
||||
LINUX_KERNEL_HASH-4.19.154 = 698c908c846b9ba2ba545cd229a67571fe4de18bb5547429a00d786abe556646
|
||||
|
||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||
|
||||
@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
|
||||
|
||||
--- a/drivers/tty/serial/Kconfig
|
||||
+++ b/drivers/tty/serial/Kconfig
|
||||
@@ -1463,7 +1463,7 @@ config SERIAL_XILINX_PS_UART_CONSOLE
|
||||
@@ -1464,7 +1464,7 @@ config SERIAL_XILINX_PS_UART_CONSOLE
|
||||
|
||||
config SERIAL_AR933X
|
||||
tristate "AR933X serial port support"
|
||||
|
||||
@ -14,7 +14,7 @@ with interrupts used.
|
||||
---
|
||||
--- a/drivers/net/phy/ar8216.c
|
||||
+++ b/drivers/net/phy/ar8216.c
|
||||
@@ -252,6 +252,7 @@ ar8xxx_mii_write32(struct ar8xxx_priv *p
|
||||
@@ -238,6 +238,7 @@ ar8xxx_mii_write32(struct ar8xxx_priv *p
|
||||
u32
|
||||
ar8xxx_read(struct ar8xxx_priv *priv, int reg)
|
||||
{
|
||||
@ -22,7 +22,7 @@ with interrupts used.
|
||||
struct mii_bus *bus = priv->mii_bus;
|
||||
u16 r1, r2, page;
|
||||
u32 val;
|
||||
@@ -259,11 +260,13 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
|
||||
@@ -245,11 +246,13 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
|
||||
split_addr((u32) reg, &r1, &r2, &page);
|
||||
|
||||
mutex_lock(&bus->mdio_lock);
|
||||
@ -36,7 +36,7 @@ with interrupts used.
|
||||
mutex_unlock(&bus->mdio_lock);
|
||||
|
||||
return val;
|
||||
@@ -272,17 +275,20 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
|
||||
@@ -258,17 +261,20 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
|
||||
void
|
||||
ar8xxx_write(struct ar8xxx_priv *priv, int reg, u32 val)
|
||||
{
|
||||
|
||||
@ -34,7 +34,7 @@ v2: use bool to indicate ongoing half-duplex send, use it afterwards
|
||||
|
||||
--- a/drivers/tty/serial/Kconfig
|
||||
+++ b/drivers/tty/serial/Kconfig
|
||||
@@ -1296,6 +1296,7 @@ config SERIAL_AR933X
|
||||
@@ -1297,6 +1297,7 @@ config SERIAL_AR933X
|
||||
tristate "AR933X serial port support"
|
||||
depends on HAVE_CLK && ATH79
|
||||
select SERIAL_CORE
|
||||
|
||||
@ -13,7 +13,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
|
||||
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -2184,8 +2184,15 @@ static int bcm2835_clk_probe(struct plat
|
||||
@@ -2186,8 +2186,15 @@ static int bcm2835_clk_probe(struct plat
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@ -30,7 +30,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
|
||||
}
|
||||
|
||||
static const struct of_device_id bcm2835_clk_of_match[] = {
|
||||
@@ -2202,7 +2209,11 @@ static struct platform_driver bcm2835_cl
|
||||
@@ -2204,7 +2211,11 @@ static struct platform_driver bcm2835_cl
|
||||
.probe = bcm2835_clk_probe,
|
||||
};
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -1362,6 +1362,11 @@ bcm2835_register_pll_divider(struct bcm2
|
||||
@@ -1364,6 +1364,11 @@ bcm2835_register_pll_divider(struct bcm2
|
||||
divider->div.hw.init = &init;
|
||||
divider->div.table = NULL;
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
|
||||
if (!pll)
|
||||
return NULL;
|
||||
@@ -1363,8 +1368,10 @@ bcm2835_register_pll_divider(struct bcm2
|
||||
@@ -1365,8 +1370,10 @@ bcm2835_register_pll_divider(struct bcm2
|
||||
divider->div.table = NULL;
|
||||
|
||||
if (!(cprman_read(cprman, data->cm_reg) & data->hold_mask)) {
|
||||
@ -49,7 +49,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
}
|
||||
|
||||
divider->cprman = cprman;
|
||||
@@ -2116,6 +2123,8 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2118,6 +2125,8 @@ static const struct bcm2835_clk_desc clk
|
||||
.ctl_reg = CM_PERIICTL),
|
||||
};
|
||||
|
||||
@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
/*
|
||||
* Permanently take a reference on the parent of the SDRAM clock.
|
||||
*
|
||||
@@ -2135,6 +2144,19 @@ static int bcm2835_mark_sdc_parent_criti
|
||||
@@ -2137,6 +2146,19 @@ static int bcm2835_mark_sdc_parent_criti
|
||||
return clk_prepare_enable(parent);
|
||||
}
|
||||
|
||||
@ -78,7 +78,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
static int bcm2835_clk_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
@@ -2144,6 +2166,7 @@ static int bcm2835_clk_probe(struct plat
|
||||
@@ -2146,6 +2168,7 @@ static int bcm2835_clk_probe(struct plat
|
||||
const struct bcm2835_clk_desc *desc;
|
||||
const size_t asize = ARRAY_SIZE(clk_desc_array);
|
||||
size_t i;
|
||||
@ -86,7 +86,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
int ret;
|
||||
|
||||
cprman = devm_kzalloc(dev,
|
||||
@@ -2159,6 +2182,13 @@ static int bcm2835_clk_probe(struct plat
|
||||
@@ -2161,6 +2184,13 @@ static int bcm2835_clk_probe(struct plat
|
||||
if (IS_ERR(cprman->regs))
|
||||
return PTR_ERR(cprman->regs);
|
||||
|
||||
|
||||
@ -90,7 +90,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
.set_rate = bcm2835_clock_set_rate,
|
||||
.determine_rate = bcm2835_clock_determine_rate,
|
||||
.set_parent = bcm2835_clock_set_parent,
|
||||
@@ -2165,6 +2193,7 @@ static int bcm2835_clk_probe(struct plat
|
||||
@@ -2167,6 +2195,7 @@ static int bcm2835_clk_probe(struct plat
|
||||
struct resource *res;
|
||||
const struct bcm2835_clk_desc *desc;
|
||||
const size_t asize = ARRAY_SIZE(clk_desc_array);
|
||||
@ -98,7 +98,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
size_t i;
|
||||
u32 clk_id;
|
||||
int ret;
|
||||
@@ -2182,6 +2211,14 @@ static int bcm2835_clk_probe(struct plat
|
||||
@@ -2184,6 +2213,14 @@ static int bcm2835_clk_probe(struct plat
|
||||
if (IS_ERR(cprman->regs))
|
||||
return PTR_ERR(cprman->regs);
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
|
||||
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -1454,6 +1454,15 @@ static struct clk_hw *bcm2835_register_c
|
||||
@@ -1456,6 +1456,15 @@ static struct clk_hw *bcm2835_register_c
|
||||
init.flags = data->flags | CLK_IGNORE_UNUSED;
|
||||
|
||||
/*
|
||||
|
||||
@ -20,7 +20,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
|
||||
--- a/drivers/media/i2c/tc358743.c
|
||||
+++ b/drivers/media/i2c/tc358743.c
|
||||
@@ -1946,7 +1946,7 @@ static int tc358743_probe_of(struct tc35
|
||||
@@ -1948,7 +1948,7 @@ static int tc358743_probe_of(struct tc35
|
||||
state->pdata.ddc5v_delay = DDC5V_DELAY_100_MS;
|
||||
state->pdata.enable_hdcp = false;
|
||||
/* A FIFO level of 16 should be enough for 2-lane 720p60 at 594 MHz. */
|
||||
|
||||
@ -24,7 +24,7 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
|
||||
|
||||
--- a/drivers/media/i2c/tc358743.c
|
||||
+++ b/drivers/media/i2c/tc358743.c
|
||||
@@ -1606,28 +1606,29 @@ static int tc358743_g_mbus_config(struct
|
||||
@@ -1608,28 +1608,29 @@ static int tc358743_g_mbus_config(struct
|
||||
struct v4l2_mbus_config *cfg)
|
||||
{
|
||||
struct tc358743_state *state = to_state(sd);
|
||||
@ -68,7 +68,7 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -2052,6 +2053,7 @@ static int tc358743_probe(struct i2c_cli
|
||||
@@ -2054,6 +2055,7 @@ static int tc358743_probe(struct i2c_cli
|
||||
if (pdata) {
|
||||
state->pdata = *pdata;
|
||||
state->bus.flags = V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
|
||||
|
||||
@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
|
||||
--- a/drivers/media/i2c/tc358743.c
|
||||
+++ b/drivers/media/i2c/tc358743.c
|
||||
@@ -1967,6 +1967,7 @@ static int tc358743_probe_of(struct tc35
|
||||
@@ -1969,6 +1969,7 @@ static int tc358743_probe_of(struct tc35
|
||||
/*
|
||||
* The CSI bps per lane must be between 62.5 Mbps and 1 Gbps.
|
||||
* The default is 594 Mbps for 4-lane 1080p60 or 2-lane 720p60.
|
||||
@ -21,7 +21,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
*/
|
||||
bps_pr_lane = 2 * endpoint->link_frequencies[0];
|
||||
if (bps_pr_lane < 62500000U || bps_pr_lane > 1000000000U) {
|
||||
@@ -1979,23 +1980,41 @@ static int tc358743_probe_of(struct tc35
|
||||
@@ -1981,23 +1982,41 @@ static int tc358743_probe_of(struct tc35
|
||||
state->pdata.refclk_hz * state->pdata.pll_prd;
|
||||
|
||||
/*
|
||||
|
||||
@ -78,7 +78,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
static void i2c_wr16(struct v4l2_subdev *sd, u16 reg, u16 val)
|
||||
{
|
||||
i2c_wrreg(sd, reg, val, 2);
|
||||
@@ -2054,6 +2071,7 @@ static int tc358743_probe(struct i2c_cli
|
||||
@@ -2056,6 +2073,7 @@ static int tc358743_probe(struct i2c_cli
|
||||
struct tc358743_platform_data *pdata = client->dev.platform_data;
|
||||
struct v4l2_subdev *sd;
|
||||
u16 irq_mask = MASK_HDMI_MSK | MASK_CSI_MSK;
|
||||
@ -86,7 +86,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
int err;
|
||||
|
||||
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
|
||||
@@ -2086,7 +2104,8 @@ static int tc358743_probe(struct i2c_cli
|
||||
@@ -2088,7 +2106,8 @@ static int tc358743_probe(struct i2c_cli
|
||||
sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
|
||||
|
||||
/* i2c access */
|
||||
|
||||
@ -26,7 +26,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
|
||||
--- a/drivers/media/i2c/tc358743.c
|
||||
+++ b/drivers/media/i2c/tc358743.c
|
||||
@@ -1680,12 +1680,23 @@ static int tc358743_enum_mbus_code(struc
|
||||
@@ -1682,12 +1682,23 @@ static int tc358743_enum_mbus_code(struc
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -51,7 +51,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
|
||||
if (format->pad != 0)
|
||||
return -EINVAL;
|
||||
@@ -1695,23 +1706,7 @@ static int tc358743_get_fmt(struct v4l2_
|
||||
@@ -1697,23 +1708,7 @@ static int tc358743_get_fmt(struct v4l2_
|
||||
format->format.height = state->timings.bt.height;
|
||||
format->format.field = V4L2_FIELD_NONE;
|
||||
|
||||
@ -76,7 +76,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -1726,18 +1721,11 @@ static int tc358743_set_fmt(struct v4l2_
|
||||
@@ -1728,18 +1723,11 @@ static int tc358743_set_fmt(struct v4l2_
|
||||
int ret = tc358743_get_fmt(sd, cfg, format);
|
||||
|
||||
format->format.code = code;
|
||||
|
||||
@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -2271,7 +2271,7 @@ static int bcm2835_clk_probe(struct plat
|
||||
@@ -2273,7 +2273,7 @@ static int bcm2835_clk_probe(struct plat
|
||||
return ret;
|
||||
|
||||
/* note that we have registered all the clocks */
|
||||
|
||||
@ -42,7 +42,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
|
||||
ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
|
||||
cprman_write(cprman, data->ctl_reg, ctl);
|
||||
|
||||
@@ -1475,7 +1479,7 @@ static struct clk_hw *bcm2835_register_c
|
||||
@@ -1477,7 +1481,7 @@ static struct clk_hw *bcm2835_register_c
|
||||
init.ops = &bcm2835_vpu_clock_clk_ops;
|
||||
} else {
|
||||
init.ops = &bcm2835_clock_clk_ops;
|
||||
|
||||
@ -61,7 +61,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
|
||||
.determine_rate = bcm2835_clock_determine_rate,
|
||||
.set_parent = bcm2835_clock_set_parent,
|
||||
.get_parent = bcm2835_clock_get_parent,
|
||||
@@ -1479,7 +1493,6 @@ static struct clk_hw *bcm2835_register_c
|
||||
@@ -1481,7 +1495,6 @@ static struct clk_hw *bcm2835_register_c
|
||||
init.ops = &bcm2835_vpu_clock_clk_ops;
|
||||
} else {
|
||||
init.ops = &bcm2835_clock_clk_ops;
|
||||
|
||||
@ -52,7 +52,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
static inline void cprman_write(struct bcm2835_cprman *cprman, u32 reg, u32 val)
|
||||
{
|
||||
writel(CM_PASSWORD | val, cprman->regs + reg);
|
||||
@@ -1528,22 +1535,28 @@ typedef struct clk_hw *(*bcm2835_clk_reg
|
||||
@@ -1530,22 +1537,28 @@ typedef struct clk_hw *(*bcm2835_clk_reg
|
||||
const void *data);
|
||||
struct bcm2835_clk_desc {
|
||||
bcm2835_clk_register clk_register;
|
||||
@ -89,7 +89,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
&(struct bcm2835_gate_data) \
|
||||
{__VA_ARGS__})
|
||||
|
||||
@@ -1557,7 +1570,8 @@ static const char *const bcm2835_clock_o
|
||||
@@ -1559,7 +1572,8 @@ static const char *const bcm2835_clock_o
|
||||
"testdebug1"
|
||||
};
|
||||
|
||||
@ -99,7 +99,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.num_mux_parents = ARRAY_SIZE(bcm2835_clock_osc_parents), \
|
||||
.parents = bcm2835_clock_osc_parents, \
|
||||
__VA_ARGS__)
|
||||
@@ -1574,7 +1588,8 @@ static const char *const bcm2835_clock_p
|
||||
@@ -1576,7 +1590,8 @@ static const char *const bcm2835_clock_p
|
||||
"pllh_aux",
|
||||
};
|
||||
|
||||
@ -109,7 +109,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.num_mux_parents = ARRAY_SIZE(bcm2835_clock_per_parents), \
|
||||
.parents = bcm2835_clock_per_parents, \
|
||||
__VA_ARGS__)
|
||||
@@ -1599,7 +1614,8 @@ static const char *const bcm2835_pcm_per
|
||||
@@ -1601,7 +1616,8 @@ static const char *const bcm2835_pcm_per
|
||||
"-",
|
||||
};
|
||||
|
||||
@ -119,7 +119,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.num_mux_parents = ARRAY_SIZE(bcm2835_pcm_per_parents), \
|
||||
.parents = bcm2835_pcm_per_parents, \
|
||||
__VA_ARGS__)
|
||||
@@ -1618,7 +1634,8 @@ static const char *const bcm2835_clock_v
|
||||
@@ -1620,7 +1636,8 @@ static const char *const bcm2835_clock_v
|
||||
"pllc_core2",
|
||||
};
|
||||
|
||||
@ -129,7 +129,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.num_mux_parents = ARRAY_SIZE(bcm2835_clock_vpu_parents), \
|
||||
.parents = bcm2835_clock_vpu_parents, \
|
||||
__VA_ARGS__)
|
||||
@@ -1654,12 +1671,14 @@ static const char *const bcm2835_clock_d
|
||||
@@ -1656,12 +1673,14 @@ static const char *const bcm2835_clock_d
|
||||
"dsi1_byte_inv",
|
||||
};
|
||||
|
||||
@ -146,7 +146,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.num_mux_parents = ARRAY_SIZE(bcm2835_clock_dsi1_parents), \
|
||||
.parents = bcm2835_clock_dsi1_parents, \
|
||||
__VA_ARGS__)
|
||||
@@ -1679,6 +1698,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1681,6 +1700,7 @@ static const struct bcm2835_clk_desc clk
|
||||
* AUDIO domain is on.
|
||||
*/
|
||||
[BCM2835_PLLA] = REGISTER_PLL(
|
||||
@ -154,7 +154,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "plla",
|
||||
.cm_ctrl_reg = CM_PLLA,
|
||||
.a2w_ctrl_reg = A2W_PLLA_CTRL,
|
||||
@@ -1693,6 +1713,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1695,6 +1715,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.max_rate = 2400000000u,
|
||||
.max_fb_rate = BCM2835_MAX_FB_RATE),
|
||||
[BCM2835_PLLA_CORE] = REGISTER_PLL_DIV(
|
||||
@ -162,7 +162,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "plla_core",
|
||||
.source_pll = "plla",
|
||||
.cm_reg = CM_PLLA,
|
||||
@@ -1702,6 +1723,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1704,6 +1725,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.fixed_divider = 1,
|
||||
.flags = CLK_SET_RATE_PARENT),
|
||||
[BCM2835_PLLA_PER] = REGISTER_PLL_DIV(
|
||||
@ -170,7 +170,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "plla_per",
|
||||
.source_pll = "plla",
|
||||
.cm_reg = CM_PLLA,
|
||||
@@ -1711,6 +1733,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1713,6 +1735,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.fixed_divider = 1,
|
||||
.flags = CLK_SET_RATE_PARENT),
|
||||
[BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV(
|
||||
@ -178,7 +178,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "plla_dsi0",
|
||||
.source_pll = "plla",
|
||||
.cm_reg = CM_PLLA,
|
||||
@@ -1719,6 +1742,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1721,6 +1744,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.hold_mask = CM_PLLA_HOLDDSI0,
|
||||
.fixed_divider = 1),
|
||||
[BCM2835_PLLA_CCP2] = REGISTER_PLL_DIV(
|
||||
@ -186,7 +186,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "plla_ccp2",
|
||||
.source_pll = "plla",
|
||||
.cm_reg = CM_PLLA,
|
||||
@@ -1730,6 +1754,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1732,6 +1756,7 @@ static const struct bcm2835_clk_desc clk
|
||||
|
||||
/* PLLB is used for the ARM's clock. */
|
||||
[BCM2835_PLLB] = REGISTER_PLL(
|
||||
@ -194,7 +194,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "pllb",
|
||||
.cm_ctrl_reg = CM_PLLB,
|
||||
.a2w_ctrl_reg = A2W_PLLB_CTRL,
|
||||
@@ -1744,6 +1769,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1746,6 +1771,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.max_rate = 3000000000u,
|
||||
.max_fb_rate = BCM2835_MAX_FB_RATE),
|
||||
[BCM2835_PLLB_ARM] = REGISTER_PLL_DIV(
|
||||
@ -202,7 +202,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "pllb_arm",
|
||||
.source_pll = "pllb",
|
||||
.cm_reg = CM_PLLB,
|
||||
@@ -1760,6 +1786,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1762,6 +1788,7 @@ static const struct bcm2835_clk_desc clk
|
||||
* AUDIO domain is on.
|
||||
*/
|
||||
[BCM2835_PLLC] = REGISTER_PLL(
|
||||
@ -210,7 +210,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "pllc",
|
||||
.cm_ctrl_reg = CM_PLLC,
|
||||
.a2w_ctrl_reg = A2W_PLLC_CTRL,
|
||||
@@ -1774,6 +1801,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1776,6 +1803,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.max_rate = 3000000000u,
|
||||
.max_fb_rate = BCM2835_MAX_FB_RATE),
|
||||
[BCM2835_PLLC_CORE0] = REGISTER_PLL_DIV(
|
||||
@ -218,7 +218,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "pllc_core0",
|
||||
.source_pll = "pllc",
|
||||
.cm_reg = CM_PLLC,
|
||||
@@ -1783,6 +1811,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1785,6 +1813,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.fixed_divider = 1,
|
||||
.flags = CLK_SET_RATE_PARENT),
|
||||
[BCM2835_PLLC_CORE1] = REGISTER_PLL_DIV(
|
||||
@ -226,7 +226,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "pllc_core1",
|
||||
.source_pll = "pllc",
|
||||
.cm_reg = CM_PLLC,
|
||||
@@ -1792,6 +1821,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1794,6 +1823,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.fixed_divider = 1,
|
||||
.flags = CLK_SET_RATE_PARENT),
|
||||
[BCM2835_PLLC_CORE2] = REGISTER_PLL_DIV(
|
||||
@ -234,7 +234,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "pllc_core2",
|
||||
.source_pll = "pllc",
|
||||
.cm_reg = CM_PLLC,
|
||||
@@ -1801,6 +1831,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1803,6 +1833,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.fixed_divider = 1,
|
||||
.flags = CLK_SET_RATE_PARENT),
|
||||
[BCM2835_PLLC_PER] = REGISTER_PLL_DIV(
|
||||
@ -242,7 +242,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "pllc_per",
|
||||
.source_pll = "pllc",
|
||||
.cm_reg = CM_PLLC,
|
||||
@@ -1817,6 +1848,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1819,6 +1850,7 @@ static const struct bcm2835_clk_desc clk
|
||||
* AUDIO domain is on.
|
||||
*/
|
||||
[BCM2835_PLLD] = REGISTER_PLL(
|
||||
@ -250,7 +250,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "plld",
|
||||
.cm_ctrl_reg = CM_PLLD,
|
||||
.a2w_ctrl_reg = A2W_PLLD_CTRL,
|
||||
@@ -1831,6 +1863,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1833,6 +1865,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.max_rate = 2400000000u,
|
||||
.max_fb_rate = BCM2835_MAX_FB_RATE),
|
||||
[BCM2835_PLLD_CORE] = REGISTER_PLL_DIV(
|
||||
@ -258,7 +258,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "plld_core",
|
||||
.source_pll = "plld",
|
||||
.cm_reg = CM_PLLD,
|
||||
@@ -1840,6 +1873,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1842,6 +1875,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.fixed_divider = 1,
|
||||
.flags = CLK_SET_RATE_PARENT),
|
||||
[BCM2835_PLLD_PER] = REGISTER_PLL_DIV(
|
||||
@ -266,7 +266,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "plld_per",
|
||||
.source_pll = "plld",
|
||||
.cm_reg = CM_PLLD,
|
||||
@@ -1849,6 +1883,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1851,6 +1885,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.fixed_divider = 1,
|
||||
.flags = CLK_SET_RATE_PARENT),
|
||||
[BCM2835_PLLD_DSI0] = REGISTER_PLL_DIV(
|
||||
@ -274,7 +274,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "plld_dsi0",
|
||||
.source_pll = "plld",
|
||||
.cm_reg = CM_PLLD,
|
||||
@@ -1857,6 +1892,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1859,6 +1894,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.hold_mask = CM_PLLD_HOLDDSI0,
|
||||
.fixed_divider = 1),
|
||||
[BCM2835_PLLD_DSI1] = REGISTER_PLL_DIV(
|
||||
@ -282,7 +282,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "plld_dsi1",
|
||||
.source_pll = "plld",
|
||||
.cm_reg = CM_PLLD,
|
||||
@@ -1872,6 +1908,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1874,6 +1910,7 @@ static const struct bcm2835_clk_desc clk
|
||||
* It is in the HDMI power domain.
|
||||
*/
|
||||
[BCM2835_PLLH] = REGISTER_PLL(
|
||||
@ -290,7 +290,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
"pllh",
|
||||
.cm_ctrl_reg = CM_PLLH,
|
||||
.a2w_ctrl_reg = A2W_PLLH_CTRL,
|
||||
@@ -1886,6 +1923,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1888,6 +1925,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.max_rate = 3000000000u,
|
||||
.max_fb_rate = BCM2835_MAX_FB_RATE),
|
||||
[BCM2835_PLLH_RCAL] = REGISTER_PLL_DIV(
|
||||
@ -298,7 +298,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "pllh_rcal",
|
||||
.source_pll = "pllh",
|
||||
.cm_reg = CM_PLLH,
|
||||
@@ -1895,6 +1933,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1897,6 +1935,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.fixed_divider = 10,
|
||||
.flags = CLK_SET_RATE_PARENT),
|
||||
[BCM2835_PLLH_AUX] = REGISTER_PLL_DIV(
|
||||
@ -306,7 +306,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "pllh_aux",
|
||||
.source_pll = "pllh",
|
||||
.cm_reg = CM_PLLH,
|
||||
@@ -1904,6 +1943,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1906,6 +1945,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.fixed_divider = 1,
|
||||
.flags = CLK_SET_RATE_PARENT),
|
||||
[BCM2835_PLLH_PIX] = REGISTER_PLL_DIV(
|
||||
@ -314,7 +314,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "pllh_pix",
|
||||
.source_pll = "pllh",
|
||||
.cm_reg = CM_PLLH,
|
||||
@@ -1919,6 +1959,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1921,6 +1961,7 @@ static const struct bcm2835_clk_desc clk
|
||||
|
||||
/* One Time Programmable Memory clock. Maximum 10Mhz. */
|
||||
[BCM2835_CLOCK_OTP] = REGISTER_OSC_CLK(
|
||||
@ -322,7 +322,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "otp",
|
||||
.ctl_reg = CM_OTPCTL,
|
||||
.div_reg = CM_OTPDIV,
|
||||
@@ -1930,6 +1971,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1932,6 +1973,7 @@ static const struct bcm2835_clk_desc clk
|
||||
* bythe watchdog timer and the camera pulse generator.
|
||||
*/
|
||||
[BCM2835_CLOCK_TIMER] = REGISTER_OSC_CLK(
|
||||
@ -330,7 +330,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "timer",
|
||||
.ctl_reg = CM_TIMERCTL,
|
||||
.div_reg = CM_TIMERDIV,
|
||||
@@ -1940,12 +1982,14 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1942,12 +1984,14 @@ static const struct bcm2835_clk_desc clk
|
||||
* Generally run at 2Mhz, max 5Mhz.
|
||||
*/
|
||||
[BCM2835_CLOCK_TSENS] = REGISTER_OSC_CLK(
|
||||
@ -345,7 +345,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "tec",
|
||||
.ctl_reg = CM_TECCTL,
|
||||
.div_reg = CM_TECDIV,
|
||||
@@ -1954,6 +1998,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1956,6 +2000,7 @@ static const struct bcm2835_clk_desc clk
|
||||
|
||||
/* clocks with vpu parent mux */
|
||||
[BCM2835_CLOCK_H264] = REGISTER_VPU_CLK(
|
||||
@ -353,7 +353,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "h264",
|
||||
.ctl_reg = CM_H264CTL,
|
||||
.div_reg = CM_H264DIV,
|
||||
@@ -1961,6 +2006,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1963,6 +2008,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.frac_bits = 8,
|
||||
.tcnt_mux = 1),
|
||||
[BCM2835_CLOCK_ISP] = REGISTER_VPU_CLK(
|
||||
@ -361,7 +361,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "isp",
|
||||
.ctl_reg = CM_ISPCTL,
|
||||
.div_reg = CM_ISPDIV,
|
||||
@@ -1973,6 +2019,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1975,6 +2021,7 @@ static const struct bcm2835_clk_desc clk
|
||||
* in the SDRAM controller can't be used.
|
||||
*/
|
||||
[BCM2835_CLOCK_SDRAM] = REGISTER_VPU_CLK(
|
||||
@ -369,7 +369,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "sdram",
|
||||
.ctl_reg = CM_SDCCTL,
|
||||
.div_reg = CM_SDCDIV,
|
||||
@@ -1980,6 +2027,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1982,6 +2029,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.frac_bits = 0,
|
||||
.tcnt_mux = 3),
|
||||
[BCM2835_CLOCK_V3D] = REGISTER_VPU_CLK(
|
||||
@ -377,7 +377,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "v3d",
|
||||
.ctl_reg = CM_V3DCTL,
|
||||
.div_reg = CM_V3DDIV,
|
||||
@@ -1993,6 +2041,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1995,6 +2043,7 @@ static const struct bcm2835_clk_desc clk
|
||||
* in various hardware documentation.
|
||||
*/
|
||||
[BCM2835_CLOCK_VPU] = REGISTER_VPU_CLK(
|
||||
@ -385,7 +385,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "vpu",
|
||||
.ctl_reg = CM_VPUCTL,
|
||||
.div_reg = CM_VPUDIV,
|
||||
@@ -2004,6 +2053,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2006,6 +2055,7 @@ static const struct bcm2835_clk_desc clk
|
||||
|
||||
/* clocks with per parent mux */
|
||||
[BCM2835_CLOCK_AVEO] = REGISTER_PER_CLK(
|
||||
@ -393,7 +393,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "aveo",
|
||||
.ctl_reg = CM_AVEOCTL,
|
||||
.div_reg = CM_AVEODIV,
|
||||
@@ -2011,6 +2061,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2013,6 +2063,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.frac_bits = 0,
|
||||
.tcnt_mux = 38),
|
||||
[BCM2835_CLOCK_CAM0] = REGISTER_PER_CLK(
|
||||
@ -401,7 +401,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "cam0",
|
||||
.ctl_reg = CM_CAM0CTL,
|
||||
.div_reg = CM_CAM0DIV,
|
||||
@@ -2018,6 +2069,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2020,6 +2071,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.frac_bits = 8,
|
||||
.tcnt_mux = 14),
|
||||
[BCM2835_CLOCK_CAM1] = REGISTER_PER_CLK(
|
||||
@ -409,7 +409,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "cam1",
|
||||
.ctl_reg = CM_CAM1CTL,
|
||||
.div_reg = CM_CAM1DIV,
|
||||
@@ -2025,12 +2077,14 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2027,12 +2079,14 @@ static const struct bcm2835_clk_desc clk
|
||||
.frac_bits = 8,
|
||||
.tcnt_mux = 15),
|
||||
[BCM2835_CLOCK_DFT] = REGISTER_PER_CLK(
|
||||
@ -424,7 +424,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "dpi",
|
||||
.ctl_reg = CM_DPICTL,
|
||||
.div_reg = CM_DPIDIV,
|
||||
@@ -2040,6 +2094,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2042,6 +2096,7 @@ static const struct bcm2835_clk_desc clk
|
||||
|
||||
/* Arasan EMMC clock */
|
||||
[BCM2835_CLOCK_EMMC] = REGISTER_PER_CLK(
|
||||
@ -432,7 +432,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "emmc",
|
||||
.ctl_reg = CM_EMMCCTL,
|
||||
.div_reg = CM_EMMCDIV,
|
||||
@@ -2049,6 +2104,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2051,6 +2106,7 @@ static const struct bcm2835_clk_desc clk
|
||||
|
||||
/* General purpose (GPIO) clocks */
|
||||
[BCM2835_CLOCK_GP0] = REGISTER_PER_CLK(
|
||||
@ -440,7 +440,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "gp0",
|
||||
.ctl_reg = CM_GP0CTL,
|
||||
.div_reg = CM_GP0DIV,
|
||||
@@ -2057,6 +2113,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2059,6 +2115,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.is_mash_clock = true,
|
||||
.tcnt_mux = 20),
|
||||
[BCM2835_CLOCK_GP1] = REGISTER_PER_CLK(
|
||||
@ -448,7 +448,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "gp1",
|
||||
.ctl_reg = CM_GP1CTL,
|
||||
.div_reg = CM_GP1DIV,
|
||||
@@ -2066,6 +2123,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2068,6 +2125,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.is_mash_clock = true,
|
||||
.tcnt_mux = 21),
|
||||
[BCM2835_CLOCK_GP2] = REGISTER_PER_CLK(
|
||||
@ -456,7 +456,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "gp2",
|
||||
.ctl_reg = CM_GP2CTL,
|
||||
.div_reg = CM_GP2DIV,
|
||||
@@ -2075,6 +2133,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2077,6 +2135,7 @@ static const struct bcm2835_clk_desc clk
|
||||
|
||||
/* HDMI state machine */
|
||||
[BCM2835_CLOCK_HSM] = REGISTER_PER_CLK(
|
||||
@ -464,7 +464,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "hsm",
|
||||
.ctl_reg = CM_HSMCTL,
|
||||
.div_reg = CM_HSMDIV,
|
||||
@@ -2082,6 +2141,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2084,6 +2143,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.frac_bits = 8,
|
||||
.tcnt_mux = 22),
|
||||
[BCM2835_CLOCK_PCM] = REGISTER_PCM_CLK(
|
||||
@ -472,7 +472,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "pcm",
|
||||
.ctl_reg = CM_PCMCTL,
|
||||
.div_reg = CM_PCMDIV,
|
||||
@@ -2091,6 +2151,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2093,6 +2153,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.low_jitter = true,
|
||||
.tcnt_mux = 23),
|
||||
[BCM2835_CLOCK_PWM] = REGISTER_PER_CLK(
|
||||
@ -480,7 +480,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "pwm",
|
||||
.ctl_reg = CM_PWMCTL,
|
||||
.div_reg = CM_PWMDIV,
|
||||
@@ -2099,6 +2160,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2101,6 +2162,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.is_mash_clock = true,
|
||||
.tcnt_mux = 24),
|
||||
[BCM2835_CLOCK_SLIM] = REGISTER_PER_CLK(
|
||||
@ -488,7 +488,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "slim",
|
||||
.ctl_reg = CM_SLIMCTL,
|
||||
.div_reg = CM_SLIMDIV,
|
||||
@@ -2107,6 +2169,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2109,6 +2171,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.is_mash_clock = true,
|
||||
.tcnt_mux = 25),
|
||||
[BCM2835_CLOCK_SMI] = REGISTER_PER_CLK(
|
||||
@ -496,7 +496,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "smi",
|
||||
.ctl_reg = CM_SMICTL,
|
||||
.div_reg = CM_SMIDIV,
|
||||
@@ -2114,6 +2177,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2116,6 +2179,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.frac_bits = 8,
|
||||
.tcnt_mux = 27),
|
||||
[BCM2835_CLOCK_UART] = REGISTER_PER_CLK(
|
||||
@ -504,7 +504,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "uart",
|
||||
.ctl_reg = CM_UARTCTL,
|
||||
.div_reg = CM_UARTDIV,
|
||||
@@ -2123,6 +2187,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2125,6 +2189,7 @@ static const struct bcm2835_clk_desc clk
|
||||
|
||||
/* TV encoder clock. Only operating frequency is 108Mhz. */
|
||||
[BCM2835_CLOCK_VEC] = REGISTER_PER_CLK(
|
||||
@ -512,7 +512,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "vec",
|
||||
.ctl_reg = CM_VECCTL,
|
||||
.div_reg = CM_VECDIV,
|
||||
@@ -2137,6 +2202,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2139,6 +2204,7 @@ static const struct bcm2835_clk_desc clk
|
||||
|
||||
/* dsi clocks */
|
||||
[BCM2835_CLOCK_DSI0E] = REGISTER_PER_CLK(
|
||||
@ -520,7 +520,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "dsi0e",
|
||||
.ctl_reg = CM_DSI0ECTL,
|
||||
.div_reg = CM_DSI0EDIV,
|
||||
@@ -2144,6 +2210,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2146,6 +2212,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.frac_bits = 8,
|
||||
.tcnt_mux = 18),
|
||||
[BCM2835_CLOCK_DSI1E] = REGISTER_PER_CLK(
|
||||
@ -528,7 +528,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "dsi1e",
|
||||
.ctl_reg = CM_DSI1ECTL,
|
||||
.div_reg = CM_DSI1EDIV,
|
||||
@@ -2151,6 +2218,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2153,6 +2220,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.frac_bits = 8,
|
||||
.tcnt_mux = 19),
|
||||
[BCM2835_CLOCK_DSI0P] = REGISTER_DSI0_CLK(
|
||||
@ -536,7 +536,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "dsi0p",
|
||||
.ctl_reg = CM_DSI0PCTL,
|
||||
.div_reg = CM_DSI0PDIV,
|
||||
@@ -2158,6 +2226,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2160,6 +2228,7 @@ static const struct bcm2835_clk_desc clk
|
||||
.frac_bits = 0,
|
||||
.tcnt_mux = 12),
|
||||
[BCM2835_CLOCK_DSI1P] = REGISTER_DSI1_CLK(
|
||||
@ -544,7 +544,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "dsi1p",
|
||||
.ctl_reg = CM_DSI1PCTL,
|
||||
.div_reg = CM_DSI1PDIV,
|
||||
@@ -2174,6 +2243,7 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2176,6 +2245,7 @@ static const struct bcm2835_clk_desc clk
|
||||
* non-stop vpu clock.
|
||||
*/
|
||||
[BCM2835_CLOCK_PERI_IMAGE] = REGISTER_GATE(
|
||||
@ -552,7 +552,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
.name = "peri_image",
|
||||
.parent = "vpu",
|
||||
.ctl_reg = CM_PERIICTL),
|
||||
@@ -2221,11 +2291,16 @@ static int bcm2835_clk_probe(struct plat
|
||||
@@ -2223,11 +2293,16 @@ static int bcm2835_clk_probe(struct plat
|
||||
struct resource *res;
|
||||
const struct bcm2835_clk_desc *desc;
|
||||
const size_t asize = ARRAY_SIZE(clk_desc_array);
|
||||
@ -569,7 +569,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
cprman = devm_kzalloc(dev,
|
||||
struct_size(cprman, onecell.hws, asize),
|
||||
GFP_KERNEL);
|
||||
@@ -2276,8 +2351,10 @@ static int bcm2835_clk_probe(struct plat
|
||||
@@ -2278,8 +2353,10 @@ static int bcm2835_clk_probe(struct plat
|
||||
|
||||
for (i = 0; i < asize; i++) {
|
||||
desc = &clk_desc_array[i];
|
||||
@ -581,7 +581,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
}
|
||||
|
||||
ret = bcm2835_mark_sdc_parent_critical(hws[BCM2835_CLOCK_SDRAM]->clk);
|
||||
@@ -2295,8 +2372,12 @@ static int bcm2835_clk_probe(struct plat
|
||||
@@ -2297,8 +2374,12 @@ static int bcm2835_clk_probe(struct plat
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
|
||||
/*
|
||||
* Names of clocks used within the driver that need to be replaced
|
||||
@@ -2102,6 +2105,16 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2104,6 +2107,16 @@ static const struct bcm2835_clk_desc clk
|
||||
.frac_bits = 8,
|
||||
.tcnt_mux = 39),
|
||||
|
||||
@ -67,7 +67,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
/* General purpose (GPIO) clocks */
|
||||
[BCM2835_CLOCK_GP0] = REGISTER_PER_CLK(
|
||||
SOC_ALL,
|
||||
@@ -2376,8 +2389,13 @@ static const struct cprman_plat_data cpr
|
||||
@@ -2378,8 +2391,13 @@ static const struct cprman_plat_data cpr
|
||||
.soc = SOC_BCM2835,
|
||||
};
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
};
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -2396,6 +2396,8 @@ static const struct cprman_plat_data cpr
|
||||
@@ -2398,6 +2398,8 @@ static const struct cprman_plat_data cpr
|
||||
static const struct of_device_id bcm2835_clk_of_match[] = {
|
||||
{ .compatible = "brcm,bcm2835-cprman", .data = &cprman_bcm2835_plat_data },
|
||||
{ .compatible = "brcm,bcm2711-cprman", .data = &cprman_bcm2711_plat_data },
|
||||
|
||||
@ -12,7 +12,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
|
||||
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -2288,9 +2288,11 @@ static bool bcm2835_clk_is_claimed(const
|
||||
@@ -2290,9 +2290,11 @@ static bool bcm2835_clk_is_claimed(const
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) {
|
||||
|
||||
@ -17,7 +17,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -1755,32 +1755,10 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1757,32 +1757,10 @@ static const struct bcm2835_clk_desc clk
|
||||
.fixed_divider = 1,
|
||||
.flags = CLK_SET_RATE_PARENT),
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
|
||||
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -1725,16 +1725,12 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -1727,16 +1727,12 @@ static const struct bcm2835_clk_desc clk
|
||||
.hold_mask = CM_PLLA_HOLDCORE,
|
||||
.fixed_divider = 1,
|
||||
.flags = CLK_SET_RATE_PARENT),
|
||||
@ -35,7 +35,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
|
||||
[BCM2835_PLLA_DSI0] = REGISTER_PLL_DIV(
|
||||
SOC_ALL,
|
||||
.name = "plla_dsi0",
|
||||
@@ -2007,14 +2003,12 @@ static const struct bcm2835_clk_desc clk
|
||||
@@ -2009,14 +2005,12 @@ static const struct bcm2835_clk_desc clk
|
||||
.int_bits = 6,
|
||||
.frac_bits = 0,
|
||||
.tcnt_mux = 3),
|
||||
|
||||
@ -25,7 +25,7 @@ Co-authored-by: Phil Elwell <phil@raspberrypi.org>
|
||||
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -2388,7 +2388,7 @@ static int __init __bcm2835_clk_driver_i
|
||||
@@ -2390,7 +2390,7 @@ static int __init __bcm2835_clk_driver_i
|
||||
{
|
||||
return platform_driver_register(&bcm2835_clk_driver);
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
|
||||
--- a/drivers/pinctrl/bcm/Kconfig
|
||||
+++ b/drivers/pinctrl/bcm/Kconfig
|
||||
@@ -73,6 +73,19 @@ config PINCTRL_CYGNUS_MUX
|
||||
@@ -74,6 +74,19 @@ config PINCTRL_CYGNUS_MUX
|
||||
configuration, with the exception that certain individual pins
|
||||
can be overridden to GPIO function
|
||||
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
{
|
||||
+ /*
|
||||
const struct of_device_id *match;
|
||||
void (*set_params)(void *data);
|
||||
void (*set_params)(struct dwc2_hsotg *data);
|
||||
+ */
|
||||
|
||||
dwc2_set_default_params(hsotg);
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
{
|
||||
+ /*
|
||||
const struct of_device_id *match;
|
||||
void (*set_params)(void *data);
|
||||
void (*set_params)(struct dwc2_hsotg *data);
|
||||
+ */
|
||||
|
||||
dwc2_set_default_params(hsotg);
|
||||
|
||||
@ -122,7 +122,7 @@
|
||||
{
|
||||
int set;
|
||||
|
||||
@@ -983,7 +983,7 @@ void radix__tlb_flush(struct mmu_gather
|
||||
@@ -992,7 +992,7 @@ void radix__tlb_flush(struct mmu_gather
|
||||
tlb->need_flush_all = 0;
|
||||
}
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
/*
|
||||
* Get the required data from the packet.
|
||||
*/
|
||||
@@ -1059,7 +1065,7 @@ static int tcp_packet(struct nf_conn *ct
|
||||
@@ -1066,7 +1072,7 @@ static int tcp_packet(struct nf_conn *ct
|
||||
IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED &&
|
||||
timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
|
||||
timeout = timeouts[TCP_CONNTRACK_UNACK];
|
||||
@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS])
|
||||
timeout = timeouts[TCP_CONNTRACK_RETRANS];
|
||||
else
|
||||
@@ -1508,6 +1514,13 @@ static struct ctl_table tcp_sysctl_table
|
||||
@@ -1515,6 +1521,13 @@ static struct ctl_table tcp_sysctl_table
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec,
|
||||
},
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
|
||||
@@ -2329,7 +2329,7 @@ ath10k_update_per_peer_tx_stats(struct a
|
||||
@@ -2337,7 +2337,7 @@ ath10k_update_per_peer_tx_stats(struct a
|
||||
sgi = ATH10K_HW_GI(peer_stats->flags);
|
||||
|
||||
if (txrate.flags == WMI_RATE_PREAMBLE_VHT && txrate.mcs > 9) {
|
||||
@ -9,7 +9,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2387,7 +2387,7 @@ static void ath10k_htt_fetch_peer_stats(
|
||||
@@ -2395,7 +2395,7 @@ static void ath10k_htt_fetch_peer_stats(
|
||||
ppdu_len = resp->peer_tx_stats.ppdu_len * sizeof(__le32);
|
||||
|
||||
if (skb->len < sizeof(struct htt_resp_hdr) + num_ppdu * ppdu_len) {
|
||||
@ -18,7 +18,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2399,8 +2399,8 @@ static void ath10k_htt_fetch_peer_stats(
|
||||
@@ -2407,8 +2407,8 @@ static void ath10k_htt_fetch_peer_stats(
|
||||
spin_lock_bh(&ar->data_lock);
|
||||
peer = ath10k_peer_find_by_id(ar, peer_id);
|
||||
if (!peer) {
|
||||
@ -60,7 +60,7 @@
|
||||
}
|
||||
--- a/drivers/net/wireless/ath/ath10k/sdio.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
|
||||
@@ -1874,8 +1874,8 @@ static int ath10k_sdio_hif_map_service_t
|
||||
@@ -1884,8 +1884,8 @@ static int ath10k_sdio_hif_map_service_t
|
||||
ar_sdio->mbox_addr[eid], ar_sdio->mbox_size[eid]);
|
||||
break;
|
||||
default:
|
||||
|
||||
@ -512,8 +512,8 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -1069,10 +1086,10 @@ static void flexcan_chip_stop(struct net
|
||||
flexcan_chip_disable(priv);
|
||||
@@ -1074,10 +1091,10 @@ static int __flexcan_chip_stop(struct ne
|
||||
goto out_chip_unfreeze;
|
||||
|
||||
/* Disable all interrupts */
|
||||
- flexcan_write(0, ®s->imask2);
|
||||
@ -527,7 +527,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
|
||||
flexcan_transceiver_disable(priv);
|
||||
priv->can.state = CAN_STATE_STOPPED;
|
||||
@@ -1187,26 +1204,26 @@ static int register_flexcandev(struct ne
|
||||
@@ -1209,26 +1226,26 @@ static int register_flexcandev(struct ne
|
||||
err = flexcan_chip_disable(priv);
|
||||
if (err)
|
||||
goto out_disable_per;
|
||||
@ -559,7 +559,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
if (!(reg & FLEXCAN_MCR_FEN)) {
|
||||
netdev_err(dev, "Could not enable RX FIFO, unsupported core\n");
|
||||
err = -ENODEV;
|
||||
@@ -1234,8 +1251,12 @@ static void unregister_flexcandev(struct
|
||||
@@ -1256,8 +1273,12 @@ static void unregister_flexcandev(struct
|
||||
static const struct of_device_id flexcan_of_match[] = {
|
||||
{ .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, },
|
||||
{ .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, },
|
||||
@ -572,7 +572,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
||||
{ /* sentinel */ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, flexcan_of_match);
|
||||
@@ -1315,6 +1336,21 @@ static int flexcan_probe(struct platform
|
||||
@@ -1337,6 +1358,21 @@ static int flexcan_probe(struct platform
|
||||
dev->flags |= IFF_ECHO;
|
||||
|
||||
priv = netdev_priv(dev);
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
@@ -1150,5 +1151,6 @@ module_platform_driver(korina_driver);
|
||||
@@ -1151,5 +1152,6 @@ module_platform_driver(korina_driver);
|
||||
MODULE_AUTHOR("Philip Rischel <rischelp@idt.com>");
|
||||
MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
|
||||
MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
|
||||
|
||||
@ -7,11 +7,9 @@ Subject: [PATCH] r8152: init LED for RTL_VER_09
|
||||
drivers/net/usb/r8152.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
|
||||
index 8ccb22b098a6b..a22e113fe17dd 100644
|
||||
--- a/drivers/net/usb/r8152.c
|
||||
+++ b/drivers/net/usb/r8152.c
|
||||
@@ -4217,6 +4217,10 @@ static void r8153b_init(struct r8152 *tp)
|
||||
@@ -4221,6 +4221,10 @@ static void r8153b_init(struct r8152 *tp
|
||||
rtl_tally_reset(tp);
|
||||
|
||||
tp->coalesce = 15000; /* 15 us */
|
||||
@ -22,7 +20,7 @@ index 8ccb22b098a6b..a22e113fe17dd 100644
|
||||
}
|
||||
|
||||
static int rtl8152_pre_reset(struct usb_interface *intf)
|
||||
@@ -5141,7 +5145,7 @@ static u8 rtl_get_version(struct usb_interface *intf)
|
||||
@@ -5144,7 +5148,7 @@ static u8 rtl_get_version(struct usb_int
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user