linux-nokia-n900: remove (MR 3964)
linux-postmarketos-omap now supports the Nokia N900 and its OMAP3430 SoC, so drop this device-specific fork [ci:skip-build] already built successfully in CI
This commit is contained in:
Sicelo A. Mhlongo
Clayton Craft
parent
8f8a85412f
commit
d19b6cf31b
10 changed files with 0 additions and 6911 deletions
|
|
@ -1,23 +0,0 @@
|
|||
From fbc4ce7a84e59215914a8981afe918002b191493 Mon Sep 17 00:00:00 2001
|
||||
From: Arthur Demchenkov <spinal.by@gmail.com>
|
||||
Date: Fri, 21 Dec 2018 09:23:57 +0300
|
||||
Subject: [PATCH] ARM: dts: n900: increase charge current limit to 950mA
|
||||
|
||||
That was default in Maemo Fremantle
|
||||
---
|
||||
arch/arm/boot/dts/omap3-n900.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
|
||||
index de7a31ae72207..7028a7cb2849e 100644
|
||||
--- a/arch/arm/boot/dts/omap3-n900.dts
|
||||
+++ b/arch/arm/boot/dts/omap3-n900.dts
|
||||
@@ -700,7 +700,7 @@
|
||||
ti,current-limit = <100>;
|
||||
ti,weak-battery-voltage = <3400>;
|
||||
ti,battery-regulation-voltage = <4200>;
|
||||
- ti,charge-current = <650>;
|
||||
+ ti,charge-current = <950>;
|
||||
ti,termination-current = <100>;
|
||||
ti,resistor-sense = <68>;
|
||||
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
commit 68fdbe090c362e8be23890a7333d156e18c27781
|
||||
Author: Sicelo A. Mhlongo <absicsz@gmail.com>
|
||||
Date: Wed Apr 20 14:30:59 2022 +0200
|
||||
|
||||
power: supply: bq27xxx: expose battery data when CI=1
|
||||
|
||||
When the Capacity Inaccurate flag is set, the chip still provides data
|
||||
about the battery, albeit inaccurate. Instead of discarding capacity
|
||||
values for CI=1, expose the stale data and use the
|
||||
POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED property to indicate that the
|
||||
values should be used with care.
|
||||
|
||||
Reviewed-by: Pali Rohár <pali@kernel.org>
|
||||
Signed-off-by: Sicelo A. Mhlongo <absicsz@gmail.com>
|
||||
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
|
||||
|
||||
diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
|
||||
index 72e727cd31e8..35e6a394c0df 100644
|
||||
--- a/drivers/power/supply/bq27xxx_battery.c
|
||||
+++ b/drivers/power/supply/bq27xxx_battery.c
|
||||
@@ -1572,14 +1572,6 @@ static int bq27xxx_battery_read_charge(struct bq27xxx_device_info *di, u8 reg)
|
||||
*/
|
||||
static inline int bq27xxx_battery_read_nac(struct bq27xxx_device_info *di)
|
||||
{
|
||||
- int flags;
|
||||
-
|
||||
- if (di->opts & BQ27XXX_O_ZERO) {
|
||||
- flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, true);
|
||||
- if (flags >= 0 && (flags & BQ27000_FLAG_CI))
|
||||
- return -ENODATA;
|
||||
- }
|
||||
-
|
||||
return bq27xxx_battery_read_charge(di, BQ27XXX_REG_NAC);
|
||||
}
|
||||
|
||||
@@ -1742,6 +1734,18 @@ static bool bq27xxx_battery_dead(struct bq27xxx_device_info *di, u16 flags)
|
||||
return flags & (BQ27XXX_FLAG_SOC1 | BQ27XXX_FLAG_SOCF);
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * Returns true if reported battery capacity is inaccurate
|
||||
+ */
|
||||
+static bool bq27xxx_battery_capacity_inaccurate(struct bq27xxx_device_info *di,
|
||||
+ u16 flags)
|
||||
+{
|
||||
+ if (di->opts & BQ27XXX_O_HAS_CI)
|
||||
+ return (flags & BQ27000_FLAG_CI);
|
||||
+ else
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
|
||||
{
|
||||
/* Unlikely but important to return first */
|
||||
@@ -1751,6 +1755,8 @@ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
|
||||
return POWER_SUPPLY_HEALTH_COLD;
|
||||
if (unlikely(bq27xxx_battery_dead(di, di->cache.flags)))
|
||||
return POWER_SUPPLY_HEALTH_DEAD;
|
||||
+ if (unlikely(bq27xxx_battery_capacity_inaccurate(di, di->cache.flags)))
|
||||
+ return POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED;
|
||||
|
||||
return POWER_SUPPLY_HEALTH_GOOD;
|
||||
}
|
||||
@@ -1758,7 +1764,6 @@ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
|
||||
void bq27xxx_battery_update(struct bq27xxx_device_info *di)
|
||||
{
|
||||
struct bq27xxx_reg_cache cache = {0, };
|
||||
- bool has_ci_flag = di->opts & BQ27XXX_O_HAS_CI;
|
||||
bool has_singe_flag = di->opts & BQ27XXX_O_ZERO;
|
||||
|
||||
cache.flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, has_singe_flag);
|
||||
@@ -1766,30 +1771,19 @@ void bq27xxx_battery_update(struct bq27xxx_device_info *di)
|
||||
cache.flags = -1; /* read error */
|
||||
if (cache.flags >= 0) {
|
||||
cache.temperature = bq27xxx_battery_read_temperature(di);
|
||||
- if (has_ci_flag && (cache.flags & BQ27000_FLAG_CI)) {
|
||||
- dev_info_once(di->dev, "battery is not calibrated! ignoring capacity values\n");
|
||||
- cache.capacity = -ENODATA;
|
||||
- cache.energy = -ENODATA;
|
||||
- cache.time_to_empty = -ENODATA;
|
||||
- cache.time_to_empty_avg = -ENODATA;
|
||||
- cache.time_to_full = -ENODATA;
|
||||
- cache.charge_full = -ENODATA;
|
||||
- cache.health = -ENODATA;
|
||||
- } else {
|
||||
- if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)
|
||||
- cache.time_to_empty = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTE);
|
||||
- if (di->regs[BQ27XXX_REG_TTECP] != INVALID_REG_ADDR)
|
||||
- cache.time_to_empty_avg = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTECP);
|
||||
- if (di->regs[BQ27XXX_REG_TTF] != INVALID_REG_ADDR)
|
||||
- cache.time_to_full = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTF);
|
||||
-
|
||||
- cache.charge_full = bq27xxx_battery_read_fcc(di);
|
||||
- cache.capacity = bq27xxx_battery_read_soc(di);
|
||||
- if (di->regs[BQ27XXX_REG_AE] != INVALID_REG_ADDR)
|
||||
- cache.energy = bq27xxx_battery_read_energy(di);
|
||||
- di->cache.flags = cache.flags;
|
||||
- cache.health = bq27xxx_battery_read_health(di);
|
||||
- }
|
||||
+ if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)
|
||||
+ cache.time_to_empty = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTE);
|
||||
+ if (di->regs[BQ27XXX_REG_TTECP] != INVALID_REG_ADDR)
|
||||
+ cache.time_to_empty_avg = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTECP);
|
||||
+ if (di->regs[BQ27XXX_REG_TTF] != INVALID_REG_ADDR)
|
||||
+ cache.time_to_full = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTF);
|
||||
+
|
||||
+ cache.charge_full = bq27xxx_battery_read_fcc(di);
|
||||
+ cache.capacity = bq27xxx_battery_read_soc(di);
|
||||
+ if (di->regs[BQ27XXX_REG_AE] != INVALID_REG_ADDR)
|
||||
+ cache.energy = bq27xxx_battery_read_energy(di);
|
||||
+ di->cache.flags = cache.flags;
|
||||
+ cache.health = bq27xxx_battery_read_health(di);
|
||||
if (di->regs[BQ27XXX_REG_CYCT] != INVALID_REG_ADDR)
|
||||
cache.cycle_count = bq27xxx_battery_read_cyct(di);
|
||||
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
|
||||
index 18aade195884..6eb8f8ae76da 100644
|
||||
--- a/include/linux/dma-direct.h
|
||||
+++ b/include/linux/dma-direct.h
|
||||
@@ -103,6 +103,10 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size,
|
||||
|
||||
if (addr == DMA_MAPPING_ERROR)
|
||||
return false;
|
||||
+
|
||||
+ if (!dev->dma_mask)
|
||||
+ return false;
|
||||
+
|
||||
if (is_ram && !IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) &&
|
||||
min(addr, end) < phys_to_dma(dev, PFN_PHYS(min_low_pfn)))
|
||||
return false;
|
||||
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
|
||||
index 559461a826ba..389fc0faaa47 100644
|
||||
--- a/kernel/dma/mapping.c
|
||||
+++ b/kernel/dma/mapping.c
|
||||
@@ -148,9 +148,6 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page,
|
||||
|
||||
BUG_ON(!valid_dma_direction(dir));
|
||||
|
||||
- if (WARN_ON_ONCE(!dev->dma_mask))
|
||||
- return DMA_MAPPING_ERROR;
|
||||
-
|
||||
if (dma_map_direct(dev, ops) ||
|
||||
arch_dma_map_page_direct(dev, page_to_phys(page) + offset + size))
|
||||
addr = dma_direct_map_page(dev, page, offset, size, dir, attrs);
|
||||
@@ -185,9 +182,6 @@ static int __dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
|
||||
|
||||
BUG_ON(!valid_dma_direction(dir));
|
||||
|
||||
- if (WARN_ON_ONCE(!dev->dma_mask))
|
||||
- return 0;
|
||||
-
|
||||
if (dma_map_direct(dev, ops) ||
|
||||
arch_dma_map_sg_direct(dev, sg, nents))
|
||||
ents = dma_direct_map_sg(dev, sg, nents, dir, attrs);
|
||||
@@ -293,9 +287,6 @@ dma_addr_t dma_map_resource(struct device *dev, phys_addr_t phys_addr,
|
||||
|
||||
BUG_ON(!valid_dma_direction(dir));
|
||||
|
||||
- if (WARN_ON_ONCE(!dev->dma_mask))
|
||||
- return DMA_MAPPING_ERROR;
|
||||
-
|
||||
if (dma_map_direct(dev, ops))
|
||||
addr = dma_direct_map_resource(dev, phys_addr, size, dir, attrs);
|
||||
else if (ops->map_resource)
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From 5f13cdce615165f5a623faa4a642ecc723202b0f Mon Sep 17 00:00:00 2001
|
||||
From: Merlijn Wajer <merlijn@wizzup.org>
|
||||
Date: Mon, 20 Dec 2021 22:27:03 +0100
|
||||
Subject: [PATCH] ARM: dts: omap3-n900: disable thermal for now
|
||||
|
||||
See "Oops while booting 5.15.2 on Nokia N900" on linux-omap mailing list
|
||||
---
|
||||
arch/arm/boot/dts/omap3-n900.dts | 17 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
|
||||
index 1746a44e96bc..fe7c884da27c 100644
|
||||
--- a/arch/arm/boot/dts/omap3-n900.dts
|
||||
+++ b/arch/arm/boot/dts/omap3-n900.dts
|
||||
@@ -28,6 +28,23 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
+/* Disable cpu_thermal and bandgap, they causes oopses on mmc access in OFF
|
||||
+ mode at the moment. Let's just disable thermal_zones as well, although the
|
||||
+ system works without it...
|
||||
+*/
|
||||
+&cpu_thermal {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&bandgap {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&thermal_zones {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+
|
||||
/ {
|
||||
model = "Nokia N900";
|
||||
compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
|
||||
index 8750dea56fcb..586146ac6884 100644
|
||||
--- a/drivers/iio/accel/st_accel.h
|
||||
+++ b/drivers/iio/accel/st_accel.h
|
||||
@@ -61,6 +61,7 @@ enum st_accel_type {
|
||||
#define LIS3DE_ACCEL_DEV_NAME "lis3de"
|
||||
#define LIS2DE12_ACCEL_DEV_NAME "lis2de12"
|
||||
#define LIS2HH12_ACCEL_DEV_NAME "lis2hh12"
|
||||
+#define LIS302DL_ACCEL_DEV_NAME "lis302dl"
|
||||
|
||||
#ifdef CONFIG_IIO_BUFFER
|
||||
int st_accel_allocate_ring(struct iio_dev *indio_dev);
|
||||
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
|
||||
index f1e6ec380667..2adf8cf7307b 100644
|
||||
--- a/drivers/iio/accel/st_accel_core.c
|
||||
+++ b/drivers/iio/accel/st_accel_core.c
|
||||
@@ -444,6 +444,7 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
|
||||
.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
|
||||
.sensors_supported = {
|
||||
[0] = LIS331DL_ACCEL_DEV_NAME,
|
||||
+ [1] = LIS302DL_ACCEL_DEV_NAME,
|
||||
},
|
||||
.ch = (struct iio_chan_spec *)st_accel_8bit_channels,
|
||||
.odr = {
|
||||
diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
|
||||
index cba57459e90a..466443101e8a 100644
|
||||
--- a/drivers/iio/accel/st_accel_i2c.c
|
||||
+++ b/drivers/iio/accel/st_accel_i2c.c
|
||||
@@ -107,6 +107,10 @@ static const struct of_device_id st_accel_of_match[] = {
|
||||
.compatible = "st,lis2hh12",
|
||||
.data = LIS2HH12_ACCEL_DEV_NAME,
|
||||
},
|
||||
+ {
|
||||
+ .compatible = "st,lis302dl",
|
||||
+ .data = LIS302DL_ACCEL_DEV_NAME,
|
||||
+ },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, st_accel_of_match);
|
||||
|
|
@ -1,81 +0,0 @@
|
|||
From 238a72c97399dfb6d5b7fcb74acf619351f72bcd Mon Sep 17 00:00:00 2001
|
||||
From: "Sicelo A. Mhlongo" <absicsz@gmail.com>
|
||||
Date: Fri, 25 Feb 2022 22:46:23 +0200
|
||||
Subject: [PATCH] ARM: dts: N900: use iio driver for accelerometer
|
||||
|
||||
---
|
||||
arch/arm/boot/dts/omap3-n900.dts | 53 +++++---------------------------
|
||||
1 file changed, 8 insertions(+), 45 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
|
||||
index d40c3d2c4914..f53234ed9c0c 100644
|
||||
--- a/arch/arm/boot/dts/omap3-n900.dts
|
||||
+++ b/arch/arm/boot/dts/omap3-n900.dts
|
||||
@@ -767,56 +767,19 @@ &i2c3 {
|
||||
|
||||
clock-frequency = <400000>;
|
||||
|
||||
- lis302dl: lis3lv02d@1d {
|
||||
- compatible = "st,lis3lv02d";
|
||||
+ lis302dl: lis302dl@1d {
|
||||
+ compatible = "st,lis302dl";
|
||||
reg = <0x1d>;
|
||||
|
||||
- Vdd-supply = <&vaux1>;
|
||||
- Vdd_IO-supply = <&vio>;
|
||||
+ vdd-supply = <&vaux1>;
|
||||
+ vddio-supply = <&vio>;
|
||||
|
||||
interrupt-parent = <&gpio6>;
|
||||
- interrupts = <21 20>; /* 181 and 180 */
|
||||
+ interrupts = <21 IRQ_TYPE_EDGE_RISING>, <20 IRQ_TYPE_EDGE_RISING>; /* 181 and 180 */
|
||||
|
||||
- /* click flags */
|
||||
- st,click-single-x;
|
||||
- st,click-single-y;
|
||||
- st,click-single-z;
|
||||
-
|
||||
- /* Limits are 0.5g * value */
|
||||
- st,click-threshold-x = <8>;
|
||||
- st,click-threshold-y = <8>;
|
||||
- st,click-threshold-z = <10>;
|
||||
-
|
||||
- /* Click must be longer than time limit */
|
||||
- st,click-time-limit = <9>;
|
||||
-
|
||||
- /* Kind of debounce filter */
|
||||
- st,click-latency = <50>;
|
||||
-
|
||||
- /* Interrupt line 2 for click detection */
|
||||
- st,irq2-click;
|
||||
-
|
||||
- st,wakeup-x-hi;
|
||||
- st,wakeup-y-hi;
|
||||
- st,wakeup-threshold = <(800/18)>; /* millig-value / 18 to get HW values */
|
||||
-
|
||||
- st,wakeup2-z-hi;
|
||||
- st,wakeup2-threshold = <(900/18)>; /* millig-value / 18 to get HW values */
|
||||
-
|
||||
- st,hipass1-disable;
|
||||
- st,hipass2-disable;
|
||||
-
|
||||
- st,axis-x = <1>; /* LIS3_DEV_X */
|
||||
- st,axis-y = <(-2)>; /* LIS3_INV_DEV_Y */
|
||||
- st,axis-z = <(-3)>; /* LIS3_INV_DEV_Z */
|
||||
-
|
||||
- st,min-limit-x = <(-32)>;
|
||||
- st,min-limit-y = <3>;
|
||||
- st,min-limit-z = <3>;
|
||||
-
|
||||
- st,max-limit-x = <(-3)>;
|
||||
- st,max-limit-y = <32>;
|
||||
- st,max-limit-z = <32>;
|
||||
+ mount-matrix = "-1", "0", "0",
|
||||
+ "0", "1", "0",
|
||||
+ "0", "0", "1";
|
||||
};
|
||||
|
||||
cam1: camera@3e {
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
@ -1,117 +0,0 @@
|
|||
From d3b8625fd76fc839fc95e90b9117fafaf2d377bb Mon Sep 17 00:00:00 2001
|
||||
From: Merlijn Wajer <merlijn@wizzup.org>
|
||||
Date: Wed, 8 Dec 2021 15:28:59 +0100
|
||||
Subject: [PATCH] Revert "ARM: omap3: enable off mode automatically"
|
||||
|
||||
This reverts commit fb2c599f056640d289b2147fbe6d9eaee689f1b2.
|
||||
|
||||
This commit surfaces problems on the Nokia N900 when the system is
|
||||
actually in idle mode - causing oopses.
|
||||
---
|
||||
arch/arm/mach-omap2/pm-debug.c | 2 ++
|
||||
arch/arm/mach-omap2/pm.c | 2 --
|
||||
arch/arm/mach-omap2/pm.h | 4 ++++
|
||||
arch/arm/mach-omap2/pm34xx.c | 27 ++-------------------------
|
||||
4 files changed, 8 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
|
||||
index b3110399a3fb..104634a9b5b3 100644
|
||||
--- a/arch/arm/mach-omap2/pm-debug.c
|
||||
+++ b/arch/arm/mach-omap2/pm-debug.c
|
||||
@@ -34,6 +34,8 @@
|
||||
#include "prm2xxx_3xxx.h"
|
||||
#include "pm.h"
|
||||
|
||||
+u32 enable_off_mode;
|
||||
+
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
#include <linux/debugfs.h>
|
||||
#include <linux/seq_file.h>
|
||||
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
|
||||
index da829a90fe8c..01ec1ba4878b 100644
|
||||
--- a/arch/arm/mach-omap2/pm.c
|
||||
+++ b/arch/arm/mach-omap2/pm.c
|
||||
@@ -28,8 +28,6 @@
|
||||
#include "clockdomain.h"
|
||||
#include "pm.h"
|
||||
|
||||
-u32 enable_off_mode;
|
||||
-
|
||||
#ifdef CONFIG_SUSPEND
|
||||
/*
|
||||
* omap_pm_suspend: points to a function that does the SoC-specific
|
||||
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
|
||||
index 80e84ae66aee..2a883a0c1fcd 100644
|
||||
--- a/arch/arm/mach-omap2/pm.h
|
||||
+++ b/arch/arm/mach-omap2/pm.h
|
||||
@@ -49,7 +49,11 @@ static inline int omap4_opp_init(void)
|
||||
extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm);
|
||||
extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);
|
||||
|
||||
+#ifdef CONFIG_PM_DEBUG
|
||||
extern u32 enable_off_mode;
|
||||
+#else
|
||||
+#define enable_off_mode 0
|
||||
+#endif
|
||||
|
||||
#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
|
||||
extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev);
|
||||
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
|
||||
index d73c7b692116..d37fb3304a2e 100644
|
||||
--- a/arch/arm/mach-omap2/pm34xx.c
|
||||
+++ b/arch/arm/mach-omap2/pm34xx.c
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <linux/clk.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/slab.h>
|
||||
-#include <linux/of.h>
|
||||
+#include <linux/omap-gpmc.h>
|
||||
|
||||
#include <trace/events/power.h>
|
||||
|
||||
@@ -406,12 +406,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
|
||||
if (!pwrst)
|
||||
return -ENOMEM;
|
||||
pwrst->pwrdm = pwrdm;
|
||||
-
|
||||
- if (enable_off_mode)
|
||||
- pwrst->next_state = PWRDM_POWER_OFF;
|
||||
- else
|
||||
- pwrst->next_state = PWRDM_POWER_RET;
|
||||
-
|
||||
+ pwrst->next_state = PWRDM_POWER_RET;
|
||||
list_add(&pwrst->node, &pwrst_list);
|
||||
|
||||
if (pwrdm_has_hdwr_sar(pwrdm))
|
||||
@@ -445,22 +440,6 @@ static void __init pm_errata_configure(void)
|
||||
}
|
||||
}
|
||||
|
||||
-static void __init omap3_pm_check_pmic(void)
|
||||
-{
|
||||
- struct device_node *np;
|
||||
-
|
||||
- np = of_find_compatible_node(NULL, NULL, "ti,twl4030-power-idle");
|
||||
- if (!np)
|
||||
- np = of_find_compatible_node(NULL, NULL, "ti,twl4030-power-idle-osc-off");
|
||||
-
|
||||
- if (np) {
|
||||
- of_node_put(np);
|
||||
- enable_off_mode = 1;
|
||||
- } else {
|
||||
- enable_off_mode = 0;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
int __init omap3_pm_init(void)
|
||||
{
|
||||
struct power_state *pwrst, *tmp;
|
||||
@@ -494,8 +473,6 @@ int __init omap3_pm_init(void)
|
||||
goto err2;
|
||||
}
|
||||
|
||||
- omap3_pm_check_pmic();
|
||||
-
|
||||
ret = pwrdm_for_each(pwrdms_setup, NULL);
|
||||
if (ret) {
|
||||
pr_err("Failed to setup powerdomains\n");
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
From 7538e4ec6211a0d0e3d4f3d3138e9c2a39a38b62 Mon Sep 17 00:00:00 2001
|
||||
From: Merlijn Wajer <merlijn@wizzup.org>
|
||||
Date: Sun, 12 Dec 2021 23:13:08 +0100
|
||||
Subject: [PATCH] wl1251: specify max. IE length
|
||||
|
||||
This fix is similar to commit 77c91295ea53 ("wil6210: specify max. IE
|
||||
length"). Without the max IE length set, wpa_supplicant cannot operate
|
||||
using the nl80211 interface.
|
||||
|
||||
This patch is a workaround - the number 512 is taken from the wlcore
|
||||
driver, but note that per Paul Fertser:
|
||||
|
||||
there's no correct number because the driver will ignore the data
|
||||
passed in extra IEs.
|
||||
|
||||
Suggested-by: Paul Fertser <fercerpav@gmail.com>
|
||||
Signed-off-by: Merlijn Wajer <merlijn@wizzup.org>
|
||||
---
|
||||
drivers/net/wireless/ti/wl1251/main.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
|
||||
index 136a0d3b23c9..a25a6143e65f 100644
|
||||
--- a/drivers/net/wireless/ti/wl1251/main.c
|
||||
+++ b/drivers/net/wireless/ti/wl1251/main.c
|
||||
@@ -1520,6 +1520,12 @@ int wl1251_init_ieee80211(struct wl1251 *wl)
|
||||
wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
|
||||
BIT(NL80211_IFTYPE_ADHOC);
|
||||
wl->hw->wiphy->max_scan_ssids = 1;
|
||||
+
|
||||
+ /* We set max_scan_ie_len to a random value to make wpa_supplicant scans not
|
||||
+ * fail, as the driver will the ignore the extra passed IEs anyway
|
||||
+ */
|
||||
+ wl->hw->wiphy->max_scan_ie_len = 512;
|
||||
+
|
||||
wl->hw->wiphy->bands[NL80211_BAND_2GHZ] = &wl1251_band_2ghz;
|
||||
|
||||
wl->hw->queues = 4;
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
# Maintainer: Sicelo <absicsz@gmail.com>
|
||||
# Co-Maintainer: Danct12 <danct12@disroot.org>
|
||||
|
||||
pkgname=linux-nokia-n900
|
||||
pkgver=5.15.81
|
||||
pkgrel=0
|
||||
pkgdesc="Mainline kernel fork for Nokia N900"
|
||||
arch="armv7"
|
||||
url="https://kernel.org/"
|
||||
license="GPL-2.0-only"
|
||||
options="!strip !check !tracedeps
|
||||
pmb:cross-native
|
||||
pmb:kconfigcheck-community
|
||||
"
|
||||
makedepends="bison findutils flex openssl-dev perl gmp-dev mpc1-dev mpfr-dev postmarketos-installkernel"
|
||||
|
||||
_carch="arm"
|
||||
_flavor=nokia-n900
|
||||
_config="config-$_flavor.armv7"
|
||||
case $pkgver in
|
||||
*.*.0) _kernver=${pkgver%.0};;
|
||||
*.*.*) _kernver=${pkgver%.*}
|
||||
_patch="
|
||||
linux-$pkgver.patch.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz";;
|
||||
*.*) _kernver=$pkgver;;
|
||||
esac
|
||||
source="
|
||||
https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
|
||||
$_patch
|
||||
$_config
|
||||
0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch
|
||||
0002-power-supply-bq27xxx-expose-battery-data-when-CI.patch
|
||||
0003-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch
|
||||
0004-ARM-dts-omap3_n900-disable-thermal-for-now.patch
|
||||
0005-iio-accel-st-accel-add-lis302dl.patch
|
||||
0006-ARM-dts-N900-use-iio-driver-for-accelerometer.patch
|
||||
0007-Revert-ARM-omap3-enable-off-mode-automatically.patch
|
||||
0008-wl1251-specify-max.-IE-length.patch
|
||||
"
|
||||
builddir="$srcdir/linux-$_kernver"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
cp -v "$srcdir"/$_config .config
|
||||
}
|
||||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
make ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
|
||||
}
|
||||
|
||||
package() {
|
||||
mkdir -p "$pkgdir"/boot
|
||||
make zinstall modules_install dtbs_install \
|
||||
ARCH="$_carch" \
|
||||
INSTALL_MOD_STRIP=1 \
|
||||
INSTALL_PATH="$pkgdir"/boot \
|
||||
INSTALL_MOD_PATH="$pkgdir" \
|
||||
INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
|
||||
|
||||
install -D "$builddir"/include/config/kernel.release \
|
||||
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a linux-5.15.tar.xz
|
||||
022a3c82eb31596f9dde69a4c71721284f4129c5efd95fcef0c102ae4f53a70487e3c1ce44d92197510e98fcb0884398fc5b866938f93e542b2b010a592c5c75 linux-5.15.81.patch.xz
|
||||
7fbbed5b6488cea6518c91147ae32c56bb113ff83c415d0564d5f442ccfaa7bd847a15351983b4d68c44a9fca764e34e6c3681086069d7cf6da467df6a4fce98 config-nokia-n900.armv7
|
||||
04a39253afd25a7de03dc45ff322161672005406543c44b97d2dc293f202de7de446aee9707a690a290641c55c7bed6e78bbe096ca323dd7d88d3207427c8d31 0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch
|
||||
3cc2036ba264bd855358361aacb309ad1cf1660cb82a0978523508d1b3fe513676c58f6efc5bb64f7601b77392c19d2c609b6d83541db7e418c1737cff3973e8 0002-power-supply-bq27xxx-expose-battery-data-when-CI.patch
|
||||
991237276bee4ff7bca24cf3a26afe3f12a2a604452793ad905a605890f761ac98374b5509cfbcab33c7b7ccf3da5cc286e70afe27b8e201387f403bf5025ae9 0003-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch
|
||||
ea33adda06e1fb64b763c34f1f598bb00ccfdba5400d0996871138284b4cb8a51e021c7c0ace9d4bc16027530027fb2a443d5013c6f0b22ed3d64f36152c8854 0004-ARM-dts-omap3_n900-disable-thermal-for-now.patch
|
||||
eb23d77ef3b03d90af43a22f37556c040f8ba69f91564d443615c9554c6ea4d19578730e8087b88751b5f673143cc557ac50bb81598f7f50aba08953c7604df8 0005-iio-accel-st-accel-add-lis302dl.patch
|
||||
302aa8e6677e7ecfae473553806cdf5d47687c4f8e73322d0ace78486f9290ba503069ed6b41250fe38802b6c6091c7c4eac06ab387e011f1316b84ad5e2641d 0006-ARM-dts-N900-use-iio-driver-for-accelerometer.patch
|
||||
acf3beef5448da7f3be19b862ac2fef65379d9f1617246baaab296083901174d891526cd9bf781162d4406089969c311701dfded04219bafd3c5c7784bc4c2e6 0007-Revert-ARM-omap3-enable-off-mode-automatically.patch
|
||||
acaa153809c390957ee8d80caae440a41d84c78f045268ac226f05019dbdd69959b5cf56b6bac2e2c0300bcdb68649ffb847e7a0a333408bf5b4426fc969afe8 0008-wl1251-specify-max.-IE-length.patch
|
||||
"
|
||||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue