Eric Lee / smarc-fsl-linux-kernel

08 Oct, 2020

1 commit

  • 2f68e5475   Merge tag 'v5.4.70' into imx_5.4.y ... Browse Code »

    * tag 'v5.4.70': (3051 commits)
    Linux 5.4.70
    netfilter: ctnetlink: add a range check for l3/l4 protonum
    ep_create_wakeup_source(): dentry name can change under you...
    ...

    Conflicts:
    arch/arm/mach-imx/pm-imx6.c
    arch/arm64/boot/dts/freescale/imx8mm-evk.dts
    arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts
    drivers/crypto/caam/caamalg.c
    drivers/gpu/drm/imx/dw_hdmi-imx.c
    drivers/gpu/drm/imx/imx-ldb.c
    drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c
    drivers/mmc/host/sdhci-esdhc-imx.c
    drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
    drivers/net/ethernet/freescale/enetc/enetc.c
    drivers/net/ethernet/freescale/enetc/enetc_pf.c
    drivers/thermal/imx_thermal.c
    drivers/usb/cdns3/ep0.c
    drivers/xen/swiotlb-xen.c
    sound/soc/fsl/fsl_esai.c
    sound/soc/fsl/fsl_sai.c

    Signed-off-by: Jason Liu

    Jason Liu
     

01 Oct, 2020

1 commit

  • e3d47125a   power: supply: max17040: Correct voltage reading ... Browse Code »

    [ Upstream commit 0383024f811aa469df258039807810fc3793a105 ]

    According to the datasheet available at (1), the bottom four
    bits are always zero and the actual voltage is 1.25x this value
    in mV. Since the kernel API specifies that voltages should be in
    uV, it should report 1250x the shifted value.

    1) https://datasheets.maximintegrated.com/en/ds/MAX17040-MAX17041.pdf

    Signed-off-by: Jonathan Bakker
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Sasha Levin

    Jonathan Bakker
     

19 Aug, 2020

1 commit

  • 8d91c73c1   power: supply: check if calc_soc succeeded in pm860x_init_battery ... Browse Code »

    [ Upstream commit ccf193dee1f0fff55b556928591f7818bac1b3b1 ]

    clang static analysis flags this error

    88pm860x_battery.c:522:19: warning: Assigned value is
    garbage or undefined [core.uninitialized.Assign]
    info->start_soc = soc;
    ^ ~~~
    soc is set by calling calc_soc.
    But calc_soc can return without setting soc.

    So check the return status and bail similarly to other
    checks in pm860x_init_battery and initialize soc to
    silence the warning.

    Fixes: a830d28b48bf ("power_supply: Enable battery-charger for 88pm860x")

    Signed-off-by: Tom Rix
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Sasha Levin

    Tom Rix
     

24 Jun, 2020

3 commits

  • 79790202d   power: supply: smb347-charger: IRQSTAT_D is volatile ... Browse Code »

    [ Upstream commit c32ea07a30630ace950e07ffe7a18bdcc25898e1 ]

    Fix failure when USB cable is connected:
    smb347 2-006a: reading IRQSTAT_D failed

    Fixes: 1502cfe19bac ("smb347-charger: Fix battery status reporting logic for charger faults")

    Tested-by: David Heidelberg
    Signed-off-by: Dmitry Osipenko
    Signed-off-by: David Heidelberg
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Sasha Levin

    Dmitry Osipenko
     
  • ad8b5b5fa   power: supply: lp8788: Fix an error handling path in 'lp8788_charger_probe()' ... Browse Code »

    [ Upstream commit 934ed3847a4ebc75b655659c4d2349ba4337941c ]

    In the probe function, in case of error, resources allocated in
    'lp8788_setup_adc_channel()' must be released.

    This can be achieved easily by using the devm_ variant of
    'iio_channel_get()'.
    This has the extra benefit to simplify the remove function and to axe the
    'lp8788_release_adc_channel()' function which is now useless.

    Fixes: 98a276649358 ("power_supply: Add new lp8788 charger driver")
    Signed-off-by: Christophe JAILLET
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Sasha Levin

    Christophe JAILLET
     
  • 8aa822a13   power: supply: bq24257_charger: Replace depends on REGMAP_I2C with select ... Browse Code »

    [ Upstream commit 87c3d579c8ed0eaea6b1567d529a8daa85a2bc6c ]

    regmap is a library function that gets selected by drivers that need
    it. No driver modules should depend on it. Depending on REGMAP_I2C makes
    this driver only build if another driver already selected REGMAP_I2C,
    as the symbol can't be selected through the menu kernel configuration.

    Fixes: 2219a935963e ("power_supply: Add TI BQ24257 charger driver")
    Signed-off-by: Enric Balletbo i Serra
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Sasha Levin

    Enric Balletbo i Serra
     

