Skip to content

Commit 65f4348

Browse files
crawfxrdcrawfxrd
committed
boards: Require declaring the smart charger
Remove the default value for the charger to use. Signed-off-by: Tim Crawford <tcrawford@system76.com>
1 parent 4adcff5 commit 65f4348

47 files changed

Lines changed: 51 additions & 28 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/adding-a-new-board.md‎

Lines changed: 3 additions & 2 deletions

‎src/board/system76/addw1/board.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ CONFIG_I2C_SMBUS = I2C_0
2424
CONFIG_PS2_TOUCHPAD = PS2_3
2525

2626
# Set smart charger parameters
27+
CONFIG_CHARGER = bq24780s
2728
CONFIG_CHARGER_ADAPTER_RSENSE = 5
2829
CONFIG_CHARGER_BATTERY_RSENSE = 10
2930
CONFIG_CHARGER_CHARGE_CURRENT = 3072

‎src/board/system76/addw2/board.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ CONFIG_I2C_SMBUS = I2C_4
2424
CONFIG_PS2_TOUCHPAD = PS2_3
2525

2626
# Set smart charger parameters
27+
CONFIG_CHARGER = bq24780s
2728
CONFIG_CHARGER_ADAPTER_RSENSE = 5
2829
CONFIG_CHARGER_BATTERY_RSENSE = 10
2930
CONFIG_CHARGER_CHARGE_CURRENT = 3072

‎src/board/system76/addw3/board.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ CONFIG_PS2_TOUCHPAD = PS2_3
3030
# Set smart charger parameters
3131
# TODO: actually bq24800
3232
# FIXME: Verify parts and values.
33-
CHARGER=bq24780s
33+
CONFIG_CHARGER = bq24780s
3434
CONFIG_CHARGER_ADAPTER_RSENSE = 5
3535
CONFIG_CHARGER_BATTERY_RSENSE = 10
3636
CONFIG_CHARGER_CHARGE_CURRENT = 1536

‎src/board/system76/addw4/board.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ KBLED = rgb_pwm
2525
CONFIG_PS2_TOUCHPAD = PS2_3
2626

2727
# Set smart charger parameters
28-
CHARGER = oz26786
28+
CONFIG_CHARGER = oz26786
2929
CONFIG_I2C_SMBUS = I2C_4
3030
CONFIG_CHARGER_ADAPTER_RSENSE = 5
3131
CONFIG_CHARGER_BATTERY_RSENSE = 10

‎src/board/system76/bonw14/board.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ CONFIG_I2C_SMBUS = I2C_4
2424
CONFIG_PS2_TOUCHPAD = PS2_3
2525

2626
# Set smart charger parameters
27+
CONFIG_CHARGER = bq24780s
2728
CONFIG_CHARGER_ADAPTER_RSENSE = 5
2829
CONFIG_CHARGER_BATTERY_RSENSE = 10
2930
CONFIG_CHARGER_CHARGE_CURRENT = 3072

‎src/board/system76/bonw15-b/board.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ CONFIG_PS2_TOUCHPAD = PS2_3
3232

3333
# Set smart charger parameters
3434
# XXX: PRS1 and PRS2 are in parallel for adapter Rsense?
35-
CHARGER = oz26786
35+
CONFIG_CHARGER = oz26786
3636
CONFIG_CHARGER_ADAPTER_RSENSE = 5
3737
CONFIG_CHARGER_BATTERY_RSENSE = 5
3838
CONFIG_CHARGER_CHARGE_CURRENT = 3072

‎src/board/system76/bonw15/board.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ CONFIG_PS2_TOUCHPAD = PS2_3
2929

3030
# Set smart charger parameters
3131
# XXX: PRS1 and PRS2 are in parallel for adapter Rsense?
32-
CHARGER=oz26786
32+
CONFIG_CHARGER = oz26786
3333
CONFIG_CHARGER_ADAPTER_RSENSE = 5
3434
CONFIG_CHARGER_BATTERY_RSENSE = 5
3535
CONFIG_CHARGER_CHARGE_CURRENT = 3072

‎src/board/system76/common/common.mk‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ CFLAGS+=\
103103
-DBATTERY_END_THRESHOLD=$(BATTERY_END_THRESHOLD)
104104

105105
# Add charger
106-
CHARGER?=bq24780s
107-
board-common-y += charger/$(CHARGER).c
106+
ifneq ($(CONFIG_CHARGER),)
107+
board-common-y += charger/$(CONFIG_CHARGER).c
108108
CFLAGS += -DCHARGER_ADAPTER_RSENSE=$(CONFIG_CHARGER_ADAPTER_RSENSE)
109109
CFLAGS += -DCHARGER_BATTERY_RSENSE=$(CONFIG_CHARGER_BATTERY_RSENSE)
110110
CFLAGS += -DCHARGER_CHARGE_CURRENT=$(CONFIG_CHARGER_CHARGE_CURRENT)
@@ -113,6 +113,7 @@ CFLAGS += -DCHARGER_INPUT_CURRENT=$(CONFIG_CHARGER_INPUT_CURRENT)
113113
ifneq ($(CONFIG_CHARGER_PSYS_GAIN),)
114114
CFLAGS += -DCHARGER_PSYS_GAIN=$(CONFIG_CHARGER_PSYS_GAIN)
115115
endif
116+
endif
116117

117118
# Add USB-PD
118119
ifeq ($(CONFIG_HAVE_USBPD),y)

‎src/board/system76/darp10-b/board.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ CONFIG_I2C_SMBUS = I2C_4
2828
CONFIG_PS2_TOUCHPAD = PS2_3
2929

3030
# Set smart charger parameters
31-
CHARGER = oz26786
31+
CONFIG_CHARGER = oz26786
3232
CONFIG_CHARGER_ADAPTER_RSENSE = 5
3333
CONFIG_CHARGER_BATTERY_RSENSE = 10
3434
CONFIG_CHARGER_CHARGE_CURRENT = 1536

0 commit comments

Comments
 (0)