Skip to content

Commit 8be0b98

Browse files
olofjolofj
committed
Merge branch 'fixes' into for-next
* fixes: ARM64: dts: meson-gx: fix UART pclk clock name ARM: dts: Fix dm814x missing phy-cells property ARM: dts: Fix elm interrupt compiler warning bus: arm-ccn: fix module unloading Error: Removing state 147 which has instances left. bus: arm-cci: Fix use of smp_processor_id() in preemptible context bus: arm-ccn: Fix use of smp_processor_id() in preemptible context bus: arm-ccn: Simplify code bus: arm-ccn: Check memory allocation failure bus: arm-ccn: constify attribute_group structures. meson-gx-socinfo: Fix package id parsing ARM: meson: fix spelling mistake: "Couln't" -> "Couldn't" ARM: dts: meson: fix the memory region of the GPIO interrupt controller ARM: dts: meson: correct the sort order for the the gpio_intc node
2 parents 8b6eac7 + ce39882 commit 8be0b98

File tree

9 files changed

+39
-30
lines changed

9 files changed

+39
-30
lines changed

‎arch/arm/boot/dts/dm814x.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@
386386
reg = <0x1b00 0x100>;
387387
reg-names = "phy";
388388
ti,ctrl_mod = <&usb_ctrl_mod>;
389+
#phy-cells = <0>;
389390
};
390391
};
391392

‎arch/arm/boot/dts/meson.dtsi‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,6 @@
8585
reg = <0x7c00 0x200>;
8686
};
8787

88-
gpio_intc: interrupt-controller@9880 {
89-
compatible = "amlogic,meson-gpio-intc";
90-
reg = <0xc1109880 0x10>;
91-
interrupt-controller;
92-
#interrupt-cells = <2>;
93-
amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
94-
status = "disabled";
95-
};
96-
9788
hwrng: rng@8100 {
9889
compatible = "amlogic,meson-rng";
9990
reg = <0x8100 0x8>;
@@ -191,6 +182,15 @@
191182
status = "disabled";
192183
};
193184