22 Jun, 2020

3 commits

  • 8b28e5c35   power: supply: core: fix memory leak in HWMON error path ... Browse Code »

    commit 1d7a7128a2e9e1f137c99b0a44e94d70a77343e3 upstream.

    In function power_supply_add_hwmon_sysfs(), psyhw->props is
    allocated by bitmap_zalloc(). But this pointer is not deallocated
    when devm_add_action fail, which lead to a memory leak bug. To fix
    this, we replace devm_add_action with devm_add_action_or_reset.

    Cc: stable@kernel.org
    Fixes: e67d4dfc9ff19 ("power: supply: Add HWMON compatibility layer")
    Signed-off-by: Qiushi Wu
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Greg Kroah-Hartman

    Qiushi Wu
     
  • 6050811ed   power: supply: core: fix HWMON temperature labels ... Browse Code »

    commit 6b20464ad9fb5fd76ef6f219ce62156aa9639dcc upstream.

    tempX_label files are swapped compared to what
    power_supply_hwmon_temp_to_property() uses. Make them match.

    Cc: stable@vger.kernel.org
    Fixes: e67d4dfc9ff1 ("power: supply: Add HWMON compatibility layer")
    Signed-off-by: Michał Mirosław
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Greg Kroah-Hartman

    Michał Mirosław
     
  • 0fd525d81   power: vexpress: add suppress_bind_attrs to true ... Browse Code »

    commit 73174acc9c75960af2daa7dcbdb9781fc0d135cb upstream.

    Make sure that the POWER_RESET_VEXPRESS driver won't have bind/unbind
    attributes available via the sysfs, so lets be explicit here and use
    ".suppress_bind_attrs = true" to prevent userspace from doing something
    silly.

    Link: https://lore.kernel.org/r/20200527112608.3886105-2-anders.roxell@linaro.org
    Cc: stable@vger.kernel.org
    Signed-off-by: Anders Roxell
    Signed-off-by: Arnd Bergmann
    Signed-off-by: Greg Kroah-Hartman

    Anders Roxell
     

19 Jun, 2020

1 commit

  • 5691e2271   Merge tag 'v5.4.47' into imx_5.4.y ... Browse Code »

    * tag 'v5.4.47': (2193 commits)
    Linux 5.4.47
    KVM: arm64: Save the host's PtrAuth keys in non-preemptible context
    KVM: arm64: Synchronize sysreg state on injecting an AArch32 exception
    ...

    Conflicts:
    arch/arm/boot/dts/imx6qdl.dtsi
    arch/arm/mach-imx/Kconfig
    arch/arm/mach-imx/common.h
    arch/arm/mach-imx/suspend-imx6.S
    arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
    arch/powerpc/include/asm/cacheflush.h
    drivers/cpufreq/imx6q-cpufreq.c
    drivers/dma/imx-sdma.c
    drivers/edac/synopsys_edac.c
    drivers/firmware/imx/imx-scu.c
    drivers/net/ethernet/freescale/fec.h
    drivers/net/ethernet/freescale/fec_main.c
    drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
    drivers/net/phy/phy_device.c
    drivers/perf/fsl_imx8_ddr_perf.c
    drivers/usb/cdns3/gadget.c
    drivers/usb/dwc3/gadget.c
    include/uapi/linux/dma-buf.h

    Signed-off-by: Jason Liu

    Jason Liu
     

23 Apr, 2020

