Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit aa96ce0af8385415a3450bc13e6254a4d6b4a888

Authored by Len Brown
2 parents 2900681b25 bf8b4542f9
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Merge branch 'misc-2.6.33' into release

Showing 10 changed files Side-by-side Diff

drivers/acpi/acpi_pad.c
Diff comments   View file @ aa96ce0
... ... @@ -100,7 +100,8 @@
100 100 struct cpumask *pad_busy_cpus = to_cpumask(pad_busy_cpus_bits);
101 101 cpumask_var_t tmp;
102 102 int cpu;
103   - unsigned long min_weight = -1, preferred_cpu;
  103 + unsigned long min_weight = -1;
  104 + unsigned long uninitialized_var(preferred_cpu);
104 105  
105 106 if (!alloc_cpumask_var(&tmp, GFP_KERNEL))
106 107 return;
drivers/acpi/battery.c
Diff comments   View file @ aa96ce0
... ... @@ -831,7 +831,7 @@
831 831 dev_name(&device->dev), event,
832 832 acpi_battery_present(battery));
833 833 #ifdef CONFIG_ACPI_SYSFS_POWER
834   - /* acpi_batter_update could remove power_supply object */
  834 + /* acpi_battery_update could remove power_supply object */
835 835 if (battery->bat.dev)
836 836 kobject_uevent(&battery->bat.dev->kobj, KOBJ_CHANGE);
837 837 #endif
... ... @@ -267,7 +267,7 @@
267 267 goto end;
268 268 }
269 269  
270   - dev_info(&device->dev, "registered as cooling_device%d\n", cdev->id);
  270 + dev_dbg(&device->dev, "registered as cooling_device%d\n", cdev->id);
