xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serial: ucc_uart: use of_property_read_u32() in ucc_uart_probe()

Browse Source 
For this to work correctly on little-endian hosts, don't access the
device-tree properties directly in native endianness, but use the
of_property_read_u32() helper.

Reviewed-by: Timur Tabi <timur@kernel.org>
Acked-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
This commit is contained in:
Rasmus Villemoes
2019-11-28 15:55:37 +01:00
committed by Li Yang
parent 002dedc5e9
commit 89ad26f5f8
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/tty/serial/ucc_uart.c
View File

@@ -1256,10 +1256,10 @@ static int soft_uart_init(struct platform_device *ofdev)
static int ucc_uart_probe(struct platform_device *ofdev) static int ucc_uart_probe(struct platform_device *ofdev)
{ {
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
const unsigned int *iprop; /* Integer OF properties */
const char *sprop; /* String OF properties */ const char *sprop; /* String OF properties */
struct uart_qe_port *qe_port = NULL; struct uart_qe_port *qe_port = NULL;
struct resource res; struct resource res;
u32 val;
int ret; int ret;
/* /*
@@ -1290,23 +1290,20 @@ static int ucc_uart_probe(struct platform_device *ofdev)
/* Get the UCC number (device ID) */ /* Get the UCC number (device ID) */
/* UCCs are numbered 1-7 */ /* UCCs are numbered 1-7 */
iprop = of_get_property(np, "cell-index", NULL); if (of_property_read_u32(np, "cell-index", &val)) {
if (!iprop) { if (of_property_read_u32(np, "device-id", &val)) {
iprop = of_get_property(np, "device-id", NULL); dev_err(&ofdev->dev, "UCC is unspecified in device tree\n");
if (!iprop) {
dev_err(&ofdev->dev, "UCC is unspecified in "
"device tree\n");
ret = -EINVAL; ret = -EINVAL;
goto out_free; goto out_free;
} }
} }
if ((*iprop < 1) || (*iprop > UCC_MAX_NUM)) { if (val < 1 || val > UCC_MAX_NUM) {
dev_err(&ofdev->dev, "no support for UCC%u\n", *iprop); dev_err(&ofdev->dev, "no support for UCC%u\n", val);
ret = -ENODEV; ret = -ENODEV;
goto out_free; goto out_free;
} }
qe_port->ucc_num = *iprop - 1; qe_port->ucc_num = val - 1;
/* /*
* In the future, we should not require the BRG to be specified in the * In the future, we should not require the BRG to be specified in the
@@ -1350,13 +1347,12 @@ static int ucc_uart_probe(struct platform_device *ofdev)
} }
/* Get the port number, numbered 0-3 */ /* Get the port number, numbered 0-3 */
iprop = of_get_property(np, "port-number", NULL); if (of_property_read_u32(np, "port-number", &val)) {
if (!iprop) {
dev_err(&ofdev->dev, "missing port-number in device tree\n"); dev_err(&ofdev->dev, "missing port-number in device tree\n");
ret = -EINVAL; ret = -EINVAL;
goto out_free; goto out_free;
} }
qe_port->port.line = *iprop; qe_port->port.line = val;
if (qe_port->port.line >= UCC_MAX_UART) { if (qe_port->port.line >= UCC_MAX_UART) {
dev_err(&ofdev->dev, "port-number must be 0-%u\n", dev_err(&ofdev->dev, "port-number must be 0-%u\n",
UCC_MAX_UART - 1); UCC_MAX_UART - 1);
@@ -1386,31 +1382,29 @@ static int ucc_uart_probe(struct platform_device *ofdev)
} }
} }
iprop = of_get_property(np, "brg-frequency", NULL); if (of_property_read_u32(np, "brg-frequency", &val)) {
if (!iprop) {
dev_err(&ofdev->dev, dev_err(&ofdev->dev,
"missing brg-frequency in device tree\n"); "missing brg-frequency in device tree\n");
ret = -EINVAL; ret = -EINVAL;
goto out_np; goto out_np;
} }
if (*iprop) if (val)
qe_port->port.uartclk = *iprop; qe_port->port.uartclk = val;
else { else {
/* /*
* Older versions of U-Boot do not initialize the brg-frequency * Older versions of U-Boot do not initialize the brg-frequency
* property, so in this case we assume the BRG frequency is * property, so in this case we assume the BRG frequency is
* half the QE bus frequency. * half the QE bus frequency.
*/ */
iprop = of_get_property(np, "bus-frequency", NULL); if (of_property_read_u32(np, "bus-frequency", &val)) {
if (!iprop) {
dev_err(&ofdev->dev, dev_err(&ofdev->dev,
"missing QE bus-frequency in device tree\n"); "missing QE bus-frequency in device tree\n");
ret = -EINVAL; ret = -EINVAL;
goto out_np; goto out_np;
} }
if (*iprop) if (val)
qe_port->port.uartclk = *iprop / 2; qe_port->port.uartclk = val / 2;
else { else {
dev_err(&ofdev->dev, dev_err(&ofdev->dev,
"invalid QE bus-frequency in device tree\n"); "invalid QE bus-frequency in device tree\n");