2 commits

  • dcb122749   power: supply: axp288_fuel_gauge: Broaden vendor check for Intel Compute Sticks. ... Browse Code »

    [ Upstream commit e42fe5b29ac07210297e75f36deefe54edbdbf80 ]

    The Intel Compute Stick `STK1A32SC` can have a system vendor of
    "Intel(R) Client Systems".
    Broaden the Intel Compute Stick DMI checks so that they match "Intel
    Corporation" as well as "Intel(R) Client Systems".

    This fixes an issue where the STK1A32SC compute sticks were still
    exposing a battery with the existing blacklist entry.

    Signed-off-by: Jeffery Miller
    Reviewed-by: Hans de Goede
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Sasha Levin

    Jeffery Miller
     
  • b7dee304a   power: supply: bq27xxx_battery: Silence deferred-probe error ... Browse Code »

    [ Upstream commit 583b53ece0b0268c542a1eafadb62e3d4b0aab8c ]

    The driver fails to probe with -EPROBE_DEFER if battery's power supply
    (charger driver) isn't ready yet and this results in a bit noisy error
    message in KMSG during kernel's boot up. Let's silence the harmless
    error message.

    Signed-off-by: Dmitry Osipenko
    Reviewed-by: Andrew F. Davis
    Reviewed-by: Pali Rohár
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Sasha Levin

    Dmitry Osipenko
     

08 Apr, 2020

1 commit

  • 7c6ae8ae0   power: supply: axp288_charger: Add special handling for HP Pavilion x2 10 ... Browse Code »

    commit 9c80662a74cd2a5d1113f5c69d027face963a556 upstream.

    Some HP Pavilion x2 10 models use an AXP288 for charging and fuel-gauge.
    We use a native power_supply / PMIC driver in this case, because on most
    models with an AXP288 the ACPI AC / Battery code is either completely
    missing or relies on custom / proprietary ACPI OpRegions which Linux
    does not implement.

    The native drivers mostly work fine, but there are 2 problems:

    1. These model uses a Type-C connector for charging which the AXP288 does
    not support. As long as a Type-A charger (which uses the USB data pins for
    charger type detection) is used everything is fine. But if a Type-C
    charger is used (such as the charger shipped with the device) then the
    charger is not recognized.

    So we end up slowly discharging the device even though a charger is
    connected, because we are limiting the current from the charger to 500mA.
    To make things worse this happens with the device's official charger.

    Looking at the ACPI tables HP has "solved" the problem of the AXP288 not
    being able to recognize Type-C chargers by simply always programming the
    input-current-limit at 3000mA and relying on a Vhold setting of 4.7V
    (normally 4.4V) to limit the current intake if the charger cannot handle
    this.

    2. If no charger is connected when the machine boots then it boots with the
    vbus-path disabled. On other devices this is done when a 5V boost converter
    is active to avoid the PMIC trying to charge from the 5V boost output.
    This is done when an OTG host cable is inserted and the ID pin on the
    micro-B receptacle is pulled low, the ID pin has an ACPI event handler
    associated with it which re-enables the vbus-path when the ID pin is pulled
    high when the OTG cable is removed. The Type-C connector has no ID pin,
    there is no ID pin handler and there appears to be no 5V boost converter,
    so we end up not charging because the vbus-path is disabled, until we
    unplug the charger which automatically clears the vbus-path disable bit and
    then on the second plug-in of the adapter we start charging.

    The HP Pavilion x2 10 models with an AXP288 do have mostly working ACPI
    AC / Battery code which does not rely on custom / proprietary ACPI
    OpRegions. So one possible solution would be to blacklist the AXP288
    native power_supply drivers and add the HP Pavilion x2 10 with AXP288
    DMI ids to the list of devices which should use the ACPI AC / Battery
    code even though they have an AXP288 PMIC. This would require changes to
    4 files: drivers/acpi/ac.c, drivers/power/supply/axp288_charger.c,
    drivers/acpi/battery.c and drivers/power/supply/axp288_fuel_gauge.c.

    Beside needing adding the same DMI matches to 4 different files, this
    approach also triggers problem 2. from above, but then when suspended,
    during suspend the machine will not wakeup because the vbus path is
    disabled by the AML code when not charging, so the Vbus low-to-high
    IRQ is not triggered, the CPU never wakes up and the device does not
    charge even though the user likely things it is charging, esp. since
    the charge status LED is directly coupled to an adapter being plugged
    in and does not reflect actual charging.

    This could be worked by enabling vbus-path explicitly from say the
    axp288_charger driver's suspend handler.

    So neither situation is ideal, in both cased we need to explicitly enable
    the vbus-path to work around different variants of problem 2 above, this
    requires a quirk in the axp288_charger code.

    If we go the route of using the ACPI AC / Battery drivers then we need
    modifications to 3 other drivers; and we need to partially disable the
    axp288_charger code, while at the same time keeping it around to enable
    vbus-path on suspend.

    OTOH we can copy the hardcoding of 3A input-current-limit (we never touch
    Vhold, so that would stay at 4.7V) to the axp288_charger code, which needs
    changes regardless, then we concentrate all special handling of this
    interesting device model in the axp288_charger code. That is what this
    commit does.

    Cc: stable@vger.kernel.org
    BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1791098
    Signed-off-by: Hans de Goede
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Greg Kroah-Hartman

    Hans de Goede
     

