summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--arch/arm/boards/raspberry-pi/rpi-common.c4
-rw-r--r--arch/arm/mach-bcm283x/core.c4
-rw-r--r--arch/arm/mach-imx/imx.c6
-rw-r--r--arch/arm/mach-omap/xload.c2
-rw-r--r--commands/mem.c4
-rw-r--r--commands/mount.c4
-rw-r--r--common/bootm.c11
-rw-r--r--common/image-fit.c8
-rw-r--r--drivers/clk/clk.c2
-rw-r--r--drivers/mtd/nand/nand_denali.c2
-rw-r--r--drivers/net/cpsw.c4
-rw-r--r--drivers/serial/Kconfig1
-rw-r--r--drivers/watchdog/imxwd.c10
14 files changed, 35 insertions, 29 deletions
diff --git a/Makefile b/Makefile
index 10e1b74a6d..1ce50d025e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
VERSION = 2018
-PATCHLEVEL = 11
+PATCHLEVEL = 12
SUBLEVEL = 0
EXTRAVERSION =
NAME = None
diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
index 5a51b91517..650b26ce7d 100644
--- a/arch/arm/boards/raspberry-pi/rpi-common.c
+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
@@ -291,8 +291,8 @@ static int rpi_clock_init(void)
if (IS_ERR(clk))
return PTR_ERR(clk);
- clk_register_clkdev(clk, NULL, "20300000.sdhci");
- clk_register_clkdev(clk, NULL, "3f300000.sdhci");
+ clkdev_add_physbase(clk, 0x20300000, NULL);
+ clkdev_add_physbase(clk, 0x3f300000, NULL);
return 0;
}
diff --git a/arch/arm/mach-bcm283x/core.c b/arch/arm/mach-bcm283x/core.c
index 26f0996b1c..f1dcda86f7 100644
--- a/arch/arm/mach-bcm283x/core.c
+++ b/arch/arm/mach-bcm283x/core.c
@@ -40,8 +40,8 @@ static int bcm2835_clk_init(void)
clk = clk_fixed("uart0-pl0110", 3 * 1000 * 1000);
clk_register_clkdev(clk, NULL, "uart0-pl0110");
- clk_register_clkdev(clk, NULL, "20201000.serial");
- clk_register_clkdev(clk, NULL, "3f201000.serial");
+ clkdev_add_physbase(clk, 0x20201000, NULL);
+ clkdev_add_physbase(clk, 0x3f201000, NULL);
clk = clk_fixed("bcm2835-cs", 1 * 1000 * 1000);
clk_register_clkdev(clk, NULL, "bcm2835-cs");
diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c
index ad227663dd..63914d306e 100644
--- a/arch/arm/mach-imx/imx.c
+++ b/arch/arm/mach-imx/imx.c
@@ -199,12 +199,8 @@ void imx_set_reset_reason(void __iomem *srsr,
}
}
- /*
- * Report this with above default priority in order to make
- * sure we'll always override info from watchdog driver.
- */
reset_source_set_priority(type,
- RESET_SOURCE_DEFAULT_PRIORITY + 1);
+ RESET_SOURCE_DEFAULT_PRIORITY);
reset_source_set_instance(type, instance);
pr_info("i.MX reset reason %s (SRSR: 0x%08x)\n",
diff --git a/arch/arm/mach-omap/xload.c b/arch/arm/mach-omap/xload.c
index bb58825dcf..47aa8275b9 100644
--- a/arch/arm/mach-omap/xload.c
+++ b/arch/arm/mach-omap/xload.c
@@ -257,6 +257,8 @@ static void *am33xx_net_boot(void)
dhcp_set_result(edev, dhcp_res);
+ edev->ifup = true;
+
/*
* Older tftp server don't send the file size.
* Then tftpfs needs temporary place to store the file.
diff --git a/commands/mem.c b/commands/mem.c
index cdd7a492d0..a9e12f3e55 100644
--- a/commands/mem.c
+++ b/commands/mem.c
@@ -96,8 +96,8 @@ static int mem_probe(struct device_d *dev)
dev->priv = cdev;
cdev->name = (char*)dev->resource[0].name;
- cdev->size = min(resource_size(&dev->resource[0]),
- (unsigned long long)S64_MAX);
+ cdev->size = min_t(unsigned long long, resource_size(&dev->resource[0]),
+ S64_MAX);
cdev->ops = &memops;
cdev->dev = dev;
diff --git a/commands/mount.c b/commands/mount.c
index 834b06386b..f523f6b3b6 100644
--- a/commands/mount.c
+++ b/commands/mount.c
@@ -76,7 +76,9 @@ static int do_mount(int argc, char *argv[])
struct cdev *cdev;
const char *path;
- device_detect_by_name(devpath_to_name(devstr));
+ devstr = devpath_to_name(devstr);
+
+ device_detect_by_name(devstr);
cdev = cdev_by_name(devstr);
if (!cdev)
diff --git a/common/bootm.c b/common/bootm.c
index 169000cccb..36f6c41bbd 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -562,18 +562,15 @@ int bootm_boot(struct bootm_data *bootm_data)
data->os_entry = bootm_data->os_entry;
ret = read_file_2(data->os_file, &size, &data->os_header, PAGE_SIZE);
- if (ret < 0 && ret != -EFBIG)
+ if (ret < 0 && ret != -EFBIG) {
+ printf("could not open %s: %s\n", data->os_file,
+ strerror(-ret));
goto err_out;
+ }
if (size < PAGE_SIZE)
goto err_out;
os_type = file_detect_type(data->os_header, PAGE_SIZE);
- if ((int)os_type < 0) {
- printf("could not open %s: %s\n", data->os_file,
- strerror(-os_type));
- ret = (int)os_type;
- goto err_out;
- }
if (!data->force && os_type == filetype_unknown) {
printf("Unknown OS filetype (try -f)\n");
diff --git a/common/image-fit.c b/common/image-fit.c
index dfd1fa02c9..87a55b7e27 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -392,7 +392,9 @@ static int fit_verify_hash(struct fit_handle *handle, struct device_node *image,
ret = -EINVAL;
}
- hash = of_get_child_by_name(image, "hash@1");
+ hash = of_get_child_by_name(image, "hash-1");
+ if (!hash)
+ hash = of_get_child_by_name(image, "hash@1");
if (!hash) {
if (ret)
pr_err("image %s does not have hashes\n",
@@ -468,7 +470,9 @@ static int fit_image_verify_signature(struct fit_handle *handle,
ret = -EINVAL;
}
- sig_node = of_get_child_by_name(image, "signature@1");
+ sig_node = of_get_child_by_name(image, "signature-1");
+ if (!sig_node)
+ sig_node = of_get_child_by_name(image, "signature@1");
if (!sig_node) {
pr_err("Image %s has no signature\n", image->full_name);
return ret;
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 24759b45bb..6a2d8ad178 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -413,7 +413,7 @@ int of_clk_add_provider(struct device_node *np,
cp->get = clk_src_get;
list_add(&cp->link, &of_clk_providers);
- pr_debug("Added clock from %s\n", np->full_name);
+ pr_debug("Added clock from %s\n", np ? np->full_name : "<none>");
return 0;
}
diff --git a/drivers/mtd/nand/nand_denali.c b/drivers/mtd/nand/nand_denali.c
index 8b09b3722f..ef3395864c 100644
--- a/drivers/mtd/nand/nand_denali.c
+++ b/drivers/mtd/nand/nand_denali.c
@@ -1387,7 +1387,7 @@ int denali_init(struct denali_nand_info *denali)
}
/* allocate a temporary buffer for nand_scan_ident() */
- denali->buf.buf = kzalloc(PAGE_SIZE, GFP_DMA | GFP_KERNEL);
+ denali->buf.buf = kzalloc(PAGE_SIZE, GFP_KERNEL);
if (!denali->buf.buf)
return -ENOMEM;
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c
index c6fc21dc54..8bb2c9f2a3 100644
--- a/drivers/net/cpsw.c
+++ b/drivers/net/cpsw.c
@@ -1093,8 +1093,8 @@ static int cpsw_probe_dt(struct cpsw_priv *priv)
if (!of_find_node_by_name(child, "fixed-link")) {
ret = of_property_read_u32_array(child, "phy_id", phy_id, 2);
- if (ret)
- return ret;
+ if (!ret)
+ dev_warn(dev, "phy_id is deprecated, use phy-handle\n");
}
slave->dev.device_node = child;
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 8a56d39f7c..d462c11c16 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -3,6 +3,7 @@ menu "serial drivers"
config SERIAL_DEV_BUS
bool "Serial device bus"
+ select POLLER
depends on CONSOLE_FULL
help
Core support for devices connected via a serial port.
diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c
index a66fae400c..8dba662392 100644
--- a/drivers/watchdog/imxwd.c
+++ b/drivers/watchdog/imxwd.c
@@ -162,19 +162,23 @@ static void __noreturn imxwd_force_soc_reset(struct restart_handler *rst)
static void imx_watchdog_detect_reset_source(struct imx_wd *priv)
{
u16 val = readw(priv->base + IMX21_WDOG_WSTR);
+ int priority = RESET_SOURCE_DEFAULT_PRIORITY;
+
+ if (reset_source_get() == RESET_WDG)
+ priority++;
if (val & WSTR_COLDSTART) {
- reset_source_set(RESET_POR);
+ reset_source_set_priority(RESET_POR, priority);
return;
}
if (val & (WSTR_HARDRESET | WSTR_WARMSTART)) {
- reset_source_set(RESET_RST);
+ reset_source_set_priority(RESET_RST, priority);
return;
}
if (val & WSTR_WDOG) {
- reset_source_set(RESET_WDG);
+ reset_source_set_priority(RESET_WDG, priority);
return;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-20 12:38:13 +0000