185+
gpio_intc: interrupt-controller@9880 {
186+
compatible = "amlogic,meson-gpio-intc";
187+
reg = <0x9880 0x10>;
188+
interrupt-controller;
189+
#interrupt-cells = <2>;
190+
amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
191+
status = "disabled";
192+
};
193+
194194
wdt: watchdog@9900 {
195195
compatible = "amlogic,meson6-wdt";
196196
reg = <0x9900 0x8>;

‎arch/arm/boot/dts/omap4.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@
398398
elm: elm@48078000 {
399399
compatible = "ti,am3352-elm";
400400
reg = <0x48078000 0x2000>;
401-
interrupts = <4>;
401+
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
402402
ti,hwmods = "elm";
403403
status = "disabled";
404404
};

‎arch/arm/mach-meson/platsmp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible,
102102

103103
scu_base = of_iomap(node, 0);
104104
if (!scu_base) {
105-
pr_err("Couln't map SCU registers\n");
105+
pr_err("Couldn't map SCU registers\n");
106106
return;
107107
}
108108

‎arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,12 +753,12 @@
753753

754754
&uart_B {
755755
clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
756-
clock-names = "xtal", "core", "baud";
756+
clock-names = "xtal", "pclk", "baud";
757757
};
758758

759759
&uart_C {
760760
clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>;
761-
clock-names = "xtal", "core", "baud";
761+
clock-names = "xtal", "pclk", "baud";
762762
};
763763

764764
&vpu {

‎arch/arm64/boot/dts/amlogic/meson-gxl.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@
688688

689689
&uart_A {
690690
clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;
691-
clock-names = "xtal", "core", "baud";
691+
clock-names = "xtal", "pclk", "baud";
692692
};
693693

694694
&uart_AO {
@@ -703,12 +703,12 @@
703703

704704
&uart_B {
705705
clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
706-
clock-names = "xtal", "core", "baud";
706+
clock-names = "xtal", "pclk", "baud";
707707
};
708708

709709
&uart_C {
710710
clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>;
711-
clock-names = "xtal", "core", "baud";
711+
clock-names = "xtal", "pclk", "baud";
712712
};
713713

714714
&vpu {

‎drivers/bus/arm-cci.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,14 +1755,17 @@ static int cci_pmu_probe(struct platform_device *pdev)
17551755
raw_spin_lock_init(&cci_pmu->hw_events.pmu_lock);
17561756
mutex_init(&cci_pmu->reserve_mutex);
17571757
atomic_set(&cci_pmu->active_events, 0);
1758-
cpumask_set_cpu(smp_processor_id(), &cci_pmu->cpus);
1758+
cpumask_set_cpu(get_cpu(), &cci_pmu->cpus);
17591759

17601760
ret = cci_pmu_init(cci_pmu, pdev);
1761-
if (ret)
1761+
if (ret) {
1762+
put_cpu();
17621763
return ret;
1764+
}
17631765

17641766
cpuhp_state_add_instance_nocalls(CPUHP_AP_PERF_ARM_CCI_ONLINE,
17651767
&cci_pmu->node);
1768+
put_cpu();
17661769
pr_info("ARM %s PMU driver probed", cci_pmu->model->name);
17671770
return 0;
17681771
}

‎drivers/bus/arm-ccn.c‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ static struct attribute *arm_ccn_pmu_format_attrs[] = {
262262
NULL
263263
};
264264

265-
static struct attribute_group arm_ccn_pmu_format_attr_group = {
265+
static const struct attribute_group arm_ccn_pmu_format_attr_group = {
266266
.name = "format",
267267
.attrs = arm_ccn_pmu_format_attrs,
268268
};
@@ -451,7 +451,7 @@ static struct arm_ccn_pmu_event arm_ccn_pmu_events[] = {
451451
static struct attribute
452452
*arm_ccn_pmu_events_attrs[ARRAY_SIZE(arm_ccn_pmu_events) + 1];
453453

454-
static struct attribute_group arm_ccn_pmu_events_attr_group = {
454+
static const struct attribute_group arm_ccn_pmu_events_attr_group = {
455455
.name = "events",
456456
.is_visible = arm_ccn_pmu_events_is_visible,
457457
.attrs = arm_ccn_pmu_events_attrs,
@@ -548,7 +548,7 @@ static struct attribute *arm_ccn_pmu_cmp_mask_attrs[] = {
548548
NULL
549549
};
550550

551-
static struct attribute_group arm_ccn_pmu_cmp_mask_attr_group = {
551+
static const struct attribute_group arm_ccn_pmu_cmp_mask_attr_group = {
552552
.name = "cmp_mask",
553553
.attrs = arm_ccn_pmu_cmp_mask_attrs,
554554
};
@@ -569,7 +569,7 @@ static struct attribute *arm_ccn_pmu_cpumask_attrs[] = {
569569
NULL,
570570
};
571571

572-
static struct attribute_group arm_ccn_pmu_cpumask_attr_group = {
572+
static const struct attribute_group arm_ccn_pmu_cpumask_attr_group = {
573573
.attrs = arm_ccn_pmu_cpumask_attrs,
574574
};
575575

@@ -1268,10 +1268,12 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn)
12681268
if (ccn->dt.id == 0) {
12691269
name = "ccn";
12701270
} else {
1271-
int len = snprintf(NULL, 0, "ccn_%d", ccn->dt.id);
1272-
1273-
name = devm_kzalloc(ccn->dev, len + 1, GFP_KERNEL);
1274-
snprintf(name, len + 1, "ccn_%d", ccn->dt.id);
1271+
name = devm_kasprintf(ccn->dev, GFP_KERNEL, "ccn_%d",
1272+
ccn->dt.id);
1273+
if (!name) {
1274+
err = -ENOMEM;
1275+
goto error_choose_name;
1276+
}
12751277
}
12761278

12771279
/* Perf driver registration */
@@ -1298,7 +1300,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn)
12981300
}
12991301

13001302
/* Pick one CPU which we will use to collect data from CCN... */
1301-
cpumask_set_cpu(smp_processor_id(), &ccn->dt.cpu);
1303+
cpumask_set_cpu(get_cpu(), &ccn->dt.cpu);
13021304

13031305
/* Also make sure that the overflow interrupt is handled by this CPU */
13041306
if (ccn->irq) {
@@ -1315,10 +1317,13 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn)
13151317

13161318
cpuhp_state_add_instance_nocalls(CPUHP_AP_PERF_ARM_CCN_ONLINE,
13171319
&ccn->dt.node);
1320+
put_cpu();
13181321
return 0;
13191322

13201323
error_pmu_register:
13211324
error_set_affinity:
1325+
put_cpu();
1326+
error_choose_name:
13221327
ida_simple_remove(&arm_ccn_pmu_ida, ccn->dt.id);
13231328
for (i = 0; i < ccn->num_xps; i++)
13241329
writel(0, ccn->xp[i].base + CCN_XP_DT_CONTROL);
@@ -1581,8 +1586,8 @@ static int __init arm_ccn_init(void)
15811586

15821587
static void __exit arm_ccn_exit(void)
15831588
{
1584-
cpuhp_remove_multi_state(CPUHP_AP_PERF_ARM_CCN_ONLINE);
15851589
platform_driver_unregister(&arm_ccn_driver);
1590+
cpuhp_remove_multi_state(CPUHP_AP_PERF_ARM_CCN_ONLINE);
15861591
}
15871592

15881593
module_init(arm_ccn_init);

‎drivers/soc/amlogic/meson-gx-socinfo.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#define AO_SEC_SOCINFO_OFFSET AO_SEC_SD_CFG8
2121

2222
#define SOCINFO_MAJOR GENMASK(31, 24)
23-
#define SOCINFO_MINOR GENMASK(23, 16)
24-
#define SOCINFO_PACK GENMASK(15, 8)
23+
#define SOCINFO_PACK GENMASK(23, 16)
24+
#define SOCINFO_MINOR GENMASK(15, 8)
2525
#define SOCINFO_MISC GENMASK(7, 0)
2626

2727
static const struct meson_gx_soc_id {

0 commit comments

Comments
 (0)