08 Mar, 2020

1 commit

  • 335d2828a   Merge tag 'v5.4.24' into imx_5.4.y ... Browse Code »

    Merge Linux stable release v5.4.24 into imx_5.4.y

    * tag 'v5.4.24': (3306 commits)
    Linux 5.4.24
    blktrace: Protect q->blk_trace with RCU
    kvm: nVMX: VMWRITE checks unsupported field before read-only field
    ...

    Signed-off-by: Jason Liu

    Conflicts:
    arch/arm/boot/dts/imx6sll-evk.dts
    arch/arm/boot/dts/imx7ulp.dtsi
    arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
    drivers/clk/imx/clk-composite-8m.c
    drivers/gpio/gpio-mxc.c
    drivers/irqchip/Kconfig
    drivers/mmc/host/sdhci-of-esdhc.c
    drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
    drivers/net/can/flexcan.c
    drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
    drivers/net/ethernet/mscc/ocelot.c
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
    drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
    drivers/net/phy/realtek.c
    drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
    drivers/perf/fsl_imx8_ddr_perf.c
    drivers/tee/optee/shm_pool.c
    drivers/usb/cdns3/gadget.c
    kernel/sched/cpufreq.c
    net/core/xdp.c
    sound/soc/fsl/fsl_esai.c
    sound/soc/fsl/fsl_sai.c
    sound/soc/sof/core.c
    sound/soc/sof/imx/Kconfig
    sound/soc/sof/loader.c

    Jason Liu
     

11 Feb, 2020

2 commits

  • 03572189d   power: supply: ltc2941-battery-gauge: fix use-after-free ... Browse Code »

    commit a60ec78d306c6548d4adbc7918b587a723c555cc upstream.

    This driver's remove path calls cancel_delayed_work().
    However, that function does not wait until the work function
    finishes. This could mean that the work function is still
    running after the driver's remove function has finished,
    which would result in a use-after-free.

    Fix by calling cancel_delayed_work_sync(), which ensures that
    that the work is properly cancelled, no longer running, and
    unable to re-schedule itself.

    This issue was detected with the help of Coccinelle.

    Cc: stable
    Signed-off-by: Sven Van Asbroeck
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Greg Kroah-Hartman

    Sven Van Asbroeck
     
  • 6f33d59ae   power: supply: axp20x_ac_power: Fix reporting online status ... Browse Code »

    commit 1c51aad8475d670ad58ae60adc9d32342381df8d upstream.

    AXP803/AXP813 have a flag that enables/disables the AC power supply
    input. This flag does not affect the status bits in PWR_INPUT_STATUS.
    Its effect can be verified by checking the battery charge/discharge
    state (bit 2 of PWR_INPUT_STATUS), or by examining the current draw on
    the AC input.

    Take this flag into account when getting the ONLINE property of the AC
    input, on PMICs where this flag is present.

    Fixes: 7693b5643fd2 ("power: supply: add AC power supply driver for AXP813")
    Cc: stable@vger.kernel.org
    Signed-off-by: Samuel Holland
    Reviewed-by: Chen-Yu Tsai
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Greg Kroah-Hartman

    Samuel Holland
     