271 271  
272 272 device->driver_data = cdev;
273 273 result = sysfs_create_link(&device->dev.kobj,
... ... @@ -28,6 +28,7 @@
28 28 #include <linux/types.h>
29 29 #include <linux/errno.h>
30 30 #include <linux/acpi.h>
  31 +#include <linux/numa.h>
31 32 #include <acpi/acpi_bus.h>
32 33  
33 34 #define PREFIX "ACPI: "
34 35  
35 36  
... ... @@ -40,14 +41,14 @@
40 41  
41 42 /* maps to convert between proximity domain and logical node ID */
42 43 static int pxm_to_node_map[MAX_PXM_DOMAINS]
43   - = { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL };
  44 + = { [0 ... MAX_PXM_DOMAINS - 1] = NUMA_NO_NODE };
44 45 static int node_to_pxm_map[MAX_NUMNODES]
45   - = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
  46 + = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
46 47  
47 48 int pxm_to_node(int pxm)
48 49 {
49 50 if (pxm < 0)
50   - return NID_INVAL;
  51 + return NUMA_NO_NODE;
51 52 return pxm_to_node_map[pxm];
52 53 }
53 54  
54 55  
... ... @@ -68,9 +69,9 @@
68 69 {
69 70 int node = pxm_to_node_map[pxm];
70 71  
71   - if (node < 0){
  72 + if (node < 0) {
72 73 if (nodes_weight(nodes_found_map) >= MAX_NUMNODES)
73   - return NID_INVAL;
  74 + return NUMA_NO_NODE;
74 75 node = first_unset_node(nodes_found_map);
75 76 __acpi_map_pxm_to_node(pxm, node);
76 77 node_set(node, nodes_found_map);
... ... @@ -78,16 +79,6 @@
78 79  
79 80 return node;
80 81 }
81   -
82   -#if 0
83   -void __cpuinit acpi_unmap_pxm_to_node(int node)
84   -{
85   - int pxm = node_to_pxm_map[node];
86   - pxm_to_node_map[pxm] = NID_INVAL;
87   - node_to_pxm_map[node] = PXM_INVAL;
88   - node_clear(node, nodes_found_map);
89   -}
90   -#endif /* 0 */
91 82  
92 83 static void __init
93 84 acpi_table_print_srat_entry(struct acpi_subtable_header *header)
... ... @@ -1118,7 +1118,7 @@
1118 1118  
1119 1119 /* Check for resource conflicts between ACPI OperationRegions and native
1120 1120 * drivers */
1121   -int acpi_check_resource_conflict(struct resource *res)
  1121 +int acpi_check_resource_conflict(const struct resource *res)
1122 1122 {
1123 1123 struct acpi_res_list *res_list_elem;
1124 1124 int ioport;
drivers/acpi/processor_core.c
Diff comments   View file @ aa96ce0
... ... @@ -353,7 +353,7 @@
353 353 PDE(inode)->data);
354 354 }
355 355  
356   -static int acpi_processor_add_fs(struct acpi_device *device)
  356 +static int __cpuinit acpi_processor_add_fs(struct acpi_device *device)
357 357 {
358 358 struct proc_dir_entry *entry = NULL;
359 359  
... ... @@ -845,7 +845,7 @@
845 845 goto err_power_exit;
846 846 }
847 847  
848   - dev_info(&device->dev, "registered as cooling_device%d\n",
  848 + dev_dbg(&device->dev, "registered as cooling_device%d\n",
849 849 pr->cdev->id);
850 850  
851 851 result = sysfs_create_link(&device->dev.kobj,
drivers/acpi/processor_idle.c
Diff comments   View file @ aa96ce0
... ... @@ -164,7 +164,7 @@
164 164 pr->power.timer_broadcast_on_state = state;
165 165 }
166 166  
167   -static void lapic_timer_propagate_broadcast(void *arg)
  167 +static void __lapic_timer_propagate_broadcast(void *arg)
168 168 {
169 169 struct acpi_processor *pr = (struct acpi_processor *) arg;
170 170 unsigned long reason;
... ... @@ -175,6 +175,12 @@
175 175 clockevents_notify(reason, &pr->id);
176 176 }
177 177  
  178 +static void lapic_timer_propagate_broadcast(struct acpi_processor *pr)
  179 +{
  180 + smp_call_function_single(pr->id, __lapic_timer_propagate_broadcast,
  181 + (void *)pr, 1);
  182 +}
  183 +
178 184 /* Power(C) State timer broadcast control */
179 185 static void lapic_timer_state_broadcast(struct acpi_processor *pr,
180 186 struct acpi_processor_cx *cx,
... ... @@ -638,8 +644,7 @@
638 644 working++;
639 645 }
640 646  
641   - smp_call_function_single(pr->id, lapic_timer_propagate_broadcast,
642   - pr, 1);
  647 + lapic_timer_propagate_broadcast(pr);
643 648  
644 649 return (working);
645 650 }
drivers/platform/x86/acerhdf.c
Diff comments   View file @ aa96ce0
... ... @@ -52,7 +52,7 @@
52 52 */
53 53 #undef START_IN_KERNEL_MODE
54 54  
55   -#define DRV_VER "0.5.18"
  55 +#define DRV_VER "0.5.20"
56 56  
57 57 /*
58 58 * According to the Atom N270 datasheet,
59 59  
... ... @@ -112,12 +112,14 @@
112 112 MODULE_PARM_DESC(force_product, "Force BIOS product and omit BIOS check");
113 113  
114 114 /*
115   - * cmd_off: to switch the fan completely off / to check if the fan is off
  115 + * cmd_off: to switch the fan completely off
  116 + * chk_off: to check if the fan is off
116 117 * cmd_auto: to set the BIOS in control of the fan. The BIOS regulates then
117 118 * the fan speed depending on the temperature
118 119 */
119 120 struct fancmd {
120 121 u8 cmd_off;
  122 + u8 chk_off;
121 123 u8 cmd_auto;
122 124 };
123 125  
124 126  
125 127  
126 128  
... ... @@ -134,32 +136,41 @@
134 136 /* Register addresses and values for different BIOS versions */
135 137 static const struct bios_settings_t bios_tbl[] = {
136 138 /* AOA110 */
137   - {"Acer", "AOA110", "v0.3109", 0x55, 0x58, {0x1f, 0x00} },
138   - {"Acer", "AOA110", "v0.3114", 0x55, 0x58, {0x1f, 0x00} },
139   - {"Acer", "AOA110", "v0.3301", 0x55, 0x58, {0xaf, 0x00} },
140   - {"Acer", "AOA110", "v0.3304", 0x55, 0x58, {0xaf, 0x00} },
141   - {"Acer", "AOA110", "v0.3305", 0x55, 0x58, {0xaf, 0x00} },
142   - {"Acer", "AOA110", "v0.3307", 0x55, 0x58, {0xaf, 0x00} },
143   - {"Acer", "AOA110", "v0.3308", 0x55, 0x58, {0x21, 0x00} },
144   - {"Acer", "AOA110", "v0.3309", 0x55, 0x58, {0x21, 0x00} },
145   - {"Acer", "AOA110", "v0.3310", 0x55, 0x58, {0x21, 0x00} },
  139 + {"Acer", "AOA110", "v0.3109", 0x55, 0x58, {0x1f, 0x1f, 0x00} },
  140 + {"Acer", "AOA110", "v0.3114", 0x55, 0x58, {0x1f, 0x1f, 0x00} },
  141 + {"Acer", "AOA110", "v0.3301", 0x55, 0x58, {0xaf, 0xaf, 0x00} },
  142 + {"Acer", "AOA110", "v0.3304", 0x55, 0x58, {0xaf, 0xaf, 0x00} },
  143 + {"Acer", "AOA110", "v0.3305", 0x55, 0x58, {0xaf, 0xaf, 0x00} },
  144 + {"Acer", "AOA110", "v0.3307", 0x55, 0x58, {0xaf, 0xaf, 0x00} },
  145 + {"Acer", "AOA110", "v0.3308", 0x55, 0x58, {0x21, 0x21, 0x00} },
  146 + {"Acer", "AOA110", "v0.3309", 0x55, 0x58, {0x21, 0x21, 0x00} },
  147 + {"Acer", "AOA110", "v0.3310", 0x55, 0x58, {0x21, 0x21, 0x00} },
146 148 /* AOA150 */
147   - {"Acer", "AOA150", "v0.3114", 0x55, 0x58, {0x20, 0x00} },
148   - {"Acer", "AOA150", "v0.3301", 0x55, 0x58, {0x20, 0x00} },
149   - {"Acer", "AOA150", "v0.3304", 0x55, 0x58, {0x20, 0x00} },
150   - {"Acer", "AOA150", "v0.3305", 0x55, 0x58, {0x20, 0x00} },
151   - {"Acer", "AOA150", "v0.3307", 0x55, 0x58, {0x20, 0x00} },
152   - {"Acer", "AOA150", "v0.3308", 0x55, 0x58, {0x20, 0x00} },
153   - {"Acer", "AOA150", "v0.3309", 0x55, 0x58, {0x20, 0x00} },
154   - {"Acer", "AOA150", "v0.3310", 0x55, 0x58, {0x20, 0x00} },
  149 + {"Acer", "AOA150", "v0.3114", 0x55, 0x58, {0x20, 0x20, 0x00} },
  150 + {"Acer", "AOA150", "v0.3301", 0x55, 0x58, {0x20, 0x20, 0x00} },
  151 + {"Acer", "AOA150", "v0.3304", 0x55, 0x58, {0x20, 0x20, 0x00} },
  152 + {"Acer", "AOA150", "v0.3305", 0x55, 0x58, {0x20, 0x20, 0x00} },
  153 + {"Acer", "AOA150", "v0.3307", 0x55, 0x58, {0x20, 0x20, 0x00} },
  154 + {"Acer", "AOA150", "v0.3308", 0x55, 0x58, {0x20, 0x20, 0x00} },
  155 + {"Acer", "AOA150", "v0.3309", 0x55, 0x58, {0x20, 0x20, 0x00} },
  156 + {"Acer", "AOA150", "v0.3310", 0x55, 0x58, {0x20, 0x20, 0x00} },
  157 + /* Acer 1410 */
  158 + {"Acer", "Aspire 1410", "v0.3120", 0x55, 0x58, {0x9e, 0x9e, 0x00} },
155 159 /* special BIOS / other */
156   - {"Gateway", "AOA110", "v0.3103", 0x55, 0x58, {0x21, 0x00} },
157   - {"Gateway", "AOA150", "v0.3103", 0x55, 0x58, {0x20, 0x00} },
158   - {"Packard Bell", "DOA150", "v0.3104", 0x55, 0x58, {0x21, 0x00} },
159   - {"Packard Bell", "AOA110", "v0.3105", 0x55, 0x58, {0x21, 0x00} },
160   - {"Packard Bell", "AOA150", "v0.3105", 0x55, 0x58, {0x20, 0x00} },
  160 + {"Gateway", "AOA110", "v0.3103", 0x55, 0x58, {0x21, 0x21, 0x00} },
  161 + {"Gateway", "AOA150", "v0.3103", 0x55, 0x58, {0x20, 0x20, 0x00} },
  162 + {"Gateway ", "LT31 ", "v1.3103 ", 0x55, 0x58,
  163 + {0x10, 0x0f, 0x00} },
  164 + {"Gateway ", "LT31 ", "v1.3201 ", 0x55, 0x58,
  165 + {0x10, 0x0f, 0x00} },
  166 + {"Gateway ", "LT31 ", "v1.3302 ", 0x55, 0x58,
  167 + {0x10, 0x0f, 0x00} },
  168 + {"Packard Bell", "DOA150", "v0.3104", 0x55, 0x58, {0x21, 0x21, 0x00} },
  169 + {"Packard Bell", "DOA150", "v0.3105", 0x55, 0x58, {0x20, 0x20, 0x00} },
  170 + {"Packard Bell", "AOA110", "v0.3105", 0x55, 0x58, {0x21, 0x21, 0x00} },
  171 + {"Packard Bell", "AOA150", "v0.3105", 0x55, 0x58, {0x20, 0x20, 0x00} },
161 172 /* pewpew-terminator */
162   - {"", "", "", 0, 0, {0, 0} }
  173 + {"", "", "", 0, 0, {0, 0, 0} }
163 174 };
164 175  
165 176 static const struct bios_settings_t *bios_cfg __read_mostly;
... ... @@ -183,7 +194,7 @@
183 194 if (ec_read(bios_cfg->fanreg, &fan))
184 195 return -EINVAL;
185 196  
186   - if (fan != bios_cfg->cmd.cmd_off)
  197 + if (fan != bios_cfg->cmd.chk_off)
187 198 *state = ACERHDF_FAN_AUTO;
188 199 else
189 200 *state = ACERHDF_FAN_OFF;
drivers/thermal/thermal_sys.c
Diff comments   View file @ aa96ce0
... ... @@ -377,7 +377,7 @@
377 377 if (!sscanf(buf, "%ld\n", &state))
378 378 return -EINVAL;
379 379  
380   - if (state < 0)
  380 + if ((long)state < 0)
381 381 return -EINVAL;
382 382  
383 383 result = cdev->ops->set_cur_state(cdev, state);
include/linux/acpi.h
Diff comments   View file @ aa96ce0
... ... @@ -240,7 +240,7 @@
240 240 #define PXM_INVAL (-1)
241 241 #define NID_INVAL (-1)
242 242  
243   -int acpi_check_resource_conflict(struct resource *res);
  243 +int acpi_check_resource_conflict(const struct resource *res);
244 244  
245 245 int acpi_check_region(resource_size_t start, resource_size_t n,
246 246 const char *name);