Merge branch 'next/cleanup' into next/soc
* next/cleanup: soc: versatile: remove unnecessary static in realview_soc_probe() ARM: Convert to using %pOF instead of full_name ARM: hisi: Fix typo in comment ARM: OMAP4+: PRM: fix of_irq_get() result checks ARM: OMAP3+: PRM: fix of_irq_get() result check ARM: dts: dra72-evm-revc: workaround incorrect DP83867 RX_CTRL pin strap ARM: dts: dra71-evm: workaround incorrect DP83867 RX_CTRL pin strap ARM: OMAP2+: omap_device: drop broken RPM status update from suspend_noirq bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
This commit is contained in:
commit
9ec83463d6
|
@ -191,6 +191,7 @@
|
|||
ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>;
|
||||
ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
|
||||
ti,min-output-impedance;
|
||||
ti,dp83867-rxctrl-strap-quirk;
|
||||
};
|
||||
|
||||
dp83867_1: ethernet-phy@3 {
|
||||
|
@ -199,6 +200,7 @@
|
|||
ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>;
|
||||
ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
|
||||
ti,min-output-impedance;
|
||||
ti,dp83867-rxctrl-strap-quirk;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -70,6 +70,7 @@
|
|||
ti,min-output-impedance;
|
||||
interrupt-parent = <&gpio6>;
|
||||
interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
|
||||
ti,dp83867-rxctrl-strap-quirk;
|
||||
};
|
||||
|
||||
dp83867_1: ethernet-phy@3 {
|
||||
|
@ -80,5 +81,6 @@
|
|||
ti,min-output-impedance;
|
||||
interrupt-parent = <&gpio6>;
|
||||
interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
|
||||
ti,dp83867-rxctrl-strap-quirk;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -101,8 +101,8 @@ static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu)
|
|||
|
||||
ops = arm_cpuidle_get_ops(enable_method);
|
||||
if (!ops) {
|
||||
pr_warn("%s: unsupported enable-method property: %s\n",
|
||||
dn->full_name, enable_method);
|
||||
pr_warn("%pOF: unsupported enable-method property: %s\n",
|
||||
dn, enable_method);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@ void __init arm_dt_init_cpu_maps(void)
|
|||
if (of_node_cmp(cpu->type, "cpu"))
|
||||
continue;
|
||||
|
||||
pr_debug(" * %s...\n", cpu->full_name);
|
||||
pr_debug(" * %pOF...\n", cpu);
|
||||
/*
|
||||
* A device tree containing CPU nodes with missing "reg"
|
||||
* properties is considered invalid to build the
|
||||
|
@ -103,8 +103,7 @@ void __init arm_dt_init_cpu_maps(void)
|
|||
*/
|
||||
cell = of_get_property(cpu, "reg", &prop_bytes);
|
||||
if (!cell || prop_bytes < sizeof(*cell)) {
|
||||
pr_debug(" * %s missing reg property\n",
|
||||
cpu->full_name);
|
||||
pr_debug(" * %pOF missing reg property\n", cpu);
|
||||
of_node_put(cpu);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -127,8 +127,7 @@ static void __init parse_dt_topology(void)
|
|||
|
||||
rate = of_get_property(cn, "clock-frequency", &len);
|
||||
if (!rate || len != 4) {
|
||||
pr_err("%s missing clock-frequency property\n",
|
||||
cn->full_name);
|
||||
pr_err("%pOF missing clock-frequency property\n", cn);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
|
@ -187,21 +187,20 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
|
|||
struct irq_domain *parent_domain, *domain;
|
||||
|
||||
if (!parent) {
|
||||
pr_err("%s: no parent, giving up\n", node->full_name);
|
||||
pr_err("%pOF: no parent, giving up\n", node);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
parent_domain = irq_find_host(parent);
|
||||
if (!parent_domain) {
|
||||
pr_err("%s: unable to obtain parent domain\n", node->full_name);
|
||||
pr_err("%pOF: unable to obtain parent domain\n", node);
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
pmu_base_addr = of_iomap(node, 0);
|
||||
|
||||
if (!pmu_base_addr) {
|
||||
pr_err("%s: failed to find exynos pmu register\n",
|
||||
node->full_name);
|
||||
pr_err("%pOF: failed to find exynos pmu register\n", node);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
|
|
@ -109,7 +109,7 @@ static void hix5hd2_set_scu_boot_addr(phys_addr_t start_addr, phys_addr_t jump_a
|
|||
|
||||
virt = ioremap(start_addr, PAGE_SIZE);
|
||||
|
||||
writel_relaxed(0xe51ff004, virt); /* ldr pc, [rc, #-4] */
|
||||
writel_relaxed(0xe51ff004, virt); /* ldr pc, [pc, #-4] */
|
||||
writel_relaxed(jump_addr, virt + 4); /* pc jump phy address */
|
||||
iounmap(virt);
|
||||
}
|
||||
|
|
|
@ -224,13 +224,13 @@ static int __init imx_gpc_init(struct device_node *node,
|
|||
int i;
|
||||
|
||||
if (!parent) {
|
||||
pr_err("%s: no parent, giving up\n", node->full_name);
|
||||
pr_err("%pOF: no parent, giving up\n", node);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
parent_domain = irq_find_host(parent);
|
||||
if (!parent_domain) {
|
||||
pr_err("%s: unable to obtain parent domain\n", node->full_name);
|
||||
pr_err("%pOF: unable to obtain parent domain\n", node);
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
|
|
|
@ -107,8 +107,7 @@ static void __init kirkwood_dt_eth_fixup(void)
|
|||
clk_prepare_enable(clk);
|
||||
|
||||
/* store MAC address register contents in local-mac-address */
|
||||
pr_err(FW_INFO "%s: local-mac-address is not set\n",
|
||||
np->full_name);
|
||||
pr_err(FW_INFO "%pOF: local-mac-address is not set\n", np);
|
||||
|
||||
pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
|
||||
if (!pmac)
|
||||
|
|
|
@ -522,13 +522,13 @@ static int __init wakeupgen_init(struct device_node *node,
|
|||
u32 val;
|
||||
|
||||
if (!parent) {
|
||||
pr_err("%s: no parent, giving up\n", node->full_name);
|
||||
pr_err("%pOF: no parent, giving up\n", node);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
parent_domain = irq_find_host(parent);
|
||||
if (!parent_domain) {
|
||||
pr_err("%s: unable to obtain parent domain\n", node->full_name);
|
||||
pr_err("%pOF: unable to obtain parent domain\n", node);
|
||||
return -ENXIO;
|
||||
}
|
||||
/* Not supported on OMAP4 ES1.0 silicon */
|
||||
|
|
|
@ -672,7 +672,6 @@ static int _od_suspend_noirq(struct device *dev)
|
|||
|
||||
if (!ret && !pm_runtime_status_suspended(dev)) {
|
||||
if (pm_generic_runtime_suspend(dev) == 0) {
|
||||
pm_runtime_set_suspended(dev);
|
||||
omap_device_idle(pdev);
|
||||
od->flags |= OMAP_DEVICE_SUSPENDED;
|
||||
}
|
||||
|
@ -689,15 +688,6 @@ static int _od_resume_noirq(struct device *dev)
|
|||
if (od->flags & OMAP_DEVICE_SUSPENDED) {
|
||||
od->flags &= ~OMAP_DEVICE_SUSPENDED;
|
||||
omap_device_enable(pdev);
|
||||
/*
|
||||
* XXX: we run before core runtime pm has resumed itself. At
|
||||
* this point in time, we just restore the runtime pm state and
|
||||
* considering symmetric operations in resume, we donot expect
|
||||
* to fail. If we failed, something changed in core runtime_pm
|
||||
* framework OR some device driver messed things up, hence, WARN
|
||||
*/
|
||||
WARN(pm_runtime_set_active(dev),
|
||||
"Could not set %s runtime state active\n", dev_name(dev));
|
||||
pm_generic_runtime_resume(dev);
|
||||
}
|
||||
|
||||
|
|
|
@ -2417,8 +2417,8 @@ static int __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data,
|
|||
if (mem)
|
||||
pr_err("omap_hwmod: %s: Could not ioremap\n", oh->name);
|
||||
else
|
||||
pr_err("omap_hwmod: %s: Missing dt reg%i for %s\n",
|
||||
oh->name, index, np->full_name);
|
||||
pr_err("omap_hwmod: %s: Missing dt reg%i for %pOF\n",
|
||||
oh->name, index, np);
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
|
|
|
@ -706,7 +706,7 @@ static int omap3xxx_prm_late_init(void)
|
|||
np = of_find_matching_node(NULL, omap3_prm_dt_match_table);
|
||||
if (np) {
|
||||
irq_num = of_irq_get(np, 0);
|
||||
if (irq_num >= 0)
|
||||
if (irq_num > 0)
|
||||
omap3_prcm_irq_setup.irq = irq_num;
|
||||
}
|
||||
|
||||
|
|
|
@ -747,7 +747,7 @@ static int omap44xx_prm_late_init(void)
|
|||
* Already have OMAP4 IRQ num. For all other platforms, we need
|
||||
* IRQ numbers from DT
|
||||
*/
|
||||
if (irq_num < 0 && !(prm_init_data->flags & PRM_IRQ_DEFAULT)) {
|
||||
if (irq_num <= 0 && !(prm_init_data->flags & PRM_IRQ_DEFAULT)) {
|
||||
if (irq_num == -EPROBE_DEFER)
|
||||
return irq_num;
|
||||
|
||||
|
@ -756,7 +756,7 @@ static int omap44xx_prm_late_init(void)
|
|||
}
|
||||
|
||||
/* Once OMAP4 DT is filled as well */
|
||||
if (irq_num >= 0) {
|
||||
if (irq_num > 0) {
|
||||
omap4_prcm_irq_setup.irq = irq_num;
|
||||
omap4_prcm_irq_setup.xlate_irq = NULL;
|
||||
}
|
||||
|
|
|
@ -182,8 +182,8 @@ static int __init rockchip_smp_prepare_sram(struct device_node *node)
|
|||
|
||||
ret = of_address_to_resource(node, 0, &res);
|
||||
if (ret < 0) {
|
||||
pr_err("%s: could not get address for node %s\n",
|
||||
__func__, node->full_name);
|
||||
pr_err("%s: could not get address for node %pOF\n",
|
||||
__func__, node);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -195,8 +195,7 @@ static void __init add_special_pd(struct device_node *np, enum pd_types type)
|
|||
return;
|
||||
}
|
||||
|
||||
pr_debug("Special PM domain %s type %d for %s\n", pd->name, type,
|
||||
np->full_name);
|
||||
pr_debug("Special PM domain %s type %d for %pOF\n", pd->name, type, np);
|
||||
|
||||
special_pds[num_special_pds].pd = pd;
|
||||
special_pds[num_special_pds].type = type;
|
||||
|
@ -331,13 +330,13 @@ static int __init rmobile_init_pm_domains(void)
|
|||
for_each_compatible_node(np, NULL, "renesas,sysc-rmobile") {
|
||||
base = of_iomap(np, 0);
|
||||
if (!base) {
|
||||
pr_warn("%s cannot map reg 0\n", np->full_name);
|
||||
pr_warn("%pOF cannot map reg 0\n", np);
|
||||
continue;
|
||||
}
|
||||
|
||||
pmd = of_get_child_by_name(np, "pm-domains");
|
||||
if (!pmd) {
|
||||
pr_warn("%s lacks pm-domains node\n", np->full_name);
|
||||
pr_warn("%pOF lacks pm-domains node\n", np);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
|
@ -70,8 +70,10 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)
|
|||
if (!of_device_is_compatible(np, "ti,am437x-ocp2scp")) {
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
regs = devm_ioremap_resource(&pdev->dev, res);
|
||||
if (IS_ERR(regs))
|
||||
goto err0;
|
||||
if (IS_ERR(regs)) {
|
||||
ret = PTR_ERR(regs);
|
||||
goto err1;
|
||||
}
|
||||
|
||||
pm_runtime_get_sync(&pdev->dev);
|
||||
reg = readl_relaxed(regs + OCP2SCP_TIMING);
|
||||
|
@ -83,6 +85,9 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)
|
|||
|
||||
return 0;
|
||||
|
||||
err1:
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
err0:
|
||||
device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices);
|
||||
|
||||
|
|
|
@ -85,7 +85,7 @@ static struct device_attribute realview_build_attr =
|
|||
|
||||
static int realview_soc_probe(struct platform_device *pdev)
|
||||
{
|
||||
static struct regmap *syscon_regmap;
|
||||
struct regmap *syscon_regmap;
|
||||
struct soc_device *soc_dev;
|
||||
struct soc_device_attribute *soc_dev_attr;
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
|
|
Loading…
Reference in New Issue