01 Feb, 2020

1 commit

  • 831919b4c   power/supply: ingenic-battery: Don't change scale if there's only one ... Browse Code »

    commit 86b9182df8bb12610d4d6feac45a69f3ed57bfd2 upstream.

    The ADC in the JZ4740 can work either in high-precision mode with a 2.5V
    range, or in low-precision mode with a 7.5V range. The code in place in
    this driver will select the proper scale according to the maximum
    voltage of the battery.

    The JZ4770 however only has one mode, with a 6.6V range. If only one
    scale is available, there's no need to change it (and nothing to change
    it to), and trying to do so will fail with -EINVAL.

    Fixes: fb24ccfbe1e0 ("power: supply: add Ingenic JZ47xx battery driver.")

    Signed-off-by: Paul Cercueil
    Acked-by: Artur Rojek
    Cc: stable@vger.kernel.org
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Greg Kroah-Hartman

    Paul Cercueil
     

26 Jan, 2020

1 commit

  • 16232b039   power: supply: bd70528: Add MODULE_ALIAS to allow module auto loading ... Browse Code »

    [ Upstream commit 9480029fe5c24d482efad38dc631bd555fc7afe2 ]

    The bd70528 charger driver is probed by MFD driver. Add MODULE_ALIAS
    in order to allow udev to load the module when MFD sub-device cell for
    charger is added.

    Fixes: f8c7f7ddd8ef0 ("power: supply: Initial support for ROHM BD70528 PMIC charger block")
    Signed-off-by: Matti Vaittinen
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Sasha Levin

    Matti Vaittinen
     

31 Dec, 2019

1 commit

  • 07ce12115   power: supply: cpcap-battery: Check voltage before orderly_poweroff ... Browse Code »

    [ Upstream commit 639c1524da3b273d20c42ff2387d08eb4b12e903 ]

    We can get the low voltage interrupt trigger sometimes way too early,
    maybe because of CPU load spikes. This causes orderly_poweroff() be
    called too easily.

    Let's check the voltage before orderly_poweroff in case it was not
    yet a permanent condition. We will be getting more interrupts anyways
    if the condition persists.

    Let's also show the measured voltages for low battery and battery
    empty warnings since we have them.

    Cc: Merlijn Wajer
    Cc: Pavel Machek
    Signed-off-by: Tony Lindgren
    Signed-off-by: Sebastian Reichel
    Signed-off-by: Sasha Levin

    Tony Lindgren
     

25 Nov, 2019

4 commits

  • 4700421b2   MLK-14473-2: power: supply: sabresd_battery: check max11801_read_adc() ... Browse Code »

    part2 of commit(b4568bee5d2a11d55fbd6272297e0ff67ebac941).
    The function calibration_voltage is calling max11801_read_adc from
    touchscreen driverm which can return negative values in case of an
    error. I case of an error, just stop reading ADC data and return 0 as
    voltage_data.

    Signed-off-by: Robert Chiras
    Signed-off-by: Vipul Kumar
    Signed-off-by: Robin Gong

    Robin Gong
     
  • c0e24ef71   MLK-11703-4: sabresd_battery: fix usb charger detect when resume back on mx6sl ... Browse Code »

    cherry-pick below patch:

    ENGR00288351 sabresd_battery: fix usb charger detect when resume back on
    mx6sl

    Fix below redundant log after first resume back on mx6slevk:
    max8903-charger max8903.12: USB Charger Connected

    It's caused by not add enough prepare for uok&dok which are connected,
    such as i.MX6SL-EVK. In this case the board only support DC charger detect,
    so we didn't need judge the uok pin for USB charger detect, although uok
    share with dok pin.

    Signed-off-by: Robin Gong
    (cherry picked from commit c5ba4940a72e8124db7ef91a67b337df4e45e3b0)
    (cherry picked from commit bcd7f8e5e19528abfc1c095049b55b3d409b27af)
    Signed-off-by: Vipul Kumar
    (cherry picked from commit 52692baf477ebd3a025999001e4a0d9a8b81e11b)

    Robin Gong
     
  • 7ecd0e7d1   MLK-11703-3: power: sabresd_battery: remove check charger offset on mx6slevk ... Browse Code »

    cherry-pick below patch:

    ENGR00277663-3 power: sabresd_battery: remove check charger offset on
    mx6slevk

    No need check the charger offset on mx6slevk, since there is no adc
    converter

    Signed-off-by: Robin Gong
    (cherry picked from commit 7683c62cf2290629f09983744d5a3987a4d64669)
    (cherry picked from commit 5f29715585ae82a435aa5ba0fe6393a53c10f87d)
    Signed-off-by: Vipul Kumar
    (cherry picked from commit c00d547719c695c7ff02180edaf58b90344d419c)

    Robin Gong
     
  • d7d4cae37   MLK-11703-2: power: sabresd_battery: add sabresd_battery driver ... Browse Code »

    cherry-pick below patch:
    ENGR00275004-4: power: sabresd_battery: add sabresd_battery driver

    Add sabresd battery driver which based on Max8903 charger IC.

    Signed-off-by: Robin Gong
    TODO: checkpatch warnings
    Signed-off-by: Vipul Kumar
    (cherry picked from commit cf4e6e09dd3d436fa63d19f0ae1ee391cdb7544d)

    Robin Gong
     

23 Sep, 2019

2 commits

  • 619e17cf7   Merge tag 'for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply ... Browse Code »

    Pull power supply and reset updates from Sebastian Reichel:
    "Core:
    - Ensure HWMON devices are registered with valid names
    - Fix device wakeup code

    Drivers:
    - bq25890_charger: Add BQ25895 support
    - axp288_fuel_gauge: Add Minix Neo Z83-4 to blacklist
    - sc27xx: improve battery calibration
    - misc small fixes all over drivers"

    * tag 'for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (24 commits)
    power: supply: cpcap-charger: Enable vbus boost voltage
    power: supply: sc27xx: Add POWER_SUPPLY_PROP_CALIBRATE attribute
    power: supply: sc27xx: Optimize the battery capacity calibration
    power: supply: sc27xx: Make sure the alarm capacity is larger than 0
    power: supply: sc27xx: Fix the the accuracy issue of coulomb calculation
    power: supply: sc27xx: Fix conditon to enable the FGU interrupt
    power: supply: sc27xx: Add POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN attribute
    power: supply: max77650: add MODULE_ALIAS()
    power: supply: isp1704: remove redundant assignment to variable ret
    power: supply: bq25890_charger: Add the BQ25895 part
    power: supply: sc27xx: Replace devm_add_action() followed by failure action with devm_add_action_or_reset()
    power: supply: sc27xx: Introduce local variable 'struct device *dev'
    power: reset: reboot-mode: Fix author email format
    power: supply: ab8500: remove set but not used variables 'vbup33_vrtcn' and 'bup_vch_range'
    power: supply: max17042_battery: Fix a typo in function names
    power: reset: gpio-restart: Fix typo when gpio reset is not found
    power: supply: Init device wakeup after device_add()
    power: supply: ab8500_charger: Mark expected switch fall-through
    power: supply: sbs-battery: only return health when battery present
    MAINTAINERS: N900: Remove isp1704_charger.h record
    ...

    Linus Torvalds
     
  • 5c6bd5de3   Merge tag 'mips_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux ... Browse Code »

    Pull MIPS updates from Paul Burton:
    "Main MIPS changes:

    - boot_mem_map is removed, providing a nice cleanup made possible by
    the recent removal of bootmem.

    - Some fixes to atomics, in general providing compiler barriers for
    smp_mb__{before,after}_atomic plus fixes specific to Loongson CPUs
    or MIPS32 systems using cmpxchg64().

    - Conversion to the new generic VDSO infrastructure courtesy of
    Vincenzo Frascino.

    - Removal of undefined behavior in set_io_port_base(), fixing the
    behavior of some MIPS kernel configurations when built with recent
    clang versions.

    - Initial MIPS32 huge page support, functional on at least Ingenic
    SoCs.

    - pte_special() is now supported for some configurations, allowing
    among other things generic fast GUP to be used.

    - Miscellaneous fixes & cleanups.

    And platform specific changes:

    - Major improvements to Ingenic SoC support from Paul Cercueil,
    mostly enabled by the inclusion of the new TCU (timer-counter unit)
    drivers he's spent a very patient year or so working on. Plus some
    fixes for X1000 SoCs from Zhou Yanjie.

    - Netgear R6200 v1 systems are now supported by the bcm47xx platform.

    - DT updates for BMIPS, Lantiq & Microsemi Ocelot systems"

    * tag 'mips_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (89 commits)
    MIPS: Detect bad _PFN_SHIFT values
    MIPS: Disable pte_special() for MIPS32 with RiXi
    MIPS: ralink: deactivate PCI support for SOC_MT7621
    mips: compat: vdso: Use legacy syscalls as fallback
    MIPS: Drop Loongson _CACHE_* definitions
    MIPS: tlbex: Remove cpu_has_local_ebase
    MIPS: tlbex: Simplify r3k check
    MIPS: Select R3k-style TLB in Kconfig
    MIPS: PCI: refactor ioc3 special handling
    mips: remove ioremap_cachable
    mips/atomic: Fix smp_mb__{before,after}_atomic()
    mips/atomic: Fix loongson_llsc_mb() wreckage
    mips/atomic: Fix cmpxchg64 barriers
    MIPS: Octeon: remove duplicated include from dma-octeon.c
    firmware: bcm47xx_nvram: Allow COMPILE_TEST
    firmware: bcm47xx_nvram: Correct size_t printf format
    MIPS: Treat Loongson Extensions as ASEs
    MIPS: Remove dev_err() usage after platform_get_irq()
    MIPS: dts: mscc: describe the PTP ready interrupt
    MIPS: dts: mscc: describe the PTP register range
    ...

    Linus Torvalds
     

20 Sep, 2019

1 commit

  • 32b90daf5   Merge tag 'tag-chrome-platform-for-v5.4' of git://git.kernel.org/pub/scm/linux/k… ... Browse Code »

    …ernel/git/chrome-platform/linux

    Pull chrome platform updates from Benson Leung:
    "CrOS EC / MFD Migration:
    - Move cros_ec core driver from mfd into chrome platform.

    Wilco EC:
    - Add batt_ppid_info command to Wilco telemetry driver.

    CrOS EC:
    - cros_ec_rpmsg : Add support to inform EC of suspend/resume status
    - cros_ec_rpmsg : Fix race condition on probe failed
    - cros_ec_chardev : Add a poll handler to receive MKBP events

    Misc:
    - bugfixes in cros_usbpd_logger and cros_ec_ishtp"

    * tag 'tag-chrome-platform-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
    platform/chrome: cros_usbpd_logger: null check create_singlethread_workqueue
    platform/chrome: cros_ec_chardev: Add a poll handler to receive MKBP events
    platform/chrome: cros_ec_rpmsg: Fix race with host command when probe failed
    platform/chrome: chromeos_tbmc: Report wake events
    mfd: cros_ec: Use mfd_add_hotplug_devices() helper
    mfd: cros_ec: Add convenience struct to define autodetectable CrOS EC subdevices
    mfd: cros_ec: Add convenience struct to define dedicated CrOS EC MCUs
    mfd: cros_ec: Use kzalloc and cros_ec_cmd_xfer_status helper
    mfd / platform: cros_ec: Reorganize platform and mfd includes
    mfd / platform: cros_ec: Rename config to a better name
    mfd: cros_ec: Switch to use the new cros-ec-chardev driver
    mfd / platform: cros_ec: Miscellaneous character device to talk with the EC
    mfd / platform: cros_ec: Move cros-ec core driver out from MFD
    mfd / platform: cros_ec: Handle chained ECs as platform devices
    platform/chrome: cros_ec_rpmsg: Add host command AP sleep state support
    platform/chrome: chromeos_laptop: drop checks of NULL-safe functions
    platform/chrome: wilco_ec: Add batt_ppid_info command to telemetry driver

    Linus Torvalds
     

03 Sep, 2019

14 commits