* [PATCH 00/44] SPMI patches needed by Hikey 970
@ 2020-08-12 15:56 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 129+ messages in thread
From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Stephen Boyd,
Lee Jones, devicetree, linux-arm-kernel, Wei Xu, David S. Miller,
Rob Herring, linux-kernel, Rob Herring, devel, linux-arm-msm,
Mark Brown, Jonathan Cameron
Hi Greg,
This patch series is part of a work I'm doing in order to be able to support
a HiKey 970 board that I recently got on my hands.
I received some freedback from Mark and from Jonathan on a first
attempt I made to upstream this.
I'm opting to submit it via staging, because I had to start from the
patch that originally added this driver on a 4.9 Kernel tree:
https://github.com/96boards-hikey/linux/tree/hikey970-v4.9
In order to preserve the original SOB from the driver's author.
The patches following it are on the standard way: one patch per
logical change.
This is part of a bigger work whose goal is to have upstream support
for USB and DRM/KMS on such boards.
I suspect that, maybe except for the DT part, those 3 specific drivers
are more or less ready to be moved from staging, but the other
drivers that are also part of this attempt aren't ready. Specially the
DRM driver has some bugs that came from the OOT version.
So, my current plan is to submit those drivers to staging for 5.9
and move the ones that are ok out of staging on Kernel 5.10.
Regards,
Mauro.
Mauro Carvalho Chehab (41):
staging: spmi: hisi-spmi-controller: coding style fixup
staging: spmi: hisi-spmi-controller: fix it to probe successfully
staging: spmi: hisi-spmi-controller: fix a typo
staging: spmi: hisi-spmi-controller: adjust whitespaces at defines
staging: spmi: hisi-spmi-controller: use le32 macros where needed
staging: spmi: hisi-spmi-controller: add debug when values are
read/write
staging: spmi: hisi-spmi-controller: fix the dev_foo() logic
staging: spmi: hisi-spmi-controller: add it to the building system
staging: spmi: hisi-spmi-controller: do some code cleanups
staging: mfd: hi6421-spmi-pmic: get rid of unused code
staging: mfd: hi6421-spmi-pmic: deal with non-static functions
staging: mfd: hi6421-spmi-pmic: get rid of the static vars
staging: mfd: hi6421-spmi-pmic: cleanup hi6421-spmi-pmic.h header
staging: mfd: hi6421-spmi-pmic: change the binding logic
staging: mfd: hi6421-spmi-pmic: get rid of unused OF properties
staging: mfd: hi6421-spmi-pmic: cleanup OF properties
staging: mfd: hi6421-spmi-pmic: change namespace on its functions
staging: mfd: hi6421-spmi-pmic: fix some coding style issues
staging: mfd: hi6421-spmi-pmic: add it to the building system
staging: mfd: hi6421-spmi-pmic: cleanup the code
staging: regulator: hi6421v600-regulator: get rid of unused code
staging: regulator: hi6421v600-regulator: port it to upstream
staging: regulator: hi6421v600-regulator: coding style fixups
staging: regulator: hi6421v600-regulator: change the binding logic
staging: regulator: hi6421v600-regulator: cleanup struct
hisi_regulator
staging: regulator: hi6421v600-regulator: cleanup debug messages
staging: regulator: hi6421v600-regulator: use shorter names for OF
properties
staging: regulator: hi6421v600-regulator: better handle modes
staging: regulator: hi6421v600-regulator: change namespace
staging: regulator: hi6421v600-regulator: convert to use get/set
voltage_sel
staging: regulator: hi6421v600-regulator: don't use usleep_range for
off_on_delay
staging: regulator: hi6421v600-regulator: add a driver-specific debug
macro
staging: regulator: hi6421v600-regulator: initialize ramp_delay
staging: regulator: hi6421v600-regulator: cleanup DT settings
staging: regulator: hi6421v600-regulator: fix some coding style issues
staging: regulator: hi6421v600-regulator: add it to the building
system
staging: regulator: hi6421v600-regulator: code cleanup
staging: hikey9xx: add a TODO list
MAINTAINERS: add an entry for HiSilicon 6421v600 drivers
dt: document HiSilicon SPMI controller and mfd/regulator properties
dt: hisilicon: add support for the PMIC found on Hikey 970
Mayulong (3):
staging: spmi: add Hikey 970 SPMI controller driver
staging: mfd: add a PMIC driver for HiSilicon 6421 SPMI version
staging: regulator: add a regulator driver for HiSilicon 6421v600 SPMI
PMIC
.../mfd/hisilicon,hi6421-spmi-pmic.yaml | 182 +++++++
.../spmi/hisilicon,hisi-spmi-controller.yaml | 54 ++
MAINTAINERS | 6 +
.../boot/dts/hisilicon/hi3670-hikey970.dts | 16 +-
.../boot/dts/hisilicon/hikey970-pmic.dtsi | 200 ++++++++
drivers/staging/Kconfig | 2 +
drivers/staging/Makefile | 1 +
drivers/staging/hikey9xx/Kconfig | 35 ++
drivers/staging/hikey9xx/Makefile | 5 +
drivers/staging/hikey9xx/TODO | 5 +
drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 381 ++++++++++++++
.../staging/hikey9xx/hi6421v600-regulator.c | 479 ++++++++++++++++++
.../staging/hikey9xx/hisi-spmi-controller.c | 351 +++++++++++++
include/linux/mfd/hi6421-spmi-pmic.h | 68 +++
14 files changed, 1773 insertions(+), 12 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml
create mode 100644 Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml
create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi
create mode 100644 drivers/staging/hikey9xx/Kconfig
create mode 100644 drivers/staging/hikey9xx/Makefile
create mode 100644 drivers/staging/hikey9xx/TODO
create mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c
create mode 100644 drivers/staging/hikey9xx/hi6421v600-regulator.c
create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c
create mode 100644 include/linux/mfd/hi6421-spmi-pmic.h
--
2.26.2
^ permalink raw reply [flat|nested] 129+ messages in thread* [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: devel, devicetree, Rob Herring, Mauro Carvalho Chehab, linux-arm-msm, Mark Brown, linuxarm, Wei Xu, linux-kernel, Stephen Boyd, Rob Herring, Jonathan Cameron, mauro.chehab, Lee Jones, David S. Miller, linux-arm-kernel Hi Greg, This patch series is part of a work I'm doing in order to be able to support a HiKey 970 board that I recently got on my hands. I received some freedback from Mark and from Jonathan on a first attempt I made to upstream this. I'm opting to submit it via staging, because I had to start from the patch that originally added this driver on a 4.9 Kernel tree: https://github.com/96boards-hikey/linux/tree/hikey970-v4.9 In order to preserve the original SOB from the driver's author. The patches following it are on the standard way: one patch per logical change. This is part of a bigger work whose goal is to have upstream support for USB and DRM/KMS on such boards. I suspect that, maybe except for the DT part, those 3 specific drivers are more or less ready to be moved from staging, but the other drivers that are also part of this attempt aren't ready. Specially the DRM driver has some bugs that came from the OOT version. So, my current plan is to submit those drivers to staging for 5.9 and move the ones that are ok out of staging on Kernel 5.10. Regards, Mauro. Mauro Carvalho Chehab (41): staging: spmi: hisi-spmi-controller: coding style fixup staging: spmi: hisi-spmi-controller: fix it to probe successfully staging: spmi: hisi-spmi-controller: fix a typo staging: spmi: hisi-spmi-controller: adjust whitespaces at defines staging: spmi: hisi-spmi-controller: use le32 macros where needed staging: spmi: hisi-spmi-controller: add debug when values are read/write staging: spmi: hisi-spmi-controller: fix the dev_foo() logic staging: spmi: hisi-spmi-controller: add it to the building system staging: spmi: hisi-spmi-controller: do some code cleanups staging: mfd: hi6421-spmi-pmic: get rid of unused code staging: mfd: hi6421-spmi-pmic: deal with non-static functions staging: mfd: hi6421-spmi-pmic: get rid of the static vars staging: mfd: hi6421-spmi-pmic: cleanup hi6421-spmi-pmic.h header staging: mfd: hi6421-spmi-pmic: change the binding logic staging: mfd: hi6421-spmi-pmic: get rid of unused OF properties staging: mfd: hi6421-spmi-pmic: cleanup OF properties staging: mfd: hi6421-spmi-pmic: change namespace on its functions staging: mfd: hi6421-spmi-pmic: fix some coding style issues staging: mfd: hi6421-spmi-pmic: add it to the building system staging: mfd: hi6421-spmi-pmic: cleanup the code staging: regulator: hi6421v600-regulator: get rid of unused code staging: regulator: hi6421v600-regulator: port it to upstream staging: regulator: hi6421v600-regulator: coding style fixups staging: regulator: hi6421v600-regulator: change the binding logic staging: regulator: hi6421v600-regulator: cleanup struct hisi_regulator staging: regulator: hi6421v600-regulator: cleanup debug messages staging: regulator: hi6421v600-regulator: use shorter names for OF properties staging: regulator: hi6421v600-regulator: better handle modes staging: regulator: hi6421v600-regulator: change namespace staging: regulator: hi6421v600-regulator: convert to use get/set voltage_sel staging: regulator: hi6421v600-regulator: don't use usleep_range for off_on_delay staging: regulator: hi6421v600-regulator: add a driver-specific debug macro staging: regulator: hi6421v600-regulator: initialize ramp_delay staging: regulator: hi6421v600-regulator: cleanup DT settings staging: regulator: hi6421v600-regulator: fix some coding style issues staging: regulator: hi6421v600-regulator: add it to the building system staging: regulator: hi6421v600-regulator: code cleanup staging: hikey9xx: add a TODO list MAINTAINERS: add an entry for HiSilicon 6421v600 drivers dt: document HiSilicon SPMI controller and mfd/regulator properties dt: hisilicon: add support for the PMIC found on Hikey 970 Mayulong (3): staging: spmi: add Hikey 970 SPMI controller driver staging: mfd: add a PMIC driver for HiSilicon 6421 SPMI version staging: regulator: add a regulator driver for HiSilicon 6421v600 SPMI PMIC .../mfd/hisilicon,hi6421-spmi-pmic.yaml | 182 +++++++ .../spmi/hisilicon,hisi-spmi-controller.yaml | 54 ++ MAINTAINERS | 6 + .../boot/dts/hisilicon/hi3670-hikey970.dts | 16 +- .../boot/dts/hisilicon/hikey970-pmic.dtsi | 200 ++++++++ drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + drivers/staging/hikey9xx/Kconfig | 35 ++ drivers/staging/hikey9xx/Makefile | 5 + drivers/staging/hikey9xx/TODO | 5 + drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 381 ++++++++++++++ .../staging/hikey9xx/hi6421v600-regulator.c | 479 ++++++++++++++++++ .../staging/hikey9xx/hisi-spmi-controller.c | 351 +++++++++++++ include/linux/mfd/hi6421-spmi-pmic.h | 68 +++ 14 files changed, 1773 insertions(+), 12 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml create mode 100644 Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi create mode 100644 drivers/staging/hikey9xx/Kconfig create mode 100644 drivers/staging/hikey9xx/Makefile create mode 100644 drivers/staging/hikey9xx/TODO create mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c create mode 100644 drivers/staging/hikey9xx/hi6421v600-regulator.c create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c create mode 100644 include/linux/mfd/hi6421-spmi-pmic.h -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 129+ messages in thread
* [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: devel, devicetree, Rob Herring, Mauro Carvalho Chehab, linux-arm-msm, Mark Brown, linuxarm, Wei Xu, linux-kernel, Stephen Boyd, Rob Herring, Jonathan Cameron, mauro.chehab, Lee Jones, David S. Miller, linux-arm-kernel Hi Greg, This patch series is part of a work I'm doing in order to be able to support a HiKey 970 board that I recently got on my hands. I received some freedback from Mark and from Jonathan on a first attempt I made to upstream this. I'm opting to submit it via staging, because I had to start from the patch that originally added this driver on a 4.9 Kernel tree: https://github.com/96boards-hikey/linux/tree/hikey970-v4.9 In order to preserve the original SOB from the driver's author. The patches following it are on the standard way: one patch per logical change. This is part of a bigger work whose goal is to have upstream support for USB and DRM/KMS on such boards. I suspect that, maybe except for the DT part, those 3 specific drivers are more or less ready to be moved from staging, but the other drivers that are also part of this attempt aren't ready. Specially the DRM driver has some bugs that came from the OOT version. So, my current plan is to submit those drivers to staging for 5.9 and move the ones that are ok out of staging on Kernel 5.10. Regards, Mauro. Mauro Carvalho Chehab (41): staging: spmi: hisi-spmi-controller: coding style fixup staging: spmi: hisi-spmi-controller: fix it to probe successfully staging: spmi: hisi-spmi-controller: fix a typo staging: spmi: hisi-spmi-controller: adjust whitespaces at defines staging: spmi: hisi-spmi-controller: use le32 macros where needed staging: spmi: hisi-spmi-controller: add debug when values are read/write staging: spmi: hisi-spmi-controller: fix the dev_foo() logic staging: spmi: hisi-spmi-controller: add it to the building system staging: spmi: hisi-spmi-controller: do some code cleanups staging: mfd: hi6421-spmi-pmic: get rid of unused code staging: mfd: hi6421-spmi-pmic: deal with non-static functions staging: mfd: hi6421-spmi-pmic: get rid of the static vars staging: mfd: hi6421-spmi-pmic: cleanup hi6421-spmi-pmic.h header staging: mfd: hi6421-spmi-pmic: change the binding logic staging: mfd: hi6421-spmi-pmic: get rid of unused OF properties staging: mfd: hi6421-spmi-pmic: cleanup OF properties staging: mfd: hi6421-spmi-pmic: change namespace on its functions staging: mfd: hi6421-spmi-pmic: fix some coding style issues staging: mfd: hi6421-spmi-pmic: add it to the building system staging: mfd: hi6421-spmi-pmic: cleanup the code staging: regulator: hi6421v600-regulator: get rid of unused code staging: regulator: hi6421v600-regulator: port it to upstream staging: regulator: hi6421v600-regulator: coding style fixups staging: regulator: hi6421v600-regulator: change the binding logic staging: regulator: hi6421v600-regulator: cleanup struct hisi_regulator staging: regulator: hi6421v600-regulator: cleanup debug messages staging: regulator: hi6421v600-regulator: use shorter names for OF properties staging: regulator: hi6421v600-regulator: better handle modes staging: regulator: hi6421v600-regulator: change namespace staging: regulator: hi6421v600-regulator: convert to use get/set voltage_sel staging: regulator: hi6421v600-regulator: don't use usleep_range for off_on_delay staging: regulator: hi6421v600-regulator: add a driver-specific debug macro staging: regulator: hi6421v600-regulator: initialize ramp_delay staging: regulator: hi6421v600-regulator: cleanup DT settings staging: regulator: hi6421v600-regulator: fix some coding style issues staging: regulator: hi6421v600-regulator: add it to the building system staging: regulator: hi6421v600-regulator: code cleanup staging: hikey9xx: add a TODO list MAINTAINERS: add an entry for HiSilicon 6421v600 drivers dt: document HiSilicon SPMI controller and mfd/regulator properties dt: hisilicon: add support for the PMIC found on Hikey 970 Mayulong (3): staging: spmi: add Hikey 970 SPMI controller driver staging: mfd: add a PMIC driver for HiSilicon 6421 SPMI version staging: regulator: add a regulator driver for HiSilicon 6421v600 SPMI PMIC .../mfd/hisilicon,hi6421-spmi-pmic.yaml | 182 +++++++ .../spmi/hisilicon,hisi-spmi-controller.yaml | 54 ++ MAINTAINERS | 6 + .../boot/dts/hisilicon/hi3670-hikey970.dts | 16 +- .../boot/dts/hisilicon/hikey970-pmic.dtsi | 200 ++++++++ drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + drivers/staging/hikey9xx/Kconfig | 35 ++ drivers/staging/hikey9xx/Makefile | 5 + drivers/staging/hikey9xx/TODO | 5 + drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 381 ++++++++++++++ .../staging/hikey9xx/hi6421v600-regulator.c | 479 ++++++++++++++++++ .../staging/hikey9xx/hisi-spmi-controller.c | 351 +++++++++++++ include/linux/mfd/hi6421-spmi-pmic.h | 68 +++ 14 files changed, 1773 insertions(+), 12 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml create mode 100644 Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi create mode 100644 drivers/staging/hikey9xx/Kconfig create mode 100644 drivers/staging/hikey9xx/Makefile create mode 100644 drivers/staging/hikey9xx/TODO create mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c create mode 100644 drivers/staging/hikey9xx/hi6421v600-regulator.c create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c create mode 100644 include/linux/mfd/hi6421-spmi-pmic.h -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* [PATCH 01/44] staging: spmi: add Hikey 970 SPMI controller driver 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mayulong, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel From: Mayulong <mayulong1@huawei.com> Add the SPMI controller code required to use the Kirin 970 SPMI bus. [mchehab+huawei@kernel.org: added just the SPMI controller on this patch] The complete patch is at: https://github.com/96boards-hikey/linux/commit/08464419fba2 Signed-off-by: Mayulong <mayulong1@huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hisi-spmi-controller.c | 390 ++++++++++++++++++ 1 file changed, 390 insertions(+) create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c new file mode 100644 index 000000000000..987526c8b49f --- /dev/null +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -0,0 +1,390 @@ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/of.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/seq_file.h> +#include <linux/spmi.h> +#include <linux/spmi.h> + +#define SPMI_CONTROLLER_NAME "spmi_controller" + +/* + * SPMI register addr + */ +#define SPMI_CHANNEL_OFFSET 0x0300 +#define SPMI_SLAVE_OFFSET 0x20 + +#define SPMI_APB_SPMI_CMD_BASE_ADDR 0x0100 +/*lint -e750 -esym(750,*)*/ +#define SPMI_APB_SPMI_WDATA0_BASE_ADDR 0x0104 +#define SPMI_APB_SPMI_WDATA1_BASE_ADDR 0x0108 +#define SPMI_APB_SPMI_WDATA2_BASE_ADDR 0x010c +#define SPMI_APB_SPMI_WDATA3_BASE_ADDR 0x0110 + +#define SPMI_APB_SPMI_STATUS_BASE_ADDR 0x0200 + +#define SPMI_APB_SPMI_RDATA0_BASE_ADDR 0x0204 +#define SPMI_APB_SPMI_RDATA1_BASE_ADDR 0x0208 +#define SPMI_APB_SPMI_RDATA2_BASE_ADDR 0x020c +#define SPMI_APB_SPMI_RDATA3_BASE_ADDR 0x0210 +/*lint +e750 -esym(750,*)*/ + +#define SPMI_PER_DATAREG_BYTE 4 +/* + * SPMI cmd register + */ +#define SPMI_APB_SPMI_CMD_EN (1 << 31) +#define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 +#define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 +#define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 +#define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 + +#define Tranverse32(X) ((((u32)(X) & 0xff000000) >> 24) | \ + (((u32)(X) & 0x00ff0000) >> 8) | \ + (((u32)(X) & 0x0000ff00) << 8) | \ + (((u32)(X) & 0x000000ff) << 24)) + +/* Command Opcodes */ +/*lint -e749 -esym(749,*)*/ +enum spmi_controller_cmd_op_code { + SPMI_CMD_REG_ZERO_WRITE = 0, + SPMI_CMD_REG_WRITE = 1, + SPMI_CMD_REG_READ = 2, + SPMI_CMD_EXT_REG_WRITE = 3, + SPMI_CMD_EXT_REG_READ = 4, + SPMI_CMD_EXT_REG_WRITE_L = 5, + SPMI_CMD_EXT_REG_READ_L = 6, + SPMI_CMD_REG_RESET = 7, + SPMI_CMD_REG_SLEEP = 8, + SPMI_CMD_REG_SHUTDOWN = 9, + SPMI_CMD_REG_WAKEUP = 10, +}; +/*lint +e749 -esym(749,*)*/ + +/* + * SPMI status register + */ +#define SPMI_APB_TRANS_DONE (1 << 0) +#define SPMI_APB_TRANS_FAIL (1 << 2) + +/* Command register fields */ +#define SPMI_CONTROLLER_CMD_MAX_BYTE_COUNT 16 + +/* Maximum number of support PMIC peripherals */ +#define SPMI_CONTROLLER_TIMEOUT_US 1000 +#define SPMI_CONTROLLER_MAX_TRANS_BYTES (16) + +#define SPMI_WRITEL( dev, reg, addr ) \ + do { \ + writel( ( reg ), ( addr ) ); \ + } while (0) + +#define SPMI_READL( dev, reg, addr ) \ + do { \ + reg = readl( addr ); \ + } while (0) + +/* + * @base base address of the PMIC Arbiter core registers. + * @rdbase, @wrbase base address of the PMIC Arbiter read core registers. + * For HW-v1 these are equal to base. + * For HW-v2, the value is the same in eeraly probing, in order to read + * PMIC_ARB_CORE registers, then chnls, and obsrvr are set to + * PMIC_ARB_CORE_REGISTERS and PMIC_ARB_CORE_REGISTERS_OBS respectivly. + * @intr base address of the SPMI interrupt control registers + * @ppid_2_chnl_tbl lookup table f(SID, Periph-ID) -> channel num + * entry is only valid if corresponding bit is set in valid_ppid_bitmap. + * @valid_ppid_bitmap bit is set only for valid ppids. + * @fmt_cmd formats a command to be set into PMIC_ARBq_CHNLn_CMD + * @chnl_ofst calculates offset of the base of a channel reg space + * @ee execution environment id + * @irq_acc0_init_val initial value of the interrupt accumulator at probe time. + * Use for an HW workaround. On handling interrupts, the first accumulator + * register will be compared against this value, and bits which are set at + * boot will be ignored. + * @reserved_chnl entry of ppid_2_chnl_tbl that this driver should never touch. + * value is positive channel number or negative to mark it unused. + */ +struct spmi_controller_dev { + struct spmi_controller *controller; + struct device *dev; + void __iomem *base; + spinlock_t lock; + u32 channel; +}; + +static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, + void __iomem *base, u8 sid, u16 addr) +{ + u32 status = 0; + u32 timeout = SPMI_CONTROLLER_TIMEOUT_US; + u32 offset = SPMI_APB_SPMI_STATUS_BASE_ADDR + SPMI_CHANNEL_OFFSET * ctrl_dev->channel + + SPMI_SLAVE_OFFSET * sid; + + while (timeout--) { + SPMI_READL(ctrl_dev->dev, status, base + offset);/*lint !e732 */ + + if (status & SPMI_APB_TRANS_DONE) { + if (status & SPMI_APB_TRANS_FAIL) { + dev_err(ctrl_dev->dev, + "%s: transaction failed (0x%x)\n", + __func__, status); + return -EIO; + } + return 0; + } + udelay(1);/*lint !e778 !e774 !e747*/ + } + + dev_err(ctrl_dev->dev, + "%s: timeout, status 0x%x\n", + __func__, status); + return -ETIMEDOUT;/*lint !e438*/ +}/*lint !e715 !e529*/ + +static int spmi_read_cmd(struct spmi_controller *ctrl, + u8 opc, u8 sid, u16 addr, u8 *buf, size_t bc) +{ + struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); + unsigned long flags; + u32 cmd, data; + int rc; + u32 chnl_ofst = SPMI_CHANNEL_OFFSET*spmi_controller->channel; + u8 op_code, i; + + if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { + dev_err(spmi_controller->dev + , "spmi_controller supports 1..%d bytes per trans, but:%ld requested" + , SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); + return -EINVAL; + } + + /* Check the opcode */ + if (SPMI_CMD_READ == opc) + op_code = SPMI_CMD_REG_READ; + else if (SPMI_CMD_EXT_READ == opc) + op_code = SPMI_CMD_EXT_REG_READ; + else if (SPMI_CMD_EXT_READL == opc) + op_code = SPMI_CMD_EXT_REG_READ_L; + else { + dev_err(spmi_controller->dev, "invalid read cmd 0x%x", opc); + return -EINVAL; + } + + cmd = SPMI_APB_SPMI_CMD_EN |/*lint !e648 !e701 */ /* cmd_en */ + (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) |/*lint !e648 !e701 */ /* cmd_type */ + ((bc-1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) |/*lint !e648 !e701 */ /* byte_cnt */ + ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ + ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ + + spin_lock_irqsave(&spmi_controller->lock, flags);/*lint !e550 */ + + SPMI_WRITEL(spmi_controller->dev, cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); + + + rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); + if (rc) + goto done; + + i = 0; + do { + SPMI_READL(spmi_controller->dev, data, spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET*sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i*SPMI_PER_DATAREG_BYTE);/*lint !e732 */ + data = Tranverse32(data); + if ((bc - i*SPMI_PER_DATAREG_BYTE ) >> 2) {/*lint !e702 */ + memcpy(buf, &data, sizeof(data)); + buf += sizeof(data); + } else { + memcpy(buf, &data, bc%SPMI_PER_DATAREG_BYTE);/*lint !e747 */ + buf += (bc%SPMI_PER_DATAREG_BYTE); + } + i++; + } while (bc > i*SPMI_PER_DATAREG_BYTE); + +done: + spin_unlock_irqrestore(&spmi_controller->lock, flags); + if (rc) + dev_err(spmi_controller->dev, "spmi read wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", + opc, sid, addr, bc + 1); + return rc; +}/*lint !e550 !e529*/ + +/*lint -e438 -esym(438,*)*/ +static int spmi_write_cmd(struct spmi_controller *ctrl, + u8 opc, u8 sid, u16 addr, const u8 *buf, size_t bc) +{ + struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); + unsigned long flags; + u32 cmd; + u32 data = 0; + int rc; + u32 chnl_ofst = SPMI_CHANNEL_OFFSET*spmi_controller->channel; + u8 op_code, i; + + + if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { + dev_err(spmi_controller->dev + , "spmi_controller supports 1..%d bytes per trans, but:%ld requested" + , SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); + return -EINVAL; + } + + /* Check the opcode */ + if (SPMI_CMD_WRITE == opc) + op_code = SPMI_CMD_REG_WRITE; + else if (SPMI_CMD_EXT_WRITE == opc) + op_code = SPMI_CMD_EXT_REG_WRITE; + else if (SPMI_CMD_EXT_WRITEL == opc) + op_code = SPMI_CMD_EXT_REG_WRITE_L; + else { + dev_err(spmi_controller->dev, "invalid write cmd 0x%x", opc); + return -EINVAL; + } + + cmd = SPMI_APB_SPMI_CMD_EN |/*lint !e648 !e701 */ /* cmd_en */ + (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) |/*lint !e648 !e701 */ /* cmd_type */ + ((bc-1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) |/*lint !e648 !e701 */ /* byte_cnt */ + ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ + ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ + + /* Write data to FIFOs */ + spin_lock_irqsave(&spmi_controller->lock, flags);/*lint !e550 */ + + i = 0; + do { + memset(&data, 0, sizeof(data)); + if ((bc - i*SPMI_PER_DATAREG_BYTE ) >> 2) {/*lint !e702 */ + memcpy(&data, buf, sizeof(data)); + buf +=sizeof(data); + } else { + memcpy(&data, buf, bc%SPMI_PER_DATAREG_BYTE);/*lint !e747 */ + buf +=(bc%SPMI_PER_DATAREG_BYTE); + } + + data = Tranverse32(data); + SPMI_WRITEL(spmi_controller->dev, data, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR+SPMI_PER_DATAREG_BYTE*i); + i++; + } while (bc > i*SPMI_PER_DATAREG_BYTE); + + /* Start the transaction */ + SPMI_WRITEL(spmi_controller->dev, cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); + + rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); + spin_unlock_irqrestore(&spmi_controller->lock, flags); + + if (rc) + dev_err(spmi_controller->dev, "spmi write wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", + opc, sid, addr, bc); + + return rc; +}/*lint !e438 !e550 !e529*/ +/*lint +e438 -esym(438,*)*/ +static int spmi_controller_probe(struct platform_device *pdev) +{ + struct spmi_controller_dev *spmi_controller; + struct spmi_controller *ctrl; + struct resource *iores; + int ret = 0; + + printk(KERN_INFO "HISI SPMI probe\n"); + ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*spmi_controller)); + if (!ctrl) { + dev_err(&pdev->dev, "can not allocate spmi_controller data\n"); + return -ENOMEM; /*lint !e429*/ + } + spmi_controller = spmi_controller_get_drvdata(ctrl); + spmi_controller->controller = ctrl; + + /* NOTE: driver uses the static register mapping */ + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!iores) { + dev_err(&pdev->dev, "can not get resource! \n"); + return -EINVAL; /*lint !e429*/ + } + + spmi_controller->base = ioremap(iores->start, resource_size(iores)); + if (!spmi_controller->base) { + dev_err(&pdev->dev, "can not remap base addr! \n"); + return -EADDRNOTAVAIL; /*lint !e429*/ + } + dev_dbg(&pdev->dev, "spmi_add_controller base addr=0x%lx!\n", (long unsigned int)spmi_controller->base);/*lint !e774*/ + + /* Get properties from the device tree */ + ret = of_property_read_u32(pdev->dev.of_node, "spmi-channel", + &spmi_controller->channel);/*lint !e838*/ + if (ret) { + dev_err(&pdev->dev, "can not get chanel \n"); + return -ENODEV; /*lint !e429*/ + } + + platform_set_drvdata(pdev, spmi_controller); + dev_set_drvdata(&ctrl->dev, spmi_controller); + + spin_lock_init(&spmi_controller->lock); + + ctrl->nr = spmi_controller->channel; + ctrl->dev.parent = pdev->dev.parent; + ctrl->dev.of_node = of_node_get(pdev->dev.of_node); + + /* Callbacks */ + ctrl->read_cmd = spmi_read_cmd; + ctrl->write_cmd = spmi_write_cmd; + + ret = spmi_controller_add(ctrl); + if (ret) { + dev_err(&pdev->dev, "spmi_add_controller failed!\n"); + goto err_add_controller; + } +err_add_controller: + platform_set_drvdata(pdev, NULL); + return ret; /*lint !e429*/ +} + +static int spmi_del_controller(struct platform_device *pdev) +{ + struct spmi_controller *ctrl = platform_get_drvdata(pdev); + + platform_set_drvdata(pdev, NULL); + spmi_controller_remove(ctrl); + return 0; +} + +static struct of_device_id spmi_controller_match_table[] = { + { .compatible = "hisilicon,spmi-controller", + },/*lint !e785*/ + {}/*lint !e785*/ +}; + +static struct platform_driver spmi_controller_driver = { + .probe = spmi_controller_probe, + .remove = spmi_del_controller, + .driver = { + .name = SPMI_CONTROLLER_NAME, + .owner = THIS_MODULE,/*lint !e64*/ + .of_match_table = spmi_controller_match_table, + },/*lint !e785*/ +};/*lint !e785*/ +/*lint -e528 -esym(528,*)*/ +static int __init spmi_controller_init(void) +{ + return platform_driver_register(&spmi_controller_driver);/*lint !e64*/ +} +postcore_initcall(spmi_controller_init); + +static void __exit spmi_controller_exit(void) +{ + platform_driver_unregister(&spmi_controller_driver); +} +module_exit(spmi_controller_exit); +/*lint -e753 -esym(753,*)*/ +MODULE_LICENSE("GPL v2"); +MODULE_VERSION("1.0");/*lint !e785 !e64 !e528*/ +MODULE_ALIAS("platform:spmi_controlller"); +/*lint -e753 +esym(753,*)*/ +/*lint -e528 +esym(528,*)*/ + -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 01/44] staging: spmi: add Hikey 970 SPMI controller driver @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mayulong, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab From: Mayulong <mayulong1@huawei.com> Add the SPMI controller code required to use the Kirin 970 SPMI bus. [mchehab+huawei@kernel.org: added just the SPMI controller on this patch] The complete patch is at: https://github.com/96boards-hikey/linux/commit/08464419fba2 Signed-off-by: Mayulong <mayulong1@huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hisi-spmi-controller.c | 390 ++++++++++++++++++ 1 file changed, 390 insertions(+) create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c new file mode 100644 index 000000000000..987526c8b49f --- /dev/null +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -0,0 +1,390 @@ + +#include <linux/delay.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/of.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/seq_file.h> +#include <linux/spmi.h> +#include <linux/spmi.h> + +#define SPMI_CONTROLLER_NAME "spmi_controller" + +/* + * SPMI register addr + */ +#define SPMI_CHANNEL_OFFSET 0x0300 +#define SPMI_SLAVE_OFFSET 0x20 + +#define SPMI_APB_SPMI_CMD_BASE_ADDR 0x0100 +/*lint -e750 -esym(750,*)*/ +#define SPMI_APB_SPMI_WDATA0_BASE_ADDR 0x0104 +#define SPMI_APB_SPMI_WDATA1_BASE_ADDR 0x0108 +#define SPMI_APB_SPMI_WDATA2_BASE_ADDR 0x010c +#define SPMI_APB_SPMI_WDATA3_BASE_ADDR 0x0110 + +#define SPMI_APB_SPMI_STATUS_BASE_ADDR 0x0200 + +#define SPMI_APB_SPMI_RDATA0_BASE_ADDR 0x0204 +#define SPMI_APB_SPMI_RDATA1_BASE_ADDR 0x0208 +#define SPMI_APB_SPMI_RDATA2_BASE_ADDR 0x020c +#define SPMI_APB_SPMI_RDATA3_BASE_ADDR 0x0210 +/*lint +e750 -esym(750,*)*/ + +#define SPMI_PER_DATAREG_BYTE 4 +/* + * SPMI cmd register + */ +#define SPMI_APB_SPMI_CMD_EN (1 << 31) +#define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 +#define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 +#define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 +#define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 + +#define Tranverse32(X) ((((u32)(X) & 0xff000000) >> 24) | \ + (((u32)(X) & 0x00ff0000) >> 8) | \ + (((u32)(X) & 0x0000ff00) << 8) | \ + (((u32)(X) & 0x000000ff) << 24)) + +/* Command Opcodes */ +/*lint -e749 -esym(749,*)*/ +enum spmi_controller_cmd_op_code { + SPMI_CMD_REG_ZERO_WRITE = 0, + SPMI_CMD_REG_WRITE = 1, + SPMI_CMD_REG_READ = 2, + SPMI_CMD_EXT_REG_WRITE = 3, + SPMI_CMD_EXT_REG_READ = 4, + SPMI_CMD_EXT_REG_WRITE_L = 5, + SPMI_CMD_EXT_REG_READ_L = 6, + SPMI_CMD_REG_RESET = 7, + SPMI_CMD_REG_SLEEP = 8, + SPMI_CMD_REG_SHUTDOWN = 9, + SPMI_CMD_REG_WAKEUP = 10, +}; +/*lint +e749 -esym(749,*)*/ + +/* + * SPMI status register + */ +#define SPMI_APB_TRANS_DONE (1 << 0) +#define SPMI_APB_TRANS_FAIL (1 << 2) + +/* Command register fields */ +#define SPMI_CONTROLLER_CMD_MAX_BYTE_COUNT 16 + +/* Maximum number of support PMIC peripherals */ +#define SPMI_CONTROLLER_TIMEOUT_US 1000 +#define SPMI_CONTROLLER_MAX_TRANS_BYTES (16) + +#define SPMI_WRITEL( dev, reg, addr ) \ + do { \ + writel( ( reg ), ( addr ) ); \ + } while (0) + +#define SPMI_READL( dev, reg, addr ) \ + do { \ + reg = readl( addr ); \ + } while (0) + +/* + * @base base address of the PMIC Arbiter core registers. + * @rdbase, @wrbase base address of the PMIC Arbiter read core registers. + * For HW-v1 these are equal to base. + * For HW-v2, the value is the same in eeraly probing, in order to read + * PMIC_ARB_CORE registers, then chnls, and obsrvr are set to + * PMIC_ARB_CORE_REGISTERS and PMIC_ARB_CORE_REGISTERS_OBS respectivly. + * @intr base address of the SPMI interrupt control registers + * @ppid_2_chnl_tbl lookup table f(SID, Periph-ID) -> channel num + * entry is only valid if corresponding bit is set in valid_ppid_bitmap. + * @valid_ppid_bitmap bit is set only for valid ppids. + * @fmt_cmd formats a command to be set into PMIC_ARBq_CHNLn_CMD + * @chnl_ofst calculates offset of the base of a channel reg space + * @ee execution environment id + * @irq_acc0_init_val initial value of the interrupt accumulator at probe time. + * Use for an HW workaround. On handling interrupts, the first accumulator + * register will be compared against this value, and bits which are set at + * boot will be ignored. + * @reserved_chnl entry of ppid_2_chnl_tbl that this driver should never touch. + * value is positive channel number or negative to mark it unused. + */ +struct spmi_controller_dev { + struct spmi_controller *controller; + struct device *dev; + void __iomem *base; + spinlock_t lock; + u32 channel; +}; + +static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, + void __iomem *base, u8 sid, u16 addr) +{ + u32 status = 0; + u32 timeout = SPMI_CONTROLLER_TIMEOUT_US; + u32 offset = SPMI_APB_SPMI_STATUS_BASE_ADDR + SPMI_CHANNEL_OFFSET * ctrl_dev->channel + + SPMI_SLAVE_OFFSET * sid; + + while (timeout--) { + SPMI_READL(ctrl_dev->dev, status, base + offset);/*lint !e732 */ + + if (status & SPMI_APB_TRANS_DONE) { + if (status & SPMI_APB_TRANS_FAIL) { + dev_err(ctrl_dev->dev, + "%s: transaction failed (0x%x)\n", + __func__, status); + return -EIO; + } + return 0; + } + udelay(1);/*lint !e778 !e774 !e747*/ + } + + dev_err(ctrl_dev->dev, + "%s: timeout, status 0x%x\n", + __func__, status); + return -ETIMEDOUT;/*lint !e438*/ +}/*lint !e715 !e529*/ + +static int spmi_read_cmd(struct spmi_controller *ctrl, + u8 opc, u8 sid, u16 addr, u8 *buf, size_t bc) +{ + struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); + unsigned long flags; + u32 cmd, data; + int rc; + u32 chnl_ofst = SPMI_CHANNEL_OFFSET*spmi_controller->channel; + u8 op_code, i; + + if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { + dev_err(spmi_controller->dev + , "spmi_controller supports 1..%d bytes per trans, but:%ld requested" + , SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); + return -EINVAL; + } + + /* Check the opcode */ + if (SPMI_CMD_READ == opc) + op_code = SPMI_CMD_REG_READ; + else if (SPMI_CMD_EXT_READ == opc) + op_code = SPMI_CMD_EXT_REG_READ; + else if (SPMI_CMD_EXT_READL == opc) + op_code = SPMI_CMD_EXT_REG_READ_L; + else { + dev_err(spmi_controller->dev, "invalid read cmd 0x%x", opc); + return -EINVAL; + } + + cmd = SPMI_APB_SPMI_CMD_EN |/*lint !e648 !e701 */ /* cmd_en */ + (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) |/*lint !e648 !e701 */ /* cmd_type */ + ((bc-1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) |/*lint !e648 !e701 */ /* byte_cnt */ + ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ + ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ + + spin_lock_irqsave(&spmi_controller->lock, flags);/*lint !e550 */ + + SPMI_WRITEL(spmi_controller->dev, cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); + + + rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); + if (rc) + goto done; + + i = 0; + do { + SPMI_READL(spmi_controller->dev, data, spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET*sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i*SPMI_PER_DATAREG_BYTE);/*lint !e732 */ + data = Tranverse32(data); + if ((bc - i*SPMI_PER_DATAREG_BYTE ) >> 2) {/*lint !e702 */ + memcpy(buf, &data, sizeof(data)); + buf += sizeof(data); + } else { + memcpy(buf, &data, bc%SPMI_PER_DATAREG_BYTE);/*lint !e747 */ + buf += (bc%SPMI_PER_DATAREG_BYTE); + } + i++; + } while (bc > i*SPMI_PER_DATAREG_BYTE); + +done: + spin_unlock_irqrestore(&spmi_controller->lock, flags); + if (rc) + dev_err(spmi_controller->dev, "spmi read wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", + opc, sid, addr, bc + 1); + return rc; +}/*lint !e550 !e529*/ + +/*lint -e438 -esym(438,*)*/ +static int spmi_write_cmd(struct spmi_controller *ctrl, + u8 opc, u8 sid, u16 addr, const u8 *buf, size_t bc) +{ + struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); + unsigned long flags; + u32 cmd; + u32 data = 0; + int rc; + u32 chnl_ofst = SPMI_CHANNEL_OFFSET*spmi_controller->channel; + u8 op_code, i; + + + if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { + dev_err(spmi_controller->dev + , "spmi_controller supports 1..%d bytes per trans, but:%ld requested" + , SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); + return -EINVAL; + } + + /* Check the opcode */ + if (SPMI_CMD_WRITE == opc) + op_code = SPMI_CMD_REG_WRITE; + else if (SPMI_CMD_EXT_WRITE == opc) + op_code = SPMI_CMD_EXT_REG_WRITE; + else if (SPMI_CMD_EXT_WRITEL == opc) + op_code = SPMI_CMD_EXT_REG_WRITE_L; + else { + dev_err(spmi_controller->dev, "invalid write cmd 0x%x", opc); + return -EINVAL; + } + + cmd = SPMI_APB_SPMI_CMD_EN |/*lint !e648 !e701 */ /* cmd_en */ + (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) |/*lint !e648 !e701 */ /* cmd_type */ + ((bc-1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) |/*lint !e648 !e701 */ /* byte_cnt */ + ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ + ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ + + /* Write data to FIFOs */ + spin_lock_irqsave(&spmi_controller->lock, flags);/*lint !e550 */ + + i = 0; + do { + memset(&data, 0, sizeof(data)); + if ((bc - i*SPMI_PER_DATAREG_BYTE ) >> 2) {/*lint !e702 */ + memcpy(&data, buf, sizeof(data)); + buf +=sizeof(data); + } else { + memcpy(&data, buf, bc%SPMI_PER_DATAREG_BYTE);/*lint !e747 */ + buf +=(bc%SPMI_PER_DATAREG_BYTE); + } + + data = Tranverse32(data); + SPMI_WRITEL(spmi_controller->dev, data, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR+SPMI_PER_DATAREG_BYTE*i); + i++; + } while (bc > i*SPMI_PER_DATAREG_BYTE); + + /* Start the transaction */ + SPMI_WRITEL(spmi_controller->dev, cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); + + rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); + spin_unlock_irqrestore(&spmi_controller->lock, flags); + + if (rc) + dev_err(spmi_controller->dev, "spmi write wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", + opc, sid, addr, bc); + + return rc; +}/*lint !e438 !e550 !e529*/ +/*lint +e438 -esym(438,*)*/ +static int spmi_controller_probe(struct platform_device *pdev) +{ + struct spmi_controller_dev *spmi_controller; + struct spmi_controller *ctrl; + struct resource *iores; + int ret = 0; + + printk(KERN_INFO "HISI SPMI probe\n"); + ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*spmi_controller)); + if (!ctrl) { + dev_err(&pdev->dev, "can not allocate spmi_controller data\n"); + return -ENOMEM; /*lint !e429*/ + } + spmi_controller = spmi_controller_get_drvdata(ctrl); + spmi_controller->controller = ctrl; + + /* NOTE: driver uses the static register mapping */ + iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!iores) { + dev_err(&pdev->dev, "can not get resource! \n"); + return -EINVAL; /*lint !e429*/ + } + + spmi_controller->base = ioremap(iores->start, resource_size(iores)); + if (!spmi_controller->base) { + dev_err(&pdev->dev, "can not remap base addr! \n"); + return -EADDRNOTAVAIL; /*lint !e429*/ + } + dev_dbg(&pdev->dev, "spmi_add_controller base addr=0x%lx!\n", (long unsigned int)spmi_controller->base);/*lint !e774*/ + + /* Get properties from the device tree */ + ret = of_property_read_u32(pdev->dev.of_node, "spmi-channel", + &spmi_controller->channel);/*lint !e838*/ + if (ret) { + dev_err(&pdev->dev, "can not get chanel \n"); + return -ENODEV; /*lint !e429*/ + } + + platform_set_drvdata(pdev, spmi_controller); + dev_set_drvdata(&ctrl->dev, spmi_controller); + + spin_lock_init(&spmi_controller->lock); + + ctrl->nr = spmi_controller->channel; + ctrl->dev.parent = pdev->dev.parent; + ctrl->dev.of_node = of_node_get(pdev->dev.of_node); + + /* Callbacks */ + ctrl->read_cmd = spmi_read_cmd; + ctrl->write_cmd = spmi_write_cmd; + + ret = spmi_controller_add(ctrl); + if (ret) { + dev_err(&pdev->dev, "spmi_add_controller failed!\n"); + goto err_add_controller; + } +err_add_controller: + platform_set_drvdata(pdev, NULL); + return ret; /*lint !e429*/ +} + +static int spmi_del_controller(struct platform_device *pdev) +{ + struct spmi_controller *ctrl = platform_get_drvdata(pdev); + + platform_set_drvdata(pdev, NULL); + spmi_controller_remove(ctrl); + return 0; +} + +static struct of_device_id spmi_controller_match_table[] = { + { .compatible = "hisilicon,spmi-controller", + },/*lint !e785*/ + {}/*lint !e785*/ +}; + +static struct platform_driver spmi_controller_driver = { + .probe = spmi_controller_probe, + .remove = spmi_del_controller, + .driver = { + .name = SPMI_CONTROLLER_NAME, + .owner = THIS_MODULE,/*lint !e64*/ + .of_match_table = spmi_controller_match_table, + },/*lint !e785*/ +};/*lint !e785*/ +/*lint -e528 -esym(528,*)*/ +static int __init spmi_controller_init(void) +{ + return platform_driver_register(&spmi_controller_driver);/*lint !e64*/ +} +postcore_initcall(spmi_controller_init); + +static void __exit spmi_controller_exit(void) +{ + platform_driver_unregister(&spmi_controller_driver); +} +module_exit(spmi_controller_exit); +/*lint -e753 -esym(753,*)*/ +MODULE_LICENSE("GPL v2"); +MODULE_VERSION("1.0");/*lint !e785 !e64 !e528*/ +MODULE_ALIAS("platform:spmi_controlller"); +/*lint -e753 +esym(753,*)*/ +/*lint -e528 +esym(528,*)*/ + -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* Re: [PATCH 01/44] staging: spmi: add Hikey 970 SPMI controller driver 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 16:28 ` Greg Kroah-Hartman -1 siblings, 0 replies; 129+ messages in thread From: Greg Kroah-Hartman @ 2020-08-12 16:28 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: devel, Mayulong, linuxarm, linux-kernel, mauro.chehab On Wed, Aug 12, 2020 at 05:56:11PM +0200, Mauro Carvalho Chehab wrote: > From: Mayulong <mayulong1@huawei.com> > > Add the SPMI controller code required to use the Kirin 970 > SPMI bus. > > [mchehab+huawei@kernel.org: added just the SPMI controller on this patch] > > The complete patch is at: > > https://github.com/96boards-hikey/linux/commit/08464419fba2 > > Signed-off-by: Mayulong <mayulong1@huawei.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > .../staging/hikey9xx/hisi-spmi-controller.c | 390 ++++++++++++++++++ > 1 file changed, 390 insertions(+) > create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c > > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c > new file mode 100644 > index 000000000000..987526c8b49f > --- /dev/null > +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c > @@ -0,0 +1,390 @@ > + > +#include <linux/delay.h> <snip> No SPDX line at all? :( ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 01/44] staging: spmi: add Hikey 970 SPMI controller driver @ 2020-08-12 16:28 ` Greg Kroah-Hartman 0 siblings, 0 replies; 129+ messages in thread From: Greg Kroah-Hartman @ 2020-08-12 16:28 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: devel, linux-kernel, mauro.chehab, linuxarm, Mayulong On Wed, Aug 12, 2020 at 05:56:11PM +0200, Mauro Carvalho Chehab wrote: > From: Mayulong <mayulong1@huawei.com> > > Add the SPMI controller code required to use the Kirin 970 > SPMI bus. > > [mchehab+huawei@kernel.org: added just the SPMI controller on this patch] > > The complete patch is at: > > https://github.com/96boards-hikey/linux/commit/08464419fba2 > > Signed-off-by: Mayulong <mayulong1@huawei.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > .../staging/hikey9xx/hisi-spmi-controller.c | 390 ++++++++++++++++++ > 1 file changed, 390 insertions(+) > create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c > > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c > new file mode 100644 > index 000000000000..987526c8b49f > --- /dev/null > +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c > @@ -0,0 +1,390 @@ > + > +#include <linux/delay.h> <snip> No SPDX line at all? :( _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 01/44] staging: spmi: add Hikey 970 SPMI controller driver 2020-08-12 16:28 ` Greg Kroah-Hartman @ 2020-08-12 18:59 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 18:59 UTC (permalink / raw) To: Greg Kroah-Hartman; +Cc: devel, Mayulong, linuxarm, linux-kernel, mauro.chehab Em Wed, 12 Aug 2020 18:28:14 +0200 Greg Kroah-Hartman <gregkh@linuxfoundation.org> escreveu: > On Wed, Aug 12, 2020 at 05:56:11PM +0200, Mauro Carvalho Chehab wrote: > > From: Mayulong <mayulong1@huawei.com> > > > > Add the SPMI controller code required to use the Kirin 970 > > SPMI bus. > > > > [mchehab+huawei@kernel.org: added just the SPMI controller on this patch] > > > > The complete patch is at: > > > > https://github.com/96boards-hikey/linux/commit/08464419fba2 > > > > Signed-off-by: Mayulong <mayulong1@huawei.com> > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > --- > > .../staging/hikey9xx/hisi-spmi-controller.c | 390 ++++++++++++++++++ > > 1 file changed, 390 insertions(+) > > create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c > > > > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c > > new file mode 100644 > > index 000000000000..987526c8b49f > > --- /dev/null > > +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c > > @@ -0,0 +1,390 @@ > > + > > +#include <linux/delay.h> > > <snip> > > No SPDX line at all? > > :( This is added later on at this series. The first patch came from a 4.9 tree, where such tags weren't used yet. The next patches on this series will add SPDX to all files. Regards, Mauro ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 01/44] staging: spmi: add Hikey 970 SPMI controller driver @ 2020-08-12 18:59 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 18:59 UTC (permalink / raw) To: Greg Kroah-Hartman; +Cc: devel, linux-kernel, mauro.chehab, linuxarm, Mayulong Em Wed, 12 Aug 2020 18:28:14 +0200 Greg Kroah-Hartman <gregkh@linuxfoundation.org> escreveu: > On Wed, Aug 12, 2020 at 05:56:11PM +0200, Mauro Carvalho Chehab wrote: > > From: Mayulong <mayulong1@huawei.com> > > > > Add the SPMI controller code required to use the Kirin 970 > > SPMI bus. > > > > [mchehab+huawei@kernel.org: added just the SPMI controller on this patch] > > > > The complete patch is at: > > > > https://github.com/96boards-hikey/linux/commit/08464419fba2 > > > > Signed-off-by: Mayulong <mayulong1@huawei.com> > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > --- > > .../staging/hikey9xx/hisi-spmi-controller.c | 390 ++++++++++++++++++ > > 1 file changed, 390 insertions(+) > > create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c > > > > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c > > new file mode 100644 > > index 000000000000..987526c8b49f > > --- /dev/null > > +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c > > @@ -0,0 +1,390 @@ > > + > > +#include <linux/delay.h> > > <snip> > > No SPDX line at all? > > :( This is added later on at this series. The first patch came from a 4.9 tree, where such tags weren't used yet. The next patches on this series will add SPDX to all files. Regards, Mauro _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* [PATCH 02/44] staging: spmi: hisi-spmi-controller: coding style fixup 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel In order to prepare for upstream, fix most coding style issues. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hisi-spmi-controller.c | 179 ++++++++---------- 1 file changed, 82 insertions(+), 97 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 987526c8b49f..3af0bd1b379f 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/delay.h> #include <linux/err.h> @@ -21,7 +22,7 @@ #define SPMI_SLAVE_OFFSET 0x20 #define SPMI_APB_SPMI_CMD_BASE_ADDR 0x0100 -/*lint -e750 -esym(750,*)*/ + #define SPMI_APB_SPMI_WDATA0_BASE_ADDR 0x0104 #define SPMI_APB_SPMI_WDATA1_BASE_ADDR 0x0108 #define SPMI_APB_SPMI_WDATA2_BASE_ADDR 0x010c @@ -33,25 +34,25 @@ #define SPMI_APB_SPMI_RDATA1_BASE_ADDR 0x0208 #define SPMI_APB_SPMI_RDATA2_BASE_ADDR 0x020c #define SPMI_APB_SPMI_RDATA3_BASE_ADDR 0x0210 -/*lint +e750 -esym(750,*)*/ #define SPMI_PER_DATAREG_BYTE 4 /* * SPMI cmd register */ -#define SPMI_APB_SPMI_CMD_EN (1 << 31) +#define SPMI_APB_SPMI_CMD_EN BIT(31) #define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 #define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 #define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 #define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 -#define Tranverse32(X) ((((u32)(X) & 0xff000000) >> 24) | \ - (((u32)(X) & 0x00ff0000) >> 8) | \ - (((u32)(X) & 0x0000ff00) << 8) | \ - (((u32)(X) & 0x000000ff) << 24)) +#define bswap_32(X) \ + ((((u32)(X) & 0xff000000) >> 24) | \ + (((u32)(X) & 0x00ff0000) >> 8) | \ + (((u32)(X) & 0x0000ff00) << 8) | \ + (((u32)(X) & 0x000000ff) << 24)) /* Command Opcodes */ -/*lint -e749 -esym(749,*)*/ + enum spmi_controller_cmd_op_code { SPMI_CMD_REG_ZERO_WRITE = 0, SPMI_CMD_REG_WRITE = 1, @@ -65,13 +66,12 @@ enum spmi_controller_cmd_op_code { SPMI_CMD_REG_SHUTDOWN = 9, SPMI_CMD_REG_WAKEUP = 10, }; -/*lint +e749 -esym(749,*)*/ /* * SPMI status register */ -#define SPMI_APB_TRANS_DONE (1 << 0) -#define SPMI_APB_TRANS_FAIL (1 << 2) +#define SPMI_APB_TRANS_DONE BIT(0) +#define SPMI_APB_TRANS_FAIL BIT(2) /* Command register fields */ #define SPMI_CONTROLLER_CMD_MAX_BYTE_COUNT 16 @@ -80,16 +80,6 @@ enum spmi_controller_cmd_op_code { #define SPMI_CONTROLLER_TIMEOUT_US 1000 #define SPMI_CONTROLLER_MAX_TRANS_BYTES (16) -#define SPMI_WRITEL( dev, reg, addr ) \ - do { \ - writel( ( reg ), ( addr ) ); \ - } while (0) - -#define SPMI_READL( dev, reg, addr ) \ - do { \ - reg = readl( addr ); \ - } while (0) - /* * @base base address of the PMIC Arbiter core registers. * @rdbase, @wrbase base address of the PMIC Arbiter read core registers. @@ -120,7 +110,7 @@ struct spmi_controller_dev { }; static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, - void __iomem *base, u8 sid, u16 addr) + void __iomem *base, u8 sid, u16 addr) { u32 status = 0; u32 timeout = SPMI_CONTROLLER_TIMEOUT_US; @@ -128,7 +118,7 @@ static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, + SPMI_SLAVE_OFFSET * sid; while (timeout--) { - SPMI_READL(ctrl_dev->dev, status, base + offset);/*lint !e732 */ + status = readl(base + offset); if (status & SPMI_APB_TRANS_DONE) { if (status & SPMI_APB_TRANS_FAIL) { @@ -139,23 +129,23 @@ static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, } return 0; } - udelay(1);/*lint !e778 !e774 !e747*/ + udelay(1); } dev_err(ctrl_dev->dev, "%s: timeout, status 0x%x\n", __func__, status); - return -ETIMEDOUT;/*lint !e438*/ -}/*lint !e715 !e529*/ + return -ETIMEDOUT; +} static int spmi_read_cmd(struct spmi_controller *ctrl, - u8 opc, u8 sid, u16 addr, u8 *buf, size_t bc) + u8 opc, u8 sid, u16 addr, u8 *buf, size_t bc) { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); unsigned long flags; u32 cmd, data; int rc; - u32 chnl_ofst = SPMI_CHANNEL_OFFSET*spmi_controller->channel; + u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; u8 op_code, i; if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { @@ -166,27 +156,26 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, } /* Check the opcode */ - if (SPMI_CMD_READ == opc) + if (opc == SPMI_CMD_READ) { op_code = SPMI_CMD_REG_READ; - else if (SPMI_CMD_EXT_READ == opc) + } else if (opc == SPMI_CMD_EXT_READ) { op_code = SPMI_CMD_EXT_REG_READ; - else if (SPMI_CMD_EXT_READL == opc) + } else if (opc == SPMI_CMD_EXT_READL) { op_code = SPMI_CMD_EXT_REG_READ_L; - else { + } else { dev_err(spmi_controller->dev, "invalid read cmd 0x%x", opc); return -EINVAL; } - cmd = SPMI_APB_SPMI_CMD_EN |/*lint !e648 !e701 */ /* cmd_en */ - (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) |/*lint !e648 !e701 */ /* cmd_type */ - ((bc-1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) |/*lint !e648 !e701 */ /* byte_cnt */ - ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ - ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ + cmd = SPMI_APB_SPMI_CMD_EN | + (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) | + ((bc - 1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) | + ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ + ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ - spin_lock_irqsave(&spmi_controller->lock, flags);/*lint !e550 */ - - SPMI_WRITEL(spmi_controller->dev, cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); + spin_lock_irqsave(&spmi_controller->lock, flags); + writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); if (rc) @@ -194,39 +183,37 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, i = 0; do { - SPMI_READL(spmi_controller->dev, data, spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET*sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i*SPMI_PER_DATAREG_BYTE);/*lint !e732 */ - data = Tranverse32(data); - if ((bc - i*SPMI_PER_DATAREG_BYTE ) >> 2) {/*lint !e702 */ + data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); + data = bswap_32(data); + if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(buf, &data, sizeof(data)); buf += sizeof(data); } else { - memcpy(buf, &data, bc%SPMI_PER_DATAREG_BYTE);/*lint !e747 */ - buf += (bc%SPMI_PER_DATAREG_BYTE); + memcpy(buf, &data, bc % SPMI_PER_DATAREG_BYTE); + buf += (bc % SPMI_PER_DATAREG_BYTE); } i++; - } while (bc > i*SPMI_PER_DATAREG_BYTE); + } while (bc > i * SPMI_PER_DATAREG_BYTE); done: spin_unlock_irqrestore(&spmi_controller->lock, flags); if (rc) dev_err(spmi_controller->dev, "spmi read wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", - opc, sid, addr, bc + 1); + opc, sid, addr, bc + 1); return rc; -}/*lint !e550 !e529*/ +} -/*lint -e438 -esym(438,*)*/ static int spmi_write_cmd(struct spmi_controller *ctrl, - u8 opc, u8 sid, u16 addr, const u8 *buf, size_t bc) + u8 opc, u8 sid, u16 addr, const u8 *buf, size_t bc) { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); unsigned long flags; u32 cmd; u32 data = 0; int rc; - u32 chnl_ofst = SPMI_CHANNEL_OFFSET*spmi_controller->channel; + u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; u8 op_code, i; - if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { dev_err(spmi_controller->dev , "spmi_controller supports 1..%d bytes per trans, but:%ld requested" @@ -235,55 +222,55 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, } /* Check the opcode */ - if (SPMI_CMD_WRITE == opc) + if (opc == SPMI_CMD_WRITE) { op_code = SPMI_CMD_REG_WRITE; - else if (SPMI_CMD_EXT_WRITE == opc) + } else if (opc == SPMI_CMD_EXT_WRITE) { op_code = SPMI_CMD_EXT_REG_WRITE; - else if (SPMI_CMD_EXT_WRITEL == opc) + } else if (opc == SPMI_CMD_EXT_WRITEL) { op_code = SPMI_CMD_EXT_REG_WRITE_L; - else { + } else { dev_err(spmi_controller->dev, "invalid write cmd 0x%x", opc); return -EINVAL; } - cmd = SPMI_APB_SPMI_CMD_EN |/*lint !e648 !e701 */ /* cmd_en */ - (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) |/*lint !e648 !e701 */ /* cmd_type */ - ((bc-1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) |/*lint !e648 !e701 */ /* byte_cnt */ - ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ - ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ + cmd = SPMI_APB_SPMI_CMD_EN | + (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) | + ((bc - 1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) | + ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ + ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ /* Write data to FIFOs */ - spin_lock_irqsave(&spmi_controller->lock, flags);/*lint !e550 */ + spin_lock_irqsave(&spmi_controller->lock, flags); i = 0; do { memset(&data, 0, sizeof(data)); - if ((bc - i*SPMI_PER_DATAREG_BYTE ) >> 2) {/*lint !e702 */ + if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(&data, buf, sizeof(data)); - buf +=sizeof(data); + buf += sizeof(data); } else { - memcpy(&data, buf, bc%SPMI_PER_DATAREG_BYTE);/*lint !e747 */ - buf +=(bc%SPMI_PER_DATAREG_BYTE); + memcpy(&data, buf, bc % SPMI_PER_DATAREG_BYTE); + buf += (bc % SPMI_PER_DATAREG_BYTE); } - data = Tranverse32(data); - SPMI_WRITEL(spmi_controller->dev, data, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR+SPMI_PER_DATAREG_BYTE*i); + data = bswap_32(data); + writel(data, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); i++; - } while (bc > i*SPMI_PER_DATAREG_BYTE); + } while (bc > i * SPMI_PER_DATAREG_BYTE); /* Start the transaction */ - SPMI_WRITEL(spmi_controller->dev, cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); + writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); spin_unlock_irqrestore(&spmi_controller->lock, flags); if (rc) dev_err(spmi_controller->dev, "spmi write wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", - opc, sid, addr, bc); + opc, sid, addr, bc); return rc; -}/*lint !e438 !e550 !e529*/ -/*lint +e438 -esym(438,*)*/ +} + static int spmi_controller_probe(struct platform_device *pdev) { struct spmi_controller_dev *spmi_controller; @@ -291,11 +278,11 @@ static int spmi_controller_probe(struct platform_device *pdev) struct resource *iores; int ret = 0; - printk(KERN_INFO "HISI SPMI probe\n"); + dev_info(&pdev->dev, "HISI SPMI probe\n"); ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*spmi_controller)); if (!ctrl) { dev_err(&pdev->dev, "can not allocate spmi_controller data\n"); - return -ENOMEM; /*lint !e429*/ + return -ENOMEM; } spmi_controller = spmi_controller_get_drvdata(ctrl); spmi_controller->controller = ctrl; @@ -303,23 +290,24 @@ static int spmi_controller_probe(struct platform_device *pdev) /* NOTE: driver uses the static register mapping */ iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!iores) { - dev_err(&pdev->dev, "can not get resource! \n"); - return -EINVAL; /*lint !e429*/ + dev_err(&pdev->dev, "can not get resource!\n"); + return -EINVAL; } spmi_controller->base = ioremap(iores->start, resource_size(iores)); if (!spmi_controller->base) { - dev_err(&pdev->dev, "can not remap base addr! \n"); - return -EADDRNOTAVAIL; /*lint !e429*/ + dev_err(&pdev->dev, "can not remap base addr!\n"); + return -EADDRNOTAVAIL; } - dev_dbg(&pdev->dev, "spmi_add_controller base addr=0x%lx!\n", (long unsigned int)spmi_controller->base);/*lint !e774*/ + dev_dbg(&pdev->dev, "spmi_add_controller base addr=0x%lx!\n", + (unsigned long)spmi_controller->base); /* Get properties from the device tree */ ret = of_property_read_u32(pdev->dev.of_node, "spmi-channel", - &spmi_controller->channel);/*lint !e838*/ + &spmi_controller->channel); if (ret) { - dev_err(&pdev->dev, "can not get chanel \n"); - return -ENODEV; /*lint !e429*/ + dev_err(&pdev->dev, "can not get chanel\n"); + return -ENODEV; } platform_set_drvdata(pdev, spmi_controller); @@ -342,7 +330,7 @@ static int spmi_controller_probe(struct platform_device *pdev) } err_add_controller: platform_set_drvdata(pdev, NULL); - return ret; /*lint !e429*/ + return ret; } static int spmi_del_controller(struct platform_device *pdev) @@ -354,10 +342,10 @@ static int spmi_del_controller(struct platform_device *pdev) return 0; } -static struct of_device_id spmi_controller_match_table[] = { +static const struct of_device_id spmi_controller_match_table[] = { { .compatible = "hisilicon,spmi-controller", - },/*lint !e785*/ - {}/*lint !e785*/ + }, + {} }; static struct platform_driver spmi_controller_driver = { @@ -365,14 +353,14 @@ static struct platform_driver spmi_controller_driver = { .remove = spmi_del_controller, .driver = { .name = SPMI_CONTROLLER_NAME, - .owner = THIS_MODULE,/*lint !e64*/ + .owner = THIS_MODULE, .of_match_table = spmi_controller_match_table, - },/*lint !e785*/ -};/*lint !e785*/ -/*lint -e528 -esym(528,*)*/ + }, +}; + static int __init spmi_controller_init(void) { - return platform_driver_register(&spmi_controller_driver);/*lint !e64*/ + return platform_driver_register(&spmi_controller_driver); } postcore_initcall(spmi_controller_init); @@ -381,10 +369,7 @@ static void __exit spmi_controller_exit(void) platform_driver_unregister(&spmi_controller_driver); } module_exit(spmi_controller_exit); -/*lint -e753 -esym(753,*)*/ + MODULE_LICENSE("GPL v2"); -MODULE_VERSION("1.0");/*lint !e785 !e64 !e528*/ +MODULE_VERSION("1.0"); MODULE_ALIAS("platform:spmi_controlller"); -/*lint -e753 +esym(753,*)*/ -/*lint -e528 +esym(528,*)*/ - -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 02/44] staging: spmi: hisi-spmi-controller: coding style fixup @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab In order to prepare for upstream, fix most coding style issues. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hisi-spmi-controller.c | 179 ++++++++---------- 1 file changed, 82 insertions(+), 97 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 987526c8b49f..3af0bd1b379f 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/delay.h> #include <linux/err.h> @@ -21,7 +22,7 @@ #define SPMI_SLAVE_OFFSET 0x20 #define SPMI_APB_SPMI_CMD_BASE_ADDR 0x0100 -/*lint -e750 -esym(750,*)*/ + #define SPMI_APB_SPMI_WDATA0_BASE_ADDR 0x0104 #define SPMI_APB_SPMI_WDATA1_BASE_ADDR 0x0108 #define SPMI_APB_SPMI_WDATA2_BASE_ADDR 0x010c @@ -33,25 +34,25 @@ #define SPMI_APB_SPMI_RDATA1_BASE_ADDR 0x0208 #define SPMI_APB_SPMI_RDATA2_BASE_ADDR 0x020c #define SPMI_APB_SPMI_RDATA3_BASE_ADDR 0x0210 -/*lint +e750 -esym(750,*)*/ #define SPMI_PER_DATAREG_BYTE 4 /* * SPMI cmd register */ -#define SPMI_APB_SPMI_CMD_EN (1 << 31) +#define SPMI_APB_SPMI_CMD_EN BIT(31) #define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 #define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 #define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 #define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 -#define Tranverse32(X) ((((u32)(X) & 0xff000000) >> 24) | \ - (((u32)(X) & 0x00ff0000) >> 8) | \ - (((u32)(X) & 0x0000ff00) << 8) | \ - (((u32)(X) & 0x000000ff) << 24)) +#define bswap_32(X) \ + ((((u32)(X) & 0xff000000) >> 24) | \ + (((u32)(X) & 0x00ff0000) >> 8) | \ + (((u32)(X) & 0x0000ff00) << 8) | \ + (((u32)(X) & 0x000000ff) << 24)) /* Command Opcodes */ -/*lint -e749 -esym(749,*)*/ + enum spmi_controller_cmd_op_code { SPMI_CMD_REG_ZERO_WRITE = 0, SPMI_CMD_REG_WRITE = 1, @@ -65,13 +66,12 @@ enum spmi_controller_cmd_op_code { SPMI_CMD_REG_SHUTDOWN = 9, SPMI_CMD_REG_WAKEUP = 10, }; -/*lint +e749 -esym(749,*)*/ /* * SPMI status register */ -#define SPMI_APB_TRANS_DONE (1 << 0) -#define SPMI_APB_TRANS_FAIL (1 << 2) +#define SPMI_APB_TRANS_DONE BIT(0) +#define SPMI_APB_TRANS_FAIL BIT(2) /* Command register fields */ #define SPMI_CONTROLLER_CMD_MAX_BYTE_COUNT 16 @@ -80,16 +80,6 @@ enum spmi_controller_cmd_op_code { #define SPMI_CONTROLLER_TIMEOUT_US 1000 #define SPMI_CONTROLLER_MAX_TRANS_BYTES (16) -#define SPMI_WRITEL( dev, reg, addr ) \ - do { \ - writel( ( reg ), ( addr ) ); \ - } while (0) - -#define SPMI_READL( dev, reg, addr ) \ - do { \ - reg = readl( addr ); \ - } while (0) - /* * @base base address of the PMIC Arbiter core registers. * @rdbase, @wrbase base address of the PMIC Arbiter read core registers. @@ -120,7 +110,7 @@ struct spmi_controller_dev { }; static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, - void __iomem *base, u8 sid, u16 addr) + void __iomem *base, u8 sid, u16 addr) { u32 status = 0; u32 timeout = SPMI_CONTROLLER_TIMEOUT_US; @@ -128,7 +118,7 @@ static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, + SPMI_SLAVE_OFFSET * sid; while (timeout--) { - SPMI_READL(ctrl_dev->dev, status, base + offset);/*lint !e732 */ + status = readl(base + offset); if (status & SPMI_APB_TRANS_DONE) { if (status & SPMI_APB_TRANS_FAIL) { @@ -139,23 +129,23 @@ static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, } return 0; } - udelay(1);/*lint !e778 !e774 !e747*/ + udelay(1); } dev_err(ctrl_dev->dev, "%s: timeout, status 0x%x\n", __func__, status); - return -ETIMEDOUT;/*lint !e438*/ -}/*lint !e715 !e529*/ + return -ETIMEDOUT; +} static int spmi_read_cmd(struct spmi_controller *ctrl, - u8 opc, u8 sid, u16 addr, u8 *buf, size_t bc) + u8 opc, u8 sid, u16 addr, u8 *buf, size_t bc) { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); unsigned long flags; u32 cmd, data; int rc; - u32 chnl_ofst = SPMI_CHANNEL_OFFSET*spmi_controller->channel; + u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; u8 op_code, i; if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { @@ -166,27 +156,26 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, } /* Check the opcode */ - if (SPMI_CMD_READ == opc) + if (opc == SPMI_CMD_READ) { op_code = SPMI_CMD_REG_READ; - else if (SPMI_CMD_EXT_READ == opc) + } else if (opc == SPMI_CMD_EXT_READ) { op_code = SPMI_CMD_EXT_REG_READ; - else if (SPMI_CMD_EXT_READL == opc) + } else if (opc == SPMI_CMD_EXT_READL) { op_code = SPMI_CMD_EXT_REG_READ_L; - else { + } else { dev_err(spmi_controller->dev, "invalid read cmd 0x%x", opc); return -EINVAL; } - cmd = SPMI_APB_SPMI_CMD_EN |/*lint !e648 !e701 */ /* cmd_en */ - (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) |/*lint !e648 !e701 */ /* cmd_type */ - ((bc-1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) |/*lint !e648 !e701 */ /* byte_cnt */ - ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ - ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ + cmd = SPMI_APB_SPMI_CMD_EN | + (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) | + ((bc - 1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) | + ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ + ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ - spin_lock_irqsave(&spmi_controller->lock, flags);/*lint !e550 */ - - SPMI_WRITEL(spmi_controller->dev, cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); + spin_lock_irqsave(&spmi_controller->lock, flags); + writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); if (rc) @@ -194,39 +183,37 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, i = 0; do { - SPMI_READL(spmi_controller->dev, data, spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET*sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i*SPMI_PER_DATAREG_BYTE);/*lint !e732 */ - data = Tranverse32(data); - if ((bc - i*SPMI_PER_DATAREG_BYTE ) >> 2) {/*lint !e702 */ + data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); + data = bswap_32(data); + if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(buf, &data, sizeof(data)); buf += sizeof(data); } else { - memcpy(buf, &data, bc%SPMI_PER_DATAREG_BYTE);/*lint !e747 */ - buf += (bc%SPMI_PER_DATAREG_BYTE); + memcpy(buf, &data, bc % SPMI_PER_DATAREG_BYTE); + buf += (bc % SPMI_PER_DATAREG_BYTE); } i++; - } while (bc > i*SPMI_PER_DATAREG_BYTE); + } while (bc > i * SPMI_PER_DATAREG_BYTE); done: spin_unlock_irqrestore(&spmi_controller->lock, flags); if (rc) dev_err(spmi_controller->dev, "spmi read wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", - opc, sid, addr, bc + 1); + opc, sid, addr, bc + 1); return rc; -}/*lint !e550 !e529*/ +} -/*lint -e438 -esym(438,*)*/ static int spmi_write_cmd(struct spmi_controller *ctrl, - u8 opc, u8 sid, u16 addr, const u8 *buf, size_t bc) + u8 opc, u8 sid, u16 addr, const u8 *buf, size_t bc) { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); unsigned long flags; u32 cmd; u32 data = 0; int rc; - u32 chnl_ofst = SPMI_CHANNEL_OFFSET*spmi_controller->channel; + u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; u8 op_code, i; - if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { dev_err(spmi_controller->dev , "spmi_controller supports 1..%d bytes per trans, but:%ld requested" @@ -235,55 +222,55 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, } /* Check the opcode */ - if (SPMI_CMD_WRITE == opc) + if (opc == SPMI_CMD_WRITE) { op_code = SPMI_CMD_REG_WRITE; - else if (SPMI_CMD_EXT_WRITE == opc) + } else if (opc == SPMI_CMD_EXT_WRITE) { op_code = SPMI_CMD_EXT_REG_WRITE; - else if (SPMI_CMD_EXT_WRITEL == opc) + } else if (opc == SPMI_CMD_EXT_WRITEL) { op_code = SPMI_CMD_EXT_REG_WRITE_L; - else { + } else { dev_err(spmi_controller->dev, "invalid write cmd 0x%x", opc); return -EINVAL; } - cmd = SPMI_APB_SPMI_CMD_EN |/*lint !e648 !e701 */ /* cmd_en */ - (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) |/*lint !e648 !e701 */ /* cmd_type */ - ((bc-1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) |/*lint !e648 !e701 */ /* byte_cnt */ - ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ - ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ + cmd = SPMI_APB_SPMI_CMD_EN | + (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) | + ((bc - 1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) | + ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ + ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ /* Write data to FIFOs */ - spin_lock_irqsave(&spmi_controller->lock, flags);/*lint !e550 */ + spin_lock_irqsave(&spmi_controller->lock, flags); i = 0; do { memset(&data, 0, sizeof(data)); - if ((bc - i*SPMI_PER_DATAREG_BYTE ) >> 2) {/*lint !e702 */ + if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(&data, buf, sizeof(data)); - buf +=sizeof(data); + buf += sizeof(data); } else { - memcpy(&data, buf, bc%SPMI_PER_DATAREG_BYTE);/*lint !e747 */ - buf +=(bc%SPMI_PER_DATAREG_BYTE); + memcpy(&data, buf, bc % SPMI_PER_DATAREG_BYTE); + buf += (bc % SPMI_PER_DATAREG_BYTE); } - data = Tranverse32(data); - SPMI_WRITEL(spmi_controller->dev, data, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR+SPMI_PER_DATAREG_BYTE*i); + data = bswap_32(data); + writel(data, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); i++; - } while (bc > i*SPMI_PER_DATAREG_BYTE); + } while (bc > i * SPMI_PER_DATAREG_BYTE); /* Start the transaction */ - SPMI_WRITEL(spmi_controller->dev, cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); + writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); spin_unlock_irqrestore(&spmi_controller->lock, flags); if (rc) dev_err(spmi_controller->dev, "spmi write wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", - opc, sid, addr, bc); + opc, sid, addr, bc); return rc; -}/*lint !e438 !e550 !e529*/ -/*lint +e438 -esym(438,*)*/ +} + static int spmi_controller_probe(struct platform_device *pdev) { struct spmi_controller_dev *spmi_controller; @@ -291,11 +278,11 @@ static int spmi_controller_probe(struct platform_device *pdev) struct resource *iores; int ret = 0; - printk(KERN_INFO "HISI SPMI probe\n"); + dev_info(&pdev->dev, "HISI SPMI probe\n"); ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*spmi_controller)); if (!ctrl) { dev_err(&pdev->dev, "can not allocate spmi_controller data\n"); - return -ENOMEM; /*lint !e429*/ + return -ENOMEM; } spmi_controller = spmi_controller_get_drvdata(ctrl); spmi_controller->controller = ctrl; @@ -303,23 +290,24 @@ static int spmi_controller_probe(struct platform_device *pdev) /* NOTE: driver uses the static register mapping */ iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!iores) { - dev_err(&pdev->dev, "can not get resource! \n"); - return -EINVAL; /*lint !e429*/ + dev_err(&pdev->dev, "can not get resource!\n"); + return -EINVAL; } spmi_controller->base = ioremap(iores->start, resource_size(iores)); if (!spmi_controller->base) { - dev_err(&pdev->dev, "can not remap base addr! \n"); - return -EADDRNOTAVAIL; /*lint !e429*/ + dev_err(&pdev->dev, "can not remap base addr!\n"); + return -EADDRNOTAVAIL; } - dev_dbg(&pdev->dev, "spmi_add_controller base addr=0x%lx!\n", (long unsigned int)spmi_controller->base);/*lint !e774*/ + dev_dbg(&pdev->dev, "spmi_add_controller base addr=0x%lx!\n", + (unsigned long)spmi_controller->base); /* Get properties from the device tree */ ret = of_property_read_u32(pdev->dev.of_node, "spmi-channel", - &spmi_controller->channel);/*lint !e838*/ + &spmi_controller->channel); if (ret) { - dev_err(&pdev->dev, "can not get chanel \n"); - return -ENODEV; /*lint !e429*/ + dev_err(&pdev->dev, "can not get chanel\n"); + return -ENODEV; } platform_set_drvdata(pdev, spmi_controller); @@ -342,7 +330,7 @@ static int spmi_controller_probe(struct platform_device *pdev) } err_add_controller: platform_set_drvdata(pdev, NULL); - return ret; /*lint !e429*/ + return ret; } static int spmi_del_controller(struct platform_device *pdev) @@ -354,10 +342,10 @@ static int spmi_del_controller(struct platform_device *pdev) return 0; } -static struct of_device_id spmi_controller_match_table[] = { +static const struct of_device_id spmi_controller_match_table[] = { { .compatible = "hisilicon,spmi-controller", - },/*lint !e785*/ - {}/*lint !e785*/ + }, + {} }; static struct platform_driver spmi_controller_driver = { @@ -365,14 +353,14 @@ static struct platform_driver spmi_controller_driver = { .remove = spmi_del_controller, .driver = { .name = SPMI_CONTROLLER_NAME, - .owner = THIS_MODULE,/*lint !e64*/ + .owner = THIS_MODULE, .of_match_table = spmi_controller_match_table, - },/*lint !e785*/ -};/*lint !e785*/ -/*lint -e528 -esym(528,*)*/ + }, +}; + static int __init spmi_controller_init(void) { - return platform_driver_register(&spmi_controller_driver);/*lint !e64*/ + return platform_driver_register(&spmi_controller_driver); } postcore_initcall(spmi_controller_init); @@ -381,10 +369,7 @@ static void __exit spmi_controller_exit(void) platform_driver_unregister(&spmi_controller_driver); } module_exit(spmi_controller_exit); -/*lint -e753 -esym(753,*)*/ + MODULE_LICENSE("GPL v2"); -MODULE_VERSION("1.0");/*lint !e785 !e64 !e528*/ +MODULE_VERSION("1.0"); MODULE_ALIAS("platform:spmi_controlller"); -/*lint -e753 +esym(753,*)*/ -/*lint -e528 +esym(528,*)*/ - -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 03/44] staging: spmi: hisi-spmi-controller: fix it to probe successfully 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Add a MODULE_DEVICE_TABLE() to the driver. Also, the current logic calls platform_set_drvdata(pdev, NULL) if the driver succeeds loading. While here, remove the .owner, as it is not needed upstream anymore. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hisi-spmi-controller.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 3af0bd1b379f..bc6847f9a5e7 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -324,11 +324,14 @@ static int spmi_controller_probe(struct platform_device *pdev) ctrl->write_cmd = spmi_write_cmd; ret = spmi_controller_add(ctrl); - if (ret) { - dev_err(&pdev->dev, "spmi_add_controller failed!\n"); + if (ret) goto err_add_controller; - } + + dev_info(&pdev->dev, "spmi_add_controller initialized\n"); + return 0; + err_add_controller: + dev_err(&pdev->dev, "spmi_add_controller failed!\n"); platform_set_drvdata(pdev, NULL); return ret; } @@ -347,13 +350,13 @@ static const struct of_device_id spmi_controller_match_table[] = { }, {} }; +MODULE_DEVICE_TABLE(of, spmi_controller_match_table); static struct platform_driver spmi_controller_driver = { .probe = spmi_controller_probe, .remove = spmi_del_controller, .driver = { .name = SPMI_CONTROLLER_NAME, - .owner = THIS_MODULE, .of_match_table = spmi_controller_match_table, }, }; -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 03/44] staging: spmi: hisi-spmi-controller: fix it to probe successfully @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Add a MODULE_DEVICE_TABLE() to the driver. Also, the current logic calls platform_set_drvdata(pdev, NULL) if the driver succeeds loading. While here, remove the .owner, as it is not needed upstream anymore. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hisi-spmi-controller.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 3af0bd1b379f..bc6847f9a5e7 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -324,11 +324,14 @@ static int spmi_controller_probe(struct platform_device *pdev) ctrl->write_cmd = spmi_write_cmd; ret = spmi_controller_add(ctrl); - if (ret) { - dev_err(&pdev->dev, "spmi_add_controller failed!\n"); + if (ret) goto err_add_controller; - } + + dev_info(&pdev->dev, "spmi_add_controller initialized\n"); + return 0; + err_add_controller: + dev_err(&pdev->dev, "spmi_add_controller failed!\n"); platform_set_drvdata(pdev, NULL); return ret; } @@ -347,13 +350,13 @@ static const struct of_device_id spmi_controller_match_table[] = { }, {} }; +MODULE_DEVICE_TABLE(of, spmi_controller_match_table); static struct platform_driver spmi_controller_driver = { .probe = spmi_controller_probe, .remove = spmi_del_controller, .driver = { .name = SPMI_CONTROLLER_NAME, - .owner = THIS_MODULE, .of_match_table = spmi_controller_match_table, }, }; -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 04/44] staging: spmi: hisi-spmi-controller: fix a typo 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel chanel -> channel Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hisi-spmi-controller.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index bc6847f9a5e7..99cf757d76fe 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -306,7 +306,7 @@ static int spmi_controller_probe(struct platform_device *pdev) ret = of_property_read_u32(pdev->dev.of_node, "spmi-channel", &spmi_controller->channel); if (ret) { - dev_err(&pdev->dev, "can not get chanel\n"); + dev_err(&pdev->dev, "can not get channel\n"); return -ENODEV; } -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 04/44] staging: spmi: hisi-spmi-controller: fix a typo @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab chanel -> channel Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hisi-spmi-controller.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index bc6847f9a5e7..99cf757d76fe 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -306,7 +306,7 @@ static int spmi_controller_probe(struct platform_device *pdev) ret = of_property_read_u32(pdev->dev.of_node, "spmi-channel", &spmi_controller->channel); if (ret) { - dev_err(&pdev->dev, "can not get chanel\n"); + dev_err(&pdev->dev, "can not get channel\n"); return -ENODEV; } -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 05/44] staging: spmi: hisi-spmi-controller: adjust whitespaces at defines 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Some defines are not aligned with tab=8, which is the style defined on Linux. Adjust them. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hisi-spmi-controller.c | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 99cf757d76fe..7fae267a6062 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -18,10 +18,10 @@ /* * SPMI register addr */ -#define SPMI_CHANNEL_OFFSET 0x0300 -#define SPMI_SLAVE_OFFSET 0x20 +#define SPMI_CHANNEL_OFFSET 0x0300 +#define SPMI_SLAVE_OFFSET 0x20 -#define SPMI_APB_SPMI_CMD_BASE_ADDR 0x0100 +#define SPMI_APB_SPMI_CMD_BASE_ADDR 0x0100 #define SPMI_APB_SPMI_WDATA0_BASE_ADDR 0x0104 #define SPMI_APB_SPMI_WDATA1_BASE_ADDR 0x0108 @@ -35,21 +35,21 @@ #define SPMI_APB_SPMI_RDATA2_BASE_ADDR 0x020c #define SPMI_APB_SPMI_RDATA3_BASE_ADDR 0x0210 -#define SPMI_PER_DATAREG_BYTE 4 +#define SPMI_PER_DATAREG_BYTE 4 /* * SPMI cmd register */ -#define SPMI_APB_SPMI_CMD_EN BIT(31) +#define SPMI_APB_SPMI_CMD_EN BIT(31) #define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 #define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 -#define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 -#define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 #define bswap_32(X) \ ((((u32)(X) & 0xff000000) >> 24) | \ (((u32)(X) & 0x00ff0000) >> 8) | \ (((u32)(X) & 0x0000ff00) << 8) | \ (((u32)(X) & 0x000000ff) << 24)) +#define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 +#define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 /* Command Opcodes */ @@ -70,15 +70,15 @@ enum spmi_controller_cmd_op_code { /* * SPMI status register */ -#define SPMI_APB_TRANS_DONE BIT(0) -#define SPMI_APB_TRANS_FAIL BIT(2) +#define SPMI_APB_TRANS_DONE BIT(0) +#define SPMI_APB_TRANS_FAIL BIT(2) /* Command register fields */ #define SPMI_CONTROLLER_CMD_MAX_BYTE_COUNT 16 /* Maximum number of support PMIC peripherals */ #define SPMI_CONTROLLER_TIMEOUT_US 1000 -#define SPMI_CONTROLLER_MAX_TRANS_BYTES (16) +#define SPMI_CONTROLLER_MAX_TRANS_BYTES 16 /* * @base base address of the PMIC Arbiter core registers. @@ -114,8 +114,10 @@ static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, { u32 status = 0; u32 timeout = SPMI_CONTROLLER_TIMEOUT_US; - u32 offset = SPMI_APB_SPMI_STATUS_BASE_ADDR + SPMI_CHANNEL_OFFSET * ctrl_dev->channel - + SPMI_SLAVE_OFFSET * sid; + u32 offset; + + offset = SPMI_APB_SPMI_STATUS_BASE_ADDR; + offset += SPMI_CHANNEL_OFFSET * ctrl_dev->channel + SPMI_SLAVE_OFFSET * sid; while (timeout--) { status = readl(base + offset); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 05/44] staging: spmi: hisi-spmi-controller: adjust whitespaces at defines @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Some defines are not aligned with tab=8, which is the style defined on Linux. Adjust them. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hisi-spmi-controller.c | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 99cf757d76fe..7fae267a6062 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -18,10 +18,10 @@ /* * SPMI register addr */ -#define SPMI_CHANNEL_OFFSET 0x0300 -#define SPMI_SLAVE_OFFSET 0x20 +#define SPMI_CHANNEL_OFFSET 0x0300 +#define SPMI_SLAVE_OFFSET 0x20 -#define SPMI_APB_SPMI_CMD_BASE_ADDR 0x0100 +#define SPMI_APB_SPMI_CMD_BASE_ADDR 0x0100 #define SPMI_APB_SPMI_WDATA0_BASE_ADDR 0x0104 #define SPMI_APB_SPMI_WDATA1_BASE_ADDR 0x0108 @@ -35,21 +35,21 @@ #define SPMI_APB_SPMI_RDATA2_BASE_ADDR 0x020c #define SPMI_APB_SPMI_RDATA3_BASE_ADDR 0x0210 -#define SPMI_PER_DATAREG_BYTE 4 +#define SPMI_PER_DATAREG_BYTE 4 /* * SPMI cmd register */ -#define SPMI_APB_SPMI_CMD_EN BIT(31) +#define SPMI_APB_SPMI_CMD_EN BIT(31) #define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 #define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 -#define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 -#define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 #define bswap_32(X) \ ((((u32)(X) & 0xff000000) >> 24) | \ (((u32)(X) & 0x00ff0000) >> 8) | \ (((u32)(X) & 0x0000ff00) << 8) | \ (((u32)(X) & 0x000000ff) << 24)) +#define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 +#define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 /* Command Opcodes */ @@ -70,15 +70,15 @@ enum spmi_controller_cmd_op_code { /* * SPMI status register */ -#define SPMI_APB_TRANS_DONE BIT(0) -#define SPMI_APB_TRANS_FAIL BIT(2) +#define SPMI_APB_TRANS_DONE BIT(0) +#define SPMI_APB_TRANS_FAIL BIT(2) /* Command register fields */ #define SPMI_CONTROLLER_CMD_MAX_BYTE_COUNT 16 /* Maximum number of support PMIC peripherals */ #define SPMI_CONTROLLER_TIMEOUT_US 1000 -#define SPMI_CONTROLLER_MAX_TRANS_BYTES (16) +#define SPMI_CONTROLLER_MAX_TRANS_BYTES 16 /* * @base base address of the PMIC Arbiter core registers. @@ -114,8 +114,10 @@ static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, { u32 status = 0; u32 timeout = SPMI_CONTROLLER_TIMEOUT_US; - u32 offset = SPMI_APB_SPMI_STATUS_BASE_ADDR + SPMI_CHANNEL_OFFSET * ctrl_dev->channel - + SPMI_SLAVE_OFFSET * sid; + u32 offset; + + offset = SPMI_APB_SPMI_STATUS_BASE_ADDR; + offset += SPMI_CHANNEL_OFFSET * ctrl_dev->channel + SPMI_SLAVE_OFFSET * sid; while (timeout--) { status = readl(base + offset); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 06/44] staging: spmi: hisi-spmi-controller: use le32 macros where needed 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Instead of manually using bswap_32(), just use the le32 macros. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hisi-spmi-controller.c | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 7fae267a6062..cacd28150b49 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -11,7 +11,6 @@ #include <linux/module.h> #include <linux/seq_file.h> #include <linux/spmi.h> -#include <linux/spmi.h> #define SPMI_CONTROLLER_NAME "spmi_controller" @@ -43,11 +42,6 @@ #define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 #define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 -#define bswap_32(X) \ - ((((u32)(X) & 0xff000000) >> 24) | \ - (((u32)(X) & 0x00ff0000) >> 8) | \ - (((u32)(X) & 0x0000ff00) << 8) | \ - (((u32)(X) & 0x000000ff) << 24)) #define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 #define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 @@ -179,14 +173,15 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); - rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); + rc = spmi_controller_wait_for_done(spmi_controller, + spmi_controller->base, sid, addr); if (rc) goto done; i = 0; do { data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); - data = bswap_32(data); + data = be32_to_cpu((__be32)data); if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(buf, &data, sizeof(data)); buf += sizeof(data); @@ -210,8 +205,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); unsigned long flags; - u32 cmd; - u32 data = 0; + u32 cmd, data; int rc; u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; u8 op_code, i; @@ -246,7 +240,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, i = 0; do { - memset(&data, 0, sizeof(data)); + data = 0; if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(&data, buf, sizeof(data)); buf += sizeof(data); @@ -255,8 +249,8 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, buf += (bc % SPMI_PER_DATAREG_BYTE); } - data = bswap_32(data); - writel(data, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); + writel((u32)cpu_to_be32(data), + spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); i++; } while (bc > i * SPMI_PER_DATAREG_BYTE); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 06/44] staging: spmi: hisi-spmi-controller: use le32 macros where needed @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Instead of manually using bswap_32(), just use the le32 macros. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hisi-spmi-controller.c | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 7fae267a6062..cacd28150b49 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -11,7 +11,6 @@ #include <linux/module.h> #include <linux/seq_file.h> #include <linux/spmi.h> -#include <linux/spmi.h> #define SPMI_CONTROLLER_NAME "spmi_controller" @@ -43,11 +42,6 @@ #define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 #define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 -#define bswap_32(X) \ - ((((u32)(X) & 0xff000000) >> 24) | \ - (((u32)(X) & 0x00ff0000) >> 8) | \ - (((u32)(X) & 0x0000ff00) << 8) | \ - (((u32)(X) & 0x000000ff) << 24)) #define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 #define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 @@ -179,14 +173,15 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); - rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); + rc = spmi_controller_wait_for_done(spmi_controller, + spmi_controller->base, sid, addr); if (rc) goto done; i = 0; do { data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); - data = bswap_32(data); + data = be32_to_cpu((__be32)data); if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(buf, &data, sizeof(data)); buf += sizeof(data); @@ -210,8 +205,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); unsigned long flags; - u32 cmd; - u32 data = 0; + u32 cmd, data; int rc; u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; u8 op_code, i; @@ -246,7 +240,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, i = 0; do { - memset(&data, 0, sizeof(data)); + data = 0; if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(&data, buf, sizeof(data)); buf += sizeof(data); @@ -255,8 +249,8 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, buf += (bc % SPMI_PER_DATAREG_BYTE); } - data = bswap_32(data); - writel(data, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); + writel((u32)cpu_to_be32(data), + spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); i++; } while (bc > i * SPMI_PER_DATAREG_BYTE); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* Re: [PATCH 06/44] staging: spmi: hisi-spmi-controller: use le32 macros where needed 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 16:21 ` Joe Perches -1 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 16:21 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linuxarm, mauro.chehab, Greg Kroah-Hartman, linux-kernel, devel On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > Instead of manually using bswap_32(), just use the > le32 macros. Are you certain this code will now work on any endian cpu? Maybe just use __swab32 instead > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c [] > @@ -43,11 +42,6 @@ > #define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 > #define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 > > -#define bswap_32(X) \ > - ((((u32)(X) & 0xff000000) >> 24) | \ > - (((u32)(X) & 0x00ff0000) >> 8) | \ > - (((u32)(X) & 0x0000ff00) << 8) | \ > - (((u32)(X) & 0x000000ff) << 24)) > #define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 > #define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 > > @@ -179,14 +173,15 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > > writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); > > - rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); > + rc = spmi_controller_wait_for_done(spmi_controller, > + spmi_controller->base, sid, addr); > if (rc) > goto done; > > i = 0; > do { > data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); > - data = bswap_32(data); > + data = be32_to_cpu((__be32)data); > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > memcpy(buf, &data, sizeof(data)); > buf += sizeof(data); > @@ -210,8 +205,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > { > struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); > unsigned long flags; > - u32 cmd; > - u32 data = 0; > + u32 cmd, data; > int rc; > u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; > u8 op_code, i; > @@ -246,7 +240,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > i = 0; > do { > - memset(&data, 0, sizeof(data)); > + data = 0; > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > memcpy(&data, buf, sizeof(data)); > buf += sizeof(data); > @@ -255,8 +249,8 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > buf += (bc % SPMI_PER_DATAREG_BYTE); > } > > - data = bswap_32(data); > - writel(data, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > + writel((u32)cpu_to_be32(data), > + spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > i++; > } while (bc > i * SPMI_PER_DATAREG_BYTE); > ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 06/44] staging: spmi: hisi-spmi-controller: use le32 macros where needed @ 2020-08-12 16:21 ` Joe Perches 0 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 16:21 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: mauro.chehab, Greg Kroah-Hartman, devel, linuxarm, linux-kernel On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > Instead of manually using bswap_32(), just use the > le32 macros. Are you certain this code will now work on any endian cpu? Maybe just use __swab32 instead > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c [] > @@ -43,11 +42,6 @@ > #define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 > #define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 > > -#define bswap_32(X) \ > - ((((u32)(X) & 0xff000000) >> 24) | \ > - (((u32)(X) & 0x00ff0000) >> 8) | \ > - (((u32)(X) & 0x0000ff00) << 8) | \ > - (((u32)(X) & 0x000000ff) << 24)) > #define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 > #define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 > > @@ -179,14 +173,15 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > > writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); > > - rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); > + rc = spmi_controller_wait_for_done(spmi_controller, > + spmi_controller->base, sid, addr); > if (rc) > goto done; > > i = 0; > do { > data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); > - data = bswap_32(data); > + data = be32_to_cpu((__be32)data); > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > memcpy(buf, &data, sizeof(data)); > buf += sizeof(data); > @@ -210,8 +205,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > { > struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); > unsigned long flags; > - u32 cmd; > - u32 data = 0; > + u32 cmd, data; > int rc; > u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; > u8 op_code, i; > @@ -246,7 +240,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > i = 0; > do { > - memset(&data, 0, sizeof(data)); > + data = 0; > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > memcpy(&data, buf, sizeof(data)); > buf += sizeof(data); > @@ -255,8 +249,8 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > buf += (bc % SPMI_PER_DATAREG_BYTE); > } > > - data = bswap_32(data); > - writel(data, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > + writel((u32)cpu_to_be32(data), > + spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > i++; > } while (bc > i * SPMI_PER_DATAREG_BYTE); > _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 06/44] staging: spmi: hisi-spmi-controller: use le32 macros where needed 2020-08-12 16:21 ` Joe Perches @ 2020-08-12 19:02 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 19:02 UTC (permalink / raw) To: Joe Perches Cc: linuxarm, mauro.chehab, Greg Kroah-Hartman, linux-kernel, devel Em Wed, 12 Aug 2020 09:21:54 -0700 Joe Perches <joe@perches.com> escreveu: > On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > > Instead of manually using bswap_32(), just use the > > le32 macros. > > Are you certain this code will now work on any endian cpu? > > Maybe just use __swab32 instead Well, I didn't test, because this driver is for an specific hardware (arm64). Yet, what happens in practice is that just one byte is written by the PMIC drivers. If the order is not LE, the byte written at the buffer will always be zero. > > > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c > [] > > @@ -43,11 +42,6 @@ > > #define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 > > #define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 > > > > -#define bswap_32(X) \ > > - ((((u32)(X) & 0xff000000) >> 24) | \ > > - (((u32)(X) & 0x00ff0000) >> 8) | \ > > - (((u32)(X) & 0x0000ff00) << 8) | \ > > - (((u32)(X) & 0x000000ff) << 24)) > > #define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 > > #define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 > > > > @@ -179,14 +173,15 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > > > > writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); > > > > - rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); > > + rc = spmi_controller_wait_for_done(spmi_controller, > > + spmi_controller->base, sid, addr); > > if (rc) > > goto done; > > > > i = 0; > > do { > > data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); > > - data = bswap_32(data); > > + data = be32_to_cpu((__be32)data); > > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > > memcpy(buf, &data, sizeof(data)); > > buf += sizeof(data); > > @@ -210,8 +205,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > { > > struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); > > unsigned long flags; > > - u32 cmd; > > - u32 data = 0; > > + u32 cmd, data; > > int rc; > > u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; > > u8 op_code, i; > > @@ -246,7 +240,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > > > i = 0; > > do { > > - memset(&data, 0, sizeof(data)); > > + data = 0; > > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > > memcpy(&data, buf, sizeof(data)); > > buf += sizeof(data); > > @@ -255,8 +249,8 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > buf += (bc % SPMI_PER_DATAREG_BYTE); > > } > > > > - data = bswap_32(data); > > - writel(data, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > > + writel((u32)cpu_to_be32(data), > > + spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > > i++; > > } while (bc > i * SPMI_PER_DATAREG_BYTE); > > > ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 06/44] staging: spmi: hisi-spmi-controller: use le32 macros where needed @ 2020-08-12 19:02 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 19:02 UTC (permalink / raw) To: Joe Perches Cc: mauro.chehab, Greg Kroah-Hartman, devel, linuxarm, linux-kernel Em Wed, 12 Aug 2020 09:21:54 -0700 Joe Perches <joe@perches.com> escreveu: > On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > > Instead of manually using bswap_32(), just use the > > le32 macros. > > Are you certain this code will now work on any endian cpu? > > Maybe just use __swab32 instead Well, I didn't test, because this driver is for an specific hardware (arm64). Yet, what happens in practice is that just one byte is written by the PMIC drivers. If the order is not LE, the byte written at the buffer will always be zero. > > > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c > [] > > @@ -43,11 +42,6 @@ > > #define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 > > #define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 > > > > -#define bswap_32(X) \ > > - ((((u32)(X) & 0xff000000) >> 24) | \ > > - (((u32)(X) & 0x00ff0000) >> 8) | \ > > - (((u32)(X) & 0x0000ff00) << 8) | \ > > - (((u32)(X) & 0x000000ff) << 24)) > > #define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 > > #define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 > > > > @@ -179,14 +173,15 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > > > > writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); > > > > - rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); > > + rc = spmi_controller_wait_for_done(spmi_controller, > > + spmi_controller->base, sid, addr); > > if (rc) > > goto done; > > > > i = 0; > > do { > > data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); > > - data = bswap_32(data); > > + data = be32_to_cpu((__be32)data); > > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > > memcpy(buf, &data, sizeof(data)); > > buf += sizeof(data); > > @@ -210,8 +205,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > { > > struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); > > unsigned long flags; > > - u32 cmd; > > - u32 data = 0; > > + u32 cmd, data; > > int rc; > > u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; > > u8 op_code, i; > > @@ -246,7 +240,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > > > i = 0; > > do { > > - memset(&data, 0, sizeof(data)); > > + data = 0; > > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > > memcpy(&data, buf, sizeof(data)); > > buf += sizeof(data); > > @@ -255,8 +249,8 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > buf += (bc % SPMI_PER_DATAREG_BYTE); > > } > > > > - data = bswap_32(data); > > - writel(data, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > > + writel((u32)cpu_to_be32(data), > > + spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > > i++; > > } while (bc > i * SPMI_PER_DATAREG_BYTE); > > > _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* [PATCH 07/44] staging: spmi: hisi-spmi-controller: add debug when values are read/write 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel It is interesting to be able to check if the driver is doing the right thing. So, add some debug macros to allow checking it. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hisi-spmi-controller.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index cacd28150b49..e996114bc717 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -41,7 +41,6 @@ #define SPMI_APB_SPMI_CMD_EN BIT(31) #define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 #define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 - #define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 #define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 @@ -135,10 +134,11 @@ static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, } static int spmi_read_cmd(struct spmi_controller *ctrl, - u8 opc, u8 sid, u16 addr, u8 *buf, size_t bc) + u8 opc, u8 sid, u16 addr, u8 *__buf, size_t bc) { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); unsigned long flags; + u8 *buf = __buf; u32 cmd, data; int rc; u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; @@ -197,13 +197,18 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, if (rc) dev_err(spmi_controller->dev, "spmi read wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", opc, sid, addr, bc + 1); + else + dev_dbg(spmi_controller->dev, "%s: id:%d addr:0x%x, read value: %*ph\n", + __func__, sid, addr, (int)bc, __buf); + return rc; } static int spmi_write_cmd(struct spmi_controller *ctrl, - u8 opc, u8 sid, u16 addr, const u8 *buf, size_t bc) + u8 opc, u8 sid, u16 addr, const u8 *__buf, size_t bc) { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); + const u8 *buf = __buf; unsigned long flags; u32 cmd, data; int rc; @@ -263,6 +268,9 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, if (rc) dev_err(spmi_controller->dev, "spmi write wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", opc, sid, addr, bc); + else + dev_dbg(spmi_controller->dev, "%s: id:%d addr:0x%x, wrote value: %*ph\n", + __func__, sid, addr, (int)bc, __buf); return rc; } @@ -275,6 +283,7 @@ static int spmi_controller_probe(struct platform_device *pdev) int ret = 0; dev_info(&pdev->dev, "HISI SPMI probe\n"); + ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*spmi_controller)); if (!ctrl) { dev_err(&pdev->dev, "can not allocate spmi_controller data\n"); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 07/44] staging: spmi: hisi-spmi-controller: add debug when values are read/write @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab It is interesting to be able to check if the driver is doing the right thing. So, add some debug macros to allow checking it. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hisi-spmi-controller.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index cacd28150b49..e996114bc717 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -41,7 +41,6 @@ #define SPMI_APB_SPMI_CMD_EN BIT(31) #define SPMI_APB_SPMI_CMD_TYPE_OFFSET 24 #define SPMI_APB_SPMI_CMD_LENGTH_OFFSET 20 - #define SPMI_APB_SPMI_CMD_SLAVEID_OFFSET 16 #define SPMI_APB_SPMI_CMD_ADDR_OFFSET 0 @@ -135,10 +134,11 @@ static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, } static int spmi_read_cmd(struct spmi_controller *ctrl, - u8 opc, u8 sid, u16 addr, u8 *buf, size_t bc) + u8 opc, u8 sid, u16 addr, u8 *__buf, size_t bc) { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); unsigned long flags; + u8 *buf = __buf; u32 cmd, data; int rc; u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; @@ -197,13 +197,18 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, if (rc) dev_err(spmi_controller->dev, "spmi read wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", opc, sid, addr, bc + 1); + else + dev_dbg(spmi_controller->dev, "%s: id:%d addr:0x%x, read value: %*ph\n", + __func__, sid, addr, (int)bc, __buf); + return rc; } static int spmi_write_cmd(struct spmi_controller *ctrl, - u8 opc, u8 sid, u16 addr, const u8 *buf, size_t bc) + u8 opc, u8 sid, u16 addr, const u8 *__buf, size_t bc) { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); + const u8 *buf = __buf; unsigned long flags; u32 cmd, data; int rc; @@ -263,6 +268,9 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, if (rc) dev_err(spmi_controller->dev, "spmi write wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", opc, sid, addr, bc); + else + dev_dbg(spmi_controller->dev, "%s: id:%d addr:0x%x, wrote value: %*ph\n", + __func__, sid, addr, (int)bc, __buf); return rc; } @@ -275,6 +283,7 @@ static int spmi_controller_probe(struct platform_device *pdev) int ret = 0; dev_info(&pdev->dev, "HISI SPMI probe\n"); + ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*spmi_controller)); if (!ctrl) { dev_err(&pdev->dev, "can not allocate spmi_controller data\n"); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 08/44] staging: spmi: hisi-spmi-controller: fix the dev_foo() logic 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Right now, driver is printing some messages as: [ 33.833026] (NULL device *): spmi_read_cmd: id:0 addr:0x17, read value: 00 This is because dev_foo() are not using a device with a name set. Change the logic for it to print it right. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hisi-spmi-controller.c | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index e996114bc717..153bcdb0cde4 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -102,7 +102,8 @@ struct spmi_controller_dev { u32 channel; }; -static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, +static int spmi_controller_wait_for_done(struct device *dev, + struct spmi_controller_dev *ctrl_dev, void __iomem *base, u8 sid, u16 addr) { u32 status = 0; @@ -117,19 +118,17 @@ static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, if (status & SPMI_APB_TRANS_DONE) { if (status & SPMI_APB_TRANS_FAIL) { - dev_err(ctrl_dev->dev, - "%s: transaction failed (0x%x)\n", + dev_err(dev, "%s: transaction failed (0x%x)\n", __func__, status); return -EIO; } + dev_dbg(dev, "%s: status 0x%x\n", __func__, status); return 0; } udelay(1); } - dev_err(ctrl_dev->dev, - "%s: timeout, status 0x%x\n", - __func__, status); + dev_err(dev, "%s: timeout, status 0x%x\n", __func__, status); return -ETIMEDOUT; } @@ -145,9 +144,9 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, u8 op_code, i; if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { - dev_err(spmi_controller->dev - , "spmi_controller supports 1..%d bytes per trans, but:%ld requested" - , SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); + dev_err(&ctrl->dev, + "spmi_controller supports 1..%d bytes per trans, but:%ld requested", + SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); return -EINVAL; } @@ -159,7 +158,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, } else if (opc == SPMI_CMD_EXT_READL) { op_code = SPMI_CMD_EXT_REG_READ_L; } else { - dev_err(spmi_controller->dev, "invalid read cmd 0x%x", opc); + dev_err(&ctrl->dev, "invalid read cmd 0x%x", opc); return -EINVAL; } @@ -173,7 +172,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); - rc = spmi_controller_wait_for_done(spmi_controller, + rc = spmi_controller_wait_for_done(&ctrl->dev, spmi_controller, spmi_controller->base, sid, addr); if (rc) goto done; @@ -195,10 +194,11 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, done: spin_unlock_irqrestore(&spmi_controller->lock, flags); if (rc) - dev_err(spmi_controller->dev, "spmi read wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", + dev_err(&ctrl->dev, + "spmi read wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", opc, sid, addr, bc + 1); else - dev_dbg(spmi_controller->dev, "%s: id:%d addr:0x%x, read value: %*ph\n", + dev_dbg(&ctrl->dev, "%s: id:%d addr:0x%x, read value: %*ph\n", __func__, sid, addr, (int)bc, __buf); return rc; @@ -216,9 +216,9 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, u8 op_code, i; if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { - dev_err(spmi_controller->dev - , "spmi_controller supports 1..%d bytes per trans, but:%ld requested" - , SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); + dev_err(&ctrl->dev, + "spmi_controller supports 1..%d bytes per trans, but:%ld requested", + SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); return -EINVAL; } @@ -230,7 +230,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, } else if (opc == SPMI_CMD_EXT_WRITEL) { op_code = SPMI_CMD_EXT_REG_WRITE_L; } else { - dev_err(spmi_controller->dev, "invalid write cmd 0x%x", opc); + dev_err(&ctrl->dev, "invalid write cmd 0x%x", opc); return -EINVAL; } @@ -262,14 +262,15 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, /* Start the transaction */ writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); - rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); + rc = spmi_controller_wait_for_done(&ctrl->dev, spmi_controller, + spmi_controller->base, sid, addr); spin_unlock_irqrestore(&spmi_controller->lock, flags); if (rc) - dev_err(spmi_controller->dev, "spmi write wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", + dev_err(&ctrl->dev, "spmi write wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", opc, sid, addr, bc); else - dev_dbg(spmi_controller->dev, "%s: id:%d addr:0x%x, wrote value: %*ph\n", + dev_dbg(&ctrl->dev, "%s: id:%d addr:0x%x, wrote value: %*ph\n", __func__, sid, addr, (int)bc, __buf); return rc; -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 08/44] staging: spmi: hisi-spmi-controller: fix the dev_foo() logic @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Right now, driver is printing some messages as: [ 33.833026] (NULL device *): spmi_read_cmd: id:0 addr:0x17, read value: 00 This is because dev_foo() are not using a device with a name set. Change the logic for it to print it right. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hisi-spmi-controller.c | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index e996114bc717..153bcdb0cde4 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -102,7 +102,8 @@ struct spmi_controller_dev { u32 channel; }; -static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, +static int spmi_controller_wait_for_done(struct device *dev, + struct spmi_controller_dev *ctrl_dev, void __iomem *base, u8 sid, u16 addr) { u32 status = 0; @@ -117,19 +118,17 @@ static int spmi_controller_wait_for_done(struct spmi_controller_dev *ctrl_dev, if (status & SPMI_APB_TRANS_DONE) { if (status & SPMI_APB_TRANS_FAIL) { - dev_err(ctrl_dev->dev, - "%s: transaction failed (0x%x)\n", + dev_err(dev, "%s: transaction failed (0x%x)\n", __func__, status); return -EIO; } + dev_dbg(dev, "%s: status 0x%x\n", __func__, status); return 0; } udelay(1); } - dev_err(ctrl_dev->dev, - "%s: timeout, status 0x%x\n", - __func__, status); + dev_err(dev, "%s: timeout, status 0x%x\n", __func__, status); return -ETIMEDOUT; } @@ -145,9 +144,9 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, u8 op_code, i; if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { - dev_err(spmi_controller->dev - , "spmi_controller supports 1..%d bytes per trans, but:%ld requested" - , SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); + dev_err(&ctrl->dev, + "spmi_controller supports 1..%d bytes per trans, but:%ld requested", + SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); return -EINVAL; } @@ -159,7 +158,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, } else if (opc == SPMI_CMD_EXT_READL) { op_code = SPMI_CMD_EXT_REG_READ_L; } else { - dev_err(spmi_controller->dev, "invalid read cmd 0x%x", opc); + dev_err(&ctrl->dev, "invalid read cmd 0x%x", opc); return -EINVAL; } @@ -173,7 +172,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); - rc = spmi_controller_wait_for_done(spmi_controller, + rc = spmi_controller_wait_for_done(&ctrl->dev, spmi_controller, spmi_controller->base, sid, addr); if (rc) goto done; @@ -195,10 +194,11 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, done: spin_unlock_irqrestore(&spmi_controller->lock, flags); if (rc) - dev_err(spmi_controller->dev, "spmi read wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", + dev_err(&ctrl->dev, + "spmi read wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", opc, sid, addr, bc + 1); else - dev_dbg(spmi_controller->dev, "%s: id:%d addr:0x%x, read value: %*ph\n", + dev_dbg(&ctrl->dev, "%s: id:%d addr:0x%x, read value: %*ph\n", __func__, sid, addr, (int)bc, __buf); return rc; @@ -216,9 +216,9 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, u8 op_code, i; if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { - dev_err(spmi_controller->dev - , "spmi_controller supports 1..%d bytes per trans, but:%ld requested" - , SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); + dev_err(&ctrl->dev, + "spmi_controller supports 1..%d bytes per trans, but:%ld requested", + SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); return -EINVAL; } @@ -230,7 +230,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, } else if (opc == SPMI_CMD_EXT_WRITEL) { op_code = SPMI_CMD_EXT_REG_WRITE_L; } else { - dev_err(spmi_controller->dev, "invalid write cmd 0x%x", opc); + dev_err(&ctrl->dev, "invalid write cmd 0x%x", opc); return -EINVAL; } @@ -262,14 +262,15 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, /* Start the transaction */ writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); - rc = spmi_controller_wait_for_done(spmi_controller, spmi_controller->base, sid, addr); + rc = spmi_controller_wait_for_done(&ctrl->dev, spmi_controller, + spmi_controller->base, sid, addr); spin_unlock_irqrestore(&spmi_controller->lock, flags); if (rc) - dev_err(spmi_controller->dev, "spmi write wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", + dev_err(&ctrl->dev, "spmi write wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", opc, sid, addr, bc); else - dev_dbg(spmi_controller->dev, "%s: id:%d addr:0x%x, wrote value: %*ph\n", + dev_dbg(&ctrl->dev, "%s: id:%d addr:0x%x, wrote value: %*ph\n", __func__, sid, addr, (int)bc, __buf); return rc; -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 09/44] staging: spmi: hisi-spmi-controller: add it to the building system 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Now that the driver was ported to upstream, add it as a SPMI controller. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/Kconfig | 2 ++ drivers/staging/Makefile | 1 + drivers/staging/hikey9xx/Kconfig | 10 ++++++++++ drivers/staging/hikey9xx/Makefile | 3 +++ 4 files changed, 16 insertions(+) create mode 100644 drivers/staging/hikey9xx/Kconfig create mode 100644 drivers/staging/hikey9xx/Makefile diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 4ec5528f89fa..dfce8e39dbc3 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -120,4 +120,6 @@ source "drivers/staging/qlge/Kconfig" source "drivers/staging/wfx/Kconfig" +source "drivers/staging/hikey9xx/Kconfig" + endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 4d34198151b3..e369a4f5e14a 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -50,3 +50,4 @@ obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ obj-$(CONFIG_KPC2000) += kpc2000/ obj-$(CONFIG_QLGE) += qlge/ obj-$(CONFIG_WFX) += wfx/ +obj-y += hikey9xx/ diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig new file mode 100644 index 000000000000..31eb01b5ef2b --- /dev/null +++ b/drivers/staging/hikey9xx/Kconfig @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0 + +config SPMI_HISI3670 + tristate "Hisilicon 3670 SPMI Controller" + select IRQ_DOMAIN_HIERARCHY + depends on HAS_IOMEM + help + If you say yes to this option, support will be included for the + built-in SPMI PMIC Arbiter interface on Hisilicon 3670 + processors. diff --git a/drivers/staging/hikey9xx/Makefile b/drivers/staging/hikey9xx/Makefile new file mode 100644 index 000000000000..e8085abce444 --- /dev/null +++ b/drivers/staging/hikey9xx/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 09/44] staging: spmi: hisi-spmi-controller: add it to the building system @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Now that the driver was ported to upstream, add it as a SPMI controller. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/Kconfig | 2 ++ drivers/staging/Makefile | 1 + drivers/staging/hikey9xx/Kconfig | 10 ++++++++++ drivers/staging/hikey9xx/Makefile | 3 +++ 4 files changed, 16 insertions(+) create mode 100644 drivers/staging/hikey9xx/Kconfig create mode 100644 drivers/staging/hikey9xx/Makefile diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 4ec5528f89fa..dfce8e39dbc3 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -120,4 +120,6 @@ source "drivers/staging/qlge/Kconfig" source "drivers/staging/wfx/Kconfig" +source "drivers/staging/hikey9xx/Kconfig" + endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 4d34198151b3..e369a4f5e14a 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -50,3 +50,4 @@ obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ obj-$(CONFIG_KPC2000) += kpc2000/ obj-$(CONFIG_QLGE) += qlge/ obj-$(CONFIG_WFX) += wfx/ +obj-y += hikey9xx/ diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig new file mode 100644 index 000000000000..31eb01b5ef2b --- /dev/null +++ b/drivers/staging/hikey9xx/Kconfig @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0 + +config SPMI_HISI3670 + tristate "Hisilicon 3670 SPMI Controller" + select IRQ_DOMAIN_HIERARCHY + depends on HAS_IOMEM + help + If you say yes to this option, support will be included for the + built-in SPMI PMIC Arbiter interface on Hisilicon 3670 + processors. diff --git a/drivers/staging/hikey9xx/Makefile b/drivers/staging/hikey9xx/Makefile new file mode 100644 index 000000000000..e8085abce444 --- /dev/null +++ b/drivers/staging/hikey9xx/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 10/44] staging: spmi: hisi-spmi-controller: do some code cleanups 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel, Jonathan Cameron There are several minor things that can be cleanup in order to make this driver more prepared for leaving staging. Suggested-by: Jonathan Cameron <Jonathan.Cameron@Huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hisi-spmi-controller.c | 135 +++++++----------- 1 file changed, 51 insertions(+), 84 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 153bcdb0cde4..583df10cbf1a 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -2,18 +2,16 @@ #include <linux/delay.h> #include <linux/err.h> +#include <linux/interrupt.h> #include <linux/io.h> #include <linux/kernel.h> -#include <linux/platform_device.h> -#include <linux/slab.h> -#include <linux/of.h> -#include <linux/interrupt.h> #include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/seq_file.h> +#include <linux/slab.h> #include <linux/spmi.h> -#define SPMI_CONTROLLER_NAME "spmi_controller" - /* * SPMI register addr */ @@ -73,27 +71,6 @@ enum spmi_controller_cmd_op_code { #define SPMI_CONTROLLER_TIMEOUT_US 1000 #define SPMI_CONTROLLER_MAX_TRANS_BYTES 16 -/* - * @base base address of the PMIC Arbiter core registers. - * @rdbase, @wrbase base address of the PMIC Arbiter read core registers. - * For HW-v1 these are equal to base. - * For HW-v2, the value is the same in eeraly probing, in order to read - * PMIC_ARB_CORE registers, then chnls, and obsrvr are set to - * PMIC_ARB_CORE_REGISTERS and PMIC_ARB_CORE_REGISTERS_OBS respectivly. - * @intr base address of the SPMI interrupt control registers - * @ppid_2_chnl_tbl lookup table f(SID, Periph-ID) -> channel num - * entry is only valid if corresponding bit is set in valid_ppid_bitmap. - * @valid_ppid_bitmap bit is set only for valid ppids. - * @fmt_cmd formats a command to be set into PMIC_ARBq_CHNLn_CMD - * @chnl_ofst calculates offset of the base of a channel reg space - * @ee execution environment id - * @irq_acc0_init_val initial value of the interrupt accumulator at probe time. - * Use for an HW workaround. On handling interrupts, the first accumulator - * register will be compared against this value, and bits which are set at - * boot will be ignored. - * @reserved_chnl entry of ppid_2_chnl_tbl that this driver should never touch. - * value is positive channel number or negative to mark it unused. - */ struct spmi_controller_dev { struct spmi_controller *controller; struct device *dev; @@ -106,14 +83,13 @@ static int spmi_controller_wait_for_done(struct device *dev, struct spmi_controller_dev *ctrl_dev, void __iomem *base, u8 sid, u16 addr) { - u32 status = 0; u32 timeout = SPMI_CONTROLLER_TIMEOUT_US; - u32 offset; + u32 status, offset; offset = SPMI_APB_SPMI_STATUS_BASE_ADDR; offset += SPMI_CHANNEL_OFFSET * ctrl_dev->channel + SPMI_SLAVE_OFFSET * sid; - while (timeout--) { + do { status = readl(base + offset); if (status & SPMI_APB_TRANS_DONE) { @@ -126,21 +102,21 @@ static int spmi_controller_wait_for_done(struct device *dev, return 0; } udelay(1); - } + } while(timeout--); dev_err(dev, "%s: timeout, status 0x%x\n", __func__, status); return -ETIMEDOUT; } static int spmi_read_cmd(struct spmi_controller *ctrl, - u8 opc, u8 sid, u16 addr, u8 *__buf, size_t bc) + u8 opc, u8 slave_id, u16 slave_addr, u8 *__buf, size_t bc) { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); + u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; unsigned long flags; u8 *buf = __buf; u32 cmd, data; int rc; - u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; u8 op_code, i; if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { @@ -150,14 +126,17 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, return -EINVAL; } - /* Check the opcode */ - if (opc == SPMI_CMD_READ) { + switch (opc) { + case SPMI_CMD_READ: op_code = SPMI_CMD_REG_READ; - } else if (opc == SPMI_CMD_EXT_READ) { + break; + case SPMI_CMD_EXT_READ: op_code = SPMI_CMD_EXT_REG_READ; - } else if (opc == SPMI_CMD_EXT_READL) { + break; + case SPMI_CMD_EXT_READL: op_code = SPMI_CMD_EXT_REG_READ_L; - } else { + break; + default: dev_err(&ctrl->dev, "invalid read cmd 0x%x", opc); return -EINVAL; } @@ -165,21 +144,20 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, cmd = SPMI_APB_SPMI_CMD_EN | (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) | ((bc - 1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) | - ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ - ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ + ((slave_id & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ + ((slave_addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ spin_lock_irqsave(&spmi_controller->lock, flags); writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); rc = spmi_controller_wait_for_done(&ctrl->dev, spmi_controller, - spmi_controller->base, sid, addr); + spmi_controller->base, slave_id, slave_addr); if (rc) goto done; - i = 0; - do { - data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); + for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) { + data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * slave_id + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); data = be32_to_cpu((__be32)data); if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(buf, &data, sizeof(data)); @@ -188,31 +166,30 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, memcpy(buf, &data, bc % SPMI_PER_DATAREG_BYTE); buf += (bc % SPMI_PER_DATAREG_BYTE); } - i++; - } while (bc > i * SPMI_PER_DATAREG_BYTE); + } done: spin_unlock_irqrestore(&spmi_controller->lock, flags); if (rc) dev_err(&ctrl->dev, - "spmi read wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", - opc, sid, addr, bc + 1); + "spmi read wait timeout op:0x%x slave_id:%d slave_addr:0x%x bc:%ld\n", + opc, slave_id, slave_addr, bc + 1); else - dev_dbg(&ctrl->dev, "%s: id:%d addr:0x%x, read value: %*ph\n", - __func__, sid, addr, (int)bc, __buf); + dev_dbg(&ctrl->dev, "%s: id:%d slave_addr:0x%x, read value: %*ph\n", + __func__, slave_id, slave_addr, (int)bc, __buf); return rc; } static int spmi_write_cmd(struct spmi_controller *ctrl, - u8 opc, u8 sid, u16 addr, const u8 *__buf, size_t bc) + u8 opc, u8 slave_id, u16 slave_addr, const u8 *__buf, size_t bc) { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); + u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; const u8 *buf = __buf; unsigned long flags; u32 cmd, data; int rc; - u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; u8 op_code, i; if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { @@ -222,14 +199,17 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, return -EINVAL; } - /* Check the opcode */ - if (opc == SPMI_CMD_WRITE) { + switch (opc) { + case SPMI_CMD_WRITE: op_code = SPMI_CMD_REG_WRITE; - } else if (opc == SPMI_CMD_EXT_WRITE) { + break; + case SPMI_CMD_EXT_WRITE: op_code = SPMI_CMD_EXT_REG_WRITE; - } else if (opc == SPMI_CMD_EXT_WRITEL) { + break; + case SPMI_CMD_EXT_WRITEL: op_code = SPMI_CMD_EXT_REG_WRITE_L; - } else { + break; + default: dev_err(&ctrl->dev, "invalid write cmd 0x%x", opc); return -EINVAL; } @@ -237,14 +217,13 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, cmd = SPMI_APB_SPMI_CMD_EN | (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) | ((bc - 1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) | - ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ - ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ + ((slave_id & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | + ((slave_addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* Write data to FIFOs */ spin_lock_irqsave(&spmi_controller->lock, flags); - i = 0; - do { + for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) { data = 0; if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(&data, buf, sizeof(data)); @@ -256,22 +235,22 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, writel((u32)cpu_to_be32(data), spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); - i++; - } while (bc > i * SPMI_PER_DATAREG_BYTE); + }; /* Start the transaction */ writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); rc = spmi_controller_wait_for_done(&ctrl->dev, spmi_controller, - spmi_controller->base, sid, addr); + spmi_controller->base, slave_id, + slave_addr); spin_unlock_irqrestore(&spmi_controller->lock, flags); if (rc) - dev_err(&ctrl->dev, "spmi write wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", - opc, sid, addr, bc); + dev_err(&ctrl->dev, "spmi write wait timeout op:0x%x slave_id:%d slave_addr:0x%x bc:%ld\n", + opc, slave_id, slave_addr, bc); else - dev_dbg(&ctrl->dev, "%s: id:%d addr:0x%x, wrote value: %*ph\n", - __func__, sid, addr, (int)bc, __buf); + dev_dbg(&ctrl->dev, "%s: id:%d slave_addr:0x%x, wrote value: %*ph\n", + __func__, slave_id, slave_addr, (int)bc, __buf); return rc; } @@ -281,9 +260,7 @@ static int spmi_controller_probe(struct platform_device *pdev) struct spmi_controller_dev *spmi_controller; struct spmi_controller *ctrl; struct resource *iores; - int ret = 0; - - dev_info(&pdev->dev, "HISI SPMI probe\n"); + int ret; ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*spmi_controller)); if (!ctrl) { @@ -293,7 +270,6 @@ static int spmi_controller_probe(struct platform_device *pdev) spmi_controller = spmi_controller_get_drvdata(ctrl); spmi_controller->controller = ctrl; - /* NOTE: driver uses the static register mapping */ iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!iores) { dev_err(&pdev->dev, "can not get resource!\n"); @@ -305,10 +281,7 @@ static int spmi_controller_probe(struct platform_device *pdev) dev_err(&pdev->dev, "can not remap base addr!\n"); return -EADDRNOTAVAIL; } - dev_dbg(&pdev->dev, "spmi_add_controller base addr=0x%lx!\n", - (unsigned long)spmi_controller->base); - /* Get properties from the device tree */ ret = of_property_read_u32(pdev->dev.of_node, "spmi-channel", &spmi_controller->channel); if (ret) { @@ -331,14 +304,8 @@ static int spmi_controller_probe(struct platform_device *pdev) ret = spmi_controller_add(ctrl); if (ret) - goto err_add_controller; + dev_err(&pdev->dev, "spmi_add_controller failed with error %d!\n", ret); - dev_info(&pdev->dev, "spmi_add_controller initialized\n"); - return 0; - -err_add_controller: - dev_err(&pdev->dev, "spmi_add_controller failed!\n"); - platform_set_drvdata(pdev, NULL); return ret; } @@ -346,8 +313,8 @@ static int spmi_del_controller(struct platform_device *pdev) { struct spmi_controller *ctrl = platform_get_drvdata(pdev); - platform_set_drvdata(pdev, NULL); spmi_controller_remove(ctrl); + kfree(ctrl); return 0; } @@ -362,7 +329,7 @@ static struct platform_driver spmi_controller_driver = { .probe = spmi_controller_probe, .remove = spmi_del_controller, .driver = { - .name = SPMI_CONTROLLER_NAME, + .name = "hisi_spmi_controller", .of_match_table = spmi_controller_match_table, }, }; -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 10/44] staging: spmi: hisi-spmi-controller: do some code cleanups @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, Jonathan Cameron, mauro.chehab There are several minor things that can be cleanup in order to make this driver more prepared for leaving staging. Suggested-by: Jonathan Cameron <Jonathan.Cameron@Huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hisi-spmi-controller.c | 135 +++++++----------- 1 file changed, 51 insertions(+), 84 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 153bcdb0cde4..583df10cbf1a 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -2,18 +2,16 @@ #include <linux/delay.h> #include <linux/err.h> +#include <linux/interrupt.h> #include <linux/io.h> #include <linux/kernel.h> -#include <linux/platform_device.h> -#include <linux/slab.h> -#include <linux/of.h> -#include <linux/interrupt.h> #include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/seq_file.h> +#include <linux/slab.h> #include <linux/spmi.h> -#define SPMI_CONTROLLER_NAME "spmi_controller" - /* * SPMI register addr */ @@ -73,27 +71,6 @@ enum spmi_controller_cmd_op_code { #define SPMI_CONTROLLER_TIMEOUT_US 1000 #define SPMI_CONTROLLER_MAX_TRANS_BYTES 16 -/* - * @base base address of the PMIC Arbiter core registers. - * @rdbase, @wrbase base address of the PMIC Arbiter read core registers. - * For HW-v1 these are equal to base. - * For HW-v2, the value is the same in eeraly probing, in order to read - * PMIC_ARB_CORE registers, then chnls, and obsrvr are set to - * PMIC_ARB_CORE_REGISTERS and PMIC_ARB_CORE_REGISTERS_OBS respectivly. - * @intr base address of the SPMI interrupt control registers - * @ppid_2_chnl_tbl lookup table f(SID, Periph-ID) -> channel num - * entry is only valid if corresponding bit is set in valid_ppid_bitmap. - * @valid_ppid_bitmap bit is set only for valid ppids. - * @fmt_cmd formats a command to be set into PMIC_ARBq_CHNLn_CMD - * @chnl_ofst calculates offset of the base of a channel reg space - * @ee execution environment id - * @irq_acc0_init_val initial value of the interrupt accumulator at probe time. - * Use for an HW workaround. On handling interrupts, the first accumulator - * register will be compared against this value, and bits which are set at - * boot will be ignored. - * @reserved_chnl entry of ppid_2_chnl_tbl that this driver should never touch. - * value is positive channel number or negative to mark it unused. - */ struct spmi_controller_dev { struct spmi_controller *controller; struct device *dev; @@ -106,14 +83,13 @@ static int spmi_controller_wait_for_done(struct device *dev, struct spmi_controller_dev *ctrl_dev, void __iomem *base, u8 sid, u16 addr) { - u32 status = 0; u32 timeout = SPMI_CONTROLLER_TIMEOUT_US; - u32 offset; + u32 status, offset; offset = SPMI_APB_SPMI_STATUS_BASE_ADDR; offset += SPMI_CHANNEL_OFFSET * ctrl_dev->channel + SPMI_SLAVE_OFFSET * sid; - while (timeout--) { + do { status = readl(base + offset); if (status & SPMI_APB_TRANS_DONE) { @@ -126,21 +102,21 @@ static int spmi_controller_wait_for_done(struct device *dev, return 0; } udelay(1); - } + } while(timeout--); dev_err(dev, "%s: timeout, status 0x%x\n", __func__, status); return -ETIMEDOUT; } static int spmi_read_cmd(struct spmi_controller *ctrl, - u8 opc, u8 sid, u16 addr, u8 *__buf, size_t bc) + u8 opc, u8 slave_id, u16 slave_addr, u8 *__buf, size_t bc) { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); + u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; unsigned long flags; u8 *buf = __buf; u32 cmd, data; int rc; - u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; u8 op_code, i; if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { @@ -150,14 +126,17 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, return -EINVAL; } - /* Check the opcode */ - if (opc == SPMI_CMD_READ) { + switch (opc) { + case SPMI_CMD_READ: op_code = SPMI_CMD_REG_READ; - } else if (opc == SPMI_CMD_EXT_READ) { + break; + case SPMI_CMD_EXT_READ: op_code = SPMI_CMD_EXT_REG_READ; - } else if (opc == SPMI_CMD_EXT_READL) { + break; + case SPMI_CMD_EXT_READL: op_code = SPMI_CMD_EXT_REG_READ_L; - } else { + break; + default: dev_err(&ctrl->dev, "invalid read cmd 0x%x", opc); return -EINVAL; } @@ -165,21 +144,20 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, cmd = SPMI_APB_SPMI_CMD_EN | (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) | ((bc - 1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) | - ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ - ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ + ((slave_id & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ + ((slave_addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ spin_lock_irqsave(&spmi_controller->lock, flags); writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); rc = spmi_controller_wait_for_done(&ctrl->dev, spmi_controller, - spmi_controller->base, sid, addr); + spmi_controller->base, slave_id, slave_addr); if (rc) goto done; - i = 0; - do { - data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * sid + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); + for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) { + data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * slave_id + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); data = be32_to_cpu((__be32)data); if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(buf, &data, sizeof(data)); @@ -188,31 +166,30 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, memcpy(buf, &data, bc % SPMI_PER_DATAREG_BYTE); buf += (bc % SPMI_PER_DATAREG_BYTE); } - i++; - } while (bc > i * SPMI_PER_DATAREG_BYTE); + } done: spin_unlock_irqrestore(&spmi_controller->lock, flags); if (rc) dev_err(&ctrl->dev, - "spmi read wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", - opc, sid, addr, bc + 1); + "spmi read wait timeout op:0x%x slave_id:%d slave_addr:0x%x bc:%ld\n", + opc, slave_id, slave_addr, bc + 1); else - dev_dbg(&ctrl->dev, "%s: id:%d addr:0x%x, read value: %*ph\n", - __func__, sid, addr, (int)bc, __buf); + dev_dbg(&ctrl->dev, "%s: id:%d slave_addr:0x%x, read value: %*ph\n", + __func__, slave_id, slave_addr, (int)bc, __buf); return rc; } static int spmi_write_cmd(struct spmi_controller *ctrl, - u8 opc, u8 sid, u16 addr, const u8 *__buf, size_t bc) + u8 opc, u8 slave_id, u16 slave_addr, const u8 *__buf, size_t bc) { struct spmi_controller_dev *spmi_controller = dev_get_drvdata(&ctrl->dev); + u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; const u8 *buf = __buf; unsigned long flags; u32 cmd, data; int rc; - u32 chnl_ofst = SPMI_CHANNEL_OFFSET * spmi_controller->channel; u8 op_code, i; if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { @@ -222,14 +199,17 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, return -EINVAL; } - /* Check the opcode */ - if (opc == SPMI_CMD_WRITE) { + switch (opc) { + case SPMI_CMD_WRITE: op_code = SPMI_CMD_REG_WRITE; - } else if (opc == SPMI_CMD_EXT_WRITE) { + break; + case SPMI_CMD_EXT_WRITE: op_code = SPMI_CMD_EXT_REG_WRITE; - } else if (opc == SPMI_CMD_EXT_WRITEL) { + break; + case SPMI_CMD_EXT_WRITEL: op_code = SPMI_CMD_EXT_REG_WRITE_L; - } else { + break; + default: dev_err(&ctrl->dev, "invalid write cmd 0x%x", opc); return -EINVAL; } @@ -237,14 +217,13 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, cmd = SPMI_APB_SPMI_CMD_EN | (op_code << SPMI_APB_SPMI_CMD_TYPE_OFFSET) | ((bc - 1) << SPMI_APB_SPMI_CMD_LENGTH_OFFSET) | - ((sid & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | /* slvid */ - ((addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* slave_addr */ + ((slave_id & 0xf) << SPMI_APB_SPMI_CMD_SLAVEID_OFFSET) | + ((slave_addr & 0xffff) << SPMI_APB_SPMI_CMD_ADDR_OFFSET); /* Write data to FIFOs */ spin_lock_irqsave(&spmi_controller->lock, flags); - i = 0; - do { + for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) { data = 0; if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(&data, buf, sizeof(data)); @@ -256,22 +235,22 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, writel((u32)cpu_to_be32(data), spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); - i++; - } while (bc > i * SPMI_PER_DATAREG_BYTE); + }; /* Start the transaction */ writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); rc = spmi_controller_wait_for_done(&ctrl->dev, spmi_controller, - spmi_controller->base, sid, addr); + spmi_controller->base, slave_id, + slave_addr); spin_unlock_irqrestore(&spmi_controller->lock, flags); if (rc) - dev_err(&ctrl->dev, "spmi write wait timeout op:0x%x sid:%d addr:0x%x bc:%ld\n", - opc, sid, addr, bc); + dev_err(&ctrl->dev, "spmi write wait timeout op:0x%x slave_id:%d slave_addr:0x%x bc:%ld\n", + opc, slave_id, slave_addr, bc); else - dev_dbg(&ctrl->dev, "%s: id:%d addr:0x%x, wrote value: %*ph\n", - __func__, sid, addr, (int)bc, __buf); + dev_dbg(&ctrl->dev, "%s: id:%d slave_addr:0x%x, wrote value: %*ph\n", + __func__, slave_id, slave_addr, (int)bc, __buf); return rc; } @@ -281,9 +260,7 @@ static int spmi_controller_probe(struct platform_device *pdev) struct spmi_controller_dev *spmi_controller; struct spmi_controller *ctrl; struct resource *iores; - int ret = 0; - - dev_info(&pdev->dev, "HISI SPMI probe\n"); + int ret; ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*spmi_controller)); if (!ctrl) { @@ -293,7 +270,6 @@ static int spmi_controller_probe(struct platform_device *pdev) spmi_controller = spmi_controller_get_drvdata(ctrl); spmi_controller->controller = ctrl; - /* NOTE: driver uses the static register mapping */ iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!iores) { dev_err(&pdev->dev, "can not get resource!\n"); @@ -305,10 +281,7 @@ static int spmi_controller_probe(struct platform_device *pdev) dev_err(&pdev->dev, "can not remap base addr!\n"); return -EADDRNOTAVAIL; } - dev_dbg(&pdev->dev, "spmi_add_controller base addr=0x%lx!\n", - (unsigned long)spmi_controller->base); - /* Get properties from the device tree */ ret = of_property_read_u32(pdev->dev.of_node, "spmi-channel", &spmi_controller->channel); if (ret) { @@ -331,14 +304,8 @@ static int spmi_controller_probe(struct platform_device *pdev) ret = spmi_controller_add(ctrl); if (ret) - goto err_add_controller; + dev_err(&pdev->dev, "spmi_add_controller failed with error %d!\n", ret); - dev_info(&pdev->dev, "spmi_add_controller initialized\n"); - return 0; - -err_add_controller: - dev_err(&pdev->dev, "spmi_add_controller failed!\n"); - platform_set_drvdata(pdev, NULL); return ret; } @@ -346,8 +313,8 @@ static int spmi_del_controller(struct platform_device *pdev) { struct spmi_controller *ctrl = platform_get_drvdata(pdev); - platform_set_drvdata(pdev, NULL); spmi_controller_remove(ctrl); + kfree(ctrl); return 0; } @@ -362,7 +329,7 @@ static struct platform_driver spmi_controller_driver = { .probe = spmi_controller_probe, .remove = spmi_del_controller, .driver = { - .name = SPMI_CONTROLLER_NAME, + .name = "hisi_spmi_controller", .of_match_table = spmi_controller_match_table, }, }; -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* Re: [PATCH 10/44] staging: spmi: hisi-spmi-controller: do some code cleanups 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 16:17 ` Joe Perches -1 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 16:17 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linuxarm, mauro.chehab, Greg Kroah-Hartman, linux-kernel, devel, Jonathan Cameron On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > There are several minor things that can be cleanup in > order to make this driver more prepared for leaving staging. trivial style notes: > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c [] > @@ -106,14 +83,13 @@ static int spmi_controller_wait_for_done(struct device *dev, > struct spmi_controller_dev *ctrl_dev, > void __iomem *base, u8 sid, u16 addr) > { > - u32 status = 0; > u32 timeout = SPMI_CONTROLLER_TIMEOUT_US; > - u32 offset; > + u32 status, offset; > > offset = SPMI_APB_SPMI_STATUS_BASE_ADDR; > offset += SPMI_CHANNEL_OFFSET * ctrl_dev->channel + SPMI_SLAVE_OFFSET * sid; > > - while (timeout--) { > + do { > status = readl(base + offset); > > if (status & SPMI_APB_TRANS_DONE) { > @@ -126,21 +102,21 @@ static int spmi_controller_wait_for_done(struct device *dev, > return 0; > } > udelay(1); > - } > + } while(timeout--); Odd spacing. Two spaces after close brace, none before open parenthesis. > @@ -237,14 +217,13 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, [] > - i = 0; > - do { > + for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) { > data = 0; > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > memcpy(&data, buf, sizeof(data)); > @@ -256,22 +235,22 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > writel((u32)cpu_to_be32(data), > spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > - i++; > - } while (bc > i * SPMI_PER_DATAREG_BYTE); > + }; Unnecessary semicolon after for loop close brace. ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 10/44] staging: spmi: hisi-spmi-controller: do some code cleanups @ 2020-08-12 16:17 ` Joe Perches 0 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 16:17 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: devel, Greg Kroah-Hartman, linuxarm, linux-kernel, Jonathan Cameron, mauro.chehab On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > There are several minor things that can be cleanup in > order to make this driver more prepared for leaving staging. trivial style notes: > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c [] > @@ -106,14 +83,13 @@ static int spmi_controller_wait_for_done(struct device *dev, > struct spmi_controller_dev *ctrl_dev, > void __iomem *base, u8 sid, u16 addr) > { > - u32 status = 0; > u32 timeout = SPMI_CONTROLLER_TIMEOUT_US; > - u32 offset; > + u32 status, offset; > > offset = SPMI_APB_SPMI_STATUS_BASE_ADDR; > offset += SPMI_CHANNEL_OFFSET * ctrl_dev->channel + SPMI_SLAVE_OFFSET * sid; > > - while (timeout--) { > + do { > status = readl(base + offset); > > if (status & SPMI_APB_TRANS_DONE) { > @@ -126,21 +102,21 @@ static int spmi_controller_wait_for_done(struct device *dev, > return 0; > } > udelay(1); > - } > + } while(timeout--); Odd spacing. Two spaces after close brace, none before open parenthesis. > @@ -237,14 +217,13 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, [] > - i = 0; > - do { > + for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) { > data = 0; > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > memcpy(&data, buf, sizeof(data)); > @@ -256,22 +235,22 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > writel((u32)cpu_to_be32(data), > spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > - i++; > - } while (bc > i * SPMI_PER_DATAREG_BYTE); > + }; Unnecessary semicolon after for loop close brace. _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* [PATCH 11/44] staging: mfd: add a PMIC driver for HiSilicon 6421 SPMI version 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mayulong, Mauro Carvalho Chehab, Greg Kroah-Hartman, Lee Jones, linux-kernel, devel From: Mayulong <mayulong1@huawei.com> Add the PMIC SPMI driver for the HiSilicon 6421v600. [mchehab+huawei@kernel.org: keep just the MFD driver on this patch, and renamed filenames to better match other upstream drivers] The compete patch is at: https://github.com/96boards-hikey/linux/commit/08464419fba2 Signed-off-by: Mayulong <mayulong1@huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 759 ++++++++++++++++++++ include/linux/mfd/hi6421-spmi-pmic.h | 165 +++++ 2 files changed, 924 insertions(+) create mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c create mode 100644 include/linux/mfd/hi6421-spmi-pmic.h diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c new file mode 100644 index 000000000000..6bb0bc4b203b --- /dev/null +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -0,0 +1,759 @@ +/* + * Device driver for regulators in HISI PMIC IC + * + * Copyright (c) 2013 Linaro Ltd. + * Copyright (c) 2011 Hisilicon. + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <linux/slab.h> +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/of_gpio.h> +#include <linux/of_irq.h> +#include <linux/mfd/hisi_pmic.h> +#include <linux/irq.h> +#include <linux/spmi.h> +#ifndef NO_IRQ +#define NO_IRQ 0 +#endif + +/* 8-bit register offset in PMIC */ +#define HISI_MASK_STATE 0xff + +#define HISI_IRQ_KEY_NUM 0 +#define HISI_IRQ_KEY_VALUE 0xc0 +#define HISI_IRQ_KEY_DOWN 7 +#define HISI_IRQ_KEY_UP 6 + +/*#define HISI_NR_IRQ 25*/ +#define HISI_MASK_FIELD 0xFF +#define HISI_BITS 8 +#define PMIC_FPGA_FLAG 1 + +/*define the first group interrupt register number*/ +#define HISI_PMIC_FIRST_GROUP_INT_NUM 2 + +static struct bit_info g_pmic_vbus = {0}; +#ifndef BIT +#define BIT(x) (0x1U << (x)) +#endif + +static struct hisi_pmic *g_pmic; +static unsigned int g_extinterrupt_flag = 0; +static struct of_device_id of_hisi_pmic_match_tbl[] = { + { + .compatible = "hisilicon-hisi-pmic-spmi", + }, + { /* end */ } +}; + +/* + * The PMIC register is only 8-bit. + * Hisilicon SoC use hardware to map PMIC register into SoC mapping. + * At here, we are accessing SoC register with 32-bit. + */ +u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) +{ + u32 ret; + u8 read_value = 0; + struct spmi_device *pdev; + + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return 0; + } + + pdev = to_spmi_device(g_pmic->dev); + if (NULL == pdev) { + pr_err("%s:pdev get failed!\n", __func__); + return 0; + } + + ret = spmi_ext_register_readl(pdev, reg, (unsigned char*)&read_value, 1);/*lint !e734 !e732 */ + if (ret) { + pr_err("%s:spmi_ext_register_readl failed!\n", __func__); + return ret; + } + return (u32)read_value; +} +EXPORT_SYMBOL(hisi_pmic_read); + +void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) +{ + u32 ret; + struct spmi_device *pdev; + + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return; + } + + pdev = to_spmi_device(g_pmic->dev); + if (NULL == pdev) { + pr_err("%s:pdev get failed!\n", __func__); + return; + } + + ret = spmi_ext_register_writel(pdev, reg, (unsigned char*)&val, 1);/*lint !e734 !e732 */ + if (ret) { + pr_err("%s:spmi_ext_register_writel failed!\n", __func__); + return ; + } +} +EXPORT_SYMBOL(hisi_pmic_write); + +#ifdef CONFIG_HISI_DIEID +u32 hisi_pmic_read_sub_pmu(u8 sid, int reg) +{ + u32 ret; + u8 read_value = 0; + struct spmi_device *pdev; + + if(strstr(saved_command_line, "androidboot.swtype=factory")) + { + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return -1;/*lint !e570 */ + } + + pdev = to_spmi_device(g_pmic->dev); + if (NULL == pdev) { + pr_err("%s:pdev get failed!\n", __func__); + return -1;/*lint !e570 */ + } + + ret = spmi_ext_register_readl(pdev->ctrl, sid, reg, (unsigned char*)&read_value, 1);/*lint !e734 !e732 */ + if (ret) { + pr_err("%s:spmi_ext_register_readl failed!\n", __func__); + return ret; + } + return (u32)read_value; + } + return 0; +} +EXPORT_SYMBOL(hisi_pmic_read_sub_pmu); + +void hisi_pmic_write_sub_pmu(u8 sid, int reg, u32 val) +{ + u32 ret; + struct spmi_device *pdev; + if(strstr(saved_command_line, "androidboot.swtype=factory")) + { + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return; + } + + pdev = to_spmi_device(g_pmic->dev); + if (NULL == pdev) { + pr_err("%s:pdev get failed!\n", __func__); + return; + } + + ret = spmi_ext_register_writel(pdev->ctrl, sid, reg, (unsigned char*)&val, 1);/*lint !e734 !e732 */ + if (ret) { + pr_err("%s:spmi_ext_register_writel failed!\n", __func__); + return ; + } + } + + return ; +} +EXPORT_SYMBOL(hisi_pmic_write_sub_pmu); +#endif + +void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, + u32 mask, u32 bits) +{ + u32 data; + unsigned long flags; + + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return; + } + + spin_lock_irqsave(&g_pmic->lock, flags); + data = hisi_pmic_read(pmic, reg) & ~mask; + data |= mask & bits; + hisi_pmic_write(pmic, reg, data); + spin_unlock_irqrestore(&g_pmic->lock, flags); +} +EXPORT_SYMBOL(hisi_pmic_rmw); + +unsigned int hisi_pmic_reg_read(int addr) +{ + return (unsigned int)hisi_pmic_read(g_pmic, addr); +} +EXPORT_SYMBOL(hisi_pmic_reg_read); + +void hisi_pmic_reg_write(int addr, int val) +{ + hisi_pmic_write(g_pmic, addr, val); +} +EXPORT_SYMBOL(hisi_pmic_reg_write); + +void hisi_pmic_reg_write_lock(int addr, int val) +{ + unsigned long flags; + + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return; + } + + spin_lock_irqsave(&g_pmic->lock, flags); + hisi_pmic_write(g_pmic, g_pmic->normal_lock.addr, g_pmic->normal_lock.val); + hisi_pmic_write(g_pmic, g_pmic->debug_lock.addr, g_pmic->debug_lock.val); + hisi_pmic_write(g_pmic, addr, val); + hisi_pmic_write(g_pmic, g_pmic->normal_lock.addr, 0); + hisi_pmic_write(g_pmic, g_pmic->debug_lock.addr, 0); + spin_unlock_irqrestore(&g_pmic->lock, flags); +} + +int hisi_pmic_array_read(int addr, char *buff, unsigned int len) +{ + unsigned int i; + + if ((len > 32) || (NULL == buff)) { + return -EINVAL; + } + + /* + * Here is a bug in the pmu die. + * the coul driver will read 4 bytes, + * but the ssi bus only read 1 byte, and the pmu die + * will make sampling 1/10669us about vol cur,so the driver + * read the data is not the same sampling + */ + for (i = 0; i < len; i++) + { + *(buff + i) = hisi_pmic_reg_read(addr+i); + } + + return 0; +} + +int hisi_pmic_array_write(int addr, char *buff, unsigned int len) +{ + unsigned int i; + + if ((len > 32) || (NULL == buff)) { + return -EINVAL; + } + + for (i = 0; i < len; i++) + { + hisi_pmic_reg_write(addr+i, *(buff + i)); + } + + return 0; +} + +static irqreturn_t hisi_irq_handler(int irq, void *data) +{ + struct hisi_pmic *pmic = (struct hisi_pmic *)data; + unsigned long pending; + int i, offset; + + for (i = 0; i < pmic->irqarray; i++) { + pending = hisi_pmic_reg_read((i + pmic->irq_addr.start_addr)); + pending &= HISI_MASK_FIELD; + if (pending != 0) { + pr_info("pending[%d]=0x%lx\n\r", i, pending); + } + + hisi_pmic_reg_write((i + pmic->irq_addr.start_addr), pending); + + /*solve powerkey order*/ + if ((HISI_IRQ_KEY_NUM == i) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { + generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_DOWN]); + generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_UP]); + pending &= (~HISI_IRQ_KEY_VALUE); + } + + if (pending) { + for_each_set_bit(offset, &pending, HISI_BITS) + generic_handle_irq(pmic->irqs[offset + i * HISI_BITS]);/*lint !e679 */ + } + } + + /*Handle the second group irq if analysis the second group irq from dtsi*/ + if (1 == g_extinterrupt_flag){ + for (i = 0; i < pmic->irqarray1; i++) { + pending = hisi_pmic_reg_read((i + pmic->irq_addr1.start_addr)); + pending &= HISI_MASK_FIELD; + if (pending != 0) { + pr_info("pending[%d]=0x%lx\n\r", i, pending); + } + + hisi_pmic_reg_write((i + pmic->irq_addr1.start_addr), pending); + + if (pending) { + for_each_set_bit(offset, &pending, HISI_BITS) + generic_handle_irq(pmic->irqs[offset + (i+HISI_PMIC_FIRST_GROUP_INT_NUM) * HISI_BITS]);/*lint !e679 */ + } + } + } + + return IRQ_HANDLED; +} + +static void hisi_irq_mask(struct irq_data *d) +{ + struct hisi_pmic *pmic = irq_data_get_irq_chip_data(d); + u32 data, offset; + unsigned long flags; + + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return; + } + + offset = (irqd_to_hwirq(d) >> 3); + if (1==g_extinterrupt_flag){ + if ( offset < HISI_PMIC_FIRST_GROUP_INT_NUM) + offset += pmic->irq_mask_addr.start_addr; + else/*Change addr when irq num larger than 16 because interrupt addr is nonsequence*/ + offset = offset+(pmic->irq_mask_addr1.start_addr)-HISI_PMIC_FIRST_GROUP_INT_NUM; + }else{ + offset += pmic->irq_mask_addr.start_addr; + } + spin_lock_irqsave(&g_pmic->lock, flags); + data = hisi_pmic_reg_read(offset); + data |= (1 << (irqd_to_hwirq(d) & 0x07)); + hisi_pmic_reg_write(offset, data); + spin_unlock_irqrestore(&g_pmic->lock, flags); +} + +static void hisi_irq_unmask(struct irq_data *d) +{ + struct hisi_pmic *pmic = irq_data_get_irq_chip_data(d); + u32 data, offset; + unsigned long flags; + + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return; + } + + offset = (irqd_to_hwirq(d) >> 3); + if (1==g_extinterrupt_flag){ + if ( offset < HISI_PMIC_FIRST_GROUP_INT_NUM) + offset += pmic->irq_mask_addr.start_addr; + else + offset = offset+(pmic->irq_mask_addr1.start_addr)-HISI_PMIC_FIRST_GROUP_INT_NUM; + }else{ + offset += pmic->irq_mask_addr.start_addr; + } + spin_lock_irqsave(&g_pmic->lock, flags); + data = hisi_pmic_reg_read(offset); + data &= ~(1 << (irqd_to_hwirq(d) & 0x07)); /*lint !e502 */ + hisi_pmic_reg_write(offset, data); + spin_unlock_irqrestore(&g_pmic->lock, flags); +} + +static struct irq_chip hisi_pmu_irqchip = { + .name = "hisi-irq", + .irq_mask = hisi_irq_mask, + .irq_unmask = hisi_irq_unmask, + .irq_disable = hisi_irq_mask, + .irq_enable = hisi_irq_unmask, +}; + +static int hisi_irq_map(struct irq_domain *d, unsigned int virq, + irq_hw_number_t hw) +{ + struct hisi_pmic *pmic = d->host_data; + + irq_set_chip_and_handler_name(virq, &hisi_pmu_irqchip, + handle_simple_irq, "hisi"); + irq_set_chip_data(virq, pmic); + irq_set_irq_type(virq, IRQ_TYPE_NONE); + + return 0; +} + +static struct irq_domain_ops hisi_domain_ops = { + .map = hisi_irq_map, + .xlate = irq_domain_xlate_twocell, +}; + +/*lint -e570 -e64*/ +static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *pmic) +{ + int ret = 0; + + /*get pmic irq num*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-num", + &(pmic->irqnum), 1); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-num property set\n"); + ret = -ENODEV; + return ret; + } + + /*get pmic irq array number*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-array", + &(pmic->irqarray), 1); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-array property set\n"); + ret = -ENODEV; + return ret; + } + + /*SOC_PMIC_IRQ_MASK_0_ADDR*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-mask-addr", + (int *)&pmic->irq_mask_addr, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-mask-addr property set\n"); + ret = -ENODEV; + return ret; + } + + /*SOC_PMIC_IRQ0_ADDR*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-addr", + (int *)&pmic->irq_addr, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-addr property set\n"); + ret = -ENODEV; + return ret; + } + + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-vbus", + (u32 *)&g_pmic_vbus, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-vbus property\n"); + ret = -ENODEV; + return ret; + } + + /*pmic lock*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-lock", + (int *)&pmic->normal_lock, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-lock property set\n"); + ret = -ENODEV; + return ret; + } + + /*pmic debug lock*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-debug-lock", + (int *)&pmic->debug_lock, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-debug-lock property set\n"); + ret = -ENODEV; + return ret; + } + + return ret; +}/*lint -restore*/ + + +/*lint -e570 -e64*/ +static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic *pmic) +{ + int ret = 0; + + /*get pmic irq num*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-num1", + &(pmic->irqnum1), 1); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-num1 property set\n"); + ret = -ENODEV; + pmic->irqnum1 = 0; + return ret; + } + + /*get pmic irq array number*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-array1", + &(pmic->irqarray1), 1); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-array1 property set\n"); + ret = -ENODEV; + return ret; + } + + /*SOC_PMIC_IRQ_MASK_0_ADDR*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-mask-addr1", + (int *)&pmic->irq_mask_addr1, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-mask-addr1 property set\n"); + ret = -ENODEV; + return ret; + } + + /*SOC_PMIC_IRQ0_ADDR*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-addr1", + (int *)&pmic->irq_addr1, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-addr1 property set\n"); + ret = -ENODEV; + return ret; + } + + g_extinterrupt_flag = 1; + return ret; +}/*lint -restore*/ + +int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list) +{ + if ( NULL == g_pmic ) { + pr_err("[%s]g_pmic is NULL\n", __func__); + return -1; + } + + if (pmic_irq_list > (unsigned int)g_pmic->irqnum) { + pr_err("[%s]input pmic irq number is error.\n", __func__); + return -1; + } + pr_info("%s:g_pmic->irqs[%d]=%d\n", __func__, pmic_irq_list, g_pmic->irqs[pmic_irq_list]); + return (int)g_pmic->irqs[pmic_irq_list]; +} +EXPORT_SYMBOL(hisi_get_pmic_irq_byname); + +int hisi_pmic_get_vbus_status(void) +{ + if (0 == g_pmic_vbus.addr) + return -1; + + if (hisi_pmic_reg_read(g_pmic_vbus.addr) & BIT(g_pmic_vbus.bit)) + return 1; + + return 0; +} +EXPORT_SYMBOL(hisi_pmic_get_vbus_status); + +static void hisi_pmic_irq_prc(struct hisi_pmic *pmic) +{ + int i; + for (i = 0 ; i < pmic->irq_mask_addr.array; i++) { + hisi_pmic_write(pmic, pmic->irq_mask_addr.start_addr + i, HISI_MASK_STATE); + } + + for (i = 0 ; i < pmic->irq_addr.array; i++) { + unsigned int pending = hisi_pmic_read(pmic, pmic->irq_addr.start_addr + i); + pr_debug("PMU IRQ address value:irq[0x%x] = 0x%x\n", pmic->irq_addr.start_addr + i, pending); + hisi_pmic_write(pmic, pmic->irq_addr.start_addr + i, HISI_MASK_STATE); + } + +} + +static void hisi_pmic_irq1_prc(struct hisi_pmic *pmic) +{ + int i; + if(1 == g_extinterrupt_flag){ + for (i = 0 ; i < pmic->irq_mask_addr1.array; i++) { + hisi_pmic_write(pmic, pmic->irq_mask_addr1.start_addr + i, HISI_MASK_STATE); + } + + for (i = 0 ; i < pmic->irq_addr1.array; i++) { + unsigned int pending1 = hisi_pmic_read(pmic, pmic->irq_addr1.start_addr + i); + pr_debug("PMU IRQ address1 value:irq[0x%x] = 0x%x\n", pmic->irq_addr1.start_addr + i, pending1); + hisi_pmic_write(pmic, pmic->irq_addr1.start_addr + i, HISI_MASK_STATE); + } + } +} + +static int hisi_pmic_probe(struct spmi_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct hisi_pmic *pmic = NULL; + enum of_gpio_flags flags; + int ret = 0; + int i; + unsigned int fpga_flag = 0; + unsigned int virq; + + pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL); + if (!pmic) { + dev_err(dev, "cannot allocate hisi_pmic device info\n"); + return -ENOMEM; + } + + /*TODO: get pmic dts info*/ + ret = get_pmic_device_tree_data(np, pmic); + if (ret) { + dev_err(&pdev->dev, "Error reading hisi pmic dts \n"); + return ret; + } + + /*get pmic dts the second group irq*/ + ret = get_pmic_device_tree_data1(np, pmic); + if (ret) { + dev_err(&pdev->dev, "the platform don't support ext-interrupt.\n"); + } + + /* TODO: get and enable clk request */ + spin_lock_init(&pmic->lock); + + pmic->dev = dev; + g_pmic = pmic; + ret = of_property_read_u32_array(np, "hisilicon,pmic_fpga_flag", &fpga_flag, 1); + if (ret) { + pr_err("no hisilicon,pmic_fpga_flag property set\n"); + } + if (PMIC_FPGA_FLAG == fpga_flag) { + goto after_irq_register; + } + + pmic->gpio = of_get_gpio_flags(np, 0, &flags); + if (pmic->gpio < 0) + return pmic->gpio; + + if (!gpio_is_valid(pmic->gpio)) + return -EINVAL; + + ret = gpio_request_one(pmic->gpio, GPIOF_IN, "pmic"); + if (ret < 0) { + dev_err(dev, "failed to request gpio%d\n", pmic->gpio); + return ret; + } + + pmic->irq = gpio_to_irq(pmic->gpio); + + /* mask && clear IRQ status */ + hisi_pmic_irq_prc(pmic); + /*clear && mask the new adding irq*/ + hisi_pmic_irq1_prc(pmic); + + pmic->irqnum += pmic->irqnum1; + + pmic->irqs = (unsigned int *)devm_kmalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL); + if (!pmic->irqs) { + pr_err("%s:Failed to alloc memory for pmic irq number!\n", __func__); + goto irq_malloc; + } + memset(pmic->irqs, 0, pmic->irqnum); + + pmic->domain = irq_domain_add_simple(np, pmic->irqnum, 0, + &hisi_domain_ops, pmic); + if (!pmic->domain) { + dev_err(dev, "failed irq domain add simple!\n"); + ret = -ENODEV; + goto irq_domain; + } + + for (i = 0; i < pmic->irqnum; i++) { + virq = irq_create_mapping(pmic->domain, i); + if (virq == NO_IRQ) { + pr_debug("Failed mapping hwirq\n"); + ret = -ENOSPC; + goto irq_create_mapping; + } + pmic->irqs[i] = virq; + pr_info("[%s]. pmic->irqs[%d] = %d\n", __func__, i, pmic->irqs[i]); + } + + ret = request_threaded_irq(pmic->irq, hisi_irq_handler, NULL, + IRQF_TRIGGER_LOW | IRQF_SHARED | IRQF_NO_SUSPEND, + "pmic", pmic); + if (ret < 0) { + dev_err(dev, "could not claim pmic %d\n", ret); + ret = -ENODEV; + goto request_theaded_irq; + } + +after_irq_register: + return 0; + + +request_theaded_irq: +irq_create_mapping: +irq_domain: +irq_malloc: + gpio_free(pmic->gpio); + g_pmic = NULL; + return ret; +} + +static void hisi_pmic_remove(struct spmi_device *pdev) +{ + + struct hisi_pmic *pmic = dev_get_drvdata(&pdev->dev); + + free_irq(pmic->irq, pmic); + gpio_free(pmic->gpio); + devm_kfree(&pdev->dev, pmic); + +} +static int hisi_pmic_suspend(struct device *dev, pm_message_t state) +{ + struct hisi_pmic *pmic = dev_get_drvdata(dev); + + if (NULL == pmic) { + pr_err("%s:pmic is NULL\n", __func__); + return -ENOMEM; + } + + pr_info("%s:+\n", __func__); + pr_info("%s:-\n", __func__); + + return 0; +}/*lint !e715 */ + +static int hisi_pmic_resume(struct device *dev) +{ + struct hisi_pmic *pmic = dev_get_drvdata(dev); + + if (NULL == pmic) { + pr_err("%s:pmic is NULL\n", __func__); + return -ENOMEM; + } + + pr_info("%s:+\n", __func__); + pr_info("%s:-\n", __func__); + + return 0; +} + +MODULE_DEVICE_TABLE(spmi, pmic_spmi_id); +static struct spmi_driver hisi_pmic_driver = { + .driver = { + .name = "hisi_pmic", + .owner = THIS_MODULE, + .of_match_table = of_hisi_pmic_match_tbl, + .suspend = hisi_pmic_suspend, + .resume = hisi_pmic_resume, + }, + .probe = hisi_pmic_probe, + .remove = hisi_pmic_remove, +}; + +static int __init hisi_pmic_init(void) +{ + return spmi_driver_register(&hisi_pmic_driver); +} + +static void __exit hisi_pmic_exit(void) +{ + spmi_driver_unregister(&hisi_pmic_driver); +} + + +subsys_initcall_sync(hisi_pmic_init); +module_exit(hisi_pmic_exit); + +MODULE_DESCRIPTION("PMIC driver"); +MODULE_LICENSE("GPL v2"); + diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h new file mode 100644 index 000000000000..939b36f617c1 --- /dev/null +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -0,0 +1,165 @@ +/* + * Header file for device driver Hi6421 PMIC + * + * Copyright (c) 2013 Linaro Ltd. + * Copyright (C) 2011 Hisilicon. + * + * Guodong Xu <guodong.xu@linaro.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef __HISI_PMIC_H +#define __HISI_PMIC_H + +#include <linux/irqdomain.h> + +#define HISI_REGS_ENA_PROTECT_TIME (0) /* in microseconds */ +#define HISI_ECO_MODE_ENABLE (1) +#define HISI_ECO_MODE_DISABLE (0) + +typedef int (*pmic_ocp_callback)(char *); +extern int hisi_pmic_special_ocp_register(char *power_name, pmic_ocp_callback handler); + +struct irq_mask_info { + int start_addr; + int array; +}; + +struct irq_info { + int start_addr; + int array; +}; + +struct bit_info { + int addr; + int bit; +}; + +struct write_lock { + int addr; + int val; +}; + +struct hisi_pmic { + struct resource *res; + struct device *dev; + void __iomem *regs; + spinlock_t lock; + struct irq_domain *domain; + int irq; + int gpio; + unsigned int *irqs; + int irqnum; + int irqarray; + struct irq_mask_info irq_mask_addr; + struct irq_info irq_addr; + int irqnum1; + int irqarray1; + struct irq_mask_info irq_mask_addr1; + struct irq_info irq_addr1; + struct write_lock normal_lock; + struct write_lock debug_lock; +}; + +/* 0:disable; 1:enable */ +unsigned int get_uv_mntn_status(void); +void clear_uv_mntn_resered_reg_bit(void); +void set_uv_mntn_resered_reg_bit(void); + +#if defined(CONFIG_HISI_PMIC) || defined(CONFIG_HISI_PMIC_PMU_SPMI) +/* Register Access Helpers */ +u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg); +void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val); +void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits); +unsigned int hisi_pmic_reg_read(int addr); +void hisi_pmic_reg_write(int addr, int val); +void hisi_pmic_reg_write_lock(int addr, int val); +int hisi_pmic_array_read(int addr, char *buff, unsigned int len); +int hisi_pmic_array_write(int addr, char *buff, unsigned int len); +extern int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list); +extern int hisi_pmic_get_vbus_status(void); +#if defined(CONFIG_HISI_DIEID) +u32 hisi_pmic_read_sub_pmu(u8 sid ,int reg); +void hisi_pmic_write_sub_pmu(u8 sid ,int reg, u32 val); +#endif +#else +static inline u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) { return 0; } +static inline void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) {} +static inline void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) {} +static inline unsigned int hisi_pmic_reg_read(int addr) { return 0; } +static inline void hisi_pmic_reg_write(int addr, int val) {} +static inline void hisi_pmic_reg_write_lock(int addr, int val) {} +static inline int hisi_pmic_array_read(int addr, char *buff, unsigned int len) { return 0; } +static inline int hisi_pmic_array_write(int addr, char *buff, unsigned int len) { return 0; } +static inline int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list) { return -1; } +static inline int hisi_pmic_get_vbus_status(void) { return 1; } +static inline u32 hisi_pmic_read_sub_pmu(u8 sid ,int reg) { return 0; } +static inline void hisi_pmic_write_sub_pmu(u8 sid ,int reg, u32 val) {} +#endif + +#ifdef CONFIG_HISI_HI6421V500_PMU +enum pmic_irq_list { + POR_D45MR = 0, + VBUS_CONNECT, + VBUS_DISCONNECT, + ALARMON_R, + HOLD_6S, + HOLD_1S, + POWERKEY_UP, + POWERKEY_DOWN, + OCP_SCP_R, + COUL_R, + VSYS_OV, + VSYS_UV, + VSYS_PWROFF_ABS, + VSYS_PWROFF_DEB, + THSD_OTMP140, + THSD_OTMP125, + HRESETN, + SIM0_HPD_R = 24, + SIM0_HPD_F, + SIM0_HPD_H, + SIM0_HPD_L, + SIM1_HPD_R, + SIM1_HPD_F, + SIM1_HPD_H, + SIM1_HPD_L, + PMIC_IRQ_LIST_MAX, +}; +#else +enum pmic_irq_list { + OTMP = 0, + VBUS_CONNECT, + VBUS_DISCONNECT, + ALARMON_R, + HOLD_6S, + HOLD_1S, + POWERKEY_UP, + POWERKEY_DOWN, + OCP_SCP_R, + COUL_R, + SIM0_HPD_R, + SIM0_HPD_F, + SIM1_HPD_R, + SIM1_HPD_F, + PMIC_IRQ_LIST_MAX, +}; +#endif + +#ifdef CONFIG_HISI_SR_DEBUG +extern void get_ip_regulator_state(void); +#endif +#endif /* __HISI_PMIC_H */ + -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 11/44] staging: mfd: add a PMIC driver for HiSilicon 6421 SPMI version @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mayulong, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab, Lee Jones From: Mayulong <mayulong1@huawei.com> Add the PMIC SPMI driver for the HiSilicon 6421v600. [mchehab+huawei@kernel.org: keep just the MFD driver on this patch, and renamed filenames to better match other upstream drivers] The compete patch is at: https://github.com/96boards-hikey/linux/commit/08464419fba2 Signed-off-by: Mayulong <mayulong1@huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 759 ++++++++++++++++++++ include/linux/mfd/hi6421-spmi-pmic.h | 165 +++++ 2 files changed, 924 insertions(+) create mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c create mode 100644 include/linux/mfd/hi6421-spmi-pmic.h diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c new file mode 100644 index 000000000000..6bb0bc4b203b --- /dev/null +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -0,0 +1,759 @@ +/* + * Device driver for regulators in HISI PMIC IC + * + * Copyright (c) 2013 Linaro Ltd. + * Copyright (c) 2011 Hisilicon. + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <linux/slab.h> +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/of_gpio.h> +#include <linux/of_irq.h> +#include <linux/mfd/hisi_pmic.h> +#include <linux/irq.h> +#include <linux/spmi.h> +#ifndef NO_IRQ +#define NO_IRQ 0 +#endif + +/* 8-bit register offset in PMIC */ +#define HISI_MASK_STATE 0xff + +#define HISI_IRQ_KEY_NUM 0 +#define HISI_IRQ_KEY_VALUE 0xc0 +#define HISI_IRQ_KEY_DOWN 7 +#define HISI_IRQ_KEY_UP 6 + +/*#define HISI_NR_IRQ 25*/ +#define HISI_MASK_FIELD 0xFF +#define HISI_BITS 8 +#define PMIC_FPGA_FLAG 1 + +/*define the first group interrupt register number*/ +#define HISI_PMIC_FIRST_GROUP_INT_NUM 2 + +static struct bit_info g_pmic_vbus = {0}; +#ifndef BIT +#define BIT(x) (0x1U << (x)) +#endif + +static struct hisi_pmic *g_pmic; +static unsigned int g_extinterrupt_flag = 0; +static struct of_device_id of_hisi_pmic_match_tbl[] = { + { + .compatible = "hisilicon-hisi-pmic-spmi", + }, + { /* end */ } +}; + +/* + * The PMIC register is only 8-bit. + * Hisilicon SoC use hardware to map PMIC register into SoC mapping. + * At here, we are accessing SoC register with 32-bit. + */ +u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) +{ + u32 ret; + u8 read_value = 0; + struct spmi_device *pdev; + + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return 0; + } + + pdev = to_spmi_device(g_pmic->dev); + if (NULL == pdev) { + pr_err("%s:pdev get failed!\n", __func__); + return 0; + } + + ret = spmi_ext_register_readl(pdev, reg, (unsigned char*)&read_value, 1);/*lint !e734 !e732 */ + if (ret) { + pr_err("%s:spmi_ext_register_readl failed!\n", __func__); + return ret; + } + return (u32)read_value; +} +EXPORT_SYMBOL(hisi_pmic_read); + +void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) +{ + u32 ret; + struct spmi_device *pdev; + + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return; + } + + pdev = to_spmi_device(g_pmic->dev); + if (NULL == pdev) { + pr_err("%s:pdev get failed!\n", __func__); + return; + } + + ret = spmi_ext_register_writel(pdev, reg, (unsigned char*)&val, 1);/*lint !e734 !e732 */ + if (ret) { + pr_err("%s:spmi_ext_register_writel failed!\n", __func__); + return ; + } +} +EXPORT_SYMBOL(hisi_pmic_write); + +#ifdef CONFIG_HISI_DIEID +u32 hisi_pmic_read_sub_pmu(u8 sid, int reg) +{ + u32 ret; + u8 read_value = 0; + struct spmi_device *pdev; + + if(strstr(saved_command_line, "androidboot.swtype=factory")) + { + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return -1;/*lint !e570 */ + } + + pdev = to_spmi_device(g_pmic->dev); + if (NULL == pdev) { + pr_err("%s:pdev get failed!\n", __func__); + return -1;/*lint !e570 */ + } + + ret = spmi_ext_register_readl(pdev->ctrl, sid, reg, (unsigned char*)&read_value, 1);/*lint !e734 !e732 */ + if (ret) { + pr_err("%s:spmi_ext_register_readl failed!\n", __func__); + return ret; + } + return (u32)read_value; + } + return 0; +} +EXPORT_SYMBOL(hisi_pmic_read_sub_pmu); + +void hisi_pmic_write_sub_pmu(u8 sid, int reg, u32 val) +{ + u32 ret; + struct spmi_device *pdev; + if(strstr(saved_command_line, "androidboot.swtype=factory")) + { + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return; + } + + pdev = to_spmi_device(g_pmic->dev); + if (NULL == pdev) { + pr_err("%s:pdev get failed!\n", __func__); + return; + } + + ret = spmi_ext_register_writel(pdev->ctrl, sid, reg, (unsigned char*)&val, 1);/*lint !e734 !e732 */ + if (ret) { + pr_err("%s:spmi_ext_register_writel failed!\n", __func__); + return ; + } + } + + return ; +} +EXPORT_SYMBOL(hisi_pmic_write_sub_pmu); +#endif + +void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, + u32 mask, u32 bits) +{ + u32 data; + unsigned long flags; + + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return; + } + + spin_lock_irqsave(&g_pmic->lock, flags); + data = hisi_pmic_read(pmic, reg) & ~mask; + data |= mask & bits; + hisi_pmic_write(pmic, reg, data); + spin_unlock_irqrestore(&g_pmic->lock, flags); +} +EXPORT_SYMBOL(hisi_pmic_rmw); + +unsigned int hisi_pmic_reg_read(int addr) +{ + return (unsigned int)hisi_pmic_read(g_pmic, addr); +} +EXPORT_SYMBOL(hisi_pmic_reg_read); + +void hisi_pmic_reg_write(int addr, int val) +{ + hisi_pmic_write(g_pmic, addr, val); +} +EXPORT_SYMBOL(hisi_pmic_reg_write); + +void hisi_pmic_reg_write_lock(int addr, int val) +{ + unsigned long flags; + + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return; + } + + spin_lock_irqsave(&g_pmic->lock, flags); + hisi_pmic_write(g_pmic, g_pmic->normal_lock.addr, g_pmic->normal_lock.val); + hisi_pmic_write(g_pmic, g_pmic->debug_lock.addr, g_pmic->debug_lock.val); + hisi_pmic_write(g_pmic, addr, val); + hisi_pmic_write(g_pmic, g_pmic->normal_lock.addr, 0); + hisi_pmic_write(g_pmic, g_pmic->debug_lock.addr, 0); + spin_unlock_irqrestore(&g_pmic->lock, flags); +} + +int hisi_pmic_array_read(int addr, char *buff, unsigned int len) +{ + unsigned int i; + + if ((len > 32) || (NULL == buff)) { + return -EINVAL; + } + + /* + * Here is a bug in the pmu die. + * the coul driver will read 4 bytes, + * but the ssi bus only read 1 byte, and the pmu die + * will make sampling 1/10669us about vol cur,so the driver + * read the data is not the same sampling + */ + for (i = 0; i < len; i++) + { + *(buff + i) = hisi_pmic_reg_read(addr+i); + } + + return 0; +} + +int hisi_pmic_array_write(int addr, char *buff, unsigned int len) +{ + unsigned int i; + + if ((len > 32) || (NULL == buff)) { + return -EINVAL; + } + + for (i = 0; i < len; i++) + { + hisi_pmic_reg_write(addr+i, *(buff + i)); + } + + return 0; +} + +static irqreturn_t hisi_irq_handler(int irq, void *data) +{ + struct hisi_pmic *pmic = (struct hisi_pmic *)data; + unsigned long pending; + int i, offset; + + for (i = 0; i < pmic->irqarray; i++) { + pending = hisi_pmic_reg_read((i + pmic->irq_addr.start_addr)); + pending &= HISI_MASK_FIELD; + if (pending != 0) { + pr_info("pending[%d]=0x%lx\n\r", i, pending); + } + + hisi_pmic_reg_write((i + pmic->irq_addr.start_addr), pending); + + /*solve powerkey order*/ + if ((HISI_IRQ_KEY_NUM == i) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { + generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_DOWN]); + generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_UP]); + pending &= (~HISI_IRQ_KEY_VALUE); + } + + if (pending) { + for_each_set_bit(offset, &pending, HISI_BITS) + generic_handle_irq(pmic->irqs[offset + i * HISI_BITS]);/*lint !e679 */ + } + } + + /*Handle the second group irq if analysis the second group irq from dtsi*/ + if (1 == g_extinterrupt_flag){ + for (i = 0; i < pmic->irqarray1; i++) { + pending = hisi_pmic_reg_read((i + pmic->irq_addr1.start_addr)); + pending &= HISI_MASK_FIELD; + if (pending != 0) { + pr_info("pending[%d]=0x%lx\n\r", i, pending); + } + + hisi_pmic_reg_write((i + pmic->irq_addr1.start_addr), pending); + + if (pending) { + for_each_set_bit(offset, &pending, HISI_BITS) + generic_handle_irq(pmic->irqs[offset + (i+HISI_PMIC_FIRST_GROUP_INT_NUM) * HISI_BITS]);/*lint !e679 */ + } + } + } + + return IRQ_HANDLED; +} + +static void hisi_irq_mask(struct irq_data *d) +{ + struct hisi_pmic *pmic = irq_data_get_irq_chip_data(d); + u32 data, offset; + unsigned long flags; + + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return; + } + + offset = (irqd_to_hwirq(d) >> 3); + if (1==g_extinterrupt_flag){ + if ( offset < HISI_PMIC_FIRST_GROUP_INT_NUM) + offset += pmic->irq_mask_addr.start_addr; + else/*Change addr when irq num larger than 16 because interrupt addr is nonsequence*/ + offset = offset+(pmic->irq_mask_addr1.start_addr)-HISI_PMIC_FIRST_GROUP_INT_NUM; + }else{ + offset += pmic->irq_mask_addr.start_addr; + } + spin_lock_irqsave(&g_pmic->lock, flags); + data = hisi_pmic_reg_read(offset); + data |= (1 << (irqd_to_hwirq(d) & 0x07)); + hisi_pmic_reg_write(offset, data); + spin_unlock_irqrestore(&g_pmic->lock, flags); +} + +static void hisi_irq_unmask(struct irq_data *d) +{ + struct hisi_pmic *pmic = irq_data_get_irq_chip_data(d); + u32 data, offset; + unsigned long flags; + + if (NULL == g_pmic) { + pr_err(" g_pmic is NULL\n"); + return; + } + + offset = (irqd_to_hwirq(d) >> 3); + if (1==g_extinterrupt_flag){ + if ( offset < HISI_PMIC_FIRST_GROUP_INT_NUM) + offset += pmic->irq_mask_addr.start_addr; + else + offset = offset+(pmic->irq_mask_addr1.start_addr)-HISI_PMIC_FIRST_GROUP_INT_NUM; + }else{ + offset += pmic->irq_mask_addr.start_addr; + } + spin_lock_irqsave(&g_pmic->lock, flags); + data = hisi_pmic_reg_read(offset); + data &= ~(1 << (irqd_to_hwirq(d) & 0x07)); /*lint !e502 */ + hisi_pmic_reg_write(offset, data); + spin_unlock_irqrestore(&g_pmic->lock, flags); +} + +static struct irq_chip hisi_pmu_irqchip = { + .name = "hisi-irq", + .irq_mask = hisi_irq_mask, + .irq_unmask = hisi_irq_unmask, + .irq_disable = hisi_irq_mask, + .irq_enable = hisi_irq_unmask, +}; + +static int hisi_irq_map(struct irq_domain *d, unsigned int virq, + irq_hw_number_t hw) +{ + struct hisi_pmic *pmic = d->host_data; + + irq_set_chip_and_handler_name(virq, &hisi_pmu_irqchip, + handle_simple_irq, "hisi"); + irq_set_chip_data(virq, pmic); + irq_set_irq_type(virq, IRQ_TYPE_NONE); + + return 0; +} + +static struct irq_domain_ops hisi_domain_ops = { + .map = hisi_irq_map, + .xlate = irq_domain_xlate_twocell, +}; + +/*lint -e570 -e64*/ +static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *pmic) +{ + int ret = 0; + + /*get pmic irq num*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-num", + &(pmic->irqnum), 1); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-num property set\n"); + ret = -ENODEV; + return ret; + } + + /*get pmic irq array number*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-array", + &(pmic->irqarray), 1); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-array property set\n"); + ret = -ENODEV; + return ret; + } + + /*SOC_PMIC_IRQ_MASK_0_ADDR*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-mask-addr", + (int *)&pmic->irq_mask_addr, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-mask-addr property set\n"); + ret = -ENODEV; + return ret; + } + + /*SOC_PMIC_IRQ0_ADDR*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-addr", + (int *)&pmic->irq_addr, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-addr property set\n"); + ret = -ENODEV; + return ret; + } + + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-vbus", + (u32 *)&g_pmic_vbus, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-vbus property\n"); + ret = -ENODEV; + return ret; + } + + /*pmic lock*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-lock", + (int *)&pmic->normal_lock, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-lock property set\n"); + ret = -ENODEV; + return ret; + } + + /*pmic debug lock*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-debug-lock", + (int *)&pmic->debug_lock, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-debug-lock property set\n"); + ret = -ENODEV; + return ret; + } + + return ret; +}/*lint -restore*/ + + +/*lint -e570 -e64*/ +static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic *pmic) +{ + int ret = 0; + + /*get pmic irq num*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-num1", + &(pmic->irqnum1), 1); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-num1 property set\n"); + ret = -ENODEV; + pmic->irqnum1 = 0; + return ret; + } + + /*get pmic irq array number*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-array1", + &(pmic->irqarray1), 1); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-array1 property set\n"); + ret = -ENODEV; + return ret; + } + + /*SOC_PMIC_IRQ_MASK_0_ADDR*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-mask-addr1", + (int *)&pmic->irq_mask_addr1, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-mask-addr1 property set\n"); + ret = -ENODEV; + return ret; + } + + /*SOC_PMIC_IRQ0_ADDR*/ + ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-addr1", + (int *)&pmic->irq_addr1, 2); + if (ret) { + pr_err("no hisilicon,hisi-pmic-irq-addr1 property set\n"); + ret = -ENODEV; + return ret; + } + + g_extinterrupt_flag = 1; + return ret; +}/*lint -restore*/ + +int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list) +{ + if ( NULL == g_pmic ) { + pr_err("[%s]g_pmic is NULL\n", __func__); + return -1; + } + + if (pmic_irq_list > (unsigned int)g_pmic->irqnum) { + pr_err("[%s]input pmic irq number is error.\n", __func__); + return -1; + } + pr_info("%s:g_pmic->irqs[%d]=%d\n", __func__, pmic_irq_list, g_pmic->irqs[pmic_irq_list]); + return (int)g_pmic->irqs[pmic_irq_list]; +} +EXPORT_SYMBOL(hisi_get_pmic_irq_byname); + +int hisi_pmic_get_vbus_status(void) +{ + if (0 == g_pmic_vbus.addr) + return -1; + + if (hisi_pmic_reg_read(g_pmic_vbus.addr) & BIT(g_pmic_vbus.bit)) + return 1; + + return 0; +} +EXPORT_SYMBOL(hisi_pmic_get_vbus_status); + +static void hisi_pmic_irq_prc(struct hisi_pmic *pmic) +{ + int i; + for (i = 0 ; i < pmic->irq_mask_addr.array; i++) { + hisi_pmic_write(pmic, pmic->irq_mask_addr.start_addr + i, HISI_MASK_STATE); + } + + for (i = 0 ; i < pmic->irq_addr.array; i++) { + unsigned int pending = hisi_pmic_read(pmic, pmic->irq_addr.start_addr + i); + pr_debug("PMU IRQ address value:irq[0x%x] = 0x%x\n", pmic->irq_addr.start_addr + i, pending); + hisi_pmic_write(pmic, pmic->irq_addr.start_addr + i, HISI_MASK_STATE); + } + +} + +static void hisi_pmic_irq1_prc(struct hisi_pmic *pmic) +{ + int i; + if(1 == g_extinterrupt_flag){ + for (i = 0 ; i < pmic->irq_mask_addr1.array; i++) { + hisi_pmic_write(pmic, pmic->irq_mask_addr1.start_addr + i, HISI_MASK_STATE); + } + + for (i = 0 ; i < pmic->irq_addr1.array; i++) { + unsigned int pending1 = hisi_pmic_read(pmic, pmic->irq_addr1.start_addr + i); + pr_debug("PMU IRQ address1 value:irq[0x%x] = 0x%x\n", pmic->irq_addr1.start_addr + i, pending1); + hisi_pmic_write(pmic, pmic->irq_addr1.start_addr + i, HISI_MASK_STATE); + } + } +} + +static int hisi_pmic_probe(struct spmi_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct hisi_pmic *pmic = NULL; + enum of_gpio_flags flags; + int ret = 0; + int i; + unsigned int fpga_flag = 0; + unsigned int virq; + + pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL); + if (!pmic) { + dev_err(dev, "cannot allocate hisi_pmic device info\n"); + return -ENOMEM; + } + + /*TODO: get pmic dts info*/ + ret = get_pmic_device_tree_data(np, pmic); + if (ret) { + dev_err(&pdev->dev, "Error reading hisi pmic dts \n"); + return ret; + } + + /*get pmic dts the second group irq*/ + ret = get_pmic_device_tree_data1(np, pmic); + if (ret) { + dev_err(&pdev->dev, "the platform don't support ext-interrupt.\n"); + } + + /* TODO: get and enable clk request */ + spin_lock_init(&pmic->lock); + + pmic->dev = dev; + g_pmic = pmic; + ret = of_property_read_u32_array(np, "hisilicon,pmic_fpga_flag", &fpga_flag, 1); + if (ret) { + pr_err("no hisilicon,pmic_fpga_flag property set\n"); + } + if (PMIC_FPGA_FLAG == fpga_flag) { + goto after_irq_register; + } + + pmic->gpio = of_get_gpio_flags(np, 0, &flags); + if (pmic->gpio < 0) + return pmic->gpio; + + if (!gpio_is_valid(pmic->gpio)) + return -EINVAL; + + ret = gpio_request_one(pmic->gpio, GPIOF_IN, "pmic"); + if (ret < 0) { + dev_err(dev, "failed to request gpio%d\n", pmic->gpio); + return ret; + } + + pmic->irq = gpio_to_irq(pmic->gpio); + + /* mask && clear IRQ status */ + hisi_pmic_irq_prc(pmic); + /*clear && mask the new adding irq*/ + hisi_pmic_irq1_prc(pmic); + + pmic->irqnum += pmic->irqnum1; + + pmic->irqs = (unsigned int *)devm_kmalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL); + if (!pmic->irqs) { + pr_err("%s:Failed to alloc memory for pmic irq number!\n", __func__); + goto irq_malloc; + } + memset(pmic->irqs, 0, pmic->irqnum); + + pmic->domain = irq_domain_add_simple(np, pmic->irqnum, 0, + &hisi_domain_ops, pmic); + if (!pmic->domain) { + dev_err(dev, "failed irq domain add simple!\n"); + ret = -ENODEV; + goto irq_domain; + } + + for (i = 0; i < pmic->irqnum; i++) { + virq = irq_create_mapping(pmic->domain, i); + if (virq == NO_IRQ) { + pr_debug("Failed mapping hwirq\n"); + ret = -ENOSPC; + goto irq_create_mapping; + } + pmic->irqs[i] = virq; + pr_info("[%s]. pmic->irqs[%d] = %d\n", __func__, i, pmic->irqs[i]); + } + + ret = request_threaded_irq(pmic->irq, hisi_irq_handler, NULL, + IRQF_TRIGGER_LOW | IRQF_SHARED | IRQF_NO_SUSPEND, + "pmic", pmic); + if (ret < 0) { + dev_err(dev, "could not claim pmic %d\n", ret); + ret = -ENODEV; + goto request_theaded_irq; + } + +after_irq_register: + return 0; + + +request_theaded_irq: +irq_create_mapping: +irq_domain: +irq_malloc: + gpio_free(pmic->gpio); + g_pmic = NULL; + return ret; +} + +static void hisi_pmic_remove(struct spmi_device *pdev) +{ + + struct hisi_pmic *pmic = dev_get_drvdata(&pdev->dev); + + free_irq(pmic->irq, pmic); + gpio_free(pmic->gpio); + devm_kfree(&pdev->dev, pmic); + +} +static int hisi_pmic_suspend(struct device *dev, pm_message_t state) +{ + struct hisi_pmic *pmic = dev_get_drvdata(dev); + + if (NULL == pmic) { + pr_err("%s:pmic is NULL\n", __func__); + return -ENOMEM; + } + + pr_info("%s:+\n", __func__); + pr_info("%s:-\n", __func__); + + return 0; +}/*lint !e715 */ + +static int hisi_pmic_resume(struct device *dev) +{ + struct hisi_pmic *pmic = dev_get_drvdata(dev); + + if (NULL == pmic) { + pr_err("%s:pmic is NULL\n", __func__); + return -ENOMEM; + } + + pr_info("%s:+\n", __func__); + pr_info("%s:-\n", __func__); + + return 0; +} + +MODULE_DEVICE_TABLE(spmi, pmic_spmi_id); +static struct spmi_driver hisi_pmic_driver = { + .driver = { + .name = "hisi_pmic", + .owner = THIS_MODULE, + .of_match_table = of_hisi_pmic_match_tbl, + .suspend = hisi_pmic_suspend, + .resume = hisi_pmic_resume, + }, + .probe = hisi_pmic_probe, + .remove = hisi_pmic_remove, +}; + +static int __init hisi_pmic_init(void) +{ + return spmi_driver_register(&hisi_pmic_driver); +} + +static void __exit hisi_pmic_exit(void) +{ + spmi_driver_unregister(&hisi_pmic_driver); +} + + +subsys_initcall_sync(hisi_pmic_init); +module_exit(hisi_pmic_exit); + +MODULE_DESCRIPTION("PMIC driver"); +MODULE_LICENSE("GPL v2"); + diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h new file mode 100644 index 000000000000..939b36f617c1 --- /dev/null +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -0,0 +1,165 @@ +/* + * Header file for device driver Hi6421 PMIC + * + * Copyright (c) 2013 Linaro Ltd. + * Copyright (C) 2011 Hisilicon. + * + * Guodong Xu <guodong.xu@linaro.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef __HISI_PMIC_H +#define __HISI_PMIC_H + +#include <linux/irqdomain.h> + +#define HISI_REGS_ENA_PROTECT_TIME (0) /* in microseconds */ +#define HISI_ECO_MODE_ENABLE (1) +#define HISI_ECO_MODE_DISABLE (0) + +typedef int (*pmic_ocp_callback)(char *); +extern int hisi_pmic_special_ocp_register(char *power_name, pmic_ocp_callback handler); + +struct irq_mask_info { + int start_addr; + int array; +}; + +struct irq_info { + int start_addr; + int array; +}; + +struct bit_info { + int addr; + int bit; +}; + +struct write_lock { + int addr; + int val; +}; + +struct hisi_pmic { + struct resource *res; + struct device *dev; + void __iomem *regs; + spinlock_t lock; + struct irq_domain *domain; + int irq; + int gpio; + unsigned int *irqs; + int irqnum; + int irqarray; + struct irq_mask_info irq_mask_addr; + struct irq_info irq_addr; + int irqnum1; + int irqarray1; + struct irq_mask_info irq_mask_addr1; + struct irq_info irq_addr1; + struct write_lock normal_lock; + struct write_lock debug_lock; +}; + +/* 0:disable; 1:enable */ +unsigned int get_uv_mntn_status(void); +void clear_uv_mntn_resered_reg_bit(void); +void set_uv_mntn_resered_reg_bit(void); + +#if defined(CONFIG_HISI_PMIC) || defined(CONFIG_HISI_PMIC_PMU_SPMI) +/* Register Access Helpers */ +u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg); +void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val); +void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits); +unsigned int hisi_pmic_reg_read(int addr); +void hisi_pmic_reg_write(int addr, int val); +void hisi_pmic_reg_write_lock(int addr, int val); +int hisi_pmic_array_read(int addr, char *buff, unsigned int len); +int hisi_pmic_array_write(int addr, char *buff, unsigned int len); +extern int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list); +extern int hisi_pmic_get_vbus_status(void); +#if defined(CONFIG_HISI_DIEID) +u32 hisi_pmic_read_sub_pmu(u8 sid ,int reg); +void hisi_pmic_write_sub_pmu(u8 sid ,int reg, u32 val); +#endif +#else +static inline u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) { return 0; } +static inline void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) {} +static inline void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) {} +static inline unsigned int hisi_pmic_reg_read(int addr) { return 0; } +static inline void hisi_pmic_reg_write(int addr, int val) {} +static inline void hisi_pmic_reg_write_lock(int addr, int val) {} +static inline int hisi_pmic_array_read(int addr, char *buff, unsigned int len) { return 0; } +static inline int hisi_pmic_array_write(int addr, char *buff, unsigned int len) { return 0; } +static inline int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list) { return -1; } +static inline int hisi_pmic_get_vbus_status(void) { return 1; } +static inline u32 hisi_pmic_read_sub_pmu(u8 sid ,int reg) { return 0; } +static inline void hisi_pmic_write_sub_pmu(u8 sid ,int reg, u32 val) {} +#endif + +#ifdef CONFIG_HISI_HI6421V500_PMU +enum pmic_irq_list { + POR_D45MR = 0, + VBUS_CONNECT, + VBUS_DISCONNECT, + ALARMON_R, + HOLD_6S, + HOLD_1S, + POWERKEY_UP, + POWERKEY_DOWN, + OCP_SCP_R, + COUL_R, + VSYS_OV, + VSYS_UV, + VSYS_PWROFF_ABS, + VSYS_PWROFF_DEB, + THSD_OTMP140, + THSD_OTMP125, + HRESETN, + SIM0_HPD_R = 24, + SIM0_HPD_F, + SIM0_HPD_H, + SIM0_HPD_L, + SIM1_HPD_R, + SIM1_HPD_F, + SIM1_HPD_H, + SIM1_HPD_L, + PMIC_IRQ_LIST_MAX, +}; +#else +enum pmic_irq_list { + OTMP = 0, + VBUS_CONNECT, + VBUS_DISCONNECT, + ALARMON_R, + HOLD_6S, + HOLD_1S, + POWERKEY_UP, + POWERKEY_DOWN, + OCP_SCP_R, + COUL_R, + SIM0_HPD_R, + SIM0_HPD_F, + SIM1_HPD_R, + SIM1_HPD_F, + PMIC_IRQ_LIST_MAX, +}; +#endif + +#ifdef CONFIG_HISI_SR_DEBUG +extern void get_ip_regulator_state(void); +#endif +#endif /* __HISI_PMIC_H */ + -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 12/44] staging: mfd: hi6421-spmi-pmic: get rid of unused code 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, Lee Jones, linux-kernel, devel There are some checks there which could make sense for downstream builds, but doesn't make much sense for upstream ones. They came from the official Hikey970 tree from Linaro, but even there, the commented-out code is not set via other Kconfig vars. So, let's just get rid of that. If needed later, this patch can be (partially?) reversed. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 63 --------------------- include/linux/mfd/hi6421-spmi-pmic.h | 42 -------------- 2 files changed, 105 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 6bb0bc4b203b..809381eb6043 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -53,10 +53,6 @@ #define HISI_PMIC_FIRST_GROUP_INT_NUM 2 static struct bit_info g_pmic_vbus = {0}; -#ifndef BIT -#define BIT(x) (0x1U << (x)) -#endif - static struct hisi_pmic *g_pmic; static unsigned int g_extinterrupt_flag = 0; static struct of_device_id of_hisi_pmic_match_tbl[] = { @@ -121,65 +117,6 @@ void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) } EXPORT_SYMBOL(hisi_pmic_write); -#ifdef CONFIG_HISI_DIEID -u32 hisi_pmic_read_sub_pmu(u8 sid, int reg) -{ - u32 ret; - u8 read_value = 0; - struct spmi_device *pdev; - - if(strstr(saved_command_line, "androidboot.swtype=factory")) - { - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); - return -1;/*lint !e570 */ - } - - pdev = to_spmi_device(g_pmic->dev); - if (NULL == pdev) { - pr_err("%s:pdev get failed!\n", __func__); - return -1;/*lint !e570 */ - } - - ret = spmi_ext_register_readl(pdev->ctrl, sid, reg, (unsigned char*)&read_value, 1);/*lint !e734 !e732 */ - if (ret) { - pr_err("%s:spmi_ext_register_readl failed!\n", __func__); - return ret; - } - return (u32)read_value; - } - return 0; -} -EXPORT_SYMBOL(hisi_pmic_read_sub_pmu); - -void hisi_pmic_write_sub_pmu(u8 sid, int reg, u32 val) -{ - u32 ret; - struct spmi_device *pdev; - if(strstr(saved_command_line, "androidboot.swtype=factory")) - { - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); - return; - } - - pdev = to_spmi_device(g_pmic->dev); - if (NULL == pdev) { - pr_err("%s:pdev get failed!\n", __func__); - return; - } - - ret = spmi_ext_register_writel(pdev->ctrl, sid, reg, (unsigned char*)&val, 1);/*lint !e734 !e732 */ - if (ret) { - pr_err("%s:spmi_ext_register_writel failed!\n", __func__); - return ; - } - } - - return ; -} -EXPORT_SYMBOL(hisi_pmic_write_sub_pmu); -#endif void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index 939b36f617c1..5be9b4d3f207 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -78,7 +78,6 @@ unsigned int get_uv_mntn_status(void); void clear_uv_mntn_resered_reg_bit(void); void set_uv_mntn_resered_reg_bit(void); -#if defined(CONFIG_HISI_PMIC) || defined(CONFIG_HISI_PMIC_PMU_SPMI) /* Register Access Helpers */ u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg); void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val); @@ -90,11 +89,6 @@ int hisi_pmic_array_read(int addr, char *buff, unsigned int len); int hisi_pmic_array_write(int addr, char *buff, unsigned int len); extern int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list); extern int hisi_pmic_get_vbus_status(void); -#if defined(CONFIG_HISI_DIEID) -u32 hisi_pmic_read_sub_pmu(u8 sid ,int reg); -void hisi_pmic_write_sub_pmu(u8 sid ,int reg, u32 val); -#endif -#else static inline u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) { return 0; } static inline void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) {} static inline void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) {} @@ -107,38 +101,7 @@ static inline int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list) { return static inline int hisi_pmic_get_vbus_status(void) { return 1; } static inline u32 hisi_pmic_read_sub_pmu(u8 sid ,int reg) { return 0; } static inline void hisi_pmic_write_sub_pmu(u8 sid ,int reg, u32 val) {} -#endif -#ifdef CONFIG_HISI_HI6421V500_PMU -enum pmic_irq_list { - POR_D45MR = 0, - VBUS_CONNECT, - VBUS_DISCONNECT, - ALARMON_R, - HOLD_6S, - HOLD_1S, - POWERKEY_UP, - POWERKEY_DOWN, - OCP_SCP_R, - COUL_R, - VSYS_OV, - VSYS_UV, - VSYS_PWROFF_ABS, - VSYS_PWROFF_DEB, - THSD_OTMP140, - THSD_OTMP125, - HRESETN, - SIM0_HPD_R = 24, - SIM0_HPD_F, - SIM0_HPD_H, - SIM0_HPD_L, - SIM1_HPD_R, - SIM1_HPD_F, - SIM1_HPD_H, - SIM1_HPD_L, - PMIC_IRQ_LIST_MAX, -}; -#else enum pmic_irq_list { OTMP = 0, VBUS_CONNECT, @@ -156,10 +119,5 @@ enum pmic_irq_list { SIM1_HPD_F, PMIC_IRQ_LIST_MAX, }; -#endif - -#ifdef CONFIG_HISI_SR_DEBUG -extern void get_ip_regulator_state(void); -#endif #endif /* __HISI_PMIC_H */ -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 12/44] staging: mfd: hi6421-spmi-pmic: get rid of unused code @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab, Lee Jones There are some checks there which could make sense for downstream builds, but doesn't make much sense for upstream ones. They came from the official Hikey970 tree from Linaro, but even there, the commented-out code is not set via other Kconfig vars. So, let's just get rid of that. If needed later, this patch can be (partially?) reversed. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 63 --------------------- include/linux/mfd/hi6421-spmi-pmic.h | 42 -------------- 2 files changed, 105 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 6bb0bc4b203b..809381eb6043 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -53,10 +53,6 @@ #define HISI_PMIC_FIRST_GROUP_INT_NUM 2 static struct bit_info g_pmic_vbus = {0}; -#ifndef BIT -#define BIT(x) (0x1U << (x)) -#endif - static struct hisi_pmic *g_pmic; static unsigned int g_extinterrupt_flag = 0; static struct of_device_id of_hisi_pmic_match_tbl[] = { @@ -121,65 +117,6 @@ void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) } EXPORT_SYMBOL(hisi_pmic_write); -#ifdef CONFIG_HISI_DIEID -u32 hisi_pmic_read_sub_pmu(u8 sid, int reg) -{ - u32 ret; - u8 read_value = 0; - struct spmi_device *pdev; - - if(strstr(saved_command_line, "androidboot.swtype=factory")) - { - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); - return -1;/*lint !e570 */ - } - - pdev = to_spmi_device(g_pmic->dev); - if (NULL == pdev) { - pr_err("%s:pdev get failed!\n", __func__); - return -1;/*lint !e570 */ - } - - ret = spmi_ext_register_readl(pdev->ctrl, sid, reg, (unsigned char*)&read_value, 1);/*lint !e734 !e732 */ - if (ret) { - pr_err("%s:spmi_ext_register_readl failed!\n", __func__); - return ret; - } - return (u32)read_value; - } - return 0; -} -EXPORT_SYMBOL(hisi_pmic_read_sub_pmu); - -void hisi_pmic_write_sub_pmu(u8 sid, int reg, u32 val) -{ - u32 ret; - struct spmi_device *pdev; - if(strstr(saved_command_line, "androidboot.swtype=factory")) - { - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); - return; - } - - pdev = to_spmi_device(g_pmic->dev); - if (NULL == pdev) { - pr_err("%s:pdev get failed!\n", __func__); - return; - } - - ret = spmi_ext_register_writel(pdev->ctrl, sid, reg, (unsigned char*)&val, 1);/*lint !e734 !e732 */ - if (ret) { - pr_err("%s:spmi_ext_register_writel failed!\n", __func__); - return ; - } - } - - return ; -} -EXPORT_SYMBOL(hisi_pmic_write_sub_pmu); -#endif void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index 939b36f617c1..5be9b4d3f207 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -78,7 +78,6 @@ unsigned int get_uv_mntn_status(void); void clear_uv_mntn_resered_reg_bit(void); void set_uv_mntn_resered_reg_bit(void); -#if defined(CONFIG_HISI_PMIC) || defined(CONFIG_HISI_PMIC_PMU_SPMI) /* Register Access Helpers */ u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg); void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val); @@ -90,11 +89,6 @@ int hisi_pmic_array_read(int addr, char *buff, unsigned int len); int hisi_pmic_array_write(int addr, char *buff, unsigned int len); extern int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list); extern int hisi_pmic_get_vbus_status(void); -#if defined(CONFIG_HISI_DIEID) -u32 hisi_pmic_read_sub_pmu(u8 sid ,int reg); -void hisi_pmic_write_sub_pmu(u8 sid ,int reg, u32 val); -#endif -#else static inline u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) { return 0; } static inline void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) {} static inline void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) {} @@ -107,38 +101,7 @@ static inline int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list) { return static inline int hisi_pmic_get_vbus_status(void) { return 1; } static inline u32 hisi_pmic_read_sub_pmu(u8 sid ,int reg) { return 0; } static inline void hisi_pmic_write_sub_pmu(u8 sid ,int reg, u32 val) {} -#endif -#ifdef CONFIG_HISI_HI6421V500_PMU -enum pmic_irq_list { - POR_D45MR = 0, - VBUS_CONNECT, - VBUS_DISCONNECT, - ALARMON_R, - HOLD_6S, - HOLD_1S, - POWERKEY_UP, - POWERKEY_DOWN, - OCP_SCP_R, - COUL_R, - VSYS_OV, - VSYS_UV, - VSYS_PWROFF_ABS, - VSYS_PWROFF_DEB, - THSD_OTMP140, - THSD_OTMP125, - HRESETN, - SIM0_HPD_R = 24, - SIM0_HPD_F, - SIM0_HPD_H, - SIM0_HPD_L, - SIM1_HPD_R, - SIM1_HPD_F, - SIM1_HPD_H, - SIM1_HPD_L, - PMIC_IRQ_LIST_MAX, -}; -#else enum pmic_irq_list { OTMP = 0, VBUS_CONNECT, @@ -156,10 +119,5 @@ enum pmic_irq_list { SIM1_HPD_F, PMIC_IRQ_LIST_MAX, }; -#endif - -#ifdef CONFIG_HISI_SR_DEBUG -extern void get_ip_regulator_state(void); -#endif #endif /* __HISI_PMIC_H */ -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 13/44] staging: mfd: hi6421-spmi-pmic: deal with non-static functions 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Several functions aren't used outside the mfd driver. So, either remove or make them static. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 147 ++++---------------- 1 file changed, 24 insertions(+), 123 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 809381eb6043..8b87d48b88b5 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -73,21 +73,21 @@ u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) u8 read_value = 0; struct spmi_device *pdev; - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); + if (!g_pmic) { + pr_err("%s: g_pmic is NULL\n", __func__); return 0; } pdev = to_spmi_device(g_pmic->dev); - if (NULL == pdev) { - pr_err("%s:pdev get failed!\n", __func__); + if (!pdev) { + pr_err("%s: pdev get failed!\n", __func__); return 0; } ret = spmi_ext_register_readl(pdev, reg, (unsigned char*)&read_value, 1);/*lint !e734 !e732 */ if (ret) { - pr_err("%s:spmi_ext_register_readl failed!\n", __func__); - return ret; + pr_err("%s: spmi_ext_register_readl failed!\n", __func__); + return 0; } return (u32)read_value; } @@ -98,34 +98,32 @@ void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) u32 ret; struct spmi_device *pdev; - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); + if (!g_pmic) { + pr_err("%s: g_pmic is NULL\n", __func__); return; } pdev = to_spmi_device(g_pmic->dev); - if (NULL == pdev) { - pr_err("%s:pdev get failed!\n", __func__); + if (!pdev) { + pr_err("%s: pdev get failed!\n", __func__); return; } ret = spmi_ext_register_writel(pdev, reg, (unsigned char*)&val, 1);/*lint !e734 !e732 */ if (ret) { - pr_err("%s:spmi_ext_register_writel failed!\n", __func__); - return ; + pr_err("%s: spmi_ext_register_writel failed!\n", __func__); + return; } } EXPORT_SYMBOL(hisi_pmic_write); - -void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, - u32 mask, u32 bits) +void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) { u32 data; unsigned long flags; - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); + if (!g_pmic) { + pr_err("%s: g_pmic is NULL\n", __func__); return; } @@ -137,75 +135,6 @@ void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, } EXPORT_SYMBOL(hisi_pmic_rmw); -unsigned int hisi_pmic_reg_read(int addr) -{ - return (unsigned int)hisi_pmic_read(g_pmic, addr); -} -EXPORT_SYMBOL(hisi_pmic_reg_read); - -void hisi_pmic_reg_write(int addr, int val) -{ - hisi_pmic_write(g_pmic, addr, val); -} -EXPORT_SYMBOL(hisi_pmic_reg_write); - -void hisi_pmic_reg_write_lock(int addr, int val) -{ - unsigned long flags; - - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); - return; - } - - spin_lock_irqsave(&g_pmic->lock, flags); - hisi_pmic_write(g_pmic, g_pmic->normal_lock.addr, g_pmic->normal_lock.val); - hisi_pmic_write(g_pmic, g_pmic->debug_lock.addr, g_pmic->debug_lock.val); - hisi_pmic_write(g_pmic, addr, val); - hisi_pmic_write(g_pmic, g_pmic->normal_lock.addr, 0); - hisi_pmic_write(g_pmic, g_pmic->debug_lock.addr, 0); - spin_unlock_irqrestore(&g_pmic->lock, flags); -} - -int hisi_pmic_array_read(int addr, char *buff, unsigned int len) -{ - unsigned int i; - - if ((len > 32) || (NULL == buff)) { - return -EINVAL; - } - - /* - * Here is a bug in the pmu die. - * the coul driver will read 4 bytes, - * but the ssi bus only read 1 byte, and the pmu die - * will make sampling 1/10669us about vol cur,so the driver - * read the data is not the same sampling - */ - for (i = 0; i < len; i++) - { - *(buff + i) = hisi_pmic_reg_read(addr+i); - } - - return 0; -} - -int hisi_pmic_array_write(int addr, char *buff, unsigned int len) -{ - unsigned int i; - - if ((len > 32) || (NULL == buff)) { - return -EINVAL; - } - - for (i = 0; i < len; i++) - { - hisi_pmic_reg_write(addr+i, *(buff + i)); - } - - return 0; -} - static irqreturn_t hisi_irq_handler(int irq, void *data) { struct hisi_pmic *pmic = (struct hisi_pmic *)data; @@ -213,13 +142,13 @@ static irqreturn_t hisi_irq_handler(int irq, void *data) int i, offset; for (i = 0; i < pmic->irqarray; i++) { - pending = hisi_pmic_reg_read((i + pmic->irq_addr.start_addr)); + pending = hisi_pmic_read(g_pmic, (i + pmic->irq_addr.start_addr)); pending &= HISI_MASK_FIELD; if (pending != 0) { pr_info("pending[%d]=0x%lx\n\r", i, pending); } - hisi_pmic_reg_write((i + pmic->irq_addr.start_addr), pending); + hisi_pmic_write(g_pmic, (i + pmic->irq_addr.start_addr), pending); /*solve powerkey order*/ if ((HISI_IRQ_KEY_NUM == i) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { @@ -237,13 +166,13 @@ static irqreturn_t hisi_irq_handler(int irq, void *data) /*Handle the second group irq if analysis the second group irq from dtsi*/ if (1 == g_extinterrupt_flag){ for (i = 0; i < pmic->irqarray1; i++) { - pending = hisi_pmic_reg_read((i + pmic->irq_addr1.start_addr)); + pending = hisi_pmic_read(g_pmic, (i + pmic->irq_addr1.start_addr)); pending &= HISI_MASK_FIELD; if (pending != 0) { pr_info("pending[%d]=0x%lx\n\r", i, pending); } - hisi_pmic_reg_write((i + pmic->irq_addr1.start_addr), pending); + hisi_pmic_write(g_pmic, (i + pmic->irq_addr1.start_addr), pending); if (pending) { for_each_set_bit(offset, &pending, HISI_BITS) @@ -276,9 +205,9 @@ static void hisi_irq_mask(struct irq_data *d) offset += pmic->irq_mask_addr.start_addr; } spin_lock_irqsave(&g_pmic->lock, flags); - data = hisi_pmic_reg_read(offset); + data = hisi_pmic_read(g_pmic, offset); data |= (1 << (irqd_to_hwirq(d) & 0x07)); - hisi_pmic_reg_write(offset, data); + hisi_pmic_write(g_pmic, offset, data); spin_unlock_irqrestore(&g_pmic->lock, flags); } @@ -303,9 +232,9 @@ static void hisi_irq_unmask(struct irq_data *d) offset += pmic->irq_mask_addr.start_addr; } spin_lock_irqsave(&g_pmic->lock, flags); - data = hisi_pmic_reg_read(offset); - data &= ~(1 << (irqd_to_hwirq(d) & 0x07)); /*lint !e502 */ - hisi_pmic_reg_write(offset, data); + data = hisi_pmic_read(g_pmic, offset); + data &= ~(1 << (irqd_to_hwirq(d) & 0x07)); + hisi_pmic_write(g_pmic, offset, data); spin_unlock_irqrestore(&g_pmic->lock, flags); } @@ -452,34 +381,6 @@ static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic * return ret; }/*lint -restore*/ -int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list) -{ - if ( NULL == g_pmic ) { - pr_err("[%s]g_pmic is NULL\n", __func__); - return -1; - } - - if (pmic_irq_list > (unsigned int)g_pmic->irqnum) { - pr_err("[%s]input pmic irq number is error.\n", __func__); - return -1; - } - pr_info("%s:g_pmic->irqs[%d]=%d\n", __func__, pmic_irq_list, g_pmic->irqs[pmic_irq_list]); - return (int)g_pmic->irqs[pmic_irq_list]; -} -EXPORT_SYMBOL(hisi_get_pmic_irq_byname); - -int hisi_pmic_get_vbus_status(void) -{ - if (0 == g_pmic_vbus.addr) - return -1; - - if (hisi_pmic_reg_read(g_pmic_vbus.addr) & BIT(g_pmic_vbus.bit)) - return 1; - - return 0; -} -EXPORT_SYMBOL(hisi_pmic_get_vbus_status); - static void hisi_pmic_irq_prc(struct hisi_pmic *pmic) { int i; -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 13/44] staging: mfd: hi6421-spmi-pmic: deal with non-static functions @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Several functions aren't used outside the mfd driver. So, either remove or make them static. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 147 ++++---------------- 1 file changed, 24 insertions(+), 123 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 809381eb6043..8b87d48b88b5 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -73,21 +73,21 @@ u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) u8 read_value = 0; struct spmi_device *pdev; - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); + if (!g_pmic) { + pr_err("%s: g_pmic is NULL\n", __func__); return 0; } pdev = to_spmi_device(g_pmic->dev); - if (NULL == pdev) { - pr_err("%s:pdev get failed!\n", __func__); + if (!pdev) { + pr_err("%s: pdev get failed!\n", __func__); return 0; } ret = spmi_ext_register_readl(pdev, reg, (unsigned char*)&read_value, 1);/*lint !e734 !e732 */ if (ret) { - pr_err("%s:spmi_ext_register_readl failed!\n", __func__); - return ret; + pr_err("%s: spmi_ext_register_readl failed!\n", __func__); + return 0; } return (u32)read_value; } @@ -98,34 +98,32 @@ void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) u32 ret; struct spmi_device *pdev; - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); + if (!g_pmic) { + pr_err("%s: g_pmic is NULL\n", __func__); return; } pdev = to_spmi_device(g_pmic->dev); - if (NULL == pdev) { - pr_err("%s:pdev get failed!\n", __func__); + if (!pdev) { + pr_err("%s: pdev get failed!\n", __func__); return; } ret = spmi_ext_register_writel(pdev, reg, (unsigned char*)&val, 1);/*lint !e734 !e732 */ if (ret) { - pr_err("%s:spmi_ext_register_writel failed!\n", __func__); - return ; + pr_err("%s: spmi_ext_register_writel failed!\n", __func__); + return; } } EXPORT_SYMBOL(hisi_pmic_write); - -void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, - u32 mask, u32 bits) +void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) { u32 data; unsigned long flags; - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); + if (!g_pmic) { + pr_err("%s: g_pmic is NULL\n", __func__); return; } @@ -137,75 +135,6 @@ void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, } EXPORT_SYMBOL(hisi_pmic_rmw); -unsigned int hisi_pmic_reg_read(int addr) -{ - return (unsigned int)hisi_pmic_read(g_pmic, addr); -} -EXPORT_SYMBOL(hisi_pmic_reg_read); - -void hisi_pmic_reg_write(int addr, int val) -{ - hisi_pmic_write(g_pmic, addr, val); -} -EXPORT_SYMBOL(hisi_pmic_reg_write); - -void hisi_pmic_reg_write_lock(int addr, int val) -{ - unsigned long flags; - - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); - return; - } - - spin_lock_irqsave(&g_pmic->lock, flags); - hisi_pmic_write(g_pmic, g_pmic->normal_lock.addr, g_pmic->normal_lock.val); - hisi_pmic_write(g_pmic, g_pmic->debug_lock.addr, g_pmic->debug_lock.val); - hisi_pmic_write(g_pmic, addr, val); - hisi_pmic_write(g_pmic, g_pmic->normal_lock.addr, 0); - hisi_pmic_write(g_pmic, g_pmic->debug_lock.addr, 0); - spin_unlock_irqrestore(&g_pmic->lock, flags); -} - -int hisi_pmic_array_read(int addr, char *buff, unsigned int len) -{ - unsigned int i; - - if ((len > 32) || (NULL == buff)) { - return -EINVAL; - } - - /* - * Here is a bug in the pmu die. - * the coul driver will read 4 bytes, - * but the ssi bus only read 1 byte, and the pmu die - * will make sampling 1/10669us about vol cur,so the driver - * read the data is not the same sampling - */ - for (i = 0; i < len; i++) - { - *(buff + i) = hisi_pmic_reg_read(addr+i); - } - - return 0; -} - -int hisi_pmic_array_write(int addr, char *buff, unsigned int len) -{ - unsigned int i; - - if ((len > 32) || (NULL == buff)) { - return -EINVAL; - } - - for (i = 0; i < len; i++) - { - hisi_pmic_reg_write(addr+i, *(buff + i)); - } - - return 0; -} - static irqreturn_t hisi_irq_handler(int irq, void *data) { struct hisi_pmic *pmic = (struct hisi_pmic *)data; @@ -213,13 +142,13 @@ static irqreturn_t hisi_irq_handler(int irq, void *data) int i, offset; for (i = 0; i < pmic->irqarray; i++) { - pending = hisi_pmic_reg_read((i + pmic->irq_addr.start_addr)); + pending = hisi_pmic_read(g_pmic, (i + pmic->irq_addr.start_addr)); pending &= HISI_MASK_FIELD; if (pending != 0) { pr_info("pending[%d]=0x%lx\n\r", i, pending); } - hisi_pmic_reg_write((i + pmic->irq_addr.start_addr), pending); + hisi_pmic_write(g_pmic, (i + pmic->irq_addr.start_addr), pending); /*solve powerkey order*/ if ((HISI_IRQ_KEY_NUM == i) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { @@ -237,13 +166,13 @@ static irqreturn_t hisi_irq_handler(int irq, void *data) /*Handle the second group irq if analysis the second group irq from dtsi*/ if (1 == g_extinterrupt_flag){ for (i = 0; i < pmic->irqarray1; i++) { - pending = hisi_pmic_reg_read((i + pmic->irq_addr1.start_addr)); + pending = hisi_pmic_read(g_pmic, (i + pmic->irq_addr1.start_addr)); pending &= HISI_MASK_FIELD; if (pending != 0) { pr_info("pending[%d]=0x%lx\n\r", i, pending); } - hisi_pmic_reg_write((i + pmic->irq_addr1.start_addr), pending); + hisi_pmic_write(g_pmic, (i + pmic->irq_addr1.start_addr), pending); if (pending) { for_each_set_bit(offset, &pending, HISI_BITS) @@ -276,9 +205,9 @@ static void hisi_irq_mask(struct irq_data *d) offset += pmic->irq_mask_addr.start_addr; } spin_lock_irqsave(&g_pmic->lock, flags); - data = hisi_pmic_reg_read(offset); + data = hisi_pmic_read(g_pmic, offset); data |= (1 << (irqd_to_hwirq(d) & 0x07)); - hisi_pmic_reg_write(offset, data); + hisi_pmic_write(g_pmic, offset, data); spin_unlock_irqrestore(&g_pmic->lock, flags); } @@ -303,9 +232,9 @@ static void hisi_irq_unmask(struct irq_data *d) offset += pmic->irq_mask_addr.start_addr; } spin_lock_irqsave(&g_pmic->lock, flags); - data = hisi_pmic_reg_read(offset); - data &= ~(1 << (irqd_to_hwirq(d) & 0x07)); /*lint !e502 */ - hisi_pmic_reg_write(offset, data); + data = hisi_pmic_read(g_pmic, offset); + data &= ~(1 << (irqd_to_hwirq(d) & 0x07)); + hisi_pmic_write(g_pmic, offset, data); spin_unlock_irqrestore(&g_pmic->lock, flags); } @@ -452,34 +381,6 @@ static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic * return ret; }/*lint -restore*/ -int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list) -{ - if ( NULL == g_pmic ) { - pr_err("[%s]g_pmic is NULL\n", __func__); - return -1; - } - - if (pmic_irq_list > (unsigned int)g_pmic->irqnum) { - pr_err("[%s]input pmic irq number is error.\n", __func__); - return -1; - } - pr_info("%s:g_pmic->irqs[%d]=%d\n", __func__, pmic_irq_list, g_pmic->irqs[pmic_irq_list]); - return (int)g_pmic->irqs[pmic_irq_list]; -} -EXPORT_SYMBOL(hisi_get_pmic_irq_byname); - -int hisi_pmic_get_vbus_status(void) -{ - if (0 == g_pmic_vbus.addr) - return -1; - - if (hisi_pmic_reg_read(g_pmic_vbus.addr) & BIT(g_pmic_vbus.bit)) - return 1; - - return 0; -} -EXPORT_SYMBOL(hisi_pmic_get_vbus_status); - static void hisi_pmic_irq_prc(struct hisi_pmic *pmic) { int i; -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 14/44] staging: mfd: hi6421-spmi-pmic: get rid of the static vars 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, Lee Jones, linux-kernel, devel There are several static vars inside this driver. Get rid of them. While here, add a SPDX header file. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 224 ++++++++------------ include/linux/mfd/hi6421-spmi-pmic.h | 20 +- 2 files changed, 97 insertions(+), 147 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 8b87d48b88b5..be42fed16bd2 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Device driver for regulators in HISI PMIC IC * @@ -52,10 +53,7 @@ /*define the first group interrupt register number*/ #define HISI_PMIC_FIRST_GROUP_INT_NUM 2 -static struct bit_info g_pmic_vbus = {0}; -static struct hisi_pmic *g_pmic; -static unsigned int g_extinterrupt_flag = 0; -static struct of_device_id of_hisi_pmic_match_tbl[] = { +static const struct of_device_id of_hisi_pmic_match_tbl[] = { { .compatible = "hisilicon-hisi-pmic-spmi", }, @@ -73,18 +71,14 @@ u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) u8 read_value = 0; struct spmi_device *pdev; - if (!g_pmic) { - pr_err("%s: g_pmic is NULL\n", __func__); - return 0; - } - - pdev = to_spmi_device(g_pmic->dev); + pdev = to_spmi_device(pmic->dev); if (!pdev) { pr_err("%s: pdev get failed!\n", __func__); return 0; } - ret = spmi_ext_register_readl(pdev, reg, (unsigned char*)&read_value, 1);/*lint !e734 !e732 */ + ret = spmi_ext_register_readl(pdev, reg, + (unsigned char *)&read_value, 1); if (ret) { pr_err("%s: spmi_ext_register_readl failed!\n", __func__); return 0; @@ -98,18 +92,13 @@ void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) u32 ret; struct spmi_device *pdev; - if (!g_pmic) { - pr_err("%s: g_pmic is NULL\n", __func__); - return; - } - - pdev = to_spmi_device(g_pmic->dev); + pdev = to_spmi_device(pmic->dev); if (!pdev) { pr_err("%s: pdev get failed!\n", __func__); return; } - ret = spmi_ext_register_writel(pdev, reg, (unsigned char*)&val, 1);/*lint !e734 !e732 */ + ret = spmi_ext_register_writel(pdev, reg, (unsigned char *)&val, 1); if (ret) { pr_err("%s: spmi_ext_register_writel failed!\n", __func__); return; @@ -122,16 +111,11 @@ void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) u32 data; unsigned long flags; - if (!g_pmic) { - pr_err("%s: g_pmic is NULL\n", __func__); - return; - } - - spin_lock_irqsave(&g_pmic->lock, flags); + spin_lock_irqsave(&pmic->lock, flags); data = hisi_pmic_read(pmic, reg) & ~mask; data |= mask & bits; hisi_pmic_write(pmic, reg, data); - spin_unlock_irqrestore(&g_pmic->lock, flags); + spin_unlock_irqrestore(&pmic->lock, flags); } EXPORT_SYMBOL(hisi_pmic_rmw); @@ -142,16 +126,15 @@ static irqreturn_t hisi_irq_handler(int irq, void *data) int i, offset; for (i = 0; i < pmic->irqarray; i++) { - pending = hisi_pmic_read(g_pmic, (i + pmic->irq_addr.start_addr)); + pending = hisi_pmic_read(pmic, (i + pmic->irq_addr.start_addr)); pending &= HISI_MASK_FIELD; - if (pending != 0) { - pr_info("pending[%d]=0x%lx\n\r", i, pending); - } + if (pending != 0) + pr_debug("pending[%d]=0x%lx\n\r", i, pending); - hisi_pmic_write(g_pmic, (i + pmic->irq_addr.start_addr), pending); + hisi_pmic_write(pmic, (i + pmic->irq_addr.start_addr), pending); - /*solve powerkey order*/ - if ((HISI_IRQ_KEY_NUM == i) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { + /* solve powerkey order */ + if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_DOWN]); generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_UP]); pending &= (~HISI_IRQ_KEY_VALUE); @@ -159,25 +142,25 @@ static irqreturn_t hisi_irq_handler(int irq, void *data) if (pending) { for_each_set_bit(offset, &pending, HISI_BITS) - generic_handle_irq(pmic->irqs[offset + i * HISI_BITS]);/*lint !e679 */ + generic_handle_irq(pmic->irqs[offset + i * HISI_BITS]); } } /*Handle the second group irq if analysis the second group irq from dtsi*/ - if (1 == g_extinterrupt_flag){ + if (pmic->g_extinterrupt_flag == 1) { for (i = 0; i < pmic->irqarray1; i++) { - pending = hisi_pmic_read(g_pmic, (i + pmic->irq_addr1.start_addr)); + pending = hisi_pmic_read(pmic, (i + pmic->irq_addr1.start_addr)); pending &= HISI_MASK_FIELD; - if (pending != 0) { - pr_info("pending[%d]=0x%lx\n\r", i, pending); - } + if (pending != 0) + pr_debug("pending[%d]=0x%lx\n\r", i, pending); - hisi_pmic_write(g_pmic, (i + pmic->irq_addr1.start_addr), pending); + hisi_pmic_write(pmic, (i + pmic->irq_addr1.start_addr), pending); - if (pending) { - for_each_set_bit(offset, &pending, HISI_BITS) - generic_handle_irq(pmic->irqs[offset + (i+HISI_PMIC_FIRST_GROUP_INT_NUM) * HISI_BITS]);/*lint !e679 */ - } + if (!pending) + continue; + + for_each_set_bit(offset, &pending, HISI_BITS) + generic_handle_irq(pmic->irqs[offset + (i + HISI_PMIC_FIRST_GROUP_INT_NUM) * HISI_BITS]); } } @@ -190,25 +173,25 @@ static void hisi_irq_mask(struct irq_data *d) u32 data, offset; unsigned long flags; - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); - return; - } - offset = (irqd_to_hwirq(d) >> 3); - if (1==g_extinterrupt_flag){ - if ( offset < HISI_PMIC_FIRST_GROUP_INT_NUM) + if (pmic->g_extinterrupt_flag == 1) { + if (offset < HISI_PMIC_FIRST_GROUP_INT_NUM) { offset += pmic->irq_mask_addr.start_addr; - else/*Change addr when irq num larger than 16 because interrupt addr is nonsequence*/ - offset = offset+(pmic->irq_mask_addr1.start_addr)-HISI_PMIC_FIRST_GROUP_INT_NUM; - }else{ + } else { + /* + * Change addr when irq num larger than 16 because + * interrupt addr is nonsequence + */ + offset = offset + (pmic->irq_mask_addr1.start_addr) - HISI_PMIC_FIRST_GROUP_INT_NUM; + } + } else { offset += pmic->irq_mask_addr.start_addr; } - spin_lock_irqsave(&g_pmic->lock, flags); - data = hisi_pmic_read(g_pmic, offset); + spin_lock_irqsave(&pmic->lock, flags); + data = hisi_pmic_read(pmic, offset); data |= (1 << (irqd_to_hwirq(d) & 0x07)); - hisi_pmic_write(g_pmic, offset, data); - spin_unlock_irqrestore(&g_pmic->lock, flags); + hisi_pmic_write(pmic, offset, data); + spin_unlock_irqrestore(&pmic->lock, flags); } static void hisi_irq_unmask(struct irq_data *d) @@ -217,25 +200,20 @@ static void hisi_irq_unmask(struct irq_data *d) u32 data, offset; unsigned long flags; - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); - return; - } - offset = (irqd_to_hwirq(d) >> 3); - if (1==g_extinterrupt_flag){ - if ( offset < HISI_PMIC_FIRST_GROUP_INT_NUM) + if (pmic->g_extinterrupt_flag == 1) { + if (offset < HISI_PMIC_FIRST_GROUP_INT_NUM) offset += pmic->irq_mask_addr.start_addr; else - offset = offset+(pmic->irq_mask_addr1.start_addr)-HISI_PMIC_FIRST_GROUP_INT_NUM; - }else{ + offset = offset + (pmic->irq_mask_addr1.start_addr) - HISI_PMIC_FIRST_GROUP_INT_NUM; + } else { offset += pmic->irq_mask_addr.start_addr; } - spin_lock_irqsave(&g_pmic->lock, flags); - data = hisi_pmic_read(g_pmic, offset); + spin_lock_irqsave(&pmic->lock, flags); + data = hisi_pmic_read(pmic, offset); data &= ~(1 << (irqd_to_hwirq(d) & 0x07)); - hisi_pmic_write(g_pmic, offset, data); - spin_unlock_irqrestore(&g_pmic->lock, flags); + hisi_pmic_write(pmic, offset, data); + spin_unlock_irqrestore(&pmic->lock, flags); } static struct irq_chip hisi_pmu_irqchip = { @@ -247,7 +225,7 @@ static struct irq_chip hisi_pmu_irqchip = { }; static int hisi_irq_map(struct irq_domain *d, unsigned int virq, - irq_hw_number_t hw) + irq_hw_number_t hw) { struct hisi_pmic *pmic = d->host_data; @@ -259,19 +237,18 @@ static int hisi_irq_map(struct irq_domain *d, unsigned int virq, return 0; } -static struct irq_domain_ops hisi_domain_ops = { +static const struct irq_domain_ops hisi_domain_ops = { .map = hisi_irq_map, .xlate = irq_domain_xlate_twocell, }; -/*lint -e570 -e64*/ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *pmic) { int ret = 0; /*get pmic irq num*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-num", - &(pmic->irqnum), 1); + &pmic->irqnum, 1); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-num property set\n"); ret = -ENODEV; @@ -280,7 +257,7 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p /*get pmic irq array number*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-array", - &(pmic->irqarray), 1); + &pmic->irqarray, 1); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-array property set\n"); ret = -ENODEV; @@ -289,7 +266,7 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p /*SOC_PMIC_IRQ_MASK_0_ADDR*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-mask-addr", - (int *)&pmic->irq_mask_addr, 2); + (int *)&pmic->irq_mask_addr, 2); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-mask-addr property set\n"); ret = -ENODEV; @@ -298,24 +275,16 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p /*SOC_PMIC_IRQ0_ADDR*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-addr", - (int *)&pmic->irq_addr, 2); + (int *)&pmic->irq_addr, 2); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-addr property set\n"); ret = -ENODEV; return ret; } - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-vbus", - (u32 *)&g_pmic_vbus, 2); - if (ret) { - pr_err("no hisilicon,hisi-pmic-vbus property\n"); - ret = -ENODEV; - return ret; - } - /*pmic lock*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-lock", - (int *)&pmic->normal_lock, 2); + (int *)&pmic->normal_lock, 2); if (ret) { pr_err("no hisilicon,hisi-pmic-lock property set\n"); ret = -ENODEV; @@ -324,7 +293,7 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p /*pmic debug lock*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-debug-lock", - (int *)&pmic->debug_lock, 2); + (int *)&pmic->debug_lock, 2); if (ret) { pr_err("no hisilicon,hisi-pmic-debug-lock property set\n"); ret = -ENODEV; @@ -332,17 +301,15 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p } return ret; -}/*lint -restore*/ +} - -/*lint -e570 -e64*/ static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic *pmic) { int ret = 0; /*get pmic irq num*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-num1", - &(pmic->irqnum1), 1); + &pmic->irqnum1, 1); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-num1 property set\n"); ret = -ENODEV; @@ -352,7 +319,7 @@ static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic * /*get pmic irq array number*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-array1", - &(pmic->irqarray1), 1); + &pmic->irqarray1, 1); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-array1 property set\n"); ret = -ENODEV; @@ -361,7 +328,7 @@ static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic * /*SOC_PMIC_IRQ_MASK_0_ADDR*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-mask-addr1", - (int *)&pmic->irq_mask_addr1, 2); + (int *)&pmic->irq_mask_addr1, 2); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-mask-addr1 property set\n"); ret = -ENODEV; @@ -370,43 +337,48 @@ static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic * /*SOC_PMIC_IRQ0_ADDR*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-addr1", - (int *)&pmic->irq_addr1, 2); + (int *)&pmic->irq_addr1, 2); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-addr1 property set\n"); ret = -ENODEV; return ret; } - g_extinterrupt_flag = 1; + pmic->g_extinterrupt_flag = 1; return ret; -}/*lint -restore*/ +} static void hisi_pmic_irq_prc(struct hisi_pmic *pmic) { int i; - for (i = 0 ; i < pmic->irq_mask_addr.array; i++) { + + for (i = 0 ; i < pmic->irq_mask_addr.array; i++) hisi_pmic_write(pmic, pmic->irq_mask_addr.start_addr + i, HISI_MASK_STATE); - } for (i = 0 ; i < pmic->irq_addr.array; i++) { unsigned int pending = hisi_pmic_read(pmic, pmic->irq_addr.start_addr + i); - pr_debug("PMU IRQ address value:irq[0x%x] = 0x%x\n", pmic->irq_addr.start_addr + i, pending); + + pr_debug("PMU IRQ address value:irq[0x%x] = 0x%x\n", + pmic->irq_addr.start_addr + i, pending); hisi_pmic_write(pmic, pmic->irq_addr.start_addr + i, HISI_MASK_STATE); } - } static void hisi_pmic_irq1_prc(struct hisi_pmic *pmic) { int i; - if(1 == g_extinterrupt_flag){ - for (i = 0 ; i < pmic->irq_mask_addr1.array; i++) { + unsigned int pending1; + + if (pmic->g_extinterrupt_flag == 1) { + for (i = 0 ; i < pmic->irq_mask_addr1.array; i++) hisi_pmic_write(pmic, pmic->irq_mask_addr1.start_addr + i, HISI_MASK_STATE); - } for (i = 0 ; i < pmic->irq_addr1.array; i++) { - unsigned int pending1 = hisi_pmic_read(pmic, pmic->irq_addr1.start_addr + i); - pr_debug("PMU IRQ address1 value:irq[0x%x] = 0x%x\n", pmic->irq_addr1.start_addr + i, pending1); + pending1 = hisi_pmic_read(pmic, pmic->irq_addr1.start_addr + i); + + pr_debug("PMU IRQ address1 value:irq[0x%x] = 0x%x\n", + pmic->irq_addr1.start_addr + i, pending1); + hisi_pmic_write(pmic, pmic->irq_addr1.start_addr + i, HISI_MASK_STATE); } } @@ -424,36 +396,32 @@ static int hisi_pmic_probe(struct spmi_device *pdev) unsigned int virq; pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL); - if (!pmic) { - dev_err(dev, "cannot allocate hisi_pmic device info\n"); + if (!pmic) return -ENOMEM; - } /*TODO: get pmic dts info*/ ret = get_pmic_device_tree_data(np, pmic); if (ret) { - dev_err(&pdev->dev, "Error reading hisi pmic dts \n"); + dev_err(&pdev->dev, "Error reading hisi pmic dts\n"); return ret; } /*get pmic dts the second group irq*/ ret = get_pmic_device_tree_data1(np, pmic); - if (ret) { + if (ret) dev_err(&pdev->dev, "the platform don't support ext-interrupt.\n"); - } /* TODO: get and enable clk request */ spin_lock_init(&pmic->lock); pmic->dev = dev; - g_pmic = pmic; - ret = of_property_read_u32_array(np, "hisilicon,pmic_fpga_flag", &fpga_flag, 1); - if (ret) { + ret = of_property_read_u32_array(np, "hisilicon,pmic_fpga_flag", + &fpga_flag, 1); + if (ret) pr_err("no hisilicon,pmic_fpga_flag property set\n"); - } - if (PMIC_FPGA_FLAG == fpga_flag) { + + if (fpga_flag == PMIC_FPGA_FLAG) goto after_irq_register; - } pmic->gpio = of_get_gpio_flags(np, 0, &flags); if (pmic->gpio < 0) @@ -477,12 +445,9 @@ static int hisi_pmic_probe(struct spmi_device *pdev) pmic->irqnum += pmic->irqnum1; - pmic->irqs = (unsigned int *)devm_kmalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL); - if (!pmic->irqs) { - pr_err("%s:Failed to alloc memory for pmic irq number!\n", __func__); + pmic->irqs = devm_kzalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL); + if (!pmic->irqs) goto irq_malloc; - } - memset(pmic->irqs, 0, pmic->irqnum); pmic->domain = irq_domain_add_simple(np, pmic->irqnum, 0, &hisi_domain_ops, pmic); @@ -504,7 +469,7 @@ static int hisi_pmic_probe(struct spmi_device *pdev) } ret = request_threaded_irq(pmic->irq, hisi_irq_handler, NULL, - IRQF_TRIGGER_LOW | IRQF_SHARED | IRQF_NO_SUSPEND, + IRQF_TRIGGER_LOW | IRQF_SHARED | IRQF_NO_SUSPEND, "pmic", pmic); if (ret < 0) { dev_err(dev, "could not claim pmic %d\n", ret); @@ -515,31 +480,28 @@ static int hisi_pmic_probe(struct spmi_device *pdev) after_irq_register: return 0; - request_theaded_irq: irq_create_mapping: irq_domain: irq_malloc: gpio_free(pmic->gpio); - g_pmic = NULL; return ret; } static void hisi_pmic_remove(struct spmi_device *pdev) { - struct hisi_pmic *pmic = dev_get_drvdata(&pdev->dev); free_irq(pmic->irq, pmic); gpio_free(pmic->gpio); devm_kfree(&pdev->dev, pmic); - } + static int hisi_pmic_suspend(struct device *dev, pm_message_t state) { struct hisi_pmic *pmic = dev_get_drvdata(dev); - if (NULL == pmic) { + if (!pmic) { pr_err("%s:pmic is NULL\n", __func__); return -ENOMEM; } @@ -548,13 +510,13 @@ static int hisi_pmic_suspend(struct device *dev, pm_message_t state) pr_info("%s:-\n", __func__); return 0; -}/*lint !e715 */ +} static int hisi_pmic_resume(struct device *dev) { struct hisi_pmic *pmic = dev_get_drvdata(dev); - if (NULL == pmic) { + if (!pmic) { pr_err("%s:pmic is NULL\n", __func__); return -ENOMEM; } @@ -588,10 +550,8 @@ static void __exit hisi_pmic_exit(void) spmi_driver_unregister(&hisi_pmic_driver); } - subsys_initcall_sync(hisi_pmic_init); module_exit(hisi_pmic_exit); MODULE_DESCRIPTION("PMIC driver"); MODULE_LICENSE("GPL v2"); - diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index 5be9b4d3f207..e0a8b50f95fc 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Header file for device driver Hi6421 PMIC * @@ -5,19 +6,6 @@ * Copyright (C) 2011 Hisilicon. * * Guodong Xu <guodong.xu@linaro.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef __HISI_PMIC_H @@ -25,12 +13,12 @@ #include <linux/irqdomain.h> -#define HISI_REGS_ENA_PROTECT_TIME (0) /* in microseconds */ +#define HISI_REGS_ENA_PROTECT_TIME (0) /* in microseconds */ #define HISI_ECO_MODE_ENABLE (1) #define HISI_ECO_MODE_DISABLE (0) typedef int (*pmic_ocp_callback)(char *); -extern int hisi_pmic_special_ocp_register(char *power_name, pmic_ocp_callback handler); +int hisi_pmic_special_ocp_register(char *power_name, pmic_ocp_callback handler); struct irq_mask_info { int start_addr; @@ -71,6 +59,8 @@ struct hisi_pmic { struct irq_info irq_addr1; struct write_lock normal_lock; struct write_lock debug_lock; + + unsigned int g_extinterrupt_flag; }; /* 0:disable; 1:enable */ -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 14/44] staging: mfd: hi6421-spmi-pmic: get rid of the static vars @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab, Lee Jones There are several static vars inside this driver. Get rid of them. While here, add a SPDX header file. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 224 ++++++++------------ include/linux/mfd/hi6421-spmi-pmic.h | 20 +- 2 files changed, 97 insertions(+), 147 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 8b87d48b88b5..be42fed16bd2 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Device driver for regulators in HISI PMIC IC * @@ -52,10 +53,7 @@ /*define the first group interrupt register number*/ #define HISI_PMIC_FIRST_GROUP_INT_NUM 2 -static struct bit_info g_pmic_vbus = {0}; -static struct hisi_pmic *g_pmic; -static unsigned int g_extinterrupt_flag = 0; -static struct of_device_id of_hisi_pmic_match_tbl[] = { +static const struct of_device_id of_hisi_pmic_match_tbl[] = { { .compatible = "hisilicon-hisi-pmic-spmi", }, @@ -73,18 +71,14 @@ u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) u8 read_value = 0; struct spmi_device *pdev; - if (!g_pmic) { - pr_err("%s: g_pmic is NULL\n", __func__); - return 0; - } - - pdev = to_spmi_device(g_pmic->dev); + pdev = to_spmi_device(pmic->dev); if (!pdev) { pr_err("%s: pdev get failed!\n", __func__); return 0; } - ret = spmi_ext_register_readl(pdev, reg, (unsigned char*)&read_value, 1);/*lint !e734 !e732 */ + ret = spmi_ext_register_readl(pdev, reg, + (unsigned char *)&read_value, 1); if (ret) { pr_err("%s: spmi_ext_register_readl failed!\n", __func__); return 0; @@ -98,18 +92,13 @@ void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) u32 ret; struct spmi_device *pdev; - if (!g_pmic) { - pr_err("%s: g_pmic is NULL\n", __func__); - return; - } - - pdev = to_spmi_device(g_pmic->dev); + pdev = to_spmi_device(pmic->dev); if (!pdev) { pr_err("%s: pdev get failed!\n", __func__); return; } - ret = spmi_ext_register_writel(pdev, reg, (unsigned char*)&val, 1);/*lint !e734 !e732 */ + ret = spmi_ext_register_writel(pdev, reg, (unsigned char *)&val, 1); if (ret) { pr_err("%s: spmi_ext_register_writel failed!\n", __func__); return; @@ -122,16 +111,11 @@ void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) u32 data; unsigned long flags; - if (!g_pmic) { - pr_err("%s: g_pmic is NULL\n", __func__); - return; - } - - spin_lock_irqsave(&g_pmic->lock, flags); + spin_lock_irqsave(&pmic->lock, flags); data = hisi_pmic_read(pmic, reg) & ~mask; data |= mask & bits; hisi_pmic_write(pmic, reg, data); - spin_unlock_irqrestore(&g_pmic->lock, flags); + spin_unlock_irqrestore(&pmic->lock, flags); } EXPORT_SYMBOL(hisi_pmic_rmw); @@ -142,16 +126,15 @@ static irqreturn_t hisi_irq_handler(int irq, void *data) int i, offset; for (i = 0; i < pmic->irqarray; i++) { - pending = hisi_pmic_read(g_pmic, (i + pmic->irq_addr.start_addr)); + pending = hisi_pmic_read(pmic, (i + pmic->irq_addr.start_addr)); pending &= HISI_MASK_FIELD; - if (pending != 0) { - pr_info("pending[%d]=0x%lx\n\r", i, pending); - } + if (pending != 0) + pr_debug("pending[%d]=0x%lx\n\r", i, pending); - hisi_pmic_write(g_pmic, (i + pmic->irq_addr.start_addr), pending); + hisi_pmic_write(pmic, (i + pmic->irq_addr.start_addr), pending); - /*solve powerkey order*/ - if ((HISI_IRQ_KEY_NUM == i) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { + /* solve powerkey order */ + if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_DOWN]); generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_UP]); pending &= (~HISI_IRQ_KEY_VALUE); @@ -159,25 +142,25 @@ static irqreturn_t hisi_irq_handler(int irq, void *data) if (pending) { for_each_set_bit(offset, &pending, HISI_BITS) - generic_handle_irq(pmic->irqs[offset + i * HISI_BITS]);/*lint !e679 */ + generic_handle_irq(pmic->irqs[offset + i * HISI_BITS]); } } /*Handle the second group irq if analysis the second group irq from dtsi*/ - if (1 == g_extinterrupt_flag){ + if (pmic->g_extinterrupt_flag == 1) { for (i = 0; i < pmic->irqarray1; i++) { - pending = hisi_pmic_read(g_pmic, (i + pmic->irq_addr1.start_addr)); + pending = hisi_pmic_read(pmic, (i + pmic->irq_addr1.start_addr)); pending &= HISI_MASK_FIELD; - if (pending != 0) { - pr_info("pending[%d]=0x%lx\n\r", i, pending); - } + if (pending != 0) + pr_debug("pending[%d]=0x%lx\n\r", i, pending); - hisi_pmic_write(g_pmic, (i + pmic->irq_addr1.start_addr), pending); + hisi_pmic_write(pmic, (i + pmic->irq_addr1.start_addr), pending); - if (pending) { - for_each_set_bit(offset, &pending, HISI_BITS) - generic_handle_irq(pmic->irqs[offset + (i+HISI_PMIC_FIRST_GROUP_INT_NUM) * HISI_BITS]);/*lint !e679 */ - } + if (!pending) + continue; + + for_each_set_bit(offset, &pending, HISI_BITS) + generic_handle_irq(pmic->irqs[offset + (i + HISI_PMIC_FIRST_GROUP_INT_NUM) * HISI_BITS]); } } @@ -190,25 +173,25 @@ static void hisi_irq_mask(struct irq_data *d) u32 data, offset; unsigned long flags; - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); - return; - } - offset = (irqd_to_hwirq(d) >> 3); - if (1==g_extinterrupt_flag){ - if ( offset < HISI_PMIC_FIRST_GROUP_INT_NUM) + if (pmic->g_extinterrupt_flag == 1) { + if (offset < HISI_PMIC_FIRST_GROUP_INT_NUM) { offset += pmic->irq_mask_addr.start_addr; - else/*Change addr when irq num larger than 16 because interrupt addr is nonsequence*/ - offset = offset+(pmic->irq_mask_addr1.start_addr)-HISI_PMIC_FIRST_GROUP_INT_NUM; - }else{ + } else { + /* + * Change addr when irq num larger than 16 because + * interrupt addr is nonsequence + */ + offset = offset + (pmic->irq_mask_addr1.start_addr) - HISI_PMIC_FIRST_GROUP_INT_NUM; + } + } else { offset += pmic->irq_mask_addr.start_addr; } - spin_lock_irqsave(&g_pmic->lock, flags); - data = hisi_pmic_read(g_pmic, offset); + spin_lock_irqsave(&pmic->lock, flags); + data = hisi_pmic_read(pmic, offset); data |= (1 << (irqd_to_hwirq(d) & 0x07)); - hisi_pmic_write(g_pmic, offset, data); - spin_unlock_irqrestore(&g_pmic->lock, flags); + hisi_pmic_write(pmic, offset, data); + spin_unlock_irqrestore(&pmic->lock, flags); } static void hisi_irq_unmask(struct irq_data *d) @@ -217,25 +200,20 @@ static void hisi_irq_unmask(struct irq_data *d) u32 data, offset; unsigned long flags; - if (NULL == g_pmic) { - pr_err(" g_pmic is NULL\n"); - return; - } - offset = (irqd_to_hwirq(d) >> 3); - if (1==g_extinterrupt_flag){ - if ( offset < HISI_PMIC_FIRST_GROUP_INT_NUM) + if (pmic->g_extinterrupt_flag == 1) { + if (offset < HISI_PMIC_FIRST_GROUP_INT_NUM) offset += pmic->irq_mask_addr.start_addr; else - offset = offset+(pmic->irq_mask_addr1.start_addr)-HISI_PMIC_FIRST_GROUP_INT_NUM; - }else{ + offset = offset + (pmic->irq_mask_addr1.start_addr) - HISI_PMIC_FIRST_GROUP_INT_NUM; + } else { offset += pmic->irq_mask_addr.start_addr; } - spin_lock_irqsave(&g_pmic->lock, flags); - data = hisi_pmic_read(g_pmic, offset); + spin_lock_irqsave(&pmic->lock, flags); + data = hisi_pmic_read(pmic, offset); data &= ~(1 << (irqd_to_hwirq(d) & 0x07)); - hisi_pmic_write(g_pmic, offset, data); - spin_unlock_irqrestore(&g_pmic->lock, flags); + hisi_pmic_write(pmic, offset, data); + spin_unlock_irqrestore(&pmic->lock, flags); } static struct irq_chip hisi_pmu_irqchip = { @@ -247,7 +225,7 @@ static struct irq_chip hisi_pmu_irqchip = { }; static int hisi_irq_map(struct irq_domain *d, unsigned int virq, - irq_hw_number_t hw) + irq_hw_number_t hw) { struct hisi_pmic *pmic = d->host_data; @@ -259,19 +237,18 @@ static int hisi_irq_map(struct irq_domain *d, unsigned int virq, return 0; } -static struct irq_domain_ops hisi_domain_ops = { +static const struct irq_domain_ops hisi_domain_ops = { .map = hisi_irq_map, .xlate = irq_domain_xlate_twocell, }; -/*lint -e570 -e64*/ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *pmic) { int ret = 0; /*get pmic irq num*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-num", - &(pmic->irqnum), 1); + &pmic->irqnum, 1); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-num property set\n"); ret = -ENODEV; @@ -280,7 +257,7 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p /*get pmic irq array number*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-array", - &(pmic->irqarray), 1); + &pmic->irqarray, 1); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-array property set\n"); ret = -ENODEV; @@ -289,7 +266,7 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p /*SOC_PMIC_IRQ_MASK_0_ADDR*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-mask-addr", - (int *)&pmic->irq_mask_addr, 2); + (int *)&pmic->irq_mask_addr, 2); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-mask-addr property set\n"); ret = -ENODEV; @@ -298,24 +275,16 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p /*SOC_PMIC_IRQ0_ADDR*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-addr", - (int *)&pmic->irq_addr, 2); + (int *)&pmic->irq_addr, 2); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-addr property set\n"); ret = -ENODEV; return ret; } - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-vbus", - (u32 *)&g_pmic_vbus, 2); - if (ret) { - pr_err("no hisilicon,hisi-pmic-vbus property\n"); - ret = -ENODEV; - return ret; - } - /*pmic lock*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-lock", - (int *)&pmic->normal_lock, 2); + (int *)&pmic->normal_lock, 2); if (ret) { pr_err("no hisilicon,hisi-pmic-lock property set\n"); ret = -ENODEV; @@ -324,7 +293,7 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p /*pmic debug lock*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-debug-lock", - (int *)&pmic->debug_lock, 2); + (int *)&pmic->debug_lock, 2); if (ret) { pr_err("no hisilicon,hisi-pmic-debug-lock property set\n"); ret = -ENODEV; @@ -332,17 +301,15 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p } return ret; -}/*lint -restore*/ +} - -/*lint -e570 -e64*/ static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic *pmic) { int ret = 0; /*get pmic irq num*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-num1", - &(pmic->irqnum1), 1); + &pmic->irqnum1, 1); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-num1 property set\n"); ret = -ENODEV; @@ -352,7 +319,7 @@ static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic * /*get pmic irq array number*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-array1", - &(pmic->irqarray1), 1); + &pmic->irqarray1, 1); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-array1 property set\n"); ret = -ENODEV; @@ -361,7 +328,7 @@ static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic * /*SOC_PMIC_IRQ_MASK_0_ADDR*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-mask-addr1", - (int *)&pmic->irq_mask_addr1, 2); + (int *)&pmic->irq_mask_addr1, 2); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-mask-addr1 property set\n"); ret = -ENODEV; @@ -370,43 +337,48 @@ static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic * /*SOC_PMIC_IRQ0_ADDR*/ ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-addr1", - (int *)&pmic->irq_addr1, 2); + (int *)&pmic->irq_addr1, 2); if (ret) { pr_err("no hisilicon,hisi-pmic-irq-addr1 property set\n"); ret = -ENODEV; return ret; } - g_extinterrupt_flag = 1; + pmic->g_extinterrupt_flag = 1; return ret; -}/*lint -restore*/ +} static void hisi_pmic_irq_prc(struct hisi_pmic *pmic) { int i; - for (i = 0 ; i < pmic->irq_mask_addr.array; i++) { + + for (i = 0 ; i < pmic->irq_mask_addr.array; i++) hisi_pmic_write(pmic, pmic->irq_mask_addr.start_addr + i, HISI_MASK_STATE); - } for (i = 0 ; i < pmic->irq_addr.array; i++) { unsigned int pending = hisi_pmic_read(pmic, pmic->irq_addr.start_addr + i); - pr_debug("PMU IRQ address value:irq[0x%x] = 0x%x\n", pmic->irq_addr.start_addr + i, pending); + + pr_debug("PMU IRQ address value:irq[0x%x] = 0x%x\n", + pmic->irq_addr.start_addr + i, pending); hisi_pmic_write(pmic, pmic->irq_addr.start_addr + i, HISI_MASK_STATE); } - } static void hisi_pmic_irq1_prc(struct hisi_pmic *pmic) { int i; - if(1 == g_extinterrupt_flag){ - for (i = 0 ; i < pmic->irq_mask_addr1.array; i++) { + unsigned int pending1; + + if (pmic->g_extinterrupt_flag == 1) { + for (i = 0 ; i < pmic->irq_mask_addr1.array; i++) hisi_pmic_write(pmic, pmic->irq_mask_addr1.start_addr + i, HISI_MASK_STATE); - } for (i = 0 ; i < pmic->irq_addr1.array; i++) { - unsigned int pending1 = hisi_pmic_read(pmic, pmic->irq_addr1.start_addr + i); - pr_debug("PMU IRQ address1 value:irq[0x%x] = 0x%x\n", pmic->irq_addr1.start_addr + i, pending1); + pending1 = hisi_pmic_read(pmic, pmic->irq_addr1.start_addr + i); + + pr_debug("PMU IRQ address1 value:irq[0x%x] = 0x%x\n", + pmic->irq_addr1.start_addr + i, pending1); + hisi_pmic_write(pmic, pmic->irq_addr1.start_addr + i, HISI_MASK_STATE); } } @@ -424,36 +396,32 @@ static int hisi_pmic_probe(struct spmi_device *pdev) unsigned int virq; pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL); - if (!pmic) { - dev_err(dev, "cannot allocate hisi_pmic device info\n"); + if (!pmic) return -ENOMEM; - } /*TODO: get pmic dts info*/ ret = get_pmic_device_tree_data(np, pmic); if (ret) { - dev_err(&pdev->dev, "Error reading hisi pmic dts \n"); + dev_err(&pdev->dev, "Error reading hisi pmic dts\n"); return ret; } /*get pmic dts the second group irq*/ ret = get_pmic_device_tree_data1(np, pmic); - if (ret) { + if (ret) dev_err(&pdev->dev, "the platform don't support ext-interrupt.\n"); - } /* TODO: get and enable clk request */ spin_lock_init(&pmic->lock); pmic->dev = dev; - g_pmic = pmic; - ret = of_property_read_u32_array(np, "hisilicon,pmic_fpga_flag", &fpga_flag, 1); - if (ret) { + ret = of_property_read_u32_array(np, "hisilicon,pmic_fpga_flag", + &fpga_flag, 1); + if (ret) pr_err("no hisilicon,pmic_fpga_flag property set\n"); - } - if (PMIC_FPGA_FLAG == fpga_flag) { + + if (fpga_flag == PMIC_FPGA_FLAG) goto after_irq_register; - } pmic->gpio = of_get_gpio_flags(np, 0, &flags); if (pmic->gpio < 0) @@ -477,12 +445,9 @@ static int hisi_pmic_probe(struct spmi_device *pdev) pmic->irqnum += pmic->irqnum1; - pmic->irqs = (unsigned int *)devm_kmalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL); - if (!pmic->irqs) { - pr_err("%s:Failed to alloc memory for pmic irq number!\n", __func__); + pmic->irqs = devm_kzalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL); + if (!pmic->irqs) goto irq_malloc; - } - memset(pmic->irqs, 0, pmic->irqnum); pmic->domain = irq_domain_add_simple(np, pmic->irqnum, 0, &hisi_domain_ops, pmic); @@ -504,7 +469,7 @@ static int hisi_pmic_probe(struct spmi_device *pdev) } ret = request_threaded_irq(pmic->irq, hisi_irq_handler, NULL, - IRQF_TRIGGER_LOW | IRQF_SHARED | IRQF_NO_SUSPEND, + IRQF_TRIGGER_LOW | IRQF_SHARED | IRQF_NO_SUSPEND, "pmic", pmic); if (ret < 0) { dev_err(dev, "could not claim pmic %d\n", ret); @@ -515,31 +480,28 @@ static int hisi_pmic_probe(struct spmi_device *pdev) after_irq_register: return 0; - request_theaded_irq: irq_create_mapping: irq_domain: irq_malloc: gpio_free(pmic->gpio); - g_pmic = NULL; return ret; } static void hisi_pmic_remove(struct spmi_device *pdev) { - struct hisi_pmic *pmic = dev_get_drvdata(&pdev->dev); free_irq(pmic->irq, pmic); gpio_free(pmic->gpio); devm_kfree(&pdev->dev, pmic); - } + static int hisi_pmic_suspend(struct device *dev, pm_message_t state) { struct hisi_pmic *pmic = dev_get_drvdata(dev); - if (NULL == pmic) { + if (!pmic) { pr_err("%s:pmic is NULL\n", __func__); return -ENOMEM; } @@ -548,13 +510,13 @@ static int hisi_pmic_suspend(struct device *dev, pm_message_t state) pr_info("%s:-\n", __func__); return 0; -}/*lint !e715 */ +} static int hisi_pmic_resume(struct device *dev) { struct hisi_pmic *pmic = dev_get_drvdata(dev); - if (NULL == pmic) { + if (!pmic) { pr_err("%s:pmic is NULL\n", __func__); return -ENOMEM; } @@ -588,10 +550,8 @@ static void __exit hisi_pmic_exit(void) spmi_driver_unregister(&hisi_pmic_driver); } - subsys_initcall_sync(hisi_pmic_init); module_exit(hisi_pmic_exit); MODULE_DESCRIPTION("PMIC driver"); MODULE_LICENSE("GPL v2"); - diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index 5be9b4d3f207..e0a8b50f95fc 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Header file for device driver Hi6421 PMIC * @@ -5,19 +6,6 @@ * Copyright (C) 2011 Hisilicon. * * Guodong Xu <guodong.xu@linaro.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef __HISI_PMIC_H @@ -25,12 +13,12 @@ #include <linux/irqdomain.h> -#define HISI_REGS_ENA_PROTECT_TIME (0) /* in microseconds */ +#define HISI_REGS_ENA_PROTECT_TIME (0) /* in microseconds */ #define HISI_ECO_MODE_ENABLE (1) #define HISI_ECO_MODE_DISABLE (0) typedef int (*pmic_ocp_callback)(char *); -extern int hisi_pmic_special_ocp_register(char *power_name, pmic_ocp_callback handler); +int hisi_pmic_special_ocp_register(char *power_name, pmic_ocp_callback handler); struct irq_mask_info { int start_addr; @@ -71,6 +59,8 @@ struct hisi_pmic { struct irq_info irq_addr1; struct write_lock normal_lock; struct write_lock debug_lock; + + unsigned int g_extinterrupt_flag; }; /* 0:disable; 1:enable */ -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 15/44] staging: mfd: hi6421-spmi-pmic: cleanup hi6421-spmi-pmic.h header 2020-08-12 15:56 ` Mauro Carvalho Chehab ` (15 preceding siblings ...) (?) @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Lee Jones, linux-kernel There are several external vars that are defined there, which are not needed anymore. Get rid of them. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- include/linux/mfd/hi6421-spmi-pmic.h | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index e0a8b50f95fc..1f986dd5f31c 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -63,34 +63,9 @@ struct hisi_pmic { unsigned int g_extinterrupt_flag; }; -/* 0:disable; 1:enable */ -unsigned int get_uv_mntn_status(void); -void clear_uv_mntn_resered_reg_bit(void); -void set_uv_mntn_resered_reg_bit(void); - -/* Register Access Helpers */ u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg); void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val); void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits); -unsigned int hisi_pmic_reg_read(int addr); -void hisi_pmic_reg_write(int addr, int val); -void hisi_pmic_reg_write_lock(int addr, int val); -int hisi_pmic_array_read(int addr, char *buff, unsigned int len); -int hisi_pmic_array_write(int addr, char *buff, unsigned int len); -extern int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list); -extern int hisi_pmic_get_vbus_status(void); -static inline u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) { return 0; } -static inline void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) {} -static inline void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) {} -static inline unsigned int hisi_pmic_reg_read(int addr) { return 0; } -static inline void hisi_pmic_reg_write(int addr, int val) {} -static inline void hisi_pmic_reg_write_lock(int addr, int val) {} -static inline int hisi_pmic_array_read(int addr, char *buff, unsigned int len) { return 0; } -static inline int hisi_pmic_array_write(int addr, char *buff, unsigned int len) { return 0; } -static inline int hisi_get_pmic_irq_byname(unsigned int pmic_irq_list) { return -1; } -static inline int hisi_pmic_get_vbus_status(void) { return 1; } -static inline u32 hisi_pmic_read_sub_pmu(u8 sid ,int reg) { return 0; } -static inline void hisi_pmic_write_sub_pmu(u8 sid ,int reg, u32 val) {} enum pmic_irq_list { OTMP = 0, @@ -110,4 +85,3 @@ enum pmic_irq_list { PMIC_IRQ_LIST_MAX, }; #endif /* __HISI_PMIC_H */ - -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 16/44] staging: mfd: hi6421-spmi-pmic: change the binding logic 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Change the binding logic to ensure that the MFD driver will be load after having the SPMI controller registered. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 84 +++++++-------------- 1 file changed, 29 insertions(+), 55 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index be42fed16bd2..939f7bd5d8ba 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -24,13 +24,14 @@ #include <linux/err.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/mfd/core.h> #include <linux/platform_device.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/of_gpio.h> #include <linux/of_irq.h> -#include <linux/mfd/hisi_pmic.h> +#include <linux/mfd/hi6421-spmi-pmic.h> #include <linux/irq.h> #include <linux/spmi.h> #ifndef NO_IRQ @@ -53,11 +54,8 @@ /*define the first group interrupt register number*/ #define HISI_PMIC_FIRST_GROUP_INT_NUM 2 -static const struct of_device_id of_hisi_pmic_match_tbl[] = { - { - .compatible = "hisilicon-hisi-pmic-spmi", - }, - { /* end */ } +static const struct mfd_cell hi6421v600_devs[] = { + { .name = "hi6421v600-regulator", }, }; /* @@ -477,6 +475,22 @@ static int hisi_pmic_probe(struct spmi_device *pdev) goto request_theaded_irq; } + dev_set_drvdata(&pdev->dev, pmic); + + /* + * The logic below will rely that the pmic is already stored at + * drvdata. + */ + dev_dbg(&pdev->dev, "SPMI-PMIC: adding childs for %pOF\n", + pdev->dev.of_node); + ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, + hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs), + NULL, 0, NULL); + if (ret) { + dev_err(&pdev->dev, "Failed to add child devices: %d\n", ret); + return ret; + } + after_irq_register: return 0; @@ -497,61 +511,21 @@ static void hisi_pmic_remove(struct spmi_device *pdev) devm_kfree(&pdev->dev, pmic); } -static int hisi_pmic_suspend(struct device *dev, pm_message_t state) -{ - struct hisi_pmic *pmic = dev_get_drvdata(dev); +static const struct of_device_id pmic_spmi_id_table[] = { + { .compatible = "hisilicon,hi6421-spmi-pmic" }, + { } +}; +MODULE_DEVICE_TABLE(of, pmic_spmi_id_table); - if (!pmic) { - pr_err("%s:pmic is NULL\n", __func__); - return -ENOMEM; - } - - pr_info("%s:+\n", __func__); - pr_info("%s:-\n", __func__); - - return 0; -} - -static int hisi_pmic_resume(struct device *dev) -{ - struct hisi_pmic *pmic = dev_get_drvdata(dev); - - if (!pmic) { - pr_err("%s:pmic is NULL\n", __func__); - return -ENOMEM; - } - - pr_info("%s:+\n", __func__); - pr_info("%s:-\n", __func__); - - return 0; -} - -MODULE_DEVICE_TABLE(spmi, pmic_spmi_id); static struct spmi_driver hisi_pmic_driver = { .driver = { - .name = "hisi_pmic", - .owner = THIS_MODULE, - .of_match_table = of_hisi_pmic_match_tbl, - .suspend = hisi_pmic_suspend, - .resume = hisi_pmic_resume, + .name = "hi6421-spmi-pmic", + .of_match_table = pmic_spmi_id_table, }, .probe = hisi_pmic_probe, .remove = hisi_pmic_remove, }; +module_spmi_driver(hisi_pmic_driver); -static int __init hisi_pmic_init(void) -{ - return spmi_driver_register(&hisi_pmic_driver); -} - -static void __exit hisi_pmic_exit(void) -{ - spmi_driver_unregister(&hisi_pmic_driver); -} - -subsys_initcall_sync(hisi_pmic_init); -module_exit(hisi_pmic_exit); - -MODULE_DESCRIPTION("PMIC driver"); +MODULE_DESCRIPTION("HiSilicon Hi6421v600 SPMI PMIC driver"); MODULE_LICENSE("GPL v2"); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 16/44] staging: mfd: hi6421-spmi-pmic: change the binding logic @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Change the binding logic to ensure that the MFD driver will be load after having the SPMI controller registered. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 84 +++++++-------------- 1 file changed, 29 insertions(+), 55 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index be42fed16bd2..939f7bd5d8ba 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -24,13 +24,14 @@ #include <linux/err.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/mfd/core.h> #include <linux/platform_device.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/of_gpio.h> #include <linux/of_irq.h> -#include <linux/mfd/hisi_pmic.h> +#include <linux/mfd/hi6421-spmi-pmic.h> #include <linux/irq.h> #include <linux/spmi.h> #ifndef NO_IRQ @@ -53,11 +54,8 @@ /*define the first group interrupt register number*/ #define HISI_PMIC_FIRST_GROUP_INT_NUM 2 -static const struct of_device_id of_hisi_pmic_match_tbl[] = { - { - .compatible = "hisilicon-hisi-pmic-spmi", - }, - { /* end */ } +static const struct mfd_cell hi6421v600_devs[] = { + { .name = "hi6421v600-regulator", }, }; /* @@ -477,6 +475,22 @@ static int hisi_pmic_probe(struct spmi_device *pdev) goto request_theaded_irq; } + dev_set_drvdata(&pdev->dev, pmic); + + /* + * The logic below will rely that the pmic is already stored at + * drvdata. + */ + dev_dbg(&pdev->dev, "SPMI-PMIC: adding childs for %pOF\n", + pdev->dev.of_node); + ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, + hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs), + NULL, 0, NULL); + if (ret) { + dev_err(&pdev->dev, "Failed to add child devices: %d\n", ret); + return ret; + } + after_irq_register: return 0; @@ -497,61 +511,21 @@ static void hisi_pmic_remove(struct spmi_device *pdev) devm_kfree(&pdev->dev, pmic); } -static int hisi_pmic_suspend(struct device *dev, pm_message_t state) -{ - struct hisi_pmic *pmic = dev_get_drvdata(dev); +static const struct of_device_id pmic_spmi_id_table[] = { + { .compatible = "hisilicon,hi6421-spmi-pmic" }, + { } +}; +MODULE_DEVICE_TABLE(of, pmic_spmi_id_table); - if (!pmic) { - pr_err("%s:pmic is NULL\n", __func__); - return -ENOMEM; - } - - pr_info("%s:+\n", __func__); - pr_info("%s:-\n", __func__); - - return 0; -} - -static int hisi_pmic_resume(struct device *dev) -{ - struct hisi_pmic *pmic = dev_get_drvdata(dev); - - if (!pmic) { - pr_err("%s:pmic is NULL\n", __func__); - return -ENOMEM; - } - - pr_info("%s:+\n", __func__); - pr_info("%s:-\n", __func__); - - return 0; -} - -MODULE_DEVICE_TABLE(spmi, pmic_spmi_id); static struct spmi_driver hisi_pmic_driver = { .driver = { - .name = "hisi_pmic", - .owner = THIS_MODULE, - .of_match_table = of_hisi_pmic_match_tbl, - .suspend = hisi_pmic_suspend, - .resume = hisi_pmic_resume, + .name = "hi6421-spmi-pmic", + .of_match_table = pmic_spmi_id_table, }, .probe = hisi_pmic_probe, .remove = hisi_pmic_remove, }; +module_spmi_driver(hisi_pmic_driver); -static int __init hisi_pmic_init(void) -{ - return spmi_driver_register(&hisi_pmic_driver); -} - -static void __exit hisi_pmic_exit(void) -{ - spmi_driver_unregister(&hisi_pmic_driver); -} - -subsys_initcall_sync(hisi_pmic_init); -module_exit(hisi_pmic_exit); - -MODULE_DESCRIPTION("PMIC driver"); +MODULE_DESCRIPTION("HiSilicon Hi6421v600 SPMI PMIC driver"); MODULE_LICENSE("GPL v2"); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 17/44] staging: mfd: hi6421-spmi-pmic: get rid of unused OF properties 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, Lee Jones, linux-kernel, devel There are several OF properties that aren't used by Hikey 970, and some are not even used inside the driver. So, drop them, as as this makes easier to document what's actually used. If latter needed, those could be re-added later. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 145 +------------------- include/linux/mfd/hi6421-spmi-pmic.h | 14 +- 2 files changed, 7 insertions(+), 152 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 939f7bd5d8ba..f523b2d844b9 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -49,7 +49,6 @@ /*#define HISI_NR_IRQ 25*/ #define HISI_MASK_FIELD 0xFF #define HISI_BITS 8 -#define PMIC_FPGA_FLAG 1 /*define the first group interrupt register number*/ #define HISI_PMIC_FIRST_GROUP_INT_NUM 2 @@ -144,24 +143,6 @@ static irqreturn_t hisi_irq_handler(int irq, void *data) } } - /*Handle the second group irq if analysis the second group irq from dtsi*/ - if (pmic->g_extinterrupt_flag == 1) { - for (i = 0; i < pmic->irqarray1; i++) { - pending = hisi_pmic_read(pmic, (i + pmic->irq_addr1.start_addr)); - pending &= HISI_MASK_FIELD; - if (pending != 0) - pr_debug("pending[%d]=0x%lx\n\r", i, pending); - - hisi_pmic_write(pmic, (i + pmic->irq_addr1.start_addr), pending); - - if (!pending) - continue; - - for_each_set_bit(offset, &pending, HISI_BITS) - generic_handle_irq(pmic->irqs[offset + (i + HISI_PMIC_FIRST_GROUP_INT_NUM) * HISI_BITS]); - } - } - return IRQ_HANDLED; } @@ -172,19 +153,8 @@ static void hisi_irq_mask(struct irq_data *d) unsigned long flags; offset = (irqd_to_hwirq(d) >> 3); - if (pmic->g_extinterrupt_flag == 1) { - if (offset < HISI_PMIC_FIRST_GROUP_INT_NUM) { - offset += pmic->irq_mask_addr.start_addr; - } else { - /* - * Change addr when irq num larger than 16 because - * interrupt addr is nonsequence - */ - offset = offset + (pmic->irq_mask_addr1.start_addr) - HISI_PMIC_FIRST_GROUP_INT_NUM; - } - } else { - offset += pmic->irq_mask_addr.start_addr; - } + offset += pmic->irq_mask_addr.start_addr; + spin_lock_irqsave(&pmic->lock, flags); data = hisi_pmic_read(pmic, offset); data |= (1 << (irqd_to_hwirq(d) & 0x07)); @@ -199,14 +169,8 @@ static void hisi_irq_unmask(struct irq_data *d) unsigned long flags; offset = (irqd_to_hwirq(d) >> 3); - if (pmic->g_extinterrupt_flag == 1) { - if (offset < HISI_PMIC_FIRST_GROUP_INT_NUM) - offset += pmic->irq_mask_addr.start_addr; - else - offset = offset + (pmic->irq_mask_addr1.start_addr) - HISI_PMIC_FIRST_GROUP_INT_NUM; - } else { - offset += pmic->irq_mask_addr.start_addr; - } + offset += pmic->irq_mask_addr.start_addr; + spin_lock_irqsave(&pmic->lock, flags); data = hisi_pmic_read(pmic, offset); data &= ~(1 << (irqd_to_hwirq(d) & 0x07)); @@ -280,69 +244,6 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p return ret; } - /*pmic lock*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-lock", - (int *)&pmic->normal_lock, 2); - if (ret) { - pr_err("no hisilicon,hisi-pmic-lock property set\n"); - ret = -ENODEV; - return ret; - } - - /*pmic debug lock*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-debug-lock", - (int *)&pmic->debug_lock, 2); - if (ret) { - pr_err("no hisilicon,hisi-pmic-debug-lock property set\n"); - ret = -ENODEV; - return ret; - } - - return ret; -} - -static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic *pmic) -{ - int ret = 0; - - /*get pmic irq num*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-num1", - &pmic->irqnum1, 1); - if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-num1 property set\n"); - ret = -ENODEV; - pmic->irqnum1 = 0; - return ret; - } - - /*get pmic irq array number*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-array1", - &pmic->irqarray1, 1); - if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-array1 property set\n"); - ret = -ENODEV; - return ret; - } - - /*SOC_PMIC_IRQ_MASK_0_ADDR*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-mask-addr1", - (int *)&pmic->irq_mask_addr1, 2); - if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-mask-addr1 property set\n"); - ret = -ENODEV; - return ret; - } - - /*SOC_PMIC_IRQ0_ADDR*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-addr1", - (int *)&pmic->irq_addr1, 2); - if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-addr1 property set\n"); - ret = -ENODEV; - return ret; - } - - pmic->g_extinterrupt_flag = 1; return ret; } @@ -362,26 +263,6 @@ static void hisi_pmic_irq_prc(struct hisi_pmic *pmic) } } -static void hisi_pmic_irq1_prc(struct hisi_pmic *pmic) -{ - int i; - unsigned int pending1; - - if (pmic->g_extinterrupt_flag == 1) { - for (i = 0 ; i < pmic->irq_mask_addr1.array; i++) - hisi_pmic_write(pmic, pmic->irq_mask_addr1.start_addr + i, HISI_MASK_STATE); - - for (i = 0 ; i < pmic->irq_addr1.array; i++) { - pending1 = hisi_pmic_read(pmic, pmic->irq_addr1.start_addr + i); - - pr_debug("PMU IRQ address1 value:irq[0x%x] = 0x%x\n", - pmic->irq_addr1.start_addr + i, pending1); - - hisi_pmic_write(pmic, pmic->irq_addr1.start_addr + i, HISI_MASK_STATE); - } - } -} - static int hisi_pmic_probe(struct spmi_device *pdev) { struct device *dev = &pdev->dev; @@ -390,7 +271,6 @@ static int hisi_pmic_probe(struct spmi_device *pdev) enum of_gpio_flags flags; int ret = 0; int i; - unsigned int fpga_flag = 0; unsigned int virq; pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL); @@ -404,22 +284,10 @@ static int hisi_pmic_probe(struct spmi_device *pdev) return ret; } - /*get pmic dts the second group irq*/ - ret = get_pmic_device_tree_data1(np, pmic); - if (ret) - dev_err(&pdev->dev, "the platform don't support ext-interrupt.\n"); - /* TODO: get and enable clk request */ spin_lock_init(&pmic->lock); pmic->dev = dev; - ret = of_property_read_u32_array(np, "hisilicon,pmic_fpga_flag", - &fpga_flag, 1); - if (ret) - pr_err("no hisilicon,pmic_fpga_flag property set\n"); - - if (fpga_flag == PMIC_FPGA_FLAG) - goto after_irq_register; pmic->gpio = of_get_gpio_flags(np, 0, &flags); if (pmic->gpio < 0) @@ -438,10 +306,6 @@ static int hisi_pmic_probe(struct spmi_device *pdev) /* mask && clear IRQ status */ hisi_pmic_irq_prc(pmic); - /*clear && mask the new adding irq*/ - hisi_pmic_irq1_prc(pmic); - - pmic->irqnum += pmic->irqnum1; pmic->irqs = devm_kzalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL); if (!pmic->irqs) @@ -491,7 +355,6 @@ static int hisi_pmic_probe(struct spmi_device *pdev) return ret; } -after_irq_register: return 0; request_theaded_irq: diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index 1f986dd5f31c..41b61de48259 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -48,19 +48,11 @@ struct hisi_pmic { struct irq_domain *domain; int irq; int gpio; - unsigned int *irqs; + unsigned int *irqs; int irqnum; int irqarray; - struct irq_mask_info irq_mask_addr; - struct irq_info irq_addr; - int irqnum1; - int irqarray1; - struct irq_mask_info irq_mask_addr1; - struct irq_info irq_addr1; - struct write_lock normal_lock; - struct write_lock debug_lock; - - unsigned int g_extinterrupt_flag; + struct irq_mask_info irq_mask_addr; + struct irq_info irq_addr; }; u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 17/44] staging: mfd: hi6421-spmi-pmic: get rid of unused OF properties @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab, Lee Jones There are several OF properties that aren't used by Hikey 970, and some are not even used inside the driver. So, drop them, as as this makes easier to document what's actually used. If latter needed, those could be re-added later. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 145 +------------------- include/linux/mfd/hi6421-spmi-pmic.h | 14 +- 2 files changed, 7 insertions(+), 152 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 939f7bd5d8ba..f523b2d844b9 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -49,7 +49,6 @@ /*#define HISI_NR_IRQ 25*/ #define HISI_MASK_FIELD 0xFF #define HISI_BITS 8 -#define PMIC_FPGA_FLAG 1 /*define the first group interrupt register number*/ #define HISI_PMIC_FIRST_GROUP_INT_NUM 2 @@ -144,24 +143,6 @@ static irqreturn_t hisi_irq_handler(int irq, void *data) } } - /*Handle the second group irq if analysis the second group irq from dtsi*/ - if (pmic->g_extinterrupt_flag == 1) { - for (i = 0; i < pmic->irqarray1; i++) { - pending = hisi_pmic_read(pmic, (i + pmic->irq_addr1.start_addr)); - pending &= HISI_MASK_FIELD; - if (pending != 0) - pr_debug("pending[%d]=0x%lx\n\r", i, pending); - - hisi_pmic_write(pmic, (i + pmic->irq_addr1.start_addr), pending); - - if (!pending) - continue; - - for_each_set_bit(offset, &pending, HISI_BITS) - generic_handle_irq(pmic->irqs[offset + (i + HISI_PMIC_FIRST_GROUP_INT_NUM) * HISI_BITS]); - } - } - return IRQ_HANDLED; } @@ -172,19 +153,8 @@ static void hisi_irq_mask(struct irq_data *d) unsigned long flags; offset = (irqd_to_hwirq(d) >> 3); - if (pmic->g_extinterrupt_flag == 1) { - if (offset < HISI_PMIC_FIRST_GROUP_INT_NUM) { - offset += pmic->irq_mask_addr.start_addr; - } else { - /* - * Change addr when irq num larger than 16 because - * interrupt addr is nonsequence - */ - offset = offset + (pmic->irq_mask_addr1.start_addr) - HISI_PMIC_FIRST_GROUP_INT_NUM; - } - } else { - offset += pmic->irq_mask_addr.start_addr; - } + offset += pmic->irq_mask_addr.start_addr; + spin_lock_irqsave(&pmic->lock, flags); data = hisi_pmic_read(pmic, offset); data |= (1 << (irqd_to_hwirq(d) & 0x07)); @@ -199,14 +169,8 @@ static void hisi_irq_unmask(struct irq_data *d) unsigned long flags; offset = (irqd_to_hwirq(d) >> 3); - if (pmic->g_extinterrupt_flag == 1) { - if (offset < HISI_PMIC_FIRST_GROUP_INT_NUM) - offset += pmic->irq_mask_addr.start_addr; - else - offset = offset + (pmic->irq_mask_addr1.start_addr) - HISI_PMIC_FIRST_GROUP_INT_NUM; - } else { - offset += pmic->irq_mask_addr.start_addr; - } + offset += pmic->irq_mask_addr.start_addr; + spin_lock_irqsave(&pmic->lock, flags); data = hisi_pmic_read(pmic, offset); data &= ~(1 << (irqd_to_hwirq(d) & 0x07)); @@ -280,69 +244,6 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p return ret; } - /*pmic lock*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-lock", - (int *)&pmic->normal_lock, 2); - if (ret) { - pr_err("no hisilicon,hisi-pmic-lock property set\n"); - ret = -ENODEV; - return ret; - } - - /*pmic debug lock*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-debug-lock", - (int *)&pmic->debug_lock, 2); - if (ret) { - pr_err("no hisilicon,hisi-pmic-debug-lock property set\n"); - ret = -ENODEV; - return ret; - } - - return ret; -} - -static int get_pmic_device_tree_data1(struct device_node *np, struct hisi_pmic *pmic) -{ - int ret = 0; - - /*get pmic irq num*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-num1", - &pmic->irqnum1, 1); - if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-num1 property set\n"); - ret = -ENODEV; - pmic->irqnum1 = 0; - return ret; - } - - /*get pmic irq array number*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-array1", - &pmic->irqarray1, 1); - if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-array1 property set\n"); - ret = -ENODEV; - return ret; - } - - /*SOC_PMIC_IRQ_MASK_0_ADDR*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-mask-addr1", - (int *)&pmic->irq_mask_addr1, 2); - if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-mask-addr1 property set\n"); - ret = -ENODEV; - return ret; - } - - /*SOC_PMIC_IRQ0_ADDR*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-addr1", - (int *)&pmic->irq_addr1, 2); - if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-addr1 property set\n"); - ret = -ENODEV; - return ret; - } - - pmic->g_extinterrupt_flag = 1; return ret; } @@ -362,26 +263,6 @@ static void hisi_pmic_irq_prc(struct hisi_pmic *pmic) } } -static void hisi_pmic_irq1_prc(struct hisi_pmic *pmic) -{ - int i; - unsigned int pending1; - - if (pmic->g_extinterrupt_flag == 1) { - for (i = 0 ; i < pmic->irq_mask_addr1.array; i++) - hisi_pmic_write(pmic, pmic->irq_mask_addr1.start_addr + i, HISI_MASK_STATE); - - for (i = 0 ; i < pmic->irq_addr1.array; i++) { - pending1 = hisi_pmic_read(pmic, pmic->irq_addr1.start_addr + i); - - pr_debug("PMU IRQ address1 value:irq[0x%x] = 0x%x\n", - pmic->irq_addr1.start_addr + i, pending1); - - hisi_pmic_write(pmic, pmic->irq_addr1.start_addr + i, HISI_MASK_STATE); - } - } -} - static int hisi_pmic_probe(struct spmi_device *pdev) { struct device *dev = &pdev->dev; @@ -390,7 +271,6 @@ static int hisi_pmic_probe(struct spmi_device *pdev) enum of_gpio_flags flags; int ret = 0; int i; - unsigned int fpga_flag = 0; unsigned int virq; pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL); @@ -404,22 +284,10 @@ static int hisi_pmic_probe(struct spmi_device *pdev) return ret; } - /*get pmic dts the second group irq*/ - ret = get_pmic_device_tree_data1(np, pmic); - if (ret) - dev_err(&pdev->dev, "the platform don't support ext-interrupt.\n"); - /* TODO: get and enable clk request */ spin_lock_init(&pmic->lock); pmic->dev = dev; - ret = of_property_read_u32_array(np, "hisilicon,pmic_fpga_flag", - &fpga_flag, 1); - if (ret) - pr_err("no hisilicon,pmic_fpga_flag property set\n"); - - if (fpga_flag == PMIC_FPGA_FLAG) - goto after_irq_register; pmic->gpio = of_get_gpio_flags(np, 0, &flags); if (pmic->gpio < 0) @@ -438,10 +306,6 @@ static int hisi_pmic_probe(struct spmi_device *pdev) /* mask && clear IRQ status */ hisi_pmic_irq_prc(pmic); - /*clear && mask the new adding irq*/ - hisi_pmic_irq1_prc(pmic); - - pmic->irqnum += pmic->irqnum1; pmic->irqs = devm_kzalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL); if (!pmic->irqs) @@ -491,7 +355,6 @@ static int hisi_pmic_probe(struct spmi_device *pdev) return ret; } -after_irq_register: return 0; request_theaded_irq: diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index 1f986dd5f31c..41b61de48259 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -48,19 +48,11 @@ struct hisi_pmic { struct irq_domain *domain; int irq; int gpio; - unsigned int *irqs; + unsigned int *irqs; int irqnum; int irqarray; - struct irq_mask_info irq_mask_addr; - struct irq_info irq_addr; - int irqnum1; - int irqarray1; - struct irq_mask_info irq_mask_addr1; - struct irq_info irq_addr1; - struct write_lock normal_lock; - struct write_lock debug_lock; - - unsigned int g_extinterrupt_flag; + struct irq_mask_info irq_mask_addr; + struct irq_info irq_addr; }; u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 18/44] staging: mfd: hi6421-spmi-pmic: cleanup OF properties 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Simplify the names of the DT properties and do some cleanups, in order to better document them. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index f523b2d844b9..aed2d3ec2227 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -209,37 +209,37 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p int ret = 0; /*get pmic irq num*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-num", + ret = of_property_read_u32_array(np, "irq-num", &pmic->irqnum, 1); if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-num property set\n"); + pr_err("no irq-num property set\n"); ret = -ENODEV; return ret; } /*get pmic irq array number*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-array", + ret = of_property_read_u32_array(np, "irq-array", &pmic->irqarray, 1); if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-array property set\n"); + pr_err("no irq-array property set\n"); ret = -ENODEV; return ret; } /*SOC_PMIC_IRQ_MASK_0_ADDR*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-mask-addr", + ret = of_property_read_u32_array(np, "irq-mask-addr", (int *)&pmic->irq_mask_addr, 2); if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-mask-addr property set\n"); + pr_err("no irq-mask-addr property set\n"); ret = -ENODEV; return ret; } /*SOC_PMIC_IRQ0_ADDR*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-addr", + ret = of_property_read_u32_array(np, "irq-addr", (int *)&pmic->irq_addr, 2); if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-addr property set\n"); + pr_err("no irq-addr property set\n"); ret = -ENODEV; return ret; } -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 18/44] staging: mfd: hi6421-spmi-pmic: cleanup OF properties @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Simplify the names of the DT properties and do some cleanups, in order to better document them. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index f523b2d844b9..aed2d3ec2227 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -209,37 +209,37 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p int ret = 0; /*get pmic irq num*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-num", + ret = of_property_read_u32_array(np, "irq-num", &pmic->irqnum, 1); if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-num property set\n"); + pr_err("no irq-num property set\n"); ret = -ENODEV; return ret; } /*get pmic irq array number*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-array", + ret = of_property_read_u32_array(np, "irq-array", &pmic->irqarray, 1); if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-array property set\n"); + pr_err("no irq-array property set\n"); ret = -ENODEV; return ret; } /*SOC_PMIC_IRQ_MASK_0_ADDR*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-mask-addr", + ret = of_property_read_u32_array(np, "irq-mask-addr", (int *)&pmic->irq_mask_addr, 2); if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-mask-addr property set\n"); + pr_err("no irq-mask-addr property set\n"); ret = -ENODEV; return ret; } /*SOC_PMIC_IRQ0_ADDR*/ - ret = of_property_read_u32_array(np, "hisilicon,hisi-pmic-irq-addr", + ret = of_property_read_u32_array(np, "irq-addr", (int *)&pmic->irq_addr, 2); if (ret) { - pr_err("no hisilicon,hisi-pmic-irq-addr property set\n"); + pr_err("no irq-addr property set\n"); ret = -ENODEV; return ret; } -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 19/44] staging: mfd: hi6421-spmi-pmic: change namespace on its functions 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, Lee Jones, linux-kernel, devel Rename the functions used internally inside the driver in order for them to follow the driver's name. While here, get rid of some unused definitions at the header file. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 97 +++++++++++---------- include/linux/mfd/hi6421-spmi-pmic.h | 51 ++++------- 2 files changed, 70 insertions(+), 78 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index aed2d3ec2227..09cedfa1e4bb 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -62,7 +62,7 @@ static const struct mfd_cell hi6421v600_devs[] = { * Hisilicon SoC use hardware to map PMIC register into SoC mapping. * At here, we are accessing SoC register with 32-bit. */ -u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) +u32 hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg) { u32 ret; u8 read_value = 0; @@ -82,9 +82,9 @@ u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) } return (u32)read_value; } -EXPORT_SYMBOL(hisi_pmic_read); +EXPORT_SYMBOL(hi6421_spmi_pmic_read); -void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) +void hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val) { u32 ret; struct spmi_device *pdev; @@ -101,34 +101,36 @@ void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) return; } } -EXPORT_SYMBOL(hisi_pmic_write); +EXPORT_SYMBOL(hi6421_spmi_pmic_write); -void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) +void hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, + u32 mask, u32 bits) { u32 data; unsigned long flags; spin_lock_irqsave(&pmic->lock, flags); - data = hisi_pmic_read(pmic, reg) & ~mask; + data = hi6421_spmi_pmic_read(pmic, reg) & ~mask; data |= mask & bits; - hisi_pmic_write(pmic, reg, data); + hi6421_spmi_pmic_write(pmic, reg, data); spin_unlock_irqrestore(&pmic->lock, flags); } -EXPORT_SYMBOL(hisi_pmic_rmw); +EXPORT_SYMBOL(hi6421_spmi_pmic_rmw); -static irqreturn_t hisi_irq_handler(int irq, void *data) +static irqreturn_t hi6421_spmi_irq_handler(int irq, void *data) { - struct hisi_pmic *pmic = (struct hisi_pmic *)data; + struct hi6421_spmi_pmic *pmic = (struct hi6421_spmi_pmic *)data; unsigned long pending; int i, offset; for (i = 0; i < pmic->irqarray; i++) { - pending = hisi_pmic_read(pmic, (i + pmic->irq_addr.start_addr)); + pending = hi6421_spmi_pmic_read(pmic, (i + pmic->irq_addr.start_addr)); pending &= HISI_MASK_FIELD; if (pending != 0) pr_debug("pending[%d]=0x%lx\n\r", i, pending); - hisi_pmic_write(pmic, (i + pmic->irq_addr.start_addr), pending); + hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr.start_addr), + pending); /* solve powerkey order */ if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { @@ -146,9 +148,9 @@ static irqreturn_t hisi_irq_handler(int irq, void *data) return IRQ_HANDLED; } -static void hisi_irq_mask(struct irq_data *d) +static void hi6421_spmi_irq_mask(struct irq_data *d) { - struct hisi_pmic *pmic = irq_data_get_irq_chip_data(d); + struct hi6421_spmi_pmic *pmic = irq_data_get_irq_chip_data(d); u32 data, offset; unsigned long flags; @@ -156,15 +158,15 @@ static void hisi_irq_mask(struct irq_data *d) offset += pmic->irq_mask_addr.start_addr; spin_lock_irqsave(&pmic->lock, flags); - data = hisi_pmic_read(pmic, offset); + data = hi6421_spmi_pmic_read(pmic, offset); data |= (1 << (irqd_to_hwirq(d) & 0x07)); - hisi_pmic_write(pmic, offset, data); + hi6421_spmi_pmic_write(pmic, offset, data); spin_unlock_irqrestore(&pmic->lock, flags); } -static void hisi_irq_unmask(struct irq_data *d) +static void hi6421_spmi_irq_unmask(struct irq_data *d) { - struct hisi_pmic *pmic = irq_data_get_irq_chip_data(d); + struct hi6421_spmi_pmic *pmic = irq_data_get_irq_chip_data(d); u32 data, offset; unsigned long flags; @@ -172,26 +174,26 @@ static void hisi_irq_unmask(struct irq_data *d) offset += pmic->irq_mask_addr.start_addr; spin_lock_irqsave(&pmic->lock, flags); - data = hisi_pmic_read(pmic, offset); + data = hi6421_spmi_pmic_read(pmic, offset); data &= ~(1 << (irqd_to_hwirq(d) & 0x07)); - hisi_pmic_write(pmic, offset, data); + hi6421_spmi_pmic_write(pmic, offset, data); spin_unlock_irqrestore(&pmic->lock, flags); } -static struct irq_chip hisi_pmu_irqchip = { +static struct irq_chip hi6421_spmi_pmu_irqchip = { .name = "hisi-irq", - .irq_mask = hisi_irq_mask, - .irq_unmask = hisi_irq_unmask, - .irq_disable = hisi_irq_mask, - .irq_enable = hisi_irq_unmask, + .irq_mask = hi6421_spmi_irq_mask, + .irq_unmask = hi6421_spmi_irq_unmask, + .irq_disable = hi6421_spmi_irq_mask, + .irq_enable = hi6421_spmi_irq_unmask, }; -static int hisi_irq_map(struct irq_domain *d, unsigned int virq, +static int hi6421_spmi_irq_map(struct irq_domain *d, unsigned int virq, irq_hw_number_t hw) { - struct hisi_pmic *pmic = d->host_data; + struct hi6421_spmi_pmic *pmic = d->host_data; - irq_set_chip_and_handler_name(virq, &hisi_pmu_irqchip, + irq_set_chip_and_handler_name(virq, &hi6421_spmi_pmu_irqchip, handle_simple_irq, "hisi"); irq_set_chip_data(virq, pmic); irq_set_irq_type(virq, IRQ_TYPE_NONE); @@ -199,12 +201,13 @@ static int hisi_irq_map(struct irq_domain *d, unsigned int virq, return 0; } -static const struct irq_domain_ops hisi_domain_ops = { - .map = hisi_irq_map, +static const struct irq_domain_ops hi6421_spmi_domain_ops = { + .map = hi6421_spmi_irq_map, .xlate = irq_domain_xlate_twocell, }; -static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *pmic) +static int get_pmic_device_tree_data(struct device_node *np, + struct hi6421_spmi_pmic *pmic) { int ret = 0; @@ -247,27 +250,29 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p return ret; } -static void hisi_pmic_irq_prc(struct hisi_pmic *pmic) +static void hi6421_spmi_pmic_irq_prc(struct hi6421_spmi_pmic *pmic) { int i; for (i = 0 ; i < pmic->irq_mask_addr.array; i++) - hisi_pmic_write(pmic, pmic->irq_mask_addr.start_addr + i, HISI_MASK_STATE); + hi6421_spmi_pmic_write(pmic, pmic->irq_mask_addr.start_addr + i, + HISI_MASK_STATE); for (i = 0 ; i < pmic->irq_addr.array; i++) { - unsigned int pending = hisi_pmic_read(pmic, pmic->irq_addr.start_addr + i); + unsigned int pending = hi6421_spmi_pmic_read(pmic, pmic->irq_addr.start_addr + i); pr_debug("PMU IRQ address value:irq[0x%x] = 0x%x\n", pmic->irq_addr.start_addr + i, pending); - hisi_pmic_write(pmic, pmic->irq_addr.start_addr + i, HISI_MASK_STATE); + hi6421_spmi_pmic_write(pmic, pmic->irq_addr.start_addr + i, + HISI_MASK_STATE); } } -static int hisi_pmic_probe(struct spmi_device *pdev) +static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; - struct hisi_pmic *pmic = NULL; + struct hi6421_spmi_pmic *pmic = NULL; enum of_gpio_flags flags; int ret = 0; int i; @@ -305,14 +310,14 @@ static int hisi_pmic_probe(struct spmi_device *pdev) pmic->irq = gpio_to_irq(pmic->gpio); /* mask && clear IRQ status */ - hisi_pmic_irq_prc(pmic); + hi6421_spmi_pmic_irq_prc(pmic); pmic->irqs = devm_kzalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL); if (!pmic->irqs) goto irq_malloc; pmic->domain = irq_domain_add_simple(np, pmic->irqnum, 0, - &hisi_domain_ops, pmic); + &hi6421_spmi_domain_ops, pmic); if (!pmic->domain) { dev_err(dev, "failed irq domain add simple!\n"); ret = -ENODEV; @@ -330,7 +335,7 @@ static int hisi_pmic_probe(struct spmi_device *pdev) pr_info("[%s]. pmic->irqs[%d] = %d\n", __func__, i, pmic->irqs[i]); } - ret = request_threaded_irq(pmic->irq, hisi_irq_handler, NULL, + ret = request_threaded_irq(pmic->irq, hi6421_spmi_irq_handler, NULL, IRQF_TRIGGER_LOW | IRQF_SHARED | IRQF_NO_SUSPEND, "pmic", pmic); if (ret < 0) { @@ -365,9 +370,9 @@ static int hisi_pmic_probe(struct spmi_device *pdev) return ret; } -static void hisi_pmic_remove(struct spmi_device *pdev) +static void hi6421_spmi_pmic_remove(struct spmi_device *pdev) { - struct hisi_pmic *pmic = dev_get_drvdata(&pdev->dev); + struct hi6421_spmi_pmic *pmic = dev_get_drvdata(&pdev->dev); free_irq(pmic->irq, pmic); gpio_free(pmic->gpio); @@ -380,15 +385,15 @@ static const struct of_device_id pmic_spmi_id_table[] = { }; MODULE_DEVICE_TABLE(of, pmic_spmi_id_table); -static struct spmi_driver hisi_pmic_driver = { +static struct spmi_driver hi6421_spmi_pmic_driver = { .driver = { .name = "hi6421-spmi-pmic", .of_match_table = pmic_spmi_id_table, }, - .probe = hisi_pmic_probe, - .remove = hisi_pmic_remove, + .probe = hi6421_spmi_pmic_probe, + .remove = hi6421_spmi_pmic_remove, }; -module_spmi_driver(hisi_pmic_driver); +module_spmi_driver(hi6421_spmi_pmic_driver); MODULE_DESCRIPTION("HiSilicon Hi6421v600 SPMI PMIC driver"); MODULE_LICENSE("GPL v2"); diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index 41b61de48259..d12ad7484018 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -17,49 +17,36 @@ #define HISI_ECO_MODE_ENABLE (1) #define HISI_ECO_MODE_DISABLE (0) -typedef int (*pmic_ocp_callback)(char *); -int hisi_pmic_special_ocp_register(char *power_name, pmic_ocp_callback handler); - -struct irq_mask_info { +struct hi6421_spmi_irq_mask_info { int start_addr; int array; }; -struct irq_info { +struct hi6421_spmi_irq_info { int start_addr; int array; }; -struct bit_info { - int addr; - int bit; -}; - -struct write_lock { - int addr; - int val; -}; - -struct hisi_pmic { - struct resource *res; - struct device *dev; - void __iomem *regs; - spinlock_t lock; - struct irq_domain *domain; - int irq; - int gpio; - unsigned int *irqs; - int irqnum; - int irqarray; - struct irq_mask_info irq_mask_addr; - struct irq_info irq_addr; +struct hi6421_spmi_pmic { + struct resource *res; + struct device *dev; + void __iomem *regs; + spinlock_t lock; + struct irq_domain *domain; + int irq; + int gpio; + unsigned int *irqs; + int irqnum; + int irqarray; + struct hi6421_spmi_irq_mask_info irq_mask_addr; + struct hi6421_spmi_irq_info irq_addr; }; -u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg); -void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val); -void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits); +u32 hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg); +void hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val); +void hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, u32 mask, u32 bits); -enum pmic_irq_list { +enum hi6421_spmi_pmic_irq_list { OTMP = 0, VBUS_CONNECT, VBUS_DISCONNECT, -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 19/44] staging: mfd: hi6421-spmi-pmic: change namespace on its functions @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab, Lee Jones Rename the functions used internally inside the driver in order for them to follow the driver's name. While here, get rid of some unused definitions at the header file. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 97 +++++++++++---------- include/linux/mfd/hi6421-spmi-pmic.h | 51 ++++------- 2 files changed, 70 insertions(+), 78 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index aed2d3ec2227..09cedfa1e4bb 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -62,7 +62,7 @@ static const struct mfd_cell hi6421v600_devs[] = { * Hisilicon SoC use hardware to map PMIC register into SoC mapping. * At here, we are accessing SoC register with 32-bit. */ -u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) +u32 hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg) { u32 ret; u8 read_value = 0; @@ -82,9 +82,9 @@ u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg) } return (u32)read_value; } -EXPORT_SYMBOL(hisi_pmic_read); +EXPORT_SYMBOL(hi6421_spmi_pmic_read); -void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) +void hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val) { u32 ret; struct spmi_device *pdev; @@ -101,34 +101,36 @@ void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val) return; } } -EXPORT_SYMBOL(hisi_pmic_write); +EXPORT_SYMBOL(hi6421_spmi_pmic_write); -void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits) +void hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, + u32 mask, u32 bits) { u32 data; unsigned long flags; spin_lock_irqsave(&pmic->lock, flags); - data = hisi_pmic_read(pmic, reg) & ~mask; + data = hi6421_spmi_pmic_read(pmic, reg) & ~mask; data |= mask & bits; - hisi_pmic_write(pmic, reg, data); + hi6421_spmi_pmic_write(pmic, reg, data); spin_unlock_irqrestore(&pmic->lock, flags); } -EXPORT_SYMBOL(hisi_pmic_rmw); +EXPORT_SYMBOL(hi6421_spmi_pmic_rmw); -static irqreturn_t hisi_irq_handler(int irq, void *data) +static irqreturn_t hi6421_spmi_irq_handler(int irq, void *data) { - struct hisi_pmic *pmic = (struct hisi_pmic *)data; + struct hi6421_spmi_pmic *pmic = (struct hi6421_spmi_pmic *)data; unsigned long pending; int i, offset; for (i = 0; i < pmic->irqarray; i++) { - pending = hisi_pmic_read(pmic, (i + pmic->irq_addr.start_addr)); + pending = hi6421_spmi_pmic_read(pmic, (i + pmic->irq_addr.start_addr)); pending &= HISI_MASK_FIELD; if (pending != 0) pr_debug("pending[%d]=0x%lx\n\r", i, pending); - hisi_pmic_write(pmic, (i + pmic->irq_addr.start_addr), pending); + hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr.start_addr), + pending); /* solve powerkey order */ if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { @@ -146,9 +148,9 @@ static irqreturn_t hisi_irq_handler(int irq, void *data) return IRQ_HANDLED; } -static void hisi_irq_mask(struct irq_data *d) +static void hi6421_spmi_irq_mask(struct irq_data *d) { - struct hisi_pmic *pmic = irq_data_get_irq_chip_data(d); + struct hi6421_spmi_pmic *pmic = irq_data_get_irq_chip_data(d); u32 data, offset; unsigned long flags; @@ -156,15 +158,15 @@ static void hisi_irq_mask(struct irq_data *d) offset += pmic->irq_mask_addr.start_addr; spin_lock_irqsave(&pmic->lock, flags); - data = hisi_pmic_read(pmic, offset); + data = hi6421_spmi_pmic_read(pmic, offset); data |= (1 << (irqd_to_hwirq(d) & 0x07)); - hisi_pmic_write(pmic, offset, data); + hi6421_spmi_pmic_write(pmic, offset, data); spin_unlock_irqrestore(&pmic->lock, flags); } -static void hisi_irq_unmask(struct irq_data *d) +static void hi6421_spmi_irq_unmask(struct irq_data *d) { - struct hisi_pmic *pmic = irq_data_get_irq_chip_data(d); + struct hi6421_spmi_pmic *pmic = irq_data_get_irq_chip_data(d); u32 data, offset; unsigned long flags; @@ -172,26 +174,26 @@ static void hisi_irq_unmask(struct irq_data *d) offset += pmic->irq_mask_addr.start_addr; spin_lock_irqsave(&pmic->lock, flags); - data = hisi_pmic_read(pmic, offset); + data = hi6421_spmi_pmic_read(pmic, offset); data &= ~(1 << (irqd_to_hwirq(d) & 0x07)); - hisi_pmic_write(pmic, offset, data); + hi6421_spmi_pmic_write(pmic, offset, data); spin_unlock_irqrestore(&pmic->lock, flags); } -static struct irq_chip hisi_pmu_irqchip = { +static struct irq_chip hi6421_spmi_pmu_irqchip = { .name = "hisi-irq", - .irq_mask = hisi_irq_mask, - .irq_unmask = hisi_irq_unmask, - .irq_disable = hisi_irq_mask, - .irq_enable = hisi_irq_unmask, + .irq_mask = hi6421_spmi_irq_mask, + .irq_unmask = hi6421_spmi_irq_unmask, + .irq_disable = hi6421_spmi_irq_mask, + .irq_enable = hi6421_spmi_irq_unmask, }; -static int hisi_irq_map(struct irq_domain *d, unsigned int virq, +static int hi6421_spmi_irq_map(struct irq_domain *d, unsigned int virq, irq_hw_number_t hw) { - struct hisi_pmic *pmic = d->host_data; + struct hi6421_spmi_pmic *pmic = d->host_data; - irq_set_chip_and_handler_name(virq, &hisi_pmu_irqchip, + irq_set_chip_and_handler_name(virq, &hi6421_spmi_pmu_irqchip, handle_simple_irq, "hisi"); irq_set_chip_data(virq, pmic); irq_set_irq_type(virq, IRQ_TYPE_NONE); @@ -199,12 +201,13 @@ static int hisi_irq_map(struct irq_domain *d, unsigned int virq, return 0; } -static const struct irq_domain_ops hisi_domain_ops = { - .map = hisi_irq_map, +static const struct irq_domain_ops hi6421_spmi_domain_ops = { + .map = hi6421_spmi_irq_map, .xlate = irq_domain_xlate_twocell, }; -static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *pmic) +static int get_pmic_device_tree_data(struct device_node *np, + struct hi6421_spmi_pmic *pmic) { int ret = 0; @@ -247,27 +250,29 @@ static int get_pmic_device_tree_data(struct device_node *np, struct hisi_pmic *p return ret; } -static void hisi_pmic_irq_prc(struct hisi_pmic *pmic) +static void hi6421_spmi_pmic_irq_prc(struct hi6421_spmi_pmic *pmic) { int i; for (i = 0 ; i < pmic->irq_mask_addr.array; i++) - hisi_pmic_write(pmic, pmic->irq_mask_addr.start_addr + i, HISI_MASK_STATE); + hi6421_spmi_pmic_write(pmic, pmic->irq_mask_addr.start_addr + i, + HISI_MASK_STATE); for (i = 0 ; i < pmic->irq_addr.array; i++) { - unsigned int pending = hisi_pmic_read(pmic, pmic->irq_addr.start_addr + i); + unsigned int pending = hi6421_spmi_pmic_read(pmic, pmic->irq_addr.start_addr + i); pr_debug("PMU IRQ address value:irq[0x%x] = 0x%x\n", pmic->irq_addr.start_addr + i, pending); - hisi_pmic_write(pmic, pmic->irq_addr.start_addr + i, HISI_MASK_STATE); + hi6421_spmi_pmic_write(pmic, pmic->irq_addr.start_addr + i, + HISI_MASK_STATE); } } -static int hisi_pmic_probe(struct spmi_device *pdev) +static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; - struct hisi_pmic *pmic = NULL; + struct hi6421_spmi_pmic *pmic = NULL; enum of_gpio_flags flags; int ret = 0; int i; @@ -305,14 +310,14 @@ static int hisi_pmic_probe(struct spmi_device *pdev) pmic->irq = gpio_to_irq(pmic->gpio); /* mask && clear IRQ status */ - hisi_pmic_irq_prc(pmic); + hi6421_spmi_pmic_irq_prc(pmic); pmic->irqs = devm_kzalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL); if (!pmic->irqs) goto irq_malloc; pmic->domain = irq_domain_add_simple(np, pmic->irqnum, 0, - &hisi_domain_ops, pmic); + &hi6421_spmi_domain_ops, pmic); if (!pmic->domain) { dev_err(dev, "failed irq domain add simple!\n"); ret = -ENODEV; @@ -330,7 +335,7 @@ static int hisi_pmic_probe(struct spmi_device *pdev) pr_info("[%s]. pmic->irqs[%d] = %d\n", __func__, i, pmic->irqs[i]); } - ret = request_threaded_irq(pmic->irq, hisi_irq_handler, NULL, + ret = request_threaded_irq(pmic->irq, hi6421_spmi_irq_handler, NULL, IRQF_TRIGGER_LOW | IRQF_SHARED | IRQF_NO_SUSPEND, "pmic", pmic); if (ret < 0) { @@ -365,9 +370,9 @@ static int hisi_pmic_probe(struct spmi_device *pdev) return ret; } -static void hisi_pmic_remove(struct spmi_device *pdev) +static void hi6421_spmi_pmic_remove(struct spmi_device *pdev) { - struct hisi_pmic *pmic = dev_get_drvdata(&pdev->dev); + struct hi6421_spmi_pmic *pmic = dev_get_drvdata(&pdev->dev); free_irq(pmic->irq, pmic); gpio_free(pmic->gpio); @@ -380,15 +385,15 @@ static const struct of_device_id pmic_spmi_id_table[] = { }; MODULE_DEVICE_TABLE(of, pmic_spmi_id_table); -static struct spmi_driver hisi_pmic_driver = { +static struct spmi_driver hi6421_spmi_pmic_driver = { .driver = { .name = "hi6421-spmi-pmic", .of_match_table = pmic_spmi_id_table, }, - .probe = hisi_pmic_probe, - .remove = hisi_pmic_remove, + .probe = hi6421_spmi_pmic_probe, + .remove = hi6421_spmi_pmic_remove, }; -module_spmi_driver(hisi_pmic_driver); +module_spmi_driver(hi6421_spmi_pmic_driver); MODULE_DESCRIPTION("HiSilicon Hi6421v600 SPMI PMIC driver"); MODULE_LICENSE("GPL v2"); diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index 41b61de48259..d12ad7484018 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -17,49 +17,36 @@ #define HISI_ECO_MODE_ENABLE (1) #define HISI_ECO_MODE_DISABLE (0) -typedef int (*pmic_ocp_callback)(char *); -int hisi_pmic_special_ocp_register(char *power_name, pmic_ocp_callback handler); - -struct irq_mask_info { +struct hi6421_spmi_irq_mask_info { int start_addr; int array; }; -struct irq_info { +struct hi6421_spmi_irq_info { int start_addr; int array; }; -struct bit_info { - int addr; - int bit; -}; - -struct write_lock { - int addr; - int val; -}; - -struct hisi_pmic { - struct resource *res; - struct device *dev; - void __iomem *regs; - spinlock_t lock; - struct irq_domain *domain; - int irq; - int gpio; - unsigned int *irqs; - int irqnum; - int irqarray; - struct irq_mask_info irq_mask_addr; - struct irq_info irq_addr; +struct hi6421_spmi_pmic { + struct resource *res; + struct device *dev; + void __iomem *regs; + spinlock_t lock; + struct irq_domain *domain; + int irq; + int gpio; + unsigned int *irqs; + int irqnum; + int irqarray; + struct hi6421_spmi_irq_mask_info irq_mask_addr; + struct hi6421_spmi_irq_info irq_addr; }; -u32 hisi_pmic_read(struct hisi_pmic *pmic, int reg); -void hisi_pmic_write(struct hisi_pmic *pmic, int reg, u32 val); -void hisi_pmic_rmw(struct hisi_pmic *pmic, int reg, u32 mask, u32 bits); +u32 hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg); +void hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val); +void hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, u32 mask, u32 bits); -enum pmic_irq_list { +enum hi6421_spmi_pmic_irq_list { OTMP = 0, VBUS_CONNECT, VBUS_DISCONNECT, -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 20/44] staging: mfd: hi6421-spmi-pmic: fix some coding style issues 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, Lee Jones, linux-kernel, devel Checkpatch complains about some minor issues inside this driver that were not addressed by the previous patch. Address them. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 4 ++-- include/linux/mfd/hi6421-spmi-pmic.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 09cedfa1e4bb..d8b84d64041e 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -189,7 +189,7 @@ static struct irq_chip hi6421_spmi_pmu_irqchip = { }; static int hi6421_spmi_irq_map(struct irq_domain *d, unsigned int virq, - irq_hw_number_t hw) + irq_hw_number_t hw) { struct hi6421_spmi_pmic *pmic = d->host_data; @@ -350,7 +350,7 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) * The logic below will rely that the pmic is already stored at * drvdata. */ - dev_dbg(&pdev->dev, "SPMI-PMIC: adding childs for %pOF\n", + dev_dbg(&pdev->dev, "SPMI-PMIC: adding children for %pOF\n", pdev->dev.of_node); ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs), diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index d12ad7484018..aeff96c4a37e 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -38,7 +38,8 @@ struct hi6421_spmi_pmic { unsigned int *irqs; int irqnum; int irqarray; - struct hi6421_spmi_irq_mask_info irq_mask_addr; + + struct hi6421_spmi_irq_mask_info irq_mask_addr; struct hi6421_spmi_irq_info irq_addr; }; -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 20/44] staging: mfd: hi6421-spmi-pmic: fix some coding style issues @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab, Lee Jones Checkpatch complains about some minor issues inside this driver that were not addressed by the previous patch. Address them. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 4 ++-- include/linux/mfd/hi6421-spmi-pmic.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 09cedfa1e4bb..d8b84d64041e 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -189,7 +189,7 @@ static struct irq_chip hi6421_spmi_pmu_irqchip = { }; static int hi6421_spmi_irq_map(struct irq_domain *d, unsigned int virq, - irq_hw_number_t hw) + irq_hw_number_t hw) { struct hi6421_spmi_pmic *pmic = d->host_data; @@ -350,7 +350,7 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) * The logic below will rely that the pmic is already stored at * drvdata. */ - dev_dbg(&pdev->dev, "SPMI-PMIC: adding childs for %pOF\n", + dev_dbg(&pdev->dev, "SPMI-PMIC: adding children for %pOF\n", pdev->dev.of_node); ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs), diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index d12ad7484018..aeff96c4a37e 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -38,7 +38,8 @@ struct hi6421_spmi_pmic { unsigned int *irqs; int irqnum; int irqarray; - struct hi6421_spmi_irq_mask_info irq_mask_addr; + + struct hi6421_spmi_irq_mask_info irq_mask_addr; struct hi6421_spmi_irq_info irq_addr; }; -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* Re: [PATCH 20/44] staging: mfd: hi6421-spmi-pmic: fix some coding style issues 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 16:12 ` Joe Perches -1 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 16:12 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linuxarm, mauro.chehab, Greg Kroah-Hartman, Lee Jones, linux-kernel, devel On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > Checkpatch complains about some minor issues inside this > driver that were not addressed by the previous patch. > > Address them. [] > diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h [] > @@ -38,7 +38,8 @@ struct hi6421_spmi_pmic { > unsigned int *irqs; > int irqnum; > int irqarray; > - struct hi6421_spmi_irq_mask_info irq_mask_addr; > + > + struct hi6421_spmi_irq_mask_info irq_mask_addr; > struct hi6421_spmi_irq_info irq_addr; > }; Was adding a blank line one of checkpatch complaints? I doubt it. ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 20/44] staging: mfd: hi6421-spmi-pmic: fix some coding style issues @ 2020-08-12 16:12 ` Joe Perches 0 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 16:12 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: devel, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab, Lee Jones On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > Checkpatch complains about some minor issues inside this > driver that were not addressed by the previous patch. > > Address them. [] > diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h [] > @@ -38,7 +38,8 @@ struct hi6421_spmi_pmic { > unsigned int *irqs; > int irqnum; > int irqarray; > - struct hi6421_spmi_irq_mask_info irq_mask_addr; > + > + struct hi6421_spmi_irq_mask_info irq_mask_addr; > struct hi6421_spmi_irq_info irq_addr; > }; Was adding a blank line one of checkpatch complaints? I doubt it. _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* [PATCH 21/44] staging: mfd: hi6421-spmi-pmic: add it to the building system 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Now that the driver is ready, place it at the build system. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/Kconfig | 17 +++++++++++++++++ drivers/staging/hikey9xx/Makefile | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig index 31eb01b5ef2b..7ca083b7e94d 100644 --- a/drivers/staging/hikey9xx/Kconfig +++ b/drivers/staging/hikey9xx/Kconfig @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 +# to be placed at drivers/spmi config SPMI_HISI3670 tristate "Hisilicon 3670 SPMI Controller" select IRQ_DOMAIN_HIERARCHY @@ -8,3 +9,19 @@ config SPMI_HISI3670 If you say yes to this option, support will be included for the built-in SPMI PMIC Arbiter interface on Hisilicon 3670 processors. + +# to be placed at drivers/mfd +config MFD_HI6421_SPMI + tristate "HiSilicon Hi6421v600 SPMI PMU/Codec IC" + depends on OF + select MFD_CORE + select REGMAP_MMIO + help + Add support for HiSilicon Hi6421v600 SPMI PMIC. Hi6421 includes + multi-functions, such as regulators, RTC, codec, Coulomb counter, + etc. + + This driver includes core APIs _only_. You have to select + individual components like voltage regulators under corresponding + menus in order to enable them. + We communicate with the Hi6421v600 via a SPMI bus. diff --git a/drivers/staging/hikey9xx/Makefile b/drivers/staging/hikey9xx/Makefile index e8085abce444..79de37da7a8f 100644 --- a/drivers/staging/hikey9xx/Makefile +++ b/drivers/staging/hikey9xx/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o +obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o +obj-$(CONFIG_MFD_HI6421_SPMI) += hi6421-spmi-pmic.o -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 21/44] staging: mfd: hi6421-spmi-pmic: add it to the building system @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Now that the driver is ready, place it at the build system. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/Kconfig | 17 +++++++++++++++++ drivers/staging/hikey9xx/Makefile | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig index 31eb01b5ef2b..7ca083b7e94d 100644 --- a/drivers/staging/hikey9xx/Kconfig +++ b/drivers/staging/hikey9xx/Kconfig @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 +# to be placed at drivers/spmi config SPMI_HISI3670 tristate "Hisilicon 3670 SPMI Controller" select IRQ_DOMAIN_HIERARCHY @@ -8,3 +9,19 @@ config SPMI_HISI3670 If you say yes to this option, support will be included for the built-in SPMI PMIC Arbiter interface on Hisilicon 3670 processors. + +# to be placed at drivers/mfd +config MFD_HI6421_SPMI + tristate "HiSilicon Hi6421v600 SPMI PMU/Codec IC" + depends on OF + select MFD_CORE + select REGMAP_MMIO + help + Add support for HiSilicon Hi6421v600 SPMI PMIC. Hi6421 includes + multi-functions, such as regulators, RTC, codec, Coulomb counter, + etc. + + This driver includes core APIs _only_. You have to select + individual components like voltage regulators under corresponding + menus in order to enable them. + We communicate with the Hi6421v600 via a SPMI bus. diff --git a/drivers/staging/hikey9xx/Makefile b/drivers/staging/hikey9xx/Makefile index e8085abce444..79de37da7a8f 100644 --- a/drivers/staging/hikey9xx/Makefile +++ b/drivers/staging/hikey9xx/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o +obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o +obj-$(CONFIG_MFD_HI6421_SPMI) += hi6421-spmi-pmic.o -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 22/44] staging: mfd: hi6421-spmi-pmic: cleanup the code 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, Lee Jones, linux-kernel, devel, Jonathan Cameron There are several small cleanups that can be done in order to make the code more prepared to be upstreamed. Suggested-by: Jonathan Cameron <Jonathan.Cameron@Huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 146 +++++++++----------- include/linux/mfd/hi6421-spmi-pmic.h | 13 +- 2 files changed, 71 insertions(+), 88 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index d8b84d64041e..76766e7b8bf9 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -17,26 +17,23 @@ * */ -#include <linux/slab.h> #include <linux/delay.h> #include <linux/device.h> -#include <linux/module.h> #include <linux/err.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/irq.h> #include <linux/mfd/core.h> -#include <linux/platform_device.h> -#include <linux/of.h> +#include <linux/mfd/hi6421-spmi-pmic.h> +#include <linux/module.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/of_gpio.h> +#include <linux/of.h> #include <linux/of_irq.h> -#include <linux/mfd/hi6421-spmi-pmic.h> -#include <linux/irq.h> +#include <linux/platform_device.h> +#include <linux/slab.h> #include <linux/spmi.h> -#ifndef NO_IRQ -#define NO_IRQ 0 -#endif /* 8-bit register offset in PMIC */ #define HISI_MASK_STATE 0xff @@ -46,12 +43,11 @@ #define HISI_IRQ_KEY_DOWN 7 #define HISI_IRQ_KEY_UP 6 -/*#define HISI_NR_IRQ 25*/ -#define HISI_MASK_FIELD 0xFF +#define HISI_MASK_FIELD 0xFF #define HISI_BITS 8 /*define the first group interrupt register number*/ -#define HISI_PMIC_FIRST_GROUP_INT_NUM 2 +#define HISI_PMIC_FIRST_GROUP_INT_NUM 2 static const struct mfd_cell hi6421v600_devs[] = { { .name = "hi6421v600-regulator", }, @@ -62,58 +58,60 @@ static const struct mfd_cell hi6421v600_devs[] = { * Hisilicon SoC use hardware to map PMIC register into SoC mapping. * At here, we are accessing SoC register with 32-bit. */ -u32 hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg) +int hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg) { - u32 ret; + struct spmi_device *pdev; u8 read_value = 0; - struct spmi_device *pdev; + u32 ret; pdev = to_spmi_device(pmic->dev); if (!pdev) { pr_err("%s: pdev get failed!\n", __func__); - return 0; + return -ENODEV; } - ret = spmi_ext_register_readl(pdev, reg, - (unsigned char *)&read_value, 1); + ret = spmi_ext_register_readl(pdev, reg, &read_value, 1); if (ret) { pr_err("%s: spmi_ext_register_readl failed!\n", __func__); - return 0; + return ret; } - return (u32)read_value; + return read_value; } EXPORT_SYMBOL(hi6421_spmi_pmic_read); -void hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val) +int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val) { - u32 ret; struct spmi_device *pdev; + u32 ret; pdev = to_spmi_device(pmic->dev); if (!pdev) { pr_err("%s: pdev get failed!\n", __func__); - return; + return -ENODEV; } ret = spmi_ext_register_writel(pdev, reg, (unsigned char *)&val, 1); - if (ret) { + if (ret) pr_err("%s: spmi_ext_register_writel failed!\n", __func__); - return; - } + + return ret; } EXPORT_SYMBOL(hi6421_spmi_pmic_write); -void hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, +int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, u32 mask, u32 bits) { + unsigned long flags; u32 data; - unsigned long flags; + int ret; spin_lock_irqsave(&pmic->lock, flags); data = hi6421_spmi_pmic_read(pmic, reg) & ~mask; data |= mask & bits; - hi6421_spmi_pmic_write(pmic, reg, data); + ret = hi6421_spmi_pmic_write(pmic, reg, data); spin_unlock_irqrestore(&pmic->lock, flags); + + return ret; } EXPORT_SYMBOL(hi6421_spmi_pmic_rmw); @@ -124,13 +122,12 @@ static irqreturn_t hi6421_spmi_irq_handler(int irq, void *data) int i, offset; for (i = 0; i < pmic->irqarray; i++) { - pending = hi6421_spmi_pmic_read(pmic, (i + pmic->irq_addr.start_addr)); + pending = hi6421_spmi_pmic_read(pmic, (i + pmic->irq_addr)); pending &= HISI_MASK_FIELD; if (pending != 0) pr_debug("pending[%d]=0x%lx\n\r", i, pending); - hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr.start_addr), - pending); + hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr), pending); /* solve powerkey order */ if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { @@ -155,7 +152,7 @@ static void hi6421_spmi_irq_mask(struct irq_data *d) unsigned long flags; offset = (irqd_to_hwirq(d) >> 3); - offset += pmic->irq_mask_addr.start_addr; + offset += pmic->irq_mask_addr; spin_lock_irqsave(&pmic->lock, flags); data = hi6421_spmi_pmic_read(pmic, offset); @@ -171,7 +168,7 @@ static void hi6421_spmi_irq_unmask(struct irq_data *d) unsigned long flags; offset = (irqd_to_hwirq(d) >> 3); - offset += pmic->irq_mask_addr.start_addr; + offset += pmic->irq_mask_addr; spin_lock_irqsave(&pmic->lock, flags); data = hi6421_spmi_pmic_read(pmic, offset); @@ -211,36 +208,32 @@ static int get_pmic_device_tree_data(struct device_node *np, { int ret = 0; - /*get pmic irq num*/ - ret = of_property_read_u32_array(np, "irq-num", - &pmic->irqnum, 1); + /* IRQ number */ + ret = of_property_read_u32(np, "irq-num", &pmic->irqnum); if (ret) { pr_err("no irq-num property set\n"); ret = -ENODEV; return ret; } - /*get pmic irq array number*/ - ret = of_property_read_u32_array(np, "irq-array", - &pmic->irqarray, 1); + /* Size of IRQ array */ + ret = of_property_read_u32(np, "irq-array", &pmic->irqarray); if (ret) { pr_err("no irq-array property set\n"); ret = -ENODEV; return ret; } - /*SOC_PMIC_IRQ_MASK_0_ADDR*/ - ret = of_property_read_u32_array(np, "irq-mask-addr", - (int *)&pmic->irq_mask_addr, 2); + /* SOC_PMIC_IRQ_MASK_0_ADDR */ + ret = of_property_read_u32(np, "irq-mask-addr", &pmic->irq_mask_addr); if (ret) { pr_err("no irq-mask-addr property set\n"); ret = -ENODEV; return ret; } - /*SOC_PMIC_IRQ0_ADDR*/ - ret = of_property_read_u32_array(np, "irq-addr", - (int *)&pmic->irq_addr, 2); + /* SOC_PMIC_IRQ0_ADDR */ + ret = of_property_read_u32(np, "irq-addr", &pmic->irq_addr); if (ret) { pr_err("no irq-addr property set\n"); ret = -ENODEV; @@ -252,18 +245,18 @@ static int get_pmic_device_tree_data(struct device_node *np, static void hi6421_spmi_pmic_irq_prc(struct hi6421_spmi_pmic *pmic) { - int i; + int i, pending; - for (i = 0 ; i < pmic->irq_mask_addr.array; i++) - hi6421_spmi_pmic_write(pmic, pmic->irq_mask_addr.start_addr + i, + for (i = 0 ; i < pmic->irqarray; i++) + hi6421_spmi_pmic_write(pmic, pmic->irq_mask_addr + i, HISI_MASK_STATE); - for (i = 0 ; i < pmic->irq_addr.array; i++) { - unsigned int pending = hi6421_spmi_pmic_read(pmic, pmic->irq_addr.start_addr + i); + for (i = 0 ; i < pmic->irqarray; i++) { + pending = hi6421_spmi_pmic_read(pmic, pmic->irq_addr + i); pr_debug("PMU IRQ address value:irq[0x%x] = 0x%x\n", - pmic->irq_addr.start_addr + i, pending); - hi6421_spmi_pmic_write(pmic, pmic->irq_addr.start_addr + i, + pmic->irq_addr + i, pending); + hi6421_spmi_pmic_write(pmic, pmic->irq_addr + i, HISI_MASK_STATE); } } @@ -272,36 +265,32 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; - struct hi6421_spmi_pmic *pmic = NULL; - enum of_gpio_flags flags; - int ret = 0; - int i; + struct hi6421_spmi_pmic *pmic; unsigned int virq; + int ret, i; pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL); if (!pmic) return -ENOMEM; - /*TODO: get pmic dts info*/ ret = get_pmic_device_tree_data(np, pmic); if (ret) { - dev_err(&pdev->dev, "Error reading hisi pmic dts\n"); + dev_err(dev, "Error reading hisi pmic dts\n"); return ret; } - /* TODO: get and enable clk request */ spin_lock_init(&pmic->lock); pmic->dev = dev; - pmic->gpio = of_get_gpio_flags(np, 0, &flags); + pmic->gpio = of_get_gpio(np, 0); if (pmic->gpio < 0) return pmic->gpio; if (!gpio_is_valid(pmic->gpio)) return -EINVAL; - ret = gpio_request_one(pmic->gpio, GPIOF_IN, "pmic"); + ret = devm_gpio_request_one(dev, pmic->gpio, GPIOF_IN, "pmic"); if (ret < 0) { dev_err(dev, "failed to request gpio%d\n", pmic->gpio); return ret; @@ -309,7 +298,6 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) pmic->irq = gpio_to_irq(pmic->gpio); - /* mask && clear IRQ status */ hi6421_spmi_pmic_irq_prc(pmic); pmic->irqs = devm_kzalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL); @@ -321,27 +309,27 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) if (!pmic->domain) { dev_err(dev, "failed irq domain add simple!\n"); ret = -ENODEV; - goto irq_domain; + goto irq_malloc; } for (i = 0; i < pmic->irqnum; i++) { virq = irq_create_mapping(pmic->domain, i); - if (virq == NO_IRQ) { - pr_debug("Failed mapping hwirq\n"); + if (!virq) { + dev_err(dev, "Failed mapping hwirq\n"); ret = -ENOSPC; - goto irq_create_mapping; + goto irq_malloc; } pmic->irqs[i] = virq; - pr_info("[%s]. pmic->irqs[%d] = %d\n", __func__, i, pmic->irqs[i]); + dev_dbg(dev, "%s: pmic->irqs[%d] = %d\n", + __func__, i, pmic->irqs[i]); } ret = request_threaded_irq(pmic->irq, hi6421_spmi_irq_handler, NULL, IRQF_TRIGGER_LOW | IRQF_SHARED | IRQF_NO_SUSPEND, "pmic", pmic); if (ret < 0) { - dev_err(dev, "could not claim pmic %d\n", ret); - ret = -ENODEV; - goto request_theaded_irq; + dev_err(dev, "could not claim pmic IRQ: error %d\n", ret); + goto irq_malloc; } dev_set_drvdata(&pdev->dev, pmic); @@ -355,18 +343,14 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs), NULL, 0, NULL); - if (ret) { - dev_err(&pdev->dev, "Failed to add child devices: %d\n", ret); - return ret; - } + if (!ret) + return 0; - return 0; + dev_err(dev, "Failed to add child devices: %d\n", ret); -request_theaded_irq: -irq_create_mapping: -irq_domain: irq_malloc: - gpio_free(pmic->gpio); + free_irq(pmic->irq, pmic); + return ret; } @@ -375,8 +359,6 @@ static void hi6421_spmi_pmic_remove(struct spmi_device *pdev) struct hi6421_spmi_pmic *pmic = dev_get_drvdata(&pdev->dev); free_irq(pmic->irq, pmic); - gpio_free(pmic->gpio); - devm_kfree(&pdev->dev, pmic); } static const struct of_device_id pmic_spmi_id_table[] = { diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index aeff96c4a37e..ff3adfa7b3ec 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -36,16 +36,17 @@ struct hi6421_spmi_pmic { int irq; int gpio; unsigned int *irqs; + int irqnum; int irqarray; - - struct hi6421_spmi_irq_mask_info irq_mask_addr; - struct hi6421_spmi_irq_info irq_addr; + int irq_mask_addr; + int irq_addr; }; -u32 hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg); -void hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val); -void hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, u32 mask, u32 bits); +int hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg); +int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val); +int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, + u32 mask, u32 bits); enum hi6421_spmi_pmic_irq_list { OTMP = 0, -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 22/44] staging: mfd: hi6421-spmi-pmic: cleanup the code @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, Jonathan Cameron, mauro.chehab, Lee Jones There are several small cleanups that can be done in order to make the code more prepared to be upstreamed. Suggested-by: Jonathan Cameron <Jonathan.Cameron@Huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 146 +++++++++----------- include/linux/mfd/hi6421-spmi-pmic.h | 13 +- 2 files changed, 71 insertions(+), 88 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index d8b84d64041e..76766e7b8bf9 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -17,26 +17,23 @@ * */ -#include <linux/slab.h> #include <linux/delay.h> #include <linux/device.h> -#include <linux/module.h> #include <linux/err.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/irq.h> #include <linux/mfd/core.h> -#include <linux/platform_device.h> -#include <linux/of.h> +#include <linux/mfd/hi6421-spmi-pmic.h> +#include <linux/module.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/of_gpio.h> +#include <linux/of.h> #include <linux/of_irq.h> -#include <linux/mfd/hi6421-spmi-pmic.h> -#include <linux/irq.h> +#include <linux/platform_device.h> +#include <linux/slab.h> #include <linux/spmi.h> -#ifndef NO_IRQ -#define NO_IRQ 0 -#endif /* 8-bit register offset in PMIC */ #define HISI_MASK_STATE 0xff @@ -46,12 +43,11 @@ #define HISI_IRQ_KEY_DOWN 7 #define HISI_IRQ_KEY_UP 6 -/*#define HISI_NR_IRQ 25*/ -#define HISI_MASK_FIELD 0xFF +#define HISI_MASK_FIELD 0xFF #define HISI_BITS 8 /*define the first group interrupt register number*/ -#define HISI_PMIC_FIRST_GROUP_INT_NUM 2 +#define HISI_PMIC_FIRST_GROUP_INT_NUM 2 static const struct mfd_cell hi6421v600_devs[] = { { .name = "hi6421v600-regulator", }, @@ -62,58 +58,60 @@ static const struct mfd_cell hi6421v600_devs[] = { * Hisilicon SoC use hardware to map PMIC register into SoC mapping. * At here, we are accessing SoC register with 32-bit. */ -u32 hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg) +int hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg) { - u32 ret; + struct spmi_device *pdev; u8 read_value = 0; - struct spmi_device *pdev; + u32 ret; pdev = to_spmi_device(pmic->dev); if (!pdev) { pr_err("%s: pdev get failed!\n", __func__); - return 0; + return -ENODEV; } - ret = spmi_ext_register_readl(pdev, reg, - (unsigned char *)&read_value, 1); + ret = spmi_ext_register_readl(pdev, reg, &read_value, 1); if (ret) { pr_err("%s: spmi_ext_register_readl failed!\n", __func__); - return 0; + return ret; } - return (u32)read_value; + return read_value; } EXPORT_SYMBOL(hi6421_spmi_pmic_read); -void hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val) +int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val) { - u32 ret; struct spmi_device *pdev; + u32 ret; pdev = to_spmi_device(pmic->dev); if (!pdev) { pr_err("%s: pdev get failed!\n", __func__); - return; + return -ENODEV; } ret = spmi_ext_register_writel(pdev, reg, (unsigned char *)&val, 1); - if (ret) { + if (ret) pr_err("%s: spmi_ext_register_writel failed!\n", __func__); - return; - } + + return ret; } EXPORT_SYMBOL(hi6421_spmi_pmic_write); -void hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, +int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, u32 mask, u32 bits) { + unsigned long flags; u32 data; - unsigned long flags; + int ret; spin_lock_irqsave(&pmic->lock, flags); data = hi6421_spmi_pmic_read(pmic, reg) & ~mask; data |= mask & bits; - hi6421_spmi_pmic_write(pmic, reg, data); + ret = hi6421_spmi_pmic_write(pmic, reg, data); spin_unlock_irqrestore(&pmic->lock, flags); + + return ret; } EXPORT_SYMBOL(hi6421_spmi_pmic_rmw); @@ -124,13 +122,12 @@ static irqreturn_t hi6421_spmi_irq_handler(int irq, void *data) int i, offset; for (i = 0; i < pmic->irqarray; i++) { - pending = hi6421_spmi_pmic_read(pmic, (i + pmic->irq_addr.start_addr)); + pending = hi6421_spmi_pmic_read(pmic, (i + pmic->irq_addr)); pending &= HISI_MASK_FIELD; if (pending != 0) pr_debug("pending[%d]=0x%lx\n\r", i, pending); - hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr.start_addr), - pending); + hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr), pending); /* solve powerkey order */ if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { @@ -155,7 +152,7 @@ static void hi6421_spmi_irq_mask(struct irq_data *d) unsigned long flags; offset = (irqd_to_hwirq(d) >> 3); - offset += pmic->irq_mask_addr.start_addr; + offset += pmic->irq_mask_addr; spin_lock_irqsave(&pmic->lock, flags); data = hi6421_spmi_pmic_read(pmic, offset); @@ -171,7 +168,7 @@ static void hi6421_spmi_irq_unmask(struct irq_data *d) unsigned long flags; offset = (irqd_to_hwirq(d) >> 3); - offset += pmic->irq_mask_addr.start_addr; + offset += pmic->irq_mask_addr; spin_lock_irqsave(&pmic->lock, flags); data = hi6421_spmi_pmic_read(pmic, offset); @@ -211,36 +208,32 @@ static int get_pmic_device_tree_data(struct device_node *np, { int ret = 0; - /*get pmic irq num*/ - ret = of_property_read_u32_array(np, "irq-num", - &pmic->irqnum, 1); + /* IRQ number */ + ret = of_property_read_u32(np, "irq-num", &pmic->irqnum); if (ret) { pr_err("no irq-num property set\n"); ret = -ENODEV; return ret; } - /*get pmic irq array number*/ - ret = of_property_read_u32_array(np, "irq-array", - &pmic->irqarray, 1); + /* Size of IRQ array */ + ret = of_property_read_u32(np, "irq-array", &pmic->irqarray); if (ret) { pr_err("no irq-array property set\n"); ret = -ENODEV; return ret; } - /*SOC_PMIC_IRQ_MASK_0_ADDR*/ - ret = of_property_read_u32_array(np, "irq-mask-addr", - (int *)&pmic->irq_mask_addr, 2); + /* SOC_PMIC_IRQ_MASK_0_ADDR */ + ret = of_property_read_u32(np, "irq-mask-addr", &pmic->irq_mask_addr); if (ret) { pr_err("no irq-mask-addr property set\n"); ret = -ENODEV; return ret; } - /*SOC_PMIC_IRQ0_ADDR*/ - ret = of_property_read_u32_array(np, "irq-addr", - (int *)&pmic->irq_addr, 2); + /* SOC_PMIC_IRQ0_ADDR */ + ret = of_property_read_u32(np, "irq-addr", &pmic->irq_addr); if (ret) { pr_err("no irq-addr property set\n"); ret = -ENODEV; @@ -252,18 +245,18 @@ static int get_pmic_device_tree_data(struct device_node *np, static void hi6421_spmi_pmic_irq_prc(struct hi6421_spmi_pmic *pmic) { - int i; + int i, pending; - for (i = 0 ; i < pmic->irq_mask_addr.array; i++) - hi6421_spmi_pmic_write(pmic, pmic->irq_mask_addr.start_addr + i, + for (i = 0 ; i < pmic->irqarray; i++) + hi6421_spmi_pmic_write(pmic, pmic->irq_mask_addr + i, HISI_MASK_STATE); - for (i = 0 ; i < pmic->irq_addr.array; i++) { - unsigned int pending = hi6421_spmi_pmic_read(pmic, pmic->irq_addr.start_addr + i); + for (i = 0 ; i < pmic->irqarray; i++) { + pending = hi6421_spmi_pmic_read(pmic, pmic->irq_addr + i); pr_debug("PMU IRQ address value:irq[0x%x] = 0x%x\n", - pmic->irq_addr.start_addr + i, pending); - hi6421_spmi_pmic_write(pmic, pmic->irq_addr.start_addr + i, + pmic->irq_addr + i, pending); + hi6421_spmi_pmic_write(pmic, pmic->irq_addr + i, HISI_MASK_STATE); } } @@ -272,36 +265,32 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; - struct hi6421_spmi_pmic *pmic = NULL; - enum of_gpio_flags flags; - int ret = 0; - int i; + struct hi6421_spmi_pmic *pmic; unsigned int virq; + int ret, i; pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL); if (!pmic) return -ENOMEM; - /*TODO: get pmic dts info*/ ret = get_pmic_device_tree_data(np, pmic); if (ret) { - dev_err(&pdev->dev, "Error reading hisi pmic dts\n"); + dev_err(dev, "Error reading hisi pmic dts\n"); return ret; } - /* TODO: get and enable clk request */ spin_lock_init(&pmic->lock); pmic->dev = dev; - pmic->gpio = of_get_gpio_flags(np, 0, &flags); + pmic->gpio = of_get_gpio(np, 0); if (pmic->gpio < 0) return pmic->gpio; if (!gpio_is_valid(pmic->gpio)) return -EINVAL; - ret = gpio_request_one(pmic->gpio, GPIOF_IN, "pmic"); + ret = devm_gpio_request_one(dev, pmic->gpio, GPIOF_IN, "pmic"); if (ret < 0) { dev_err(dev, "failed to request gpio%d\n", pmic->gpio); return ret; @@ -309,7 +298,6 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) pmic->irq = gpio_to_irq(pmic->gpio); - /* mask && clear IRQ status */ hi6421_spmi_pmic_irq_prc(pmic); pmic->irqs = devm_kzalloc(dev, pmic->irqnum * sizeof(int), GFP_KERNEL); @@ -321,27 +309,27 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) if (!pmic->domain) { dev_err(dev, "failed irq domain add simple!\n"); ret = -ENODEV; - goto irq_domain; + goto irq_malloc; } for (i = 0; i < pmic->irqnum; i++) { virq = irq_create_mapping(pmic->domain, i); - if (virq == NO_IRQ) { - pr_debug("Failed mapping hwirq\n"); + if (!virq) { + dev_err(dev, "Failed mapping hwirq\n"); ret = -ENOSPC; - goto irq_create_mapping; + goto irq_malloc; } pmic->irqs[i] = virq; - pr_info("[%s]. pmic->irqs[%d] = %d\n", __func__, i, pmic->irqs[i]); + dev_dbg(dev, "%s: pmic->irqs[%d] = %d\n", + __func__, i, pmic->irqs[i]); } ret = request_threaded_irq(pmic->irq, hi6421_spmi_irq_handler, NULL, IRQF_TRIGGER_LOW | IRQF_SHARED | IRQF_NO_SUSPEND, "pmic", pmic); if (ret < 0) { - dev_err(dev, "could not claim pmic %d\n", ret); - ret = -ENODEV; - goto request_theaded_irq; + dev_err(dev, "could not claim pmic IRQ: error %d\n", ret); + goto irq_malloc; } dev_set_drvdata(&pdev->dev, pmic); @@ -355,18 +343,14 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *pdev) ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, hi6421v600_devs, ARRAY_SIZE(hi6421v600_devs), NULL, 0, NULL); - if (ret) { - dev_err(&pdev->dev, "Failed to add child devices: %d\n", ret); - return ret; - } + if (!ret) + return 0; - return 0; + dev_err(dev, "Failed to add child devices: %d\n", ret); -request_theaded_irq: -irq_create_mapping: -irq_domain: irq_malloc: - gpio_free(pmic->gpio); + free_irq(pmic->irq, pmic); + return ret; } @@ -375,8 +359,6 @@ static void hi6421_spmi_pmic_remove(struct spmi_device *pdev) struct hi6421_spmi_pmic *pmic = dev_get_drvdata(&pdev->dev); free_irq(pmic->irq, pmic); - gpio_free(pmic->gpio); - devm_kfree(&pdev->dev, pmic); } static const struct of_device_id pmic_spmi_id_table[] = { diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h index aeff96c4a37e..ff3adfa7b3ec 100644 --- a/include/linux/mfd/hi6421-spmi-pmic.h +++ b/include/linux/mfd/hi6421-spmi-pmic.h @@ -36,16 +36,17 @@ struct hi6421_spmi_pmic { int irq; int gpio; unsigned int *irqs; + int irqnum; int irqarray; - - struct hi6421_spmi_irq_mask_info irq_mask_addr; - struct hi6421_spmi_irq_info irq_addr; + int irq_mask_addr; + int irq_addr; }; -u32 hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg); -void hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val); -void hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, u32 mask, u32 bits); +int hi6421_spmi_pmic_read(struct hi6421_spmi_pmic *pmic, int reg); +int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val); +int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, + u32 mask, u32 bits); enum hi6421_spmi_pmic_irq_list { OTMP = 0, -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 23/44] staging: regulator: add a regulator driver for HiSilicon 6421v600 SPMI PMIC 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mayulong, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel From: Mayulong <mayulong1@huawei.com> Add the regulator driver for the LDO lines provided by the HiSilicon 6421v600 SPMI PMIC device. [mchehab+huawei@kernel.org: keep just the regulator driver on this patch, renaming it to better fit at upstream namespace] The compete patch is at: https://github.com/96boards-hikey/linux/commit/08464419fba2 Signed-off-by: Mayulong <mayulong1@huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 741 ++++++++++++++++++ 1 file changed, 741 insertions(+) create mode 100644 drivers/staging/hikey9xx/hi6421v600-regulator.c diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c new file mode 100644 index 000000000000..941bfe32bf5b --- /dev/null +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -0,0 +1,741 @@ +/* + * Device driver for regulators in Hisi IC + * + * Copyright (c) 2013 Linaro Ltd. + * Copyright (c) 2011 Hisilicon. + * + * Guodong Xu <guodong.xu@linaro.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <linux/slab.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/of_address.h> +#include <linux/regmap.h> +#include <linux/regulator/driver.h> +#include <linux/regulator/machine.h> +#include <linux/regulator/of_regulator.h> +#include <linux/mfd/hisi_pmic.h> +#include <linux/delay.h> +#include <linux/time.h> +#include <linux/version.h> +#ifdef CONFIG_HISI_PMIC_DEBUG +#include <linux/debugfs.h> +#endif +#include <linux/seq_file.h> +#include <linux/uaccess.h> +#include <linux/spmi.h> + +#if 1 +#define BRAND_DEBUG(args...) pr_debug(args); +#else +#define BRAND_DEBUG(args...) +#endif + +struct hisi_regulator_register_info { + u32 ctrl_reg; + u32 enable_mask; + u32 eco_mode_mask; + u32 vset_reg; + u32 vset_mask; +}; + +struct hisi_regulator { + const char *name; + struct hisi_regulator_register_info register_info; + struct timeval last_off_time; + u32 off_on_delay; + u32 eco_uA; + struct regulator_desc rdesc; + int (*dt_parse)(struct hisi_regulator *, struct spmi_device *); +}; + +static DEFINE_MUTEX(enable_mutex); +struct timeval last_enabled; + + +static inline struct hisi_pmic *rdev_to_pmic(struct regulator_dev *dev) +{ + /* regulator_dev parent to-> + * hisi regulator platform device_dev parent to-> + * hisi pmic platform device_dev + */ + return dev_get_drvdata(rdev_get_dev(dev)->parent->parent); +} + +/* helper function to ensure when it returns it is at least 'delay_us' + * microseconds after 'since'. + */ +static void ensured_time_after(struct timeval since, u32 delay_us) +{ + struct timeval now; + u64 elapsed_ns64, delay_ns64; + u32 actual_us32; + + delay_ns64 = delay_us * NSEC_PER_USEC; + do_gettimeofday(&now); + elapsed_ns64 = timeval_to_ns(&now) - timeval_to_ns(&since); + if (delay_ns64 > elapsed_ns64) { + actual_us32 = ((u32)(delay_ns64 - elapsed_ns64) / + NSEC_PER_USEC); + if (actual_us32 >= 1000) { + mdelay(actual_us32 / 1000); /*lint !e647 */ + udelay(actual_us32 % 1000); + } else if (actual_us32 > 0) { + udelay(actual_us32); + } + } + return; +} + +static int hisi_regulator_is_enabled(struct regulator_dev *dev) +{ + u32 reg_val; + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + + reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); + BRAND_DEBUG("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", __func__, sreg->register_info.ctrl_reg,\ + (reg_val & sreg->register_info.enable_mask)); + + return ((reg_val & sreg->register_info.enable_mask) != 0); +} + +static int hisi_regulator_enable(struct regulator_dev *dev) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + + /* keep a distance of off_on_delay from last time disabled */ + ensured_time_after(sreg->last_off_time, sreg->off_on_delay); + + BRAND_DEBUG("<[%s]: off_on_delay=%dus>\n", __func__, sreg->off_on_delay); + + /* cannot enable more than one regulator at one time */ + mutex_lock(&enable_mutex); + ensured_time_after(last_enabled, HISI_REGS_ENA_PROTECT_TIME); + + /* set enable register */ + hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, + sreg->register_info.enable_mask, + sreg->register_info.enable_mask); + BRAND_DEBUG("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", __func__, sreg->register_info.ctrl_reg,\ + sreg->register_info.enable_mask); + + do_gettimeofday(&last_enabled); + mutex_unlock(&enable_mutex); + + return 0; +} + +static int hisi_regulator_disable(struct regulator_dev *dev) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + + /* set enable register to 0 */ + hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, + sreg->register_info.enable_mask, 0); + + do_gettimeofday(&sreg->last_off_time); + + return 0; +} + +static int hisi_regulator_get_voltage(struct regulator_dev *dev) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + u32 reg_val, selector; + + /* get voltage selector */ + reg_val = hisi_pmic_read(pmic, sreg->register_info.vset_reg); + BRAND_DEBUG("<[%s]: vset_reg=0x%x>\n", __func__, sreg->register_info.vset_reg); + + selector = (reg_val & sreg->register_info.vset_mask) >> + (ffs(sreg->register_info.vset_mask) - 1); + + return sreg->rdesc.ops->list_voltage(dev, selector); +} + +static int hisi_regulator_set_voltage(struct regulator_dev *dev, + int min_uV, int max_uV, unsigned *selector) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + u32 vsel; + int ret = 0; + + for (vsel = 0; vsel < sreg->rdesc.n_voltages; vsel++) { + int uV = sreg->rdesc.volt_table[vsel]; + /* Break at the first in-range value */ + if (min_uV <= uV && uV <= max_uV) + break; + } + + /* unlikely to happen. sanity test done by regulator core */ + if (unlikely(vsel == sreg->rdesc.n_voltages)) + return -EINVAL; + + *selector = vsel; + /* set voltage selector */ + hisi_pmic_rmw(pmic, sreg->register_info.vset_reg, + sreg->register_info.vset_mask, + vsel << (ffs(sreg->register_info.vset_mask) - 1)); + + BRAND_DEBUG("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", __func__,\ + sreg->register_info.vset_reg,\ + sreg->register_info.vset_mask,\ + vsel << (ffs(sreg->register_info.vset_mask) - 1)\ + ); + + return ret; +} + +static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + u32 reg_val; + + reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); + BRAND_DEBUG("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", __func__, reg_val,\ + sreg->register_info.ctrl_reg,\ + sreg->register_info.eco_mode_mask\ + ); + + if (reg_val & sreg->register_info.eco_mode_mask) + return REGULATOR_MODE_IDLE; + else + return REGULATOR_MODE_NORMAL; +} + +static int hisi_regulator_set_mode(struct regulator_dev *dev, + unsigned int mode) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + u32 eco_mode; + + switch (mode) { + case REGULATOR_MODE_NORMAL: + eco_mode = HISI_ECO_MODE_DISABLE; + break; + case REGULATOR_MODE_IDLE: + eco_mode = HISI_ECO_MODE_ENABLE; + break; + default: + return -EINVAL; + } + + /* set mode */ + hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, + sreg->register_info.eco_mode_mask, + eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); + + BRAND_DEBUG("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", __func__,\ + sreg->register_info.ctrl_reg,\ + sreg->register_info.eco_mode_mask,\ + eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)\ + ); + return 0; +} + + +unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, + int input_uV, int output_uV, int load_uA) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + + if ((load_uA == 0) || ((unsigned int)load_uA > sreg->eco_uA)) + return REGULATOR_MODE_NORMAL; + else + return REGULATOR_MODE_IDLE; +} + +static int hisi_dt_parse_common(struct hisi_regulator *sreg, + struct spmi_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct regulator_desc *rdesc = &sreg->rdesc; + unsigned int register_info[3] = {0}; + int ret = 0; + + /* parse .register_info.ctrl_reg */ + ret = of_property_read_u32_array(np, "hisilicon,hisi-ctrl", + register_info, 3); + if (ret) { + dev_err(dev, "no hisilicon,hisi-ctrl property set\n"); + goto dt_parse_common_end; + } + sreg->register_info.ctrl_reg = register_info[0]; + sreg->register_info.enable_mask = register_info[1]; + sreg->register_info.eco_mode_mask = register_info[2]; + + /* parse .register_info.vset_reg */ + ret = of_property_read_u32_array(np, "hisilicon,hisi-vset", + register_info, 2); + if (ret) { + dev_err(dev, "no hisilicon,hisi-vset property set\n"); + goto dt_parse_common_end; + } + sreg->register_info.vset_reg = register_info[0]; + sreg->register_info.vset_mask = register_info[1]; + + /* parse .off-on-delay */ + ret = of_property_read_u32(np, "hisilicon,hisi-off-on-delay-us", + &sreg->off_on_delay); + if (ret) { + dev_err(dev, "no hisilicon,hisi-off-on-delay-us property set\n"); + goto dt_parse_common_end; + } + + /* parse .enable_time */ + ret = of_property_read_u32(np, "hisilicon,hisi-enable-time-us", + &rdesc->enable_time); + if (ret) { + dev_err(dev, "no hisilicon,hisi-enable-time-us property set\n"); + goto dt_parse_common_end; + } + + /* parse .eco_uA */ + ret = of_property_read_u32(np, "hisilicon,hisi-eco-microamp", + &sreg->eco_uA); + if (ret) { + sreg->eco_uA = 0; + ret = 0; + } + +dt_parse_common_end: + return ret; +} + +static int hisi_dt_parse_ldo(struct hisi_regulator *sreg, + struct spmi_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct regulator_desc *rdesc = &sreg->rdesc; + unsigned int *v_table; + int ret = 0; + + /* parse .n_voltages, and .volt_table */ + ret = of_property_read_u32(np, "hisilicon,hisi-n-voltages", + &rdesc->n_voltages); + if (ret) { + dev_err(dev, "no hisilicon,hisi-n-voltages property set\n"); + goto dt_parse_ldo_end; + } + + /* alloc space for .volt_table */ + v_table = devm_kzalloc(dev, sizeof(unsigned int) * rdesc->n_voltages, + GFP_KERNEL); + if (unlikely(!v_table)) { + ret = -ENOMEM; + dev_err(dev, "no memory for .volt_table\n"); + goto dt_parse_ldo_end; + } + + ret = of_property_read_u32_array(np, "hisilicon,hisi-vset-table", + v_table, rdesc->n_voltages); + if (ret) { + dev_err(dev, "no hisilicon,hisi-vset-table property set\n"); + goto dt_parse_ldo_end1; + } + rdesc->volt_table = v_table; + + /* parse hisi regulator's dt common part */ + ret = hisi_dt_parse_common(sreg, pdev); + if (ret) { + dev_err(dev, "failure in hisi_dt_parse_common\n"); + goto dt_parse_ldo_end1; + } + + return ret; + +dt_parse_ldo_end1: +dt_parse_ldo_end: + return ret; +} + +static struct regulator_ops hisi_ldo_rops = { + .is_enabled = hisi_regulator_is_enabled, + .enable = hisi_regulator_enable, + .disable = hisi_regulator_disable, + .list_voltage = regulator_list_voltage_table, + .get_voltage = hisi_regulator_get_voltage, + .set_voltage = hisi_regulator_set_voltage, + .get_mode = hisi_regulator_get_mode, + .set_mode = hisi_regulator_set_mode, + .get_optimum_mode = hisi_regulator_get_optimum_mode, +}; + +static const struct hisi_regulator hisi_regulator_ldo = { + .rdesc = { + .ops = &hisi_ldo_rops, + .type = REGULATOR_VOLTAGE, + .owner = THIS_MODULE, + }, + .dt_parse = hisi_dt_parse_ldo, +}; + +static struct of_device_id of_hisi_regulator_match_tbl[] = { + { + .compatible = "hisilicon-hisi-ldo", + .data = &hisi_regulator_ldo, + }, + { /* end */ } +}; + +#ifdef CONFIG_HISI_PMIC_DEBUG +extern void get_current_regulator_dev(struct seq_file *s); +extern void set_regulator_state(char *ldo_name, int value); +extern void get_regulator_state(char *ldo_name); +extern int set_regulator_voltage(char *ldo_name, unsigned int vol_value); + +u32 pmu_atoi(char *s) +{ + char *p = s; + char c; + u64 ret = 0; + if (s == NULL) + return 0; + while ((c = *p++) != '\0') { + if ('0' <= c && c <= '9') { + ret *= 10; + ret += (u64)((unsigned char)c - '0'); + if (ret > U32_MAX) + return 0; + } else { + break; + } + } + return (u32)ret; +} +static int dbg_hisi_regulator_show(struct seq_file *s, void *data) +{ + seq_printf(s, "\n\r"); + seq_printf(s, "%-13s %-15s %-15s %-15s %-15s\n\r", + "LDO_NAME", "ON/OFF", "Use_count", "Open_count", "Always_on"); + seq_printf(s, "-----------------------------------------" + "-----------------------------------------------\n\r"); + get_current_regulator_dev(s); + return 0; +} + +static int dbg_hisi_regulator_open(struct inode *inode, struct file *file) +{ + return single_open(file, dbg_hisi_regulator_show, inode->i_private); +} + +static const struct file_operations debug_regulator_state_fops = { + .open = dbg_hisi_regulator_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static int dbg_control_regulator_show(struct seq_file *s, void *data) +{ + printk(" \n\r \ + ---------------------------------------------------------------------------------\n\r \ + |usage: |\n\r \ + | S = state R = read V = voltage |\n\r \ + | set ldo state and voltage |\n\r \ + | get ldo state and current voltage |\n\r \ + |example: |\n\r \ + | echo S ldo16 0 > control_regulator :disable ldo16 |\n\r \ + | echo S ldo16 1 > control_regulator :enable ldo16 |\n\r \ + | echo R ldo16 > control_regulator :get ldo16 state and voltage |\n\r \ + | echo V ldo16 xxx > control_regulator :set ldo16 voltage |\n\r \ + ---------------------------------------------------------------------------------\n\r"); + return 0; +} +static ssize_t dbg_control_regulator_set_value(struct file *filp, const char __user *buffer, + size_t count, loff_t *ppos) +{ + char tmp[128] = {0}; + char ptr[128] = {0}; + char *vol = NULL; + char num = 0; + unsigned int i; + int next_flag = 1; + + if (count >= 128) { + pr_info("error! buffer size big than internal buffer\n"); + return -EFAULT; + } + + if (copy_from_user(tmp, buffer, count)) { + pr_info("error!\n"); + return -EFAULT; + } + + if (tmp[0] == 'R' || tmp[0] == 'r') { + for (i = 2; i < (count - 1); i++) { + ptr[i - 2] = tmp[i]; + } + ptr[i - 2] = '\0'; + get_regulator_state(ptr); + } else if (tmp[0] == 'S' || tmp[0] == 's') { + for (i = 2; i < (count - 1); i++) { + if (tmp[i] == ' ') { + next_flag = 0; + ptr[i - 2] = '\0'; + continue; + } + if (next_flag) { + ptr[i - 2] = tmp[i]; + } else { + num = tmp[i] - 48; + } + } + set_regulator_state(ptr, num); + } else if (tmp[0] == 'V' || tmp[0] == 'v') { + for (i = 2; i < (count - 1); i++) { + if (tmp[i] == ' ') { + next_flag = 0; + ptr[i - 2] = '\0'; + continue; + } + if (next_flag) { + ptr[i - 2] = tmp[i]; + } else { + vol = &tmp[i]; + break; + } + } + set_regulator_voltage(ptr, pmu_atoi(vol)); + } + + *ppos += count; + + return count; +} + +static int dbg_control_regulator_open(struct inode *inode, struct file *file) +{ + file->private_data = inode->i_private; + return single_open(file, dbg_control_regulator_show, &inode->i_private); +} + +static const struct file_operations set_control_regulator_fops = { + .open = dbg_control_regulator_open, + .read = seq_read, + .write = dbg_control_regulator_set_value, + .llseek = seq_lseek, + .release = single_release, +}; +#endif + +static int hisi_regulator_probe(struct spmi_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct regulator_desc *rdesc; + struct regulator_dev *rdev; + struct hisi_regulator *sreg = NULL; + struct regulator_init_data *initdata; + struct regulator_config config = { }; + const struct of_device_id *match; + struct regulation_constraints *constraint; + const char *supplyname = NULL; +#ifdef CONFIG_HISI_PMIC_DEBUG + struct dentry *d; + static int debugfs_flag; +#endif + unsigned int temp_modes; + + const struct hisi_regulator *template = NULL; + int ret = 0; + /* to check which type of regulator this is */ + match = of_match_device(of_hisi_regulator_match_tbl, &pdev->dev); + if (NULL == match) { + pr_err("get hisi regulator fail!\n\r"); + return -EINVAL; + } + + template = match->data; +#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) + initdata = of_get_regulator_init_data(dev, np, NULL); +#else + initdata = of_get_regulator_init_data(dev, np); +#endif + if (NULL == initdata) { + pr_err("get regulator init data error !\n"); + return -EINVAL; + } + + /* hisi regulator supports two modes */ + constraint = &initdata->constraints; + + ret = of_property_read_u32_array(np, "hisilicon,valid-modes-mask", + &(constraint->valid_modes_mask), 1); + if (ret) { + pr_err("no hisilicon,valid-modes-mask property set\n"); + ret = -ENODEV; + return ret; + } + ret = of_property_read_u32_array(np, "hisilicon,valid-idle-mask", + &temp_modes, 1); + if (ret) { + pr_err("no hisilicon,valid-modes-mask property set\n"); + ret = -ENODEV; + return ret; + } + constraint->valid_ops_mask |= temp_modes; + + sreg = kmemdup(template, sizeof(*sreg), GFP_KERNEL); + if (!sreg) { + pr_err("template kememdup is fail. \n"); + return -ENOMEM; + } + sreg->name = initdata->constraints.name; + rdesc = &sreg->rdesc; + rdesc->name = sreg->name; + rdesc->min_uV = initdata->constraints.min_uV; + supplyname = of_get_property(np, "hisilicon,supply_name", NULL); + if (supplyname != NULL) { + initdata->supply_regulator = supplyname; + } + + /* to parse device tree data for regulator specific */ + ret = sreg->dt_parse(sreg, pdev); + if (ret) { + dev_err(dev, "device tree parameter parse error!\n"); + goto hisi_probe_end; + } + + config.dev = &pdev->dev; + config.init_data = initdata; + config.driver_data = sreg; + config.of_node = pdev->dev.of_node; + + /* register regulator */ + rdev = regulator_register(rdesc, &config); + if (IS_ERR(rdev)) { + dev_err(dev, "failed to register %s\n", + rdesc->name); + ret = PTR_ERR(rdev); + goto hisi_probe_end; + } + + BRAND_DEBUG("[%s]:valid_modes_mask[0x%x], valid_ops_mask[0x%x]\n", rdesc->name,\ + constraint->valid_modes_mask, constraint->valid_ops_mask); + + dev_set_drvdata(dev, rdev); +#ifdef CONFIG_HISI_PMIC_DEBUG + if (debugfs_flag == 0) { + d = debugfs_create_dir("hisi_regulator_debugfs", NULL); + if (!d) { + dev_err(dev, "failed to create hisi regulator debugfs dir !\n"); + ret = -ENOMEM; + goto hisi_probe_fail; + } + (void) debugfs_create_file("regulator_state", S_IRUSR, + d, NULL, &debug_regulator_state_fops); + + (void) debugfs_create_file("control_regulator", S_IRUSR, + d, NULL, &set_control_regulator_fops); + debugfs_flag = 1; + } +#endif + +#ifdef CONFIG_HISI_PMIC_DEBUG +hisi_probe_fail: + if (ret) + regulator_unregister(rdev); +#endif +hisi_probe_end: + if (ret) + kfree(sreg); + return ret; +} + +static void hisi_regulator_remove(struct spmi_device *pdev) +{ + struct regulator_dev *rdev = dev_get_drvdata(&pdev->dev); + struct hisi_regulator *sreg = rdev_get_drvdata(rdev); + + regulator_unregister(rdev); + + /* TODO: should i worry about that? devm_kzalloc */ + if (sreg->rdesc.volt_table) + devm_kfree(&pdev->dev, (unsigned int *)sreg->rdesc.volt_table); + + kfree(sreg); +} +static int hisi_regulator_suspend(struct device *dev, pm_message_t state) +{ + struct hisi_regulator *hisi_regulator = dev_get_drvdata(dev); + + if (NULL == hisi_regulator) { + pr_err("%s:regulator is NULL\n", __func__); + return -ENOMEM; + } + + pr_info("%s:+\n", __func__); + pr_info("%s:-\n", __func__); + + return 0; +}/*lint !e715 */ + +static int hisi_regulator_resume(struct device *dev) +{ + struct hisi_regulator *hisi_regulator = dev_get_drvdata(dev); + + if (NULL == hisi_regulator) { + pr_err("%s:regulator is NULL\n", __func__); + return -ENOMEM; + } + + pr_info("%s:+\n", __func__); + pr_info("%s:-\n", __func__); + + return 0; +} + +static struct spmi_driver hisi_pmic_driver = { + .driver = { + .name = "hisi_regulator", + .owner = THIS_MODULE, + .of_match_table = of_hisi_regulator_match_tbl, + .suspend = hisi_regulator_suspend, + .resume = hisi_regulator_resume, + }, + .probe = hisi_regulator_probe, + .remove = hisi_regulator_remove, +}; + +static int __init hisi_regulator_init(void) +{ + return spmi_driver_register(&hisi_pmic_driver); +} + +static void __exit hisi_regulator_exit(void) +{ + spmi_driver_unregister(&hisi_pmic_driver); +} + +fs_initcall(hisi_regulator_init); +module_exit(hisi_regulator_exit); + +MODULE_DESCRIPTION("Hisi regulator driver"); +MODULE_LICENSE("GPL v2"); + -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 23/44] staging: regulator: add a regulator driver for HiSilicon 6421v600 SPMI PMIC @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mayulong, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab From: Mayulong <mayulong1@huawei.com> Add the regulator driver for the LDO lines provided by the HiSilicon 6421v600 SPMI PMIC device. [mchehab+huawei@kernel.org: keep just the regulator driver on this patch, renaming it to better fit at upstream namespace] The compete patch is at: https://github.com/96boards-hikey/linux/commit/08464419fba2 Signed-off-by: Mayulong <mayulong1@huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 741 ++++++++++++++++++ 1 file changed, 741 insertions(+) create mode 100644 drivers/staging/hikey9xx/hi6421v600-regulator.c diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c new file mode 100644 index 000000000000..941bfe32bf5b --- /dev/null +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -0,0 +1,741 @@ +/* + * Device driver for regulators in Hisi IC + * + * Copyright (c) 2013 Linaro Ltd. + * Copyright (c) 2011 Hisilicon. + * + * Guodong Xu <guodong.xu@linaro.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <linux/slab.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/of_address.h> +#include <linux/regmap.h> +#include <linux/regulator/driver.h> +#include <linux/regulator/machine.h> +#include <linux/regulator/of_regulator.h> +#include <linux/mfd/hisi_pmic.h> +#include <linux/delay.h> +#include <linux/time.h> +#include <linux/version.h> +#ifdef CONFIG_HISI_PMIC_DEBUG +#include <linux/debugfs.h> +#endif +#include <linux/seq_file.h> +#include <linux/uaccess.h> +#include <linux/spmi.h> + +#if 1 +#define BRAND_DEBUG(args...) pr_debug(args); +#else +#define BRAND_DEBUG(args...) +#endif + +struct hisi_regulator_register_info { + u32 ctrl_reg; + u32 enable_mask; + u32 eco_mode_mask; + u32 vset_reg; + u32 vset_mask; +}; + +struct hisi_regulator { + const char *name; + struct hisi_regulator_register_info register_info; + struct timeval last_off_time; + u32 off_on_delay; + u32 eco_uA; + struct regulator_desc rdesc; + int (*dt_parse)(struct hisi_regulator *, struct spmi_device *); +}; + +static DEFINE_MUTEX(enable_mutex); +struct timeval last_enabled; + + +static inline struct hisi_pmic *rdev_to_pmic(struct regulator_dev *dev) +{ + /* regulator_dev parent to-> + * hisi regulator platform device_dev parent to-> + * hisi pmic platform device_dev + */ + return dev_get_drvdata(rdev_get_dev(dev)->parent->parent); +} + +/* helper function to ensure when it returns it is at least 'delay_us' + * microseconds after 'since'. + */ +static void ensured_time_after(struct timeval since, u32 delay_us) +{ + struct timeval now; + u64 elapsed_ns64, delay_ns64; + u32 actual_us32; + + delay_ns64 = delay_us * NSEC_PER_USEC; + do_gettimeofday(&now); + elapsed_ns64 = timeval_to_ns(&now) - timeval_to_ns(&since); + if (delay_ns64 > elapsed_ns64) { + actual_us32 = ((u32)(delay_ns64 - elapsed_ns64) / + NSEC_PER_USEC); + if (actual_us32 >= 1000) { + mdelay(actual_us32 / 1000); /*lint !e647 */ + udelay(actual_us32 % 1000); + } else if (actual_us32 > 0) { + udelay(actual_us32); + } + } + return; +} + +static int hisi_regulator_is_enabled(struct regulator_dev *dev) +{ + u32 reg_val; + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + + reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); + BRAND_DEBUG("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", __func__, sreg->register_info.ctrl_reg,\ + (reg_val & sreg->register_info.enable_mask)); + + return ((reg_val & sreg->register_info.enable_mask) != 0); +} + +static int hisi_regulator_enable(struct regulator_dev *dev) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + + /* keep a distance of off_on_delay from last time disabled */ + ensured_time_after(sreg->last_off_time, sreg->off_on_delay); + + BRAND_DEBUG("<[%s]: off_on_delay=%dus>\n", __func__, sreg->off_on_delay); + + /* cannot enable more than one regulator at one time */ + mutex_lock(&enable_mutex); + ensured_time_after(last_enabled, HISI_REGS_ENA_PROTECT_TIME); + + /* set enable register */ + hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, + sreg->register_info.enable_mask, + sreg->register_info.enable_mask); + BRAND_DEBUG("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", __func__, sreg->register_info.ctrl_reg,\ + sreg->register_info.enable_mask); + + do_gettimeofday(&last_enabled); + mutex_unlock(&enable_mutex); + + return 0; +} + +static int hisi_regulator_disable(struct regulator_dev *dev) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + + /* set enable register to 0 */ + hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, + sreg->register_info.enable_mask, 0); + + do_gettimeofday(&sreg->last_off_time); + + return 0; +} + +static int hisi_regulator_get_voltage(struct regulator_dev *dev) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + u32 reg_val, selector; + + /* get voltage selector */ + reg_val = hisi_pmic_read(pmic, sreg->register_info.vset_reg); + BRAND_DEBUG("<[%s]: vset_reg=0x%x>\n", __func__, sreg->register_info.vset_reg); + + selector = (reg_val & sreg->register_info.vset_mask) >> + (ffs(sreg->register_info.vset_mask) - 1); + + return sreg->rdesc.ops->list_voltage(dev, selector); +} + +static int hisi_regulator_set_voltage(struct regulator_dev *dev, + int min_uV, int max_uV, unsigned *selector) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + u32 vsel; + int ret = 0; + + for (vsel = 0; vsel < sreg->rdesc.n_voltages; vsel++) { + int uV = sreg->rdesc.volt_table[vsel]; + /* Break at the first in-range value */ + if (min_uV <= uV && uV <= max_uV) + break; + } + + /* unlikely to happen. sanity test done by regulator core */ + if (unlikely(vsel == sreg->rdesc.n_voltages)) + return -EINVAL; + + *selector = vsel; + /* set voltage selector */ + hisi_pmic_rmw(pmic, sreg->register_info.vset_reg, + sreg->register_info.vset_mask, + vsel << (ffs(sreg->register_info.vset_mask) - 1)); + + BRAND_DEBUG("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", __func__,\ + sreg->register_info.vset_reg,\ + sreg->register_info.vset_mask,\ + vsel << (ffs(sreg->register_info.vset_mask) - 1)\ + ); + + return ret; +} + +static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + u32 reg_val; + + reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); + BRAND_DEBUG("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", __func__, reg_val,\ + sreg->register_info.ctrl_reg,\ + sreg->register_info.eco_mode_mask\ + ); + + if (reg_val & sreg->register_info.eco_mode_mask) + return REGULATOR_MODE_IDLE; + else + return REGULATOR_MODE_NORMAL; +} + +static int hisi_regulator_set_mode(struct regulator_dev *dev, + unsigned int mode) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hisi_pmic *pmic = rdev_to_pmic(dev); + u32 eco_mode; + + switch (mode) { + case REGULATOR_MODE_NORMAL: + eco_mode = HISI_ECO_MODE_DISABLE; + break; + case REGULATOR_MODE_IDLE: + eco_mode = HISI_ECO_MODE_ENABLE; + break; + default: + return -EINVAL; + } + + /* set mode */ + hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, + sreg->register_info.eco_mode_mask, + eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); + + BRAND_DEBUG("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", __func__,\ + sreg->register_info.ctrl_reg,\ + sreg->register_info.eco_mode_mask,\ + eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)\ + ); + return 0; +} + + +unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, + int input_uV, int output_uV, int load_uA) +{ + struct hisi_regulator *sreg = rdev_get_drvdata(dev); + + if ((load_uA == 0) || ((unsigned int)load_uA > sreg->eco_uA)) + return REGULATOR_MODE_NORMAL; + else + return REGULATOR_MODE_IDLE; +} + +static int hisi_dt_parse_common(struct hisi_regulator *sreg, + struct spmi_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct regulator_desc *rdesc = &sreg->rdesc; + unsigned int register_info[3] = {0}; + int ret = 0; + + /* parse .register_info.ctrl_reg */ + ret = of_property_read_u32_array(np, "hisilicon,hisi-ctrl", + register_info, 3); + if (ret) { + dev_err(dev, "no hisilicon,hisi-ctrl property set\n"); + goto dt_parse_common_end; + } + sreg->register_info.ctrl_reg = register_info[0]; + sreg->register_info.enable_mask = register_info[1]; + sreg->register_info.eco_mode_mask = register_info[2]; + + /* parse .register_info.vset_reg */ + ret = of_property_read_u32_array(np, "hisilicon,hisi-vset", + register_info, 2); + if (ret) { + dev_err(dev, "no hisilicon,hisi-vset property set\n"); + goto dt_parse_common_end; + } + sreg->register_info.vset_reg = register_info[0]; + sreg->register_info.vset_mask = register_info[1]; + + /* parse .off-on-delay */ + ret = of_property_read_u32(np, "hisilicon,hisi-off-on-delay-us", + &sreg->off_on_delay); + if (ret) { + dev_err(dev, "no hisilicon,hisi-off-on-delay-us property set\n"); + goto dt_parse_common_end; + } + + /* parse .enable_time */ + ret = of_property_read_u32(np, "hisilicon,hisi-enable-time-us", + &rdesc->enable_time); + if (ret) { + dev_err(dev, "no hisilicon,hisi-enable-time-us property set\n"); + goto dt_parse_common_end; + } + + /* parse .eco_uA */ + ret = of_property_read_u32(np, "hisilicon,hisi-eco-microamp", + &sreg->eco_uA); + if (ret) { + sreg->eco_uA = 0; + ret = 0; + } + +dt_parse_common_end: + return ret; +} + +static int hisi_dt_parse_ldo(struct hisi_regulator *sreg, + struct spmi_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct regulator_desc *rdesc = &sreg->rdesc; + unsigned int *v_table; + int ret = 0; + + /* parse .n_voltages, and .volt_table */ + ret = of_property_read_u32(np, "hisilicon,hisi-n-voltages", + &rdesc->n_voltages); + if (ret) { + dev_err(dev, "no hisilicon,hisi-n-voltages property set\n"); + goto dt_parse_ldo_end; + } + + /* alloc space for .volt_table */ + v_table = devm_kzalloc(dev, sizeof(unsigned int) * rdesc->n_voltages, + GFP_KERNEL); + if (unlikely(!v_table)) { + ret = -ENOMEM; + dev_err(dev, "no memory for .volt_table\n"); + goto dt_parse_ldo_end; + } + + ret = of_property_read_u32_array(np, "hisilicon,hisi-vset-table", + v_table, rdesc->n_voltages); + if (ret) { + dev_err(dev, "no hisilicon,hisi-vset-table property set\n"); + goto dt_parse_ldo_end1; + } + rdesc->volt_table = v_table; + + /* parse hisi regulator's dt common part */ + ret = hisi_dt_parse_common(sreg, pdev); + if (ret) { + dev_err(dev, "failure in hisi_dt_parse_common\n"); + goto dt_parse_ldo_end1; + } + + return ret; + +dt_parse_ldo_end1: +dt_parse_ldo_end: + return ret; +} + +static struct regulator_ops hisi_ldo_rops = { + .is_enabled = hisi_regulator_is_enabled, + .enable = hisi_regulator_enable, + .disable = hisi_regulator_disable, + .list_voltage = regulator_list_voltage_table, + .get_voltage = hisi_regulator_get_voltage, + .set_voltage = hisi_regulator_set_voltage, + .get_mode = hisi_regulator_get_mode, + .set_mode = hisi_regulator_set_mode, + .get_optimum_mode = hisi_regulator_get_optimum_mode, +}; + +static const struct hisi_regulator hisi_regulator_ldo = { + .rdesc = { + .ops = &hisi_ldo_rops, + .type = REGULATOR_VOLTAGE, + .owner = THIS_MODULE, + }, + .dt_parse = hisi_dt_parse_ldo, +}; + +static struct of_device_id of_hisi_regulator_match_tbl[] = { + { + .compatible = "hisilicon-hisi-ldo", + .data = &hisi_regulator_ldo, + }, + { /* end */ } +}; + +#ifdef CONFIG_HISI_PMIC_DEBUG +extern void get_current_regulator_dev(struct seq_file *s); +extern void set_regulator_state(char *ldo_name, int value); +extern void get_regulator_state(char *ldo_name); +extern int set_regulator_voltage(char *ldo_name, unsigned int vol_value); + +u32 pmu_atoi(char *s) +{ + char *p = s; + char c; + u64 ret = 0; + if (s == NULL) + return 0; + while ((c = *p++) != '\0') { + if ('0' <= c && c <= '9') { + ret *= 10; + ret += (u64)((unsigned char)c - '0'); + if (ret > U32_MAX) + return 0; + } else { + break; + } + } + return (u32)ret; +} +static int dbg_hisi_regulator_show(struct seq_file *s, void *data) +{ + seq_printf(s, "\n\r"); + seq_printf(s, "%-13s %-15s %-15s %-15s %-15s\n\r", + "LDO_NAME", "ON/OFF", "Use_count", "Open_count", "Always_on"); + seq_printf(s, "-----------------------------------------" + "-----------------------------------------------\n\r"); + get_current_regulator_dev(s); + return 0; +} + +static int dbg_hisi_regulator_open(struct inode *inode, struct file *file) +{ + return single_open(file, dbg_hisi_regulator_show, inode->i_private); +} + +static const struct file_operations debug_regulator_state_fops = { + .open = dbg_hisi_regulator_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static int dbg_control_regulator_show(struct seq_file *s, void *data) +{ + printk(" \n\r \ + ---------------------------------------------------------------------------------\n\r \ + |usage: |\n\r \ + | S = state R = read V = voltage |\n\r \ + | set ldo state and voltage |\n\r \ + | get ldo state and current voltage |\n\r \ + |example: |\n\r \ + | echo S ldo16 0 > control_regulator :disable ldo16 |\n\r \ + | echo S ldo16 1 > control_regulator :enable ldo16 |\n\r \ + | echo R ldo16 > control_regulator :get ldo16 state and voltage |\n\r \ + | echo V ldo16 xxx > control_regulator :set ldo16 voltage |\n\r \ + ---------------------------------------------------------------------------------\n\r"); + return 0; +} +static ssize_t dbg_control_regulator_set_value(struct file *filp, const char __user *buffer, + size_t count, loff_t *ppos) +{ + char tmp[128] = {0}; + char ptr[128] = {0}; + char *vol = NULL; + char num = 0; + unsigned int i; + int next_flag = 1; + + if (count >= 128) { + pr_info("error! buffer size big than internal buffer\n"); + return -EFAULT; + } + + if (copy_from_user(tmp, buffer, count)) { + pr_info("error!\n"); + return -EFAULT; + } + + if (tmp[0] == 'R' || tmp[0] == 'r') { + for (i = 2; i < (count - 1); i++) { + ptr[i - 2] = tmp[i]; + } + ptr[i - 2] = '\0'; + get_regulator_state(ptr); + } else if (tmp[0] == 'S' || tmp[0] == 's') { + for (i = 2; i < (count - 1); i++) { + if (tmp[i] == ' ') { + next_flag = 0; + ptr[i - 2] = '\0'; + continue; + } + if (next_flag) { + ptr[i - 2] = tmp[i]; + } else { + num = tmp[i] - 48; + } + } + set_regulator_state(ptr, num); + } else if (tmp[0] == 'V' || tmp[0] == 'v') { + for (i = 2; i < (count - 1); i++) { + if (tmp[i] == ' ') { + next_flag = 0; + ptr[i - 2] = '\0'; + continue; + } + if (next_flag) { + ptr[i - 2] = tmp[i]; + } else { + vol = &tmp[i]; + break; + } + } + set_regulator_voltage(ptr, pmu_atoi(vol)); + } + + *ppos += count; + + return count; +} + +static int dbg_control_regulator_open(struct inode *inode, struct file *file) +{ + file->private_data = inode->i_private; + return single_open(file, dbg_control_regulator_show, &inode->i_private); +} + +static const struct file_operations set_control_regulator_fops = { + .open = dbg_control_regulator_open, + .read = seq_read, + .write = dbg_control_regulator_set_value, + .llseek = seq_lseek, + .release = single_release, +}; +#endif + +static int hisi_regulator_probe(struct spmi_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct regulator_desc *rdesc; + struct regulator_dev *rdev; + struct hisi_regulator *sreg = NULL; + struct regulator_init_data *initdata; + struct regulator_config config = { }; + const struct of_device_id *match; + struct regulation_constraints *constraint; + const char *supplyname = NULL; +#ifdef CONFIG_HISI_PMIC_DEBUG + struct dentry *d; + static int debugfs_flag; +#endif + unsigned int temp_modes; + + const struct hisi_regulator *template = NULL; + int ret = 0; + /* to check which type of regulator this is */ + match = of_match_device(of_hisi_regulator_match_tbl, &pdev->dev); + if (NULL == match) { + pr_err("get hisi regulator fail!\n\r"); + return -EINVAL; + } + + template = match->data; +#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) + initdata = of_get_regulator_init_data(dev, np, NULL); +#else + initdata = of_get_regulator_init_data(dev, np); +#endif + if (NULL == initdata) { + pr_err("get regulator init data error !\n"); + return -EINVAL; + } + + /* hisi regulator supports two modes */ + constraint = &initdata->constraints; + + ret = of_property_read_u32_array(np, "hisilicon,valid-modes-mask", + &(constraint->valid_modes_mask), 1); + if (ret) { + pr_err("no hisilicon,valid-modes-mask property set\n"); + ret = -ENODEV; + return ret; + } + ret = of_property_read_u32_array(np, "hisilicon,valid-idle-mask", + &temp_modes, 1); + if (ret) { + pr_err("no hisilicon,valid-modes-mask property set\n"); + ret = -ENODEV; + return ret; + } + constraint->valid_ops_mask |= temp_modes; + + sreg = kmemdup(template, sizeof(*sreg), GFP_KERNEL); + if (!sreg) { + pr_err("template kememdup is fail. \n"); + return -ENOMEM; + } + sreg->name = initdata->constraints.name; + rdesc = &sreg->rdesc; + rdesc->name = sreg->name; + rdesc->min_uV = initdata->constraints.min_uV; + supplyname = of_get_property(np, "hisilicon,supply_name", NULL); + if (supplyname != NULL) { + initdata->supply_regulator = supplyname; + } + + /* to parse device tree data for regulator specific */ + ret = sreg->dt_parse(sreg, pdev); + if (ret) { + dev_err(dev, "device tree parameter parse error!\n"); + goto hisi_probe_end; + } + + config.dev = &pdev->dev; + config.init_data = initdata; + config.driver_data = sreg; + config.of_node = pdev->dev.of_node; + + /* register regulator */ + rdev = regulator_register(rdesc, &config); + if (IS_ERR(rdev)) { + dev_err(dev, "failed to register %s\n", + rdesc->name); + ret = PTR_ERR(rdev); + goto hisi_probe_end; + } + + BRAND_DEBUG("[%s]:valid_modes_mask[0x%x], valid_ops_mask[0x%x]\n", rdesc->name,\ + constraint->valid_modes_mask, constraint->valid_ops_mask); + + dev_set_drvdata(dev, rdev); +#ifdef CONFIG_HISI_PMIC_DEBUG + if (debugfs_flag == 0) { + d = debugfs_create_dir("hisi_regulator_debugfs", NULL); + if (!d) { + dev_err(dev, "failed to create hisi regulator debugfs dir !\n"); + ret = -ENOMEM; + goto hisi_probe_fail; + } + (void) debugfs_create_file("regulator_state", S_IRUSR, + d, NULL, &debug_regulator_state_fops); + + (void) debugfs_create_file("control_regulator", S_IRUSR, + d, NULL, &set_control_regulator_fops); + debugfs_flag = 1; + } +#endif + +#ifdef CONFIG_HISI_PMIC_DEBUG +hisi_probe_fail: + if (ret) + regulator_unregister(rdev); +#endif +hisi_probe_end: + if (ret) + kfree(sreg); + return ret; +} + +static void hisi_regulator_remove(struct spmi_device *pdev) +{ + struct regulator_dev *rdev = dev_get_drvdata(&pdev->dev); + struct hisi_regulator *sreg = rdev_get_drvdata(rdev); + + regulator_unregister(rdev); + + /* TODO: should i worry about that? devm_kzalloc */ + if (sreg->rdesc.volt_table) + devm_kfree(&pdev->dev, (unsigned int *)sreg->rdesc.volt_table); + + kfree(sreg); +} +static int hisi_regulator_suspend(struct device *dev, pm_message_t state) +{ + struct hisi_regulator *hisi_regulator = dev_get_drvdata(dev); + + if (NULL == hisi_regulator) { + pr_err("%s:regulator is NULL\n", __func__); + return -ENOMEM; + } + + pr_info("%s:+\n", __func__); + pr_info("%s:-\n", __func__); + + return 0; +}/*lint !e715 */ + +static int hisi_regulator_resume(struct device *dev) +{ + struct hisi_regulator *hisi_regulator = dev_get_drvdata(dev); + + if (NULL == hisi_regulator) { + pr_err("%s:regulator is NULL\n", __func__); + return -ENOMEM; + } + + pr_info("%s:+\n", __func__); + pr_info("%s:-\n", __func__); + + return 0; +} + +static struct spmi_driver hisi_pmic_driver = { + .driver = { + .name = "hisi_regulator", + .owner = THIS_MODULE, + .of_match_table = of_hisi_regulator_match_tbl, + .suspend = hisi_regulator_suspend, + .resume = hisi_regulator_resume, + }, + .probe = hisi_regulator_probe, + .remove = hisi_regulator_remove, +}; + +static int __init hisi_regulator_init(void) +{ + return spmi_driver_register(&hisi_pmic_driver); +} + +static void __exit hisi_regulator_exit(void) +{ + spmi_driver_unregister(&hisi_pmic_driver); +} + +fs_initcall(hisi_regulator_init); +module_exit(hisi_regulator_exit); + +MODULE_DESCRIPTION("Hisi regulator driver"); +MODULE_LICENSE("GPL v2"); + -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 24/44] staging: regulator: hi6421v600-regulator: get rid of unused code 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Get rid of the sysfs code and other parts of the driver which aren't needed upstream. If needed later, this patch can be (partially?) reversed. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 196 +----------------- 1 file changed, 8 insertions(+), 188 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 941bfe32bf5b..7bc0ae27b110 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -34,19 +34,10 @@ #include <linux/delay.h> #include <linux/time.h> #include <linux/version.h> -#ifdef CONFIG_HISI_PMIC_DEBUG -#include <linux/debugfs.h> -#endif #include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/spmi.h> -#if 1 -#define BRAND_DEBUG(args...) pr_debug(args); -#else -#define BRAND_DEBUG(args...) -#endif - struct hisi_regulator_register_info { u32 ctrl_reg; u32 enable_mask; @@ -110,7 +101,7 @@ static int hisi_regulator_is_enabled(struct regulator_dev *dev) struct hisi_pmic *pmic = rdev_to_pmic(dev); reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); - BRAND_DEBUG("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", __func__, sreg->register_info.ctrl_reg,\ + pr_debug("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", __func__, sreg->register_info.ctrl_reg,\ (reg_val & sreg->register_info.enable_mask)); return ((reg_val & sreg->register_info.enable_mask) != 0); @@ -124,7 +115,7 @@ static int hisi_regulator_enable(struct regulator_dev *dev) /* keep a distance of off_on_delay from last time disabled */ ensured_time_after(sreg->last_off_time, sreg->off_on_delay); - BRAND_DEBUG("<[%s]: off_on_delay=%dus>\n", __func__, sreg->off_on_delay); + pr_debug("<[%s]: off_on_delay=%dus>\n", __func__, sreg->off_on_delay); /* cannot enable more than one regulator at one time */ mutex_lock(&enable_mutex); @@ -134,7 +125,7 @@ static int hisi_regulator_enable(struct regulator_dev *dev) hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, sreg->register_info.enable_mask, sreg->register_info.enable_mask); - BRAND_DEBUG("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", __func__, sreg->register_info.ctrl_reg,\ + pr_debug("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", __func__, sreg->register_info.ctrl_reg,\ sreg->register_info.enable_mask); do_gettimeofday(&last_enabled); @@ -165,7 +156,7 @@ static int hisi_regulator_get_voltage(struct regulator_dev *dev) /* get voltage selector */ reg_val = hisi_pmic_read(pmic, sreg->register_info.vset_reg); - BRAND_DEBUG("<[%s]: vset_reg=0x%x>\n", __func__, sreg->register_info.vset_reg); + pr_debug("<[%s]: vset_reg=0x%x>\n", __func__, sreg->register_info.vset_reg); selector = (reg_val & sreg->register_info.vset_mask) >> (ffs(sreg->register_info.vset_mask) - 1); @@ -198,7 +189,7 @@ static int hisi_regulator_set_voltage(struct regulator_dev *dev, sreg->register_info.vset_mask, vsel << (ffs(sreg->register_info.vset_mask) - 1)); - BRAND_DEBUG("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", __func__,\ + pr_debug("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", __func__,\ sreg->register_info.vset_reg,\ sreg->register_info.vset_mask,\ vsel << (ffs(sreg->register_info.vset_mask) - 1)\ @@ -214,7 +205,7 @@ static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) u32 reg_val; reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); - BRAND_DEBUG("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", __func__, reg_val,\ + pr_debug("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", __func__, reg_val,\ sreg->register_info.ctrl_reg,\ sreg->register_info.eco_mode_mask\ ); @@ -248,7 +239,7 @@ static int hisi_regulator_set_mode(struct regulator_dev *dev, sreg->register_info.eco_mode_mask, eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); - BRAND_DEBUG("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", __func__,\ + pr_debug("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", __func__,\ sreg->register_info.ctrl_reg,\ sreg->register_info.eco_mode_mask,\ eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)\ @@ -403,147 +394,6 @@ static struct of_device_id of_hisi_regulator_match_tbl[] = { { /* end */ } }; -#ifdef CONFIG_HISI_PMIC_DEBUG -extern void get_current_regulator_dev(struct seq_file *s); -extern void set_regulator_state(char *ldo_name, int value); -extern void get_regulator_state(char *ldo_name); -extern int set_regulator_voltage(char *ldo_name, unsigned int vol_value); - -u32 pmu_atoi(char *s) -{ - char *p = s; - char c; - u64 ret = 0; - if (s == NULL) - return 0; - while ((c = *p++) != '\0') { - if ('0' <= c && c <= '9') { - ret *= 10; - ret += (u64)((unsigned char)c - '0'); - if (ret > U32_MAX) - return 0; - } else { - break; - } - } - return (u32)ret; -} -static int dbg_hisi_regulator_show(struct seq_file *s, void *data) -{ - seq_printf(s, "\n\r"); - seq_printf(s, "%-13s %-15s %-15s %-15s %-15s\n\r", - "LDO_NAME", "ON/OFF", "Use_count", "Open_count", "Always_on"); - seq_printf(s, "-----------------------------------------" - "-----------------------------------------------\n\r"); - get_current_regulator_dev(s); - return 0; -} - -static int dbg_hisi_regulator_open(struct inode *inode, struct file *file) -{ - return single_open(file, dbg_hisi_regulator_show, inode->i_private); -} - -static const struct file_operations debug_regulator_state_fops = { - .open = dbg_hisi_regulator_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static int dbg_control_regulator_show(struct seq_file *s, void *data) -{ - printk(" \n\r \ - ---------------------------------------------------------------------------------\n\r \ - |usage: |\n\r \ - | S = state R = read V = voltage |\n\r \ - | set ldo state and voltage |\n\r \ - | get ldo state and current voltage |\n\r \ - |example: |\n\r \ - | echo S ldo16 0 > control_regulator :disable ldo16 |\n\r \ - | echo S ldo16 1 > control_regulator :enable ldo16 |\n\r \ - | echo R ldo16 > control_regulator :get ldo16 state and voltage |\n\r \ - | echo V ldo16 xxx > control_regulator :set ldo16 voltage |\n\r \ - ---------------------------------------------------------------------------------\n\r"); - return 0; -} -static ssize_t dbg_control_regulator_set_value(struct file *filp, const char __user *buffer, - size_t count, loff_t *ppos) -{ - char tmp[128] = {0}; - char ptr[128] = {0}; - char *vol = NULL; - char num = 0; - unsigned int i; - int next_flag = 1; - - if (count >= 128) { - pr_info("error! buffer size big than internal buffer\n"); - return -EFAULT; - } - - if (copy_from_user(tmp, buffer, count)) { - pr_info("error!\n"); - return -EFAULT; - } - - if (tmp[0] == 'R' || tmp[0] == 'r') { - for (i = 2; i < (count - 1); i++) { - ptr[i - 2] = tmp[i]; - } - ptr[i - 2] = '\0'; - get_regulator_state(ptr); - } else if (tmp[0] == 'S' || tmp[0] == 's') { - for (i = 2; i < (count - 1); i++) { - if (tmp[i] == ' ') { - next_flag = 0; - ptr[i - 2] = '\0'; - continue; - } - if (next_flag) { - ptr[i - 2] = tmp[i]; - } else { - num = tmp[i] - 48; - } - } - set_regulator_state(ptr, num); - } else if (tmp[0] == 'V' || tmp[0] == 'v') { - for (i = 2; i < (count - 1); i++) { - if (tmp[i] == ' ') { - next_flag = 0; - ptr[i - 2] = '\0'; - continue; - } - if (next_flag) { - ptr[i - 2] = tmp[i]; - } else { - vol = &tmp[i]; - break; - } - } - set_regulator_voltage(ptr, pmu_atoi(vol)); - } - - *ppos += count; - - return count; -} - -static int dbg_control_regulator_open(struct inode *inode, struct file *file) -{ - file->private_data = inode->i_private; - return single_open(file, dbg_control_regulator_show, &inode->i_private); -} - -static const struct file_operations set_control_regulator_fops = { - .open = dbg_control_regulator_open, - .read = seq_read, - .write = dbg_control_regulator_set_value, - .llseek = seq_lseek, - .release = single_release, -}; -#endif - static int hisi_regulator_probe(struct spmi_device *pdev) { struct device *dev = &pdev->dev; @@ -556,10 +406,6 @@ static int hisi_regulator_probe(struct spmi_device *pdev) const struct of_device_id *match; struct regulation_constraints *constraint; const char *supplyname = NULL; -#ifdef CONFIG_HISI_PMIC_DEBUG - struct dentry *d; - static int debugfs_flag; -#endif unsigned int temp_modes; const struct hisi_regulator *template = NULL; @@ -572,11 +418,7 @@ static int hisi_regulator_probe(struct spmi_device *pdev) } template = match->data; -#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) initdata = of_get_regulator_init_data(dev, np, NULL); -#else - initdata = of_get_regulator_init_data(dev, np); -#endif if (NULL == initdata) { pr_err("get regulator init data error !\n"); return -EINVAL; @@ -636,32 +478,10 @@ static int hisi_regulator_probe(struct spmi_device *pdev) goto hisi_probe_end; } - BRAND_DEBUG("[%s]:valid_modes_mask[0x%x], valid_ops_mask[0x%x]\n", rdesc->name,\ + pr_debug("[%s]:valid_modes_mask[0x%x], valid_ops_mask[0x%x]\n", rdesc->name,\ constraint->valid_modes_mask, constraint->valid_ops_mask); dev_set_drvdata(dev, rdev); -#ifdef CONFIG_HISI_PMIC_DEBUG - if (debugfs_flag == 0) { - d = debugfs_create_dir("hisi_regulator_debugfs", NULL); - if (!d) { - dev_err(dev, "failed to create hisi regulator debugfs dir !\n"); - ret = -ENOMEM; - goto hisi_probe_fail; - } - (void) debugfs_create_file("regulator_state", S_IRUSR, - d, NULL, &debug_regulator_state_fops); - - (void) debugfs_create_file("control_regulator", S_IRUSR, - d, NULL, &set_control_regulator_fops); - debugfs_flag = 1; - } -#endif - -#ifdef CONFIG_HISI_PMIC_DEBUG -hisi_probe_fail: - if (ret) - regulator_unregister(rdev); -#endif hisi_probe_end: if (ret) kfree(sreg); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 24/44] staging: regulator: hi6421v600-regulator: get rid of unused code @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Get rid of the sysfs code and other parts of the driver which aren't needed upstream. If needed later, this patch can be (partially?) reversed. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 196 +----------------- 1 file changed, 8 insertions(+), 188 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 941bfe32bf5b..7bc0ae27b110 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -34,19 +34,10 @@ #include <linux/delay.h> #include <linux/time.h> #include <linux/version.h> -#ifdef CONFIG_HISI_PMIC_DEBUG -#include <linux/debugfs.h> -#endif #include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/spmi.h> -#if 1 -#define BRAND_DEBUG(args...) pr_debug(args); -#else -#define BRAND_DEBUG(args...) -#endif - struct hisi_regulator_register_info { u32 ctrl_reg; u32 enable_mask; @@ -110,7 +101,7 @@ static int hisi_regulator_is_enabled(struct regulator_dev *dev) struct hisi_pmic *pmic = rdev_to_pmic(dev); reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); - BRAND_DEBUG("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", __func__, sreg->register_info.ctrl_reg,\ + pr_debug("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", __func__, sreg->register_info.ctrl_reg,\ (reg_val & sreg->register_info.enable_mask)); return ((reg_val & sreg->register_info.enable_mask) != 0); @@ -124,7 +115,7 @@ static int hisi_regulator_enable(struct regulator_dev *dev) /* keep a distance of off_on_delay from last time disabled */ ensured_time_after(sreg->last_off_time, sreg->off_on_delay); - BRAND_DEBUG("<[%s]: off_on_delay=%dus>\n", __func__, sreg->off_on_delay); + pr_debug("<[%s]: off_on_delay=%dus>\n", __func__, sreg->off_on_delay); /* cannot enable more than one regulator at one time */ mutex_lock(&enable_mutex); @@ -134,7 +125,7 @@ static int hisi_regulator_enable(struct regulator_dev *dev) hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, sreg->register_info.enable_mask, sreg->register_info.enable_mask); - BRAND_DEBUG("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", __func__, sreg->register_info.ctrl_reg,\ + pr_debug("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", __func__, sreg->register_info.ctrl_reg,\ sreg->register_info.enable_mask); do_gettimeofday(&last_enabled); @@ -165,7 +156,7 @@ static int hisi_regulator_get_voltage(struct regulator_dev *dev) /* get voltage selector */ reg_val = hisi_pmic_read(pmic, sreg->register_info.vset_reg); - BRAND_DEBUG("<[%s]: vset_reg=0x%x>\n", __func__, sreg->register_info.vset_reg); + pr_debug("<[%s]: vset_reg=0x%x>\n", __func__, sreg->register_info.vset_reg); selector = (reg_val & sreg->register_info.vset_mask) >> (ffs(sreg->register_info.vset_mask) - 1); @@ -198,7 +189,7 @@ static int hisi_regulator_set_voltage(struct regulator_dev *dev, sreg->register_info.vset_mask, vsel << (ffs(sreg->register_info.vset_mask) - 1)); - BRAND_DEBUG("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", __func__,\ + pr_debug("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", __func__,\ sreg->register_info.vset_reg,\ sreg->register_info.vset_mask,\ vsel << (ffs(sreg->register_info.vset_mask) - 1)\ @@ -214,7 +205,7 @@ static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) u32 reg_val; reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); - BRAND_DEBUG("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", __func__, reg_val,\ + pr_debug("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", __func__, reg_val,\ sreg->register_info.ctrl_reg,\ sreg->register_info.eco_mode_mask\ ); @@ -248,7 +239,7 @@ static int hisi_regulator_set_mode(struct regulator_dev *dev, sreg->register_info.eco_mode_mask, eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); - BRAND_DEBUG("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", __func__,\ + pr_debug("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", __func__,\ sreg->register_info.ctrl_reg,\ sreg->register_info.eco_mode_mask,\ eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)\ @@ -403,147 +394,6 @@ static struct of_device_id of_hisi_regulator_match_tbl[] = { { /* end */ } }; -#ifdef CONFIG_HISI_PMIC_DEBUG -extern void get_current_regulator_dev(struct seq_file *s); -extern void set_regulator_state(char *ldo_name, int value); -extern void get_regulator_state(char *ldo_name); -extern int set_regulator_voltage(char *ldo_name, unsigned int vol_value); - -u32 pmu_atoi(char *s) -{ - char *p = s; - char c; - u64 ret = 0; - if (s == NULL) - return 0; - while ((c = *p++) != '\0') { - if ('0' <= c && c <= '9') { - ret *= 10; - ret += (u64)((unsigned char)c - '0'); - if (ret > U32_MAX) - return 0; - } else { - break; - } - } - return (u32)ret; -} -static int dbg_hisi_regulator_show(struct seq_file *s, void *data) -{ - seq_printf(s, "\n\r"); - seq_printf(s, "%-13s %-15s %-15s %-15s %-15s\n\r", - "LDO_NAME", "ON/OFF", "Use_count", "Open_count", "Always_on"); - seq_printf(s, "-----------------------------------------" - "-----------------------------------------------\n\r"); - get_current_regulator_dev(s); - return 0; -} - -static int dbg_hisi_regulator_open(struct inode *inode, struct file *file) -{ - return single_open(file, dbg_hisi_regulator_show, inode->i_private); -} - -static const struct file_operations debug_regulator_state_fops = { - .open = dbg_hisi_regulator_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static int dbg_control_regulator_show(struct seq_file *s, void *data) -{ - printk(" \n\r \ - ---------------------------------------------------------------------------------\n\r \ - |usage: |\n\r \ - | S = state R = read V = voltage |\n\r \ - | set ldo state and voltage |\n\r \ - | get ldo state and current voltage |\n\r \ - |example: |\n\r \ - | echo S ldo16 0 > control_regulator :disable ldo16 |\n\r \ - | echo S ldo16 1 > control_regulator :enable ldo16 |\n\r \ - | echo R ldo16 > control_regulator :get ldo16 state and voltage |\n\r \ - | echo V ldo16 xxx > control_regulator :set ldo16 voltage |\n\r \ - ---------------------------------------------------------------------------------\n\r"); - return 0; -} -static ssize_t dbg_control_regulator_set_value(struct file *filp, const char __user *buffer, - size_t count, loff_t *ppos) -{ - char tmp[128] = {0}; - char ptr[128] = {0}; - char *vol = NULL; - char num = 0; - unsigned int i; - int next_flag = 1; - - if (count >= 128) { - pr_info("error! buffer size big than internal buffer\n"); - return -EFAULT; - } - - if (copy_from_user(tmp, buffer, count)) { - pr_info("error!\n"); - return -EFAULT; - } - - if (tmp[0] == 'R' || tmp[0] == 'r') { - for (i = 2; i < (count - 1); i++) { - ptr[i - 2] = tmp[i]; - } - ptr[i - 2] = '\0'; - get_regulator_state(ptr); - } else if (tmp[0] == 'S' || tmp[0] == 's') { - for (i = 2; i < (count - 1); i++) { - if (tmp[i] == ' ') { - next_flag = 0; - ptr[i - 2] = '\0'; - continue; - } - if (next_flag) { - ptr[i - 2] = tmp[i]; - } else { - num = tmp[i] - 48; - } - } - set_regulator_state(ptr, num); - } else if (tmp[0] == 'V' || tmp[0] == 'v') { - for (i = 2; i < (count - 1); i++) { - if (tmp[i] == ' ') { - next_flag = 0; - ptr[i - 2] = '\0'; - continue; - } - if (next_flag) { - ptr[i - 2] = tmp[i]; - } else { - vol = &tmp[i]; - break; - } - } - set_regulator_voltage(ptr, pmu_atoi(vol)); - } - - *ppos += count; - - return count; -} - -static int dbg_control_regulator_open(struct inode *inode, struct file *file) -{ - file->private_data = inode->i_private; - return single_open(file, dbg_control_regulator_show, &inode->i_private); -} - -static const struct file_operations set_control_regulator_fops = { - .open = dbg_control_regulator_open, - .read = seq_read, - .write = dbg_control_regulator_set_value, - .llseek = seq_lseek, - .release = single_release, -}; -#endif - static int hisi_regulator_probe(struct spmi_device *pdev) { struct device *dev = &pdev->dev; @@ -556,10 +406,6 @@ static int hisi_regulator_probe(struct spmi_device *pdev) const struct of_device_id *match; struct regulation_constraints *constraint; const char *supplyname = NULL; -#ifdef CONFIG_HISI_PMIC_DEBUG - struct dentry *d; - static int debugfs_flag; -#endif unsigned int temp_modes; const struct hisi_regulator *template = NULL; @@ -572,11 +418,7 @@ static int hisi_regulator_probe(struct spmi_device *pdev) } template = match->data; -#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) initdata = of_get_regulator_init_data(dev, np, NULL); -#else - initdata = of_get_regulator_init_data(dev, np); -#endif if (NULL == initdata) { pr_err("get regulator init data error !\n"); return -EINVAL; @@ -636,32 +478,10 @@ static int hisi_regulator_probe(struct spmi_device *pdev) goto hisi_probe_end; } - BRAND_DEBUG("[%s]:valid_modes_mask[0x%x], valid_ops_mask[0x%x]\n", rdesc->name,\ + pr_debug("[%s]:valid_modes_mask[0x%x], valid_ops_mask[0x%x]\n", rdesc->name,\ constraint->valid_modes_mask, constraint->valid_ops_mask); dev_set_drvdata(dev, rdev); -#ifdef CONFIG_HISI_PMIC_DEBUG - if (debugfs_flag == 0) { - d = debugfs_create_dir("hisi_regulator_debugfs", NULL); - if (!d) { - dev_err(dev, "failed to create hisi regulator debugfs dir !\n"); - ret = -ENOMEM; - goto hisi_probe_fail; - } - (void) debugfs_create_file("regulator_state", S_IRUSR, - d, NULL, &debug_regulator_state_fops); - - (void) debugfs_create_file("control_regulator", S_IRUSR, - d, NULL, &set_control_regulator_fops); - debugfs_flag = 1; - } -#endif - -#ifdef CONFIG_HISI_PMIC_DEBUG -hisi_probe_fail: - if (ret) - regulator_unregister(rdev); -#endif hisi_probe_end: if (ret) kfree(sreg); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 25/44] staging: regulator: hi6421v600-regulator: port it to upstream 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel The driver was originally written for Kernel 4.9. It needs to be ported to upstream: - Got rid of timeval; - Removed a bogus dependency; - Did cleanups at the header file. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 34 +++---------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 7bc0ae27b110..904cb64b1dcd 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -49,7 +49,6 @@ struct hisi_regulator_register_info { struct hisi_regulator { const char *name; struct hisi_regulator_register_info register_info; - struct timeval last_off_time; u32 off_on_delay; u32 eco_uA; struct regulator_desc rdesc; @@ -57,8 +56,6 @@ struct hisi_regulator { }; static DEFINE_MUTEX(enable_mutex); -struct timeval last_enabled; - static inline struct hisi_pmic *rdev_to_pmic(struct regulator_dev *dev) { @@ -72,27 +69,6 @@ static inline struct hisi_pmic *rdev_to_pmic(struct regulator_dev *dev) /* helper function to ensure when it returns it is at least 'delay_us' * microseconds after 'since'. */ -static void ensured_time_after(struct timeval since, u32 delay_us) -{ - struct timeval now; - u64 elapsed_ns64, delay_ns64; - u32 actual_us32; - - delay_ns64 = delay_us * NSEC_PER_USEC; - do_gettimeofday(&now); - elapsed_ns64 = timeval_to_ns(&now) - timeval_to_ns(&since); - if (delay_ns64 > elapsed_ns64) { - actual_us32 = ((u32)(delay_ns64 - elapsed_ns64) / - NSEC_PER_USEC); - if (actual_us32 >= 1000) { - mdelay(actual_us32 / 1000); /*lint !e647 */ - udelay(actual_us32 % 1000); - } else if (actual_us32 > 0) { - udelay(actual_us32); - } - } - return; -} static int hisi_regulator_is_enabled(struct regulator_dev *dev) { @@ -113,13 +89,16 @@ static int hisi_regulator_enable(struct regulator_dev *dev) struct hisi_pmic *pmic = rdev_to_pmic(dev); /* keep a distance of off_on_delay from last time disabled */ - ensured_time_after(sreg->last_off_time, sreg->off_on_delay); + usleep_range(sreg->off_on_delay, sreg->off_on_delay + 1000); pr_debug("<[%s]: off_on_delay=%dus>\n", __func__, sreg->off_on_delay); /* cannot enable more than one regulator at one time */ mutex_lock(&enable_mutex); - ensured_time_after(last_enabled, HISI_REGS_ENA_PROTECT_TIME); + usleep_range(HISI_REGS_ENA_PROTECT_TIME, + HISI_REGS_ENA_PROTECT_TIME + 1000); + + /* set enable register */ hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, @@ -128,7 +107,6 @@ static int hisi_regulator_enable(struct regulator_dev *dev) pr_debug("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", __func__, sreg->register_info.ctrl_reg,\ sreg->register_info.enable_mask); - do_gettimeofday(&last_enabled); mutex_unlock(&enable_mutex); return 0; @@ -143,8 +121,6 @@ static int hisi_regulator_disable(struct regulator_dev *dev) hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, sreg->register_info.enable_mask, 0); - do_gettimeofday(&sreg->last_off_time); - return 0; } -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 25/44] staging: regulator: hi6421v600-regulator: port it to upstream @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab The driver was originally written for Kernel 4.9. It needs to be ported to upstream: - Got rid of timeval; - Removed a bogus dependency; - Did cleanups at the header file. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 34 +++---------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 7bc0ae27b110..904cb64b1dcd 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -49,7 +49,6 @@ struct hisi_regulator_register_info { struct hisi_regulator { const char *name; struct hisi_regulator_register_info register_info; - struct timeval last_off_time; u32 off_on_delay; u32 eco_uA; struct regulator_desc rdesc; @@ -57,8 +56,6 @@ struct hisi_regulator { }; static DEFINE_MUTEX(enable_mutex); -struct timeval last_enabled; - static inline struct hisi_pmic *rdev_to_pmic(struct regulator_dev *dev) { @@ -72,27 +69,6 @@ static inline struct hisi_pmic *rdev_to_pmic(struct regulator_dev *dev) /* helper function to ensure when it returns it is at least 'delay_us' * microseconds after 'since'. */ -static void ensured_time_after(struct timeval since, u32 delay_us) -{ - struct timeval now; - u64 elapsed_ns64, delay_ns64; - u32 actual_us32; - - delay_ns64 = delay_us * NSEC_PER_USEC; - do_gettimeofday(&now); - elapsed_ns64 = timeval_to_ns(&now) - timeval_to_ns(&since); - if (delay_ns64 > elapsed_ns64) { - actual_us32 = ((u32)(delay_ns64 - elapsed_ns64) / - NSEC_PER_USEC); - if (actual_us32 >= 1000) { - mdelay(actual_us32 / 1000); /*lint !e647 */ - udelay(actual_us32 % 1000); - } else if (actual_us32 > 0) { - udelay(actual_us32); - } - } - return; -} static int hisi_regulator_is_enabled(struct regulator_dev *dev) { @@ -113,13 +89,16 @@ static int hisi_regulator_enable(struct regulator_dev *dev) struct hisi_pmic *pmic = rdev_to_pmic(dev); /* keep a distance of off_on_delay from last time disabled */ - ensured_time_after(sreg->last_off_time, sreg->off_on_delay); + usleep_range(sreg->off_on_delay, sreg->off_on_delay + 1000); pr_debug("<[%s]: off_on_delay=%dus>\n", __func__, sreg->off_on_delay); /* cannot enable more than one regulator at one time */ mutex_lock(&enable_mutex); - ensured_time_after(last_enabled, HISI_REGS_ENA_PROTECT_TIME); + usleep_range(HISI_REGS_ENA_PROTECT_TIME, + HISI_REGS_ENA_PROTECT_TIME + 1000); + + /* set enable register */ hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, @@ -128,7 +107,6 @@ static int hisi_regulator_enable(struct regulator_dev *dev) pr_debug("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", __func__, sreg->register_info.ctrl_reg,\ sreg->register_info.enable_mask); - do_gettimeofday(&last_enabled); mutex_unlock(&enable_mutex); return 0; @@ -143,8 +121,6 @@ static int hisi_regulator_disable(struct regulator_dev *dev) hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, sreg->register_info.enable_mask, 0); - do_gettimeofday(&sreg->last_off_time); - return 0; } -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 26/44] staging: regulator: hi6421v600-regulator: coding style fixups 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel There are several issues on those drivers related to their coding style. Solve most of them. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 110 +++++++++--------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 904cb64b1dcd..5f6e4ba4b99e 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Device driver for regulators in Hisi IC * @@ -52,7 +53,7 @@ struct hisi_regulator { u32 off_on_delay; u32 eco_uA; struct regulator_desc rdesc; - int (*dt_parse)(struct hisi_regulator *, struct spmi_device *); + int (*dt_parse)(struct hisi_regulator *reg, struct spmi_device *spmi); }; static DEFINE_MUTEX(enable_mutex); @@ -77,8 +78,9 @@ static int hisi_regulator_is_enabled(struct regulator_dev *dev) struct hisi_pmic *pmic = rdev_to_pmic(dev); reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); - pr_debug("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", __func__, sreg->register_info.ctrl_reg,\ - (reg_val & sreg->register_info.enable_mask)); + pr_debug("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", + __func__, sreg->register_info.ctrl_reg, + (reg_val & sreg->register_info.enable_mask)); return ((reg_val & sreg->register_info.enable_mask) != 0); } @@ -98,14 +100,13 @@ static int hisi_regulator_enable(struct regulator_dev *dev) usleep_range(HISI_REGS_ENA_PROTECT_TIME, HISI_REGS_ENA_PROTECT_TIME + 1000); - - /* set enable register */ hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, - sreg->register_info.enable_mask, + sreg->register_info.enable_mask, sreg->register_info.enable_mask); - pr_debug("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", __func__, sreg->register_info.ctrl_reg,\ - sreg->register_info.enable_mask); + pr_debug("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", + __func__, sreg->register_info.ctrl_reg, + sreg->register_info.enable_mask); mutex_unlock(&enable_mutex); @@ -119,7 +120,7 @@ static int hisi_regulator_disable(struct regulator_dev *dev) /* set enable register to 0 */ hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, - sreg->register_info.enable_mask, 0); + sreg->register_info.enable_mask, 0); return 0; } @@ -132,7 +133,8 @@ static int hisi_regulator_get_voltage(struct regulator_dev *dev) /* get voltage selector */ reg_val = hisi_pmic_read(pmic, sreg->register_info.vset_reg); - pr_debug("<[%s]: vset_reg=0x%x>\n", __func__, sreg->register_info.vset_reg); + pr_debug("<[%s]: vset_reg=0x%x>\n", + __func__, sreg->register_info.vset_reg); selector = (reg_val & sreg->register_info.vset_mask) >> (ffs(sreg->register_info.vset_mask) - 1); @@ -141,7 +143,7 @@ static int hisi_regulator_get_voltage(struct regulator_dev *dev) } static int hisi_regulator_set_voltage(struct regulator_dev *dev, - int min_uV, int max_uV, unsigned *selector) + int min_uV, int max_uV, unsigned int *selector) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); struct hisi_pmic *pmic = rdev_to_pmic(dev); @@ -162,14 +164,14 @@ static int hisi_regulator_set_voltage(struct regulator_dev *dev, *selector = vsel; /* set voltage selector */ hisi_pmic_rmw(pmic, sreg->register_info.vset_reg, - sreg->register_info.vset_mask, + sreg->register_info.vset_mask, vsel << (ffs(sreg->register_info.vset_mask) - 1)); - pr_debug("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", __func__,\ - sreg->register_info.vset_reg,\ - sreg->register_info.vset_mask,\ - vsel << (ffs(sreg->register_info.vset_mask) - 1)\ - ); + pr_debug("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", + __func__, + sreg->register_info.vset_reg, + sreg->register_info.vset_mask, + vsel << (ffs(sreg->register_info.vset_mask) - 1)); return ret; } @@ -181,10 +183,10 @@ static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) u32 reg_val; reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); - pr_debug("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", __func__, reg_val,\ - sreg->register_info.ctrl_reg,\ - sreg->register_info.eco_mode_mask\ - ); + pr_debug("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", + __func__, reg_val, + sreg->register_info.ctrl_reg, + sreg->register_info.eco_mode_mask); if (reg_val & sreg->register_info.eco_mode_mask) return REGULATOR_MODE_IDLE; @@ -193,7 +195,7 @@ static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) } static int hisi_regulator_set_mode(struct regulator_dev *dev, - unsigned int mode) + unsigned int mode) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); struct hisi_pmic *pmic = rdev_to_pmic(dev); @@ -212,31 +214,31 @@ static int hisi_regulator_set_mode(struct regulator_dev *dev, /* set mode */ hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, + sreg->register_info.eco_mode_mask, + eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); + + pr_debug("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", + __func__, + sreg->register_info.ctrl_reg, sreg->register_info.eco_mode_mask, eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); - - pr_debug("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", __func__,\ - sreg->register_info.ctrl_reg,\ - sreg->register_info.eco_mode_mask,\ - eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)\ - ); return 0; } - -unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, - int input_uV, int output_uV, int load_uA) +static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, + int input_uV, int output_uV, + int load_uA) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - if ((load_uA == 0) || ((unsigned int)load_uA > sreg->eco_uA)) + if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) return REGULATOR_MODE_NORMAL; else return REGULATOR_MODE_IDLE; } static int hisi_dt_parse_common(struct hisi_regulator *sreg, - struct spmi_device *pdev) + struct spmi_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; @@ -246,7 +248,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, /* parse .register_info.ctrl_reg */ ret = of_property_read_u32_array(np, "hisilicon,hisi-ctrl", - register_info, 3); + register_info, 3); if (ret) { dev_err(dev, "no hisilicon,hisi-ctrl property set\n"); goto dt_parse_common_end; @@ -257,7 +259,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, /* parse .register_info.vset_reg */ ret = of_property_read_u32_array(np, "hisilicon,hisi-vset", - register_info, 2); + register_info, 2); if (ret) { dev_err(dev, "no hisilicon,hisi-vset property set\n"); goto dt_parse_common_end; @@ -267,7 +269,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, /* parse .off-on-delay */ ret = of_property_read_u32(np, "hisilicon,hisi-off-on-delay-us", - &sreg->off_on_delay); + &sreg->off_on_delay); if (ret) { dev_err(dev, "no hisilicon,hisi-off-on-delay-us property set\n"); goto dt_parse_common_end; @@ -294,7 +296,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, } static int hisi_dt_parse_ldo(struct hisi_regulator *sreg, - struct spmi_device *pdev) + struct spmi_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; @@ -312,7 +314,7 @@ static int hisi_dt_parse_ldo(struct hisi_regulator *sreg, /* alloc space for .volt_table */ v_table = devm_kzalloc(dev, sizeof(unsigned int) * rdesc->n_voltages, - GFP_KERNEL); + GFP_KERNEL); if (unlikely(!v_table)) { ret = -ENOMEM; dev_err(dev, "no memory for .volt_table\n"); @@ -320,7 +322,7 @@ static int hisi_dt_parse_ldo(struct hisi_regulator *sreg, } ret = of_property_read_u32_array(np, "hisilicon,hisi-vset-table", - v_table, rdesc->n_voltages); + v_table, rdesc->n_voltages); if (ret) { dev_err(dev, "no hisilicon,hisi-vset-table property set\n"); goto dt_parse_ldo_end1; @@ -362,7 +364,7 @@ static const struct hisi_regulator hisi_regulator_ldo = { .dt_parse = hisi_dt_parse_ldo, }; -static struct of_device_id of_hisi_regulator_match_tbl[] = { +static const struct of_device_id of_hisi_regulator_match_tbl[] = { { .compatible = "hisilicon-hisi-ldo", .data = &hisi_regulator_ldo, @@ -388,14 +390,14 @@ static int hisi_regulator_probe(struct spmi_device *pdev) int ret = 0; /* to check which type of regulator this is */ match = of_match_device(of_hisi_regulator_match_tbl, &pdev->dev); - if (NULL == match) { + if (!match) { pr_err("get hisi regulator fail!\n\r"); return -EINVAL; } template = match->data; initdata = of_get_regulator_init_data(dev, np, NULL); - if (NULL == initdata) { + if (!initdata) { pr_err("get regulator init data error !\n"); return -EINVAL; } @@ -404,14 +406,14 @@ static int hisi_regulator_probe(struct spmi_device *pdev) constraint = &initdata->constraints; ret = of_property_read_u32_array(np, "hisilicon,valid-modes-mask", - &(constraint->valid_modes_mask), 1); + &constraint->valid_modes_mask, 1); if (ret) { pr_err("no hisilicon,valid-modes-mask property set\n"); ret = -ENODEV; return ret; } ret = of_property_read_u32_array(np, "hisilicon,valid-idle-mask", - &temp_modes, 1); + &temp_modes, 1); if (ret) { pr_err("no hisilicon,valid-modes-mask property set\n"); ret = -ENODEV; @@ -420,18 +422,16 @@ static int hisi_regulator_probe(struct spmi_device *pdev) constraint->valid_ops_mask |= temp_modes; sreg = kmemdup(template, sizeof(*sreg), GFP_KERNEL); - if (!sreg) { - pr_err("template kememdup is fail. \n"); + if (!sreg) return -ENOMEM; - } + sreg->name = initdata->constraints.name; rdesc = &sreg->rdesc; rdesc->name = sreg->name; rdesc->min_uV = initdata->constraints.min_uV; supplyname = of_get_property(np, "hisilicon,supply_name", NULL); - if (supplyname != NULL) { + if (supplyname) initdata->supply_regulator = supplyname; - } /* to parse device tree data for regulator specific */ ret = sreg->dt_parse(sreg, pdev); @@ -454,8 +454,9 @@ static int hisi_regulator_probe(struct spmi_device *pdev) goto hisi_probe_end; } - pr_debug("[%s]:valid_modes_mask[0x%x], valid_ops_mask[0x%x]\n", rdesc->name,\ - constraint->valid_modes_mask, constraint->valid_ops_mask); + pr_debug("[%s]:valid_modes_mask[0x%x], valid_ops_mask[0x%x]\n", + rdesc->name, + constraint->valid_modes_mask, constraint->valid_ops_mask); dev_set_drvdata(dev, rdev); hisi_probe_end: @@ -477,11 +478,12 @@ static void hisi_regulator_remove(struct spmi_device *pdev) kfree(sreg); } + static int hisi_regulator_suspend(struct device *dev, pm_message_t state) { struct hisi_regulator *hisi_regulator = dev_get_drvdata(dev); - if (NULL == hisi_regulator) { + if (!hisi_regulator) { pr_err("%s:regulator is NULL\n", __func__); return -ENOMEM; } @@ -490,13 +492,13 @@ static int hisi_regulator_suspend(struct device *dev, pm_message_t state) pr_info("%s:-\n", __func__); return 0; -}/*lint !e715 */ +} static int hisi_regulator_resume(struct device *dev) { struct hisi_regulator *hisi_regulator = dev_get_drvdata(dev); - if (NULL == hisi_regulator) { + if (!hisi_regulator) { pr_err("%s:regulator is NULL\n", __func__); return -ENOMEM; } -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 26/44] staging: regulator: hi6421v600-regulator: coding style fixups @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab There are several issues on those drivers related to their coding style. Solve most of them. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 110 +++++++++--------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 904cb64b1dcd..5f6e4ba4b99e 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Device driver for regulators in Hisi IC * @@ -52,7 +53,7 @@ struct hisi_regulator { u32 off_on_delay; u32 eco_uA; struct regulator_desc rdesc; - int (*dt_parse)(struct hisi_regulator *, struct spmi_device *); + int (*dt_parse)(struct hisi_regulator *reg, struct spmi_device *spmi); }; static DEFINE_MUTEX(enable_mutex); @@ -77,8 +78,9 @@ static int hisi_regulator_is_enabled(struct regulator_dev *dev) struct hisi_pmic *pmic = rdev_to_pmic(dev); reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); - pr_debug("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", __func__, sreg->register_info.ctrl_reg,\ - (reg_val & sreg->register_info.enable_mask)); + pr_debug("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", + __func__, sreg->register_info.ctrl_reg, + (reg_val & sreg->register_info.enable_mask)); return ((reg_val & sreg->register_info.enable_mask) != 0); } @@ -98,14 +100,13 @@ static int hisi_regulator_enable(struct regulator_dev *dev) usleep_range(HISI_REGS_ENA_PROTECT_TIME, HISI_REGS_ENA_PROTECT_TIME + 1000); - - /* set enable register */ hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, - sreg->register_info.enable_mask, + sreg->register_info.enable_mask, sreg->register_info.enable_mask); - pr_debug("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", __func__, sreg->register_info.ctrl_reg,\ - sreg->register_info.enable_mask); + pr_debug("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", + __func__, sreg->register_info.ctrl_reg, + sreg->register_info.enable_mask); mutex_unlock(&enable_mutex); @@ -119,7 +120,7 @@ static int hisi_regulator_disable(struct regulator_dev *dev) /* set enable register to 0 */ hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, - sreg->register_info.enable_mask, 0); + sreg->register_info.enable_mask, 0); return 0; } @@ -132,7 +133,8 @@ static int hisi_regulator_get_voltage(struct regulator_dev *dev) /* get voltage selector */ reg_val = hisi_pmic_read(pmic, sreg->register_info.vset_reg); - pr_debug("<[%s]: vset_reg=0x%x>\n", __func__, sreg->register_info.vset_reg); + pr_debug("<[%s]: vset_reg=0x%x>\n", + __func__, sreg->register_info.vset_reg); selector = (reg_val & sreg->register_info.vset_mask) >> (ffs(sreg->register_info.vset_mask) - 1); @@ -141,7 +143,7 @@ static int hisi_regulator_get_voltage(struct regulator_dev *dev) } static int hisi_regulator_set_voltage(struct regulator_dev *dev, - int min_uV, int max_uV, unsigned *selector) + int min_uV, int max_uV, unsigned int *selector) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); struct hisi_pmic *pmic = rdev_to_pmic(dev); @@ -162,14 +164,14 @@ static int hisi_regulator_set_voltage(struct regulator_dev *dev, *selector = vsel; /* set voltage selector */ hisi_pmic_rmw(pmic, sreg->register_info.vset_reg, - sreg->register_info.vset_mask, + sreg->register_info.vset_mask, vsel << (ffs(sreg->register_info.vset_mask) - 1)); - pr_debug("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", __func__,\ - sreg->register_info.vset_reg,\ - sreg->register_info.vset_mask,\ - vsel << (ffs(sreg->register_info.vset_mask) - 1)\ - ); + pr_debug("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", + __func__, + sreg->register_info.vset_reg, + sreg->register_info.vset_mask, + vsel << (ffs(sreg->register_info.vset_mask) - 1)); return ret; } @@ -181,10 +183,10 @@ static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) u32 reg_val; reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); - pr_debug("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", __func__, reg_val,\ - sreg->register_info.ctrl_reg,\ - sreg->register_info.eco_mode_mask\ - ); + pr_debug("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", + __func__, reg_val, + sreg->register_info.ctrl_reg, + sreg->register_info.eco_mode_mask); if (reg_val & sreg->register_info.eco_mode_mask) return REGULATOR_MODE_IDLE; @@ -193,7 +195,7 @@ static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) } static int hisi_regulator_set_mode(struct regulator_dev *dev, - unsigned int mode) + unsigned int mode) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); struct hisi_pmic *pmic = rdev_to_pmic(dev); @@ -212,31 +214,31 @@ static int hisi_regulator_set_mode(struct regulator_dev *dev, /* set mode */ hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, + sreg->register_info.eco_mode_mask, + eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); + + pr_debug("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", + __func__, + sreg->register_info.ctrl_reg, sreg->register_info.eco_mode_mask, eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); - - pr_debug("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", __func__,\ - sreg->register_info.ctrl_reg,\ - sreg->register_info.eco_mode_mask,\ - eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)\ - ); return 0; } - -unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, - int input_uV, int output_uV, int load_uA) +static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, + int input_uV, int output_uV, + int load_uA) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - if ((load_uA == 0) || ((unsigned int)load_uA > sreg->eco_uA)) + if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) return REGULATOR_MODE_NORMAL; else return REGULATOR_MODE_IDLE; } static int hisi_dt_parse_common(struct hisi_regulator *sreg, - struct spmi_device *pdev) + struct spmi_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; @@ -246,7 +248,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, /* parse .register_info.ctrl_reg */ ret = of_property_read_u32_array(np, "hisilicon,hisi-ctrl", - register_info, 3); + register_info, 3); if (ret) { dev_err(dev, "no hisilicon,hisi-ctrl property set\n"); goto dt_parse_common_end; @@ -257,7 +259,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, /* parse .register_info.vset_reg */ ret = of_property_read_u32_array(np, "hisilicon,hisi-vset", - register_info, 2); + register_info, 2); if (ret) { dev_err(dev, "no hisilicon,hisi-vset property set\n"); goto dt_parse_common_end; @@ -267,7 +269,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, /* parse .off-on-delay */ ret = of_property_read_u32(np, "hisilicon,hisi-off-on-delay-us", - &sreg->off_on_delay); + &sreg->off_on_delay); if (ret) { dev_err(dev, "no hisilicon,hisi-off-on-delay-us property set\n"); goto dt_parse_common_end; @@ -294,7 +296,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, } static int hisi_dt_parse_ldo(struct hisi_regulator *sreg, - struct spmi_device *pdev) + struct spmi_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; @@ -312,7 +314,7 @@ static int hisi_dt_parse_ldo(struct hisi_regulator *sreg, /* alloc space for .volt_table */ v_table = devm_kzalloc(dev, sizeof(unsigned int) * rdesc->n_voltages, - GFP_KERNEL); + GFP_KERNEL); if (unlikely(!v_table)) { ret = -ENOMEM; dev_err(dev, "no memory for .volt_table\n"); @@ -320,7 +322,7 @@ static int hisi_dt_parse_ldo(struct hisi_regulator *sreg, } ret = of_property_read_u32_array(np, "hisilicon,hisi-vset-table", - v_table, rdesc->n_voltages); + v_table, rdesc->n_voltages); if (ret) { dev_err(dev, "no hisilicon,hisi-vset-table property set\n"); goto dt_parse_ldo_end1; @@ -362,7 +364,7 @@ static const struct hisi_regulator hisi_regulator_ldo = { .dt_parse = hisi_dt_parse_ldo, }; -static struct of_device_id of_hisi_regulator_match_tbl[] = { +static const struct of_device_id of_hisi_regulator_match_tbl[] = { { .compatible = "hisilicon-hisi-ldo", .data = &hisi_regulator_ldo, @@ -388,14 +390,14 @@ static int hisi_regulator_probe(struct spmi_device *pdev) int ret = 0; /* to check which type of regulator this is */ match = of_match_device(of_hisi_regulator_match_tbl, &pdev->dev); - if (NULL == match) { + if (!match) { pr_err("get hisi regulator fail!\n\r"); return -EINVAL; } template = match->data; initdata = of_get_regulator_init_data(dev, np, NULL); - if (NULL == initdata) { + if (!initdata) { pr_err("get regulator init data error !\n"); return -EINVAL; } @@ -404,14 +406,14 @@ static int hisi_regulator_probe(struct spmi_device *pdev) constraint = &initdata->constraints; ret = of_property_read_u32_array(np, "hisilicon,valid-modes-mask", - &(constraint->valid_modes_mask), 1); + &constraint->valid_modes_mask, 1); if (ret) { pr_err("no hisilicon,valid-modes-mask property set\n"); ret = -ENODEV; return ret; } ret = of_property_read_u32_array(np, "hisilicon,valid-idle-mask", - &temp_modes, 1); + &temp_modes, 1); if (ret) { pr_err("no hisilicon,valid-modes-mask property set\n"); ret = -ENODEV; @@ -420,18 +422,16 @@ static int hisi_regulator_probe(struct spmi_device *pdev) constraint->valid_ops_mask |= temp_modes; sreg = kmemdup(template, sizeof(*sreg), GFP_KERNEL); - if (!sreg) { - pr_err("template kememdup is fail. \n"); + if (!sreg) return -ENOMEM; - } + sreg->name = initdata->constraints.name; rdesc = &sreg->rdesc; rdesc->name = sreg->name; rdesc->min_uV = initdata->constraints.min_uV; supplyname = of_get_property(np, "hisilicon,supply_name", NULL); - if (supplyname != NULL) { + if (supplyname) initdata->supply_regulator = supplyname; - } /* to parse device tree data for regulator specific */ ret = sreg->dt_parse(sreg, pdev); @@ -454,8 +454,9 @@ static int hisi_regulator_probe(struct spmi_device *pdev) goto hisi_probe_end; } - pr_debug("[%s]:valid_modes_mask[0x%x], valid_ops_mask[0x%x]\n", rdesc->name,\ - constraint->valid_modes_mask, constraint->valid_ops_mask); + pr_debug("[%s]:valid_modes_mask[0x%x], valid_ops_mask[0x%x]\n", + rdesc->name, + constraint->valid_modes_mask, constraint->valid_ops_mask); dev_set_drvdata(dev, rdev); hisi_probe_end: @@ -477,11 +478,12 @@ static void hisi_regulator_remove(struct spmi_device *pdev) kfree(sreg); } + static int hisi_regulator_suspend(struct device *dev, pm_message_t state) { struct hisi_regulator *hisi_regulator = dev_get_drvdata(dev); - if (NULL == hisi_regulator) { + if (!hisi_regulator) { pr_err("%s:regulator is NULL\n", __func__); return -ENOMEM; } @@ -490,13 +492,13 @@ static int hisi_regulator_suspend(struct device *dev, pm_message_t state) pr_info("%s:-\n", __func__); return 0; -}/*lint !e715 */ +} static int hisi_regulator_resume(struct device *dev) { struct hisi_regulator *hisi_regulator = dev_get_drvdata(dev); - if (NULL == hisi_regulator) { + if (!hisi_regulator) { pr_err("%s:regulator is NULL\n", __func__); return -ENOMEM; } -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 27/44] staging: regulator: hi6421v600-regulator: change the binding logic 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Change the binding logic to ensure that the PMIC SPMI driver will run before the regulator code and add it to the building system. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 186 +++++++++--------- 1 file changed, 91 insertions(+), 95 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 5f6e4ba4b99e..9aaafcbb1a36 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -31,7 +31,7 @@ #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> #include <linux/regulator/of_regulator.h> -#include <linux/mfd/hisi_pmic.h> +#include <linux/mfd/hi6421-spmi-pmic.h> #include <linux/delay.h> #include <linux/time.h> #include <linux/version.h> @@ -53,20 +53,11 @@ struct hisi_regulator { u32 off_on_delay; u32 eco_uA; struct regulator_desc rdesc; - int (*dt_parse)(struct hisi_regulator *reg, struct spmi_device *spmi); + struct hisi_pmic *pmic; }; static DEFINE_MUTEX(enable_mutex); -static inline struct hisi_pmic *rdev_to_pmic(struct regulator_dev *dev) -{ - /* regulator_dev parent to-> - * hisi regulator platform device_dev parent to-> - * hisi pmic platform device_dev - */ - return dev_get_drvdata(rdev_get_dev(dev)->parent->parent); -} - /* helper function to ensure when it returns it is at least 'delay_us' * microseconds after 'since'. */ @@ -75,7 +66,7 @@ static int hisi_regulator_is_enabled(struct regulator_dev *dev) { u32 reg_val; struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); pr_debug("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", @@ -88,7 +79,7 @@ static int hisi_regulator_is_enabled(struct regulator_dev *dev) static int hisi_regulator_enable(struct regulator_dev *dev) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; /* keep a distance of off_on_delay from last time disabled */ usleep_range(sreg->off_on_delay, sreg->off_on_delay + 1000); @@ -116,7 +107,7 @@ static int hisi_regulator_enable(struct regulator_dev *dev) static int hisi_regulator_disable(struct regulator_dev *dev) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; /* set enable register to 0 */ hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, @@ -128,7 +119,7 @@ static int hisi_regulator_disable(struct regulator_dev *dev) static int hisi_regulator_get_voltage(struct regulator_dev *dev) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; u32 reg_val, selector; /* get voltage selector */ @@ -146,7 +137,7 @@ static int hisi_regulator_set_voltage(struct regulator_dev *dev, int min_uV, int max_uV, unsigned int *selector) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; u32 vsel; int ret = 0; @@ -179,7 +170,7 @@ static int hisi_regulator_set_voltage(struct regulator_dev *dev, static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; u32 reg_val; reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); @@ -198,7 +189,7 @@ static int hisi_regulator_set_mode(struct regulator_dev *dev, unsigned int mode) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; u32 eco_mode; switch (mode) { @@ -238,7 +229,7 @@ static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, } static int hisi_dt_parse_common(struct hisi_regulator *sreg, - struct spmi_device *pdev) + struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; @@ -296,7 +287,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, } static int hisi_dt_parse_ldo(struct hisi_regulator *sreg, - struct spmi_device *pdev) + struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; @@ -355,47 +346,32 @@ static struct regulator_ops hisi_ldo_rops = { .get_optimum_mode = hisi_regulator_get_optimum_mode, }; -static const struct hisi_regulator hisi_regulator_ldo = { - .rdesc = { - .ops = &hisi_ldo_rops, - .type = REGULATOR_VOLTAGE, - .owner = THIS_MODULE, - }, - .dt_parse = hisi_dt_parse_ldo, -}; +/* + * Used only for parsing the DT properties + */ -static const struct of_device_id of_hisi_regulator_match_tbl[] = { +static const struct of_device_id of_hisi_pmic_match_tbl[] = { { - .compatible = "hisilicon-hisi-ldo", - .data = &hisi_regulator_ldo, + .compatible = "hisilicon,hi6421-spmi-pmic-ldo", }, - { /* end */ } + { } }; -static int hisi_regulator_probe(struct spmi_device *pdev) +static int hisi_regulator_probe_ldo(struct platform_device *pdev, + struct device_node *np, + struct hisi_pmic *pmic) { struct device *dev = &pdev->dev; - struct device_node *np = dev->of_node; struct regulator_desc *rdesc; struct regulator_dev *rdev; struct hisi_regulator *sreg = NULL; struct regulator_init_data *initdata; struct regulator_config config = { }; - const struct of_device_id *match; struct regulation_constraints *constraint; const char *supplyname = NULL; unsigned int temp_modes; - - const struct hisi_regulator *template = NULL; int ret = 0; - /* to check which type of regulator this is */ - match = of_match_device(of_hisi_regulator_match_tbl, &pdev->dev); - if (!match) { - pr_err("get hisi regulator fail!\n\r"); - return -EINVAL; - } - template = match->data; initdata = of_get_regulator_init_data(dev, np, NULL); if (!initdata) { pr_err("get regulator init data error !\n"); @@ -421,20 +397,25 @@ static int hisi_regulator_probe(struct spmi_device *pdev) } constraint->valid_ops_mask |= temp_modes; - sreg = kmemdup(template, sizeof(*sreg), GFP_KERNEL); + sreg = kzalloc(sizeof(*sreg), GFP_KERNEL); if (!sreg) return -ENOMEM; sreg->name = initdata->constraints.name; + sreg->pmic = pmic; rdesc = &sreg->rdesc; + rdesc->name = sreg->name; + rdesc->ops = &hisi_ldo_rops; + rdesc->type = REGULATOR_VOLTAGE; rdesc->min_uV = initdata->constraints.min_uV; + supplyname = of_get_property(np, "hisilicon,supply_name", NULL); if (supplyname) initdata->supply_regulator = supplyname; - /* to parse device tree data for regulator specific */ - ret = sreg->dt_parse(sreg, pdev); + /* parse device tree data for regulator specific */ + ret = hisi_dt_parse_ldo(sreg, pdev); if (ret) { dev_err(dev, "device tree parameter parse error!\n"); goto hisi_probe_end; @@ -465,7 +446,59 @@ static int hisi_regulator_probe(struct spmi_device *pdev) return ret; } -static void hisi_regulator_remove(struct spmi_device *pdev) + +static int hisi_regulator_probe(struct platform_device *pdev) +{ + struct device *pmic_dev = pdev->dev.parent; + struct device_node *np = pmic_dev->of_node; + struct device_node *regulators, *child; + struct platform_device *new_pdev; + struct hisi_pmic *pmic; + int ret; + + dev_dbg(&pdev->dev, "probing hi6421v600 regulator\n"); + /* + * This driver is meant to be called by hi6421-spmi-core, + * which should first set drvdata. If this doesn't happen, hit + * a warn on and return. + */ + pmic = dev_get_drvdata(pmic_dev); + if (WARN_ON(!pmic)) + return -ENODEV; + + regulators = of_get_child_by_name(np, "regulators"); + if (!regulators) { + dev_err(&pdev->dev, "regulator node not found\n"); + return -ENODEV; + } + + /* + * Parse all LDO regulator nodes + */ + for_each_child_of_node(regulators, child) { + dev_dbg(&pdev->dev, "adding child %pOF\n", child); + + new_pdev = platform_device_alloc(child->name, -1); + new_pdev->dev.parent = pmic_dev; + new_pdev->dev.of_node = of_node_get(child); + + ret = platform_device_add(new_pdev); + if (ret < 0) { + platform_device_put(new_pdev); + continue; + } + + ret = hisi_regulator_probe_ldo(new_pdev, child, pmic); + if (ret < 0) + platform_device_put(new_pdev); + } + + of_node_put(regulators); + + return 0; +} + +static int hisi_regulator_remove(struct platform_device *pdev) { struct regulator_dev *rdev = dev_get_drvdata(&pdev->dev); struct hisi_regulator *sreg = rdev_get_drvdata(rdev); @@ -477,63 +510,26 @@ static void hisi_regulator_remove(struct spmi_device *pdev) devm_kfree(&pdev->dev, (unsigned int *)sreg->rdesc.volt_table); kfree(sreg); -} - -static int hisi_regulator_suspend(struct device *dev, pm_message_t state) -{ - struct hisi_regulator *hisi_regulator = dev_get_drvdata(dev); - - if (!hisi_regulator) { - pr_err("%s:regulator is NULL\n", __func__); - return -ENOMEM; - } - - pr_info("%s:+\n", __func__); - pr_info("%s:-\n", __func__); return 0; } -static int hisi_regulator_resume(struct device *dev) -{ - struct hisi_regulator *hisi_regulator = dev_get_drvdata(dev); - - if (!hisi_regulator) { - pr_err("%s:regulator is NULL\n", __func__); - return -ENOMEM; - } - - pr_info("%s:+\n", __func__); - pr_info("%s:-\n", __func__); - - return 0; -} +static const struct platform_device_id hi6421v600_regulator_table[] = { + { .name = "hi6421v600-regulator" }, + {}, +}; +MODULE_DEVICE_TABLE(platform, hi6421v600_regulator_table); -static struct spmi_driver hisi_pmic_driver = { +static struct platform_driver hi6421v600_regulator_driver = { + .id_table = hi6421v600_regulator_table, .driver = { - .name = "hisi_regulator", - .owner = THIS_MODULE, - .of_match_table = of_hisi_regulator_match_tbl, - .suspend = hisi_regulator_suspend, - .resume = hisi_regulator_resume, + .name = "hi6421v600-regulator", }, .probe = hisi_regulator_probe, .remove = hisi_regulator_remove, }; +module_platform_driver(hi6421v600_regulator_driver); -static int __init hisi_regulator_init(void) -{ - return spmi_driver_register(&hisi_pmic_driver); -} - -static void __exit hisi_regulator_exit(void) -{ - spmi_driver_unregister(&hisi_pmic_driver); -} - -fs_initcall(hisi_regulator_init); -module_exit(hisi_regulator_exit); - -MODULE_DESCRIPTION("Hisi regulator driver"); +MODULE_DESCRIPTION("Hi6421v600 regulator driver"); MODULE_LICENSE("GPL v2"); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 27/44] staging: regulator: hi6421v600-regulator: change the binding logic @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Change the binding logic to ensure that the PMIC SPMI driver will run before the regulator code and add it to the building system. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 186 +++++++++--------- 1 file changed, 91 insertions(+), 95 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 5f6e4ba4b99e..9aaafcbb1a36 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -31,7 +31,7 @@ #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> #include <linux/regulator/of_regulator.h> -#include <linux/mfd/hisi_pmic.h> +#include <linux/mfd/hi6421-spmi-pmic.h> #include <linux/delay.h> #include <linux/time.h> #include <linux/version.h> @@ -53,20 +53,11 @@ struct hisi_regulator { u32 off_on_delay; u32 eco_uA; struct regulator_desc rdesc; - int (*dt_parse)(struct hisi_regulator *reg, struct spmi_device *spmi); + struct hisi_pmic *pmic; }; static DEFINE_MUTEX(enable_mutex); -static inline struct hisi_pmic *rdev_to_pmic(struct regulator_dev *dev) -{ - /* regulator_dev parent to-> - * hisi regulator platform device_dev parent to-> - * hisi pmic platform device_dev - */ - return dev_get_drvdata(rdev_get_dev(dev)->parent->parent); -} - /* helper function to ensure when it returns it is at least 'delay_us' * microseconds after 'since'. */ @@ -75,7 +66,7 @@ static int hisi_regulator_is_enabled(struct regulator_dev *dev) { u32 reg_val; struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); pr_debug("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", @@ -88,7 +79,7 @@ static int hisi_regulator_is_enabled(struct regulator_dev *dev) static int hisi_regulator_enable(struct regulator_dev *dev) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; /* keep a distance of off_on_delay from last time disabled */ usleep_range(sreg->off_on_delay, sreg->off_on_delay + 1000); @@ -116,7 +107,7 @@ static int hisi_regulator_enable(struct regulator_dev *dev) static int hisi_regulator_disable(struct regulator_dev *dev) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; /* set enable register to 0 */ hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, @@ -128,7 +119,7 @@ static int hisi_regulator_disable(struct regulator_dev *dev) static int hisi_regulator_get_voltage(struct regulator_dev *dev) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; u32 reg_val, selector; /* get voltage selector */ @@ -146,7 +137,7 @@ static int hisi_regulator_set_voltage(struct regulator_dev *dev, int min_uV, int max_uV, unsigned int *selector) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; u32 vsel; int ret = 0; @@ -179,7 +170,7 @@ static int hisi_regulator_set_voltage(struct regulator_dev *dev, static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; u32 reg_val; reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); @@ -198,7 +189,7 @@ static int hisi_regulator_set_mode(struct regulator_dev *dev, unsigned int mode) { struct hisi_regulator *sreg = rdev_get_drvdata(dev); - struct hisi_pmic *pmic = rdev_to_pmic(dev); + struct hisi_pmic *pmic = sreg->pmic; u32 eco_mode; switch (mode) { @@ -238,7 +229,7 @@ static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, } static int hisi_dt_parse_common(struct hisi_regulator *sreg, - struct spmi_device *pdev) + struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; @@ -296,7 +287,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, } static int hisi_dt_parse_ldo(struct hisi_regulator *sreg, - struct spmi_device *pdev) + struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; @@ -355,47 +346,32 @@ static struct regulator_ops hisi_ldo_rops = { .get_optimum_mode = hisi_regulator_get_optimum_mode, }; -static const struct hisi_regulator hisi_regulator_ldo = { - .rdesc = { - .ops = &hisi_ldo_rops, - .type = REGULATOR_VOLTAGE, - .owner = THIS_MODULE, - }, - .dt_parse = hisi_dt_parse_ldo, -}; +/* + * Used only for parsing the DT properties + */ -static const struct of_device_id of_hisi_regulator_match_tbl[] = { +static const struct of_device_id of_hisi_pmic_match_tbl[] = { { - .compatible = "hisilicon-hisi-ldo", - .data = &hisi_regulator_ldo, + .compatible = "hisilicon,hi6421-spmi-pmic-ldo", }, - { /* end */ } + { } }; -static int hisi_regulator_probe(struct spmi_device *pdev) +static int hisi_regulator_probe_ldo(struct platform_device *pdev, + struct device_node *np, + struct hisi_pmic *pmic) { struct device *dev = &pdev->dev; - struct device_node *np = dev->of_node; struct regulator_desc *rdesc; struct regulator_dev *rdev; struct hisi_regulator *sreg = NULL; struct regulator_init_data *initdata; struct regulator_config config = { }; - const struct of_device_id *match; struct regulation_constraints *constraint; const char *supplyname = NULL; unsigned int temp_modes; - - const struct hisi_regulator *template = NULL; int ret = 0; - /* to check which type of regulator this is */ - match = of_match_device(of_hisi_regulator_match_tbl, &pdev->dev); - if (!match) { - pr_err("get hisi regulator fail!\n\r"); - return -EINVAL; - } - template = match->data; initdata = of_get_regulator_init_data(dev, np, NULL); if (!initdata) { pr_err("get regulator init data error !\n"); @@ -421,20 +397,25 @@ static int hisi_regulator_probe(struct spmi_device *pdev) } constraint->valid_ops_mask |= temp_modes; - sreg = kmemdup(template, sizeof(*sreg), GFP_KERNEL); + sreg = kzalloc(sizeof(*sreg), GFP_KERNEL); if (!sreg) return -ENOMEM; sreg->name = initdata->constraints.name; + sreg->pmic = pmic; rdesc = &sreg->rdesc; + rdesc->name = sreg->name; + rdesc->ops = &hisi_ldo_rops; + rdesc->type = REGULATOR_VOLTAGE; rdesc->min_uV = initdata->constraints.min_uV; + supplyname = of_get_property(np, "hisilicon,supply_name", NULL); if (supplyname) initdata->supply_regulator = supplyname; - /* to parse device tree data for regulator specific */ - ret = sreg->dt_parse(sreg, pdev); + /* parse device tree data for regulator specific */ + ret = hisi_dt_parse_ldo(sreg, pdev); if (ret) { dev_err(dev, "device tree parameter parse error!\n"); goto hisi_probe_end; @@ -465,7 +446,59 @@ static int hisi_regulator_probe(struct spmi_device *pdev) return ret; } -static void hisi_regulator_remove(struct spmi_device *pdev) + +static int hisi_regulator_probe(struct platform_device *pdev) +{ + struct device *pmic_dev = pdev->dev.parent; + struct device_node *np = pmic_dev->of_node; + struct device_node *regulators, *child; + struct platform_device *new_pdev; + struct hisi_pmic *pmic; + int ret; + + dev_dbg(&pdev->dev, "probing hi6421v600 regulator\n"); + /* + * This driver is meant to be called by hi6421-spmi-core, + * which should first set drvdata. If this doesn't happen, hit + * a warn on and return. + */ + pmic = dev_get_drvdata(pmic_dev); + if (WARN_ON(!pmic)) + return -ENODEV; + + regulators = of_get_child_by_name(np, "regulators"); + if (!regulators) { + dev_err(&pdev->dev, "regulator node not found\n"); + return -ENODEV; + } + + /* + * Parse all LDO regulator nodes + */ + for_each_child_of_node(regulators, child) { + dev_dbg(&pdev->dev, "adding child %pOF\n", child); + + new_pdev = platform_device_alloc(child->name, -1); + new_pdev->dev.parent = pmic_dev; + new_pdev->dev.of_node = of_node_get(child); + + ret = platform_device_add(new_pdev); + if (ret < 0) { + platform_device_put(new_pdev); + continue; + } + + ret = hisi_regulator_probe_ldo(new_pdev, child, pmic); + if (ret < 0) + platform_device_put(new_pdev); + } + + of_node_put(regulators); + + return 0; +} + +static int hisi_regulator_remove(struct platform_device *pdev) { struct regulator_dev *rdev = dev_get_drvdata(&pdev->dev); struct hisi_regulator *sreg = rdev_get_drvdata(rdev); @@ -477,63 +510,26 @@ static void hisi_regulator_remove(struct spmi_device *pdev) devm_kfree(&pdev->dev, (unsigned int *)sreg->rdesc.volt_table); kfree(sreg); -} - -static int hisi_regulator_suspend(struct device *dev, pm_message_t state) -{ - struct hisi_regulator *hisi_regulator = dev_get_drvdata(dev); - - if (!hisi_regulator) { - pr_err("%s:regulator is NULL\n", __func__); - return -ENOMEM; - } - - pr_info("%s:+\n", __func__); - pr_info("%s:-\n", __func__); return 0; } -static int hisi_regulator_resume(struct device *dev) -{ - struct hisi_regulator *hisi_regulator = dev_get_drvdata(dev); - - if (!hisi_regulator) { - pr_err("%s:regulator is NULL\n", __func__); - return -ENOMEM; - } - - pr_info("%s:+\n", __func__); - pr_info("%s:-\n", __func__); - - return 0; -} +static const struct platform_device_id hi6421v600_regulator_table[] = { + { .name = "hi6421v600-regulator" }, + {}, +}; +MODULE_DEVICE_TABLE(platform, hi6421v600_regulator_table); -static struct spmi_driver hisi_pmic_driver = { +static struct platform_driver hi6421v600_regulator_driver = { + .id_table = hi6421v600_regulator_table, .driver = { - .name = "hisi_regulator", - .owner = THIS_MODULE, - .of_match_table = of_hisi_regulator_match_tbl, - .suspend = hisi_regulator_suspend, - .resume = hisi_regulator_resume, + .name = "hi6421v600-regulator", }, .probe = hisi_regulator_probe, .remove = hisi_regulator_remove, }; +module_platform_driver(hi6421v600_regulator_driver); -static int __init hisi_regulator_init(void) -{ - return spmi_driver_register(&hisi_pmic_driver); -} - -static void __exit hisi_regulator_exit(void) -{ - spmi_driver_unregister(&hisi_pmic_driver); -} - -fs_initcall(hisi_regulator_init); -module_exit(hisi_regulator_exit); - -MODULE_DESCRIPTION("Hisi regulator driver"); +MODULE_DESCRIPTION("Hi6421v600 regulator driver"); MODULE_LICENSE("GPL v2"); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 28/44] staging: regulator: hi6421v600-regulator: cleanup struct hisi_regulator 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel There are several fields on this struct that can be removed, as they already exists at struct regulator_desc. Remove them, cleaning up the code in the process. While here, rename it to hi6421v600_regulator_info, in order to better match the driver's name. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 226 +++++++----------- 1 file changed, 92 insertions(+), 134 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 9aaafcbb1a36..7d82d11f4b52 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -39,21 +39,11 @@ #include <linux/uaccess.h> #include <linux/spmi.h> -struct hisi_regulator_register_info { - u32 ctrl_reg; - u32 enable_mask; - u32 eco_mode_mask; - u32 vset_reg; - u32 vset_mask; -}; - -struct hisi_regulator { - const char *name; - struct hisi_regulator_register_info register_info; - u32 off_on_delay; - u32 eco_uA; +struct hi6421v600_regulator { struct regulator_desc rdesc; struct hisi_pmic *pmic; + u8 eco_mode_mask; + u32 eco_uA; }; static DEFINE_MUTEX(enable_mutex); @@ -62,29 +52,29 @@ static DEFINE_MUTEX(enable_mutex); * microseconds after 'since'. */ -static int hisi_regulator_is_enabled(struct regulator_dev *dev) +static int hisi_regulator_is_enabled(struct regulator_dev *rdev) { u32 reg_val; - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; - reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); - pr_debug("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", - __func__, sreg->register_info.ctrl_reg, - (reg_val & sreg->register_info.enable_mask)); + reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg); + pr_debug("<[%s]: enable_reg=0x%x,enable_state=%d>\n", + __func__, rdev->desc->enable_reg, + (reg_val & rdev->desc->enable_mask)); - return ((reg_val & sreg->register_info.enable_mask) != 0); + return ((reg_val & rdev->desc->enable_mask) != 0); } -static int hisi_regulator_enable(struct regulator_dev *dev) +static int hisi_regulator_enable(struct regulator_dev *rdev) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; /* keep a distance of off_on_delay from last time disabled */ - usleep_range(sreg->off_on_delay, sreg->off_on_delay + 1000); + usleep_range(rdev->desc->off_on_delay, rdev->desc->off_on_delay + 1000); - pr_debug("<[%s]: off_on_delay=%dus>\n", __func__, sreg->off_on_delay); + pr_debug("<[%s]: off_on_delay=%dus>\n", __func__, rdev->desc->off_on_delay); /* cannot enable more than one regulator at one time */ mutex_lock(&enable_mutex); @@ -92,103 +82,103 @@ static int hisi_regulator_enable(struct regulator_dev *dev) HISI_REGS_ENA_PROTECT_TIME + 1000); /* set enable register */ - hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, - sreg->register_info.enable_mask, - sreg->register_info.enable_mask); - pr_debug("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", - __func__, sreg->register_info.ctrl_reg, - sreg->register_info.enable_mask); + hisi_pmic_rmw(pmic, rdev->desc->enable_reg, + rdev->desc->enable_mask, + rdev->desc->enable_mask); + pr_debug("<[%s]: enable_reg=0x%x,enable_mask=0x%x>\n", + __func__, rdev->desc->enable_reg, + rdev->desc->enable_mask); mutex_unlock(&enable_mutex); return 0; } -static int hisi_regulator_disable(struct regulator_dev *dev) +static int hisi_regulator_disable(struct regulator_dev *rdev) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; /* set enable register to 0 */ - hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, - sreg->register_info.enable_mask, 0); + hisi_pmic_rmw(pmic, rdev->desc->enable_reg, + rdev->desc->enable_mask, 0); return 0; } -static int hisi_regulator_get_voltage(struct regulator_dev *dev) +static int hisi_regulator_get_voltage(struct regulator_dev *rdev) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 reg_val, selector; /* get voltage selector */ - reg_val = hisi_pmic_read(pmic, sreg->register_info.vset_reg); - pr_debug("<[%s]: vset_reg=0x%x>\n", - __func__, sreg->register_info.vset_reg); + reg_val = hisi_pmic_read(pmic, rdev->desc->vsel_reg); + pr_debug("<[%s]: vsel_reg=0x%x>\n", + __func__, rdev->desc->vsel_reg); - selector = (reg_val & sreg->register_info.vset_mask) >> - (ffs(sreg->register_info.vset_mask) - 1); + selector = (reg_val & rdev->desc->vsel_mask) >> + (ffs(rdev->desc->vsel_mask) - 1); - return sreg->rdesc.ops->list_voltage(dev, selector); + return rdev->desc->ops->list_voltage(rdev, selector); } -static int hisi_regulator_set_voltage(struct regulator_dev *dev, +static int hisi_regulator_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV, unsigned int *selector) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 vsel; int ret = 0; - for (vsel = 0; vsel < sreg->rdesc.n_voltages; vsel++) { - int uV = sreg->rdesc.volt_table[vsel]; + for (vsel = 0; vsel < rdev->desc->n_voltages; vsel++) { + int uV = rdev->desc->volt_table[vsel]; /* Break at the first in-range value */ if (min_uV <= uV && uV <= max_uV) break; } /* unlikely to happen. sanity test done by regulator core */ - if (unlikely(vsel == sreg->rdesc.n_voltages)) + if (unlikely(vsel == rdev->desc->n_voltages)) return -EINVAL; *selector = vsel; /* set voltage selector */ - hisi_pmic_rmw(pmic, sreg->register_info.vset_reg, - sreg->register_info.vset_mask, - vsel << (ffs(sreg->register_info.vset_mask) - 1)); + hisi_pmic_rmw(pmic, rdev->desc->vsel_reg, + rdev->desc->vsel_mask, + vsel << (ffs(rdev->desc->vsel_mask) - 1)); - pr_debug("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", + pr_debug("<[%s]: vsel_reg=0x%x, vsel_mask=0x%x, value=0x%x>\n", __func__, - sreg->register_info.vset_reg, - sreg->register_info.vset_mask, - vsel << (ffs(sreg->register_info.vset_mask) - 1)); + rdev->desc->vsel_reg, + rdev->desc->vsel_mask, + vsel << (ffs(rdev->desc->vsel_mask) - 1)); return ret; } -static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) +static unsigned int hisi_regulator_get_mode(struct regulator_dev *rdev) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 reg_val; - reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); - pr_debug("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", + reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg); + pr_debug("<[%s]: reg_val=%d, enable_reg=0x%x, eco_mode_mask=0x%x>\n", __func__, reg_val, - sreg->register_info.ctrl_reg, - sreg->register_info.eco_mode_mask); + rdev->desc->enable_reg, + sreg->eco_mode_mask); - if (reg_val & sreg->register_info.eco_mode_mask) + if (reg_val & sreg->eco_mode_mask) return REGULATOR_MODE_IDLE; else return REGULATOR_MODE_NORMAL; } -static int hisi_regulator_set_mode(struct regulator_dev *dev, +static int hisi_regulator_set_mode(struct regulator_dev *rdev, unsigned int mode) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 eco_mode; @@ -204,23 +194,23 @@ static int hisi_regulator_set_mode(struct regulator_dev *dev, } /* set mode */ - hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, - sreg->register_info.eco_mode_mask, - eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); + hisi_pmic_rmw(pmic, rdev->desc->enable_reg, + sreg->eco_mode_mask, + eco_mode << (ffs(sreg->eco_mode_mask) - 1)); - pr_debug("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", + pr_debug("<[%s]: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", __func__, - sreg->register_info.ctrl_reg, - sreg->register_info.eco_mode_mask, - eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); + rdev->desc->enable_reg, + sreg->eco_mode_mask, + eco_mode << (ffs(sreg->eco_mode_mask) - 1)); return 0; } -static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, +static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *rdev, int input_uV, int output_uV, int load_uA) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) return REGULATOR_MODE_NORMAL; @@ -228,42 +218,43 @@ static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, return REGULATOR_MODE_IDLE; } -static int hisi_dt_parse_common(struct hisi_regulator *sreg, - struct platform_device *pdev) +static int hisi_dt_parse(struct platform_device *pdev, + struct hi6421v600_regulator *sreg, + struct regulator_desc *rdesc) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; - struct regulator_desc *rdesc = &sreg->rdesc; unsigned int register_info[3] = {0}; - int ret = 0; + unsigned int *v_table; + int ret; - /* parse .register_info.ctrl_reg */ + /* parse .register_info.enable_reg */ ret = of_property_read_u32_array(np, "hisilicon,hisi-ctrl", register_info, 3); if (ret) { dev_err(dev, "no hisilicon,hisi-ctrl property set\n"); - goto dt_parse_common_end; + return ret; } - sreg->register_info.ctrl_reg = register_info[0]; - sreg->register_info.enable_mask = register_info[1]; - sreg->register_info.eco_mode_mask = register_info[2]; + rdesc->enable_reg = register_info[0]; + rdesc->enable_mask = register_info[1]; + sreg->eco_mode_mask = register_info[2]; - /* parse .register_info.vset_reg */ + /* parse .register_info.vsel_reg */ ret = of_property_read_u32_array(np, "hisilicon,hisi-vset", register_info, 2); if (ret) { dev_err(dev, "no hisilicon,hisi-vset property set\n"); - goto dt_parse_common_end; + return ret; } - sreg->register_info.vset_reg = register_info[0]; - sreg->register_info.vset_mask = register_info[1]; + rdesc->vsel_reg = register_info[0]; + rdesc->vsel_mask = register_info[1]; /* parse .off-on-delay */ ret = of_property_read_u32(np, "hisilicon,hisi-off-on-delay-us", - &sreg->off_on_delay); + &rdesc->off_on_delay); if (ret) { dev_err(dev, "no hisilicon,hisi-off-on-delay-us property set\n"); - goto dt_parse_common_end; + return ret; } /* parse .enable_time */ @@ -271,7 +262,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, &rdesc->enable_time); if (ret) { dev_err(dev, "no hisilicon,hisi-enable-time-us property set\n"); - goto dt_parse_common_end; + return ret; } /* parse .eco_uA */ @@ -282,56 +273,24 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, ret = 0; } -dt_parse_common_end: - return ret; -} + /* parse volt_table */ -static int hisi_dt_parse_ldo(struct hisi_regulator *sreg, - struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - struct device_node *np = dev->of_node; - struct regulator_desc *rdesc = &sreg->rdesc; - unsigned int *v_table; - int ret = 0; + rdesc->n_voltages = of_property_count_u32_elems(np, "hisilicon,hisi-vset-table"); - /* parse .n_voltages, and .volt_table */ - ret = of_property_read_u32(np, "hisilicon,hisi-n-voltages", - &rdesc->n_voltages); - if (ret) { - dev_err(dev, "no hisilicon,hisi-n-voltages property set\n"); - goto dt_parse_ldo_end; - } - - /* alloc space for .volt_table */ v_table = devm_kzalloc(dev, sizeof(unsigned int) * rdesc->n_voltages, GFP_KERNEL); - if (unlikely(!v_table)) { - ret = -ENOMEM; - dev_err(dev, "no memory for .volt_table\n"); - goto dt_parse_ldo_end; - } + if (unlikely(!v_table)) + return -ENOMEM; + rdesc->volt_table = v_table; ret = of_property_read_u32_array(np, "hisilicon,hisi-vset-table", v_table, rdesc->n_voltages); if (ret) { dev_err(dev, "no hisilicon,hisi-vset-table property set\n"); - goto dt_parse_ldo_end1; + return ret; } - rdesc->volt_table = v_table; - /* parse hisi regulator's dt common part */ - ret = hisi_dt_parse_common(sreg, pdev); - if (ret) { - dev_err(dev, "failure in hisi_dt_parse_common\n"); - goto dt_parse_ldo_end1; - } - - return ret; - -dt_parse_ldo_end1: -dt_parse_ldo_end: - return ret; + return 0; } static struct regulator_ops hisi_ldo_rops = { @@ -364,7 +323,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, struct device *dev = &pdev->dev; struct regulator_desc *rdesc; struct regulator_dev *rdev; - struct hisi_regulator *sreg = NULL; + struct hi6421v600_regulator *sreg = NULL; struct regulator_init_data *initdata; struct regulator_config config = { }; struct regulation_constraints *constraint; @@ -401,11 +360,10 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, if (!sreg) return -ENOMEM; - sreg->name = initdata->constraints.name; sreg->pmic = pmic; rdesc = &sreg->rdesc; - rdesc->name = sreg->name; + rdesc->name = initdata->constraints.name; rdesc->ops = &hisi_ldo_rops; rdesc->type = REGULATOR_VOLTAGE; rdesc->min_uV = initdata->constraints.min_uV; @@ -415,7 +373,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, initdata->supply_regulator = supplyname; /* parse device tree data for regulator specific */ - ret = hisi_dt_parse_ldo(sreg, pdev); + ret = hisi_dt_parse(pdev, sreg, rdesc); if (ret) { dev_err(dev, "device tree parameter parse error!\n"); goto hisi_probe_end; @@ -501,13 +459,13 @@ static int hisi_regulator_probe(struct platform_device *pdev) static int hisi_regulator_remove(struct platform_device *pdev) { struct regulator_dev *rdev = dev_get_drvdata(&pdev->dev); - struct hisi_regulator *sreg = rdev_get_drvdata(rdev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); regulator_unregister(rdev); /* TODO: should i worry about that? devm_kzalloc */ - if (sreg->rdesc.volt_table) - devm_kfree(&pdev->dev, (unsigned int *)sreg->rdesc.volt_table); + if (rdev->desc->volt_table) + devm_kfree(&pdev->dev, (unsigned int *)rdev->desc->volt_table); kfree(sreg); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 28/44] staging: regulator: hi6421v600-regulator: cleanup struct hisi_regulator @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab There are several fields on this struct that can be removed, as they already exists at struct regulator_desc. Remove them, cleaning up the code in the process. While here, rename it to hi6421v600_regulator_info, in order to better match the driver's name. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 226 +++++++----------- 1 file changed, 92 insertions(+), 134 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 9aaafcbb1a36..7d82d11f4b52 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -39,21 +39,11 @@ #include <linux/uaccess.h> #include <linux/spmi.h> -struct hisi_regulator_register_info { - u32 ctrl_reg; - u32 enable_mask; - u32 eco_mode_mask; - u32 vset_reg; - u32 vset_mask; -}; - -struct hisi_regulator { - const char *name; - struct hisi_regulator_register_info register_info; - u32 off_on_delay; - u32 eco_uA; +struct hi6421v600_regulator { struct regulator_desc rdesc; struct hisi_pmic *pmic; + u8 eco_mode_mask; + u32 eco_uA; }; static DEFINE_MUTEX(enable_mutex); @@ -62,29 +52,29 @@ static DEFINE_MUTEX(enable_mutex); * microseconds after 'since'. */ -static int hisi_regulator_is_enabled(struct regulator_dev *dev) +static int hisi_regulator_is_enabled(struct regulator_dev *rdev) { u32 reg_val; - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; - reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); - pr_debug("<[%s]: ctrl_reg=0x%x,enable_state=%d>\n", - __func__, sreg->register_info.ctrl_reg, - (reg_val & sreg->register_info.enable_mask)); + reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg); + pr_debug("<[%s]: enable_reg=0x%x,enable_state=%d>\n", + __func__, rdev->desc->enable_reg, + (reg_val & rdev->desc->enable_mask)); - return ((reg_val & sreg->register_info.enable_mask) != 0); + return ((reg_val & rdev->desc->enable_mask) != 0); } -static int hisi_regulator_enable(struct regulator_dev *dev) +static int hisi_regulator_enable(struct regulator_dev *rdev) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; /* keep a distance of off_on_delay from last time disabled */ - usleep_range(sreg->off_on_delay, sreg->off_on_delay + 1000); + usleep_range(rdev->desc->off_on_delay, rdev->desc->off_on_delay + 1000); - pr_debug("<[%s]: off_on_delay=%dus>\n", __func__, sreg->off_on_delay); + pr_debug("<[%s]: off_on_delay=%dus>\n", __func__, rdev->desc->off_on_delay); /* cannot enable more than one regulator at one time */ mutex_lock(&enable_mutex); @@ -92,103 +82,103 @@ static int hisi_regulator_enable(struct regulator_dev *dev) HISI_REGS_ENA_PROTECT_TIME + 1000); /* set enable register */ - hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, - sreg->register_info.enable_mask, - sreg->register_info.enable_mask); - pr_debug("<[%s]: ctrl_reg=0x%x,enable_mask=0x%x>\n", - __func__, sreg->register_info.ctrl_reg, - sreg->register_info.enable_mask); + hisi_pmic_rmw(pmic, rdev->desc->enable_reg, + rdev->desc->enable_mask, + rdev->desc->enable_mask); + pr_debug("<[%s]: enable_reg=0x%x,enable_mask=0x%x>\n", + __func__, rdev->desc->enable_reg, + rdev->desc->enable_mask); mutex_unlock(&enable_mutex); return 0; } -static int hisi_regulator_disable(struct regulator_dev *dev) +static int hisi_regulator_disable(struct regulator_dev *rdev) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; /* set enable register to 0 */ - hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, - sreg->register_info.enable_mask, 0); + hisi_pmic_rmw(pmic, rdev->desc->enable_reg, + rdev->desc->enable_mask, 0); return 0; } -static int hisi_regulator_get_voltage(struct regulator_dev *dev) +static int hisi_regulator_get_voltage(struct regulator_dev *rdev) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 reg_val, selector; /* get voltage selector */ - reg_val = hisi_pmic_read(pmic, sreg->register_info.vset_reg); - pr_debug("<[%s]: vset_reg=0x%x>\n", - __func__, sreg->register_info.vset_reg); + reg_val = hisi_pmic_read(pmic, rdev->desc->vsel_reg); + pr_debug("<[%s]: vsel_reg=0x%x>\n", + __func__, rdev->desc->vsel_reg); - selector = (reg_val & sreg->register_info.vset_mask) >> - (ffs(sreg->register_info.vset_mask) - 1); + selector = (reg_val & rdev->desc->vsel_mask) >> + (ffs(rdev->desc->vsel_mask) - 1); - return sreg->rdesc.ops->list_voltage(dev, selector); + return rdev->desc->ops->list_voltage(rdev, selector); } -static int hisi_regulator_set_voltage(struct regulator_dev *dev, +static int hisi_regulator_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV, unsigned int *selector) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 vsel; int ret = 0; - for (vsel = 0; vsel < sreg->rdesc.n_voltages; vsel++) { - int uV = sreg->rdesc.volt_table[vsel]; + for (vsel = 0; vsel < rdev->desc->n_voltages; vsel++) { + int uV = rdev->desc->volt_table[vsel]; /* Break at the first in-range value */ if (min_uV <= uV && uV <= max_uV) break; } /* unlikely to happen. sanity test done by regulator core */ - if (unlikely(vsel == sreg->rdesc.n_voltages)) + if (unlikely(vsel == rdev->desc->n_voltages)) return -EINVAL; *selector = vsel; /* set voltage selector */ - hisi_pmic_rmw(pmic, sreg->register_info.vset_reg, - sreg->register_info.vset_mask, - vsel << (ffs(sreg->register_info.vset_mask) - 1)); + hisi_pmic_rmw(pmic, rdev->desc->vsel_reg, + rdev->desc->vsel_mask, + vsel << (ffs(rdev->desc->vsel_mask) - 1)); - pr_debug("<[%s]: vset_reg=0x%x, vset_mask=0x%x, value=0x%x>\n", + pr_debug("<[%s]: vsel_reg=0x%x, vsel_mask=0x%x, value=0x%x>\n", __func__, - sreg->register_info.vset_reg, - sreg->register_info.vset_mask, - vsel << (ffs(sreg->register_info.vset_mask) - 1)); + rdev->desc->vsel_reg, + rdev->desc->vsel_mask, + vsel << (ffs(rdev->desc->vsel_mask) - 1)); return ret; } -static unsigned int hisi_regulator_get_mode(struct regulator_dev *dev) +static unsigned int hisi_regulator_get_mode(struct regulator_dev *rdev) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 reg_val; - reg_val = hisi_pmic_read(pmic, sreg->register_info.ctrl_reg); - pr_debug("<[%s]: reg_val=%d, ctrl_reg=0x%x, eco_mode_mask=0x%x>\n", + reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg); + pr_debug("<[%s]: reg_val=%d, enable_reg=0x%x, eco_mode_mask=0x%x>\n", __func__, reg_val, - sreg->register_info.ctrl_reg, - sreg->register_info.eco_mode_mask); + rdev->desc->enable_reg, + sreg->eco_mode_mask); - if (reg_val & sreg->register_info.eco_mode_mask) + if (reg_val & sreg->eco_mode_mask) return REGULATOR_MODE_IDLE; else return REGULATOR_MODE_NORMAL; } -static int hisi_regulator_set_mode(struct regulator_dev *dev, +static int hisi_regulator_set_mode(struct regulator_dev *rdev, unsigned int mode) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 eco_mode; @@ -204,23 +194,23 @@ static int hisi_regulator_set_mode(struct regulator_dev *dev, } /* set mode */ - hisi_pmic_rmw(pmic, sreg->register_info.ctrl_reg, - sreg->register_info.eco_mode_mask, - eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); + hisi_pmic_rmw(pmic, rdev->desc->enable_reg, + sreg->eco_mode_mask, + eco_mode << (ffs(sreg->eco_mode_mask) - 1)); - pr_debug("<[%s]: ctrl_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", + pr_debug("<[%s]: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", __func__, - sreg->register_info.ctrl_reg, - sreg->register_info.eco_mode_mask, - eco_mode << (ffs(sreg->register_info.eco_mode_mask) - 1)); + rdev->desc->enable_reg, + sreg->eco_mode_mask, + eco_mode << (ffs(sreg->eco_mode_mask) - 1)); return 0; } -static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, +static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *rdev, int input_uV, int output_uV, int load_uA) { - struct hisi_regulator *sreg = rdev_get_drvdata(dev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) return REGULATOR_MODE_NORMAL; @@ -228,42 +218,43 @@ static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *dev, return REGULATOR_MODE_IDLE; } -static int hisi_dt_parse_common(struct hisi_regulator *sreg, - struct platform_device *pdev) +static int hisi_dt_parse(struct platform_device *pdev, + struct hi6421v600_regulator *sreg, + struct regulator_desc *rdesc) { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; - struct regulator_desc *rdesc = &sreg->rdesc; unsigned int register_info[3] = {0}; - int ret = 0; + unsigned int *v_table; + int ret; - /* parse .register_info.ctrl_reg */ + /* parse .register_info.enable_reg */ ret = of_property_read_u32_array(np, "hisilicon,hisi-ctrl", register_info, 3); if (ret) { dev_err(dev, "no hisilicon,hisi-ctrl property set\n"); - goto dt_parse_common_end; + return ret; } - sreg->register_info.ctrl_reg = register_info[0]; - sreg->register_info.enable_mask = register_info[1]; - sreg->register_info.eco_mode_mask = register_info[2]; + rdesc->enable_reg = register_info[0]; + rdesc->enable_mask = register_info[1]; + sreg->eco_mode_mask = register_info[2]; - /* parse .register_info.vset_reg */ + /* parse .register_info.vsel_reg */ ret = of_property_read_u32_array(np, "hisilicon,hisi-vset", register_info, 2); if (ret) { dev_err(dev, "no hisilicon,hisi-vset property set\n"); - goto dt_parse_common_end; + return ret; } - sreg->register_info.vset_reg = register_info[0]; - sreg->register_info.vset_mask = register_info[1]; + rdesc->vsel_reg = register_info[0]; + rdesc->vsel_mask = register_info[1]; /* parse .off-on-delay */ ret = of_property_read_u32(np, "hisilicon,hisi-off-on-delay-us", - &sreg->off_on_delay); + &rdesc->off_on_delay); if (ret) { dev_err(dev, "no hisilicon,hisi-off-on-delay-us property set\n"); - goto dt_parse_common_end; + return ret; } /* parse .enable_time */ @@ -271,7 +262,7 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, &rdesc->enable_time); if (ret) { dev_err(dev, "no hisilicon,hisi-enable-time-us property set\n"); - goto dt_parse_common_end; + return ret; } /* parse .eco_uA */ @@ -282,56 +273,24 @@ static int hisi_dt_parse_common(struct hisi_regulator *sreg, ret = 0; } -dt_parse_common_end: - return ret; -} + /* parse volt_table */ -static int hisi_dt_parse_ldo(struct hisi_regulator *sreg, - struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - struct device_node *np = dev->of_node; - struct regulator_desc *rdesc = &sreg->rdesc; - unsigned int *v_table; - int ret = 0; + rdesc->n_voltages = of_property_count_u32_elems(np, "hisilicon,hisi-vset-table"); - /* parse .n_voltages, and .volt_table */ - ret = of_property_read_u32(np, "hisilicon,hisi-n-voltages", - &rdesc->n_voltages); - if (ret) { - dev_err(dev, "no hisilicon,hisi-n-voltages property set\n"); - goto dt_parse_ldo_end; - } - - /* alloc space for .volt_table */ v_table = devm_kzalloc(dev, sizeof(unsigned int) * rdesc->n_voltages, GFP_KERNEL); - if (unlikely(!v_table)) { - ret = -ENOMEM; - dev_err(dev, "no memory for .volt_table\n"); - goto dt_parse_ldo_end; - } + if (unlikely(!v_table)) + return -ENOMEM; + rdesc->volt_table = v_table; ret = of_property_read_u32_array(np, "hisilicon,hisi-vset-table", v_table, rdesc->n_voltages); if (ret) { dev_err(dev, "no hisilicon,hisi-vset-table property set\n"); - goto dt_parse_ldo_end1; + return ret; } - rdesc->volt_table = v_table; - /* parse hisi regulator's dt common part */ - ret = hisi_dt_parse_common(sreg, pdev); - if (ret) { - dev_err(dev, "failure in hisi_dt_parse_common\n"); - goto dt_parse_ldo_end1; - } - - return ret; - -dt_parse_ldo_end1: -dt_parse_ldo_end: - return ret; + return 0; } static struct regulator_ops hisi_ldo_rops = { @@ -364,7 +323,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, struct device *dev = &pdev->dev; struct regulator_desc *rdesc; struct regulator_dev *rdev; - struct hisi_regulator *sreg = NULL; + struct hi6421v600_regulator *sreg = NULL; struct regulator_init_data *initdata; struct regulator_config config = { }; struct regulation_constraints *constraint; @@ -401,11 +360,10 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, if (!sreg) return -ENOMEM; - sreg->name = initdata->constraints.name; sreg->pmic = pmic; rdesc = &sreg->rdesc; - rdesc->name = sreg->name; + rdesc->name = initdata->constraints.name; rdesc->ops = &hisi_ldo_rops; rdesc->type = REGULATOR_VOLTAGE; rdesc->min_uV = initdata->constraints.min_uV; @@ -415,7 +373,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, initdata->supply_regulator = supplyname; /* parse device tree data for regulator specific */ - ret = hisi_dt_parse_ldo(sreg, pdev); + ret = hisi_dt_parse(pdev, sreg, rdesc); if (ret) { dev_err(dev, "device tree parameter parse error!\n"); goto hisi_probe_end; @@ -501,13 +459,13 @@ static int hisi_regulator_probe(struct platform_device *pdev) static int hisi_regulator_remove(struct platform_device *pdev) { struct regulator_dev *rdev = dev_get_drvdata(&pdev->dev); - struct hisi_regulator *sreg = rdev_get_drvdata(rdev); + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); regulator_unregister(rdev); /* TODO: should i worry about that? devm_kzalloc */ - if (sreg->rdesc.volt_table) - devm_kfree(&pdev->dev, (unsigned int *)sreg->rdesc.volt_table); + if (rdev->desc->volt_table) + devm_kfree(&pdev->dev, (unsigned int *)rdev->desc->volt_table); kfree(sreg); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 29/44] staging: regulator: hi6421v600-regulator: cleanup debug messages 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel - use dev_foo() instead of pr_foo(); - cleanup the messages, making them more standard and easier to understand. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 76 ++++++++++++------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 7d82d11f4b52..2d1096ecb277 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -59,9 +59,11 @@ static int hisi_regulator_is_enabled(struct regulator_dev *rdev) struct hisi_pmic *pmic = sreg->pmic; reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg); - pr_debug("<[%s]: enable_reg=0x%x,enable_state=%d>\n", + + dev_dbg(&rdev->dev, + "%s: enable_reg=0x%x, val= 0x%x, enable_state=%d\n", __func__, rdev->desc->enable_reg, - (reg_val & rdev->desc->enable_mask)); + reg_val, (reg_val & rdev->desc->enable_mask)); return ((reg_val & rdev->desc->enable_mask) != 0); } @@ -74,7 +76,8 @@ static int hisi_regulator_enable(struct regulator_dev *rdev) /* keep a distance of off_on_delay from last time disabled */ usleep_range(rdev->desc->off_on_delay, rdev->desc->off_on_delay + 1000); - pr_debug("<[%s]: off_on_delay=%dus>\n", __func__, rdev->desc->off_on_delay); + dev_dbg(&rdev->dev, "%s: off_on_delay=%d us\n", + __func__, rdev->desc->off_on_delay); /* cannot enable more than one regulator at one time */ mutex_lock(&enable_mutex); @@ -85,7 +88,7 @@ static int hisi_regulator_enable(struct regulator_dev *rdev) hisi_pmic_rmw(pmic, rdev->desc->enable_reg, rdev->desc->enable_mask, rdev->desc->enable_mask); - pr_debug("<[%s]: enable_reg=0x%x,enable_mask=0x%x>\n", + dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, enable_mask=0x%x\n", __func__, rdev->desc->enable_reg, rdev->desc->enable_mask); @@ -111,16 +114,20 @@ static int hisi_regulator_get_voltage(struct regulator_dev *rdev) struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 reg_val, selector; + int vol; /* get voltage selector */ reg_val = hisi_pmic_read(pmic, rdev->desc->vsel_reg); - pr_debug("<[%s]: vsel_reg=0x%x>\n", - __func__, rdev->desc->vsel_reg); - selector = (reg_val & rdev->desc->vsel_mask) >> (ffs(rdev->desc->vsel_mask) - 1); - return rdev->desc->ops->list_voltage(rdev, selector); + vol = rdev->desc->ops->list_voltage(rdev, selector); + + dev_dbg(&rdev->dev, + "%s: vsel_reg=0x%x, val=0x%x, entry=0x%x, voltage=%d mV\n", + __func__, rdev->desc->vsel_reg, reg_val, selector, vol/ 1000); + + return vol; } static int hisi_regulator_set_voltage(struct regulator_dev *rdev, @@ -129,10 +136,14 @@ static int hisi_regulator_set_voltage(struct regulator_dev *rdev, struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 vsel; - int ret = 0; + int uV, ret = 0; for (vsel = 0; vsel < rdev->desc->n_voltages; vsel++) { - int uV = rdev->desc->volt_table[vsel]; + uV = rdev->desc->volt_table[vsel]; + dev_dbg(&rdev->dev, + "%s: min %d, max %d, value[%u] = %d\n", + __func__, min_uV, max_uV, vsel, uV); + /* Break at the first in-range value */ if (min_uV <= uV && uV <= max_uV) break; @@ -146,13 +157,14 @@ static int hisi_regulator_set_voltage(struct regulator_dev *rdev, /* set voltage selector */ hisi_pmic_rmw(pmic, rdev->desc->vsel_reg, rdev->desc->vsel_mask, - vsel << (ffs(rdev->desc->vsel_mask) - 1)); + vsel << (ffs(rdev->desc->vsel_mask) - 1)); - pr_debug("<[%s]: vsel_reg=0x%x, vsel_mask=0x%x, value=0x%x>\n", + dev_dbg(&rdev->dev, + "%s: vsel_reg=0x%x, vsel_mask=0x%x, value=0x%x, voltage=%d mV\n", __func__, rdev->desc->vsel_reg, rdev->desc->vsel_mask, - vsel << (ffs(rdev->desc->vsel_mask) - 1)); + vsel << (ffs(rdev->desc->vsel_mask) - 1), uV / 1000); return ret; } @@ -162,17 +174,21 @@ static unsigned int hisi_regulator_get_mode(struct regulator_dev *rdev) struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 reg_val; + unsigned int mode; reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg); - pr_debug("<[%s]: reg_val=%d, enable_reg=0x%x, eco_mode_mask=0x%x>\n", - __func__, reg_val, - rdev->desc->enable_reg, - sreg->eco_mode_mask); if (reg_val & sreg->eco_mode_mask) - return REGULATOR_MODE_IDLE; + mode = REGULATOR_MODE_IDLE; else - return REGULATOR_MODE_NORMAL; + mode = REGULATOR_MODE_NORMAL; + + dev_dbg(&rdev->dev, + "%s: enable_reg=0x%x, eco_mode_mask=0x%x, reg_val=0x%x, %s mode\n", + __func__, rdev->desc->enable_reg, sreg->eco_mode_mask, reg_val, + mode == REGULATOR_MODE_IDLE ? "idle" : "normal"); + + return mode; } static int hisi_regulator_set_mode(struct regulator_dev *rdev, @@ -198,7 +214,8 @@ static int hisi_regulator_set_mode(struct regulator_dev *rdev, sreg->eco_mode_mask, eco_mode << (ffs(sreg->eco_mode_mask) - 1)); - pr_debug("<[%s]: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", + dev_dbg(&rdev->dev, + "%s: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x\n", __func__, rdev->desc->enable_reg, sreg->eco_mode_mask, @@ -212,10 +229,13 @@ static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *rdev, { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) + if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { + dev_dbg(&rdev->dev, "%s: normal mode", __func__); return REGULATOR_MODE_NORMAL; - else + } else { + dev_dbg(&rdev->dev, "%s: idle mode", __func__); return REGULATOR_MODE_IDLE; + } } static int hisi_dt_parse(struct platform_device *pdev, @@ -333,7 +353,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, initdata = of_get_regulator_init_data(dev, np, NULL); if (!initdata) { - pr_err("get regulator init data error !\n"); + dev_err(dev, "failed to get regulator data\n"); return -EINVAL; } @@ -343,14 +363,14 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, ret = of_property_read_u32_array(np, "hisilicon,valid-modes-mask", &constraint->valid_modes_mask, 1); if (ret) { - pr_err("no hisilicon,valid-modes-mask property set\n"); + dev_err(dev, "no valid modes mask\n"); ret = -ENODEV; return ret; } ret = of_property_read_u32_array(np, "hisilicon,valid-idle-mask", &temp_modes, 1); if (ret) { - pr_err("no hisilicon,valid-modes-mask property set\n"); + dev_err(dev, "no valid idle mask\n"); ret = -ENODEV; return ret; } @@ -374,10 +394,8 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, /* parse device tree data for regulator specific */ ret = hisi_dt_parse(pdev, sreg, rdesc); - if (ret) { - dev_err(dev, "device tree parameter parse error!\n"); + if (ret) goto hisi_probe_end; - } config.dev = &pdev->dev; config.init_data = initdata; @@ -393,7 +411,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, goto hisi_probe_end; } - pr_debug("[%s]:valid_modes_mask[0x%x], valid_ops_mask[0x%x]\n", + dev_dbg(dev, "%s:valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", rdesc->name, constraint->valid_modes_mask, constraint->valid_ops_mask); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 29/44] staging: regulator: hi6421v600-regulator: cleanup debug messages @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab - use dev_foo() instead of pr_foo(); - cleanup the messages, making them more standard and easier to understand. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 76 ++++++++++++------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 7d82d11f4b52..2d1096ecb277 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -59,9 +59,11 @@ static int hisi_regulator_is_enabled(struct regulator_dev *rdev) struct hisi_pmic *pmic = sreg->pmic; reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg); - pr_debug("<[%s]: enable_reg=0x%x,enable_state=%d>\n", + + dev_dbg(&rdev->dev, + "%s: enable_reg=0x%x, val= 0x%x, enable_state=%d\n", __func__, rdev->desc->enable_reg, - (reg_val & rdev->desc->enable_mask)); + reg_val, (reg_val & rdev->desc->enable_mask)); return ((reg_val & rdev->desc->enable_mask) != 0); } @@ -74,7 +76,8 @@ static int hisi_regulator_enable(struct regulator_dev *rdev) /* keep a distance of off_on_delay from last time disabled */ usleep_range(rdev->desc->off_on_delay, rdev->desc->off_on_delay + 1000); - pr_debug("<[%s]: off_on_delay=%dus>\n", __func__, rdev->desc->off_on_delay); + dev_dbg(&rdev->dev, "%s: off_on_delay=%d us\n", + __func__, rdev->desc->off_on_delay); /* cannot enable more than one regulator at one time */ mutex_lock(&enable_mutex); @@ -85,7 +88,7 @@ static int hisi_regulator_enable(struct regulator_dev *rdev) hisi_pmic_rmw(pmic, rdev->desc->enable_reg, rdev->desc->enable_mask, rdev->desc->enable_mask); - pr_debug("<[%s]: enable_reg=0x%x,enable_mask=0x%x>\n", + dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, enable_mask=0x%x\n", __func__, rdev->desc->enable_reg, rdev->desc->enable_mask); @@ -111,16 +114,20 @@ static int hisi_regulator_get_voltage(struct regulator_dev *rdev) struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 reg_val, selector; + int vol; /* get voltage selector */ reg_val = hisi_pmic_read(pmic, rdev->desc->vsel_reg); - pr_debug("<[%s]: vsel_reg=0x%x>\n", - __func__, rdev->desc->vsel_reg); - selector = (reg_val & rdev->desc->vsel_mask) >> (ffs(rdev->desc->vsel_mask) - 1); - return rdev->desc->ops->list_voltage(rdev, selector); + vol = rdev->desc->ops->list_voltage(rdev, selector); + + dev_dbg(&rdev->dev, + "%s: vsel_reg=0x%x, val=0x%x, entry=0x%x, voltage=%d mV\n", + __func__, rdev->desc->vsel_reg, reg_val, selector, vol/ 1000); + + return vol; } static int hisi_regulator_set_voltage(struct regulator_dev *rdev, @@ -129,10 +136,14 @@ static int hisi_regulator_set_voltage(struct regulator_dev *rdev, struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 vsel; - int ret = 0; + int uV, ret = 0; for (vsel = 0; vsel < rdev->desc->n_voltages; vsel++) { - int uV = rdev->desc->volt_table[vsel]; + uV = rdev->desc->volt_table[vsel]; + dev_dbg(&rdev->dev, + "%s: min %d, max %d, value[%u] = %d\n", + __func__, min_uV, max_uV, vsel, uV); + /* Break at the first in-range value */ if (min_uV <= uV && uV <= max_uV) break; @@ -146,13 +157,14 @@ static int hisi_regulator_set_voltage(struct regulator_dev *rdev, /* set voltage selector */ hisi_pmic_rmw(pmic, rdev->desc->vsel_reg, rdev->desc->vsel_mask, - vsel << (ffs(rdev->desc->vsel_mask) - 1)); + vsel << (ffs(rdev->desc->vsel_mask) - 1)); - pr_debug("<[%s]: vsel_reg=0x%x, vsel_mask=0x%x, value=0x%x>\n", + dev_dbg(&rdev->dev, + "%s: vsel_reg=0x%x, vsel_mask=0x%x, value=0x%x, voltage=%d mV\n", __func__, rdev->desc->vsel_reg, rdev->desc->vsel_mask, - vsel << (ffs(rdev->desc->vsel_mask) - 1)); + vsel << (ffs(rdev->desc->vsel_mask) - 1), uV / 1000); return ret; } @@ -162,17 +174,21 @@ static unsigned int hisi_regulator_get_mode(struct regulator_dev *rdev) struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; u32 reg_val; + unsigned int mode; reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg); - pr_debug("<[%s]: reg_val=%d, enable_reg=0x%x, eco_mode_mask=0x%x>\n", - __func__, reg_val, - rdev->desc->enable_reg, - sreg->eco_mode_mask); if (reg_val & sreg->eco_mode_mask) - return REGULATOR_MODE_IDLE; + mode = REGULATOR_MODE_IDLE; else - return REGULATOR_MODE_NORMAL; + mode = REGULATOR_MODE_NORMAL; + + dev_dbg(&rdev->dev, + "%s: enable_reg=0x%x, eco_mode_mask=0x%x, reg_val=0x%x, %s mode\n", + __func__, rdev->desc->enable_reg, sreg->eco_mode_mask, reg_val, + mode == REGULATOR_MODE_IDLE ? "idle" : "normal"); + + return mode; } static int hisi_regulator_set_mode(struct regulator_dev *rdev, @@ -198,7 +214,8 @@ static int hisi_regulator_set_mode(struct regulator_dev *rdev, sreg->eco_mode_mask, eco_mode << (ffs(sreg->eco_mode_mask) - 1)); - pr_debug("<[%s]: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x>\n", + dev_dbg(&rdev->dev, + "%s: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x\n", __func__, rdev->desc->enable_reg, sreg->eco_mode_mask, @@ -212,10 +229,13 @@ static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *rdev, { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) + if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { + dev_dbg(&rdev->dev, "%s: normal mode", __func__); return REGULATOR_MODE_NORMAL; - else + } else { + dev_dbg(&rdev->dev, "%s: idle mode", __func__); return REGULATOR_MODE_IDLE; + } } static int hisi_dt_parse(struct platform_device *pdev, @@ -333,7 +353,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, initdata = of_get_regulator_init_data(dev, np, NULL); if (!initdata) { - pr_err("get regulator init data error !\n"); + dev_err(dev, "failed to get regulator data\n"); return -EINVAL; } @@ -343,14 +363,14 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, ret = of_property_read_u32_array(np, "hisilicon,valid-modes-mask", &constraint->valid_modes_mask, 1); if (ret) { - pr_err("no hisilicon,valid-modes-mask property set\n"); + dev_err(dev, "no valid modes mask\n"); ret = -ENODEV; return ret; } ret = of_property_read_u32_array(np, "hisilicon,valid-idle-mask", &temp_modes, 1); if (ret) { - pr_err("no hisilicon,valid-modes-mask property set\n"); + dev_err(dev, "no valid idle mask\n"); ret = -ENODEV; return ret; } @@ -374,10 +394,8 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, /* parse device tree data for regulator specific */ ret = hisi_dt_parse(pdev, sreg, rdesc); - if (ret) { - dev_err(dev, "device tree parameter parse error!\n"); + if (ret) goto hisi_probe_end; - } config.dev = &pdev->dev; config.init_data = initdata; @@ -393,7 +411,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, goto hisi_probe_end; } - pr_debug("[%s]:valid_modes_mask[0x%x], valid_ops_mask[0x%x]\n", + dev_dbg(dev, "%s:valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", rdesc->name, constraint->valid_modes_mask, constraint->valid_ops_mask); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 30/44] staging: regulator: hi6421v600-regulator: use shorter names for OF properties 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Simplify the names of the OF properties, in order to make them similar to other drivers and to make easier to understand what each property means. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 52 ++++++++----------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 2d1096ecb277..e4a64893a7ad 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -196,14 +196,14 @@ static int hisi_regulator_set_mode(struct regulator_dev *rdev, { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; - u32 eco_mode; + u32 val; switch (mode) { case REGULATOR_MODE_NORMAL: - eco_mode = HISI_ECO_MODE_DISABLE; + val = 0; break; case REGULATOR_MODE_IDLE: - eco_mode = HISI_ECO_MODE_ENABLE; + val = sreg->eco_mode_mask << (ffs(sreg->eco_mode_mask) - 1); break; default: return -EINVAL; @@ -211,15 +211,12 @@ static int hisi_regulator_set_mode(struct regulator_dev *rdev, /* set mode */ hisi_pmic_rmw(pmic, rdev->desc->enable_reg, - sreg->eco_mode_mask, - eco_mode << (ffs(sreg->eco_mode_mask) - 1)); + sreg->eco_mode_mask, val); dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x\n", - __func__, - rdev->desc->enable_reg, - sreg->eco_mode_mask, - eco_mode << (ffs(sreg->eco_mode_mask) - 1)); + __func__, rdev->desc->enable_reg, sreg->eco_mode_mask, val); + return 0; } @@ -249,10 +246,10 @@ static int hisi_dt_parse(struct platform_device *pdev, int ret; /* parse .register_info.enable_reg */ - ret = of_property_read_u32_array(np, "hisilicon,hisi-ctrl", + ret = of_property_read_u32_array(np, "hi6421-ctrl", register_info, 3); if (ret) { - dev_err(dev, "no hisilicon,hisi-ctrl property set\n"); + dev_err(dev, "no hi6421-ctrl property set\n"); return ret; } rdesc->enable_reg = register_info[0]; @@ -260,33 +257,33 @@ static int hisi_dt_parse(struct platform_device *pdev, sreg->eco_mode_mask = register_info[2]; /* parse .register_info.vsel_reg */ - ret = of_property_read_u32_array(np, "hisilicon,hisi-vset", + ret = of_property_read_u32_array(np, "hi6421-vsel", register_info, 2); if (ret) { - dev_err(dev, "no hisilicon,hisi-vset property set\n"); + dev_err(dev, "no hi6421-vsel property set\n"); return ret; } rdesc->vsel_reg = register_info[0]; rdesc->vsel_mask = register_info[1]; /* parse .off-on-delay */ - ret = of_property_read_u32(np, "hisilicon,hisi-off-on-delay-us", + ret = of_property_read_u32(np, "off-on-delay-us", &rdesc->off_on_delay); if (ret) { - dev_err(dev, "no hisilicon,hisi-off-on-delay-us property set\n"); + dev_err(dev, "no off-on-delay-us property set\n"); return ret; } /* parse .enable_time */ - ret = of_property_read_u32(np, "hisilicon,hisi-enable-time-us", + ret = of_property_read_u32(np, "startup-delay-us", &rdesc->enable_time); if (ret) { - dev_err(dev, "no hisilicon,hisi-enable-time-us property set\n"); + dev_err(dev, "no startup-delay-us property set\n"); return ret; } /* parse .eco_uA */ - ret = of_property_read_u32(np, "hisilicon,hisi-eco-microamp", + ret = of_property_read_u32(np, "eco-microamp", &sreg->eco_uA); if (ret) { sreg->eco_uA = 0; @@ -295,7 +292,7 @@ static int hisi_dt_parse(struct platform_device *pdev, /* parse volt_table */ - rdesc->n_voltages = of_property_count_u32_elems(np, "hisilicon,hisi-vset-table"); + rdesc->n_voltages = of_property_count_u32_elems(np, "voltage-table"); v_table = devm_kzalloc(dev, sizeof(unsigned int) * rdesc->n_voltages, GFP_KERNEL); @@ -303,10 +300,10 @@ static int hisi_dt_parse(struct platform_device *pdev, return -ENOMEM; rdesc->volt_table = v_table; - ret = of_property_read_u32_array(np, "hisilicon,hisi-vset-table", + ret = of_property_read_u32_array(np, "voltage-table", v_table, rdesc->n_voltages); if (ret) { - dev_err(dev, "no hisilicon,hisi-vset-table property set\n"); + dev_err(dev, "no voltage-table property set\n"); return ret; } @@ -329,13 +326,6 @@ static struct regulator_ops hisi_ldo_rops = { * Used only for parsing the DT properties */ -static const struct of_device_id of_hisi_pmic_match_tbl[] = { - { - .compatible = "hisilicon,hi6421-spmi-pmic-ldo", - }, - { } -}; - static int hisi_regulator_probe_ldo(struct platform_device *pdev, struct device_node *np, struct hisi_pmic *pmic) @@ -360,14 +350,14 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, /* hisi regulator supports two modes */ constraint = &initdata->constraints; - ret = of_property_read_u32_array(np, "hisilicon,valid-modes-mask", + ret = of_property_read_u32_array(np, "valid-modes-mask", &constraint->valid_modes_mask, 1); if (ret) { dev_err(dev, "no valid modes mask\n"); ret = -ENODEV; return ret; } - ret = of_property_read_u32_array(np, "hisilicon,valid-idle-mask", + ret = of_property_read_u32_array(np, "valid-idle-mask", &temp_modes, 1); if (ret) { dev_err(dev, "no valid idle mask\n"); @@ -388,7 +378,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, rdesc->type = REGULATOR_VOLTAGE; rdesc->min_uV = initdata->constraints.min_uV; - supplyname = of_get_property(np, "hisilicon,supply_name", NULL); + supplyname = of_get_property(np, "supply_name", NULL); if (supplyname) initdata->supply_regulator = supplyname; -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 30/44] staging: regulator: hi6421v600-regulator: use shorter names for OF properties @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Simplify the names of the OF properties, in order to make them similar to other drivers and to make easier to understand what each property means. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 52 ++++++++----------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 2d1096ecb277..e4a64893a7ad 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -196,14 +196,14 @@ static int hisi_regulator_set_mode(struct regulator_dev *rdev, { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hisi_pmic *pmic = sreg->pmic; - u32 eco_mode; + u32 val; switch (mode) { case REGULATOR_MODE_NORMAL: - eco_mode = HISI_ECO_MODE_DISABLE; + val = 0; break; case REGULATOR_MODE_IDLE: - eco_mode = HISI_ECO_MODE_ENABLE; + val = sreg->eco_mode_mask << (ffs(sreg->eco_mode_mask) - 1); break; default: return -EINVAL; @@ -211,15 +211,12 @@ static int hisi_regulator_set_mode(struct regulator_dev *rdev, /* set mode */ hisi_pmic_rmw(pmic, rdev->desc->enable_reg, - sreg->eco_mode_mask, - eco_mode << (ffs(sreg->eco_mode_mask) - 1)); + sreg->eco_mode_mask, val); dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x\n", - __func__, - rdev->desc->enable_reg, - sreg->eco_mode_mask, - eco_mode << (ffs(sreg->eco_mode_mask) - 1)); + __func__, rdev->desc->enable_reg, sreg->eco_mode_mask, val); + return 0; } @@ -249,10 +246,10 @@ static int hisi_dt_parse(struct platform_device *pdev, int ret; /* parse .register_info.enable_reg */ - ret = of_property_read_u32_array(np, "hisilicon,hisi-ctrl", + ret = of_property_read_u32_array(np, "hi6421-ctrl", register_info, 3); if (ret) { - dev_err(dev, "no hisilicon,hisi-ctrl property set\n"); + dev_err(dev, "no hi6421-ctrl property set\n"); return ret; } rdesc->enable_reg = register_info[0]; @@ -260,33 +257,33 @@ static int hisi_dt_parse(struct platform_device *pdev, sreg->eco_mode_mask = register_info[2]; /* parse .register_info.vsel_reg */ - ret = of_property_read_u32_array(np, "hisilicon,hisi-vset", + ret = of_property_read_u32_array(np, "hi6421-vsel", register_info, 2); if (ret) { - dev_err(dev, "no hisilicon,hisi-vset property set\n"); + dev_err(dev, "no hi6421-vsel property set\n"); return ret; } rdesc->vsel_reg = register_info[0]; rdesc->vsel_mask = register_info[1]; /* parse .off-on-delay */ - ret = of_property_read_u32(np, "hisilicon,hisi-off-on-delay-us", + ret = of_property_read_u32(np, "off-on-delay-us", &rdesc->off_on_delay); if (ret) { - dev_err(dev, "no hisilicon,hisi-off-on-delay-us property set\n"); + dev_err(dev, "no off-on-delay-us property set\n"); return ret; } /* parse .enable_time */ - ret = of_property_read_u32(np, "hisilicon,hisi-enable-time-us", + ret = of_property_read_u32(np, "startup-delay-us", &rdesc->enable_time); if (ret) { - dev_err(dev, "no hisilicon,hisi-enable-time-us property set\n"); + dev_err(dev, "no startup-delay-us property set\n"); return ret; } /* parse .eco_uA */ - ret = of_property_read_u32(np, "hisilicon,hisi-eco-microamp", + ret = of_property_read_u32(np, "eco-microamp", &sreg->eco_uA); if (ret) { sreg->eco_uA = 0; @@ -295,7 +292,7 @@ static int hisi_dt_parse(struct platform_device *pdev, /* parse volt_table */ - rdesc->n_voltages = of_property_count_u32_elems(np, "hisilicon,hisi-vset-table"); + rdesc->n_voltages = of_property_count_u32_elems(np, "voltage-table"); v_table = devm_kzalloc(dev, sizeof(unsigned int) * rdesc->n_voltages, GFP_KERNEL); @@ -303,10 +300,10 @@ static int hisi_dt_parse(struct platform_device *pdev, return -ENOMEM; rdesc->volt_table = v_table; - ret = of_property_read_u32_array(np, "hisilicon,hisi-vset-table", + ret = of_property_read_u32_array(np, "voltage-table", v_table, rdesc->n_voltages); if (ret) { - dev_err(dev, "no hisilicon,hisi-vset-table property set\n"); + dev_err(dev, "no voltage-table property set\n"); return ret; } @@ -329,13 +326,6 @@ static struct regulator_ops hisi_ldo_rops = { * Used only for parsing the DT properties */ -static const struct of_device_id of_hisi_pmic_match_tbl[] = { - { - .compatible = "hisilicon,hi6421-spmi-pmic-ldo", - }, - { } -}; - static int hisi_regulator_probe_ldo(struct platform_device *pdev, struct device_node *np, struct hisi_pmic *pmic) @@ -360,14 +350,14 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, /* hisi regulator supports two modes */ constraint = &initdata->constraints; - ret = of_property_read_u32_array(np, "hisilicon,valid-modes-mask", + ret = of_property_read_u32_array(np, "valid-modes-mask", &constraint->valid_modes_mask, 1); if (ret) { dev_err(dev, "no valid modes mask\n"); ret = -ENODEV; return ret; } - ret = of_property_read_u32_array(np, "hisilicon,valid-idle-mask", + ret = of_property_read_u32_array(np, "valid-idle-mask", &temp_modes, 1); if (ret) { dev_err(dev, "no valid idle mask\n"); @@ -388,7 +378,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, rdesc->type = REGULATOR_VOLTAGE; rdesc->min_uV = initdata->constraints.min_uV; - supplyname = of_get_property(np, "hisilicon,supply_name", NULL); + supplyname = of_get_property(np, "supply_name", NULL); if (supplyname) initdata->supply_regulator = supplyname; -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 31/44] staging: regulator: hi6421v600-regulator: better handle modes 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Instead of implementing a custom set of properties, set valid_modes_mask based on having or not a mask for enabling the eco_mode. This makes the code clearer, and remove some uneeded props from DT. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index e4a64893a7ad..bde7fa4d7e8f 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -338,7 +338,6 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, struct regulator_config config = { }; struct regulation_constraints *constraint; const char *supplyname = NULL; - unsigned int temp_modes; int ret = 0; initdata = of_get_regulator_init_data(dev, np, NULL); @@ -347,25 +346,6 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, return -EINVAL; } - /* hisi regulator supports two modes */ - constraint = &initdata->constraints; - - ret = of_property_read_u32_array(np, "valid-modes-mask", - &constraint->valid_modes_mask, 1); - if (ret) { - dev_err(dev, "no valid modes mask\n"); - ret = -ENODEV; - return ret; - } - ret = of_property_read_u32_array(np, "valid-idle-mask", - &temp_modes, 1); - if (ret) { - dev_err(dev, "no valid idle mask\n"); - ret = -ENODEV; - return ret; - } - constraint->valid_ops_mask |= temp_modes; - sreg = kzalloc(sizeof(*sreg), GFP_KERNEL); if (!sreg) return -ENOMEM; @@ -387,6 +367,15 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, if (ret) goto hisi_probe_end; + /* hisi regulator supports two modes */ + constraint = &initdata->constraints; + + constraint->valid_modes_mask = REGULATOR_MODE_NORMAL; + if (sreg->eco_mode_mask) { + constraint->valid_modes_mask |= REGULATOR_MODE_IDLE; + constraint->valid_ops_mask |= REGULATOR_CHANGE_MODE; + } + config.dev = &pdev->dev; config.init_data = initdata; config.driver_data = sreg; @@ -401,8 +390,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, goto hisi_probe_end; } - dev_dbg(dev, "%s:valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", - rdesc->name, + dev_dbg(dev, "valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", constraint->valid_modes_mask, constraint->valid_ops_mask); dev_set_drvdata(dev, rdev); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 31/44] staging: regulator: hi6421v600-regulator: better handle modes @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Instead of implementing a custom set of properties, set valid_modes_mask based on having or not a mask for enabling the eco_mode. This makes the code clearer, and remove some uneeded props from DT. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index e4a64893a7ad..bde7fa4d7e8f 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -338,7 +338,6 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, struct regulator_config config = { }; struct regulation_constraints *constraint; const char *supplyname = NULL; - unsigned int temp_modes; int ret = 0; initdata = of_get_regulator_init_data(dev, np, NULL); @@ -347,25 +346,6 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, return -EINVAL; } - /* hisi regulator supports two modes */ - constraint = &initdata->constraints; - - ret = of_property_read_u32_array(np, "valid-modes-mask", - &constraint->valid_modes_mask, 1); - if (ret) { - dev_err(dev, "no valid modes mask\n"); - ret = -ENODEV; - return ret; - } - ret = of_property_read_u32_array(np, "valid-idle-mask", - &temp_modes, 1); - if (ret) { - dev_err(dev, "no valid idle mask\n"); - ret = -ENODEV; - return ret; - } - constraint->valid_ops_mask |= temp_modes; - sreg = kzalloc(sizeof(*sreg), GFP_KERNEL); if (!sreg) return -ENOMEM; @@ -387,6 +367,15 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, if (ret) goto hisi_probe_end; + /* hisi regulator supports two modes */ + constraint = &initdata->constraints; + + constraint->valid_modes_mask = REGULATOR_MODE_NORMAL; + if (sreg->eco_mode_mask) { + constraint->valid_modes_mask |= REGULATOR_MODE_IDLE; + constraint->valid_ops_mask |= REGULATOR_CHANGE_MODE; + } + config.dev = &pdev->dev; config.init_data = initdata; config.driver_data = sreg; @@ -401,8 +390,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, goto hisi_probe_end; } - dev_dbg(dev, "%s:valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", - rdesc->name, + dev_dbg(dev, "valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", constraint->valid_modes_mask, constraint->valid_ops_mask); dev_set_drvdata(dev, rdev); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 32/44] staging: regulator: hi6421v600-regulator: change namespace 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Rename the functions used internally inside the driver in order for them to follow the driver's name. While here, get rid of some unused definitions at the header file. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index bde7fa4d7e8f..f77ecea78597 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -41,7 +41,7 @@ struct hi6421v600_regulator { struct regulator_desc rdesc; - struct hisi_pmic *pmic; + struct hi6421_spmi_pmic *pmic; u8 eco_mode_mask; u32 eco_uA; }; @@ -52,13 +52,13 @@ static DEFINE_MUTEX(enable_mutex); * microseconds after 'since'. */ -static int hisi_regulator_is_enabled(struct regulator_dev *rdev) +static int hi6421_spmi_regulator_is_enabled(struct regulator_dev *rdev) { u32 reg_val; struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; - reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg); + reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->enable_reg); dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, val= 0x%x, enable_state=%d\n", @@ -68,10 +68,10 @@ static int hisi_regulator_is_enabled(struct regulator_dev *rdev) return ((reg_val & rdev->desc->enable_mask) != 0); } -static int hisi_regulator_enable(struct regulator_dev *rdev) +static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; /* keep a distance of off_on_delay from last time disabled */ usleep_range(rdev->desc->off_on_delay, rdev->desc->off_on_delay + 1000); @@ -85,7 +85,7 @@ static int hisi_regulator_enable(struct regulator_dev *rdev) HISI_REGS_ENA_PROTECT_TIME + 1000); /* set enable register */ - hisi_pmic_rmw(pmic, rdev->desc->enable_reg, + hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, rdev->desc->enable_mask, rdev->desc->enable_mask); dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, enable_mask=0x%x\n", @@ -97,27 +97,27 @@ static int hisi_regulator_enable(struct regulator_dev *rdev) return 0; } -static int hisi_regulator_disable(struct regulator_dev *rdev) +static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; /* set enable register to 0 */ - hisi_pmic_rmw(pmic, rdev->desc->enable_reg, + hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, rdev->desc->enable_mask, 0); return 0; } -static int hisi_regulator_get_voltage(struct regulator_dev *rdev) +static int hi6421_spmi_regulator_get_voltage(struct regulator_dev *rdev) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; u32 reg_val, selector; int vol; /* get voltage selector */ - reg_val = hisi_pmic_read(pmic, rdev->desc->vsel_reg); + reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->vsel_reg); selector = (reg_val & rdev->desc->vsel_mask) >> (ffs(rdev->desc->vsel_mask) - 1); @@ -130,11 +130,11 @@ static int hisi_regulator_get_voltage(struct regulator_dev *rdev) return vol; } -static int hisi_regulator_set_voltage(struct regulator_dev *rdev, +static int hi6421_spmi_regulator_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV, unsigned int *selector) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; u32 vsel; int uV, ret = 0; @@ -155,7 +155,7 @@ static int hisi_regulator_set_voltage(struct regulator_dev *rdev, *selector = vsel; /* set voltage selector */ - hisi_pmic_rmw(pmic, rdev->desc->vsel_reg, + hi6421_spmi_pmic_rmw(pmic, rdev->desc->vsel_reg, rdev->desc->vsel_mask, vsel << (ffs(rdev->desc->vsel_mask) - 1)); @@ -169,14 +169,14 @@ static int hisi_regulator_set_voltage(struct regulator_dev *rdev, return ret; } -static unsigned int hisi_regulator_get_mode(struct regulator_dev *rdev) +static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; u32 reg_val; unsigned int mode; - reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg); + reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->enable_reg); if (reg_val & sreg->eco_mode_mask) mode = REGULATOR_MODE_IDLE; @@ -191,11 +191,11 @@ static unsigned int hisi_regulator_get_mode(struct regulator_dev *rdev) return mode; } -static int hisi_regulator_set_mode(struct regulator_dev *rdev, +static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev, unsigned int mode) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; u32 val; switch (mode) { @@ -210,8 +210,8 @@ static int hisi_regulator_set_mode(struct regulator_dev *rdev, } /* set mode */ - hisi_pmic_rmw(pmic, rdev->desc->enable_reg, - sreg->eco_mode_mask, val); + hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, + sreg->eco_mode_mask, val); dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x\n", @@ -220,7 +220,7 @@ static int hisi_regulator_set_mode(struct regulator_dev *rdev, return 0; } -static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *rdev, +static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev, int input_uV, int output_uV, int load_uA) { @@ -235,7 +235,7 @@ static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *rdev, } } -static int hisi_dt_parse(struct platform_device *pdev, +static int hi6421_spmi_dt_parse(struct platform_device *pdev, struct hi6421v600_regulator *sreg, struct regulator_desc *rdesc) { @@ -310,25 +310,25 @@ static int hisi_dt_parse(struct platform_device *pdev, return 0; } -static struct regulator_ops hisi_ldo_rops = { - .is_enabled = hisi_regulator_is_enabled, - .enable = hisi_regulator_enable, - .disable = hisi_regulator_disable, +static struct regulator_ops hi6421_spmi_ldo_rops = { + .is_enabled = hi6421_spmi_regulator_is_enabled, + .enable = hi6421_spmi_regulator_enable, + .disable = hi6421_spmi_regulator_disable, .list_voltage = regulator_list_voltage_table, - .get_voltage = hisi_regulator_get_voltage, - .set_voltage = hisi_regulator_set_voltage, - .get_mode = hisi_regulator_get_mode, - .set_mode = hisi_regulator_set_mode, - .get_optimum_mode = hisi_regulator_get_optimum_mode, + .get_voltage = hi6421_spmi_regulator_get_voltage, + .set_voltage = hi6421_spmi_regulator_set_voltage, + .get_mode = hi6421_spmi_regulator_get_mode, + .set_mode = hi6421_spmi_regulator_set_mode, + .get_optimum_mode = hi6421_spmi_regulator_get_optimum_mode, }; /* * Used only for parsing the DT properties */ -static int hisi_regulator_probe_ldo(struct platform_device *pdev, +static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, struct device_node *np, - struct hisi_pmic *pmic) + struct hi6421_spmi_pmic *pmic) { struct device *dev = &pdev->dev; struct regulator_desc *rdesc; @@ -354,7 +354,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, rdesc = &sreg->rdesc; rdesc->name = initdata->constraints.name; - rdesc->ops = &hisi_ldo_rops; + rdesc->ops = &hi6421_spmi_ldo_rops; rdesc->type = REGULATOR_VOLTAGE; rdesc->min_uV = initdata->constraints.min_uV; @@ -363,9 +363,9 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, initdata->supply_regulator = supplyname; /* parse device tree data for regulator specific */ - ret = hisi_dt_parse(pdev, sreg, rdesc); + ret = hi6421_spmi_dt_parse(pdev, sreg, rdesc); if (ret) - goto hisi_probe_end; + goto probe_end; /* hisi regulator supports two modes */ constraint = &initdata->constraints; @@ -387,27 +387,27 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, dev_err(dev, "failed to register %s\n", rdesc->name); ret = PTR_ERR(rdev); - goto hisi_probe_end; + goto probe_end; } dev_dbg(dev, "valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", constraint->valid_modes_mask, constraint->valid_ops_mask); dev_set_drvdata(dev, rdev); -hisi_probe_end: +probe_end: if (ret) kfree(sreg); return ret; } -static int hisi_regulator_probe(struct platform_device *pdev) +static int hi6421_spmi_regulator_probe(struct platform_device *pdev) { struct device *pmic_dev = pdev->dev.parent; struct device_node *np = pmic_dev->of_node; struct device_node *regulators, *child; struct platform_device *new_pdev; - struct hisi_pmic *pmic; + struct hi6421_spmi_pmic *pmic; int ret; dev_dbg(&pdev->dev, "probing hi6421v600 regulator\n"); @@ -442,7 +442,7 @@ static int hisi_regulator_probe(struct platform_device *pdev) continue; } - ret = hisi_regulator_probe_ldo(new_pdev, child, pmic); + ret = hi6421_spmi_regulator_probe_ldo(new_pdev, child, pmic); if (ret < 0) platform_device_put(new_pdev); } @@ -452,7 +452,7 @@ static int hisi_regulator_probe(struct platform_device *pdev) return 0; } -static int hisi_regulator_remove(struct platform_device *pdev) +static int hi6421_spmi_regulator_remove(struct platform_device *pdev) { struct regulator_dev *rdev = dev_get_drvdata(&pdev->dev); struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); @@ -479,8 +479,8 @@ static struct platform_driver hi6421v600_regulator_driver = { .driver = { .name = "hi6421v600-regulator", }, - .probe = hisi_regulator_probe, - .remove = hisi_regulator_remove, + .probe = hi6421_spmi_regulator_probe, + .remove = hi6421_spmi_regulator_remove, }; module_platform_driver(hi6421v600_regulator_driver); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 32/44] staging: regulator: hi6421v600-regulator: change namespace @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Rename the functions used internally inside the driver in order for them to follow the driver's name. While here, get rid of some unused definitions at the header file. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index bde7fa4d7e8f..f77ecea78597 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -41,7 +41,7 @@ struct hi6421v600_regulator { struct regulator_desc rdesc; - struct hisi_pmic *pmic; + struct hi6421_spmi_pmic *pmic; u8 eco_mode_mask; u32 eco_uA; }; @@ -52,13 +52,13 @@ static DEFINE_MUTEX(enable_mutex); * microseconds after 'since'. */ -static int hisi_regulator_is_enabled(struct regulator_dev *rdev) +static int hi6421_spmi_regulator_is_enabled(struct regulator_dev *rdev) { u32 reg_val; struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; - reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg); + reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->enable_reg); dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, val= 0x%x, enable_state=%d\n", @@ -68,10 +68,10 @@ static int hisi_regulator_is_enabled(struct regulator_dev *rdev) return ((reg_val & rdev->desc->enable_mask) != 0); } -static int hisi_regulator_enable(struct regulator_dev *rdev) +static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; /* keep a distance of off_on_delay from last time disabled */ usleep_range(rdev->desc->off_on_delay, rdev->desc->off_on_delay + 1000); @@ -85,7 +85,7 @@ static int hisi_regulator_enable(struct regulator_dev *rdev) HISI_REGS_ENA_PROTECT_TIME + 1000); /* set enable register */ - hisi_pmic_rmw(pmic, rdev->desc->enable_reg, + hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, rdev->desc->enable_mask, rdev->desc->enable_mask); dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, enable_mask=0x%x\n", @@ -97,27 +97,27 @@ static int hisi_regulator_enable(struct regulator_dev *rdev) return 0; } -static int hisi_regulator_disable(struct regulator_dev *rdev) +static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; /* set enable register to 0 */ - hisi_pmic_rmw(pmic, rdev->desc->enable_reg, + hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, rdev->desc->enable_mask, 0); return 0; } -static int hisi_regulator_get_voltage(struct regulator_dev *rdev) +static int hi6421_spmi_regulator_get_voltage(struct regulator_dev *rdev) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; u32 reg_val, selector; int vol; /* get voltage selector */ - reg_val = hisi_pmic_read(pmic, rdev->desc->vsel_reg); + reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->vsel_reg); selector = (reg_val & rdev->desc->vsel_mask) >> (ffs(rdev->desc->vsel_mask) - 1); @@ -130,11 +130,11 @@ static int hisi_regulator_get_voltage(struct regulator_dev *rdev) return vol; } -static int hisi_regulator_set_voltage(struct regulator_dev *rdev, +static int hi6421_spmi_regulator_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV, unsigned int *selector) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; u32 vsel; int uV, ret = 0; @@ -155,7 +155,7 @@ static int hisi_regulator_set_voltage(struct regulator_dev *rdev, *selector = vsel; /* set voltage selector */ - hisi_pmic_rmw(pmic, rdev->desc->vsel_reg, + hi6421_spmi_pmic_rmw(pmic, rdev->desc->vsel_reg, rdev->desc->vsel_mask, vsel << (ffs(rdev->desc->vsel_mask) - 1)); @@ -169,14 +169,14 @@ static int hisi_regulator_set_voltage(struct regulator_dev *rdev, return ret; } -static unsigned int hisi_regulator_get_mode(struct regulator_dev *rdev) +static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; u32 reg_val; unsigned int mode; - reg_val = hisi_pmic_read(pmic, rdev->desc->enable_reg); + reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->enable_reg); if (reg_val & sreg->eco_mode_mask) mode = REGULATOR_MODE_IDLE; @@ -191,11 +191,11 @@ static unsigned int hisi_regulator_get_mode(struct regulator_dev *rdev) return mode; } -static int hisi_regulator_set_mode(struct regulator_dev *rdev, +static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev, unsigned int mode) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - struct hisi_pmic *pmic = sreg->pmic; + struct hi6421_spmi_pmic *pmic = sreg->pmic; u32 val; switch (mode) { @@ -210,8 +210,8 @@ static int hisi_regulator_set_mode(struct regulator_dev *rdev, } /* set mode */ - hisi_pmic_rmw(pmic, rdev->desc->enable_reg, - sreg->eco_mode_mask, val); + hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, + sreg->eco_mode_mask, val); dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x\n", @@ -220,7 +220,7 @@ static int hisi_regulator_set_mode(struct regulator_dev *rdev, return 0; } -static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *rdev, +static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev, int input_uV, int output_uV, int load_uA) { @@ -235,7 +235,7 @@ static unsigned int hisi_regulator_get_optimum_mode(struct regulator_dev *rdev, } } -static int hisi_dt_parse(struct platform_device *pdev, +static int hi6421_spmi_dt_parse(struct platform_device *pdev, struct hi6421v600_regulator *sreg, struct regulator_desc *rdesc) { @@ -310,25 +310,25 @@ static int hisi_dt_parse(struct platform_device *pdev, return 0; } -static struct regulator_ops hisi_ldo_rops = { - .is_enabled = hisi_regulator_is_enabled, - .enable = hisi_regulator_enable, - .disable = hisi_regulator_disable, +static struct regulator_ops hi6421_spmi_ldo_rops = { + .is_enabled = hi6421_spmi_regulator_is_enabled, + .enable = hi6421_spmi_regulator_enable, + .disable = hi6421_spmi_regulator_disable, .list_voltage = regulator_list_voltage_table, - .get_voltage = hisi_regulator_get_voltage, - .set_voltage = hisi_regulator_set_voltage, - .get_mode = hisi_regulator_get_mode, - .set_mode = hisi_regulator_set_mode, - .get_optimum_mode = hisi_regulator_get_optimum_mode, + .get_voltage = hi6421_spmi_regulator_get_voltage, + .set_voltage = hi6421_spmi_regulator_set_voltage, + .get_mode = hi6421_spmi_regulator_get_mode, + .set_mode = hi6421_spmi_regulator_set_mode, + .get_optimum_mode = hi6421_spmi_regulator_get_optimum_mode, }; /* * Used only for parsing the DT properties */ -static int hisi_regulator_probe_ldo(struct platform_device *pdev, +static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, struct device_node *np, - struct hisi_pmic *pmic) + struct hi6421_spmi_pmic *pmic) { struct device *dev = &pdev->dev; struct regulator_desc *rdesc; @@ -354,7 +354,7 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, rdesc = &sreg->rdesc; rdesc->name = initdata->constraints.name; - rdesc->ops = &hisi_ldo_rops; + rdesc->ops = &hi6421_spmi_ldo_rops; rdesc->type = REGULATOR_VOLTAGE; rdesc->min_uV = initdata->constraints.min_uV; @@ -363,9 +363,9 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, initdata->supply_regulator = supplyname; /* parse device tree data for regulator specific */ - ret = hisi_dt_parse(pdev, sreg, rdesc); + ret = hi6421_spmi_dt_parse(pdev, sreg, rdesc); if (ret) - goto hisi_probe_end; + goto probe_end; /* hisi regulator supports two modes */ constraint = &initdata->constraints; @@ -387,27 +387,27 @@ static int hisi_regulator_probe_ldo(struct platform_device *pdev, dev_err(dev, "failed to register %s\n", rdesc->name); ret = PTR_ERR(rdev); - goto hisi_probe_end; + goto probe_end; } dev_dbg(dev, "valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", constraint->valid_modes_mask, constraint->valid_ops_mask); dev_set_drvdata(dev, rdev); -hisi_probe_end: +probe_end: if (ret) kfree(sreg); return ret; } -static int hisi_regulator_probe(struct platform_device *pdev) +static int hi6421_spmi_regulator_probe(struct platform_device *pdev) { struct device *pmic_dev = pdev->dev.parent; struct device_node *np = pmic_dev->of_node; struct device_node *regulators, *child; struct platform_device *new_pdev; - struct hisi_pmic *pmic; + struct hi6421_spmi_pmic *pmic; int ret; dev_dbg(&pdev->dev, "probing hi6421v600 regulator\n"); @@ -442,7 +442,7 @@ static int hisi_regulator_probe(struct platform_device *pdev) continue; } - ret = hisi_regulator_probe_ldo(new_pdev, child, pmic); + ret = hi6421_spmi_regulator_probe_ldo(new_pdev, child, pmic); if (ret < 0) platform_device_put(new_pdev); } @@ -452,7 +452,7 @@ static int hisi_regulator_probe(struct platform_device *pdev) return 0; } -static int hisi_regulator_remove(struct platform_device *pdev) +static int hi6421_spmi_regulator_remove(struct platform_device *pdev) { struct regulator_dev *rdev = dev_get_drvdata(&pdev->dev); struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); @@ -479,8 +479,8 @@ static struct platform_driver hi6421v600_regulator_driver = { .driver = { .name = "hi6421v600-regulator", }, - .probe = hisi_regulator_probe, - .remove = hisi_regulator_remove, + .probe = hi6421_spmi_regulator_probe, + .remove = hi6421_spmi_regulator_remove, }; module_platform_driver(hi6421v600_regulator_driver); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 33/44] staging: regulator: hi6421v600-regulator: convert to use get/set voltage_sel 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel As the supported LDOs on this driver are all using a selector, change the implementation to use get_voltage_sel and set_voltage_sel ops. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 58 +++++++------------ 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index f77ecea78597..abd1f43dd5ec 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -86,8 +86,8 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) /* set enable register */ hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, - rdev->desc->enable_mask, - rdev->desc->enable_mask); + rdev->desc->enable_mask, + rdev->desc->enable_mask); dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, enable_mask=0x%x\n", __func__, rdev->desc->enable_reg, rdev->desc->enable_mask); @@ -109,64 +109,49 @@ static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev) return 0; } -static int hi6421_spmi_regulator_get_voltage(struct regulator_dev *rdev) +static int hi6421_spmi_regulator_get_voltage_sel(struct regulator_dev *rdev) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; u32 reg_val, selector; - int vol; /* get voltage selector */ reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->vsel_reg); - selector = (reg_val & rdev->desc->vsel_mask) >> - (ffs(rdev->desc->vsel_mask) - 1); - vol = rdev->desc->ops->list_voltage(rdev, selector); + selector = (reg_val & rdev->desc->vsel_mask) >> (ffs(rdev->desc->vsel_mask) - 1); dev_dbg(&rdev->dev, - "%s: vsel_reg=0x%x, val=0x%x, entry=0x%x, voltage=%d mV\n", - __func__, rdev->desc->vsel_reg, reg_val, selector, vol/ 1000); + "%s: vsel_reg=0x%x, value=0x%x, entry=0x%x, voltage=%d mV\n", + __func__, rdev->desc->vsel_reg, reg_val, selector, + rdev->desc->ops->list_voltage(rdev, selector) / 1000); - return vol; + return selector; } -static int hi6421_spmi_regulator_set_voltage(struct regulator_dev *rdev, - int min_uV, int max_uV, unsigned int *selector) +static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev, + unsigned int selector) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; - u32 vsel; - int uV, ret = 0; - - for (vsel = 0; vsel < rdev->desc->n_voltages; vsel++) { - uV = rdev->desc->volt_table[vsel]; - dev_dbg(&rdev->dev, - "%s: min %d, max %d, value[%u] = %d\n", - __func__, min_uV, max_uV, vsel, uV); - - /* Break at the first in-range value */ - if (min_uV <= uV && uV <= max_uV) - break; - } + u32 reg_val; /* unlikely to happen. sanity test done by regulator core */ - if (unlikely(vsel == rdev->desc->n_voltages)) + if (unlikely(selector >= rdev->desc->n_voltages)) return -EINVAL; - *selector = vsel; + reg_val = selector << (ffs(rdev->desc->vsel_mask) - 1); + /* set voltage selector */ hi6421_spmi_pmic_rmw(pmic, rdev->desc->vsel_reg, - rdev->desc->vsel_mask, - vsel << (ffs(rdev->desc->vsel_mask) - 1)); + rdev->desc->vsel_mask, reg_val); dev_dbg(&rdev->dev, - "%s: vsel_reg=0x%x, vsel_mask=0x%x, value=0x%x, voltage=%d mV\n", + "%s: vsel_reg=0x%x, mask=0x%x, value=0x%x, voltage=%d mV\n", __func__, - rdev->desc->vsel_reg, - rdev->desc->vsel_mask, - vsel << (ffs(rdev->desc->vsel_mask) - 1), uV / 1000); + rdev->desc->vsel_reg, rdev->desc->vsel_mask, reg_val, + rdev->desc->ops->list_voltage(rdev, selector) / 1000); - return ret; + return 0; } static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) @@ -315,8 +300,9 @@ static struct regulator_ops hi6421_spmi_ldo_rops = { .enable = hi6421_spmi_regulator_enable, .disable = hi6421_spmi_regulator_disable, .list_voltage = regulator_list_voltage_table, - .get_voltage = hi6421_spmi_regulator_get_voltage, - .set_voltage = hi6421_spmi_regulator_set_voltage, + .map_voltage = regulator_map_voltage_iterate, + .get_voltage_sel = hi6421_spmi_regulator_get_voltage_sel, + .set_voltage_sel = hi6421_spmi_regulator_set_voltage_sel, .get_mode = hi6421_spmi_regulator_get_mode, .set_mode = hi6421_spmi_regulator_set_mode, .get_optimum_mode = hi6421_spmi_regulator_get_optimum_mode, -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 33/44] staging: regulator: hi6421v600-regulator: convert to use get/set voltage_sel @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab As the supported LDOs on this driver are all using a selector, change the implementation to use get_voltage_sel and set_voltage_sel ops. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 58 +++++++------------ 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index f77ecea78597..abd1f43dd5ec 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -86,8 +86,8 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) /* set enable register */ hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, - rdev->desc->enable_mask, - rdev->desc->enable_mask); + rdev->desc->enable_mask, + rdev->desc->enable_mask); dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, enable_mask=0x%x\n", __func__, rdev->desc->enable_reg, rdev->desc->enable_mask); @@ -109,64 +109,49 @@ static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev) return 0; } -static int hi6421_spmi_regulator_get_voltage(struct regulator_dev *rdev) +static int hi6421_spmi_regulator_get_voltage_sel(struct regulator_dev *rdev) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; u32 reg_val, selector; - int vol; /* get voltage selector */ reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->vsel_reg); - selector = (reg_val & rdev->desc->vsel_mask) >> - (ffs(rdev->desc->vsel_mask) - 1); - vol = rdev->desc->ops->list_voltage(rdev, selector); + selector = (reg_val & rdev->desc->vsel_mask) >> (ffs(rdev->desc->vsel_mask) - 1); dev_dbg(&rdev->dev, - "%s: vsel_reg=0x%x, val=0x%x, entry=0x%x, voltage=%d mV\n", - __func__, rdev->desc->vsel_reg, reg_val, selector, vol/ 1000); + "%s: vsel_reg=0x%x, value=0x%x, entry=0x%x, voltage=%d mV\n", + __func__, rdev->desc->vsel_reg, reg_val, selector, + rdev->desc->ops->list_voltage(rdev, selector) / 1000); - return vol; + return selector; } -static int hi6421_spmi_regulator_set_voltage(struct regulator_dev *rdev, - int min_uV, int max_uV, unsigned int *selector) +static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev, + unsigned int selector) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; - u32 vsel; - int uV, ret = 0; - - for (vsel = 0; vsel < rdev->desc->n_voltages; vsel++) { - uV = rdev->desc->volt_table[vsel]; - dev_dbg(&rdev->dev, - "%s: min %d, max %d, value[%u] = %d\n", - __func__, min_uV, max_uV, vsel, uV); - - /* Break at the first in-range value */ - if (min_uV <= uV && uV <= max_uV) - break; - } + u32 reg_val; /* unlikely to happen. sanity test done by regulator core */ - if (unlikely(vsel == rdev->desc->n_voltages)) + if (unlikely(selector >= rdev->desc->n_voltages)) return -EINVAL; - *selector = vsel; + reg_val = selector << (ffs(rdev->desc->vsel_mask) - 1); + /* set voltage selector */ hi6421_spmi_pmic_rmw(pmic, rdev->desc->vsel_reg, - rdev->desc->vsel_mask, - vsel << (ffs(rdev->desc->vsel_mask) - 1)); + rdev->desc->vsel_mask, reg_val); dev_dbg(&rdev->dev, - "%s: vsel_reg=0x%x, vsel_mask=0x%x, value=0x%x, voltage=%d mV\n", + "%s: vsel_reg=0x%x, mask=0x%x, value=0x%x, voltage=%d mV\n", __func__, - rdev->desc->vsel_reg, - rdev->desc->vsel_mask, - vsel << (ffs(rdev->desc->vsel_mask) - 1), uV / 1000); + rdev->desc->vsel_reg, rdev->desc->vsel_mask, reg_val, + rdev->desc->ops->list_voltage(rdev, selector) / 1000); - return ret; + return 0; } static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) @@ -315,8 +300,9 @@ static struct regulator_ops hi6421_spmi_ldo_rops = { .enable = hi6421_spmi_regulator_enable, .disable = hi6421_spmi_regulator_disable, .list_voltage = regulator_list_voltage_table, - .get_voltage = hi6421_spmi_regulator_get_voltage, - .set_voltage = hi6421_spmi_regulator_set_voltage, + .map_voltage = regulator_map_voltage_iterate, + .get_voltage_sel = hi6421_spmi_regulator_get_voltage_sel, + .set_voltage_sel = hi6421_spmi_regulator_set_voltage_sel, .get_mode = hi6421_spmi_regulator_get_mode, .set_mode = hi6421_spmi_regulator_set_mode, .get_optimum_mode = hi6421_spmi_regulator_get_optimum_mode, -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 34/44] staging: regulator: hi6421v600-regulator: don't use usleep_range for off_on_delay 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel The regulator's core already handles it. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421v600-regulator.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index abd1f43dd5ec..31b8ff19fd31 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -73,9 +73,6 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; - /* keep a distance of off_on_delay from last time disabled */ - usleep_range(rdev->desc->off_on_delay, rdev->desc->off_on_delay + 1000); - dev_dbg(&rdev->dev, "%s: off_on_delay=%d us\n", __func__, rdev->desc->off_on_delay); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 34/44] staging: regulator: hi6421v600-regulator: don't use usleep_range for off_on_delay @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab The regulator's core already handles it. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421v600-regulator.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index abd1f43dd5ec..31b8ff19fd31 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -73,9 +73,6 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; - /* keep a distance of off_on_delay from last time disabled */ - usleep_range(rdev->desc->off_on_delay, rdev->desc->off_on_delay + 1000); - dev_dbg(&rdev->dev, "%s: off_on_delay=%d us\n", __func__, rdev->desc->off_on_delay); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 35/44] staging: regulator: hi6421v600-regulator: add a driver-specific debug macro 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Using dev_dbg() is not too nice, as, instead of printing the name of the regulator, it prints "regulator.<number>", making harder to associate what is happening with each ldo line. So, add a debug-specific macro, which will print the rdev's name, just like the regulator core. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 61 ++++++++++--------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 31b8ff19fd31..5ddaf7f8cacc 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -39,6 +39,9 @@ #include <linux/uaccess.h> #include <linux/spmi.h> +#define rdev_dbg(rdev, fmt, arg...) \ + pr_debug("%s: %s: " fmt, rdev->desc->name, __func__, ##arg) + struct hi6421v600_regulator { struct regulator_desc rdesc; struct hi6421_spmi_pmic *pmic; @@ -60,10 +63,10 @@ static int hi6421_spmi_regulator_is_enabled(struct regulator_dev *rdev) reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->enable_reg); - dev_dbg(&rdev->dev, - "%s: enable_reg=0x%x, val= 0x%x, enable_state=%d\n", - __func__, rdev->desc->enable_reg, - reg_val, (reg_val & rdev->desc->enable_mask)); + rdev_dbg(rdev, + "enable_reg=0x%x, val= 0x%x, enable_state=%d\n", + rdev->desc->enable_reg, + reg_val, (reg_val & rdev->desc->enable_mask)); return ((reg_val & rdev->desc->enable_mask) != 0); } @@ -73,21 +76,20 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; - dev_dbg(&rdev->dev, "%s: off_on_delay=%d us\n", - __func__, rdev->desc->off_on_delay); - /* cannot enable more than one regulator at one time */ mutex_lock(&enable_mutex); usleep_range(HISI_REGS_ENA_PROTECT_TIME, HISI_REGS_ENA_PROTECT_TIME + 1000); /* set enable register */ + rdev_dbg(rdev, + "off_on_delay=%d us, enable_reg=0x%x, enable_mask=0x%x\n", + rdev->desc->off_on_delay, rdev->desc->enable_reg, + rdev->desc->enable_mask); + hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, rdev->desc->enable_mask, rdev->desc->enable_mask); - dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, enable_mask=0x%x\n", - __func__, rdev->desc->enable_reg, - rdev->desc->enable_mask); mutex_unlock(&enable_mutex); @@ -100,6 +102,9 @@ static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev) struct hi6421_spmi_pmic *pmic = sreg->pmic; /* set enable register to 0 */ + rdev_dbg(rdev, "enable_reg=0x%x, enable_mask=0x%x\n", + rdev->desc->enable_reg, rdev->desc->enable_mask); + hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, rdev->desc->enable_mask, 0); @@ -117,9 +122,9 @@ static int hi6421_spmi_regulator_get_voltage_sel(struct regulator_dev *rdev) selector = (reg_val & rdev->desc->vsel_mask) >> (ffs(rdev->desc->vsel_mask) - 1); - dev_dbg(&rdev->dev, - "%s: vsel_reg=0x%x, value=0x%x, entry=0x%x, voltage=%d mV\n", - __func__, rdev->desc->vsel_reg, reg_val, selector, + rdev_dbg(rdev, + "vsel_reg=0x%x, value=0x%x, entry=0x%x, voltage=%d mV\n", + rdev->desc->vsel_reg, reg_val, selector, rdev->desc->ops->list_voltage(rdev, selector) / 1000); return selector; @@ -139,15 +144,14 @@ static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev, reg_val = selector << (ffs(rdev->desc->vsel_mask) - 1); /* set voltage selector */ - hi6421_spmi_pmic_rmw(pmic, rdev->desc->vsel_reg, - rdev->desc->vsel_mask, reg_val); - - dev_dbg(&rdev->dev, - "%s: vsel_reg=0x%x, mask=0x%x, value=0x%x, voltage=%d mV\n", - __func__, + rdev_dbg(rdev, + "vsel_reg=0x%x, mask=0x%x, value=0x%x, voltage=%d mV\n", rdev->desc->vsel_reg, rdev->desc->vsel_mask, reg_val, rdev->desc->ops->list_voltage(rdev, selector) / 1000); + hi6421_spmi_pmic_rmw(pmic, rdev->desc->vsel_reg, + rdev->desc->vsel_mask, reg_val); + return 0; } @@ -165,9 +169,9 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) else mode = REGULATOR_MODE_NORMAL; - dev_dbg(&rdev->dev, - "%s: enable_reg=0x%x, eco_mode_mask=0x%x, reg_val=0x%x, %s mode\n", - __func__, rdev->desc->enable_reg, sreg->eco_mode_mask, reg_val, + rdev_dbg(rdev, + "enable_reg=0x%x, eco_mode_mask=0x%x, reg_val=0x%x, %s mode\n", + rdev->desc->enable_reg, sreg->eco_mode_mask, reg_val, mode == REGULATOR_MODE_IDLE ? "idle" : "normal"); return mode; @@ -192,13 +196,12 @@ static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev, } /* set mode */ + rdev_dbg(rdev, "enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x\n", + rdev->desc->enable_reg, sreg->eco_mode_mask, val); + hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, sreg->eco_mode_mask, val); - dev_dbg(&rdev->dev, - "%s: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x\n", - __func__, rdev->desc->enable_reg, sreg->eco_mode_mask, val); - return 0; } @@ -209,10 +212,10 @@ static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { - dev_dbg(&rdev->dev, "%s: normal mode", __func__); + rdev_dbg(rdev, "normal mode"); return REGULATOR_MODE_NORMAL; } else { - dev_dbg(&rdev->dev, "%s: idle mode", __func__); + rdev_dbg(rdev, "idle mode"); return REGULATOR_MODE_IDLE; } } @@ -373,7 +376,7 @@ static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, goto probe_end; } - dev_dbg(dev, "valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", + rdev_dbg(rdev, "valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", constraint->valid_modes_mask, constraint->valid_ops_mask); dev_set_drvdata(dev, rdev); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 35/44] staging: regulator: hi6421v600-regulator: add a driver-specific debug macro @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Using dev_dbg() is not too nice, as, instead of printing the name of the regulator, it prints "regulator.<number>", making harder to associate what is happening with each ldo line. So, add a debug-specific macro, which will print the rdev's name, just like the regulator core. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 61 ++++++++++--------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 31b8ff19fd31..5ddaf7f8cacc 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -39,6 +39,9 @@ #include <linux/uaccess.h> #include <linux/spmi.h> +#define rdev_dbg(rdev, fmt, arg...) \ + pr_debug("%s: %s: " fmt, rdev->desc->name, __func__, ##arg) + struct hi6421v600_regulator { struct regulator_desc rdesc; struct hi6421_spmi_pmic *pmic; @@ -60,10 +63,10 @@ static int hi6421_spmi_regulator_is_enabled(struct regulator_dev *rdev) reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->enable_reg); - dev_dbg(&rdev->dev, - "%s: enable_reg=0x%x, val= 0x%x, enable_state=%d\n", - __func__, rdev->desc->enable_reg, - reg_val, (reg_val & rdev->desc->enable_mask)); + rdev_dbg(rdev, + "enable_reg=0x%x, val= 0x%x, enable_state=%d\n", + rdev->desc->enable_reg, + reg_val, (reg_val & rdev->desc->enable_mask)); return ((reg_val & rdev->desc->enable_mask) != 0); } @@ -73,21 +76,20 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; - dev_dbg(&rdev->dev, "%s: off_on_delay=%d us\n", - __func__, rdev->desc->off_on_delay); - /* cannot enable more than one regulator at one time */ mutex_lock(&enable_mutex); usleep_range(HISI_REGS_ENA_PROTECT_TIME, HISI_REGS_ENA_PROTECT_TIME + 1000); /* set enable register */ + rdev_dbg(rdev, + "off_on_delay=%d us, enable_reg=0x%x, enable_mask=0x%x\n", + rdev->desc->off_on_delay, rdev->desc->enable_reg, + rdev->desc->enable_mask); + hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, rdev->desc->enable_mask, rdev->desc->enable_mask); - dev_dbg(&rdev->dev, "%s: enable_reg=0x%x, enable_mask=0x%x\n", - __func__, rdev->desc->enable_reg, - rdev->desc->enable_mask); mutex_unlock(&enable_mutex); @@ -100,6 +102,9 @@ static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev) struct hi6421_spmi_pmic *pmic = sreg->pmic; /* set enable register to 0 */ + rdev_dbg(rdev, "enable_reg=0x%x, enable_mask=0x%x\n", + rdev->desc->enable_reg, rdev->desc->enable_mask); + hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, rdev->desc->enable_mask, 0); @@ -117,9 +122,9 @@ static int hi6421_spmi_regulator_get_voltage_sel(struct regulator_dev *rdev) selector = (reg_val & rdev->desc->vsel_mask) >> (ffs(rdev->desc->vsel_mask) - 1); - dev_dbg(&rdev->dev, - "%s: vsel_reg=0x%x, value=0x%x, entry=0x%x, voltage=%d mV\n", - __func__, rdev->desc->vsel_reg, reg_val, selector, + rdev_dbg(rdev, + "vsel_reg=0x%x, value=0x%x, entry=0x%x, voltage=%d mV\n", + rdev->desc->vsel_reg, reg_val, selector, rdev->desc->ops->list_voltage(rdev, selector) / 1000); return selector; @@ -139,15 +144,14 @@ static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev, reg_val = selector << (ffs(rdev->desc->vsel_mask) - 1); /* set voltage selector */ - hi6421_spmi_pmic_rmw(pmic, rdev->desc->vsel_reg, - rdev->desc->vsel_mask, reg_val); - - dev_dbg(&rdev->dev, - "%s: vsel_reg=0x%x, mask=0x%x, value=0x%x, voltage=%d mV\n", - __func__, + rdev_dbg(rdev, + "vsel_reg=0x%x, mask=0x%x, value=0x%x, voltage=%d mV\n", rdev->desc->vsel_reg, rdev->desc->vsel_mask, reg_val, rdev->desc->ops->list_voltage(rdev, selector) / 1000); + hi6421_spmi_pmic_rmw(pmic, rdev->desc->vsel_reg, + rdev->desc->vsel_mask, reg_val); + return 0; } @@ -165,9 +169,9 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) else mode = REGULATOR_MODE_NORMAL; - dev_dbg(&rdev->dev, - "%s: enable_reg=0x%x, eco_mode_mask=0x%x, reg_val=0x%x, %s mode\n", - __func__, rdev->desc->enable_reg, sreg->eco_mode_mask, reg_val, + rdev_dbg(rdev, + "enable_reg=0x%x, eco_mode_mask=0x%x, reg_val=0x%x, %s mode\n", + rdev->desc->enable_reg, sreg->eco_mode_mask, reg_val, mode == REGULATOR_MODE_IDLE ? "idle" : "normal"); return mode; @@ -192,13 +196,12 @@ static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev, } /* set mode */ + rdev_dbg(rdev, "enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x\n", + rdev->desc->enable_reg, sreg->eco_mode_mask, val); + hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, sreg->eco_mode_mask, val); - dev_dbg(&rdev->dev, - "%s: enable_reg=0x%x, eco_mode_mask=0x%x, value=0x%x\n", - __func__, rdev->desc->enable_reg, sreg->eco_mode_mask, val); - return 0; } @@ -209,10 +212,10 @@ static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { - dev_dbg(&rdev->dev, "%s: normal mode", __func__); + rdev_dbg(rdev, "normal mode"); return REGULATOR_MODE_NORMAL; } else { - dev_dbg(&rdev->dev, "%s: idle mode", __func__); + rdev_dbg(rdev, "idle mode"); return REGULATOR_MODE_IDLE; } } @@ -373,7 +376,7 @@ static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, goto probe_end; } - dev_dbg(dev, "valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", + rdev_dbg(rdev, "valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", constraint->valid_modes_mask, constraint->valid_ops_mask); dev_set_drvdata(dev, rdev); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* Re: [PATCH 35/44] staging: regulator: hi6421v600-regulator: add a driver-specific debug macro 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 16:10 ` Joe Perches -1 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 16:10 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linuxarm, mauro.chehab, Greg Kroah-Hartman, linux-kernel, devel On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > Using dev_dbg() is not too nice, as, instead of printing the > name of the regulator, it prints "regulator.<number>", making > harder to associate what is happening with each ldo line. > > So, add a debug-specific macro, which will print the rdev's > name, just like the regulator core. Seems sensible, but trivially: > diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c [] > @@ -209,10 +212,10 @@ static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev > struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); > > if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { > - dev_dbg(&rdev->dev, "%s: normal mode", __func__); > + rdev_dbg(rdev, "normal mode"); > return REGULATOR_MODE_NORMAL; > } else { > - dev_dbg(&rdev->dev, "%s: idle mode", __func__); > + rdev_dbg(rdev, "idle mode"); missing terminating newlines ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 35/44] staging: regulator: hi6421v600-regulator: add a driver-specific debug macro @ 2020-08-12 16:10 ` Joe Perches 0 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 16:10 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: mauro.chehab, Greg Kroah-Hartman, devel, linuxarm, linux-kernel On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > Using dev_dbg() is not too nice, as, instead of printing the > name of the regulator, it prints "regulator.<number>", making > harder to associate what is happening with each ldo line. > > So, add a debug-specific macro, which will print the rdev's > name, just like the regulator core. Seems sensible, but trivially: > diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c [] > @@ -209,10 +212,10 @@ static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev > struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); > > if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { > - dev_dbg(&rdev->dev, "%s: normal mode", __func__); > + rdev_dbg(rdev, "normal mode"); > return REGULATOR_MODE_NORMAL; > } else { > - dev_dbg(&rdev->dev, "%s: idle mode", __func__); > + rdev_dbg(rdev, "idle mode"); missing terminating newlines _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 35/44] staging: regulator: hi6421v600-regulator: add a driver-specific debug macro 2020-08-12 16:10 ` Joe Perches @ 2020-08-13 10:10 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-13 10:10 UTC (permalink / raw) To: Joe Perches Cc: linuxarm, mauro.chehab, Greg Kroah-Hartman, linux-kernel, devel Em Wed, 12 Aug 2020 09:10:29 -0700 Joe Perches <joe@perches.com> escreveu: > On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > > Using dev_dbg() is not too nice, as, instead of printing the > > name of the regulator, it prints "regulator.<number>", making > > harder to associate what is happening with each ldo line. > > > > So, add a debug-specific macro, which will print the rdev's > > name, just like the regulator core. > > Seems sensible, but trivially: > > > diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c > [] > > @@ -209,10 +212,10 @@ static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev > > struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); > > > > if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { > > - dev_dbg(&rdev->dev, "%s: normal mode", __func__); > > + rdev_dbg(rdev, "normal mode"); > > return REGULATOR_MODE_NORMAL; > > } else { > > - dev_dbg(&rdev->dev, "%s: idle mode", __func__); > > + rdev_dbg(rdev, "idle mode"); > > missing terminating newlines As per request from Jonathan, I ended dropping those rdev_dbg() on a followup patch. Btw, after this changeset: commit 563873318d328d9bbab4b00dfd835ac7c7e28697 Merge: 24532f768121 bfd8d3f23b51 Author: Linus Torvalds <torvalds@linux-foundation.org> Date: Mon Oct 10 09:29:50 2016 -0700 Merge branch 'printk-cleanups' Merge my system logging cleanups, triggered by the broken '\n' patches. the printk lib will add a line feed if a "\n" is missing. I had to get rid of pr_cont() & friends on that time on media, due to that. Thanks, Mauro ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 35/44] staging: regulator: hi6421v600-regulator: add a driver-specific debug macro @ 2020-08-13 10:10 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-13 10:10 UTC (permalink / raw) To: Joe Perches Cc: mauro.chehab, Greg Kroah-Hartman, devel, linuxarm, linux-kernel Em Wed, 12 Aug 2020 09:10:29 -0700 Joe Perches <joe@perches.com> escreveu: > On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > > Using dev_dbg() is not too nice, as, instead of printing the > > name of the regulator, it prints "regulator.<number>", making > > harder to associate what is happening with each ldo line. > > > > So, add a debug-specific macro, which will print the rdev's > > name, just like the regulator core. > > Seems sensible, but trivially: > > > diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c > [] > > @@ -209,10 +212,10 @@ static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev > > struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); > > > > if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { > > - dev_dbg(&rdev->dev, "%s: normal mode", __func__); > > + rdev_dbg(rdev, "normal mode"); > > return REGULATOR_MODE_NORMAL; > > } else { > > - dev_dbg(&rdev->dev, "%s: idle mode", __func__); > > + rdev_dbg(rdev, "idle mode"); > > missing terminating newlines As per request from Jonathan, I ended dropping those rdev_dbg() on a followup patch. Btw, after this changeset: commit 563873318d328d9bbab4b00dfd835ac7c7e28697 Merge: 24532f768121 bfd8d3f23b51 Author: Linus Torvalds <torvalds@linux-foundation.org> Date: Mon Oct 10 09:29:50 2016 -0700 Merge branch 'printk-cleanups' Merge my system logging cleanups, triggered by the broken '\n' patches. the printk lib will add a line feed if a "\n" is missing. I had to get rid of pr_cont() & friends on that time on media, due to that. Thanks, Mauro _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 35/44] staging: regulator: hi6421v600-regulator: add a driver-specific debug macro 2020-08-13 10:10 ` Mauro Carvalho Chehab @ 2020-08-13 15:07 ` Joe Perches -1 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-13 15:07 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linuxarm, mauro.chehab, Greg Kroah-Hartman, linux-kernel, devel On Thu, 2020-08-13 at 12:10 +0200, Mauro Carvalho Chehab wrote: > Em Wed, 12 Aug 2020 09:10:29 -0700 > Joe Perches <joe@perches.com> escreveu: > > > On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > > > Using dev_dbg() is not too nice, as, instead of printing the > > > name of the regulator, it prints "regulator.<number>", making > > > harder to associate what is happening with each ldo line. > > > > > > So, add a debug-specific macro, which will print the rdev's > > > name, just like the regulator core. > > > > Seems sensible, but trivially: > > > > > diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c > > [] > > > @@ -209,10 +212,10 @@ static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev > > > struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); > > > > > > if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { > > > - dev_dbg(&rdev->dev, "%s: normal mode", __func__); > > > + rdev_dbg(rdev, "normal mode"); > > > return REGULATOR_MODE_NORMAL; > > > } else { > > > - dev_dbg(&rdev->dev, "%s: idle mode", __func__); > > > + rdev_dbg(rdev, "idle mode"); > > > > missing terminating newlines > > As per request from Jonathan, I ended dropping those rdev_dbg() > on a followup patch. > > Btw, after this changeset: > > commit 563873318d328d9bbab4b00dfd835ac7c7e28697 > Merge: 24532f768121 bfd8d3f23b51 > Author: Linus Torvalds <torvalds@linux-foundation.org> > Date: Mon Oct 10 09:29:50 2016 -0700 > > Merge branch 'printk-cleanups' > > Merge my system logging cleanups, triggered by the broken '\n' patches. > > the printk lib will add a line feed if a "\n" is missing. I had > to get rid of pr_cont() & friends on that time on media, due to that. I know. Message formats should still end in a newline. Any other subsystem could use a pr_cont and that could be added to any line without a terminating newline. Also any line without a newline will not be emitted until another message is emitted. ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 35/44] staging: regulator: hi6421v600-regulator: add a driver-specific debug macro @ 2020-08-13 15:07 ` Joe Perches 0 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-13 15:07 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: mauro.chehab, Greg Kroah-Hartman, devel, linuxarm, linux-kernel On Thu, 2020-08-13 at 12:10 +0200, Mauro Carvalho Chehab wrote: > Em Wed, 12 Aug 2020 09:10:29 -0700 > Joe Perches <joe@perches.com> escreveu: > > > On Wed, 2020-08-12 at 17:56 +0200, Mauro Carvalho Chehab wrote: > > > Using dev_dbg() is not too nice, as, instead of printing the > > > name of the regulator, it prints "regulator.<number>", making > > > harder to associate what is happening with each ldo line. > > > > > > So, add a debug-specific macro, which will print the rdev's > > > name, just like the regulator core. > > > > Seems sensible, but trivially: > > > > > diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c > > [] > > > @@ -209,10 +212,10 @@ static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev > > > struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); > > > > > > if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { > > > - dev_dbg(&rdev->dev, "%s: normal mode", __func__); > > > + rdev_dbg(rdev, "normal mode"); > > > return REGULATOR_MODE_NORMAL; > > > } else { > > > - dev_dbg(&rdev->dev, "%s: idle mode", __func__); > > > + rdev_dbg(rdev, "idle mode"); > > > > missing terminating newlines > > As per request from Jonathan, I ended dropping those rdev_dbg() > on a followup patch. > > Btw, after this changeset: > > commit 563873318d328d9bbab4b00dfd835ac7c7e28697 > Merge: 24532f768121 bfd8d3f23b51 > Author: Linus Torvalds <torvalds@linux-foundation.org> > Date: Mon Oct 10 09:29:50 2016 -0700 > > Merge branch 'printk-cleanups' > > Merge my system logging cleanups, triggered by the broken '\n' patches. > > the printk lib will add a line feed if a "\n" is missing. I had > to get rid of pr_cont() & friends on that time on media, due to that. I know. Message formats should still end in a newline. Any other subsystem could use a pr_cont and that could be added to any line without a terminating newline. Also any line without a newline will not be emitted until another message is emitted. _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* [PATCH] media: debugging logging cleanup 2020-08-13 10:10 ` Mauro Carvalho Chehab @ 2020-08-14 4:01 ` Joe Perches -1 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-14 4:01 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linuxarm, mauro.chehab, Greg Kroah-Hartman, linux-kernel, devel Various logging mechanisms are broken with lack of KERN_<LEVEL> and buffer logging. Remove unnecessary debug_dump macros and uses for %*ph instead. Miscellanea: o Convert deb_<foo> to dbg_<foo> to clarify the debugging use o Use KERN_DEBUG in dprintk/dbg_<foo> macros o Use fmt, ... and ##__VA_ARGS__ in macros o Add missing format newlines o Use no_printk to validate format and argument when not debugging o whitespace and line wrapping neatening Signed-off-by: Joe Perches <joe@perches.com> --- drivers/media/common/b2c2/flexcop-fe-tuner.c | 4 +- drivers/media/common/b2c2/flexcop-hw-filter.c | 9 +- drivers/media/common/b2c2/flexcop-i2c.c | 28 ++-- drivers/media/common/b2c2/flexcop-misc.c | 14 +- drivers/media/common/b2c2/flexcop-sram.c | 2 +- drivers/media/common/b2c2/flexcop.c | 4 +- drivers/media/common/b2c2/flexcop.h | 24 ++-- drivers/media/dvb-frontends/bcm3510.c | 106 ++++++++------- drivers/media/dvb-frontends/dib3000mb.c | 184 +++++++++++++------------- drivers/media/dvb-frontends/ix2505v.c | 29 ++-- drivers/media/dvb-frontends/m88rs2000.c | 28 ++-- drivers/media/dvb-frontends/zl10036.c | 38 +++--- drivers/media/pci/b2c2/flexcop-dma.c | 12 +- drivers/media/pci/b2c2/flexcop-pci.c | 63 ++++----- drivers/media/usb/b2c2/flexcop-usb.c | 82 ++++++------ drivers/media/usb/dvb-usb-v2/lmedm04.c | 30 ++--- drivers/media/usb/dvb-usb/a800.c | 2 +- drivers/media/usb/dvb-usb/af9005-fe.c | 150 ++++++++++----------- drivers/media/usb/dvb-usb/af9005-remote.c | 20 +-- drivers/media/usb/dvb-usb/af9005.c | 86 ++++++------ drivers/media/usb/dvb-usb/af9005.h | 18 ++- drivers/media/usb/dvb-usb/az6027.c | 34 ++--- drivers/media/usb/dvb-usb/az6027.h | 8 +- drivers/media/usb/dvb-usb/cinergyT2-core.c | 10 +- drivers/media/usb/dvb-usb/cinergyT2-fe.c | 2 +- drivers/media/usb/dvb-usb/cinergyT2.h | 18 +-- drivers/media/usb/dvb-usb/dib0700.h | 12 +- drivers/media/usb/dvb-usb/dib0700_core.c | 92 +++++++------ drivers/media/usb/dvb-usb/dib0700_devices.c | 80 ++++++----- drivers/media/usb/dvb-usb/dibusb-common.c | 4 +- drivers/media/usb/dvb-usb/digitv.c | 5 +- drivers/media/usb/dvb-usb/dtt200u-fe.c | 2 +- drivers/media/usb/dvb-usb/dtt200u.c | 2 +- drivers/media/usb/dvb-usb/dtt200u.h | 6 +- drivers/media/usb/dvb-usb/dvb-usb-common.h | 27 ++-- drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 26 ++-- drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 3 +- drivers/media/usb/dvb-usb/dvb-usb-init.c | 16 ++- drivers/media/usb/dvb-usb/dvb-usb-remote.c | 29 ++-- drivers/media/usb/dvb-usb/dvb-usb-urb.c | 6 +- drivers/media/usb/dvb-usb/dvb-usb.h | 16 +-- drivers/media/usb/dvb-usb/dw2102.c | 31 ++--- drivers/media/usb/dvb-usb/dw2102.h | 4 +- drivers/media/usb/dvb-usb/gp8psk.c | 12 +- drivers/media/usb/dvb-usb/gp8psk.h | 9 +- drivers/media/usb/dvb-usb/nova-t-usb2.c | 11 +- drivers/media/usb/dvb-usb/technisat-usb2.c | 31 ++--- drivers/media/usb/dvb-usb/ttusb2.c | 23 ++-- drivers/media/usb/dvb-usb/usb-urb.c | 40 +++--- drivers/media/usb/dvb-usb/vp702x-fe.c | 38 +++--- drivers/media/usb/dvb-usb/vp702x.c | 10 +- drivers/media/usb/dvb-usb/vp702x.h | 12 +- drivers/media/usb/dvb-usb/vp7045.c | 29 ++-- 53 files changed, 808 insertions(+), 773 deletions(-) diff --git a/drivers/media/common/b2c2/flexcop-fe-tuner.c b/drivers/media/common/b2c2/flexcop-fe-tuner.c index aac1aadb0cb1..12332b2c10ce 100644 --- a/drivers/media/common/b2c2/flexcop-fe-tuner.c +++ b/drivers/media/common/b2c2/flexcop-fe-tuner.c @@ -44,7 +44,7 @@ static int flexcop_set_voltage(struct dvb_frontend *fe, { struct flexcop_device *fc = fe->dvb->priv; flexcop_ibi_value v; - deb_tuner("polarity/voltage = %u\n", voltage); + dbg_tuner("polarity/voltage = %u\n", voltage); v = fc->read_ibi_reg(fc, misc_204); switch (voltage) { @@ -86,7 +86,7 @@ static int flexcop_set_tone(struct dvb_frontend *fe, enum fe_sec_tone_mode tone) flexcop_ibi_value v; u16 ax; v.raw = 0; - deb_tuner("tone = %u\n",tone); + dbg_tuner("tone = %u\n", tone); switch (tone) { case SEC_TONE_ON: diff --git a/drivers/media/common/b2c2/flexcop-hw-filter.c b/drivers/media/common/b2c2/flexcop-hw-filter.c index 335f30a54ba8..6706239ab896 100644 --- a/drivers/media/common/b2c2/flexcop-hw-filter.c +++ b/drivers/media/common/b2c2/flexcop-hw-filter.c @@ -9,7 +9,7 @@ static void flexcop_rcv_data_ctrl(struct flexcop_device *fc, int onoff) { flexcop_set_ibi_value(ctrl_208, Rcv_Data_sig, onoff); - deb_ts("rcv_data is now: '%s'\n", onoff ? "on" : "off"); + dbg_ts("rcv_data is now: '%s'\n", onoff ? "on" : "off"); } void flexcop_smc_ctrl(struct flexcop_device *fc, int onoff) @@ -115,8 +115,8 @@ static void flexcop_pid_control(struct flexcop_device *fc, if (pid == 0x2000) return; - deb_ts("setting pid: %5d %04x at index %d '%s'\n", - pid, pid, index, onoff ? "on" : "off"); + dbg_ts("setting pid: %5d %04x at index %d '%s'\n", + pid, pid, index, onoff ? "on" : "off"); /* First 6 can be buggy - skip over them if option set */ if (fc->skip_6_hw_pid_filter) @@ -164,7 +164,8 @@ static void flexcop_pid_control(struct flexcop_device *fc, static int flexcop_toggle_fullts_streaming(struct flexcop_device *fc, int onoff) { if (fc->fullts_streaming_state != onoff) { - deb_ts("%s full TS transfer\n",onoff ? "enabling" : "disabling"); + dbg_ts("%s full TS transfer\n", + onoff ? "enabling" : "disabling"); flexcop_pid_group_filter(fc, 0, 0x1fe0 * (!onoff)); flexcop_pid_group_filter_ctrl(fc, onoff); fc->fullts_streaming_state = onoff; diff --git a/drivers/media/common/b2c2/flexcop-i2c.c b/drivers/media/common/b2c2/flexcop-i2c.c index 1f1eaa807811..a85985b98766 100644 --- a/drivers/media/common/b2c2/flexcop-i2c.c +++ b/drivers/media/common/b2c2/flexcop-i2c.c @@ -15,7 +15,7 @@ static int flexcop_i2c_operation(struct flexcop_device *fc, flexcop_ibi_value r; r100->tw_sm_c_100.working_start = 1; - deb_i2c("r100 before: %08x\n",r100->raw); + dbg_i2c("r100 before: %08x\n", r100->raw); fc->write_ibi_reg(fc, tw_sm_c_100, ibi_zero); fc->write_ibi_reg(fc, tw_sm_c_100, *r100); /* initiating i2c operation */ @@ -26,15 +26,15 @@ static int flexcop_i2c_operation(struct flexcop_device *fc, if (!r.tw_sm_c_100.no_base_addr_ack_error) { if (r.tw_sm_c_100.st_done) { *r100 = r; - deb_i2c("i2c success\n"); + dbg_i2c("i2c success\n"); return 0; } } else { - deb_i2c("suffering from an i2c ack_error\n"); + dbg_i2c("suffering from an i2c ack_error\n"); return -EREMOTEIO; } } - deb_i2c("tried %d times i2c operation, never finished or too many ack errors.\n", + dbg_i2c("tried %d times i2c operation, never finished or too many ack errors\n", i); return -EREMOTEIO; } @@ -61,12 +61,12 @@ static int flexcop_i2c_read4(struct flexcop_i2c_adapter *i2c, ret = flexcop_i2c_operation(i2c->fc, &r100); if (ret != 0) { - deb_i2c("Retrying operation\n"); + dbg_i2c("Retrying operation\n"); r100.tw_sm_c_100.no_base_addr_ack_error = i2c->no_base_addr; ret = flexcop_i2c_operation(i2c->fc, &r100); } if (ret != 0) { - deb_i2c("read failed. %d\n", ret); + dbg_i2c("read failed. %d\n", ret); return ret; } @@ -74,7 +74,7 @@ static int flexcop_i2c_read4(struct flexcop_i2c_adapter *i2c, if (len > 0) { r104 = i2c->fc->read_ibi_reg(i2c->fc, tw_sm_c_104); - deb_i2c("read: r100: %08x, r104: %08x\n", r100.raw, r104.raw); + dbg_i2c("read: r100: %08x, r104: %08x\n", r100.raw, r104.raw); /* there is at least one more byte, otherwise we wouldn't be here */ buf[1] = r104.tw_sm_c_104.data2_reg; @@ -97,7 +97,7 @@ static int flexcop_i2c_write4(struct flexcop_device *fc, r104.tw_sm_c_104.data3_reg = len > 1 ? buf[2] : 0; r104.tw_sm_c_104.data4_reg = len > 2 ? buf[3] : 0; - deb_i2c("write: r100: %08x, r104: %08x\n", r100.raw, r104.raw); + dbg_i2c("write: r100: %08x, r104: %08x\n", r100.raw, r104.raw); /* write the additional i2c data before doing the actual i2c operation */ fc->write_ibi_reg(fc, tw_sm_c_104, r104); @@ -116,7 +116,7 @@ int flexcop_i2c_request(struct flexcop_i2c_adapter *i2c, u16 bytes_to_transfer; flexcop_ibi_value r100; - deb_i2c("port %d %s(%02x): register %02x, size: %d\n", + dbg_i2c("port %d %s(%02x): register %02x, size: %d\n", i2c->port, op == FC_READ ? "rd" : "wr", chipaddr, start_addr, size); @@ -153,10 +153,10 @@ int flexcop_i2c_request(struct flexcop_i2c_adapter *i2c, addr += bytes_to_transfer; len -= bytes_to_transfer; } - deb_i2c_dump("port %d %s(%02x): register %02x: %*ph\n", - i2c->port, - op == FC_READ ? "rd" : "wr", - chipaddr, start_addr, size, buf); + dbg_i2c_dump("port %d %s(%02x): register %02x: %*ph\n", + i2c->port, + op == FC_READ ? "rd" : "wr", + chipaddr, start_addr, size, buf); return 0; } @@ -192,7 +192,7 @@ static int flexcop_master_xfer(struct i2c_adapter *i2c_adap, msgs[i].buf[0], &msgs[i].buf[1], msgs[i].len - 1); if (ret < 0) { - deb_i2c("i2c master_xfer failed"); + dbg_i2c("i2c master_xfer failed"); break; } } diff --git a/drivers/media/common/b2c2/flexcop-misc.c b/drivers/media/common/b2c2/flexcop-misc.c index 83d01d3a81cc..eb3e981ea15c 100644 --- a/drivers/media/common/b2c2/flexcop-misc.c +++ b/drivers/media/common/b2c2/flexcop-misc.c @@ -12,15 +12,15 @@ void flexcop_determine_revision(struct flexcop_device *fc) switch (v.misc_204.Rev_N_sig_revision_hi) { case 0x2: - deb_info("found a FlexCopII.\n"); + dbg_info("found a FlexCopII\n"); fc->rev = FLEXCOP_II; break; case 0x3: - deb_info("found a FlexCopIIb.\n"); + dbg_info("found a FlexCopIIb\n"); fc->rev = FLEXCOP_IIB; break; case 0x0: - deb_info("found a FlexCopIII.\n"); + dbg_info("found a FlexCopIII\n"); fc->rev = FLEXCOP_III; break; default: @@ -30,9 +30,9 @@ void flexcop_determine_revision(struct flexcop_device *fc) } if ((fc->has_32_hw_pid_filter = v.misc_204.Rev_N_sig_caps)) - deb_info("this FlexCop has the additional 32 hardware pid filter.\n"); + dbg_info("this FlexCop has the additional 32 hardware pid filter\n"); else - deb_info("this FlexCop has the 6 basic main hardware pid filter.\n"); + dbg_info("this FlexCop has the 6 basic main hardware pid filter\n"); /* bus parts have to decide if hw pid filtering is used or not. */ } @@ -78,8 +78,8 @@ void flexcop_dump_reg(struct flexcop_device *fc, int i; for (i = 0; i < num; i++) { v = fc->read_ibi_reg(fc, reg+4*i); - deb_rdump("0x%03x: %08x, ", reg+4*i, v.raw); + dbg_rdump("0x%03x: %08x, ", reg + 4 * i, v.raw); } - deb_rdump("\n"); + dbg_rdump("\n"); } EXPORT_SYMBOL(flexcop_dump_reg); diff --git a/drivers/media/common/b2c2/flexcop-sram.c b/drivers/media/common/b2c2/flexcop-sram.c index d97962eb0112..3089d3b88a5e 100644 --- a/drivers/media/common/b2c2/flexcop-sram.c +++ b/drivers/media/common/b2c2/flexcop-sram.c @@ -38,7 +38,7 @@ int flexcop_sram_set_dest(struct flexcop_device *fc, flexcop_sram_dest_t dest, err("SRAM destination target to available on FlexCopII(b)\n"); return -EINVAL; } - deb_sram("sram dest: %x target: %x\n", dest, target); + dbg_sram("sram dest: %x target: %x\n", dest, target); if (dest & FC_SRAM_DEST_NET) v.sram_dest_reg_714.NET_Dest = target; diff --git a/drivers/media/common/b2c2/flexcop.c b/drivers/media/common/b2c2/flexcop.c index cbaa61f10d5f..dd78827fb7cd 100644 --- a/drivers/media/common/b2c2/flexcop.c +++ b/drivers/media/common/b2c2/flexcop.c @@ -155,7 +155,7 @@ static void flexcop_dvb_exit(struct flexcop_device *fc) dvb_dmxdev_release(&fc->dmxdev); dvb_dmx_release(&fc->demux); dvb_unregister_adapter(&fc->dvb_adapter); - deb_info("deinitialized dvb stuff\n"); + dbg_info("deinitialized dvb stuff\n"); } fc->init_state &= ~FC_STATE_DVB_INIT; } @@ -210,7 +210,7 @@ void flexcop_reset_block_300(struct flexcop_device *fc) flexcop_ibi_value v208_save = fc->read_ibi_reg(fc, ctrl_208), v210 = fc->read_ibi_reg(fc, sw_reset_210); - deb_rdump("208: %08x, 210: %08x\n", v208_save.raw, v210.raw); + dbg_rdump("208: %08x, 210: %08x\n", v208_save.raw, v210.raw); fc->write_ibi_reg(fc,ctrl_208,ibi_zero); v210.sw_reset_210.reset_block_300 = 1; diff --git a/drivers/media/common/b2c2/flexcop.h b/drivers/media/common/b2c2/flexcop.h index 486fe2380b92..f1149a722187 100644 --- a/drivers/media/common/b2c2/flexcop.h +++ b/drivers/media/common/b2c2/flexcop.h @@ -14,18 +14,22 @@ extern int b2c2_flexcop_debug; /* debug */ #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG -#define dprintk(level,args...) \ - do { if ((b2c2_flexcop_debug & level)) printk(args); } while (0) +#define dprintk(level, fmt, ...) \ +do { \ + if ((b2c2_flexcop_debug & (level))) \ + printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ +} while (0) #else -#define dprintk(level,args...) +#define dprintk(level, fmt, ...) \ + no_printk(KERN_DEBUG fmt, ##__VA_ARGS__) #endif -#define deb_info(args...) dprintk(0x01, args) -#define deb_tuner(args...) dprintk(0x02, args) -#define deb_i2c(args...) dprintk(0x04, args) -#define deb_ts(args...) dprintk(0x08, args) -#define deb_sram(args...) dprintk(0x10, args) -#define deb_rdump(args...) dprintk(0x20, args) -#define deb_i2c_dump(args...) dprintk(0x40, args) +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) +#define dbg_tuner(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) +#define dbg_i2c(fmt, ...) dprintk(0x04, fmt, ##__VA_ARGS__) +#define dbg_ts(fmt, ...) dprintk(0x08, fmt, ##__VA_ARGS__) +#define dbg_sram(fmt, ...) dprintk(0x10, fmt, ##__VA_ARGS__) +#define dbg_rdump(fmt, ...) dprintk(0x20, fmt, ##__VA_ARGS__) +#define dbg_i2c_dump(fmt, ...) dprintk(0x40, fmt, ##__VA_ARGS__) #endif diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c index e92542b92d34..15a0ac2f57ea 100644 --- a/drivers/media/dvb-frontends/bcm3510.c +++ b/drivers/media/dvb-frontends/bcm3510.c @@ -67,15 +67,15 @@ static int debug; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c (|-able))."); -#define dprintk(level,x...) if (level & debug) printk(x) -#define dbufout(b,l,m) {\ - int i; \ - for (i = 0; i < l; i++) \ - m("%02x ",b[i]); \ -} -#define deb_info(args...) dprintk(0x01,args) -#define deb_i2c(args...) dprintk(0x02,args) -#define deb_hab(args...) dprintk(0x04,args) +#define dprintk(level, fmt, ...) \ +do { \ + if (debug & (level)) \ + printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ +} while (0) + +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) +#define dbg_i2c(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) +#define dbg_hab(fmt, ...) dprintk(0x04, fmt, ##__VA_ARGS__) /* transfer functions */ static int bcm3510_writebytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 len) @@ -87,14 +87,12 @@ static int bcm3510_writebytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 b[0] = reg; memcpy(&b[1],buf,len); - deb_i2c("i2c wr %02x: ",reg); - dbufout(buf,len,deb_i2c); - deb_i2c("\n"); + dbg_i2c("i2c wr %02x: %*ph\n", reg, (int)len, buf); if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { - deb_info("%s: i2c write error (addr %02x, reg %02x, err == %i)\n", - __func__, state->config->demod_address, reg, err); + dbg_info("%s: i2c write error (addr %02x, reg %02x, err == %i)\n", + __func__, state->config->demod_address, reg, err); return -EREMOTEIO; } @@ -112,13 +110,11 @@ static int bcm3510_readbytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 l memset(buf,0,len); if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) { - deb_info("%s: i2c read error (addr %02x, reg %02x, err == %i)\n", - __func__, state->config->demod_address, reg, err); + dbg_info("%s: i2c read error (addr %02x, reg %02x, err == %i)\n", + __func__, state->config->demod_address, reg, err); return -EREMOTEIO; } - deb_i2c("i2c rd %02x: ",reg); - dbufout(buf,len,deb_i2c); - deb_i2c("\n"); + dbg_i2c("i2c rd %02x: %*ph\n", reg, (int)len, buf); return 0; } @@ -162,7 +158,7 @@ static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len) if ((ret = bcm3510_readB(st,0xa8,&v)) < 0) return ret; if (v.HABSTAT_a8.HABR) { - deb_info("HAB is running already - clearing it.\n"); + dbg_info("HAB is running already - clearing it\n"); v.HABSTAT_a8.HABR = 0; bcm3510_writeB(st,0xa8,v); // return -EBUSY; @@ -189,7 +185,7 @@ static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len) /* Polling method: Wait until the AP finishes processing the HAB request */ t = jiffies + 1*HZ; while (time_before(jiffies, t)) { - deb_info("waiting for HAB to complete\n"); + dbg_info("waiting for HAB to complete\n"); msleep(10); if ((ret = bcm3510_readB(st,0xa8,&v)) < 0) return ret; @@ -198,7 +194,7 @@ static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len) return 0; } - deb_info("send_request execution timed out.\n"); + dbg_info("send_request execution timed out\n"); return -ETIMEDOUT; } @@ -208,12 +204,12 @@ static int bcm3510_do_hab_cmd(struct bcm3510_state *st, u8 cmd, u8 msgid, u8 *ob int ret = 0; if (ilen + 2 > sizeof(ib)) { - deb_hab("do_hab_cmd: ilen=%d is too big!\n", ilen); + dbg_hab("do_hab_cmd: ilen=%d is too big!\n", ilen); return -EINVAL; } if (olen + 2 > sizeof(ob)) { - deb_hab("do_hab_cmd: olen=%d is too big!\n", olen); + dbg_hab("do_hab_cmd: olen=%d is too big!\n", olen); return -EINVAL; } @@ -221,9 +217,7 @@ static int bcm3510_do_hab_cmd(struct bcm3510_state *st, u8 cmd, u8 msgid, u8 *ob ob[1] = msgid; memcpy(&ob[2],obuf,olen); - deb_hab("hab snd: "); - dbufout(ob,olen+2,deb_hab); - deb_hab("\n"); + dbg_hab("hab snd: %*ph\n", olen + 2, ob); if (mutex_lock_interruptible(&st->hab_mutex) < 0) return -EAGAIN; @@ -232,9 +226,7 @@ static int bcm3510_do_hab_cmd(struct bcm3510_state *st, u8 cmd, u8 msgid, u8 *ob (ret = bcm3510_hab_get_response(st, ib, ilen+2)) < 0) goto error; - deb_hab("hab get: "); - dbufout(ib,ilen+2,deb_hab); - deb_hab("\n"); + dbg_hab("hab get: %*ph\n", ilen + 2, ib); memcpy(ibuf,&ib[2],ilen); error: @@ -254,7 +246,7 @@ static int bcm3510_is_ap_ready(struct bcm3510_state *st) return ret; if (ap.APSTAT1_a2.RESET || ap.APSTAT1_a2.IDLE || ap.APSTAT1_a2.STOP || hab.HABSTAT_a8.HABR) { - deb_info("AP is busy\n"); + dbg_info("AP is busy\n"); return -EBUSY; } @@ -309,7 +301,7 @@ static int bcm3510_read_status(struct dvb_frontend *fe, enum fe_status *status) else /* more frequently checks if no lock has been achieved yet */ st->status_check_interval = 500; - deb_info("real_status: %02x\n",*status); + dbg_info("real_status: %02x\n", *status); return 0; } @@ -454,10 +446,11 @@ static int bcm3510_set_freq(struct bcm3510_state* st,u32 freq) u8 bc,a; u16 n; s32 YIntercept,Tfvco1; + u32 ofreq; freq /= 1000; + ofreq = freq; - deb_info("%dkHz:",freq); /* set Band Switch */ if (freq <= 168000) bc = 0x1c; @@ -485,7 +478,7 @@ static int bcm3510_set_freq(struct bcm3510_state* st,u32 freq) n = Tfvco1 >> 6; a = Tfvco1 & 0x3f; - deb_info(" BC1_2_3_4: %x, N: %x A: %x\n", bc, n, a); + dbg_info("%dkHz: BC1_2_3_4: %x, N: %x A: %x\n", ofreq, bc, n, a); if (n >= 16 && n <= 2047) return bcm3510_tuner_cmd(st,bc,n,a); @@ -635,26 +628,28 @@ static int bcm3510_download_firmware(struct dvb_frontend* fe) const u8 *b; int ret,i; - deb_info("requesting firmware\n"); + dbg_info("requesting firmware\n"); if ((ret = st->config->request_firmware(fe, &fw, BCM3510_DEFAULT_FIRMWARE)) < 0) { - err("could not load firmware (%s): %d",BCM3510_DEFAULT_FIRMWARE,ret); + err("could not load firmware (%s): %d\n", + BCM3510_DEFAULT_FIRMWARE, ret); return ret; } - deb_info("got firmware: %zu\n", fw->size); + dbg_info("got firmware: %zu\n", fw->size); b = fw->data; for (i = 0; i < fw->size;) { addr = le16_to_cpu(*((__le16 *)&b[i])); len = le16_to_cpu(*((__le16 *)&b[i+2])); - deb_info("firmware chunk, addr: 0x%04x, len: 0x%04x, total length: 0x%04zx\n",addr,len,fw->size); + dbg_info("firmware chunk, addr: 0x%04x, len: 0x%04x, total length: 0x%04zx\n", + addr, len, fw->size); if ((ret = bcm3510_write_ram(st,addr,&b[i+4],len)) < 0) { - err("firmware download failed: %d\n",ret); + err("firmware download failed: %d\n", ret); return ret; } i += 4 + len; } release_firmware(fw); - deb_info("firmware download successfully completed\n"); + dbg_info("firmware download successfully completed\n"); return 0; } @@ -663,15 +658,16 @@ static int bcm3510_check_firmware_version(struct bcm3510_state *st) struct bcm3510_hab_cmd_get_version_info ver; bcm3510_do_hab_cmd(st,CMD_GET_VERSION_INFO,MSGID_GET_VERSION_INFO,NULL,0,(u8*)&ver,sizeof(ver)); - deb_info("Version information: 0x%02x 0x%02x 0x%02x 0x%02x\n", - ver.microcode_version, ver.script_version, ver.config_version, ver.demod_version); + dbg_info("Version information: 0x%02x 0x%02x 0x%02x 0x%02x\n", + ver.microcode_version, ver.script_version, + ver.config_version, ver.demod_version); if (ver.script_version == BCM3510_DEF_SCRIPT_VERSION && ver.config_version == BCM3510_DEF_CONFIG_VERSION && ver.demod_version == BCM3510_DEF_DEMOD_VERSION) return 0; - deb_info("version check failed\n"); + dbg_info("version check failed\n"); return -ENODEV; } @@ -695,7 +691,7 @@ static int bcm3510_reset(struct bcm3510_state *st) if (v.APSTAT1_a2.RESET) return 0; } - deb_info("reset timed out\n"); + dbg_info("reset timed out\n"); return -ETIMEDOUT; } @@ -719,7 +715,7 @@ static int bcm3510_clear_reset(struct bcm3510_state *st) if (!v.APSTAT1_a2.RESET) return 0; } - deb_info("reset clear timed out\n"); + dbg_info("reset clear timed out\n"); return -ETIMEDOUT; } @@ -732,21 +728,21 @@ static int bcm3510_init_cold(struct bcm3510_state *st) if ((ret = bcm3510_readB(st,0xa2,&v)) < 0) return ret; if (v.APSTAT1_a2.RUN) { - deb_info("AP is already running - firmware already loaded.\n"); + dbg_info("AP is already running - firmware already loaded\n"); return 0; } - deb_info("reset?\n"); + dbg_info("reset?\n"); if ((ret = bcm3510_reset(st)) < 0) return ret; - deb_info("tristate?\n"); + dbg_info("tristate?\n"); /* tri-state */ v.TSTCTL_2e.CTL = 0; if ((ret = bcm3510_writeB(st,0x2e,v)) < 0) return ret; - deb_info("firmware?\n"); + dbg_info("firmware?\n"); if ((ret = bcm3510_download_firmware(&st->frontend)) < 0 || (ret = bcm3510_clear_reset(st)) < 0) return ret; @@ -766,16 +762,16 @@ static int bcm3510_init(struct dvb_frontend* fe) if ((ret = bcm3510_readB(st,0xca,&j)) < 0) return ret; - deb_info("JDEC: %02x\n",j.raw); + dbg_info("JDEC: %02x\n", j.raw); switch (j.JDEC_ca.JDEC) { case JDEC_WAIT_AT_RAM: - deb_info("attempting to download firmware\n"); + dbg_info("attempting to download firmware\n"); if ((ret = bcm3510_init_cold(st)) < 0) return ret; /* fall-through */ case JDEC_EEPROM_LOAD_WAIT: - deb_info("firmware is loaded\n"); + dbg_info("firmware is loaded\n"); bcm3510_check_firmware_version(st); break; default: @@ -818,13 +814,15 @@ struct dvb_frontend* bcm3510_attach(const struct bcm3510_config *config, if ((ret = bcm3510_readB(state,0xe0,&v)) < 0) goto error; - deb_info("Revision: 0x%1x, Layer: 0x%1x.\n",v.REVID_e0.REV,v.REVID_e0.LAYER); + dbg_info("Revision: 0x%1x, Layer: 0x%1x\n", + v.REVID_e0.REV, v.REVID_e0.LAYER); if ((v.REVID_e0.REV != 0x1 && v.REVID_e0.LAYER != 0xb) && /* cold */ (v.REVID_e0.REV != 0x8 && v.REVID_e0.LAYER != 0x0)) /* warm */ goto error; - info("Revision: 0x%1x, Layer: 0x%1x.",v.REVID_e0.REV,v.REVID_e0.LAYER); + info("Revision: 0x%1x, Layer: 0x%1x\n", + v.REVID_e0.REV, v.REVID_e0.LAYER); bcm3510_reset(state); diff --git a/drivers/media/dvb-frontends/dib3000mb.c b/drivers/media/dvb-frontends/dib3000mb.c index 0f0480d8576d..8c1b76b41473 100644 --- a/drivers/media/dvb-frontends/dib3000mb.c +++ b/drivers/media/dvb-frontends/dib3000mb.c @@ -40,13 +40,12 @@ static int debug; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-able))."); -#define deb_info(args...) dprintk(0x01, args) -#define deb_i2c(args...) dprintk(0x02, args) -#define deb_srch(args...) dprintk(0x04, args) -#define deb_info(args...) dprintk(0x01, args) -#define deb_xfer(args...) dprintk(0x02, args) -#define deb_setf(args...) dprintk(0x04, args) -#define deb_getf(args...) dprintk(0x08, args) +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) +#define dbg_i2c(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) +#define dbg_srch(fmt, ...) dprintk(0x04, fmt, ##__VA_ARGS__) +#define dbg_setf(fmt, ...) dprintk(0x04, fmt, ##__VA_ARGS__) +#define dbg_getf(fmt, ...) dprintk(0x08, fmt, ##__VA_ARGS__) static int dib3000_read_reg(struct dib3000_state *state, u16 reg) { @@ -58,10 +57,10 @@ static int dib3000_read_reg(struct dib3000_state *state, u16 reg) }; if (i2c_transfer(state->i2c, msg, 2) != 2) - deb_i2c("i2c read error\n"); + dbg_i2c("i2c read error\n"); - deb_i2c("reading i2c bus (reg: %5d 0x%04x, val: %5d 0x%04x)\n",reg,reg, - (rb[0] << 8) | rb[1],(rb[0] << 8) | rb[1]); + dbg_i2c("reading i2c bus (reg: %5d 0x%04x, val: %5d 0x%04x)\n", + reg, reg, (rb[0] << 8) | rb[1], (rb[0] << 8) | rb[1]); return (rb[0] << 8) | rb[1]; } @@ -75,7 +74,8 @@ static int dib3000_write_reg(struct dib3000_state *state, u16 reg, u16 val) struct i2c_msg msg[] = { { .addr = state->config.demod_address, .flags = 0, .buf = b, .len = 4 } }; - deb_i2c("writing i2c bus (reg: %5d 0x%04x, val: %5d 0x%04x)\n",reg,reg,val,val); + dbg_i2c("writing i2c bus (reg: %5d 0x%04x, val: %5d 0x%04x)\n", + reg, reg, val, val); return i2c_transfer(state->i2c,msg, 1) != 1 ? -EREMOTEIO : 0; } @@ -84,14 +84,14 @@ static int dib3000_search_status(u16 irq,u16 lock) { if (irq & 0x02) { if (lock & 0x01) { - deb_srch("auto search succeeded\n"); + dbg_srch("auto search succeeded\n"); return 1; // auto search succeeded } else { - deb_srch("auto search not successful\n"); + dbg_srch("auto search not successful\n"); return 0; // auto search failed } } else if (irq & 0x01) { - deb_srch("auto search failed\n"); + dbg_srch("auto search failed\n"); return 0; // auto search failed } return -1; // try again @@ -140,24 +140,24 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) case 0: return -EOPNOTSUPP; default: - pr_err("unknown bandwidth value.\n"); + pr_err("unknown bandwidth value\n"); return -EINVAL; } - deb_setf("bandwidth: %d MHZ\n", c->bandwidth_hz / 1000000); + dbg_setf("bandwidth: %d MHZ\n", c->bandwidth_hz / 1000000); } wr(DIB3000MB_REG_LOCK1_MASK, DIB3000MB_LOCK1_SEARCH_4); switch (c->transmission_mode) { case TRANSMISSION_MODE_2K: - deb_setf("transmission mode: 2k\n"); + dbg_setf("transmission mode: 2k\n"); wr(DIB3000MB_REG_FFT, DIB3000_TRANSMISSION_MODE_2K); break; case TRANSMISSION_MODE_8K: - deb_setf("transmission mode: 8k\n"); + dbg_setf("transmission mode: 8k\n"); wr(DIB3000MB_REG_FFT, DIB3000_TRANSMISSION_MODE_8K); break; case TRANSMISSION_MODE_AUTO: - deb_setf("transmission mode: auto\n"); + dbg_setf("transmission mode: auto\n"); break; default: return -EINVAL; @@ -165,23 +165,23 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) switch (c->guard_interval) { case GUARD_INTERVAL_1_32: - deb_setf("guard 1_32\n"); + dbg_setf("guard 1_32\n"); wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_32); break; case GUARD_INTERVAL_1_16: - deb_setf("guard 1_16\n"); + dbg_setf("guard 1_16\n"); wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_16); break; case GUARD_INTERVAL_1_8: - deb_setf("guard 1_8\n"); + dbg_setf("guard 1_8\n"); wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_8); break; case GUARD_INTERVAL_1_4: - deb_setf("guard 1_4\n"); + dbg_setf("guard 1_4\n"); wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_4); break; case GUARD_INTERVAL_AUTO: - deb_setf("guard auto\n"); + dbg_setf("guard auto\n"); break; default: return -EINVAL; @@ -189,14 +189,14 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) switch (c->inversion) { case INVERSION_OFF: - deb_setf("inversion off\n"); + dbg_setf("inversion off\n"); wr(DIB3000MB_REG_DDS_INV, DIB3000_DDS_INVERSION_OFF); break; case INVERSION_AUTO: - deb_setf("inversion auto\n"); + dbg_setf("inversion auto\n"); break; case INVERSION_ON: - deb_setf("inversion on\n"); + dbg_setf("inversion on\n"); wr(DIB3000MB_REG_DDS_INV, DIB3000_DDS_INVERSION_ON); break; default: @@ -205,15 +205,15 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) switch (c->modulation) { case QPSK: - deb_setf("modulation: qpsk\n"); + dbg_setf("modulation: qpsk\n"); wr(DIB3000MB_REG_QAM, DIB3000_CONSTELLATION_QPSK); break; case QAM_16: - deb_setf("modulation: qam16\n"); + dbg_setf("modulation: qam16\n"); wr(DIB3000MB_REG_QAM, DIB3000_CONSTELLATION_16QAM); break; case QAM_64: - deb_setf("modulation: qam64\n"); + dbg_setf("modulation: qam64\n"); wr(DIB3000MB_REG_QAM, DIB3000_CONSTELLATION_64QAM); break; case QAM_AUTO: @@ -223,22 +223,22 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) } switch (c->hierarchy) { case HIERARCHY_NONE: - deb_setf("hierarchy: none\n"); + dbg_setf("hierarchy: none\n"); /* fall through */ case HIERARCHY_1: - deb_setf("hierarchy: alpha=1\n"); + dbg_setf("hierarchy: alpha=1\n"); wr(DIB3000MB_REG_VIT_ALPHA, DIB3000_ALPHA_1); break; case HIERARCHY_2: - deb_setf("hierarchy: alpha=2\n"); + dbg_setf("hierarchy: alpha=2\n"); wr(DIB3000MB_REG_VIT_ALPHA, DIB3000_ALPHA_2); break; case HIERARCHY_4: - deb_setf("hierarchy: alpha=4\n"); + dbg_setf("hierarchy: alpha=4\n"); wr(DIB3000MB_REG_VIT_ALPHA, DIB3000_ALPHA_4); break; case HIERARCHY_AUTO: - deb_setf("hierarchy: alpha=auto\n"); + dbg_setf("hierarchy: alpha=auto\n"); break; default: return -EINVAL; @@ -255,30 +255,30 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) } switch (fe_cr) { case FEC_1_2: - deb_setf("fec: 1_2\n"); + dbg_setf("fec: 1_2\n"); wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_1_2); break; case FEC_2_3: - deb_setf("fec: 2_3\n"); + dbg_setf("fec: 2_3\n"); wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_2_3); break; case FEC_3_4: - deb_setf("fec: 3_4\n"); + dbg_setf("fec: 3_4\n"); wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_3_4); break; case FEC_5_6: - deb_setf("fec: 5_6\n"); + dbg_setf("fec: 5_6\n"); wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_5_6); break; case FEC_7_8: - deb_setf("fec: 7_8\n"); + dbg_setf("fec: 7_8\n"); wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_7_8); break; case FEC_NONE: - deb_setf("fec: none\n"); + dbg_setf("fec: none\n"); break; case FEC_AUTO: - deb_setf("fec: auto\n"); + dbg_setf("fec: auto\n"); break; default: return -EINVAL; @@ -289,7 +289,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) [c->guard_interval == GUARD_INTERVAL_AUTO] [c->inversion == INVERSION_AUTO]; - deb_setf("seq? %d\n", seq); + dbg_setf("seq? %d\n", seq); wr(DIB3000MB_REG_SEQ, seq); @@ -330,7 +330,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) c->inversion == INVERSION_AUTO) { int as_count=0; - deb_setf("autosearch enabled.\n"); + dbg_setf("autosearch enabled\n"); wr(DIB3000MB_REG_ISI, DIB3000MB_ISI_INHIBIT); @@ -343,12 +343,12 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) rd(DIB3000MB_REG_LOCK2_VALUE))) < 0 && as_count++ < 100) msleep(1); - deb_setf("search_state after autosearch %d after %d checks\n", + dbg_setf("search_state after autosearch %d after %d checks\n", search_state, as_count); if (search_state == 1) { if (dib3000mb_get_frontend(fe, c) == 0) { - deb_setf("reading tuning data from frontend succeeded.\n"); + dbg_setf("reading tuning data from frontend succeeded\n"); return dib3000mb_set_frontend(fe, 0); } } @@ -365,7 +365,7 @@ static int dib3000mb_fe_init(struct dvb_frontend* fe, int mobile_mode) { struct dib3000_state* state = fe->demodulator_priv; - deb_info("dib3000mb is getting up.\n"); + dbg_info("dib3000mb is getting up\n"); wr(DIB3000MB_REG_POWER_CONTROL, DIB3000MB_POWER_UP); wr(DIB3000MB_REG_RESTART, DIB3000MB_RESTART_AGC); @@ -451,7 +451,10 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe, return 0; dds_val = ((rd(DIB3000MB_REG_DDS_VALUE_MSB) & 0xff) << 16) + rd(DIB3000MB_REG_DDS_VALUE_LSB); - deb_getf("DDS_VAL: %x %x %x\n", dds_val, rd(DIB3000MB_REG_DDS_VALUE_MSB), rd(DIB3000MB_REG_DDS_VALUE_LSB)); + dbg_getf("DDS_VAL: %x %x %x\n", + dds_val, + rd(DIB3000MB_REG_DDS_VALUE_MSB), + rd(DIB3000MB_REG_DDS_VALUE_LSB)); if (dds_val < threshold) inv_test1 = 0; else if (dds_val == threshold) @@ -460,7 +463,10 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe, inv_test1 = 2; dds_val = ((rd(DIB3000MB_REG_DDS_FREQ_MSB) & 0xff) << 16) + rd(DIB3000MB_REG_DDS_FREQ_LSB); - deb_getf("DDS_FREQ: %x %x %x\n", dds_val, rd(DIB3000MB_REG_DDS_FREQ_MSB), rd(DIB3000MB_REG_DDS_FREQ_LSB)); + dbg_getf("DDS_FREQ: %x %x %x\n", + dds_val, + rd(DIB3000MB_REG_DDS_FREQ_MSB), + rd(DIB3000MB_REG_DDS_FREQ_LSB)); if (dds_val < threshold) inv_test2 = 0; else if (dds_val == threshold) @@ -473,57 +479,57 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe, ((inv_test2 == 0) && (inv_test1==1 || inv_test1==2)) ? INVERSION_ON : INVERSION_OFF; - deb_getf("inversion %d %d, %d\n", inv_test2, inv_test1, c->inversion); + dbg_getf("inversion %d %d, %d\n", inv_test2, inv_test1, c->inversion); switch ((tps_val = rd(DIB3000MB_REG_TPS_QAM))) { case DIB3000_CONSTELLATION_QPSK: - deb_getf("QPSK\n"); + dbg_getf("QPSK\n"); c->modulation = QPSK; break; case DIB3000_CONSTELLATION_16QAM: - deb_getf("QAM16\n"); + dbg_getf("QAM16\n"); c->modulation = QAM_16; break; case DIB3000_CONSTELLATION_64QAM: - deb_getf("QAM64\n"); + dbg_getf("QAM64\n"); c->modulation = QAM_64; break; default: pr_err("Unexpected constellation returned by TPS (%d)\n", tps_val); break; } - deb_getf("TPS: %d\n", tps_val); + dbg_getf("TPS: %d\n", tps_val); if (rd(DIB3000MB_REG_TPS_HRCH)) { - deb_getf("HRCH ON\n"); + dbg_getf("HRCH ON\n"); cr = &c->code_rate_LP; c->code_rate_HP = FEC_NONE; switch ((tps_val = rd(DIB3000MB_REG_TPS_VIT_ALPHA))) { case DIB3000_ALPHA_0: - deb_getf("HIERARCHY_NONE\n"); + dbg_getf("HIERARCHY_NONE\n"); c->hierarchy = HIERARCHY_NONE; break; case DIB3000_ALPHA_1: - deb_getf("HIERARCHY_1\n"); + dbg_getf("HIERARCHY_1\n"); c->hierarchy = HIERARCHY_1; break; case DIB3000_ALPHA_2: - deb_getf("HIERARCHY_2\n"); + dbg_getf("HIERARCHY_2\n"); c->hierarchy = HIERARCHY_2; break; case DIB3000_ALPHA_4: - deb_getf("HIERARCHY_4\n"); + dbg_getf("HIERARCHY_4\n"); c->hierarchy = HIERARCHY_4; break; default: pr_err("Unexpected ALPHA value returned by TPS (%d)\n", tps_val); break; } - deb_getf("TPS: %d\n", tps_val); + dbg_getf("TPS: %d\n", tps_val); tps_val = rd(DIB3000MB_REG_TPS_CODE_RATE_LP); } else { - deb_getf("HRCH OFF\n"); + dbg_getf("HRCH OFF\n"); cr = &c->code_rate_HP; c->code_rate_LP = FEC_NONE; c->hierarchy = HIERARCHY_NONE; @@ -533,68 +539,68 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe, switch (tps_val) { case DIB3000_FEC_1_2: - deb_getf("FEC_1_2\n"); + dbg_getf("FEC_1_2\n"); *cr = FEC_1_2; break; case DIB3000_FEC_2_3: - deb_getf("FEC_2_3\n"); + dbg_getf("FEC_2_3\n"); *cr = FEC_2_3; break; case DIB3000_FEC_3_4: - deb_getf("FEC_3_4\n"); + dbg_getf("FEC_3_4\n"); *cr = FEC_3_4; break; case DIB3000_FEC_5_6: - deb_getf("FEC_5_6\n"); + dbg_getf("FEC_5_6\n"); *cr = FEC_4_5; break; case DIB3000_FEC_7_8: - deb_getf("FEC_7_8\n"); + dbg_getf("FEC_7_8\n"); *cr = FEC_7_8; break; default: pr_err("Unexpected FEC returned by TPS (%d)\n", tps_val); break; } - deb_getf("TPS: %d\n",tps_val); + dbg_getf("TPS: %d\n", tps_val); switch ((tps_val = rd(DIB3000MB_REG_TPS_GUARD_TIME))) { case DIB3000_GUARD_TIME_1_32: - deb_getf("GUARD_INTERVAL_1_32\n"); + dbg_getf("GUARD_INTERVAL_1_32\n"); c->guard_interval = GUARD_INTERVAL_1_32; break; case DIB3000_GUARD_TIME_1_16: - deb_getf("GUARD_INTERVAL_1_16\n"); + dbg_getf("GUARD_INTERVAL_1_16\n"); c->guard_interval = GUARD_INTERVAL_1_16; break; case DIB3000_GUARD_TIME_1_8: - deb_getf("GUARD_INTERVAL_1_8\n"); + dbg_getf("GUARD_INTERVAL_1_8\n"); c->guard_interval = GUARD_INTERVAL_1_8; break; case DIB3000_GUARD_TIME_1_4: - deb_getf("GUARD_INTERVAL_1_4\n"); + dbg_getf("GUARD_INTERVAL_1_4\n"); c->guard_interval = GUARD_INTERVAL_1_4; break; default: pr_err("Unexpected Guard Time returned by TPS (%d)\n", tps_val); break; } - deb_getf("TPS: %d\n", tps_val); + dbg_getf("TPS: %d\n", tps_val); switch ((tps_val = rd(DIB3000MB_REG_TPS_FFT))) { case DIB3000_TRANSMISSION_MODE_2K: - deb_getf("TRANSMISSION_MODE_2K\n"); + dbg_getf("TRANSMISSION_MODE_2K\n"); c->transmission_mode = TRANSMISSION_MODE_2K; break; case DIB3000_TRANSMISSION_MODE_8K: - deb_getf("TRANSMISSION_MODE_8K\n"); + dbg_getf("TRANSMISSION_MODE_8K\n"); c->transmission_mode = TRANSMISSION_MODE_8K; break; default: pr_err("unexpected transmission mode return by TPS (%d)\n", tps_val); break; } - deb_getf("TPS: %d\n", tps_val); + dbg_getf("TPS: %d\n", tps_val); return 0; } @@ -615,18 +621,18 @@ static int dib3000mb_read_status(struct dvb_frontend *fe, if (rd(DIB3000MB_REG_TS_SYNC_LOCK)) *stat |= (FE_HAS_SYNC | FE_HAS_LOCK); - deb_getf("actual status is %2x\n",*stat); + dbg_getf("actual status is %2x\n", *stat); - deb_getf("autoval: tps: %d, qam: %d, hrch: %d, alpha: %d, hp: %d, lp: %d, guard: %d, fft: %d cell: %d\n", - rd(DIB3000MB_REG_TPS_LOCK), - rd(DIB3000MB_REG_TPS_QAM), - rd(DIB3000MB_REG_TPS_HRCH), - rd(DIB3000MB_REG_TPS_VIT_ALPHA), - rd(DIB3000MB_REG_TPS_CODE_RATE_HP), - rd(DIB3000MB_REG_TPS_CODE_RATE_LP), - rd(DIB3000MB_REG_TPS_GUARD_TIME), - rd(DIB3000MB_REG_TPS_FFT), - rd(DIB3000MB_REG_TPS_CELL_ID)); + dbg_getf("autoval: tps: %d, qam: %d, hrch: %d, alpha: %d, hp: %d, lp: %d, guard: %d, fft: %d cell: %d\n", + rd(DIB3000MB_REG_TPS_LOCK), + rd(DIB3000MB_REG_TPS_QAM), + rd(DIB3000MB_REG_TPS_HRCH), + rd(DIB3000MB_REG_TPS_VIT_ALPHA), + rd(DIB3000MB_REG_TPS_CODE_RATE_HP), + rd(DIB3000MB_REG_TPS_CODE_RATE_LP), + rd(DIB3000MB_REG_TPS_GUARD_TIME), + rd(DIB3000MB_REG_TPS_FFT), + rd(DIB3000MB_REG_TPS_CELL_ID)); //*stat = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK; return 0; @@ -670,7 +676,7 @@ static int dib3000mb_read_unc_blocks(struct dvb_frontend* fe, u32 *unc) static int dib3000mb_sleep(struct dvb_frontend* fe) { struct dib3000_state* state = fe->demodulator_priv; - deb_info("dib3000mb is going to bed.\n"); + dbg_info("dib3000mb is going to bed\n"); wr(DIB3000MB_REG_POWER_CONTROL, DIB3000MB_POWER_DOWN); return 0; } @@ -710,7 +716,7 @@ static int dib3000mb_fifo_control(struct dvb_frontend *fe, int onoff) { struct dib3000_state *state = fe->demodulator_priv; - deb_xfer("%s fifo\n",onoff ? "enabling" : "disabling"); + dbg_xfer("%s fifo\n", onoff ? "enabling" : "disabling"); if (onoff) { wr(DIB3000MB_REG_FIFO, DIB3000MB_FIFO_ACTIVATE); } else { @@ -722,7 +728,7 @@ static int dib3000mb_fifo_control(struct dvb_frontend *fe, int onoff) static int dib3000mb_pid_parse(struct dvb_frontend *fe, int onoff) { struct dib3000_state *state = fe->demodulator_priv; - deb_xfer("%s pid parsing\n",onoff ? "enabling" : "disabling"); + dbg_xfer("%s pid parsing\n", onoff ? "enabling" : "disabling"); wr(DIB3000MB_REG_PID_PARSE,onoff); return 0; } diff --git a/drivers/media/dvb-frontends/ix2505v.c b/drivers/media/dvb-frontends/ix2505v.c index 73f27105c139..3e1b2b52a0d0 100644 --- a/drivers/media/dvb-frontends/ix2505v.c +++ b/drivers/media/dvb-frontends/ix2505v.c @@ -13,13 +13,14 @@ #include "ix2505v.h" static int ix2505v_debug; -#define dprintk(level, args...) do { \ - if (ix2505v_debug & level) \ - printk(KERN_DEBUG "ix2505v: " args); \ +#define dprintk(level, fmt, ...) \ +do { \ + if (ix2505v_debug & (level)) \ + printk(KERN_DEBUG "ix2505v: " fmt, ##__VA_ARGS__); \ } while (0) -#define deb_info(args...) dprintk(0x01, args) -#define deb_i2c(args...) dprintk(0x02, args) +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) +#define dbg_i2c(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) struct ix2505v_state { struct i2c_adapter *i2c; @@ -57,7 +58,7 @@ static int ix2505v_read_status_reg(struct ix2505v_state *state) }; ret = i2c_transfer(state->i2c, msg, 1); - deb_i2c("Read %s ", __func__); + dbg_i2c("Read %s\n", __func__); return (ret == 1) ? (int) b2[0] : -1; } @@ -74,7 +75,7 @@ static int ix2505v_write(struct ix2505v_state *state, u8 buf[], u8 count) ret = i2c_transfer(state->i2c, msg, 1); if (ret != 1) { - deb_i2c("%s: i2c error, ret=%d\n", __func__, ret); + dbg_i2c("%s: i2c error, ret=%d\n", __func__, ret); return -EIO; } @@ -153,7 +154,7 @@ static int ix2505v_set_params(struct dvb_frontend *fe) data[1] = (N << 5) | (A & 0x1f); data[2] = 0x81 | ((cc & 0x3) << 5) ; /*PD5,PD4 & TM = 0|C1,C0|REF=1*/ - deb_info("Frq=%d x=%d N=%d A=%d\n", frequency, x, N, A); + dbg_info("Frq=%d x=%d N=%d A=%d\n", frequency, x, N, A); if (frequency <= 1065000) local_osc = (6 << 5) | 2; @@ -197,8 +198,8 @@ static int ix2505v_set_params(struct dvb_frontend *fe) else lpf = 0xb; - deb_info("Osc=%x b_w=%x lpf=%x\n", local_osc, b_w, lpf); - deb_info("Data 0=[%4phN]\n", data); + dbg_info("Osc=%x b_w=%x lpf=%x\n", local_osc, b_w, lpf); + dbg_info("Data 0=[%4phN]\n", data); if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); @@ -219,7 +220,7 @@ static int ix2505v_set_params(struct dvb_frontend *fe) data[2] |= ((lpf >> 2) & 0x3) << 3; /* lpf */ data[3] |= (lpf & 0x3) << 2; - deb_info("Data 2=[%x%x]\n", data[2], data[3]); + dbg_info("Data 2=[%x%x]\n", data[2], data[3]); if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); @@ -263,7 +264,7 @@ struct dvb_frontend *ix2505v_attach(struct dvb_frontend *fe, int ret; if (NULL == config) { - deb_i2c("%s: no config ", __func__); + dbg_i2c("%s: no config\n", __func__); goto error; } @@ -281,7 +282,7 @@ struct dvb_frontend *ix2505v_attach(struct dvb_frontend *fe, ret = ix2505v_read_status_reg(state); if (ret & 0x80) { - deb_i2c("%s: No IX2505V found\n", __func__); + dbg_i2c("%s: No IX2505V found\n", __func__); goto error; } @@ -293,7 +294,7 @@ struct dvb_frontend *ix2505v_attach(struct dvb_frontend *fe, memcpy(&fe->ops.tuner_ops, &ix2505v_tuner_ops, sizeof(struct dvb_tuner_ops)); - deb_i2c("%s: initialization (%s addr=0x%02x) ok\n", + dbg_i2c("%s: initialization (%s addr=0x%02x) ok\n", __func__, fe->ops.tuner_ops.info.name, config->tuner_address); return fe; diff --git a/drivers/media/dvb-frontends/m88rs2000.c b/drivers/media/dvb-frontends/m88rs2000.c index 39cbb3ea1c9d..4450bb1940ab 100644 --- a/drivers/media/dvb-frontends/m88rs2000.c +++ b/drivers/media/dvb-frontends/m88rs2000.c @@ -39,13 +39,15 @@ static int m88rs2000_debug; module_param_named(debug, m88rs2000_debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able))."); -#define dprintk(level, args...) do { \ - if (level & m88rs2000_debug) \ - printk(KERN_DEBUG "m88rs2000-fe: " args); \ +#define dprintk(level, fmt, ...) \ +do { \ + if (m88rs2000_debug & (level)) \ + printk(KERN_DEBUG "m88rs2000-fe: " fmt, ##__VA_ARGS__); \ } while (0) -#define deb_info(args...) dprintk(0x01, args) -#define info(format, arg...) \ +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) + +#define info(format, arg...) \ printk(KERN_INFO "m88rs2000-fe: " format "\n" , ## arg) static int m88rs2000_writereg(struct m88rs2000_state *state, @@ -63,7 +65,7 @@ static int m88rs2000_writereg(struct m88rs2000_state *state, ret = i2c_transfer(state->i2c, &msg, 1); if (ret != 1) - deb_info("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n", + dbg_info("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n", __func__, reg, data, ret); return (ret != 1) ? -EREMOTEIO : 0; @@ -92,8 +94,8 @@ static u8 m88rs2000_readreg(struct m88rs2000_state *state, u8 reg) ret = i2c_transfer(state->i2c, msg, 2); if (ret != 2) - deb_info("%s: readreg error (reg == 0x%02x, ret == %i)\n", - __func__, reg, ret); + dbg_info("%s: readreg error (reg == 0x%02x, ret == %i)\n", + __func__, reg, ret); return b1[0]; } @@ -186,7 +188,7 @@ static int m88rs2000_set_symbolrate(struct dvb_frontend *fe, u32 srate) else ret |= m88rs2000_writereg(state, 0xa3, 0x90); - deb_info("m88rs2000: m88rs2000_set_symbolrate\n"); + dbg_info("%s\n", __func__); return ret; } @@ -197,7 +199,7 @@ static int m88rs2000_send_diseqc_msg(struct dvb_frontend *fe, int i; u8 reg; - deb_info("%s\n", __func__); + dbg_info("%s\n", __func__); m88rs2000_writereg(state, 0x9a, 0x30); reg = m88rs2000_readreg(state, 0xb2); reg &= 0x3f; @@ -239,7 +241,7 @@ static int m88rs2000_send_diseqc_burst(struct dvb_frontend *fe, { struct m88rs2000_state *state = fe->demodulator_priv; u8 reg0, reg1; - deb_info("%s\n", __func__); + dbg_info("%s\n", __func__); m88rs2000_writereg(state, 0x9a, 0x30); msleep(50); reg0 = m88rs2000_readreg(state, 0xb1); @@ -432,7 +434,7 @@ static int m88rs2000_init(struct dvb_frontend *fe) struct m88rs2000_state *state = fe->demodulator_priv; int ret; - deb_info("m88rs2000: init chip\n"); + dbg_info("init chip\n"); /* Setup frontend from shutdown/cold */ if (state->config->inittab) ret = m88rs2000_tab_set(state, @@ -606,7 +608,7 @@ static int m88rs2000_set_frontend(struct dvb_frontend *fe) state->no_lock_count = 0; if (c->delivery_system != SYS_DVBS) { - deb_info("%s: unsupported delivery system selected (%d)\n", + dbg_info("%s: unsupported delivery system selected (%d)\n", __func__, c->delivery_system); return -EOPNOTSUPP; } diff --git a/drivers/media/dvb-frontends/zl10036.c b/drivers/media/dvb-frontends/zl10036.c index d392c7cce2ce..a69ff7ce0051 100644 --- a/drivers/media/dvb-frontends/zl10036.c +++ b/drivers/media/dvb-frontends/zl10036.c @@ -23,12 +23,14 @@ #include "zl10036.h" static int zl10036_debug; -#define dprintk(level, args...) \ - do { if (zl10036_debug & level) printk(KERN_DEBUG "zl10036: " args); \ - } while (0) +#define dprintk(level, fmt, ...) \ +do { \ + if (zl10036_debug & (level)) \ + printk(KERN_DEBUG "zl10036: " fmt, ##__VA_ARGS__); \ +} while (0) -#define deb_info(args...) dprintk(0x01, args) -#define deb_i2c(args...) dprintk(0x02, args) +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) +#define dbg_i2c(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) struct zl10036_state { struct i2c_adapter *i2c; @@ -70,10 +72,10 @@ static int zl10036_read_status_reg(struct zl10036_state *state) return -EIO; } - deb_i2c("R(status): %02x [FL=%d]\n", status, - (status & STATUS_FL) ? 1 : 0); + dbg_i2c("R(status): %02x [FL=%d]\n", + status, (status & STATUS_FL) ? 1 : 0); if (status & STATUS_POR) - deb_info("%s: Power-On-Reset bit enabled - need to initialize the tuner\n", + dbg_info("%s: Power-On-Reset bit enabled - need to initialize the tuner\n", __func__); return status; @@ -104,13 +106,7 @@ static int zl10036_write(struct zl10036_state *state, u8 buf[], u8 count) else if ((buf[0] & 0xf0) == 0xf0) reg = 12; - deb_i2c("W(%d):", reg); - { - int i; - for (i = 0; i < count; i++) - printk(KERN_CONT " %02x", buf[i]); - printk(KERN_CONT "\n"); - } + dbg_i2c("W(%d): %*ph\n", reg, (int)count, buf); } ret = i2c_transfer(state->i2c, msg, 1); @@ -136,7 +132,7 @@ static int zl10036_sleep(struct dvb_frontend *fe) u8 buf[] = { 0xf0, 0x80 }; /* regs 12/13 */ int ret; - deb_info("%s\n", __func__); + dbg_info("%s\n", __func__); if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */ @@ -180,8 +176,8 @@ static int zl10036_set_frequency(struct zl10036_state *state, u32 frequency) buf[0] = (div >> 8) & 0x7f; buf[1] = (div >> 0) & 0xff; - deb_info("%s: ftodo=%u fpriv=%u ferr=%d div=%u\n", __func__, - frequency, state->frequency, foffset, div); + dbg_info("%s: ftodo=%u fpriv=%u ferr=%d div=%u\n", + __func__, frequency, state->frequency, foffset, div); return zl10036_write(state, buf, sizeof(buf)); } @@ -236,7 +232,7 @@ static int zl10036_set_bandwidth(struct zl10036_state *state, u32 fbw) buf_bf[1] = (bf << 1) & 0x7e; buf_br[1] = (br << 2) & 0x7c; - deb_info("%s: BW=%d br=%u bf=%u\n", __func__, fbw, br, bf); + dbg_info("%s: BW=%d br=%u bf=%u\n", __func__, fbw, br, bf); if (br != state->br) { ret = zl10036_write(state, buf_br, sizeof(buf_br)); @@ -287,7 +283,7 @@ static int zl10036_set_gain_params(struct zl10036_state *state, /* P0=0 */ buf[1] = _RDIV_REG | ((c << 5) & 0x60); - deb_info("%s: c=%u rfg=%u ba=%u bg=%u\n", __func__, c, rfg, ba, bg); + dbg_info("%s: c=%u rfg=%u ba=%u bg=%u\n", __func__, c, rfg, ba, bg); return zl10036_write(state, buf, sizeof(buf)); } @@ -400,7 +396,7 @@ static int zl10036_init_regs(struct zl10036_state *state) if (!state->config->rf_loop_enable) zl10036_init_tab[1][0] |= 0x01; - deb_info("%s\n", __func__); + dbg_info("%s\n", __func__); for (i = 0; i < ARRAY_SIZE(zl10036_init_tab); i++) { ret = zl10036_write(state, zl10036_init_tab[i], 2); diff --git a/drivers/media/pci/b2c2/flexcop-dma.c b/drivers/media/pci/b2c2/flexcop-dma.c index ba45b378d739..96a954f67af3 100644 --- a/drivers/media/pci/b2c2/flexcop-dma.c +++ b/drivers/media/pci/b2c2/flexcop-dma.c @@ -92,8 +92,8 @@ int flexcop_dma_xfer_control(struct flexcop_device *fc, v0x0 = fc->read_ibi_reg(fc, r0x0); v0xc = fc->read_ibi_reg(fc, r0xc); - deb_rdump("reg: %03x: %x\n", r0x0, v0x0.raw); - deb_rdump("reg: %03x: %x\n", r0xc, v0xc.raw); + dbg_rdump("reg: %03x: %x\n", r0x0, v0x0.raw); + dbg_rdump("reg: %03x: %x\n", r0xc, v0xc.raw); if (index & FC_DMA_SUBADDR_0) v0x0.dma_0x0.dma_0start = onoff; @@ -104,8 +104,8 @@ int flexcop_dma_xfer_control(struct flexcop_device *fc, fc->write_ibi_reg(fc, r0x0, v0x0); fc->write_ibi_reg(fc, r0xc, v0xc); - deb_rdump("reg: %03x: %x\n", r0x0, v0x0.raw); - deb_rdump("reg: %03x: %x\n", r0xc, v0xc.raw); + dbg_rdump("reg: %03x: %x\n", r0x0, v0x0.raw); + dbg_rdump("reg: %03x: %x\n", r0xc, v0xc.raw); return 0; } EXPORT_SYMBOL(flexcop_dma_xfer_control); @@ -117,7 +117,7 @@ static int flexcop_dma_remap(struct flexcop_device *fc, flexcop_ibi_register r = (dma_idx & FC_DMA_1) ? dma1_00c : dma2_01c; flexcop_ibi_value v = fc->read_ibi_reg(fc, r); - deb_info("%s\n", __func__); + dbg_info("%s\n", __func__); v.dma_0xc.remap_enable = onoff; fc->write_ibi_reg(fc, r, v); return 0; @@ -166,7 +166,7 @@ int flexcop_dma_config_timer(struct flexcop_device *fc, flexcop_dma_remap(fc, dma_idx, 0); - deb_info("%s\n", __func__); + dbg_info("%s\n", __func__); v.dma_0x4_write.dmatimer = cycles; fc->write_ibi_reg(fc, r, v); return 0; diff --git a/drivers/media/pci/b2c2/flexcop-pci.c b/drivers/media/pci/b2c2/flexcop-pci.c index a9d9520a94c6..0d90bd56a2c9 100644 --- a/drivers/media/pci/b2c2/flexcop-pci.c +++ b/drivers/media/pci/b2c2/flexcop-pci.c @@ -18,19 +18,23 @@ module_param(irq_chk_intv, int, 0644); MODULE_PARM_DESC(irq_chk_intv, "set the interval for IRQ streaming watchdog."); #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG -#define dprintk(level,args...) \ - do { if ((debug & level)) printk(args); } while (0) +#define dprintk(level, fmt, ...) \ +do { \ + if (debug & (level)) \ + printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ +} while (0) #define DEBSTATUS "" #else -#define dprintk(level,args...) +#define dprintk(level, fmt, ...) \ + no_printk(KERN_DEBUG fmt, ##__VA_ARGS__) #define DEBSTATUS " (debugging is not enabled)" #endif -#define deb_info(args...) dprintk(0x01, args) -#define deb_reg(args...) dprintk(0x02, args) -#define deb_ts(args...) dprintk(0x04, args) -#define deb_irq(args...) dprintk(0x08, args) -#define deb_chk(args...) dprintk(0x10, args) +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) +#define dbg_reg(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) +#define dbg_ts(fmt, ...) dprintk(0x04, fmt, ##__VA_ARGS__) +#define dbg_irq(fmt, ...) dprintk(0x08, fmt, ##__VA_ARGS__) +#define dbg_chk(fmt, ...) dprintk(0x10, fmt, ##__VA_ARGS__) static int debug; module_param(debug, int, 0644); @@ -82,7 +86,7 @@ static flexcop_ibi_value flexcop_pci_read_ibi_reg(struct flexcop_device *fc, if (lastrreg != r || lastrval != v.raw) { lastrreg = r; lastrval = v.raw; - deb_reg("new rd: %3x: %08x\n", r, v.raw); + dbg_reg("new rd: %3x: %08x\n", r, v.raw); } return v; @@ -95,7 +99,7 @@ static int flexcop_pci_write_ibi_reg(struct flexcop_device *fc, if (lastwreg != r || lastwval != v.raw) { lastwreg = r; lastwval = v.raw; - deb_reg("new wr: %3x: %08x\n", r, v.raw); + dbg_reg("new wr: %3x: %08x\n", r, v.raw); } writel(v.raw, fc_pci->io_mem + r); @@ -111,10 +115,10 @@ static void flexcop_pci_irq_check_work(struct work_struct *work) if (fc->feedcount) { if (fc_pci->count == fc_pci->count_prev) { - deb_chk("no IRQ since the last check\n"); + dbg_chk("no IRQ since the last check\n"); if (fc_pci->stream_problem++ == 3) { struct dvb_demux_feed *feed; - deb_info("flexcop-pci: stream problem, resetting pid filter\n"); + dbg_info("flexcop-pci: stream problem, resetting pid filter\n"); spin_lock_irq(&fc->demux.lock); list_for_each_entry(feed, &fc->demux.feed_list, @@ -156,16 +160,16 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id) /* errors */ if (v.irq_20c.Data_receiver_error) - deb_chk("data receiver error\n"); + dbg_chk("data receiver error\n"); if (v.irq_20c.Continuity_error_flag) - deb_chk("Continuity error flag is set\n"); + dbg_chk("Continuity error flag is set\n"); if (v.irq_20c.LLC_SNAP_FLAG_set) - deb_chk("LLC_SNAP_FLAG_set is set\n"); + dbg_chk("LLC_SNAP_FLAG_set is set\n"); if (v.irq_20c.Transport_Error) - deb_chk("Transport error\n"); + dbg_chk("Transport error\n"); if ((fc_pci->count % 1000) == 0) - deb_chk("%d valid irq took place so far\n", fc_pci->count); + dbg_chk("%d valid irq took place so far\n", fc_pci->count); if (v.irq_20c.DMA1_IRQ_Status == 1) { if (fc_pci->active_dma1_addr == 0) @@ -177,7 +181,7 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id) fc_pci->dma[0].cpu_addr1, fc_pci->dma[0].size / 188); - deb_irq("page change to page: %d\n",!fc_pci->active_dma1_addr); + dbg_irq("page change to page: %d\n", !fc_pci->active_dma1_addr); fc_pci->active_dma1_addr = !fc_pci->active_dma1_addr; /* for the timer IRQ we only can use buffer dmx feeding, because we don't have * complete TS packets when reading from the DMA memory */ @@ -186,17 +190,17 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id) fc->read_ibi_reg(fc,dma1_008).dma_0x8.dma_cur_addr << 2; u32 cur_pos = cur_addr - fc_pci->dma[0].dma_addr0; - deb_irq("%u irq: %08x cur_addr: %llx: cur_pos: %08x, last_cur_pos: %08x ", - jiffies_to_usecs(jiffies - fc_pci->last_irq), - v.raw, (unsigned long long)cur_addr, cur_pos, - fc_pci->last_dma1_cur_pos); + dbg_irq("%u irq: %08x cur_addr: %llx: cur_pos: %08x, last_cur_pos: %08x\n", + jiffies_to_usecs(jiffies - fc_pci->last_irq), + v.raw, (unsigned long long)cur_addr, cur_pos, + fc_pci->last_dma1_cur_pos); fc_pci->last_irq = jiffies; /* buffer end was reached, restarted from the beginning * pass the data from last_cur_pos to the buffer end to the demux */ if (cur_pos < fc_pci->last_dma1_cur_pos) { - deb_irq(" end was reached: passing %d bytes ", + dbg_irq("end was reached: passing %d bytes\n", (fc_pci->dma[0].size*2 - 1) - fc_pci->last_dma1_cur_pos); flexcop_pass_dmx_data(fc_pci->fc_dev, @@ -208,19 +212,18 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id) } if (cur_pos > fc_pci->last_dma1_cur_pos) { - deb_irq(" passing %d bytes ", + dbg_irq("passing %d bytes\n", cur_pos - fc_pci->last_dma1_cur_pos); flexcop_pass_dmx_data(fc_pci->fc_dev, fc_pci->dma[0].cpu_addr0 + fc_pci->last_dma1_cur_pos, cur_pos - fc_pci->last_dma1_cur_pos); } - deb_irq("\n"); fc_pci->last_dma1_cur_pos = cur_pos; fc_pci->count++; } else { - deb_irq("isr for flexcop called, apparently without reason (%08x)\n", + dbg_irq("isr for flexcop called, apparently without reason (%08x)\n", v.raw); ret = IRQ_NONE; } @@ -238,19 +241,19 @@ static int flexcop_pci_stream_control(struct flexcop_device *fc, int onoff) flexcop_dma_config_timer(fc, FC_DMA_1, 0); flexcop_dma_xfer_control(fc, FC_DMA_1, FC_DMA_SUBADDR_0 | FC_DMA_SUBADDR_1, 1); - deb_irq("DMA xfer enabled\n"); + dbg_irq("DMA xfer enabled\n"); fc_pci->last_dma1_cur_pos = 0; flexcop_dma_control_timer_irq(fc, FC_DMA_1, 1); - deb_irq("IRQ enabled\n"); + dbg_irq("IRQ enabled\n"); fc_pci->count_prev = fc_pci->count; } else { flexcop_dma_control_timer_irq(fc, FC_DMA_1, 0); - deb_irq("IRQ disabled\n"); + dbg_irq("IRQ disabled\n"); flexcop_dma_xfer_control(fc, FC_DMA_1, FC_DMA_SUBADDR_0 | FC_DMA_SUBADDR_1, 0); - deb_irq("DMA xfer disabled\n"); + dbg_irq("DMA xfer disabled\n"); } return 0; } diff --git a/drivers/media/usb/b2c2/flexcop-usb.c b/drivers/media/usb/b2c2/flexcop-usb.c index 198ddfb8d2b1..e4a0d09e56cf 100644 --- a/drivers/media/usb/b2c2/flexcop-usb.c +++ b/drivers/media/usb/b2c2/flexcop-usb.c @@ -15,20 +15,16 @@ /* debug */ #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG -#define dprintk(level,args...) \ - do { if ((debug & level)) printk(args); } while (0) - -#define debug_dump(b, l, method) do {\ - int i; \ - for (i = 0; i < l; i++) \ - method("%02x ", b[i]); \ - method("\n"); \ +#define dprintk(level, fmt, ...) \ +do { \ + if (debug & (level)) \ + printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ } while (0) #define DEBSTATUS "" #else -#define dprintk(level, args...) -#define debug_dump(b, l, method) +#define dprintk(level, fmt, ...) \ + no_printk(KERN_DEBUG fmt, ##__VA_ARGS__) #define DEBSTATUS " (debugging is not enabled)" #endif @@ -37,11 +33,11 @@ module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info,ts=2,ctrl=4,i2c=8,v8mem=16 (or-able))." DEBSTATUS); #undef DEBSTATUS -#define deb_info(args...) dprintk(0x01, args) -#define deb_ts(args...) dprintk(0x02, args) -#define deb_ctrl(args...) dprintk(0x04, args) -#define deb_i2c(args...) dprintk(0x08, args) -#define deb_v8(args...) dprintk(0x10, args) +#define dbg_info(args...) dprintk(0x01, args) +#define dbg_ts(args...) dprintk(0x02, args) +#define dbg_ctrl(args...) dprintk(0x04, args) +#define dbg_i2c(args...) dprintk(0x08, args) +#define dbg_v8(args...) dprintk(0x10, args) /* JLP 111700: we will include the 1 bit gap between the upper and lower 3 bits * in the IBI address, to make the V8 code simpler. @@ -137,11 +133,11 @@ static int flexcop_usb_v8_memory_req(struct flexcop_usb *fc_usb, pipe = B2C2_USB_CTRL_PIPE_OUT; break; default: - deb_info("unsupported request for v8_mem_req %x.\n", req); + dbg_info("unsupported request for v8_mem_req %x\n", req); return -EINVAL; } - deb_v8("v8mem: %02x %02x %04x %04x, len: %d\n", request_type, req, - wAddress, wIndex, buflen); + dbg_v8("v8mem: %02x %02x %04x %04x, len: %d\n", + request_type, req, wAddress, wIndex, buflen); mutex_lock(&fc_usb->data_mutex); @@ -167,7 +163,7 @@ static int flexcop_usb_v8_memory_req(struct flexcop_usb *fc_usb, mutex_unlock(&fc_usb->data_mutex); - debug_dump(pbBuffer, ret, deb_v8); + dbg_v8("v8mem buffer: %*ph\n", ret, pbBuffer); return ret; } @@ -202,9 +198,9 @@ static int flexcop_usb_memory_req(struct flexcop_usb *fc_usb, wMax < bytes_left_to_read_on_page(addr, len) ? wMax : bytes_left_to_read_on_page(addr, len); - deb_info("%x\n", - (addr & V8_MEMORY_PAGE_MASK) | - (V8_MEMORY_EXTENDED*extended)); + dbg_info("%x\n", + (addr & V8_MEMORY_PAGE_MASK) | + (V8_MEMORY_EXTENDED * extended)); ret = flexcop_usb_v8_memory_req(fc_usb, req, page_start + (addr / V8_MEMORY_PAGE_SIZE), @@ -259,16 +255,16 @@ static int flexcop_usb_i2c_req(struct flexcop_i2c_adapter *i2c, request_type |= USB_DIR_IN; break; default: - deb_info("unsupported function for i2c_req %x\n", func); + dbg_info("unsupported function for i2c_req %x\n", func); return -EINVAL; } wValue = (func << 8) | (i2c->port << 4); wIndex = (chipaddr << 8 ) | addr; - deb_i2c("i2c %2d: %02x %02x %02x %02x %02x %02x\n", - func, request_type, req, - wValue & 0xff, wValue >> 8, - wIndex & 0xff, wIndex >> 8); + dbg_i2c("i2c %2d: %02x %02x %02x %02x %02x %02x\n", + func, request_type, req, + wValue & 0xff, wValue >> 8, + wIndex & 0xff, wIndex >> 8); mutex_lock(&fc_usb->data_mutex); @@ -332,8 +328,8 @@ static void flexcop_usb_process_frame(struct flexcop_usb *fc_usb, u8 *b; int l; - deb_ts("tmp_buffer_length=%d, buffer_length=%d\n", - fc_usb->tmp_buffer_length, buffer_length); + dbg_ts("tmp_buffer_length=%d, buffer_length=%d\n", + fc_usb->tmp_buffer_length, buffer_length); if (fc_usb->tmp_buffer_length > 0) { memcpy(fc_usb->tmp_buffer+fc_usb->tmp_buffer_length, buffer, @@ -354,17 +350,17 @@ static void flexcop_usb_process_frame(struct flexcop_usb *fc_usb, flexcop_pass_dmx_packets( fc_usb->fc_dev, b+2, 1); else - deb_ts("not ts packet %*ph\n", 4, b+2); + dbg_ts("not ts packet %*ph\n", 4, b + 2); b += 190; l -= 190; break; default: - deb_ts("wrong packet type\n"); + dbg_ts("wrong packet type\n"); l = 0; break; } } else { - deb_ts("wrong header\n"); + dbg_ts("wrong header\n"); l = 0; } } @@ -380,8 +376,8 @@ static void flexcop_usb_urb_complete(struct urb *urb) int i; if (urb->actual_length > 0) - deb_ts("urb completed, bufsize: %d actlen; %d\n", - urb->transfer_buffer_length, urb->actual_length); + dbg_ts("urb completed, bufsize: %d actlen; %d\n", + urb->transfer_buffer_length, urb->actual_length); for (i = 0; i < urb->number_of_packets; i++) { if (urb->iso_frame_desc[i].status < 0) { @@ -389,8 +385,8 @@ static void flexcop_usb_urb_complete(struct urb *urb) urb->iso_frame_desc[i].status); } else if (urb->iso_frame_desc[i].actual_length > 0) { - deb_ts("passed %d bytes to the demux\n", - urb->iso_frame_desc[i].actual_length); + dbg_ts("passed %d bytes to the demux\n", + urb->iso_frame_desc[i].actual_length); flexcop_usb_process_frame(fc_usb, urb->transfer_buffer + @@ -414,7 +410,7 @@ static void flexcop_usb_transfer_exit(struct flexcop_usb *fc_usb) int i; for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++) if (fc_usb->iso_urb[i] != NULL) { - deb_ts("unlinking/killing urb no. %d\n",i); + dbg_ts("unlinking/killing urb no. %d\n", i); usb_kill_urb(fc_usb->iso_urb[i]); usb_free_urb(fc_usb->iso_urb[i]); } @@ -433,9 +429,9 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb) frame_size, i, j, ret; int buffer_offset = 0; - deb_ts("creating %d iso-urbs with %d frames each of %d bytes size = %d.\n", + dbg_ts("creating %d iso-urbs with %d frames each of %d bytes size = %d\n", B2C2_USB_NUM_ISO_URB, - B2C2_USB_FRAMES_PER_ISO, frame_size, bufsize); + B2C2_USB_FRAMES_PER_ISO, frame_size, bufsize); fc_usb->iso_buffer = usb_alloc_coherent(fc_usb->udev, bufsize, GFP_KERNEL, &fc_usb->dma_addr); @@ -459,7 +455,7 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb) for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++) { int frame_offset = 0; struct urb *urb = fc_usb->iso_urb[i]; - deb_ts("initializing and submitting urb no. %d (buf_offset: %d).\n", + dbg_ts("initializing and submitting urb no. %d (buf_offset: %d)\n", i, buffer_offset); urb->dev = fc_usb->udev; @@ -474,8 +470,8 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb) buffer_offset += frame_size * B2C2_USB_FRAMES_PER_ISO; for (j = 0; j < B2C2_USB_FRAMES_PER_ISO; j++) { - deb_ts("urb no: %d, frame: %d, frame_offset: %d\n", - i, j, frame_offset); + dbg_ts("urb no: %d, frame: %d, frame_offset: %d\n", + i, j, frame_offset); urb->iso_frame_desc[j].offset = frame_offset; urb->iso_frame_desc[j].length = frame_size; frame_offset += frame_size; @@ -485,7 +481,7 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb) err("submitting urb %d failed with %d.", i, ret); goto urb_error; } - deb_ts("submitted urb no. %d.\n",i); + dbg_ts("submitted urb no. %d\n", i); } /* SRAM */ diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c index 8a3c0eeed959..b7d4c62875a9 100644 --- a/drivers/media/usb/dvb-usb-v2/lmedm04.c +++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c @@ -83,9 +83,9 @@ static int dvb_usb_lme2510_debug; if ((var >= level)) \ pr_debug(DVB_USB_LOG_PREFIX": " args); \ } while (0) -#define deb_info(level, args...) lme_debug(dvb_usb_lme2510_debug, level, args) +#define dbg_info(level, args...) lme_debug(dvb_usb_lme2510_debug, level, args) #define debug_data_snipet(level, name, p) \ - deb_info(level, name" (%8phN)", p); + dbg_info(level, name " (%8phN)", p); #define info(args...) pr_info(DVB_USB_LOG_PREFIX": "args) module_param_named(debug, dvb_usb_lme2510_debug, int, 0644); @@ -185,7 +185,7 @@ static int lme2510_enable_pid(struct dvb_usb_device *d, u8 index, u16 pid_out) u8 pid_no = index * 2; u8 pid_len = pid_no + 2; int ret = 0; - deb_info(1, "PID Setting Pid %04x", pid_out); + dbg_info(1, "PID Setting Pid %04x", pid_out); if (st->pid_size == 0) ret |= lme2510_stream_restart(d); @@ -293,8 +293,8 @@ static void lme2510_int_response(struct urb *lme_urb) for (i = 0; i < offset; ++i) { ibuf = (u8 *)&rbuf[i*8]; - deb_info(5, "INT O/S C =%02x C/O=%02x Type =%02x%02x", - offset, i, ibuf[0], ibuf[1]); + dbg_info(5, "INT O/S C =%02x C/O=%02x Type =%02x%02x", + offset, i, ibuf[0], ibuf[1]); switch (ibuf[0]) { case 0xaa: @@ -307,7 +307,7 @@ static void lme2510_int_response(struct urb *lme_urb) ibuf[4] << 8 | ibuf[5]); - deb_info(1, "INT Key = 0x%08x", key); + dbg_info(1, "INT Key = 0x%08x", key); rc_keydown(adap_to_d(adap)->rc_dev, RC_PROTO_NEC32, key, 0); break; @@ -407,7 +407,7 @@ static int lme2510_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff) static u8 rbuf[1]; int ret = 0; - deb_info(1, "PID Clearing Filter"); + dbg_info(1, "PID Clearing Filter"); mutex_lock(&d->i2c_mutex); @@ -431,8 +431,8 @@ static int lme2510_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, struct dvb_usb_device *d = adap_to_d(adap); int ret = 0; - deb_info(3, "%s PID=%04x Index=%04x onoff=%02x", __func__, - pid, index, onoff); + dbg_info(3, "%s PID=%04x Index=%04x onoff=%02x", + __func__, pid, index, onoff); if (onoff) { mutex_lock(&d->i2c_mutex); @@ -521,7 +521,7 @@ static int lme2510_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], } if (lme2510_msg(d, obuf, len, ibuf, 64) < 0) { - deb_info(1, "i2c transfer failed."); + dbg_info(1, "i2c transfer failed."); mutex_unlock(&d->i2c_mutex); return -EAGAIN; } @@ -559,13 +559,13 @@ static int lme2510_streaming_ctrl(struct dvb_frontend *fe, int onoff) static u8 rbuf[1]; int ret = 0, rlen = sizeof(rbuf); - deb_info(1, "STM (%02x)", onoff); + dbg_info(1, "STM (%02x)", onoff); /* Streaming is started by FE_HAS_LOCK */ if (onoff == 1) st->stream_on = 1; else { - deb_info(1, "STM Steam Off"); + dbg_info(1, "STM Steam Off"); /* mutex is here only to avoid collision with I2C */ mutex_lock(&d->i2c_mutex); @@ -625,8 +625,8 @@ static int lme2510_download_firmware(struct dvb_usb_device *d, memcpy(&data[2], fw_data, dlen+1); wlen = (u8) dlen + 4; data[wlen-1] = check_sum(fw_data, dlen+1); - deb_info(1, "Data S=%02x:E=%02x CS= %02x", data[3], - data[dlen+2], data[dlen+3]); + dbg_info(1, "Data S=%02x:E=%02x CS= %02x", + data[3], data[dlen + 2], data[dlen + 3]); lme2510_usb_talk(d, data, wlen, data, len_in); ret |= (data[0] == 0x88) ? 0 : -1; } @@ -756,7 +756,7 @@ static int lme2510_kill_urb(struct usb_data_stream *stream) int i; for (i = 0; i < stream->urbs_submitted; i++) { - deb_info(3, "killing URB no. %d.", i); + dbg_info(3, "killing URB no. %d.", i); /* stop the URB */ usb_kill_urb(stream->urb_list[i]); } diff --git a/drivers/media/usb/dvb-usb/a800.c b/drivers/media/usb/dvb-usb/a800.c index 36b5b6227412..a8383a3c4fc8 100644 --- a/drivers/media/usb/dvb-usb/a800.c +++ b/drivers/media/usb/dvb-usb/a800.c @@ -18,7 +18,7 @@ MODULE_PARM_DESC(debug, "set debugging level (rc=1 (or-able))." DVB_USB_DEBUG_ST DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); -#define deb_rc(args...) dprintk(debug,0x01,args) +#define dbg_rc(fmt, ...) dprintk(debug, 0x01, fmt, ##__VA_ARGS__) static int a800_power_ctrl(struct dvb_usb_device *d, int onoff) { diff --git a/drivers/media/usb/dvb-usb/af9005-fe.c b/drivers/media/usb/dvb-usb/af9005-fe.c index 9d6fa0556d7b..e78615d4d5bf 100644 --- a/drivers/media/usb/dvb-usb/af9005-fe.c +++ b/drivers/media/usb/dvb-usb/af9005-fe.c @@ -139,7 +139,7 @@ static int af9005_get_post_vit_err_cw_count(struct dvb_frontend *fe, if (ret) return ret; if (!temp) { - deb_info("rsd counter not ready\n"); + dbg_info("rsd counter not ready\n"); return 100; } /* get abort count */ @@ -192,7 +192,7 @@ static int af9005_get_post_vit_err_cw_count(struct dvb_frontend *fe, err("wrong RSD packet count"); return -EIO; } - deb_info("POST abort count %d err count %d rsd packets %d\n", + dbg_info("POST abort count %d err count %d rsd packets %d\n", loc_abort_count, err_count, cw_count); *post_cw_count = cw_count - (u32) loc_abort_count; *abort_count = loc_abort_count; @@ -236,7 +236,7 @@ static int af9005_get_pre_vit_err_bit_count(struct dvb_frontend *fe, if (ret) return ret; if (!temp) { - deb_info("viterbi counter not ready\n"); + dbg_info("viterbi counter not ready\n"); return 101; /* ERR_APO_VTB_COUNTER_NOT_READY; */ } ret = @@ -268,7 +268,7 @@ static int af9005_get_pre_vit_err_bit_count(struct dvb_frontend *fe, return ret; super_frame_count = ((u32) temp1 << 8) + temp0; if (super_frame_count == 0) { - deb_info("super frame count 0\n"); + dbg_info("super frame count 0\n"); return 102; } @@ -312,7 +312,7 @@ static int af9005_get_pre_vit_err_bit_count(struct dvb_frontend *fe, return -EINVAL; } *pre_bit_count = super_frame_count * 68 * 4 * x * bits; - deb_info("PRE err count %d frame count %d bit count %d\n", + dbg_info("PRE err count %d frame count %d bit count %d\n", *pre_err_count, super_frame_count, *pre_bit_count); return 0; } @@ -372,12 +372,12 @@ static int af9005_get_statistic(struct dvb_frontend *fe) int ret, fecavailable; u64 numerator, denominator; - deb_info("GET STATISTIC\n"); + dbg_info("GET STATISTIC\n"); ret = af9005_is_fecmon_available(fe, &fecavailable); if (ret) return ret; if (!fecavailable) { - deb_info("fecmon not available\n"); + dbg_info("fecmon not available\n"); return 0; } @@ -414,7 +414,7 @@ static int af9005_fe_refresh_state(struct dvb_frontend *fe) { struct af9005_fe_state *state = fe->demodulator_priv; if (time_after(jiffies, state->next_status_check)) { - deb_info("REFRESH STATE\n"); + dbg_info("REFRESH STATE\n"); /* statistics */ if (af9005_get_statistic(fe)) @@ -468,7 +468,7 @@ static int af9005_fe_read_status(struct dvb_frontend *fe, if (ret) return ret; if (temp != state->strong) { - deb_info("adjust for strong signal %d\n", temp); + dbg_info("adjust for strong signal %d\n", temp); state->strong = temp; } return 0; @@ -787,7 +787,7 @@ static int af9005_fe_power(struct dvb_frontend *fe, int on) struct af9005_fe_state *state = fe->demodulator_priv; u8 temp = on; int ret; - deb_info("power %s tuner\n", on ? "on" : "off"); + dbg_info("power %s tuner\n", on ? "on" : "off"); ret = af9005_send_command(state->d, 0x03, &temp, 1, NULL, 0); return ret; } @@ -809,10 +809,10 @@ static int af9005_fe_init(struct dvb_frontend *fe) u8 buf[2]; u16 if1; - deb_info("in af9005_fe_init\n"); + dbg_info("in %s\n", __func__); /* reset */ - deb_info("reset\n"); + dbg_info("reset\n"); if ((ret = af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst_en, 4, 1, 0x01))) @@ -820,7 +820,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) if ((ret = af9005_write_ofdm_register(state->d, APO_REG_RESET, 0))) return ret; /* clear ofdm reset */ - deb_info("clear ofdm reset\n"); + dbg_info("clear ofdm reset\n"); for (i = 0; i < 150; i++) { if ((ret = af9005_read_ofdm_register(state->d, @@ -876,7 +876,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) return ret; /* set stand alone chip */ - deb_info("set stand alone chip\n"); + dbg_info("set stand alone chip\n"); if ((ret = af9005_write_register_bits(state->d, xd_p_reg_dca_stand_alone, reg_dca_stand_alone_pos, @@ -884,7 +884,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) return ret; /* set dca upper & lower chip */ - deb_info("set dca upper & lower chip\n"); + dbg_info("set dca upper & lower chip\n"); if ((ret = af9005_write_register_bits(state->d, xd_p_reg_dca_upper_chip, reg_dca_upper_chip_pos, @@ -897,13 +897,13 @@ static int af9005_fe_init(struct dvb_frontend *fe) return ret; /* set 2wire master clock to 0x14 (for 60KHz) */ - deb_info("set 2wire master clock to 0x14 (for 60KHz)\n"); + dbg_info("set 2wire master clock to 0x14 (for 60KHz)\n"); if ((ret = af9005_write_ofdm_register(state->d, xd_I2C_i2c_m_period, 0x14))) return ret; /* clear dca enable chip */ - deb_info("clear dca enable chip\n"); + dbg_info("clear dca enable chip\n"); if ((ret = af9005_write_register_bits(state->d, xd_p_reg_dca_en, reg_dca_en_pos, reg_dca_en_len, 0))) @@ -917,12 +917,12 @@ static int af9005_fe_init(struct dvb_frontend *fe) return ret; /* init other parameters: program cfoe and select bandwidth */ - deb_info("program cfoe\n"); + dbg_info("program cfoe\n"); ret = af9005_fe_program_cfoe(state->d, 6000000); if (ret) return ret; /* set read-update bit for modulation */ - deb_info("set read-update bit for modulation\n"); + dbg_info("set read-update bit for modulation\n"); if ((ret = af9005_write_register_bits(state->d, xd_p_reg_feq_read_update, reg_feq_read_update_pos, @@ -933,7 +933,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) but sniffing reveals that it doesn't do it */ /* set read-update bit to 1 for DCA modulation */ - deb_info("set read-update bit 1 for DCA modulation\n"); + dbg_info("set read-update bit 1 for DCA modulation\n"); if ((ret = af9005_write_register_bits(state->d, xd_p_reg_dca_read_update, reg_dca_read_update_pos, @@ -941,7 +941,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) return ret; /* enable fec monitor */ - deb_info("enable fec monitor\n"); + dbg_info("enable fec monitor\n"); if ((ret = af9005_write_register_bits(state->d, xd_p_fec_vtb_rsd_mon_en, fec_vtb_rsd_mon_en_pos, @@ -952,12 +952,12 @@ static int af9005_fe_init(struct dvb_frontend *fe) ret = af9005_write_ofdm_register(state->d, 0xa601, 0); /* set api_retrain_never_freeze */ - deb_info("set api_retrain_never_freeze\n"); + dbg_info("set api_retrain_never_freeze\n"); if ((ret = af9005_write_ofdm_register(state->d, 0xaefb, 0x01))) return ret; /* load init script */ - deb_info("load init script\n"); + dbg_info("load init script\n"); scriptlen = sizeof(script) / sizeof(RegDesc); for (i = 0; i < scriptlen; i++) { if ((ret = @@ -989,7 +989,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) /* save original TOPs */ - deb_info("save original TOPs\n"); + dbg_info("save original TOPs\n"); /* RF TOP */ ret = @@ -1031,7 +1031,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) err("Impossible to read EEPROM\n"); return ret; } - deb_info("Tuner id %d, board id %d\n", buf[0], buf[1]); + dbg_info("Tuner id %d, board id %d\n", buf[0], buf[1]); switch (buf[0]) { case 2: /* MT2060 */ /* read if1 from eeprom */ @@ -1043,7 +1043,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) if1 = (u16) (buf[0] << 8) + buf[1]; if (dvb_attach(mt2060_attach, fe, &adap->dev->i2c_adap, &af9005_mt2060_config, if1) == NULL) { - deb_info("MT2060 attach failed\n"); + dbg_info("MT2060 attach failed\n"); return -ENODEV; } break; @@ -1051,7 +1051,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) case 9: /* QT1010B */ if (dvb_attach(qt1010_attach, fe, &adap->dev->i2c_adap, &af9005_qt1010_config) ==NULL) { - deb_info("QT1010 attach failed\n"); + dbg_info("QT1010 attach failed\n"); return -ENODEV; } break; @@ -1064,7 +1064,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) return ret; } - deb_info("profit!\n"); + dbg_info("profit!\n"); return 0; } @@ -1095,14 +1095,14 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe) int ret; u8 temp, temp0, temp1, temp2; - deb_info("af9005_fe_set_frontend freq %d bw %d\n", fep->frequency, - fep->bandwidth_hz); + dbg_info("%s: freq %d bw %d\n", + __func__, fep->frequency, fep->bandwidth_hz); if (fe->ops.tuner_ops.release == NULL) { err("Tuner not attached"); return -ENODEV; } - deb_info("turn off led\n"); + dbg_info("turn off led\n"); /* not in the log */ ret = af9005_led_control(state->d, 0); if (ret) @@ -1113,7 +1113,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe) return ret; /* set FCW to default value */ - deb_info("set FCW to default value\n"); + dbg_info("set FCW to default value\n"); temp0 = (u8) (state->original_fcw & 0x000000ff); temp1 = (u8) ((state->original_fcw & 0x0000ff00) >> 8); temp2 = (u8) ((state->original_fcw & 0x00ff0000) >> 16); @@ -1128,7 +1128,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe) return ret; /* restore original TOPs */ - deb_info("restore original TOPs\n"); + dbg_info("restore original TOPs\n"); ret = af9005_write_word_agc(state->d, xd_p_reg_aagc_rf_top_numerator_9_8, @@ -1155,7 +1155,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe) return ret; /* select bandwidth */ - deb_info("select bandwidth"); + dbg_info("select bandwidth"); ret = af9005_fe_select_bw(state->d, fep->bandwidth_hz); if (ret) return ret; @@ -1164,33 +1164,33 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe) return ret; /* clear easy mode flag */ - deb_info("clear easy mode flag\n"); + dbg_info("clear easy mode flag\n"); ret = af9005_write_ofdm_register(state->d, 0xaefd, 0); if (ret) return ret; /* set unplug threshold to original value */ - deb_info("set unplug threshold to original value\n"); + dbg_info("set unplug threshold to original value\n"); ret = af9005_write_ofdm_register(state->d, xd_p_reg_unplug_th, state->original_if_unplug_th); if (ret) return ret; /* set tuner */ - deb_info("set tuner\n"); + dbg_info("set tuner\n"); ret = fe->ops.tuner_ops.set_params(fe); if (ret) return ret; /* trigger ofsm */ - deb_info("trigger ofsm\n"); + dbg_info("trigger ofsm\n"); temp = 0; ret = af9005_write_tuner_registers(state->d, 0xffff, &temp, 1); if (ret) return ret; /* clear retrain and freeze flag */ - deb_info("clear retrain and freeze flag\n"); + dbg_info("clear retrain and freeze flag\n"); ret = af9005_write_register_bits(state->d, xd_p_reg_api_retrain_request, @@ -1228,20 +1228,20 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, &temp); if (ret) return ret; - deb_info("===== fe_get_frontend_legacy = =============\n"); - deb_info("CONSTELLATION "); + dbg_info("===== fe_get_frontend_legacy = =============\n"); + dbg_info("CONSTELLATION "); switch (temp) { case 0: fep->modulation = QPSK; - deb_info("QPSK\n"); + dbg_info("QPSK\n"); break; case 1: fep->modulation = QAM_16; - deb_info("QAM_16\n"); + dbg_info("QAM_16\n"); break; case 2: fep->modulation = QAM_64; - deb_info("QAM_64\n"); + dbg_info("QAM_64\n"); break; } @@ -1252,23 +1252,23 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, &temp); if (ret) return ret; - deb_info("HIERARCHY "); + dbg_info("HIERARCHY "); switch (temp) { case 0: fep->hierarchy = HIERARCHY_NONE; - deb_info("NONE\n"); + dbg_info("NONE\n"); break; case 1: fep->hierarchy = HIERARCHY_1; - deb_info("1\n"); + dbg_info("1\n"); break; case 2: fep->hierarchy = HIERARCHY_2; - deb_info("2\n"); + dbg_info("2\n"); break; case 3: fep->hierarchy = HIERARCHY_4; - deb_info("4\n"); + dbg_info("4\n"); break; } @@ -1279,7 +1279,7 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, if (ret) return ret; /* if temp is set = high priority */ - deb_info("PRIORITY %s\n", temp ? "high" : "low"); + dbg_info("PRIORITY %s\n", temp ? "high" : "low"); /* high coderate */ ret = @@ -1288,27 +1288,27 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, &temp); if (ret) return ret; - deb_info("CODERATE HP "); + dbg_info("CODERATE HP "); switch (temp) { case 0: fep->code_rate_HP = FEC_1_2; - deb_info("FEC_1_2\n"); + dbg_info("FEC_1_2\n"); break; case 1: fep->code_rate_HP = FEC_2_3; - deb_info("FEC_2_3\n"); + dbg_info("FEC_2_3\n"); break; case 2: fep->code_rate_HP = FEC_3_4; - deb_info("FEC_3_4\n"); + dbg_info("FEC_3_4\n"); break; case 3: fep->code_rate_HP = FEC_5_6; - deb_info("FEC_5_6\n"); + dbg_info("FEC_5_6\n"); break; case 4: fep->code_rate_HP = FEC_7_8; - deb_info("FEC_7_8\n"); + dbg_info("FEC_7_8\n"); break; } @@ -1319,27 +1319,27 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, &temp); if (ret) return ret; - deb_info("CODERATE LP "); + dbg_info("CODERATE LP "); switch (temp) { case 0: fep->code_rate_LP = FEC_1_2; - deb_info("FEC_1_2\n"); + dbg_info("FEC_1_2\n"); break; case 1: fep->code_rate_LP = FEC_2_3; - deb_info("FEC_2_3\n"); + dbg_info("FEC_2_3\n"); break; case 2: fep->code_rate_LP = FEC_3_4; - deb_info("FEC_3_4\n"); + dbg_info("FEC_3_4\n"); break; case 3: fep->code_rate_LP = FEC_5_6; - deb_info("FEC_5_6\n"); + dbg_info("FEC_5_6\n"); break; case 4: fep->code_rate_LP = FEC_7_8; - deb_info("FEC_7_8\n"); + dbg_info("FEC_7_8\n"); break; } @@ -1349,23 +1349,23 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, reg_tpsd_gi_pos, reg_tpsd_gi_len, &temp); if (ret) return ret; - deb_info("GUARD INTERVAL "); + dbg_info("GUARD INTERVAL "); switch (temp) { case 0: fep->guard_interval = GUARD_INTERVAL_1_32; - deb_info("1_32\n"); + dbg_info("1_32\n"); break; case 1: fep->guard_interval = GUARD_INTERVAL_1_16; - deb_info("1_16\n"); + dbg_info("1_16\n"); break; case 2: fep->guard_interval = GUARD_INTERVAL_1_8; - deb_info("1_8\n"); + dbg_info("1_8\n"); break; case 3: fep->guard_interval = GUARD_INTERVAL_1_4; - deb_info("1_4\n"); + dbg_info("1_4\n"); break; } @@ -1376,15 +1376,15 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, &temp); if (ret) return ret; - deb_info("TRANSMISSION MODE "); + dbg_info("TRANSMISSION MODE "); switch (temp) { case 0: fep->transmission_mode = TRANSMISSION_MODE_2K; - deb_info("2K\n"); + dbg_info("2K\n"); break; case 1: fep->transmission_mode = TRANSMISSION_MODE_8K; - deb_info("8K\n"); + dbg_info("8K\n"); break; } @@ -1392,19 +1392,19 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, ret = af9005_read_register_bits(state->d, xd_g_reg_bw, reg_bw_pos, reg_bw_len, &temp); - deb_info("BANDWIDTH "); + dbg_info("BANDWIDTH "); switch (temp) { case 0: fep->bandwidth_hz = 6000000; - deb_info("6\n"); + dbg_info("6\n"); break; case 1: fep->bandwidth_hz = 7000000; - deb_info("7\n"); + dbg_info("7\n"); break; case 2: fep->bandwidth_hz = 8000000; - deb_info("8\n"); + dbg_info("8\n"); break; } return 0; @@ -1428,7 +1428,7 @@ struct dvb_frontend *af9005_fe_attach(struct dvb_usb_device *d) if (state == NULL) goto error; - deb_info("attaching frontend af9005\n"); + dbg_info("attaching frontend af9005\n"); state->d = d; state->opened = 0; diff --git a/drivers/media/usb/dvb-usb/af9005-remote.c b/drivers/media/usb/dvb-usb/af9005-remote.c index 41d48b3c8d05..9eff44ff7967 100644 --- a/drivers/media/usb/dvb-usb/af9005-remote.c +++ b/drivers/media/usb/dvb-usb/af9005-remote.c @@ -18,7 +18,8 @@ MODULE_PARM_DESC(debug, "enable (1) or disable (0) debug messages." DVB_USB_DEBUG_STATUS); -#define deb_decode(args...) dprintk(dvb_usb_af9005_remote_debug,0x01,args) +#define dbg_decode(fmt, ...) \ + dprintk(dvb_usb_af9005_remote_debug, 0x01, fmt, ##__VA_ARGS__) struct rc_map_table rc_map_af9005_table[] = { @@ -86,12 +87,12 @@ int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, u32 * event, if (d->last_event == repeatable_keys[i]) { *state = REMOTE_KEY_REPEAT; *event = d->last_event; - deb_decode("repeat key, event %x\n", + dbg_decode("repeat key, event %x\n", *event); return 0; } } - deb_decode("repeated key ignored (non repeatable)\n"); + dbg_decode("repeated key ignored (non repeatable)\n"); return 0; } else if (len >= 33 * 4) { /*32 bits + start code */ result = 0; @@ -104,17 +105,16 @@ int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, u32 * event, if (mark * 2 > space) result += 1; } - deb_decode("key pressed, raw value %x\n", result); + dbg_decode("key pressed, raw value %x\n", result); if ((result & 0xff000000) != 0xfe000000) { - deb_decode - ("doesn't start with 0xfe, ignored\n"); + dbg_decode("doesn't start with 0xfe, ignored\n"); return 0; } cust = (result >> 16) & 0xff; dat = (result >> 8) & 0xff; invdat = (~result) & 0xff; if (dat != invdat) { - deb_decode("code != inverted code\n"); + dbg_decode("code != inverted code\n"); return 0; } for (i = 0; i < rc_map_af9005_table_size; i++) { @@ -122,12 +122,12 @@ int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, u32 * event, && rc5_data(&rc_map_af9005_table[i]) == dat) { *event = rc_map_af9005_table[i].keycode; *state = REMOTE_KEY_PRESSED; - deb_decode - ("key pressed, event %x\n", *event); + dbg_decode("key pressed, event %x\n", + *event); return 0; } } - deb_decode("not found in table\n"); + dbg_decode("not found in table\n"); } } return 0; diff --git a/drivers/media/usb/dvb-usb/af9005.c b/drivers/media/usb/dvb-usb/af9005.c index b6a2436d16e9..c7239ae61552 100644 --- a/drivers/media/usb/dvb-usb/af9005.c +++ b/drivers/media/usb/dvb-usb/af9005.c @@ -134,14 +134,13 @@ static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg, int af9005_read_ofdm_register(struct dvb_usb_device *d, u16 reg, u8 * value) { int ret; - deb_reg("read register %x ", reg); ret = af9005_generic_read_write(d, reg, AF9005_CMD_READ, AF9005_OFDM_REG, value, 1); if (ret) - deb_reg("failed\n"); + dbg_reg("read register %x failed\n", reg); else - deb_reg("value %x\n", *value); + dbg_reg("read register %x value %x\n", reg, *value); return ret; } @@ -149,14 +148,14 @@ int af9005_read_ofdm_registers(struct dvb_usb_device *d, u16 reg, u8 * values, int len) { int ret; - deb_reg("read %d registers %x ", len, reg); ret = af9005_generic_read_write(d, reg, AF9005_CMD_READ, AF9005_OFDM_REG, values, len); if (ret) - deb_reg("failed\n"); + dbg_reg("read %d registers %x failed\n", len, reg); else - debug_dump(values, len, deb_reg); + dbg_reg("read %d registers %x %*ph\n", len, reg, len, values); + return ret; } @@ -164,14 +163,12 @@ int af9005_write_ofdm_register(struct dvb_usb_device *d, u16 reg, u8 value) { int ret; u8 temp = value; - deb_reg("write register %x value %x ", reg, value); ret = af9005_generic_read_write(d, reg, AF9005_CMD_WRITE, AF9005_OFDM_REG, &temp, 1); - if (ret) - deb_reg("failed\n"); - else - deb_reg("ok\n"); + dbg_reg("write register %x value %x %s\n", + reg, value, ret ? "failed" : "ok"); + return ret; } @@ -179,16 +176,15 @@ int af9005_write_ofdm_registers(struct dvb_usb_device *d, u16 reg, u8 * values, int len) { int ret; - deb_reg("write %d registers %x values ", len, reg); - debug_dump(values, len, deb_reg); + dbg_reg("write %d registers %x values %*ph\n", len, reg, len, values); ret = af9005_generic_read_write(d, reg, AF9005_CMD_WRITE, AF9005_OFDM_REG, values, len); if (ret) - deb_reg("failed\n"); + dbg_reg("failed\n"); else - deb_reg("ok\n"); + dbg_reg("ok\n"); return ret; } @@ -197,14 +193,14 @@ int af9005_read_register_bits(struct dvb_usb_device *d, u16 reg, u8 pos, { u8 temp; int ret; - deb_reg("read bits %x %x %x", reg, pos, len); + dbg_reg("read bits %x %x %x", reg, pos, len); ret = af9005_read_ofdm_register(d, reg, &temp); if (ret) { - deb_reg(" failed\n"); + dbg_reg("read bits %x %x %x failed\n", reg, pos, len); return ret; } *value = (temp >> pos) & regmask[len - 1]; - deb_reg(" value %x\n", *value); + dbg_reg("read bits %x %x %x value %x\n", reg, pos, len, *value); return 0; } @@ -214,7 +210,7 @@ int af9005_write_register_bits(struct dvb_usb_device *d, u16 reg, u8 pos, { u8 temp, mask; int ret; - deb_reg("write bits %x %x %x value %x\n", reg, pos, len, value); + dbg_reg("write bits %x %x %x value %x\n", reg, pos, len, value); if (pos == 0 && len == 8) return af9005_write_ofdm_register(d, reg, value); ret = af9005_read_ofdm_register(d, reg, &temp); @@ -353,9 +349,8 @@ static int af9005_i2c_write(struct dvb_usb_device *d, u8 i2caddr, u8 reg, { int ret, i; u8 buf[3]; - deb_i2c("i2c_write i2caddr %x, reg %x, len %d data ", i2caddr, - reg, len); - debug_dump(data, len, deb_i2c); + dbg_i2c("i2c_write i2caddr %x, reg %x, len %d data %*ph\n", + i2caddr, reg, len, len, data); for (i = 0; i < len; i++) { buf[0] = i2caddr; @@ -366,11 +361,11 @@ static int af9005_i2c_write(struct dvb_usb_device *d, u8 i2caddr, u8 reg, APO_REG_I2C_RW_SILICON_TUNER, buf, 3); if (ret) { - deb_i2c("i2c_write failed\n"); + dbg_i2c("i2c_write failed\n"); return ret; } } - deb_i2c("i2c_write ok\n"); + dbg_i2c("i2c_write ok\n"); return 0; } @@ -379,7 +374,7 @@ static int af9005_i2c_read(struct dvb_usb_device *d, u8 i2caddr, u8 reg, { int ret, i; u8 temp; - deb_i2c("i2c_read i2caddr %x, reg %x, len %d\n ", i2caddr, reg, len); + dbg_i2c("i2c_read i2caddr %x, reg %x, len %d\n ", i2caddr, reg, len); for (i = 0; i < len; i++) { temp = reg + i; ret = @@ -387,13 +382,12 @@ static int af9005_i2c_read(struct dvb_usb_device *d, u8 i2caddr, u8 reg, APO_REG_I2C_RW_SILICON_TUNER, i2caddr, &temp, 1); if (ret) { - deb_i2c("i2c_read failed\n"); + dbg_i2c("i2c_read failed\n"); return ret; } data[i] = temp; } - deb_i2c("i2c data read: "); - debug_dump(data, len, deb_i2c); + dbg_i2c("i2c data read: %*ph\n", len, data); return 0; } @@ -597,8 +591,7 @@ static int af9005_boot_packet(struct usb_device *udev, int type, u8 *reply, err("boot packet invalid boot packet type"); return -EINVAL; } - deb_fw(">>> "); - debug_dump(buf, FW_BULKOUT_SIZE + 2, deb_fw); + dbg_fw(">>> %*ph\n", FW_BULKOUT_SIZE + 2, buf); ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 0x02), @@ -617,8 +610,7 @@ static int af9005_boot_packet(struct usb_device *udev, int type, u8 *reply, err("boot packet recv bulk message failed: %d", ret); return ret; } - deb_fw("<<< "); - debug_dump(buf, act_len, deb_fw); + dbg_fw("<<< %*ph\n", act_len, buf); checksum = 0; switch (type) { case FW_CONFIG: @@ -731,8 +723,7 @@ static int af9005_download_firmware(struct usb_device *udev, const struct firmwa for (i = 0; i < packets; i++) { memcpy(&buf[2], fw->data + i * FW_BULKOUT_SIZE, FW_BULKOUT_SIZE); - deb_fw(">>> "); - debug_dump(buf, FW_BULKOUT_SIZE + 2, deb_fw); + dbg_fw(">>> %*ph\n", FW_BULKOUT_SIZE + 2, buf); ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 0x02), buf, FW_BULKOUT_SIZE + 2, &act_len, 1000); @@ -810,10 +801,10 @@ static int af9005_frontend_attach(struct dvb_usb_adapter *adap) usb_clear_halt(udev, usb_sndbulkpipe(udev, 2)); usb_clear_halt(udev, usb_rcvbulkpipe(udev, 1)); if (dvb_usb_af9005_dump_eeprom) { - printk("EEPROM DUMP\n"); + printk(KERN_DEBUG "EEPROM DUMP\n"); for (i = 0; i < 255; i += 8) { af9005_read_eeprom(adap->dev, i, buf, 8); - debug_dump(buf, 8, printk); + printk(KERN_DEBUG "%*ph\n", 8, buf); } } adap->fe_adap[0].fe = af9005_fe_attach(adap->dev); @@ -834,7 +825,7 @@ static int af9005_rc_query(struct dvb_usb_device *d, u32 * event, int *state) mutex_lock(&d->data_mutex); - /* deb_info("rc_query\n"); */ + /* dbg_info("rc_query\n"); */ st->data[0] = 3; /* rest of packet length low */ st->data[1] = 0; /* rest of packet length high */ st->data[2] = 0x40; /* read remote */ @@ -861,14 +852,13 @@ static int af9005_rc_query(struct dvb_usb_device *d, u32 * event, int *state) goto ret; } if (len > 0) { - deb_rc("rc data (%d) ", len); - debug_dump((st->data + 6), len, deb_rc); + dbg_rc("rc data (%d) %*ph\n", len, len, st->data + 6); ret = rc_decode(d, &st->data[6], len, event, state); if (ret) { err("rc_decode failed"); goto ret; } else { - deb_rc("rc_decode state %x event %x\n", *state, *event); + dbg_rc("rc_decode state %x event %x\n", *state, *event); if (*state == REMOTE_KEY_REPEAT) *event = d->last_event; } @@ -888,7 +878,7 @@ static int af9005_power_ctrl(struct dvb_usb_device *d, int onoff) static int af9005_pid_filter_control(struct dvb_usb_adapter *adap, int onoff) { int ret; - deb_info("pid filter control onoff %d\n", onoff); + dbg_info("pid filter control onoff %d\n", onoff); if (onoff) { ret = af9005_write_ofdm_register(adap->dev, XD_MP2IF_DMX_CTRL, 1); @@ -906,7 +896,7 @@ static int af9005_pid_filter_control(struct dvb_usb_adapter *adap, int onoff) af9005_write_ofdm_register(adap->dev, XD_MP2IF_DMX_CTRL, 0); if (ret) return ret; - deb_info("pid filter control ok\n"); + dbg_info("pid filter control ok\n"); return 0; } @@ -915,13 +905,13 @@ static int af9005_pid_filter(struct dvb_usb_adapter *adap, int index, { u8 cmd = index & 0x1f; int ret; - deb_info("set pid filter, index %d, pid %x, onoff %d\n", index, + dbg_info("set pid filter, index %d, pid %x, onoff %d\n", index, pid, onoff); if (onoff) { /* cannot use it as pid_filter_ctrl since it has to be done before setting the first pid */ if (adap->feedcount == 1) { - deb_info("first pid set, enable pid table\n"); + dbg_info("first pid set, enable pid table\n"); ret = af9005_pid_filter_control(adap, onoff); if (ret) return ret; @@ -941,7 +931,7 @@ static int af9005_pid_filter(struct dvb_usb_adapter *adap, int index, cmd |= 0x20 | 0x40; } else { if (adap->feedcount == 0) { - deb_info("last pid unset, disable pid table\n"); + dbg_info("last pid unset, disable pid table\n"); ret = af9005_pid_filter_control(adap, onoff); if (ret) return ret; @@ -950,7 +940,7 @@ static int af9005_pid_filter(struct dvb_usb_adapter *adap, int index, ret = af9005_write_ofdm_register(adap->dev, XD_MP2IF_PID_IDX, cmd); if (ret) return ret; - deb_info("set pid ok\n"); + dbg_info("set pid ok\n"); return 0; } @@ -970,7 +960,7 @@ static int af9005_identify_state(struct usb_device *udev, buf, FW_BULKOUT_SIZE + 2); if (ret) goto err; - deb_info("result of FW_CONFIG in identify state %d\n", reply); + dbg_info("result of FW_CONFIG in identify state %d\n", reply); if (reply == 0x01) *cold = 1; else if (reply == 0x02) @@ -978,7 +968,7 @@ static int af9005_identify_state(struct usb_device *udev, else ret = -EIO; if (!ret) - deb_info("Identify state cold = %d\n", *cold); + dbg_info("Identify state cold = %d\n", *cold); err: kfree(buf); diff --git a/drivers/media/usb/dvb-usb/af9005.h b/drivers/media/usb/dvb-usb/af9005.h index 11d74dc26d83..360fa719fe3f 100644 --- a/drivers/media/usb/dvb-usb/af9005.h +++ b/drivers/media/usb/dvb-usb/af9005.h @@ -15,12 +15,18 @@ #include "dvb-usb.h" extern int dvb_usb_af9005_debug; -#define deb_info(args...) dprintk(dvb_usb_af9005_debug,0x01,args) -#define deb_xfer(args...) dprintk(dvb_usb_af9005_debug,0x02,args) -#define deb_rc(args...) dprintk(dvb_usb_af9005_debug,0x04,args) -#define deb_reg(args...) dprintk(dvb_usb_af9005_debug,0x08,args) -#define deb_i2c(args...) dprintk(dvb_usb_af9005_debug,0x10,args) -#define deb_fw(args...) dprintk(dvb_usb_af9005_debug,0x20,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_af9005_debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) \ + dprintk(dvb_usb_af9005_debug, 0x02, fmt, ##__VA_ARGS__) +#define dbg_rc(fmt, ...) \ + dprintk(dvb_usb_af9005_debug, 0x04, fmt, ##__VA_ARGS__) +#define dbg_reg(fmt, ...) \ + dprintk(dvb_usb_af9005_debug, 0x08, fmt, ##__VA_ARGS__) +#define dbg_i2c(fmt, ...) \ + dprintk(dvb_usb_af9005_debug, 0x10, fmt, ##__VA_ARGS__) +#define dbg_fw(fmt, ...) \ + dprintk(dvb_usb_af9005_debug, 0x20, fmt, ##__VA_ARGS__) extern bool dvb_usb_af9005_led; diff --git a/drivers/media/usb/dvb-usb/az6027.c b/drivers/media/usb/dvb-usb/az6027.c index 1c39b61cde29..82160c22aba5 100644 --- a/drivers/media/usb/dvb-usb/az6027.c +++ b/drivers/media/usb/dvb-usb/az6027.c @@ -318,8 +318,8 @@ static int az6027_usb_in_op(struct dvb_usb_device *d, u8 req, } else ret = 0; - deb_xfer("in: req. %02x, val: %04x, ind: %04x, buffer: ", req, value, index); - debug_dump(b, blen, deb_xfer); + dbg_xfer("in: req. %02x, val: %04x, ind: %04x, buffer: %*ph\n", + req, value, index, blen, b); mutex_unlock(&d->usb_mutex); return ret; @@ -334,8 +334,8 @@ static int az6027_usb_out_op(struct dvb_usb_device *d, { int ret; - deb_xfer("out: req. %02x, val: %04x, ind: %04x, buffer: ", req, value, index); - debug_dump(b, blen, deb_xfer); + dbg_xfer("out: req. %02x, val: %04x, ind: %04x, buffer: %*ph\n", + req, value, index, blen, b); if (mutex_lock_interruptible(&d->usb_mutex)) return -EAGAIN; @@ -368,7 +368,7 @@ static int az6027_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) u16 index; int blen; - deb_info("%s %d", __func__, onoff); + dbg_info("%s %d", __func__, onoff); req = 0xBC; value = onoff; @@ -457,7 +457,7 @@ static int az6027_ci_write_attribute_mem(struct dvb_ca_en50221 *ca, u16 index; int blen; - deb_info("%s %d", __func__, slot); + dbg_info("%s %d", __func__, slot); if (slot != 0) return -EINVAL; @@ -512,7 +512,7 @@ static int az6027_ci_read_cam_control(struct dvb_ca_en50221 *ca, warn("Read CI IO error"); ret = b[1]; - deb_info("read cam data = %x from 0x%x", b[1], value); + dbg_info("read cam data = %x from 0x%x", b[1], value); } mutex_unlock(&state->ca_mutex); @@ -625,7 +625,7 @@ static int az6027_ci_slot_reset(struct dvb_ca_en50221 *ca, int slot) msleep(100); if (CI_CamReady(ca, slot)) { - deb_info("CAM Ready"); + dbg_info("CAM Ready"); break; } } @@ -652,7 +652,7 @@ static int az6027_ci_slot_ts_enable(struct dvb_ca_en50221 *ca, int slot) u16 index; int blen; - deb_info("%s", __func__); + dbg_info("%s", __func__); mutex_lock(&state->ca_mutex); req = 0xC7; value = 1; @@ -713,7 +713,7 @@ static void az6027_ci_uninit(struct dvb_usb_device *d) { struct az6027_device_state *state; - deb_info("%s", __func__); + dbg_info("%s", __func__); if (NULL == d) return; @@ -737,7 +737,7 @@ static int az6027_ci_init(struct dvb_usb_adapter *a) struct az6027_device_state *state = (struct az6027_device_state *)d->priv; int ret; - deb_info("%s", __func__); + dbg_info("%s", __func__); mutex_init(&state->ca_mutex); @@ -762,7 +762,7 @@ static int az6027_ci_init(struct dvb_usb_adapter *a) return ret; } - deb_info("CI initialized."); + dbg_info("CI initialized."); return 0; } @@ -906,13 +906,15 @@ static int az6027_frontend_attach(struct dvb_usb_adapter *adap) az6027_frontend_poweron(adap); az6027_frontend_reset(adap); - deb_info("adap = %p, dev = %p\n", adap, adap->dev); + dbg_info("adap = %p, dev = %p\n", adap, adap->dev); adap->fe_adap[0].fe = stb0899_attach(&az6027_stb0899_config, &adap->dev->i2c_adap); if (adap->fe_adap[0].fe) { - deb_info("found STB0899 DVB-S/DVB-S2 frontend @0x%02x", az6027_stb0899_config.demod_address); + dbg_info("found STB0899 DVB-S/DVB-S2 frontend @0x%02x\n", + az6027_stb0899_config.demod_address); if (stb6100_attach(adap->fe_adap[0].fe, &az6027_stb6100_config, &adap->dev->i2c_adap)) { - deb_info("found STB6100 DVB-S/DVB-S2 frontend @0x%02x", az6027_stb6100_config.tuner_address); + dbg_info("found STB6100 DVB-S/DVB-S2 frontend @0x%02x\n", + az6027_stb6100_config.tuner_address); adap->fe_adap[0].fe->ops.set_voltage = az6027_set_voltage; az6027_ci_init(adap); } else { @@ -1074,7 +1076,7 @@ static int az6027_identify_state(struct usb_device *udev, *cold = ret <= 0; kfree(b); - deb_info("cold: %d\n", *cold); + dbg_info("cold: %d\n", *cold); return 0; } diff --git a/drivers/media/usb/dvb-usb/az6027.h b/drivers/media/usb/dvb-usb/az6027.h index 95b056b36030..42c57a13835c 100644 --- a/drivers/media/usb/dvb-usb/az6027.h +++ b/drivers/media/usb/dvb-usb/az6027.h @@ -7,9 +7,9 @@ extern int dvb_usb_az6027_debug; -#define deb_info(args...) dprintk(dvb_usb_az6027_debug, 0x01, args) -#define deb_xfer(args...) dprintk(dvb_usb_az6027_debug, 0x02, args) -#define deb_rc(args...) dprintk(dvb_usb_az6027_debug, 0x04, args) -#define deb_fe(args...) dprintk(dvb_usb_az6027_debug, 0x08, args) +#define dbg_info(args...) dprintk(dvb_usb_az6027_debug, 0x01, args) +#define dbg_xfer(args...) dprintk(dvb_usb_az6027_debug, 0x02, args) +#define dbg_rc(args...) dprintk(dvb_usb_az6027_debug, 0x04, args) +#define dbg_fe(args...) dprintk(dvb_usb_az6027_debug, 0x08, args) #endif diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c index 969a7ec71dff..54aad0187af5 100644 --- a/drivers/media/usb/dvb-usb/cinergyT2-core.c +++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c @@ -78,7 +78,7 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap) ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 3, 0); if (ret < 0) { - deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep state info\n"); + dbg_rc("cinergyt2_power_ctrl() Failed to retrieve sleep state info\n"); } mutex_unlock(&d->data_mutex); @@ -164,12 +164,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state) if (d->last_event == repeatable_keys[i]) { *state = REMOTE_KEY_REPEAT; *event = d->last_event; - deb_rc("repeat key, event %x\n", - *event); + dbg_rc("repeat key, event %x\n", + *event); goto ret; } } - deb_rc("repeated key (non repeatable)\n"); + dbg_rc("repeated key (non repeatable)\n"); } goto ret; } @@ -181,7 +181,7 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state) if (*event != d->last_event) st->rc_counter = 0; - deb_rc("key: %*ph\n", 5, st->data); + dbg_rc("key: %*ph\n", 5, st->data); } ret: diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c index efb207c23a64..fa801bd6a8e7 100644 --- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c +++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c @@ -210,7 +210,7 @@ static int cinergyt2_fe_init(struct dvb_frontend *fe) static int cinergyt2_fe_sleep(struct dvb_frontend *fe) { - deb_info("cinergyt2_fe_sleep() Called\n"); + dbg_info("cinergyt2_fe_sleep() Called\n"); return 0; } diff --git a/drivers/media/usb/dvb-usb/cinergyT2.h b/drivers/media/usb/dvb-usb/cinergyT2.h index 18905a0ec43e..b1e2c5021a95 100644 --- a/drivers/media/usb/dvb-usb/cinergyT2.h +++ b/drivers/media/usb/dvb-usb/cinergyT2.h @@ -25,15 +25,15 @@ extern int dvb_usb_cinergyt2_debug; -#define deb_info(args...) dprintk(dvb_usb_cinergyt2_debug, 0x001, args) -#define deb_xfer(args...) dprintk(dvb_usb_cinergyt2_debug, 0x002, args) -#define deb_pll(args...) dprintk(dvb_usb_cinergyt2_debug, 0x004, args) -#define deb_ts(args...) dprintk(dvb_usb_cinergyt2_debug, 0x008, args) -#define deb_err(args...) dprintk(dvb_usb_cinergyt2_debug, 0x010, args) -#define deb_rc(args...) dprintk(dvb_usb_cinergyt2_debug, 0x020, args) -#define deb_fw(args...) dprintk(dvb_usb_cinergyt2_debug, 0x040, args) -#define deb_mem(args...) dprintk(dvb_usb_cinergyt2_debug, 0x080, args) -#define deb_uxfer(args...) dprintk(dvb_usb_cinergyt2_debug, 0x100, args) +#define dbg_info(args...) dprintk(dvb_usb_cinergyt2_debug, 0x001, args) +#define dbg_xfer(args...) dprintk(dvb_usb_cinergyt2_debug, 0x002, args) +#define dbg_pll(args...) dprintk(dvb_usb_cinergyt2_debug, 0x004, args) +#define dbg_ts(args...) dprintk(dvb_usb_cinergyt2_debug, 0x008, args) +#define dbg_err(args...) dprintk(dvb_usb_cinergyt2_debug, 0x010, args) +#define dbg_rc(args...) dprintk(dvb_usb_cinergyt2_debug, 0x020, args) +#define dbg_fw(args...) dprintk(dvb_usb_cinergyt2_debug, 0x040, args) +#define dbg_mem(args...) dprintk(dvb_usb_cinergyt2_debug, 0x080, args) +#define dbg_uxfer(args...) dprintk(dvb_usb_cinergyt2_debug, 0x100, args) diff --git a/drivers/media/usb/dvb-usb/dib0700.h b/drivers/media/usb/dvb-usb/dib0700.h index 2defbd8b6fc1..a2aecae27a28 100644 --- a/drivers/media/usb/dvb-usb/dib0700.h +++ b/drivers/media/usb/dvb-usb/dib0700.h @@ -12,10 +12,14 @@ #include "dib07x0.h" extern int dvb_usb_dib0700_debug; -#define deb_info(args...) dprintk(dvb_usb_dib0700_debug,0x01,args) -#define deb_fw(args...) dprintk(dvb_usb_dib0700_debug,0x02,args) -#define deb_fwdata(args...) dprintk(dvb_usb_dib0700_debug,0x04,args) -#define deb_data(args...) dprintk(dvb_usb_dib0700_debug,0x08,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_dib0700_debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_fw(fmt, ...) \ + dprintk(dvb_usb_dib0700_debug, 0x02, fmt, ##__VA_ARGS__) +#define dbg_fwdata(fmt, ...) \ + dprintk(dvb_usb_dib0700_debug, 0x04, fmt, ##__VA_ARGS__) +#define dbg_data(fmt, ...) \ + dprintk(dvb_usb_dib0700_debug, 0x08, fmt, ##__VA_ARGS__) #define REQUEST_SET_USB_XFER_LEN 0x0 /* valid only for firmware version */ /* higher than 1.21 */ diff --git a/drivers/media/usb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c index 70219b3e8566..8a8d68d70479 100644 --- a/drivers/media/usb/dvb-usb/dib0700_core.c +++ b/drivers/media/usb/dvb-usb/dib0700_core.c @@ -54,15 +54,15 @@ static int dib0700_ctrl_wr(struct dvb_usb_device *d, u8 *tx, u8 txlen) { int status; - deb_data(">>> "); - debug_dump(tx, txlen, deb_data); + dbg_data(">>> %*ph\n", (int)txlen, tx); status = usb_control_msg(d->udev, usb_sndctrlpipe(d->udev,0), tx[0], USB_TYPE_VENDOR | USB_DIR_OUT, 0, 0, tx, txlen, USB_CTRL_GET_TIMEOUT); if (status != txlen) - deb_data("ep 0 write error (status = %d, len: %d)\n",status,txlen); + dbg_data("ep 0 write error (status = %d, len: %d)\n", + status, txlen); return status < 0 ? status : 0; } @@ -82,8 +82,7 @@ int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen return -EINVAL; } - deb_data(">>> "); - debug_dump(tx,txlen,deb_data); + dbg_data(">>> %*ph\n", (int)txlen, tx); value = ((txlen - 2) << 8) | tx[1]; index = 0; @@ -97,10 +96,9 @@ int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen USB_CTRL_GET_TIMEOUT); if (status < 0) - deb_info("ep 0 read error (status = %d)\n",status); + dbg_info("ep 0 read error (status = %d)\n", status); - deb_data("<<< "); - debug_dump(rx, rxlen, deb_data); + dbg_data("<<< %*ph\n", (int)rxlen, rx); return status; /* length in case of success */ } @@ -140,12 +138,12 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets) st->buf[1] = (nb_ts_packets >> 8) & 0xff; st->buf[2] = nb_ts_packets & 0xff; - deb_info("set the USB xfer len to %i Ts packet\n", nb_ts_packets); + dbg_info("set the USB xfer len to %i Ts packet\n", nb_ts_packets); ret = dib0700_ctrl_wr(d, st->buf, 3); mutex_unlock(&d->usb_mutex); } else { - deb_info("this firmware does not allow to change the USB xfer len\n"); + dbg_info("this firmware does not allow to change the USB xfer len\n"); ret = -EIO; } @@ -211,12 +209,12 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, msg[i].len, USB_CTRL_GET_TIMEOUT); if (result < 0) { - deb_info("i2c read error (status = %d)\n", result); + dbg_info("i2c read error (status = %d)\n", result); goto unlock; } if (msg[i].len > sizeof(st->buf)) { - deb_info("buffer too small to fit %d bytes\n", + dbg_info("buffer too small to fit %d bytes\n", msg[i].len); result = -EIO; goto unlock; @@ -224,8 +222,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, memcpy(msg[i].buf, st->buf, msg[i].len); - deb_data("<<< "); - debug_dump(msg[i].buf, msg[i].len, deb_data); + dbg_data("<<< %*ph\n", (int)msg[i].len, msg[i].buf); } else { /* Write request */ @@ -243,7 +240,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, ((bus_mode << 4) & 0x30); if (msg[i].len > sizeof(st->buf) - 4) { - deb_info("i2c message to big: %d\n", + dbg_info("i2c message to big: %d\n", msg[i].len); mutex_unlock(&d->usb_mutex); result = -EIO; @@ -253,8 +250,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, /* The Actual i2c payload */ memcpy(&st->buf[4], msg[i].buf, msg[i].len); - deb_data(">>> "); - debug_dump(st->buf, msg[i].len + 4, deb_data); + dbg_data(">>> %*ph\n", (int)(msg[i].len + 4), st->buf); result = usb_control_msg(d->udev, usb_sndctrlpipe(d->udev, 0), @@ -264,7 +260,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, USB_CTRL_GET_TIMEOUT); mutex_unlock(&d->usb_mutex); if (result < 0) { - deb_info("i2c write error (status = %d)\n", result); + dbg_info("i2c write error (status = %d)\n", result); break; } } @@ -299,8 +295,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap, st->buf[1] = msg[i].addr << 1; /* fill the buffer */ if (msg[i].len > sizeof(st->buf) - 2) { - deb_info("i2c xfer to big: %d\n", - msg[i].len); + dbg_info("i2c xfer too big: %d\n", msg[i].len); result = -EIO; goto unlock; } @@ -315,15 +310,15 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap, len = dib0700_ctrl_rd(d, st->buf, msg[i].len + 2, st->buf, msg[i + 1].len); if (len <= 0) { - deb_info("I2C read failed on address 0x%02x\n", - msg[i].addr); + dbg_info("I2C read failed on address 0x%02x\n", + msg[i].addr); result = -EIO; goto unlock; } if (msg[i + 1].len > sizeof(st->buf)) { - deb_info("i2c xfer buffer to small for %d\n", - msg[i].len); + dbg_info("i2c xfer buffer too small for %d\n", + msg[i].len); result = -EIO; goto unlock; } @@ -388,10 +383,10 @@ int dib0700_identify_state(struct usb_device *udev, ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), REQUEST_GET_VERSION, USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, b, 16, USB_CTRL_GET_TIMEOUT); - deb_info("FW GET_VERSION length: %d\n",ret); + dbg_info("FW GET_VERSION length: %d\n", ret); *cold = ret <= 0; - deb_info("cold: %d\n", *cold); + dbg_info("cold: %d\n", *cold); kfree(b); return 0; @@ -453,9 +448,11 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz) st->buf[6] = (u8) (divider >> 8); st->buf[7] = (u8) (divider & 0xff); - deb_info("setting I2C speed: %04x %04x %04x (%d kHz).", - (st->buf[2] << 8) | (st->buf[3]), (st->buf[4] << 8) | - st->buf[5], (st->buf[6] << 8) | st->buf[7], scl_kHz); + dbg_info("setting I2C speed: %04x %04x %04x (%d kHz)\n", + (st->buf[2] << 8) | (st->buf[3]), + (st->buf[4] << 8) | (st->buf[5]), + (st->buf[6] << 8) | (st->buf[7]), + scl_kHz); ret = dib0700_ctrl_wr(d, st->buf, 8); mutex_unlock(&d->usb_mutex); @@ -491,11 +488,11 @@ static int dib0700_jumpram(struct usb_device *udev, u32 address) buf[7] = address & 0xff; if ((ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 0x01),buf,8,&actlen,1000)) < 0) { - deb_fw("jumpram to 0x%x failed\n",address); + dbg_fw("jumpram to 0x%x failed\n", address); goto out; } if (actlen != 8) { - deb_fw("jumpram to 0x%x failed\n",address); + dbg_fw("jumpram to 0x%x failed\n", address); ret = -EIO; goto out; } @@ -516,8 +513,8 @@ int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw return -ENOMEM; while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) { - deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n", - hx.addr, hx.len, hx.chk); + dbg_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n", + hx.addr, hx.len, hx.chk); buf[0] = hx.len; buf[1] = (hx.addr >> 8) & 0xff; @@ -591,7 +588,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) ret = dib0700_set_usb_xfer_len(adap->dev, st->nb_packet_buffer_size); if (ret < 0) { - deb_info("can not set the USB xfer len\n"); + dbg_info("can not set the USB xfer len\n"); return ret; } } @@ -610,12 +607,13 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) st->buf[3] = 0x00; - deb_info("modifying (%d) streaming state for %d\n", onoff, adap->id); + dbg_info("modifying (%d) streaming state for %d\n", onoff, adap->id); st->channel_state &= ~0x3; if ((adap->fe_adap[0].stream.props.endpoint != 2) && (adap->fe_adap[0].stream.props.endpoint != 3)) { - deb_info("the endpoint number (%i) is not correct, use the adapter id instead", adap->fe_adap[0].stream.props.endpoint); + dbg_info("the endpoint number (%i) is not correct, use the adapter id instead\n", + adap->fe_adap[0].stream.props.endpoint); if (onoff) st->channel_state |= 1 << (adap->id); else @@ -629,7 +627,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) st->buf[2] |= st->channel_state; - deb_info("data for streaming: %x %x\n", st->buf[1], st->buf[2]); + dbg_info("data for streaming: %x %x\n", st->buf[1], st->buf[2]); ret = dib0700_ctrl_wr(adap->dev, st->buf, 4); mutex_unlock(&adap->dev->usb_mutex); @@ -715,7 +713,7 @@ static void dib0700_rc_urb_completion(struct urb *purb) u32 keycode; u8 toggle; - deb_info("%s()\n", __func__); + dbg_info("%s()\n", __func__); if (d->rc_dev == NULL) { /* This will occur if disable_rc_polling=1 */ kfree(purb->transfer_buffer); @@ -726,18 +724,18 @@ static void dib0700_rc_urb_completion(struct urb *purb) poll_reply = purb->transfer_buffer; if (purb->status < 0) { - deb_info("discontinuing polling\n"); + dbg_info("discontinuing polling\n"); kfree(purb->transfer_buffer); usb_free_urb(purb); return; } if (purb->actual_length != RC_MSG_SIZE_V1_20) { - deb_info("malformed rc msg size=%d\n", purb->actual_length); + dbg_info("malformed rc msg size=%d\n", purb->actual_length); goto resubmit; } - deb_data("IR ID = %02X state = %02X System = %02X %02X Cmd = %02X %02X (len %d)\n", + dbg_data("IR ID = %02X state = %02X System = %02X %02X Cmd = %02X %02X (len %d)\n", poll_reply->report_id, poll_reply->data_state, poll_reply->nec.system, poll_reply->nec.not_system, poll_reply->nec.data, poll_reply->nec.not_data, @@ -758,21 +756,21 @@ static void dib0700_rc_urb_completion(struct urb *purb) } if ((poll_reply->nec.data ^ poll_reply->nec.not_data) != 0xff) { - deb_data("NEC32 protocol\n"); + dbg_data("NEC32 protocol\n"); keycode = RC_SCANCODE_NEC32(poll_reply->nec.system << 24 | poll_reply->nec.not_system << 16 | poll_reply->nec.data << 8 | poll_reply->nec.not_data); protocol = RC_PROTO_NEC32; } else if ((poll_reply->nec.system ^ poll_reply->nec.not_system) != 0xff) { - deb_data("NEC extended protocol\n"); + dbg_data("NEC extended protocol\n"); keycode = RC_SCANCODE_NECX(poll_reply->nec.system << 8 | poll_reply->nec.not_system, poll_reply->nec.data); protocol = RC_PROTO_NECX; } else { - deb_data("NEC normal protocol\n"); + dbg_data("NEC normal protocol\n"); keycode = RC_SCANCODE_NEC(poll_reply->nec.system, poll_reply->nec.data); protocol = RC_PROTO_NEC; @@ -780,7 +778,7 @@ static void dib0700_rc_urb_completion(struct urb *purb) break; default: - deb_data("RC5 protocol\n"); + dbg_data("RC5 protocol\n"); protocol = RC_PROTO_RC5; toggle = poll_reply->report_id; keycode = RC_SCANCODE_RC5(poll_reply->rc5.system, poll_reply->rc5.data); @@ -890,8 +888,8 @@ static int dib0700_probe(struct usb_interface *intf, dib0700_get_version(dev, &hwversion, &romversion, &fw_version, &fwtype); - deb_info("Firmware version: %x, %d, 0x%x, %d\n", - hwversion, romversion, fw_version, fwtype); + dbg_info("Firmware version: %x, %d, 0x%x, %d\n", + hwversion, romversion, fw_version, fwtype); st->fw_version = fw_version; st->nb_packet_buffer_size = (u32)nb_packet_buffer_size; diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c index 4ef3fa98d20f..4e04d146b78d 100644 --- a/drivers/media/usb/dvb-usb/dib0700_devices.c +++ b/drivers/media/usb/dvb-usb/dib0700_devices.c @@ -798,7 +798,7 @@ static int dib7070_tuner_reset(struct dvb_frontend *fe, int onoff) struct dvb_usb_adapter *adap = fe->dvb->priv; struct dib0700_adapter_state *state = adap->priv; - deb_info("reset: %d", onoff); + dbg_info("reset: %d", onoff); return state->dib7000p_ops.set_gpio(fe, 8, 0, !onoff); } @@ -807,7 +807,7 @@ static int dib7070_tuner_sleep(struct dvb_frontend *fe, int onoff) struct dvb_usb_adapter *adap = fe->dvb->priv; struct dib0700_adapter_state *state = adap->priv; - deb_info("sleep: %d", onoff); + dbg_info("sleep: %d", onoff); return state->dib7000p_ops.set_gpio(fe, 9, 0, onoff); } @@ -851,7 +851,7 @@ static int dib7070_set_param_override(struct dvb_frontend *fe) case BAND_UHF: default: offset = 550; break; } - deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe)); + dbg_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe)); state->dib7000p_ops.set_wbd_ref(fe, offset + dib0070_wbd_offset(fe)); return state->set_param_save(fe); } @@ -875,7 +875,7 @@ static int dib7770_set_param_override(struct dvb_frontend *fe) offset = 250; break; } - deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe)); + dbg_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe)); state->dib7000p_ops.set_wbd_ref(fe, offset + dib0070_wbd_offset(fe)); return state->set_param_save(fe); } @@ -1296,7 +1296,7 @@ static int dib807x_set_param_override(struct dvb_frontend *fe) default: offset += 250; break; } - deb_info("WBD for DiB8000: %d\n", offset); + dbg_info("WBD for DiB8000: %d\n", offset); state->dib8000_ops.set_wbd_ref(fe, offset); return state->set_param_save(fe); @@ -1543,7 +1543,7 @@ static int dib8090_get_adc_power(struct dvb_frontend *fe) static void dib8090_agc_control(struct dvb_frontend *fe, u8 restart) { - deb_info("AGC control callback: %i\n", restart); + dbg_info("AGC control callback: %i\n", restart); dib0090_dcc_freq(fe, restart); if (restart == 0) /* before AGC startup */ @@ -1636,13 +1636,13 @@ static u8 dib8090_compute_pll_parameters(struct dvb_frontend *fe) if (rest > freq_adc / 2) rest = freq_adc - rest; - deb_info("PLL ratio=%i rest=%i\n", pll_ratio, rest); + dbg_info("PLL ratio=%i rest=%i\n", pll_ratio, rest); if ((rest > max) && (rest > 717)) { optimal_pll_ratio = pll_ratio; max = rest; } } - deb_info("optimal PLL ratio=%i\n", optimal_pll_ratio); + dbg_info("optimal PLL ratio=%i\n", optimal_pll_ratio); return optimal_pll_ratio; } @@ -1659,14 +1659,15 @@ static int dib8096_set_param_override(struct dvb_frontend *fe) switch (band) { default: - deb_info("Warning : Rf frequency (%iHz) is not in the supported range, using VHF switch ", fe->dtv_property_cache.frequency); - /* fall through */ + dbg_info("Warning : Rf frequency (%iHz) is not in the supported range, using VHF switch\n", + fe->dtv_property_cache.frequency); + fallthrough; case BAND_VHF: - state->dib8000_ops.set_gpio(fe, 3, 0, 1); - break; + state->dib8000_ops.set_gpio(fe, 3, 0, 1); + break; case BAND_UHF: - state->dib8000_ops.set_gpio(fe, 3, 0, 0); - break; + state->dib8000_ops.set_gpio(fe, 3, 0, 0); + break; } ret = state->set_param_save(fe); @@ -1674,7 +1675,7 @@ static int dib8096_set_param_override(struct dvb_frontend *fe) return ret; if (fe->dtv_property_cache.bandwidth_hz != 6000000) { - deb_info("only 6MHz bandwidth is supported\n"); + dbg_info("only 6MHz bandwidth is supported\n"); return -EINVAL; } @@ -1704,7 +1705,7 @@ static int dib8096_set_param_override(struct dvb_frontend *fe) } if (band == BAND_CBAND) { - deb_info("tuning in CBAND - soft-AGC startup\n"); + dbg_info("tuning in CBAND - soft-AGC startup\n"); dib0090_set_tune_state(fe, CT_AGC_START); do { @@ -1720,13 +1721,13 @@ static int dib8096_set_param_override(struct dvb_frontend *fe) } } while (tune_state < CT_AGC_STOP); - deb_info("switching to PWM AGC\n"); + dbg_info("switching to PWM AGC\n"); dib0090_pwm_gain_reset(fe); state->dib8000_ops.pwm_agc_reset(fe); state->dib8000_ops.set_tune_state(fe, CT_DEMOD_START); } else { /* for everything else than CBAND we are using standard AGC */ - deb_info("not tuning in CBAND - standard AGC startup\n"); + dbg_info("not tuning in CBAND - standard AGC startup\n"); dib0090_pwm_gain_reset(fe); } @@ -2057,7 +2058,7 @@ static int dib8096p_get_best_sampling(struct dvb_frontend *fe, struct dibx090p_b adc->pll_loopdiv = loopdiv; adc->pll_prediv = prediv; - deb_info("bandwidth = %d", fe->dtv_property_cache.bandwidth_hz); + dbg_info("bandwidth = %d", fe->dtv_property_cache.bandwidth_hz); /* Find Min and Max prediv */ while ((xtal / max_prediv) >= fcp_min) @@ -2070,7 +2071,7 @@ static int dib8096p_get_best_sampling(struct dvb_frontend *fe, struct dibx090p_b if (min_prediv == 1) break; } - deb_info("MIN prediv = %d : MAX prediv = %d", min_prediv, max_prediv); + dbg_info("MIN prediv = %d : MAX prediv = %d", min_prediv, max_prediv); min_prediv = 1; @@ -2099,7 +2100,12 @@ static int dib8096p_get_best_sampling(struct dvb_frontend *fe, struct dibx090p_b adc->timf = (4260880253U / fdem) * (1 << 8); adc->timf += ((4260880253U % fdem) << 8) / fdem; - deb_info("RF %6d; BW %6d; Xtal %6d; Fmem %6d; Fdem %6d; Fs %6d; Prediv %2d; Loopdiv %2d; Timf %8d;", fe->dtv_property_cache.frequency, fe->dtv_property_cache.bandwidth_hz, xtal, fmem, fdem, fs, prediv, loopdiv, adc->timf); + dbg_info("RF %6d; BW %6d; Xtal %6d; Fmem %6d; Fdem %6d; Fs %6d; Prediv %2d; Loopdiv %2d; Timf %8d;\n", + fe->dtv_property_cache.frequency, + fe->dtv_property_cache.bandwidth_hz, + xtal, fmem, fdem, fs, + prediv, loopdiv, + adc->timf); break; } } @@ -2240,16 +2246,16 @@ static int dib01x0_pmu_update(struct i2c_adapter *i2c, u16 *data, u8 len) switch (rb[0] << 8 | rb[1]) { case 0: - deb_info("Found DiB0170 rev1: This version of DiB0170 is not supported any longer.\n"); + dbg_info("Found DiB0170 rev1: This version of DiB0170 is not supported any longer.\n"); return -EIO; case 1: - deb_info("Found DiB0170 rev2"); + dbg_info("Found DiB0170 rev2"); break; case 2: - deb_info("Found DiB0190 rev2"); + dbg_info("Found DiB0190 rev2"); break; default: - deb_info("DiB01x0 not found"); + dbg_info("DiB01x0 not found"); return -EIO; } @@ -2414,10 +2420,11 @@ static int stk9090m_frontend_attach(struct dvb_usb_adapter *adap) dib9000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x10, 0x80); if (request_firmware(&state->frontend_firmware, "dib9090.fw", &adap->dev->udev->dev)) { - deb_info("%s: Upload failed. (file not found?)\n", __func__); + dbg_info("%s: Upload failed. (file not found?)\n", __func__); return -ENODEV; } else { - deb_info("%s: firmware read %zu bytes.\n", __func__, state->frontend_firmware->size); + dbg_info("%s: firmware read %zu bytes\n", + __func__, state->frontend_firmware->size); } stk9090m_config.microcode_B_fe_size = state->frontend_firmware->size; stk9090m_config.microcode_B_fe_buffer = state->frontend_firmware->data; @@ -2484,10 +2491,11 @@ static int nim9090md_frontend_attach(struct dvb_usb_adapter *adap) dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1); if (request_firmware(&state->frontend_firmware, "dib9090.fw", &adap->dev->udev->dev)) { - deb_info("%s: Upload failed. (file not found?)\n", __func__); + dbg_info("%s: Upload failed. (file not found?)\n", __func__); return -EIO; } else { - deb_info("%s: firmware read %zu bytes.\n", __func__, state->frontend_firmware->size); + dbg_info("%s: firmware read %zu bytes\n", + __func__, state->frontend_firmware->size); } nim9090md_config[0].microcode_B_fe_size = state->frontend_firmware->size; nim9090md_config[0].microcode_B_fe_buffer = state->frontend_firmware->data; @@ -2571,7 +2579,7 @@ static int dib7090p_get_best_sampling(struct dvb_frontend *fe , struct dibx090p_ adc->pll_prediv = prediv; adc->timf = 0; - deb_info("bandwidth = %d fdem_min =%d", fe->dtv_property_cache.bandwidth_hz, fdem_min); + dbg_info("bandwidth = %d fdem_min =%d", fe->dtv_property_cache.bandwidth_hz, fdem_min); /* Find Min and Max prediv */ while ((xtal/max_prediv) >= fcp_min) @@ -2584,7 +2592,7 @@ static int dib7090p_get_best_sampling(struct dvb_frontend *fe , struct dibx090p_ if (min_prediv == 1) break; } - deb_info("MIN prediv = %d : MAX prediv = %d", min_prediv, max_prediv); + dbg_info("MIN prediv = %d : MAX prediv = %d", min_prediv, max_prediv); min_prediv = 2; @@ -2611,7 +2619,9 @@ static int dib7090p_get_best_sampling(struct dvb_frontend *fe , struct dibx090p_ adc->pll_prediv = prediv; adc->timf = 2396745143UL/fdem*(1 << 9); adc->timf += ((2396745143UL%fdem) << 9)/fdem; - deb_info("loopdiv=%i prediv=%i timf=%i", loopdiv, prediv, adc->timf); + dbg_info("loopdiv=%i prediv=%i timf=%i\n", + loopdiv, prediv, + adc->timf); break; } } @@ -2658,7 +2668,7 @@ static int dib7090_agc_startup(struct dvb_frontend *fe) static int dib7090_agc_restart(struct dvb_frontend *fe, u8 restart) { - deb_info("AGC restart callback: %d", restart); + dbg_info("AGC restart callback: %d", restart); if (restart == 0) /* before AGC startup */ dib0090_set_dc_servo(fe, 1); return 0; @@ -2669,7 +2679,7 @@ static int tfe7790p_update_lna(struct dvb_frontend *fe, u16 agc_global) struct dvb_usb_adapter *adap = fe->dvb->priv; struct dib0700_adapter_state *state = adap->priv; - deb_info("update LNA: agc global=%i", agc_global); + dbg_info("update LNA: agc global=%i", agc_global); if (agc_global < 25000) { state->dib7000p_ops.set_gpio(fe, 8, 0, 0); @@ -2824,7 +2834,7 @@ static int tfe7090p_pvr_update_lna(struct dvb_frontend *fe, u16 agc_global) struct dvb_usb_adapter *adap = fe->dvb->priv; struct dib0700_adapter_state *state = adap->priv; - deb_info("TFE7090P-PVR update LNA: agc global=%i", agc_global); + dbg_info("TFE7090P-PVR update LNA: agc global=%i", agc_global); if (agc_global < 25000) { state->dib7000p_ops.set_gpio(fe, 5, 0, 0); state->dib7000p_ops.set_agc1_min(fe, 0); diff --git a/drivers/media/usb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c index 02b51d1a1b67..fdc0df47678c 100644 --- a/drivers/media/usb/dvb-usb/dibusb-common.c +++ b/drivers/media/usb/dvb-usb/dibusb-common.c @@ -16,7 +16,7 @@ module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info (|-able))." DVB_USB_DEBUG_STATUS); MODULE_LICENSE("GPL"); -#define deb_info(args...) dprintk(debug,0x01,args) +#define dbg_info(fmt, ...) dprintk(debug, 0x01, fmt, ##__VA_ARGS__) /* common stuff used by the different dibusb modules */ int dibusb_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) @@ -389,7 +389,7 @@ int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state) dvb_usb_nec_rc_key_to_event(d, buf, event, state); if (buf[0] != 0) - deb_info("key: %*ph\n", 5, buf); + dbg_info("key: %*ph\n", 5, buf); ret: kfree(buf); diff --git a/drivers/media/usb/dvb-usb/digitv.c b/drivers/media/usb/dvb-usb/digitv.c index 4e3b3c064bcf..3b07928b2996 100644 --- a/drivers/media/usb/dvb-usb/digitv.c +++ b/drivers/media/usb/dvb-usb/digitv.c @@ -20,7 +20,8 @@ MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_ST DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); -#define deb_rc(args...) dprintk(dvb_usb_digitv_debug,0x01,args) +#define dbg_rc(fmt, ...) \ + dprintk(dvb_usb_digitv_debug, 0x01, fmt, ##__VA_ARGS__) static int digitv_ctrl_msg(struct dvb_usb_device *d, u8 cmd, u8 vv, u8 *wbuf, int wlen, u8 *rbuf, int rlen) @@ -262,7 +263,7 @@ static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state) } } - deb_rc("key: %*ph\n", 4, key); + dbg_rc("key: %*ph\n", 4, key); } return 0; diff --git a/drivers/media/usb/dvb-usb/dtt200u-fe.c b/drivers/media/usb/dvb-usb/dtt200u-fe.c index 9f83560ba63d..2c2e842dc187 100644 --- a/drivers/media/usb/dvb-usb/dtt200u-fe.c +++ b/drivers/media/usb/dvb-usb/dtt200u-fe.c @@ -210,7 +210,7 @@ struct dvb_frontend* dtt200u_fe_attach(struct dvb_usb_device *d) if (state == NULL) goto error; - deb_info("attaching frontend dtt200u\n"); + dbg_info("attaching frontend dtt200u\n"); state->d = d; mutex_init(&state->data_mutex); diff --git a/drivers/media/usb/dvb-usb/dtt200u.c b/drivers/media/usb/dvb-usb/dtt200u.c index 24efa023d827..465f05c38891 100644 --- a/drivers/media/usb/dvb-usb/dtt200u.c +++ b/drivers/media/usb/dvb-usb/dtt200u.c @@ -121,7 +121,7 @@ static int dtt200u_rc_query(struct dvb_usb_device *d) } if (st->data[0] != 0) - deb_info("st->data: %*ph\n", 5, st->data); + dbg_info("st->data: %*ph\n", 5, st->data); ret: mutex_unlock(&d->data_mutex); diff --git a/drivers/media/usb/dvb-usb/dtt200u.h b/drivers/media/usb/dvb-usb/dtt200u.h index 696c2c1f3af3..22dca506216d 100644 --- a/drivers/media/usb/dvb-usb/dtt200u.h +++ b/drivers/media/usb/dvb-usb/dtt200u.h @@ -14,8 +14,10 @@ #include "dvb-usb.h" extern int dvb_usb_dtt200u_debug; -#define deb_info(args...) dprintk(dvb_usb_dtt200u_debug,0x01,args) -#define deb_xfer(args...) dprintk(dvb_usb_dtt200u_debug,0x02,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_dtt200u_debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) \ + dprintk(dvb_usb_dtt200u_debug, 0x02, fmt, ##__VA_ARGS__) /* guessed protocol description (reverse engineered): * read diff --git a/drivers/media/usb/dvb-usb/dvb-usb-common.h b/drivers/media/usb/dvb-usb/dvb-usb-common.h index 70f4eedd7c48..c5a4abc01f73 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-common.h +++ b/drivers/media/usb/dvb-usb/dvb-usb-common.h @@ -15,15 +15,24 @@ extern int dvb_usb_debug; extern int dvb_usb_disable_rc_polling; -#define deb_info(args...) dprintk(dvb_usb_debug,0x001,args) -#define deb_xfer(args...) dprintk(dvb_usb_debug,0x002,args) -#define deb_pll(args...) dprintk(dvb_usb_debug,0x004,args) -#define deb_ts(args...) dprintk(dvb_usb_debug,0x008,args) -#define deb_err(args...) dprintk(dvb_usb_debug,0x010,args) -#define deb_rc(args...) dprintk(dvb_usb_debug,0x020,args) -#define deb_fw(args...) dprintk(dvb_usb_debug,0x040,args) -#define deb_mem(args...) dprintk(dvb_usb_debug,0x080,args) -#define deb_uxfer(args...) dprintk(dvb_usb_debug,0x100,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_debug, 0x001, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) \ + dprintk(dvb_usb_debug, 0x002, fmt, ##__VA_ARGS__) +#define dbg_pll(fmt, ...) \ + dprintk(dvb_usb_debug, 0x004, fmt, ##__VA_ARGS__) +#define dbg_ts(fmt, ...) \ + dprintk(dvb_usb_debug, 0x008, fmt, ##__VA_ARGS__) +#define dbg_err(fmt, ...) \ + dprintk(dvb_usb_debug, 0x010, fmt, ##__VA_ARGS__) +#define dbg_rc(fmt, ...) \ + dprintk(dvb_usb_debug, 0x020, fmt, ##__VA_ARGS__) +#define dbg_fw(fmt, ...) \ + dprintk(dvb_usb_debug, 0x040, fmt, ##__VA_ARGS__) +#define dbg_mem(fmt, ...) \ + dprintk(dvb_usb_debug, 0x080, fmt, ##__VA_ARGS__) +#define dbg_uxfer(fmt, ...) \ + dprintk(dvb_usb_debug, 0x100, fmt, ##__VA_ARGS__) /* commonly used methods */ int dvb_usb_download_firmware(struct usb_device *udev, diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c index 0a7f8ba90992..fa9f80938813 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c @@ -28,7 +28,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) /* stop feed before setting a new pid if there will be no pid anymore */ if (newfeedcount == 0) { - deb_ts("stop feeding\n"); + dbg_ts("stop feeding\n"); usb_urb_kill(&adap->fe_adap[adap->active_fe].stream); if (adap->props.fe[adap->active_fe].streaming_ctrl != NULL) { @@ -43,10 +43,10 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) adap->feedcount = newfeedcount; /* activate the pid on the device specific pid_filter */ - deb_ts("setting pid (%s): %5d %04x at index %d '%s'\n", - adap->fe_adap[adap->active_fe].pid_filtering ? - "yes" : "no", dvbdmxfeed->pid, dvbdmxfeed->pid, - dvbdmxfeed->index, onoff ? "on" : "off"); + dbg_ts("setting pid (%s): %5d %04x at index %d '%s'\n", + adap->fe_adap[adap->active_fe].pid_filtering ? "yes" : "no", + dvbdmxfeed->pid, dvbdmxfeed->pid, dvbdmxfeed->index, + onoff ? "on" : "off"); if (adap->props.fe[adap->active_fe].caps & DVB_USB_ADAP_HAS_PID_FILTER && adap->fe_adap[adap->active_fe].pid_filtering && adap->props.fe[adap->active_fe].pid_filter != NULL) @@ -56,7 +56,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) * for reception. */ if (adap->feedcount == onoff && adap->feedcount > 0) { - deb_ts("controlling pid parser\n"); + dbg_ts("controlling pid parser\n"); if (adap->props.fe[adap->active_fe].caps & DVB_USB_ADAP_HAS_PID_FILTER && adap->props.fe[adap->active_fe].caps & DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF && @@ -68,7 +68,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) return ret; } } - deb_ts("start feeding\n"); + dbg_ts("start feeding\n"); if (adap->props.fe[adap->active_fe].streaming_ctrl != NULL) { ret = adap->props.fe[adap->active_fe].streaming_ctrl(adap, 1); if (ret < 0) { @@ -77,7 +77,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) } } - deb_ts("submitting all URBs\n"); + dbg_ts("submitting all URBs\n"); usb_urb_submit(&adap->fe_adap[adap->active_fe].stream); } return 0; @@ -85,14 +85,14 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) static int dvb_usb_start_feed(struct dvb_demux_feed *dvbdmxfeed) { - deb_ts("start pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, + dbg_ts("start pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type); return dvb_usb_ctrl_feed(dvbdmxfeed, 1); } static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed) { - deb_ts("stop pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type); + dbg_ts("stop pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type); return dvb_usb_ctrl_feed(dvbdmxfeed, 0); } @@ -150,14 +150,14 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums) adapter_nums); if (ret < 0) { - deb_info("dvb_register_adapter failed: error %d", ret); + dbg_info("dvb_register_adapter failed: error %d", ret); goto err; } adap->dvb_adap.priv = adap; ret = dvb_usb_media_device_init(adap); if (ret < 0) { - deb_info("dvb_usb_media_device_init failed: error %d", ret); + dbg_info("dvb_usb_media_device_init failed: error %d", ret); goto err_mc; } @@ -218,7 +218,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums) int dvb_usb_adapter_dvb_exit(struct dvb_usb_adapter *adap) { if (adap->state & DVB_USB_ADAP_STATE_DVB) { - deb_info("unregistering DVB part\n"); + dbg_info("unregistering DVB part\n"); dvb_net_release(&adap->dvb_net); adap->demux.dmx.close(&adap->demux.dmx); dvb_dmxdev_release(&adap->dmxdev); diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c index 0fb3fa6100e4..0c9748ab1853 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c @@ -52,7 +52,8 @@ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw err("could not stop the USB controller CPU."); while ((ret = dvb_usb_get_hexline(fw, hx, &pos)) > 0) { - deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n", hx->addr, hx->len, hx->chk); + dbg_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n", + hx->addr, hx->len, hx->chk); ret = usb_cypress_writemem(udev, hx->addr, hx->data, hx->len); if (ret != hx->len) { diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c index c1a7634e27b4..52374ed73b57 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-init.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c @@ -124,11 +124,11 @@ static int dvb_usb_adapter_exit(struct dvb_usb_device *d) /* general initialization functions */ static int dvb_usb_exit(struct dvb_usb_device *d) { - deb_info("state before exiting everything: %x\n", d->state); + dbg_info("state before exiting everything: %x\n", d->state); dvb_usb_remote_exit(d); dvb_usb_adapter_exit(d); dvb_usb_i2c_exit(d); - deb_info("state should be zero now: %x\n", d->state); + dbg_info("state should be zero now: %x\n", d->state); d->state = DVB_USB_STATE_INIT; if (d->priv != NULL && d->props.priv_destroy != NULL) @@ -194,7 +194,9 @@ static const struct dvb_usb_device_description *dvb_usb_find_device(struct usb_d for (i = 0; i < props->num_device_descs; i++) { for (j = 0; j < DVB_USB_ID_MAX_NUM && props->devices[i].cold_ids[j] != NULL; j++) { - deb_info("check for cold %x %x\n", props->devices[i].cold_ids[j]->idVendor, props->devices[i].cold_ids[j]->idProduct); + dbg_info("check for cold %x %x\n", + props->devices[i].cold_ids[j]->idVendor, + props->devices[i].cold_ids[j]->idProduct); if (props->devices[i].cold_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) && props->devices[i].cold_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) { *cold = 1; @@ -207,7 +209,9 @@ static const struct dvb_usb_device_description *dvb_usb_find_device(struct usb_d break; for (j = 0; j < DVB_USB_ID_MAX_NUM && props->devices[i].warm_ids[j] != NULL; j++) { - deb_info("check for warm %x %x\n", props->devices[i].warm_ids[j]->idVendor, props->devices[i].warm_ids[j]->idProduct); + dbg_info("check for warm %x %x\n", + props->devices[i].warm_ids[j]->idVendor, + props->devices[i].warm_ids[j]->idProduct); if (props->devices[i].warm_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) && props->devices[i].warm_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) { *cold = 0; @@ -231,7 +235,7 @@ int dvb_usb_device_power_ctrl(struct dvb_usb_device *d, int onoff) d->powered--; if (d->powered == 0 || (onoff && d->powered == 1)) { /* when switching from 1 to 0 or from 0 to 1 */ - deb_info("power control: %d\n", onoff); + dbg_info("power control: %d\n", onoff); if (d->props.power_ctrl) return d->props.power_ctrl(d, onoff); } @@ -256,7 +260,7 @@ int dvb_usb_device_init(struct usb_interface *intf, *du = NULL; if ((desc = dvb_usb_find_device(udev, props, &cold)) == NULL) { - deb_err("something went very wrong, device was not found in current device list - let's see what comes next.\n"); + dbg_err("something went very wrong, device was not found in current device list - let's see what comes next.\n"); return -ENODEV; } diff --git a/drivers/media/usb/dvb-usb/dvb-usb-remote.c b/drivers/media/usb/dvb-usb/dvb-usb-remote.c index 65e2c9e2cdc9..dcc6cafb69e7 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-remote.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-remote.c @@ -130,7 +130,7 @@ static void legacy_dvb_usb_read_remote_control(struct work_struct *work) case REMOTE_NO_KEY_PRESSED: break; case REMOTE_KEY_PRESSED: - deb_rc("key pressed\n"); + dbg_rc("key pressed\n"); d->last_event = event; input_event(d->input_dev, EV_KEY, event, 1); input_sync(d->input_dev); @@ -138,7 +138,7 @@ static void legacy_dvb_usb_read_remote_control(struct work_struct *work) input_sync(d->input_dev); break; case REMOTE_KEY_REPEAT: - deb_rc("key repeated\n"); + dbg_rc("key repeated\n"); input_event(d->input_dev, EV_KEY, event, 1); input_sync(d->input_dev); input_event(d->input_dev, EV_KEY, d->last_event, 0); @@ -151,9 +151,9 @@ static void legacy_dvb_usb_read_remote_control(struct work_struct *work) /* improved repeat handling ??? switch (state) { case REMOTE_NO_KEY_PRESSED: - deb_rc("NO KEY PRESSED\n"); + dbg_rc("NO KEY PRESSED\n"); if (d->last_state != REMOTE_NO_KEY_PRESSED) { - deb_rc("releasing event %d\n",d->last_event); + dbg_rc("releasing event %d\n", d->last_event); input_event(d->rc_input_dev, EV_KEY, d->last_event, 0); input_sync(d->rc_input_dev); } @@ -161,8 +161,8 @@ static void legacy_dvb_usb_read_remote_control(struct work_struct *work) d->last_event = 0; break; case REMOTE_KEY_PRESSED: - deb_rc("KEY PRESSED\n"); - deb_rc("pressing event %d\n",event); + dbg_rc("KEY PRESSED\n"); + dbg_rc("pressing event %d\n", event); input_event(d->rc_input_dev, EV_KEY, event, 1); input_sync(d->rc_input_dev); @@ -171,9 +171,9 @@ static void legacy_dvb_usb_read_remote_control(struct work_struct *work) d->last_state = REMOTE_KEY_PRESSED; break; case REMOTE_KEY_REPEAT: - deb_rc("KEY_REPEAT\n"); + dbg_rc("KEY_REPEAT\n"); if (d->last_state != REMOTE_NO_KEY_PRESSED) { - deb_rc("repeating event %d\n",d->last_event); + dbg_rc("repeating event %d\n", d->last_event); input_event(d->rc_input_dev, EV_KEY, d->last_event, 2); input_sync(d->rc_input_dev); d->last_state = REMOTE_KEY_REPEAT; @@ -208,10 +208,10 @@ static int legacy_dvb_usb_remote_init(struct dvb_usb_device *d) input_dev->setkeycode = legacy_dvb_usb_setkeycode; /* set the bits for the keys */ - deb_rc("key map size: %d\n", d->props.rc.legacy.rc_map_size); + dbg_rc("key map size: %d\n", d->props.rc.legacy.rc_map_size); for (i = 0; i < d->props.rc.legacy.rc_map_size; i++) { - deb_rc("setting bit for event %d item %d\n", - d->props.rc.legacy.rc_map_table[i].keycode, i); + dbg_rc("setting bit for event %d item %d\n", + d->props.rc.legacy.rc_map_table[i].keycode, i); set_bit(d->props.rc.legacy.rc_map_table[i].keycode, input_dev->keybit); } @@ -372,7 +372,7 @@ int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *d, case DVB_USB_RC_NEC_KEY_PRESSED: if ((u8) ~keybuf[1] != keybuf[2] || (u8) ~keybuf[3] != keybuf[4]) { - deb_err("remote control checksum failed.\n"); + dbg_err("remote control checksum failed.\n"); break; } /* See if we can match the raw key code. */ @@ -383,13 +383,14 @@ int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *d, *state = REMOTE_KEY_PRESSED; return 0; } - deb_err("key mapping failed - no appropriate key found in keymapping\n"); + dbg_err("key mapping failed - no appropriate key found in keymapping\n"); break; case DVB_USB_RC_NEC_KEY_REPEATED: *state = REMOTE_KEY_REPEAT; break; default: - deb_err("unknown type of remote status: %d\n",keybuf[0]); + dbg_err("unknown type of remote status: %d\n", + keybuf[0]); break; } return 0; diff --git a/drivers/media/usb/dvb-usb/dvb-usb-urb.c b/drivers/media/usb/dvb-usb/dvb-usb-urb.c index 2aabf90d8697..a7b405906627 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-urb.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-urb.c @@ -25,8 +25,7 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf, if ((ret = mutex_lock_interruptible(&d->usb_mutex))) return ret; - deb_xfer(">>> "); - debug_dump(wbuf,wlen,deb_xfer); + dbg_xfer(">>> %*ph\n", (int)wlen, wbuf); ret = usb_bulk_msg(d->udev,usb_sndbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint), wbuf,wlen,&actlen, @@ -51,8 +50,7 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf, if (ret) err("recv bulk message failed: %d",ret); else { - deb_xfer("<<< "); - debug_dump(rbuf,actlen,deb_xfer); + dbg_xfer("<<< %*ph\n", actlen, rbuf); } } diff --git a/drivers/media/usb/dvb-usb/dvb-usb.h b/drivers/media/usb/dvb-usb/dvb-usb.h index 741be0e69447..51b6a2e339a1 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb.h +++ b/drivers/media/usb/dvb-usb/dvb-usb.h @@ -28,19 +28,17 @@ /* debug */ #ifdef CONFIG_DVB_USB_DEBUG -#define dprintk(var,level,args...) \ - do { if ((var & level)) { printk(args); } } while (0) -#define debug_dump(b,l,func) {\ - int loop_; \ - for (loop_ = 0; loop_ < l; loop_++) func("%02x ", b[loop_]); \ - func("\n");\ -} +#define dprintk(var, level, fmt, ...) \ +do { \ + if (var & (level)) \ + printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ +} while (0) #define DVB_USB_DEBUG_STATUS + #else -#define dprintk(args...) -#define debug_dump(b,l,func) +#define dprintk(fmt, ...) no_printk(KERN_DEBUG fmt, ##__VA_ARGS__) #define DVB_USB_DEBUG_STATUS " (debugging is not enabled)" #endif diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c index f96626fe2c0b..a31e401f17fd 100644 --- a/drivers/media/usb/dvb-usb/dw2102.c +++ b/drivers/media/usb/dvb-usb/dw2102.c @@ -542,9 +542,10 @@ static int dw3101_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], } for (i = 0; i < num; i++) { - deb_xfer("%02x:%02x: %s ", i, msg[i].addr, - msg[i].flags == 0 ? ">>>" : "<<<"); - debug_dump(msg[i].buf, msg[i].len, deb_xfer); + dbg_xfer("%02x:%02x: %s %*ph\n", + i, msg[i].addr, + msg[i].flags == 0 ? ">>>" : "<<<", + (int)msg[i].len, msg[i].buf); } ret = num; @@ -835,10 +836,8 @@ static int dw210x_read_mac_address(struct dvb_usb_device *d, u8 mac[6]) eepromline[i%16] = ibuf[0]; eeprom[i] = ibuf[0]; } - if ((i % 16) == 15) { - deb_xfer("%02x: ", i - 15); - debug_dump(eepromline, 16, deb_xfer); - } + if ((i % 16) == 15) + dbg_xfer("%02x: %*ph\n", i - 15, 16, eepromline); } memcpy(mac, eeprom + 8, 6); @@ -875,10 +874,8 @@ static int s6x0_read_mac_address(struct dvb_usb_device *d, u8 mac[6]) eeprom[i] = ibuf[0]; } - if ((i % 16) == 15) { - deb_xfer("%02x: ", i - 15); - debug_dump(eepromline, 16, deb_xfer); - } + if ((i % 16) == 15) + dbg_xfer("%02x: %*ph", i - 15, 16, eepromline); } memcpy(mac, eeprom + 16, 6); @@ -1705,8 +1702,8 @@ static int dw2102_rc_query(struct dvb_usb_device *d) if (d->props.i2c_algo->master_xfer(&d->i2c_adap, &msg, 1) == 1) { if (msg.buf[0] != 0xff) { - deb_rc("%s: rc code: %x, %x\n", - __func__, key[0], key[1]); + dbg_rc("%s: rc code: %x, %x\n", + __func__, key[0], key[1]); rc_keydown(d->rc_dev, RC_PROTO_UNKNOWN, key[0], 0); } } @@ -1726,8 +1723,8 @@ static int prof_rc_query(struct dvb_usb_device *d) if (d->props.i2c_algo->master_xfer(&d->i2c_adap, &msg, 1) == 1) { if (msg.buf[0] != 0xff) { - deb_rc("%s: rc code: %x, %x\n", - __func__, key[0], key[1]); + dbg_rc("%s: rc code: %x, %x\n", + __func__, key[0], key[1]); rc_keydown(d->rc_dev, RC_PROTO_UNKNOWN, key[0] ^ 0xff, 0); } @@ -1748,8 +1745,8 @@ static int su3000_rc_query(struct dvb_usb_device *d) if (d->props.i2c_algo->master_xfer(&d->i2c_adap, &msg, 1) == 1) { if (msg.buf[0] != 0xff) { - deb_rc("%s: rc code: %x, %x\n", - __func__, key[0], key[1]); + dbg_rc("%s: rc code: %x, %x\n", + __func__, key[0], key[1]); rc_keydown(d->rc_dev, RC_PROTO_RC5, RC_SCANCODE_RC5(key[1], key[0]), 0); } diff --git a/drivers/media/usb/dvb-usb/dw2102.h b/drivers/media/usb/dvb-usb/dw2102.h index f64cf79b7934..ff728355a785 100644 --- a/drivers/media/usb/dvb-usb/dw2102.h +++ b/drivers/media/usb/dvb-usb/dw2102.h @@ -5,6 +5,6 @@ #define DVB_USB_LOG_PREFIX "dw2102" #include "dvb-usb.h" -#define deb_xfer(args...) dprintk(dvb_usb_dw2102_debug, 0x02, args) -#define deb_rc(args...) dprintk(dvb_usb_dw2102_debug, 0x04, args) +#define dbg_xfer(args...) dprintk(dvb_usb_dw2102_debug, 0x02, args) +#define dbg_rc(args...) dprintk(dvb_usb_dw2102_debug, 0x04, args) #endif diff --git a/drivers/media/usb/dvb-usb/gp8psk.c b/drivers/media/usb/dvb-usb/gp8psk.c index c07f46f5176e..946d63beff13 100644 --- a/drivers/media/usb/dvb-usb/gp8psk.c +++ b/drivers/media/usb/dvb-usb/gp8psk.c @@ -45,7 +45,7 @@ static int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, USB_TYPE_VENDOR | USB_DIR_IN, value, index, st->data, blen, 2000); - deb_info("reading number %d (ret: %d)\n",try,ret); + dbg_info("reading number %d (ret: %d)\n", try, ret); try++; } @@ -57,8 +57,8 @@ static int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, memcpy(b, st->data, blen); } - deb_xfer("in: req. %x, val: %x, ind: %x, buffer: ",req,value,index); - debug_dump(b,blen,deb_xfer); + dbg_xfer("in: req. %x, val: %x, ind: %x, buffer: %*ph\n", + req, value, index, blen, b); mutex_unlock(&d->usb_mutex); @@ -71,8 +71,8 @@ static int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value, struct gp8psk_state *st = d->priv; int ret; - deb_xfer("out: req. %x, val: %x, ind: %x, buffer: ",req,value,index); - debug_dump(b,blen,deb_xfer); + dbg_xfer("out: req. %x, val: %x, ind: %x, buffer: %*ph\n", + req, value, index, blen, b); if (blen > sizeof(st->data)) return -EIO; @@ -230,7 +230,7 @@ static int gp8psk_bcm4500_reload(struct dvb_usb_device *d) u8 buf; int gp_product_id = le16_to_cpu(d->udev->descriptor.idProduct); - deb_xfer("reloading firmware\n"); + dbg_xfer("reloading firmware\n"); /* Turn off 8psk power */ if (gp8psk_usb_in_op(d, BOOT_8PSK, 0, 0, &buf, 1)) diff --git a/drivers/media/usb/dvb-usb/gp8psk.h b/drivers/media/usb/dvb-usb/gp8psk.h index 5293dfdd2609..c44895ce3b3a 100644 --- a/drivers/media/usb/dvb-usb/gp8psk.h +++ b/drivers/media/usb/dvb-usb/gp8psk.h @@ -18,9 +18,12 @@ #include "dvb-usb.h" extern int dvb_usb_gp8psk_debug; -#define deb_info(args...) dprintk(dvb_usb_gp8psk_debug,0x01,args) -#define deb_xfer(args...) dprintk(dvb_usb_gp8psk_debug,0x02,args) -#define deb_rc(args...) dprintk(dvb_usb_gp8psk_debug,0x04,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_gp8psk_debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) \ + dprintk(dvb_usb_gp8psk_debug, 0x02, fmt, ##__VA_ARGS__) +#define dbg_rc(fmt, ...) \ + dprintk(dvb_usb_gp8psk_debug, 0x04, fmt, ##__VA_ARGS__) #define GET_USB_SPEED 0x07 diff --git a/drivers/media/usb/dvb-usb/nova-t-usb2.c b/drivers/media/usb/dvb-usb/nova-t-usb2.c index e7b290552b66..71df4c357ef2 100644 --- a/drivers/media/usb/dvb-usb/nova-t-usb2.c +++ b/drivers/media/usb/dvb-usb/nova-t-usb2.c @@ -14,8 +14,8 @@ MODULE_PARM_DESC(debug, "set debugging level (1=rc,2=eeprom (|-able))." DVB_USB_ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); -#define deb_rc(args...) dprintk(debug,0x01,args) -#define deb_ee(args...) dprintk(debug,0x02,args) +#define dbg_rc(fmt, ...) dprintk(debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_ee(fmt, ...) dprintk(debug, 0x02, fmt, ##__VA_ARGS__) /* Hauppauge NOVA-T USB2 keys */ static struct rc_map_table rc_map_haupp_table[] = { @@ -94,15 +94,16 @@ static int nova_t_rc_query(struct dvb_usb_device *d, u32 *event, int *state) data = raw & 0x3f; custom = (raw >> 6) & 0x1f; - deb_rc("raw key code 0x%02x, 0x%02x, 0x%02x to c: %02x d: %02x toggle: %d\n", + dbg_rc("raw key code 0x%02x, 0x%02x, 0x%02x to c: %02x d: %02x toggle: %d\n", buf[1], buf[2], buf[3], custom, data, toggle); for (i = 0; i < ARRAY_SIZE(rc_map_haupp_table); i++) { if (rc5_data(&rc_map_haupp_table[i]) == data && rc5_custom(&rc_map_haupp_table[i]) == custom) { - deb_rc("c: %x, d: %x\n", rc5_data(&rc_map_haupp_table[i]), - rc5_custom(&rc_map_haupp_table[i])); + dbg_rc("c: %x, d: %x\n", + rc5_data(&rc_map_haupp_table[i]), + rc5_custom(&rc_map_haupp_table[i])); *event = rc_map_haupp_table[i].keycode; *state = REMOTE_KEY_PRESSED; diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c index f172120db2aa..4402823fa717 100644 --- a/drivers/media/usb/dvb-usb/technisat-usb2.c +++ b/drivers/media/usb/dvb-usb/technisat-usb2.c @@ -60,10 +60,10 @@ struct technisat_usb2_state { }; /* debug print helpers */ -#define deb_info(args...) dprintk(debug, 0x01, args) -#define deb_eeprom(args...) dprintk(debug, 0x02, args) -#define deb_i2c(args...) dprintk(debug, 0x04, args) -#define deb_rc(args...) dprintk(debug, 0x08, args) +#define dbg_info(args...) dprintk(debug, 0x01, args) +#define dbg_eeprom(args...) dprintk(debug, 0x02, args) +#define dbg_i2c(args...) dprintk(debug, 0x04, args) +#define dbg_rc(args...) dprintk(debug, 0x08, args) /* vendor requests */ #define SET_IFCLK_TO_EXTERNAL_TSCLK_VENDOR_REQUEST 0xB3 @@ -91,9 +91,7 @@ static int technisat_usb2_i2c_access(struct usb_device *udev, if (!b) return -ENOMEM; - deb_i2c("i2c-access: %02x, tx: ", device_addr); - debug_dump(tx, txlen, deb_i2c); - deb_i2c(" "); + dbg_i2c("i2c-access: %02x, tx: %*ph\n", device_addr, (int)txlen, tx); if (txlen > 62) { err("i2c TX buffer can't exceed 62 bytes (dev 0x%02x)", @@ -142,17 +140,15 @@ static int technisat_usb2_i2c_access(struct usb_device *udev, goto err; } - deb_i2c("status: %d, ", b[0]); - if (rx != NULL) { memcpy(rx, &b[2], rxlen); - deb_i2c("rx (%d): ", rxlen); - debug_dump(rx, rxlen, deb_i2c); + dbg_i2c("status: %d, rx (%d): %*ph\n", + b[0], rxlen, (int)rxlen, rx); + } else { + dbg_i2c("status: %d\n", b[0]); } - deb_i2c("\n"); - err: kfree(b); return ret; @@ -397,10 +393,10 @@ static void technisat_usb2_eeprom_dump(struct dvb_usb_device *d) if (technisat_usb2_i2c_access(d->udev, 0x50 + j / 256, ®, 1, b, 16) != 0) break; - deb_eeprom("EEPROM: %01x%02x: ", j / 256, reg); + dbg_eeprom("EEPROM: %01x%02x: ", j / 256, reg); for (i = 0; i < 16; i++) - deb_eeprom("%02x ", b[i]); - deb_eeprom("\n"); + dbg_eeprom("%02x ", b[i]); + dbg_eeprom("\n"); } } #endif @@ -648,8 +644,7 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d) /* decoding */ #if 0 - deb_rc("RC: %d ", ret); - debug_dump(buf + 1, ret, deb_rc); + dbg_rc("RC: %d %*ph", ret, ret, buf + 1); #endif ev.pulse = 0; diff --git a/drivers/media/usb/dvb-usb/ttusb2.c b/drivers/media/usb/dvb-usb/ttusb2.c index 294274fd8f55..e5a6df348f9d 100644 --- a/drivers/media/usb/dvb-usb/ttusb2.c +++ b/drivers/media/usb/dvb-usb/ttusb2.c @@ -35,7 +35,8 @@ /* debug */ static int dvb_usb_ttusb2_debug; -#define deb_info(args...) dprintk(dvb_usb_ttusb2_debug,0x01,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_ttusb2_debug, 0x01, fmt, ##__VA_ARGS__) module_param_named(debug,dvb_usb_ttusb2_debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able))." DVB_USB_DEBUG_STATUS); static int dvb_usb_ttusb2_debug_ci; @@ -44,11 +45,11 @@ MODULE_PARM_DESC(debug_ci, "set debugging ci." DVB_USB_DEBUG_STATUS); DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); -#define ci_dbg(format, arg...) \ -do { \ +#define ci_dbg(fmt, ...) \ +do { \ if (dvb_usb_ttusb2_debug_ci) \ - printk(KERN_DEBUG DVB_USB_LOG_PREFIX \ - ": %s " format "\n" , __func__, ## arg); \ + printk(KERN_DEBUG DVB_USB_LOG_PREFIX ": %s " fmt "\n", \ + __func__, ##__VA_ARGS__); \ } while (0) enum { @@ -455,7 +456,7 @@ static int tt3650_rc_query(struct dvb_usb_device *d) if (rx[8] & 0x01) { /* got a "press" event */ st->last_rc_key = RC_SCANCODE_RC5(rx[3], rx[2]); - deb_info("%s: cmd=0x%02x sys=0x%02x\n", __func__, rx[2], rx[3]); + dbg_info("%s: cmd=0x%02x sys=0x%02x\n", __func__, rx[2], rx[3]); rc_keydown(d->rc_dev, RC_PROTO_RC5, st->last_rc_key, rx[1]); } else if (st->last_rc_key) { rc_keyup(d->rc_dev); @@ -526,7 +527,7 @@ static int ttusb2_frontend_tda10086_attach(struct dvb_usb_adapter *adap) err("set interface to alts=3 failed"); if ((adap->fe_adap[0].fe = dvb_attach(tda10086_attach, &tda10086_config, &adap->dev->i2c_adap)) == NULL) { - deb_info("TDA10086 attach failed\n"); + dbg_info("TDA10086 attach failed\n"); return -ENODEV; } @@ -551,7 +552,7 @@ static int ttusb2_frontend_tda10023_attach(struct dvb_usb_adapter *adap) &tda10023_config, &adap->dev->i2c_adap, 0x48); if (adap->fe_adap[0].fe == NULL) { - deb_info("TDA10023 attach failed\n"); + dbg_info("TDA10023 attach failed\n"); return -ENODEV; } tt3650_ci_init(adap); @@ -560,7 +561,7 @@ static int ttusb2_frontend_tda10023_attach(struct dvb_usb_adapter *adap) &tda10048_config, &adap->dev->i2c_adap); if (adap->fe_adap[1].fe == NULL) { - deb_info("TDA10048 attach failed\n"); + dbg_info("TDA10048 attach failed\n"); return -ENODEV; } @@ -593,12 +594,12 @@ static int ttusb2_tuner_tda827x_attach(struct dvb_usb_adapter *adap) static int ttusb2_tuner_tda826x_attach(struct dvb_usb_adapter *adap) { if (dvb_attach(tda826x_attach, adap->fe_adap[0].fe, 0x60, &adap->dev->i2c_adap, 0) == NULL) { - deb_info("TDA8263 attach failed\n"); + dbg_info("TDA8263 attach failed\n"); return -ENODEV; } if (dvb_attach(lnbp21_attach, adap->fe_adap[0].fe, &adap->dev->i2c_adap, 0, 0) == NULL) { - deb_info("LNBP21 attach failed\n"); + dbg_info("LNBP21 attach failed\n"); return -ENODEV; } return 0; diff --git a/drivers/media/usb/dvb-usb/usb-urb.c b/drivers/media/usb/dvb-usb/usb-urb.c index 9771f0954c69..26da9ef1d1ca 100644 --- a/drivers/media/usb/dvb-usb/usb-urb.c +++ b/drivers/media/usb/dvb-usb/usb-urb.c @@ -19,10 +19,10 @@ static void usb_urb_complete(struct urb *urb) int i; u8 *b; - deb_uxfer("'%s' urb completed. status: %d, length: %d/%d, pack_num: %d, errors: %d\n", - ptype == PIPE_ISOCHRONOUS ? "isoc" : "bulk", - urb->status,urb->actual_length,urb->transfer_buffer_length, - urb->number_of_packets,urb->error_count); + dbg_uxfer("'%s' urb completed. status: %d, length: %d/%d, pack_num: %d, errors: %d\n", + ptype == PIPE_ISOCHRONOUS ? "isoc" : "bulk", + urb->status, urb->actual_length, urb->transfer_buffer_length, + urb->number_of_packets, urb->error_count); switch (urb->status) { case 0: /* success */ @@ -33,7 +33,7 @@ static void usb_urb_complete(struct urb *urb) case -ESHUTDOWN: return; default: /* error */ - deb_ts("urb completion error %d.\n", urb->status); + dbg_ts("urb completion error %d\n", urb->status); break; } @@ -43,14 +43,15 @@ static void usb_urb_complete(struct urb *urb) for (i = 0; i < urb->number_of_packets; i++) { if (urb->iso_frame_desc[i].status != 0) - deb_ts("iso frame descriptor has an error: %d\n",urb->iso_frame_desc[i].status); + dbg_ts("iso frame descriptor has an error: %d\n", + urb->iso_frame_desc[i].status); else if (urb->iso_frame_desc[i].actual_length > 0) stream->complete(stream, b + urb->iso_frame_desc[i].offset, urb->iso_frame_desc[i].actual_length); urb->iso_frame_desc[i].status = 0; urb->iso_frame_desc[i].actual_length = 0; } - debug_dump(b,20,deb_uxfer); + dbg_uxfer("%*ph\n", 20, b); break; case PIPE_BULK: if (urb->actual_length > 0) @@ -67,7 +68,7 @@ int usb_urb_kill(struct usb_data_stream *stream) { int i; for (i = 0; i < stream->urbs_submitted; i++) { - deb_ts("killing URB no. %d.\n",i); + dbg_ts("killing URB no. %d\n", i); /* stop the URB */ usb_kill_urb(stream->urb_list[i]); @@ -80,7 +81,7 @@ int usb_urb_submit(struct usb_data_stream *stream) { int i,ret; for (i = 0; i < stream->urbs_initialized; i++) { - deb_ts("submitting URB no. %d\n",i); + dbg_ts("submitting URB no. %d\n", i); if ((ret = usb_submit_urb(stream->urb_list[i],GFP_ATOMIC))) { err("could not submit URB no. %d - get them all back",i); usb_urb_kill(stream); @@ -96,7 +97,7 @@ static int usb_free_stream_buffers(struct usb_data_stream *stream) if (stream->state & USB_STATE_URB_BUF) { while (stream->buf_num) { stream->buf_num--; - deb_mem("freeing buffer %d\n",stream->buf_num); + dbg_mem("freeing buffer %d\n", stream->buf_num); usb_free_coherent(stream->udev, stream->buf_size, stream->buf_list[stream->buf_num], stream->dma_addr[stream->buf_num]); @@ -113,24 +114,25 @@ static int usb_allocate_stream_buffers(struct usb_data_stream *stream, int num, stream->buf_num = 0; stream->buf_size = size; - deb_mem("all in all I will use %lu bytes for streaming\n",num*size); + dbg_mem("all in all I will use %lu bytes for streaming\n", num * size); for (stream->buf_num = 0; stream->buf_num < num; stream->buf_num++) { - deb_mem("allocating buffer %d\n",stream->buf_num); + dbg_mem("allocating buffer %d\n", stream->buf_num); if (( stream->buf_list[stream->buf_num] = usb_alloc_coherent(stream->udev, size, GFP_KERNEL, &stream->dma_addr[stream->buf_num]) ) == NULL) { - deb_mem("not enough memory for urb-buffer allocation.\n"); + dbg_mem("not enough memory for urb-buffer allocation.\n"); usb_free_stream_buffers(stream); return -ENOMEM; } - deb_mem("buffer %d: %p (dma: %Lu)\n", + dbg_mem("buffer %d: %p (dma: %llu)\n", stream->buf_num, -stream->buf_list[stream->buf_num], (long long)stream->dma_addr[stream->buf_num]); + stream->buf_list[stream->buf_num], + (long long)stream->dma_addr[stream->buf_num]); memset(stream->buf_list[stream->buf_num],0,size); stream->state |= USB_STATE_URB_BUF; } - deb_mem("allocation successful\n"); + dbg_mem("allocation successful\n"); return 0; } @@ -147,7 +149,7 @@ static int usb_bulk_urb_init(struct usb_data_stream *stream) for (i = 0; i < stream->props.count; i++) { stream->urb_list[i] = usb_alloc_urb(0, GFP_KERNEL); if (!stream->urb_list[i]) { - deb_mem("not enough memory for urb_alloc_urb!.\n"); + dbg_mem("not enough memory for urb_alloc_urb!.\n"); for (j = 0; j < i; j++) usb_free_urb(stream->urb_list[j]); return -ENOMEM; @@ -180,7 +182,7 @@ static int usb_isoc_urb_init(struct usb_data_stream *stream) stream->urb_list[i] = usb_alloc_urb(stream->props.u.isoc.framesperurb, GFP_KERNEL); if (!stream->urb_list[i]) { - deb_mem("not enough memory for urb_alloc_urb!\n"); + dbg_mem("not enough memory for urb_alloc_urb!\n"); for (j = 0; j < i; j++) usb_free_urb(stream->urb_list[j]); return -ENOMEM; @@ -243,7 +245,7 @@ int usb_urb_exit(struct usb_data_stream *stream) for (i = 0; i < stream->urbs_initialized; i++) { if (stream->urb_list[i] != NULL) { - deb_mem("freeing URB no. %d.\n",i); + dbg_mem("freeing URB no. %d\n", i); /* free the URBs */ usb_free_urb(stream->urb_list[i]); } diff --git a/drivers/media/usb/dvb-usb/vp702x-fe.c b/drivers/media/usb/dvb-usb/vp702x-fe.c index c1e7931900ee..d2cf0858ed94 100644 --- a/drivers/media/usb/dvb-usb/vp702x-fe.c +++ b/drivers/media/usb/dvb-usb/vp702x-fe.c @@ -73,7 +73,7 @@ static int vp702x_fe_read_status(struct dvb_frontend *fe, { struct vp702x_fe_state *st = fe->demodulator_priv; vp702x_fe_refresh_state(st); - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); if (st->lock == 0) *status = FE_HAS_LOCK | FE_HAS_SYNC | FE_HAS_VITERBI | FE_HAS_SIGNAL | FE_HAS_CARRIER; @@ -127,7 +127,7 @@ static int vp702x_fe_read_snr(struct dvb_frontend* fe, u16 *snr) static int vp702x_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune) { - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); tune->min_delay_ms = 2000; return 0; } @@ -158,9 +158,9 @@ static int vp702x_fe_set_frontend(struct dvb_frontend *fe) cmd[4] = (sr >> 4) & 0xff; cmd[5] = (sr << 4) & 0xf0; - deb_fe("setting frontend to: %u -> %u (%x) LNB-based GHz, symbolrate: %d -> %lu (%lx)\n", - fep->frequency, freq, freq, fep->symbol_rate, - (unsigned long) sr, (unsigned long) sr); + dbg_fe("setting frontend to: %u -> %u (%x) LNB-based GHz, symbolrate: %d -> %lu (%lx)\n", + fep->frequency, freq, freq, fep->symbol_rate, + (unsigned long)sr, (unsigned long)sr); /* if (fep->inversion == INVERSION_ON) cmd[6] |= 0x80; */ @@ -185,9 +185,9 @@ static int vp702x_fe_set_frontend(struct dvb_frontend *fe) vp702x_usb_inout_op(st->d, cmd, 8, cmd, 10, 100); if (cmd[2] == 0 && cmd[3] == 0) - deb_fe("tuning failed.\n"); + dbg_fe("tuning failed.\n"); else - deb_fe("tuning succeeded.\n"); + dbg_fe("tuning succeeded.\n"); mutex_unlock(&dst->buf_mutex); @@ -197,14 +197,14 @@ static int vp702x_fe_set_frontend(struct dvb_frontend *fe) static int vp702x_fe_init(struct dvb_frontend *fe) { struct vp702x_fe_state *st = fe->demodulator_priv; - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); vp702x_usb_in_op(st->d, RESET_TUNER, 0, 0, NULL, 0); return 0; } static int vp702x_fe_sleep(struct dvb_frontend *fe) { - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); return 0; } @@ -215,7 +215,7 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe, struct vp702x_fe_state *st = fe->demodulator_priv; struct vp702x_device_state *dst = st->d->priv; - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); if (m->msg_len > 4) return -EINVAL; @@ -231,9 +231,9 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe, vp702x_usb_inout_op(st->d, cmd, 8, cmd, 10, 100); if (cmd[2] == 0 && cmd[3] == 0) - deb_fe("diseqc cmd failed.\n"); + dbg_fe("diseqc cmd failed.\n"); else - deb_fe("diseqc cmd succeeded.\n"); + dbg_fe("diseqc cmd succeeded.\n"); mutex_unlock(&dst->buf_mutex); @@ -243,7 +243,7 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe, static int vp702x_fe_send_diseqc_burst(struct dvb_frontend *fe, enum fe_sec_mini_cmd burst) { - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); return 0; } @@ -254,7 +254,7 @@ static int vp702x_fe_set_tone(struct dvb_frontend *fe, struct vp702x_device_state *dst = st->d->priv; u8 *buf; - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); st->tone_mode = tone; @@ -272,9 +272,9 @@ static int vp702x_fe_set_tone(struct dvb_frontend *fe, vp702x_usb_inout_op(st->d, buf, 8, buf, 10, 100); if (buf[2] == 0 && buf[3] == 0) - deb_fe("set_tone cmd failed.\n"); + dbg_fe("set_tone cmd failed.\n"); else - deb_fe("set_tone cmd succeeded.\n"); + dbg_fe("set_tone cmd succeeded.\n"); mutex_unlock(&dst->buf_mutex); @@ -287,7 +287,7 @@ static int vp702x_fe_set_voltage(struct dvb_frontend *fe, struct vp702x_fe_state *st = fe->demodulator_priv; struct vp702x_device_state *dst = st->d->priv; u8 *buf; - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); st->voltage = voltage; @@ -305,9 +305,9 @@ static int vp702x_fe_set_voltage(struct dvb_frontend *fe, vp702x_usb_inout_op(st->d, buf, 8, buf, 10, 100); if (buf[2] == 0 && buf[3] == 0) - deb_fe("set_voltage cmd failed.\n"); + dbg_fe("set_voltage cmd failed.\n"); else - deb_fe("set_voltage cmd succeeded.\n"); + dbg_fe("set_voltage cmd succeeded.\n"); mutex_unlock(&dst->buf_mutex); return 0; diff --git a/drivers/media/usb/dvb-usb/vp702x.c b/drivers/media/usb/dvb-usb/vp702x.c index bf54747e2e01..6e5c3bf1786f 100644 --- a/drivers/media/usb/dvb-usb/vp702x.c +++ b/drivers/media/usb/dvb-usb/vp702x.c @@ -46,8 +46,8 @@ static int vp702x_usb_in_op_unlocked(struct dvb_usb_device *d, u8 req, ret = 0; - deb_xfer("in: req. %02x, val: %04x, ind: %04x, buffer: ",req,value,index); - debug_dump(b,blen,deb_xfer); + dbg_xfer("in: req. %02x, val: %04x, ind: %04x, buffer: %*ph\n", + req, value, index, blen, b); return ret; } @@ -68,8 +68,8 @@ static int vp702x_usb_out_op_unlocked(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen) { int ret; - deb_xfer("out: req. %02x, val: %04x, ind: %04x, buffer: ",req,value,index); - debug_dump(b,blen,deb_xfer); + dbg_xfer("out: req. %02x, val: %04x, ind: %04x, buffer: %*ph\n", + req, value, index, blen, b); if ((ret = usb_control_msg(d->udev, usb_sndctrlpipe(d->udev,0), @@ -267,7 +267,7 @@ static int vp702x_rc_query(struct dvb_usb_device *d, u32 *event, int *state) vp702x_usb_in_op(d,READ_REMOTE_REQ,0,0,key,10); - deb_rc("remote query key: %x %d\n",key[1],key[1]); + dbg_rc("remote query key: %x %d\n", key[1], key[1]); if (key[1] == 0x44) { *state = REMOTE_NO_KEY_PRESSED; diff --git a/drivers/media/usb/dvb-usb/vp702x.h b/drivers/media/usb/dvb-usb/vp702x.h index 18ad7ced2045..04117d5d1a97 100644 --- a/drivers/media/usb/dvb-usb/vp702x.h +++ b/drivers/media/usb/dvb-usb/vp702x.h @@ -6,10 +6,14 @@ #include "dvb-usb.h" extern int dvb_usb_vp702x_debug; -#define deb_info(args...) dprintk(dvb_usb_vp702x_debug,0x01,args) -#define deb_xfer(args...) dprintk(dvb_usb_vp702x_debug,0x02,args) -#define deb_rc(args...) dprintk(dvb_usb_vp702x_debug,0x04,args) -#define deb_fe(args...) dprintk(dvb_usb_vp702x_debug,0x08,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_vp702x_debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) \ + dprintk(dvb_usb_vp702x_debug, 0x02, fmt, ##__VA_ARGS__) +#define dbg_rc(fmt, ...) \ + dprintk(dvb_usb_vp702x_debug, 0x04, fmt, ##__VA_ARGS__) +#define dbg_fe(fmt, ...) \ + dprintk(dvb_usb_vp702x_debug, 0x08, fmt, ##__VA_ARGS__) /* commands are read and written with USB control messages */ diff --git a/drivers/media/usb/dvb-usb/vp7045.c b/drivers/media/usb/dvb-usb/vp7045.c index 23e3a90af1f4..e06b9d627285 100644 --- a/drivers/media/usb/dvb-usb/vp7045.c +++ b/drivers/media/usb/dvb-usb/vp7045.c @@ -18,9 +18,12 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,rc=4 (or-able))." DV DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); -#define deb_info(args...) dprintk(dvb_usb_vp7045_debug,0x01,args) -#define deb_xfer(args...) dprintk(dvb_usb_vp7045_debug,0x02,args) -#define deb_rc(args...) dprintk(dvb_usb_vp7045_debug,0x04,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_vp7045_debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) \ + dprintk(dvb_usb_vp7045_debug, 0x02, fmt, ##__VA_ARGS__) +#define dbg_rc(fmt, ...) \ + dprintk(dvb_usb_vp7045_debug, 0x04, fmt, ##__VA_ARGS__) int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in, int inlen, int msec) { @@ -42,9 +45,7 @@ int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in, if (out != NULL && outlen > 0) memcpy(&buf[1], out, outlen); - deb_xfer("out buffer: "); - debug_dump(buf, outlen+1, deb_xfer); - + dbg_xfer("out buffer: %*ph\n", outlen + 1, buf); if (usb_control_msg(d->udev, usb_sndctrlpipe(d->udev,0), @@ -66,8 +67,7 @@ int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in, goto unlock; } - deb_xfer("in buffer: "); - debug_dump(buf, 12, deb_xfer); + dbg_xfer("in buffer: %*ph\n", 12, buf); if (in != NULL && inlen > 0) memcpy(in, &buf[1], inlen); @@ -103,7 +103,7 @@ static int vp7045_rc_query(struct dvb_usb_device *d) if (ret) return ret; - deb_rc("remote query key: %x\n", key); + dbg_rc("remote query key: %x\n", key); if (key != 0x44) { /* @@ -129,8 +129,9 @@ static int vp7045_read_eeprom(struct dvb_usb_device *d,u8 *buf, int len, int off buf[i] = br[1]; } - deb_info("VP7045 EEPROM read (offs: %d, len: %d) : ", offset, i); - debug_dump(buf, i, deb_info); + dbg_info("VP7045 EEPROM read (offs: %d, len: %d) : %*ph\n", + offset, i, i, buf); + return 0; } @@ -145,15 +146,15 @@ static int vp7045_frontend_attach(struct dvb_usb_adapter *adap) vp7045_usb_op(adap->dev,VENDOR_STRING_READ,NULL,0,buf,20,0); buf[10] = '\0'; - deb_info("firmware says: %s ",buf); + dbg_info("firmware says: %s\n", buf); vp7045_usb_op(adap->dev,PRODUCT_STRING_READ,NULL,0,buf,20,0); buf[10] = '\0'; - deb_info("%s ",buf); + dbg_info("%s\n", buf); vp7045_usb_op(adap->dev,FW_VERSION_READ,NULL,0,buf,20,0); buf[10] = '\0'; - deb_info("v%s\n",buf); + dbg_info("v%s\n", buf); /* Dump the EEPROM */ /* vp7045_read_eeprom(d,buf, 255, FX2_ID_ADDR); */ ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH] media: debugging logging cleanup @ 2020-08-14 4:01 ` Joe Perches 0 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-14 4:01 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: mauro.chehab, Greg Kroah-Hartman, devel, linuxarm, linux-kernel Various logging mechanisms are broken with lack of KERN_<LEVEL> and buffer logging. Remove unnecessary debug_dump macros and uses for %*ph instead. Miscellanea: o Convert deb_<foo> to dbg_<foo> to clarify the debugging use o Use KERN_DEBUG in dprintk/dbg_<foo> macros o Use fmt, ... and ##__VA_ARGS__ in macros o Add missing format newlines o Use no_printk to validate format and argument when not debugging o whitespace and line wrapping neatening Signed-off-by: Joe Perches <joe@perches.com> --- drivers/media/common/b2c2/flexcop-fe-tuner.c | 4 +- drivers/media/common/b2c2/flexcop-hw-filter.c | 9 +- drivers/media/common/b2c2/flexcop-i2c.c | 28 ++-- drivers/media/common/b2c2/flexcop-misc.c | 14 +- drivers/media/common/b2c2/flexcop-sram.c | 2 +- drivers/media/common/b2c2/flexcop.c | 4 +- drivers/media/common/b2c2/flexcop.h | 24 ++-- drivers/media/dvb-frontends/bcm3510.c | 106 ++++++++------- drivers/media/dvb-frontends/dib3000mb.c | 184 +++++++++++++------------- drivers/media/dvb-frontends/ix2505v.c | 29 ++-- drivers/media/dvb-frontends/m88rs2000.c | 28 ++-- drivers/media/dvb-frontends/zl10036.c | 38 +++--- drivers/media/pci/b2c2/flexcop-dma.c | 12 +- drivers/media/pci/b2c2/flexcop-pci.c | 63 ++++----- drivers/media/usb/b2c2/flexcop-usb.c | 82 ++++++------ drivers/media/usb/dvb-usb-v2/lmedm04.c | 30 ++--- drivers/media/usb/dvb-usb/a800.c | 2 +- drivers/media/usb/dvb-usb/af9005-fe.c | 150 ++++++++++----------- drivers/media/usb/dvb-usb/af9005-remote.c | 20 +-- drivers/media/usb/dvb-usb/af9005.c | 86 ++++++------ drivers/media/usb/dvb-usb/af9005.h | 18 ++- drivers/media/usb/dvb-usb/az6027.c | 34 ++--- drivers/media/usb/dvb-usb/az6027.h | 8 +- drivers/media/usb/dvb-usb/cinergyT2-core.c | 10 +- drivers/media/usb/dvb-usb/cinergyT2-fe.c | 2 +- drivers/media/usb/dvb-usb/cinergyT2.h | 18 +-- drivers/media/usb/dvb-usb/dib0700.h | 12 +- drivers/media/usb/dvb-usb/dib0700_core.c | 92 +++++++------ drivers/media/usb/dvb-usb/dib0700_devices.c | 80 ++++++----- drivers/media/usb/dvb-usb/dibusb-common.c | 4 +- drivers/media/usb/dvb-usb/digitv.c | 5 +- drivers/media/usb/dvb-usb/dtt200u-fe.c | 2 +- drivers/media/usb/dvb-usb/dtt200u.c | 2 +- drivers/media/usb/dvb-usb/dtt200u.h | 6 +- drivers/media/usb/dvb-usb/dvb-usb-common.h | 27 ++-- drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 26 ++-- drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 3 +- drivers/media/usb/dvb-usb/dvb-usb-init.c | 16 ++- drivers/media/usb/dvb-usb/dvb-usb-remote.c | 29 ++-- drivers/media/usb/dvb-usb/dvb-usb-urb.c | 6 +- drivers/media/usb/dvb-usb/dvb-usb.h | 16 +-- drivers/media/usb/dvb-usb/dw2102.c | 31 ++--- drivers/media/usb/dvb-usb/dw2102.h | 4 +- drivers/media/usb/dvb-usb/gp8psk.c | 12 +- drivers/media/usb/dvb-usb/gp8psk.h | 9 +- drivers/media/usb/dvb-usb/nova-t-usb2.c | 11 +- drivers/media/usb/dvb-usb/technisat-usb2.c | 31 ++--- drivers/media/usb/dvb-usb/ttusb2.c | 23 ++-- drivers/media/usb/dvb-usb/usb-urb.c | 40 +++--- drivers/media/usb/dvb-usb/vp702x-fe.c | 38 +++--- drivers/media/usb/dvb-usb/vp702x.c | 10 +- drivers/media/usb/dvb-usb/vp702x.h | 12 +- drivers/media/usb/dvb-usb/vp7045.c | 29 ++-- 53 files changed, 808 insertions(+), 773 deletions(-) diff --git a/drivers/media/common/b2c2/flexcop-fe-tuner.c b/drivers/media/common/b2c2/flexcop-fe-tuner.c index aac1aadb0cb1..12332b2c10ce 100644 --- a/drivers/media/common/b2c2/flexcop-fe-tuner.c +++ b/drivers/media/common/b2c2/flexcop-fe-tuner.c @@ -44,7 +44,7 @@ static int flexcop_set_voltage(struct dvb_frontend *fe, { struct flexcop_device *fc = fe->dvb->priv; flexcop_ibi_value v; - deb_tuner("polarity/voltage = %u\n", voltage); + dbg_tuner("polarity/voltage = %u\n", voltage); v = fc->read_ibi_reg(fc, misc_204); switch (voltage) { @@ -86,7 +86,7 @@ static int flexcop_set_tone(struct dvb_frontend *fe, enum fe_sec_tone_mode tone) flexcop_ibi_value v; u16 ax; v.raw = 0; - deb_tuner("tone = %u\n",tone); + dbg_tuner("tone = %u\n", tone); switch (tone) { case SEC_TONE_ON: diff --git a/drivers/media/common/b2c2/flexcop-hw-filter.c b/drivers/media/common/b2c2/flexcop-hw-filter.c index 335f30a54ba8..6706239ab896 100644 --- a/drivers/media/common/b2c2/flexcop-hw-filter.c +++ b/drivers/media/common/b2c2/flexcop-hw-filter.c @@ -9,7 +9,7 @@ static void flexcop_rcv_data_ctrl(struct flexcop_device *fc, int onoff) { flexcop_set_ibi_value(ctrl_208, Rcv_Data_sig, onoff); - deb_ts("rcv_data is now: '%s'\n", onoff ? "on" : "off"); + dbg_ts("rcv_data is now: '%s'\n", onoff ? "on" : "off"); } void flexcop_smc_ctrl(struct flexcop_device *fc, int onoff) @@ -115,8 +115,8 @@ static void flexcop_pid_control(struct flexcop_device *fc, if (pid == 0x2000) return; - deb_ts("setting pid: %5d %04x at index %d '%s'\n", - pid, pid, index, onoff ? "on" : "off"); + dbg_ts("setting pid: %5d %04x at index %d '%s'\n", + pid, pid, index, onoff ? "on" : "off"); /* First 6 can be buggy - skip over them if option set */ if (fc->skip_6_hw_pid_filter) @@ -164,7 +164,8 @@ static void flexcop_pid_control(struct flexcop_device *fc, static int flexcop_toggle_fullts_streaming(struct flexcop_device *fc, int onoff) { if (fc->fullts_streaming_state != onoff) { - deb_ts("%s full TS transfer\n",onoff ? "enabling" : "disabling"); + dbg_ts("%s full TS transfer\n", + onoff ? "enabling" : "disabling"); flexcop_pid_group_filter(fc, 0, 0x1fe0 * (!onoff)); flexcop_pid_group_filter_ctrl(fc, onoff); fc->fullts_streaming_state = onoff; diff --git a/drivers/media/common/b2c2/flexcop-i2c.c b/drivers/media/common/b2c2/flexcop-i2c.c index 1f1eaa807811..a85985b98766 100644 --- a/drivers/media/common/b2c2/flexcop-i2c.c +++ b/drivers/media/common/b2c2/flexcop-i2c.c @@ -15,7 +15,7 @@ static int flexcop_i2c_operation(struct flexcop_device *fc, flexcop_ibi_value r; r100->tw_sm_c_100.working_start = 1; - deb_i2c("r100 before: %08x\n",r100->raw); + dbg_i2c("r100 before: %08x\n", r100->raw); fc->write_ibi_reg(fc, tw_sm_c_100, ibi_zero); fc->write_ibi_reg(fc, tw_sm_c_100, *r100); /* initiating i2c operation */ @@ -26,15 +26,15 @@ static int flexcop_i2c_operation(struct flexcop_device *fc, if (!r.tw_sm_c_100.no_base_addr_ack_error) { if (r.tw_sm_c_100.st_done) { *r100 = r; - deb_i2c("i2c success\n"); + dbg_i2c("i2c success\n"); return 0; } } else { - deb_i2c("suffering from an i2c ack_error\n"); + dbg_i2c("suffering from an i2c ack_error\n"); return -EREMOTEIO; } } - deb_i2c("tried %d times i2c operation, never finished or too many ack errors.\n", + dbg_i2c("tried %d times i2c operation, never finished or too many ack errors\n", i); return -EREMOTEIO; } @@ -61,12 +61,12 @@ static int flexcop_i2c_read4(struct flexcop_i2c_adapter *i2c, ret = flexcop_i2c_operation(i2c->fc, &r100); if (ret != 0) { - deb_i2c("Retrying operation\n"); + dbg_i2c("Retrying operation\n"); r100.tw_sm_c_100.no_base_addr_ack_error = i2c->no_base_addr; ret = flexcop_i2c_operation(i2c->fc, &r100); } if (ret != 0) { - deb_i2c("read failed. %d\n", ret); + dbg_i2c("read failed. %d\n", ret); return ret; } @@ -74,7 +74,7 @@ static int flexcop_i2c_read4(struct flexcop_i2c_adapter *i2c, if (len > 0) { r104 = i2c->fc->read_ibi_reg(i2c->fc, tw_sm_c_104); - deb_i2c("read: r100: %08x, r104: %08x\n", r100.raw, r104.raw); + dbg_i2c("read: r100: %08x, r104: %08x\n", r100.raw, r104.raw); /* there is at least one more byte, otherwise we wouldn't be here */ buf[1] = r104.tw_sm_c_104.data2_reg; @@ -97,7 +97,7 @@ static int flexcop_i2c_write4(struct flexcop_device *fc, r104.tw_sm_c_104.data3_reg = len > 1 ? buf[2] : 0; r104.tw_sm_c_104.data4_reg = len > 2 ? buf[3] : 0; - deb_i2c("write: r100: %08x, r104: %08x\n", r100.raw, r104.raw); + dbg_i2c("write: r100: %08x, r104: %08x\n", r100.raw, r104.raw); /* write the additional i2c data before doing the actual i2c operation */ fc->write_ibi_reg(fc, tw_sm_c_104, r104); @@ -116,7 +116,7 @@ int flexcop_i2c_request(struct flexcop_i2c_adapter *i2c, u16 bytes_to_transfer; flexcop_ibi_value r100; - deb_i2c("port %d %s(%02x): register %02x, size: %d\n", + dbg_i2c("port %d %s(%02x): register %02x, size: %d\n", i2c->port, op == FC_READ ? "rd" : "wr", chipaddr, start_addr, size); @@ -153,10 +153,10 @@ int flexcop_i2c_request(struct flexcop_i2c_adapter *i2c, addr += bytes_to_transfer; len -= bytes_to_transfer; } - deb_i2c_dump("port %d %s(%02x): register %02x: %*ph\n", - i2c->port, - op == FC_READ ? "rd" : "wr", - chipaddr, start_addr, size, buf); + dbg_i2c_dump("port %d %s(%02x): register %02x: %*ph\n", + i2c->port, + op == FC_READ ? "rd" : "wr", + chipaddr, start_addr, size, buf); return 0; } @@ -192,7 +192,7 @@ static int flexcop_master_xfer(struct i2c_adapter *i2c_adap, msgs[i].buf[0], &msgs[i].buf[1], msgs[i].len - 1); if (ret < 0) { - deb_i2c("i2c master_xfer failed"); + dbg_i2c("i2c master_xfer failed"); break; } } diff --git a/drivers/media/common/b2c2/flexcop-misc.c b/drivers/media/common/b2c2/flexcop-misc.c index 83d01d3a81cc..eb3e981ea15c 100644 --- a/drivers/media/common/b2c2/flexcop-misc.c +++ b/drivers/media/common/b2c2/flexcop-misc.c @@ -12,15 +12,15 @@ void flexcop_determine_revision(struct flexcop_device *fc) switch (v.misc_204.Rev_N_sig_revision_hi) { case 0x2: - deb_info("found a FlexCopII.\n"); + dbg_info("found a FlexCopII\n"); fc->rev = FLEXCOP_II; break; case 0x3: - deb_info("found a FlexCopIIb.\n"); + dbg_info("found a FlexCopIIb\n"); fc->rev = FLEXCOP_IIB; break; case 0x0: - deb_info("found a FlexCopIII.\n"); + dbg_info("found a FlexCopIII\n"); fc->rev = FLEXCOP_III; break; default: @@ -30,9 +30,9 @@ void flexcop_determine_revision(struct flexcop_device *fc) } if ((fc->has_32_hw_pid_filter = v.misc_204.Rev_N_sig_caps)) - deb_info("this FlexCop has the additional 32 hardware pid filter.\n"); + dbg_info("this FlexCop has the additional 32 hardware pid filter\n"); else - deb_info("this FlexCop has the 6 basic main hardware pid filter.\n"); + dbg_info("this FlexCop has the 6 basic main hardware pid filter\n"); /* bus parts have to decide if hw pid filtering is used or not. */ } @@ -78,8 +78,8 @@ void flexcop_dump_reg(struct flexcop_device *fc, int i; for (i = 0; i < num; i++) { v = fc->read_ibi_reg(fc, reg+4*i); - deb_rdump("0x%03x: %08x, ", reg+4*i, v.raw); + dbg_rdump("0x%03x: %08x, ", reg + 4 * i, v.raw); } - deb_rdump("\n"); + dbg_rdump("\n"); } EXPORT_SYMBOL(flexcop_dump_reg); diff --git a/drivers/media/common/b2c2/flexcop-sram.c b/drivers/media/common/b2c2/flexcop-sram.c index d97962eb0112..3089d3b88a5e 100644 --- a/drivers/media/common/b2c2/flexcop-sram.c +++ b/drivers/media/common/b2c2/flexcop-sram.c @@ -38,7 +38,7 @@ int flexcop_sram_set_dest(struct flexcop_device *fc, flexcop_sram_dest_t dest, err("SRAM destination target to available on FlexCopII(b)\n"); return -EINVAL; } - deb_sram("sram dest: %x target: %x\n", dest, target); + dbg_sram("sram dest: %x target: %x\n", dest, target); if (dest & FC_SRAM_DEST_NET) v.sram_dest_reg_714.NET_Dest = target; diff --git a/drivers/media/common/b2c2/flexcop.c b/drivers/media/common/b2c2/flexcop.c index cbaa61f10d5f..dd78827fb7cd 100644 --- a/drivers/media/common/b2c2/flexcop.c +++ b/drivers/media/common/b2c2/flexcop.c @@ -155,7 +155,7 @@ static void flexcop_dvb_exit(struct flexcop_device *fc) dvb_dmxdev_release(&fc->dmxdev); dvb_dmx_release(&fc->demux); dvb_unregister_adapter(&fc->dvb_adapter); - deb_info("deinitialized dvb stuff\n"); + dbg_info("deinitialized dvb stuff\n"); } fc->init_state &= ~FC_STATE_DVB_INIT; } @@ -210,7 +210,7 @@ void flexcop_reset_block_300(struct flexcop_device *fc) flexcop_ibi_value v208_save = fc->read_ibi_reg(fc, ctrl_208), v210 = fc->read_ibi_reg(fc, sw_reset_210); - deb_rdump("208: %08x, 210: %08x\n", v208_save.raw, v210.raw); + dbg_rdump("208: %08x, 210: %08x\n", v208_save.raw, v210.raw); fc->write_ibi_reg(fc,ctrl_208,ibi_zero); v210.sw_reset_210.reset_block_300 = 1; diff --git a/drivers/media/common/b2c2/flexcop.h b/drivers/media/common/b2c2/flexcop.h index 486fe2380b92..f1149a722187 100644 --- a/drivers/media/common/b2c2/flexcop.h +++ b/drivers/media/common/b2c2/flexcop.h @@ -14,18 +14,22 @@ extern int b2c2_flexcop_debug; /* debug */ #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG -#define dprintk(level,args...) \ - do { if ((b2c2_flexcop_debug & level)) printk(args); } while (0) +#define dprintk(level, fmt, ...) \ +do { \ + if ((b2c2_flexcop_debug & (level))) \ + printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ +} while (0) #else -#define dprintk(level,args...) +#define dprintk(level, fmt, ...) \ + no_printk(KERN_DEBUG fmt, ##__VA_ARGS__) #endif -#define deb_info(args...) dprintk(0x01, args) -#define deb_tuner(args...) dprintk(0x02, args) -#define deb_i2c(args...) dprintk(0x04, args) -#define deb_ts(args...) dprintk(0x08, args) -#define deb_sram(args...) dprintk(0x10, args) -#define deb_rdump(args...) dprintk(0x20, args) -#define deb_i2c_dump(args...) dprintk(0x40, args) +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) +#define dbg_tuner(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) +#define dbg_i2c(fmt, ...) dprintk(0x04, fmt, ##__VA_ARGS__) +#define dbg_ts(fmt, ...) dprintk(0x08, fmt, ##__VA_ARGS__) +#define dbg_sram(fmt, ...) dprintk(0x10, fmt, ##__VA_ARGS__) +#define dbg_rdump(fmt, ...) dprintk(0x20, fmt, ##__VA_ARGS__) +#define dbg_i2c_dump(fmt, ...) dprintk(0x40, fmt, ##__VA_ARGS__) #endif diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c index e92542b92d34..15a0ac2f57ea 100644 --- a/drivers/media/dvb-frontends/bcm3510.c +++ b/drivers/media/dvb-frontends/bcm3510.c @@ -67,15 +67,15 @@ static int debug; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c (|-able))."); -#define dprintk(level,x...) if (level & debug) printk(x) -#define dbufout(b,l,m) {\ - int i; \ - for (i = 0; i < l; i++) \ - m("%02x ",b[i]); \ -} -#define deb_info(args...) dprintk(0x01,args) -#define deb_i2c(args...) dprintk(0x02,args) -#define deb_hab(args...) dprintk(0x04,args) +#define dprintk(level, fmt, ...) \ +do { \ + if (debug & (level)) \ + printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ +} while (0) + +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) +#define dbg_i2c(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) +#define dbg_hab(fmt, ...) dprintk(0x04, fmt, ##__VA_ARGS__) /* transfer functions */ static int bcm3510_writebytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 len) @@ -87,14 +87,12 @@ static int bcm3510_writebytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 b[0] = reg; memcpy(&b[1],buf,len); - deb_i2c("i2c wr %02x: ",reg); - dbufout(buf,len,deb_i2c); - deb_i2c("\n"); + dbg_i2c("i2c wr %02x: %*ph\n", reg, (int)len, buf); if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { - deb_info("%s: i2c write error (addr %02x, reg %02x, err == %i)\n", - __func__, state->config->demod_address, reg, err); + dbg_info("%s: i2c write error (addr %02x, reg %02x, err == %i)\n", + __func__, state->config->demod_address, reg, err); return -EREMOTEIO; } @@ -112,13 +110,11 @@ static int bcm3510_readbytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 l memset(buf,0,len); if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) { - deb_info("%s: i2c read error (addr %02x, reg %02x, err == %i)\n", - __func__, state->config->demod_address, reg, err); + dbg_info("%s: i2c read error (addr %02x, reg %02x, err == %i)\n", + __func__, state->config->demod_address, reg, err); return -EREMOTEIO; } - deb_i2c("i2c rd %02x: ",reg); - dbufout(buf,len,deb_i2c); - deb_i2c("\n"); + dbg_i2c("i2c rd %02x: %*ph\n", reg, (int)len, buf); return 0; } @@ -162,7 +158,7 @@ static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len) if ((ret = bcm3510_readB(st,0xa8,&v)) < 0) return ret; if (v.HABSTAT_a8.HABR) { - deb_info("HAB is running already - clearing it.\n"); + dbg_info("HAB is running already - clearing it\n"); v.HABSTAT_a8.HABR = 0; bcm3510_writeB(st,0xa8,v); // return -EBUSY; @@ -189,7 +185,7 @@ static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len) /* Polling method: Wait until the AP finishes processing the HAB request */ t = jiffies + 1*HZ; while (time_before(jiffies, t)) { - deb_info("waiting for HAB to complete\n"); + dbg_info("waiting for HAB to complete\n"); msleep(10); if ((ret = bcm3510_readB(st,0xa8,&v)) < 0) return ret; @@ -198,7 +194,7 @@ static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len) return 0; } - deb_info("send_request execution timed out.\n"); + dbg_info("send_request execution timed out\n"); return -ETIMEDOUT; } @@ -208,12 +204,12 @@ static int bcm3510_do_hab_cmd(struct bcm3510_state *st, u8 cmd, u8 msgid, u8 *ob int ret = 0; if (ilen + 2 > sizeof(ib)) { - deb_hab("do_hab_cmd: ilen=%d is too big!\n", ilen); + dbg_hab("do_hab_cmd: ilen=%d is too big!\n", ilen); return -EINVAL; } if (olen + 2 > sizeof(ob)) { - deb_hab("do_hab_cmd: olen=%d is too big!\n", olen); + dbg_hab("do_hab_cmd: olen=%d is too big!\n", olen); return -EINVAL; } @@ -221,9 +217,7 @@ static int bcm3510_do_hab_cmd(struct bcm3510_state *st, u8 cmd, u8 msgid, u8 *ob ob[1] = msgid; memcpy(&ob[2],obuf,olen); - deb_hab("hab snd: "); - dbufout(ob,olen+2,deb_hab); - deb_hab("\n"); + dbg_hab("hab snd: %*ph\n", olen + 2, ob); if (mutex_lock_interruptible(&st->hab_mutex) < 0) return -EAGAIN; @@ -232,9 +226,7 @@ static int bcm3510_do_hab_cmd(struct bcm3510_state *st, u8 cmd, u8 msgid, u8 *ob (ret = bcm3510_hab_get_response(st, ib, ilen+2)) < 0) goto error; - deb_hab("hab get: "); - dbufout(ib,ilen+2,deb_hab); - deb_hab("\n"); + dbg_hab("hab get: %*ph\n", ilen + 2, ib); memcpy(ibuf,&ib[2],ilen); error: @@ -254,7 +246,7 @@ static int bcm3510_is_ap_ready(struct bcm3510_state *st) return ret; if (ap.APSTAT1_a2.RESET || ap.APSTAT1_a2.IDLE || ap.APSTAT1_a2.STOP || hab.HABSTAT_a8.HABR) { - deb_info("AP is busy\n"); + dbg_info("AP is busy\n"); return -EBUSY; } @@ -309,7 +301,7 @@ static int bcm3510_read_status(struct dvb_frontend *fe, enum fe_status *status) else /* more frequently checks if no lock has been achieved yet */ st->status_check_interval = 500; - deb_info("real_status: %02x\n",*status); + dbg_info("real_status: %02x\n", *status); return 0; } @@ -454,10 +446,11 @@ static int bcm3510_set_freq(struct bcm3510_state* st,u32 freq) u8 bc,a; u16 n; s32 YIntercept,Tfvco1; + u32 ofreq; freq /= 1000; + ofreq = freq; - deb_info("%dkHz:",freq); /* set Band Switch */ if (freq <= 168000) bc = 0x1c; @@ -485,7 +478,7 @@ static int bcm3510_set_freq(struct bcm3510_state* st,u32 freq) n = Tfvco1 >> 6; a = Tfvco1 & 0x3f; - deb_info(" BC1_2_3_4: %x, N: %x A: %x\n", bc, n, a); + dbg_info("%dkHz: BC1_2_3_4: %x, N: %x A: %x\n", ofreq, bc, n, a); if (n >= 16 && n <= 2047) return bcm3510_tuner_cmd(st,bc,n,a); @@ -635,26 +628,28 @@ static int bcm3510_download_firmware(struct dvb_frontend* fe) const u8 *b; int ret,i; - deb_info("requesting firmware\n"); + dbg_info("requesting firmware\n"); if ((ret = st->config->request_firmware(fe, &fw, BCM3510_DEFAULT_FIRMWARE)) < 0) { - err("could not load firmware (%s): %d",BCM3510_DEFAULT_FIRMWARE,ret); + err("could not load firmware (%s): %d\n", + BCM3510_DEFAULT_FIRMWARE, ret); return ret; } - deb_info("got firmware: %zu\n", fw->size); + dbg_info("got firmware: %zu\n", fw->size); b = fw->data; for (i = 0; i < fw->size;) { addr = le16_to_cpu(*((__le16 *)&b[i])); len = le16_to_cpu(*((__le16 *)&b[i+2])); - deb_info("firmware chunk, addr: 0x%04x, len: 0x%04x, total length: 0x%04zx\n",addr,len,fw->size); + dbg_info("firmware chunk, addr: 0x%04x, len: 0x%04x, total length: 0x%04zx\n", + addr, len, fw->size); if ((ret = bcm3510_write_ram(st,addr,&b[i+4],len)) < 0) { - err("firmware download failed: %d\n",ret); + err("firmware download failed: %d\n", ret); return ret; } i += 4 + len; } release_firmware(fw); - deb_info("firmware download successfully completed\n"); + dbg_info("firmware download successfully completed\n"); return 0; } @@ -663,15 +658,16 @@ static int bcm3510_check_firmware_version(struct bcm3510_state *st) struct bcm3510_hab_cmd_get_version_info ver; bcm3510_do_hab_cmd(st,CMD_GET_VERSION_INFO,MSGID_GET_VERSION_INFO,NULL,0,(u8*)&ver,sizeof(ver)); - deb_info("Version information: 0x%02x 0x%02x 0x%02x 0x%02x\n", - ver.microcode_version, ver.script_version, ver.config_version, ver.demod_version); + dbg_info("Version information: 0x%02x 0x%02x 0x%02x 0x%02x\n", + ver.microcode_version, ver.script_version, + ver.config_version, ver.demod_version); if (ver.script_version == BCM3510_DEF_SCRIPT_VERSION && ver.config_version == BCM3510_DEF_CONFIG_VERSION && ver.demod_version == BCM3510_DEF_DEMOD_VERSION) return 0; - deb_info("version check failed\n"); + dbg_info("version check failed\n"); return -ENODEV; } @@ -695,7 +691,7 @@ static int bcm3510_reset(struct bcm3510_state *st) if (v.APSTAT1_a2.RESET) return 0; } - deb_info("reset timed out\n"); + dbg_info("reset timed out\n"); return -ETIMEDOUT; } @@ -719,7 +715,7 @@ static int bcm3510_clear_reset(struct bcm3510_state *st) if (!v.APSTAT1_a2.RESET) return 0; } - deb_info("reset clear timed out\n"); + dbg_info("reset clear timed out\n"); return -ETIMEDOUT; } @@ -732,21 +728,21 @@ static int bcm3510_init_cold(struct bcm3510_state *st) if ((ret = bcm3510_readB(st,0xa2,&v)) < 0) return ret; if (v.APSTAT1_a2.RUN) { - deb_info("AP is already running - firmware already loaded.\n"); + dbg_info("AP is already running - firmware already loaded\n"); return 0; } - deb_info("reset?\n"); + dbg_info("reset?\n"); if ((ret = bcm3510_reset(st)) < 0) return ret; - deb_info("tristate?\n"); + dbg_info("tristate?\n"); /* tri-state */ v.TSTCTL_2e.CTL = 0; if ((ret = bcm3510_writeB(st,0x2e,v)) < 0) return ret; - deb_info("firmware?\n"); + dbg_info("firmware?\n"); if ((ret = bcm3510_download_firmware(&st->frontend)) < 0 || (ret = bcm3510_clear_reset(st)) < 0) return ret; @@ -766,16 +762,16 @@ static int bcm3510_init(struct dvb_frontend* fe) if ((ret = bcm3510_readB(st,0xca,&j)) < 0) return ret; - deb_info("JDEC: %02x\n",j.raw); + dbg_info("JDEC: %02x\n", j.raw); switch (j.JDEC_ca.JDEC) { case JDEC_WAIT_AT_RAM: - deb_info("attempting to download firmware\n"); + dbg_info("attempting to download firmware\n"); if ((ret = bcm3510_init_cold(st)) < 0) return ret; /* fall-through */ case JDEC_EEPROM_LOAD_WAIT: - deb_info("firmware is loaded\n"); + dbg_info("firmware is loaded\n"); bcm3510_check_firmware_version(st); break; default: @@ -818,13 +814,15 @@ struct dvb_frontend* bcm3510_attach(const struct bcm3510_config *config, if ((ret = bcm3510_readB(state,0xe0,&v)) < 0) goto error; - deb_info("Revision: 0x%1x, Layer: 0x%1x.\n",v.REVID_e0.REV,v.REVID_e0.LAYER); + dbg_info("Revision: 0x%1x, Layer: 0x%1x\n", + v.REVID_e0.REV, v.REVID_e0.LAYER); if ((v.REVID_e0.REV != 0x1 && v.REVID_e0.LAYER != 0xb) && /* cold */ (v.REVID_e0.REV != 0x8 && v.REVID_e0.LAYER != 0x0)) /* warm */ goto error; - info("Revision: 0x%1x, Layer: 0x%1x.",v.REVID_e0.REV,v.REVID_e0.LAYER); + info("Revision: 0x%1x, Layer: 0x%1x\n", + v.REVID_e0.REV, v.REVID_e0.LAYER); bcm3510_reset(state); diff --git a/drivers/media/dvb-frontends/dib3000mb.c b/drivers/media/dvb-frontends/dib3000mb.c index 0f0480d8576d..8c1b76b41473 100644 --- a/drivers/media/dvb-frontends/dib3000mb.c +++ b/drivers/media/dvb-frontends/dib3000mb.c @@ -40,13 +40,12 @@ static int debug; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-able))."); -#define deb_info(args...) dprintk(0x01, args) -#define deb_i2c(args...) dprintk(0x02, args) -#define deb_srch(args...) dprintk(0x04, args) -#define deb_info(args...) dprintk(0x01, args) -#define deb_xfer(args...) dprintk(0x02, args) -#define deb_setf(args...) dprintk(0x04, args) -#define deb_getf(args...) dprintk(0x08, args) +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) +#define dbg_i2c(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) +#define dbg_srch(fmt, ...) dprintk(0x04, fmt, ##__VA_ARGS__) +#define dbg_setf(fmt, ...) dprintk(0x04, fmt, ##__VA_ARGS__) +#define dbg_getf(fmt, ...) dprintk(0x08, fmt, ##__VA_ARGS__) static int dib3000_read_reg(struct dib3000_state *state, u16 reg) { @@ -58,10 +57,10 @@ static int dib3000_read_reg(struct dib3000_state *state, u16 reg) }; if (i2c_transfer(state->i2c, msg, 2) != 2) - deb_i2c("i2c read error\n"); + dbg_i2c("i2c read error\n"); - deb_i2c("reading i2c bus (reg: %5d 0x%04x, val: %5d 0x%04x)\n",reg,reg, - (rb[0] << 8) | rb[1],(rb[0] << 8) | rb[1]); + dbg_i2c("reading i2c bus (reg: %5d 0x%04x, val: %5d 0x%04x)\n", + reg, reg, (rb[0] << 8) | rb[1], (rb[0] << 8) | rb[1]); return (rb[0] << 8) | rb[1]; } @@ -75,7 +74,8 @@ static int dib3000_write_reg(struct dib3000_state *state, u16 reg, u16 val) struct i2c_msg msg[] = { { .addr = state->config.demod_address, .flags = 0, .buf = b, .len = 4 } }; - deb_i2c("writing i2c bus (reg: %5d 0x%04x, val: %5d 0x%04x)\n",reg,reg,val,val); + dbg_i2c("writing i2c bus (reg: %5d 0x%04x, val: %5d 0x%04x)\n", + reg, reg, val, val); return i2c_transfer(state->i2c,msg, 1) != 1 ? -EREMOTEIO : 0; } @@ -84,14 +84,14 @@ static int dib3000_search_status(u16 irq,u16 lock) { if (irq & 0x02) { if (lock & 0x01) { - deb_srch("auto search succeeded\n"); + dbg_srch("auto search succeeded\n"); return 1; // auto search succeeded } else { - deb_srch("auto search not successful\n"); + dbg_srch("auto search not successful\n"); return 0; // auto search failed } } else if (irq & 0x01) { - deb_srch("auto search failed\n"); + dbg_srch("auto search failed\n"); return 0; // auto search failed } return -1; // try again @@ -140,24 +140,24 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) case 0: return -EOPNOTSUPP; default: - pr_err("unknown bandwidth value.\n"); + pr_err("unknown bandwidth value\n"); return -EINVAL; } - deb_setf("bandwidth: %d MHZ\n", c->bandwidth_hz / 1000000); + dbg_setf("bandwidth: %d MHZ\n", c->bandwidth_hz / 1000000); } wr(DIB3000MB_REG_LOCK1_MASK, DIB3000MB_LOCK1_SEARCH_4); switch (c->transmission_mode) { case TRANSMISSION_MODE_2K: - deb_setf("transmission mode: 2k\n"); + dbg_setf("transmission mode: 2k\n"); wr(DIB3000MB_REG_FFT, DIB3000_TRANSMISSION_MODE_2K); break; case TRANSMISSION_MODE_8K: - deb_setf("transmission mode: 8k\n"); + dbg_setf("transmission mode: 8k\n"); wr(DIB3000MB_REG_FFT, DIB3000_TRANSMISSION_MODE_8K); break; case TRANSMISSION_MODE_AUTO: - deb_setf("transmission mode: auto\n"); + dbg_setf("transmission mode: auto\n"); break; default: return -EINVAL; @@ -165,23 +165,23 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) switch (c->guard_interval) { case GUARD_INTERVAL_1_32: - deb_setf("guard 1_32\n"); + dbg_setf("guard 1_32\n"); wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_32); break; case GUARD_INTERVAL_1_16: - deb_setf("guard 1_16\n"); + dbg_setf("guard 1_16\n"); wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_16); break; case GUARD_INTERVAL_1_8: - deb_setf("guard 1_8\n"); + dbg_setf("guard 1_8\n"); wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_8); break; case GUARD_INTERVAL_1_4: - deb_setf("guard 1_4\n"); + dbg_setf("guard 1_4\n"); wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_4); break; case GUARD_INTERVAL_AUTO: - deb_setf("guard auto\n"); + dbg_setf("guard auto\n"); break; default: return -EINVAL; @@ -189,14 +189,14 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) switch (c->inversion) { case INVERSION_OFF: - deb_setf("inversion off\n"); + dbg_setf("inversion off\n"); wr(DIB3000MB_REG_DDS_INV, DIB3000_DDS_INVERSION_OFF); break; case INVERSION_AUTO: - deb_setf("inversion auto\n"); + dbg_setf("inversion auto\n"); break; case INVERSION_ON: - deb_setf("inversion on\n"); + dbg_setf("inversion on\n"); wr(DIB3000MB_REG_DDS_INV, DIB3000_DDS_INVERSION_ON); break; default: @@ -205,15 +205,15 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) switch (c->modulation) { case QPSK: - deb_setf("modulation: qpsk\n"); + dbg_setf("modulation: qpsk\n"); wr(DIB3000MB_REG_QAM, DIB3000_CONSTELLATION_QPSK); break; case QAM_16: - deb_setf("modulation: qam16\n"); + dbg_setf("modulation: qam16\n"); wr(DIB3000MB_REG_QAM, DIB3000_CONSTELLATION_16QAM); break; case QAM_64: - deb_setf("modulation: qam64\n"); + dbg_setf("modulation: qam64\n"); wr(DIB3000MB_REG_QAM, DIB3000_CONSTELLATION_64QAM); break; case QAM_AUTO: @@ -223,22 +223,22 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) } switch (c->hierarchy) { case HIERARCHY_NONE: - deb_setf("hierarchy: none\n"); + dbg_setf("hierarchy: none\n"); /* fall through */ case HIERARCHY_1: - deb_setf("hierarchy: alpha=1\n"); + dbg_setf("hierarchy: alpha=1\n"); wr(DIB3000MB_REG_VIT_ALPHA, DIB3000_ALPHA_1); break; case HIERARCHY_2: - deb_setf("hierarchy: alpha=2\n"); + dbg_setf("hierarchy: alpha=2\n"); wr(DIB3000MB_REG_VIT_ALPHA, DIB3000_ALPHA_2); break; case HIERARCHY_4: - deb_setf("hierarchy: alpha=4\n"); + dbg_setf("hierarchy: alpha=4\n"); wr(DIB3000MB_REG_VIT_ALPHA, DIB3000_ALPHA_4); break; case HIERARCHY_AUTO: - deb_setf("hierarchy: alpha=auto\n"); + dbg_setf("hierarchy: alpha=auto\n"); break; default: return -EINVAL; @@ -255,30 +255,30 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) } switch (fe_cr) { case FEC_1_2: - deb_setf("fec: 1_2\n"); + dbg_setf("fec: 1_2\n"); wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_1_2); break; case FEC_2_3: - deb_setf("fec: 2_3\n"); + dbg_setf("fec: 2_3\n"); wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_2_3); break; case FEC_3_4: - deb_setf("fec: 3_4\n"); + dbg_setf("fec: 3_4\n"); wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_3_4); break; case FEC_5_6: - deb_setf("fec: 5_6\n"); + dbg_setf("fec: 5_6\n"); wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_5_6); break; case FEC_7_8: - deb_setf("fec: 7_8\n"); + dbg_setf("fec: 7_8\n"); wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_7_8); break; case FEC_NONE: - deb_setf("fec: none\n"); + dbg_setf("fec: none\n"); break; case FEC_AUTO: - deb_setf("fec: auto\n"); + dbg_setf("fec: auto\n"); break; default: return -EINVAL; @@ -289,7 +289,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) [c->guard_interval == GUARD_INTERVAL_AUTO] [c->inversion == INVERSION_AUTO]; - deb_setf("seq? %d\n", seq); + dbg_setf("seq? %d\n", seq); wr(DIB3000MB_REG_SEQ, seq); @@ -330,7 +330,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) c->inversion == INVERSION_AUTO) { int as_count=0; - deb_setf("autosearch enabled.\n"); + dbg_setf("autosearch enabled\n"); wr(DIB3000MB_REG_ISI, DIB3000MB_ISI_INHIBIT); @@ -343,12 +343,12 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) rd(DIB3000MB_REG_LOCK2_VALUE))) < 0 && as_count++ < 100) msleep(1); - deb_setf("search_state after autosearch %d after %d checks\n", + dbg_setf("search_state after autosearch %d after %d checks\n", search_state, as_count); if (search_state == 1) { if (dib3000mb_get_frontend(fe, c) == 0) { - deb_setf("reading tuning data from frontend succeeded.\n"); + dbg_setf("reading tuning data from frontend succeeded\n"); return dib3000mb_set_frontend(fe, 0); } } @@ -365,7 +365,7 @@ static int dib3000mb_fe_init(struct dvb_frontend* fe, int mobile_mode) { struct dib3000_state* state = fe->demodulator_priv; - deb_info("dib3000mb is getting up.\n"); + dbg_info("dib3000mb is getting up\n"); wr(DIB3000MB_REG_POWER_CONTROL, DIB3000MB_POWER_UP); wr(DIB3000MB_REG_RESTART, DIB3000MB_RESTART_AGC); @@ -451,7 +451,10 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe, return 0; dds_val = ((rd(DIB3000MB_REG_DDS_VALUE_MSB) & 0xff) << 16) + rd(DIB3000MB_REG_DDS_VALUE_LSB); - deb_getf("DDS_VAL: %x %x %x\n", dds_val, rd(DIB3000MB_REG_DDS_VALUE_MSB), rd(DIB3000MB_REG_DDS_VALUE_LSB)); + dbg_getf("DDS_VAL: %x %x %x\n", + dds_val, + rd(DIB3000MB_REG_DDS_VALUE_MSB), + rd(DIB3000MB_REG_DDS_VALUE_LSB)); if (dds_val < threshold) inv_test1 = 0; else if (dds_val == threshold) @@ -460,7 +463,10 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe, inv_test1 = 2; dds_val = ((rd(DIB3000MB_REG_DDS_FREQ_MSB) & 0xff) << 16) + rd(DIB3000MB_REG_DDS_FREQ_LSB); - deb_getf("DDS_FREQ: %x %x %x\n", dds_val, rd(DIB3000MB_REG_DDS_FREQ_MSB), rd(DIB3000MB_REG_DDS_FREQ_LSB)); + dbg_getf("DDS_FREQ: %x %x %x\n", + dds_val, + rd(DIB3000MB_REG_DDS_FREQ_MSB), + rd(DIB3000MB_REG_DDS_FREQ_LSB)); if (dds_val < threshold) inv_test2 = 0; else if (dds_val == threshold) @@ -473,57 +479,57 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe, ((inv_test2 == 0) && (inv_test1==1 || inv_test1==2)) ? INVERSION_ON : INVERSION_OFF; - deb_getf("inversion %d %d, %d\n", inv_test2, inv_test1, c->inversion); + dbg_getf("inversion %d %d, %d\n", inv_test2, inv_test1, c->inversion); switch ((tps_val = rd(DIB3000MB_REG_TPS_QAM))) { case DIB3000_CONSTELLATION_QPSK: - deb_getf("QPSK\n"); + dbg_getf("QPSK\n"); c->modulation = QPSK; break; case DIB3000_CONSTELLATION_16QAM: - deb_getf("QAM16\n"); + dbg_getf("QAM16\n"); c->modulation = QAM_16; break; case DIB3000_CONSTELLATION_64QAM: - deb_getf("QAM64\n"); + dbg_getf("QAM64\n"); c->modulation = QAM_64; break; default: pr_err("Unexpected constellation returned by TPS (%d)\n", tps_val); break; } - deb_getf("TPS: %d\n", tps_val); + dbg_getf("TPS: %d\n", tps_val); if (rd(DIB3000MB_REG_TPS_HRCH)) { - deb_getf("HRCH ON\n"); + dbg_getf("HRCH ON\n"); cr = &c->code_rate_LP; c->code_rate_HP = FEC_NONE; switch ((tps_val = rd(DIB3000MB_REG_TPS_VIT_ALPHA))) { case DIB3000_ALPHA_0: - deb_getf("HIERARCHY_NONE\n"); + dbg_getf("HIERARCHY_NONE\n"); c->hierarchy = HIERARCHY_NONE; break; case DIB3000_ALPHA_1: - deb_getf("HIERARCHY_1\n"); + dbg_getf("HIERARCHY_1\n"); c->hierarchy = HIERARCHY_1; break; case DIB3000_ALPHA_2: - deb_getf("HIERARCHY_2\n"); + dbg_getf("HIERARCHY_2\n"); c->hierarchy = HIERARCHY_2; break; case DIB3000_ALPHA_4: - deb_getf("HIERARCHY_4\n"); + dbg_getf("HIERARCHY_4\n"); c->hierarchy = HIERARCHY_4; break; default: pr_err("Unexpected ALPHA value returned by TPS (%d)\n", tps_val); break; } - deb_getf("TPS: %d\n", tps_val); + dbg_getf("TPS: %d\n", tps_val); tps_val = rd(DIB3000MB_REG_TPS_CODE_RATE_LP); } else { - deb_getf("HRCH OFF\n"); + dbg_getf("HRCH OFF\n"); cr = &c->code_rate_HP; c->code_rate_LP = FEC_NONE; c->hierarchy = HIERARCHY_NONE; @@ -533,68 +539,68 @@ static int dib3000mb_get_frontend(struct dvb_frontend* fe, switch (tps_val) { case DIB3000_FEC_1_2: - deb_getf("FEC_1_2\n"); + dbg_getf("FEC_1_2\n"); *cr = FEC_1_2; break; case DIB3000_FEC_2_3: - deb_getf("FEC_2_3\n"); + dbg_getf("FEC_2_3\n"); *cr = FEC_2_3; break; case DIB3000_FEC_3_4: - deb_getf("FEC_3_4\n"); + dbg_getf("FEC_3_4\n"); *cr = FEC_3_4; break; case DIB3000_FEC_5_6: - deb_getf("FEC_5_6\n"); + dbg_getf("FEC_5_6\n"); *cr = FEC_4_5; break; case DIB3000_FEC_7_8: - deb_getf("FEC_7_8\n"); + dbg_getf("FEC_7_8\n"); *cr = FEC_7_8; break; default: pr_err("Unexpected FEC returned by TPS (%d)\n", tps_val); break; } - deb_getf("TPS: %d\n",tps_val); + dbg_getf("TPS: %d\n", tps_val); switch ((tps_val = rd(DIB3000MB_REG_TPS_GUARD_TIME))) { case DIB3000_GUARD_TIME_1_32: - deb_getf("GUARD_INTERVAL_1_32\n"); + dbg_getf("GUARD_INTERVAL_1_32\n"); c->guard_interval = GUARD_INTERVAL_1_32; break; case DIB3000_GUARD_TIME_1_16: - deb_getf("GUARD_INTERVAL_1_16\n"); + dbg_getf("GUARD_INTERVAL_1_16\n"); c->guard_interval = GUARD_INTERVAL_1_16; break; case DIB3000_GUARD_TIME_1_8: - deb_getf("GUARD_INTERVAL_1_8\n"); + dbg_getf("GUARD_INTERVAL_1_8\n"); c->guard_interval = GUARD_INTERVAL_1_8; break; case DIB3000_GUARD_TIME_1_4: - deb_getf("GUARD_INTERVAL_1_4\n"); + dbg_getf("GUARD_INTERVAL_1_4\n"); c->guard_interval = GUARD_INTERVAL_1_4; break; default: pr_err("Unexpected Guard Time returned by TPS (%d)\n", tps_val); break; } - deb_getf("TPS: %d\n", tps_val); + dbg_getf("TPS: %d\n", tps_val); switch ((tps_val = rd(DIB3000MB_REG_TPS_FFT))) { case DIB3000_TRANSMISSION_MODE_2K: - deb_getf("TRANSMISSION_MODE_2K\n"); + dbg_getf("TRANSMISSION_MODE_2K\n"); c->transmission_mode = TRANSMISSION_MODE_2K; break; case DIB3000_TRANSMISSION_MODE_8K: - deb_getf("TRANSMISSION_MODE_8K\n"); + dbg_getf("TRANSMISSION_MODE_8K\n"); c->transmission_mode = TRANSMISSION_MODE_8K; break; default: pr_err("unexpected transmission mode return by TPS (%d)\n", tps_val); break; } - deb_getf("TPS: %d\n", tps_val); + dbg_getf("TPS: %d\n", tps_val); return 0; } @@ -615,18 +621,18 @@ static int dib3000mb_read_status(struct dvb_frontend *fe, if (rd(DIB3000MB_REG_TS_SYNC_LOCK)) *stat |= (FE_HAS_SYNC | FE_HAS_LOCK); - deb_getf("actual status is %2x\n",*stat); + dbg_getf("actual status is %2x\n", *stat); - deb_getf("autoval: tps: %d, qam: %d, hrch: %d, alpha: %d, hp: %d, lp: %d, guard: %d, fft: %d cell: %d\n", - rd(DIB3000MB_REG_TPS_LOCK), - rd(DIB3000MB_REG_TPS_QAM), - rd(DIB3000MB_REG_TPS_HRCH), - rd(DIB3000MB_REG_TPS_VIT_ALPHA), - rd(DIB3000MB_REG_TPS_CODE_RATE_HP), - rd(DIB3000MB_REG_TPS_CODE_RATE_LP), - rd(DIB3000MB_REG_TPS_GUARD_TIME), - rd(DIB3000MB_REG_TPS_FFT), - rd(DIB3000MB_REG_TPS_CELL_ID)); + dbg_getf("autoval: tps: %d, qam: %d, hrch: %d, alpha: %d, hp: %d, lp: %d, guard: %d, fft: %d cell: %d\n", + rd(DIB3000MB_REG_TPS_LOCK), + rd(DIB3000MB_REG_TPS_QAM), + rd(DIB3000MB_REG_TPS_HRCH), + rd(DIB3000MB_REG_TPS_VIT_ALPHA), + rd(DIB3000MB_REG_TPS_CODE_RATE_HP), + rd(DIB3000MB_REG_TPS_CODE_RATE_LP), + rd(DIB3000MB_REG_TPS_GUARD_TIME), + rd(DIB3000MB_REG_TPS_FFT), + rd(DIB3000MB_REG_TPS_CELL_ID)); //*stat = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK; return 0; @@ -670,7 +676,7 @@ static int dib3000mb_read_unc_blocks(struct dvb_frontend* fe, u32 *unc) static int dib3000mb_sleep(struct dvb_frontend* fe) { struct dib3000_state* state = fe->demodulator_priv; - deb_info("dib3000mb is going to bed.\n"); + dbg_info("dib3000mb is going to bed\n"); wr(DIB3000MB_REG_POWER_CONTROL, DIB3000MB_POWER_DOWN); return 0; } @@ -710,7 +716,7 @@ static int dib3000mb_fifo_control(struct dvb_frontend *fe, int onoff) { struct dib3000_state *state = fe->demodulator_priv; - deb_xfer("%s fifo\n",onoff ? "enabling" : "disabling"); + dbg_xfer("%s fifo\n", onoff ? "enabling" : "disabling"); if (onoff) { wr(DIB3000MB_REG_FIFO, DIB3000MB_FIFO_ACTIVATE); } else { @@ -722,7 +728,7 @@ static int dib3000mb_fifo_control(struct dvb_frontend *fe, int onoff) static int dib3000mb_pid_parse(struct dvb_frontend *fe, int onoff) { struct dib3000_state *state = fe->demodulator_priv; - deb_xfer("%s pid parsing\n",onoff ? "enabling" : "disabling"); + dbg_xfer("%s pid parsing\n", onoff ? "enabling" : "disabling"); wr(DIB3000MB_REG_PID_PARSE,onoff); return 0; } diff --git a/drivers/media/dvb-frontends/ix2505v.c b/drivers/media/dvb-frontends/ix2505v.c index 73f27105c139..3e1b2b52a0d0 100644 --- a/drivers/media/dvb-frontends/ix2505v.c +++ b/drivers/media/dvb-frontends/ix2505v.c @@ -13,13 +13,14 @@ #include "ix2505v.h" static int ix2505v_debug; -#define dprintk(level, args...) do { \ - if (ix2505v_debug & level) \ - printk(KERN_DEBUG "ix2505v: " args); \ +#define dprintk(level, fmt, ...) \ +do { \ + if (ix2505v_debug & (level)) \ + printk(KERN_DEBUG "ix2505v: " fmt, ##__VA_ARGS__); \ } while (0) -#define deb_info(args...) dprintk(0x01, args) -#define deb_i2c(args...) dprintk(0x02, args) +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) +#define dbg_i2c(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) struct ix2505v_state { struct i2c_adapter *i2c; @@ -57,7 +58,7 @@ static int ix2505v_read_status_reg(struct ix2505v_state *state) }; ret = i2c_transfer(state->i2c, msg, 1); - deb_i2c("Read %s ", __func__); + dbg_i2c("Read %s\n", __func__); return (ret == 1) ? (int) b2[0] : -1; } @@ -74,7 +75,7 @@ static int ix2505v_write(struct ix2505v_state *state, u8 buf[], u8 count) ret = i2c_transfer(state->i2c, msg, 1); if (ret != 1) { - deb_i2c("%s: i2c error, ret=%d\n", __func__, ret); + dbg_i2c("%s: i2c error, ret=%d\n", __func__, ret); return -EIO; } @@ -153,7 +154,7 @@ static int ix2505v_set_params(struct dvb_frontend *fe) data[1] = (N << 5) | (A & 0x1f); data[2] = 0x81 | ((cc & 0x3) << 5) ; /*PD5,PD4 & TM = 0|C1,C0|REF=1*/ - deb_info("Frq=%d x=%d N=%d A=%d\n", frequency, x, N, A); + dbg_info("Frq=%d x=%d N=%d A=%d\n", frequency, x, N, A); if (frequency <= 1065000) local_osc = (6 << 5) | 2; @@ -197,8 +198,8 @@ static int ix2505v_set_params(struct dvb_frontend *fe) else lpf = 0xb; - deb_info("Osc=%x b_w=%x lpf=%x\n", local_osc, b_w, lpf); - deb_info("Data 0=[%4phN]\n", data); + dbg_info("Osc=%x b_w=%x lpf=%x\n", local_osc, b_w, lpf); + dbg_info("Data 0=[%4phN]\n", data); if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); @@ -219,7 +220,7 @@ static int ix2505v_set_params(struct dvb_frontend *fe) data[2] |= ((lpf >> 2) & 0x3) << 3; /* lpf */ data[3] |= (lpf & 0x3) << 2; - deb_info("Data 2=[%x%x]\n", data[2], data[3]); + dbg_info("Data 2=[%x%x]\n", data[2], data[3]); if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); @@ -263,7 +264,7 @@ struct dvb_frontend *ix2505v_attach(struct dvb_frontend *fe, int ret; if (NULL == config) { - deb_i2c("%s: no config ", __func__); + dbg_i2c("%s: no config\n", __func__); goto error; } @@ -281,7 +282,7 @@ struct dvb_frontend *ix2505v_attach(struct dvb_frontend *fe, ret = ix2505v_read_status_reg(state); if (ret & 0x80) { - deb_i2c("%s: No IX2505V found\n", __func__); + dbg_i2c("%s: No IX2505V found\n", __func__); goto error; } @@ -293,7 +294,7 @@ struct dvb_frontend *ix2505v_attach(struct dvb_frontend *fe, memcpy(&fe->ops.tuner_ops, &ix2505v_tuner_ops, sizeof(struct dvb_tuner_ops)); - deb_i2c("%s: initialization (%s addr=0x%02x) ok\n", + dbg_i2c("%s: initialization (%s addr=0x%02x) ok\n", __func__, fe->ops.tuner_ops.info.name, config->tuner_address); return fe; diff --git a/drivers/media/dvb-frontends/m88rs2000.c b/drivers/media/dvb-frontends/m88rs2000.c index 39cbb3ea1c9d..4450bb1940ab 100644 --- a/drivers/media/dvb-frontends/m88rs2000.c +++ b/drivers/media/dvb-frontends/m88rs2000.c @@ -39,13 +39,15 @@ static int m88rs2000_debug; module_param_named(debug, m88rs2000_debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able))."); -#define dprintk(level, args...) do { \ - if (level & m88rs2000_debug) \ - printk(KERN_DEBUG "m88rs2000-fe: " args); \ +#define dprintk(level, fmt, ...) \ +do { \ + if (m88rs2000_debug & (level)) \ + printk(KERN_DEBUG "m88rs2000-fe: " fmt, ##__VA_ARGS__); \ } while (0) -#define deb_info(args...) dprintk(0x01, args) -#define info(format, arg...) \ +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) + +#define info(format, arg...) \ printk(KERN_INFO "m88rs2000-fe: " format "\n" , ## arg) static int m88rs2000_writereg(struct m88rs2000_state *state, @@ -63,7 +65,7 @@ static int m88rs2000_writereg(struct m88rs2000_state *state, ret = i2c_transfer(state->i2c, &msg, 1); if (ret != 1) - deb_info("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n", + dbg_info("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n", __func__, reg, data, ret); return (ret != 1) ? -EREMOTEIO : 0; @@ -92,8 +94,8 @@ static u8 m88rs2000_readreg(struct m88rs2000_state *state, u8 reg) ret = i2c_transfer(state->i2c, msg, 2); if (ret != 2) - deb_info("%s: readreg error (reg == 0x%02x, ret == %i)\n", - __func__, reg, ret); + dbg_info("%s: readreg error (reg == 0x%02x, ret == %i)\n", + __func__, reg, ret); return b1[0]; } @@ -186,7 +188,7 @@ static int m88rs2000_set_symbolrate(struct dvb_frontend *fe, u32 srate) else ret |= m88rs2000_writereg(state, 0xa3, 0x90); - deb_info("m88rs2000: m88rs2000_set_symbolrate\n"); + dbg_info("%s\n", __func__); return ret; } @@ -197,7 +199,7 @@ static int m88rs2000_send_diseqc_msg(struct dvb_frontend *fe, int i; u8 reg; - deb_info("%s\n", __func__); + dbg_info("%s\n", __func__); m88rs2000_writereg(state, 0x9a, 0x30); reg = m88rs2000_readreg(state, 0xb2); reg &= 0x3f; @@ -239,7 +241,7 @@ static int m88rs2000_send_diseqc_burst(struct dvb_frontend *fe, { struct m88rs2000_state *state = fe->demodulator_priv; u8 reg0, reg1; - deb_info("%s\n", __func__); + dbg_info("%s\n", __func__); m88rs2000_writereg(state, 0x9a, 0x30); msleep(50); reg0 = m88rs2000_readreg(state, 0xb1); @@ -432,7 +434,7 @@ static int m88rs2000_init(struct dvb_frontend *fe) struct m88rs2000_state *state = fe->demodulator_priv; int ret; - deb_info("m88rs2000: init chip\n"); + dbg_info("init chip\n"); /* Setup frontend from shutdown/cold */ if (state->config->inittab) ret = m88rs2000_tab_set(state, @@ -606,7 +608,7 @@ static int m88rs2000_set_frontend(struct dvb_frontend *fe) state->no_lock_count = 0; if (c->delivery_system != SYS_DVBS) { - deb_info("%s: unsupported delivery system selected (%d)\n", + dbg_info("%s: unsupported delivery system selected (%d)\n", __func__, c->delivery_system); return -EOPNOTSUPP; } diff --git a/drivers/media/dvb-frontends/zl10036.c b/drivers/media/dvb-frontends/zl10036.c index d392c7cce2ce..a69ff7ce0051 100644 --- a/drivers/media/dvb-frontends/zl10036.c +++ b/drivers/media/dvb-frontends/zl10036.c @@ -23,12 +23,14 @@ #include "zl10036.h" static int zl10036_debug; -#define dprintk(level, args...) \ - do { if (zl10036_debug & level) printk(KERN_DEBUG "zl10036: " args); \ - } while (0) +#define dprintk(level, fmt, ...) \ +do { \ + if (zl10036_debug & (level)) \ + printk(KERN_DEBUG "zl10036: " fmt, ##__VA_ARGS__); \ +} while (0) -#define deb_info(args...) dprintk(0x01, args) -#define deb_i2c(args...) dprintk(0x02, args) +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) +#define dbg_i2c(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) struct zl10036_state { struct i2c_adapter *i2c; @@ -70,10 +72,10 @@ static int zl10036_read_status_reg(struct zl10036_state *state) return -EIO; } - deb_i2c("R(status): %02x [FL=%d]\n", status, - (status & STATUS_FL) ? 1 : 0); + dbg_i2c("R(status): %02x [FL=%d]\n", + status, (status & STATUS_FL) ? 1 : 0); if (status & STATUS_POR) - deb_info("%s: Power-On-Reset bit enabled - need to initialize the tuner\n", + dbg_info("%s: Power-On-Reset bit enabled - need to initialize the tuner\n", __func__); return status; @@ -104,13 +106,7 @@ static int zl10036_write(struct zl10036_state *state, u8 buf[], u8 count) else if ((buf[0] & 0xf0) == 0xf0) reg = 12; - deb_i2c("W(%d):", reg); - { - int i; - for (i = 0; i < count; i++) - printk(KERN_CONT " %02x", buf[i]); - printk(KERN_CONT "\n"); - } + dbg_i2c("W(%d): %*ph\n", reg, (int)count, buf); } ret = i2c_transfer(state->i2c, msg, 1); @@ -136,7 +132,7 @@ static int zl10036_sleep(struct dvb_frontend *fe) u8 buf[] = { 0xf0, 0x80 }; /* regs 12/13 */ int ret; - deb_info("%s\n", __func__); + dbg_info("%s\n", __func__); if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */ @@ -180,8 +176,8 @@ static int zl10036_set_frequency(struct zl10036_state *state, u32 frequency) buf[0] = (div >> 8) & 0x7f; buf[1] = (div >> 0) & 0xff; - deb_info("%s: ftodo=%u fpriv=%u ferr=%d div=%u\n", __func__, - frequency, state->frequency, foffset, div); + dbg_info("%s: ftodo=%u fpriv=%u ferr=%d div=%u\n", + __func__, frequency, state->frequency, foffset, div); return zl10036_write(state, buf, sizeof(buf)); } @@ -236,7 +232,7 @@ static int zl10036_set_bandwidth(struct zl10036_state *state, u32 fbw) buf_bf[1] = (bf << 1) & 0x7e; buf_br[1] = (br << 2) & 0x7c; - deb_info("%s: BW=%d br=%u bf=%u\n", __func__, fbw, br, bf); + dbg_info("%s: BW=%d br=%u bf=%u\n", __func__, fbw, br, bf); if (br != state->br) { ret = zl10036_write(state, buf_br, sizeof(buf_br)); @@ -287,7 +283,7 @@ static int zl10036_set_gain_params(struct zl10036_state *state, /* P0=0 */ buf[1] = _RDIV_REG | ((c << 5) & 0x60); - deb_info("%s: c=%u rfg=%u ba=%u bg=%u\n", __func__, c, rfg, ba, bg); + dbg_info("%s: c=%u rfg=%u ba=%u bg=%u\n", __func__, c, rfg, ba, bg); return zl10036_write(state, buf, sizeof(buf)); } @@ -400,7 +396,7 @@ static int zl10036_init_regs(struct zl10036_state *state) if (!state->config->rf_loop_enable) zl10036_init_tab[1][0] |= 0x01; - deb_info("%s\n", __func__); + dbg_info("%s\n", __func__); for (i = 0; i < ARRAY_SIZE(zl10036_init_tab); i++) { ret = zl10036_write(state, zl10036_init_tab[i], 2); diff --git a/drivers/media/pci/b2c2/flexcop-dma.c b/drivers/media/pci/b2c2/flexcop-dma.c index ba45b378d739..96a954f67af3 100644 --- a/drivers/media/pci/b2c2/flexcop-dma.c +++ b/drivers/media/pci/b2c2/flexcop-dma.c @@ -92,8 +92,8 @@ int flexcop_dma_xfer_control(struct flexcop_device *fc, v0x0 = fc->read_ibi_reg(fc, r0x0); v0xc = fc->read_ibi_reg(fc, r0xc); - deb_rdump("reg: %03x: %x\n", r0x0, v0x0.raw); - deb_rdump("reg: %03x: %x\n", r0xc, v0xc.raw); + dbg_rdump("reg: %03x: %x\n", r0x0, v0x0.raw); + dbg_rdump("reg: %03x: %x\n", r0xc, v0xc.raw); if (index & FC_DMA_SUBADDR_0) v0x0.dma_0x0.dma_0start = onoff; @@ -104,8 +104,8 @@ int flexcop_dma_xfer_control(struct flexcop_device *fc, fc->write_ibi_reg(fc, r0x0, v0x0); fc->write_ibi_reg(fc, r0xc, v0xc); - deb_rdump("reg: %03x: %x\n", r0x0, v0x0.raw); - deb_rdump("reg: %03x: %x\n", r0xc, v0xc.raw); + dbg_rdump("reg: %03x: %x\n", r0x0, v0x0.raw); + dbg_rdump("reg: %03x: %x\n", r0xc, v0xc.raw); return 0; } EXPORT_SYMBOL(flexcop_dma_xfer_control); @@ -117,7 +117,7 @@ static int flexcop_dma_remap(struct flexcop_device *fc, flexcop_ibi_register r = (dma_idx & FC_DMA_1) ? dma1_00c : dma2_01c; flexcop_ibi_value v = fc->read_ibi_reg(fc, r); - deb_info("%s\n", __func__); + dbg_info("%s\n", __func__); v.dma_0xc.remap_enable = onoff; fc->write_ibi_reg(fc, r, v); return 0; @@ -166,7 +166,7 @@ int flexcop_dma_config_timer(struct flexcop_device *fc, flexcop_dma_remap(fc, dma_idx, 0); - deb_info("%s\n", __func__); + dbg_info("%s\n", __func__); v.dma_0x4_write.dmatimer = cycles; fc->write_ibi_reg(fc, r, v); return 0; diff --git a/drivers/media/pci/b2c2/flexcop-pci.c b/drivers/media/pci/b2c2/flexcop-pci.c index a9d9520a94c6..0d90bd56a2c9 100644 --- a/drivers/media/pci/b2c2/flexcop-pci.c +++ b/drivers/media/pci/b2c2/flexcop-pci.c @@ -18,19 +18,23 @@ module_param(irq_chk_intv, int, 0644); MODULE_PARM_DESC(irq_chk_intv, "set the interval for IRQ streaming watchdog."); #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG -#define dprintk(level,args...) \ - do { if ((debug & level)) printk(args); } while (0) +#define dprintk(level, fmt, ...) \ +do { \ + if (debug & (level)) \ + printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ +} while (0) #define DEBSTATUS "" #else -#define dprintk(level,args...) +#define dprintk(level, fmt, ...) \ + no_printk(KERN_DEBUG fmt, ##__VA_ARGS__) #define DEBSTATUS " (debugging is not enabled)" #endif -#define deb_info(args...) dprintk(0x01, args) -#define deb_reg(args...) dprintk(0x02, args) -#define deb_ts(args...) dprintk(0x04, args) -#define deb_irq(args...) dprintk(0x08, args) -#define deb_chk(args...) dprintk(0x10, args) +#define dbg_info(fmt, ...) dprintk(0x01, fmt, ##__VA_ARGS__) +#define dbg_reg(fmt, ...) dprintk(0x02, fmt, ##__VA_ARGS__) +#define dbg_ts(fmt, ...) dprintk(0x04, fmt, ##__VA_ARGS__) +#define dbg_irq(fmt, ...) dprintk(0x08, fmt, ##__VA_ARGS__) +#define dbg_chk(fmt, ...) dprintk(0x10, fmt, ##__VA_ARGS__) static int debug; module_param(debug, int, 0644); @@ -82,7 +86,7 @@ static flexcop_ibi_value flexcop_pci_read_ibi_reg(struct flexcop_device *fc, if (lastrreg != r || lastrval != v.raw) { lastrreg = r; lastrval = v.raw; - deb_reg("new rd: %3x: %08x\n", r, v.raw); + dbg_reg("new rd: %3x: %08x\n", r, v.raw); } return v; @@ -95,7 +99,7 @@ static int flexcop_pci_write_ibi_reg(struct flexcop_device *fc, if (lastwreg != r || lastwval != v.raw) { lastwreg = r; lastwval = v.raw; - deb_reg("new wr: %3x: %08x\n", r, v.raw); + dbg_reg("new wr: %3x: %08x\n", r, v.raw); } writel(v.raw, fc_pci->io_mem + r); @@ -111,10 +115,10 @@ static void flexcop_pci_irq_check_work(struct work_struct *work) if (fc->feedcount) { if (fc_pci->count == fc_pci->count_prev) { - deb_chk("no IRQ since the last check\n"); + dbg_chk("no IRQ since the last check\n"); if (fc_pci->stream_problem++ == 3) { struct dvb_demux_feed *feed; - deb_info("flexcop-pci: stream problem, resetting pid filter\n"); + dbg_info("flexcop-pci: stream problem, resetting pid filter\n"); spin_lock_irq(&fc->demux.lock); list_for_each_entry(feed, &fc->demux.feed_list, @@ -156,16 +160,16 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id) /* errors */ if (v.irq_20c.Data_receiver_error) - deb_chk("data receiver error\n"); + dbg_chk("data receiver error\n"); if (v.irq_20c.Continuity_error_flag) - deb_chk("Continuity error flag is set\n"); + dbg_chk("Continuity error flag is set\n"); if (v.irq_20c.LLC_SNAP_FLAG_set) - deb_chk("LLC_SNAP_FLAG_set is set\n"); + dbg_chk("LLC_SNAP_FLAG_set is set\n"); if (v.irq_20c.Transport_Error) - deb_chk("Transport error\n"); + dbg_chk("Transport error\n"); if ((fc_pci->count % 1000) == 0) - deb_chk("%d valid irq took place so far\n", fc_pci->count); + dbg_chk("%d valid irq took place so far\n", fc_pci->count); if (v.irq_20c.DMA1_IRQ_Status == 1) { if (fc_pci->active_dma1_addr == 0) @@ -177,7 +181,7 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id) fc_pci->dma[0].cpu_addr1, fc_pci->dma[0].size / 188); - deb_irq("page change to page: %d\n",!fc_pci->active_dma1_addr); + dbg_irq("page change to page: %d\n", !fc_pci->active_dma1_addr); fc_pci->active_dma1_addr = !fc_pci->active_dma1_addr; /* for the timer IRQ we only can use buffer dmx feeding, because we don't have * complete TS packets when reading from the DMA memory */ @@ -186,17 +190,17 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id) fc->read_ibi_reg(fc,dma1_008).dma_0x8.dma_cur_addr << 2; u32 cur_pos = cur_addr - fc_pci->dma[0].dma_addr0; - deb_irq("%u irq: %08x cur_addr: %llx: cur_pos: %08x, last_cur_pos: %08x ", - jiffies_to_usecs(jiffies - fc_pci->last_irq), - v.raw, (unsigned long long)cur_addr, cur_pos, - fc_pci->last_dma1_cur_pos); + dbg_irq("%u irq: %08x cur_addr: %llx: cur_pos: %08x, last_cur_pos: %08x\n", + jiffies_to_usecs(jiffies - fc_pci->last_irq), + v.raw, (unsigned long long)cur_addr, cur_pos, + fc_pci->last_dma1_cur_pos); fc_pci->last_irq = jiffies; /* buffer end was reached, restarted from the beginning * pass the data from last_cur_pos to the buffer end to the demux */ if (cur_pos < fc_pci->last_dma1_cur_pos) { - deb_irq(" end was reached: passing %d bytes ", + dbg_irq("end was reached: passing %d bytes\n", (fc_pci->dma[0].size*2 - 1) - fc_pci->last_dma1_cur_pos); flexcop_pass_dmx_data(fc_pci->fc_dev, @@ -208,19 +212,18 @@ static irqreturn_t flexcop_pci_isr(int irq, void *dev_id) } if (cur_pos > fc_pci->last_dma1_cur_pos) { - deb_irq(" passing %d bytes ", + dbg_irq("passing %d bytes\n", cur_pos - fc_pci->last_dma1_cur_pos); flexcop_pass_dmx_data(fc_pci->fc_dev, fc_pci->dma[0].cpu_addr0 + fc_pci->last_dma1_cur_pos, cur_pos - fc_pci->last_dma1_cur_pos); } - deb_irq("\n"); fc_pci->last_dma1_cur_pos = cur_pos; fc_pci->count++; } else { - deb_irq("isr for flexcop called, apparently without reason (%08x)\n", + dbg_irq("isr for flexcop called, apparently without reason (%08x)\n", v.raw); ret = IRQ_NONE; } @@ -238,19 +241,19 @@ static int flexcop_pci_stream_control(struct flexcop_device *fc, int onoff) flexcop_dma_config_timer(fc, FC_DMA_1, 0); flexcop_dma_xfer_control(fc, FC_DMA_1, FC_DMA_SUBADDR_0 | FC_DMA_SUBADDR_1, 1); - deb_irq("DMA xfer enabled\n"); + dbg_irq("DMA xfer enabled\n"); fc_pci->last_dma1_cur_pos = 0; flexcop_dma_control_timer_irq(fc, FC_DMA_1, 1); - deb_irq("IRQ enabled\n"); + dbg_irq("IRQ enabled\n"); fc_pci->count_prev = fc_pci->count; } else { flexcop_dma_control_timer_irq(fc, FC_DMA_1, 0); - deb_irq("IRQ disabled\n"); + dbg_irq("IRQ disabled\n"); flexcop_dma_xfer_control(fc, FC_DMA_1, FC_DMA_SUBADDR_0 | FC_DMA_SUBADDR_1, 0); - deb_irq("DMA xfer disabled\n"); + dbg_irq("DMA xfer disabled\n"); } return 0; } diff --git a/drivers/media/usb/b2c2/flexcop-usb.c b/drivers/media/usb/b2c2/flexcop-usb.c index 198ddfb8d2b1..e4a0d09e56cf 100644 --- a/drivers/media/usb/b2c2/flexcop-usb.c +++ b/drivers/media/usb/b2c2/flexcop-usb.c @@ -15,20 +15,16 @@ /* debug */ #ifdef CONFIG_DVB_B2C2_FLEXCOP_DEBUG -#define dprintk(level,args...) \ - do { if ((debug & level)) printk(args); } while (0) - -#define debug_dump(b, l, method) do {\ - int i; \ - for (i = 0; i < l; i++) \ - method("%02x ", b[i]); \ - method("\n"); \ +#define dprintk(level, fmt, ...) \ +do { \ + if (debug & (level)) \ + printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ } while (0) #define DEBSTATUS "" #else -#define dprintk(level, args...) -#define debug_dump(b, l, method) +#define dprintk(level, fmt, ...) \ + no_printk(KERN_DEBUG fmt, ##__VA_ARGS__) #define DEBSTATUS " (debugging is not enabled)" #endif @@ -37,11 +33,11 @@ module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info,ts=2,ctrl=4,i2c=8,v8mem=16 (or-able))." DEBSTATUS); #undef DEBSTATUS -#define deb_info(args...) dprintk(0x01, args) -#define deb_ts(args...) dprintk(0x02, args) -#define deb_ctrl(args...) dprintk(0x04, args) -#define deb_i2c(args...) dprintk(0x08, args) -#define deb_v8(args...) dprintk(0x10, args) +#define dbg_info(args...) dprintk(0x01, args) +#define dbg_ts(args...) dprintk(0x02, args) +#define dbg_ctrl(args...) dprintk(0x04, args) +#define dbg_i2c(args...) dprintk(0x08, args) +#define dbg_v8(args...) dprintk(0x10, args) /* JLP 111700: we will include the 1 bit gap between the upper and lower 3 bits * in the IBI address, to make the V8 code simpler. @@ -137,11 +133,11 @@ static int flexcop_usb_v8_memory_req(struct flexcop_usb *fc_usb, pipe = B2C2_USB_CTRL_PIPE_OUT; break; default: - deb_info("unsupported request for v8_mem_req %x.\n", req); + dbg_info("unsupported request for v8_mem_req %x\n", req); return -EINVAL; } - deb_v8("v8mem: %02x %02x %04x %04x, len: %d\n", request_type, req, - wAddress, wIndex, buflen); + dbg_v8("v8mem: %02x %02x %04x %04x, len: %d\n", + request_type, req, wAddress, wIndex, buflen); mutex_lock(&fc_usb->data_mutex); @@ -167,7 +163,7 @@ static int flexcop_usb_v8_memory_req(struct flexcop_usb *fc_usb, mutex_unlock(&fc_usb->data_mutex); - debug_dump(pbBuffer, ret, deb_v8); + dbg_v8("v8mem buffer: %*ph\n", ret, pbBuffer); return ret; } @@ -202,9 +198,9 @@ static int flexcop_usb_memory_req(struct flexcop_usb *fc_usb, wMax < bytes_left_to_read_on_page(addr, len) ? wMax : bytes_left_to_read_on_page(addr, len); - deb_info("%x\n", - (addr & V8_MEMORY_PAGE_MASK) | - (V8_MEMORY_EXTENDED*extended)); + dbg_info("%x\n", + (addr & V8_MEMORY_PAGE_MASK) | + (V8_MEMORY_EXTENDED * extended)); ret = flexcop_usb_v8_memory_req(fc_usb, req, page_start + (addr / V8_MEMORY_PAGE_SIZE), @@ -259,16 +255,16 @@ static int flexcop_usb_i2c_req(struct flexcop_i2c_adapter *i2c, request_type |= USB_DIR_IN; break; default: - deb_info("unsupported function for i2c_req %x\n", func); + dbg_info("unsupported function for i2c_req %x\n", func); return -EINVAL; } wValue = (func << 8) | (i2c->port << 4); wIndex = (chipaddr << 8 ) | addr; - deb_i2c("i2c %2d: %02x %02x %02x %02x %02x %02x\n", - func, request_type, req, - wValue & 0xff, wValue >> 8, - wIndex & 0xff, wIndex >> 8); + dbg_i2c("i2c %2d: %02x %02x %02x %02x %02x %02x\n", + func, request_type, req, + wValue & 0xff, wValue >> 8, + wIndex & 0xff, wIndex >> 8); mutex_lock(&fc_usb->data_mutex); @@ -332,8 +328,8 @@ static void flexcop_usb_process_frame(struct flexcop_usb *fc_usb, u8 *b; int l; - deb_ts("tmp_buffer_length=%d, buffer_length=%d\n", - fc_usb->tmp_buffer_length, buffer_length); + dbg_ts("tmp_buffer_length=%d, buffer_length=%d\n", + fc_usb->tmp_buffer_length, buffer_length); if (fc_usb->tmp_buffer_length > 0) { memcpy(fc_usb->tmp_buffer+fc_usb->tmp_buffer_length, buffer, @@ -354,17 +350,17 @@ static void flexcop_usb_process_frame(struct flexcop_usb *fc_usb, flexcop_pass_dmx_packets( fc_usb->fc_dev, b+2, 1); else - deb_ts("not ts packet %*ph\n", 4, b+2); + dbg_ts("not ts packet %*ph\n", 4, b + 2); b += 190; l -= 190; break; default: - deb_ts("wrong packet type\n"); + dbg_ts("wrong packet type\n"); l = 0; break; } } else { - deb_ts("wrong header\n"); + dbg_ts("wrong header\n"); l = 0; } } @@ -380,8 +376,8 @@ static void flexcop_usb_urb_complete(struct urb *urb) int i; if (urb->actual_length > 0) - deb_ts("urb completed, bufsize: %d actlen; %d\n", - urb->transfer_buffer_length, urb->actual_length); + dbg_ts("urb completed, bufsize: %d actlen; %d\n", + urb->transfer_buffer_length, urb->actual_length); for (i = 0; i < urb->number_of_packets; i++) { if (urb->iso_frame_desc[i].status < 0) { @@ -389,8 +385,8 @@ static void flexcop_usb_urb_complete(struct urb *urb) urb->iso_frame_desc[i].status); } else if (urb->iso_frame_desc[i].actual_length > 0) { - deb_ts("passed %d bytes to the demux\n", - urb->iso_frame_desc[i].actual_length); + dbg_ts("passed %d bytes to the demux\n", + urb->iso_frame_desc[i].actual_length); flexcop_usb_process_frame(fc_usb, urb->transfer_buffer + @@ -414,7 +410,7 @@ static void flexcop_usb_transfer_exit(struct flexcop_usb *fc_usb) int i; for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++) if (fc_usb->iso_urb[i] != NULL) { - deb_ts("unlinking/killing urb no. %d\n",i); + dbg_ts("unlinking/killing urb no. %d\n", i); usb_kill_urb(fc_usb->iso_urb[i]); usb_free_urb(fc_usb->iso_urb[i]); } @@ -433,9 +429,9 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb) frame_size, i, j, ret; int buffer_offset = 0; - deb_ts("creating %d iso-urbs with %d frames each of %d bytes size = %d.\n", + dbg_ts("creating %d iso-urbs with %d frames each of %d bytes size = %d\n", B2C2_USB_NUM_ISO_URB, - B2C2_USB_FRAMES_PER_ISO, frame_size, bufsize); + B2C2_USB_FRAMES_PER_ISO, frame_size, bufsize); fc_usb->iso_buffer = usb_alloc_coherent(fc_usb->udev, bufsize, GFP_KERNEL, &fc_usb->dma_addr); @@ -459,7 +455,7 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb) for (i = 0; i < B2C2_USB_NUM_ISO_URB; i++) { int frame_offset = 0; struct urb *urb = fc_usb->iso_urb[i]; - deb_ts("initializing and submitting urb no. %d (buf_offset: %d).\n", + dbg_ts("initializing and submitting urb no. %d (buf_offset: %d)\n", i, buffer_offset); urb->dev = fc_usb->udev; @@ -474,8 +470,8 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb) buffer_offset += frame_size * B2C2_USB_FRAMES_PER_ISO; for (j = 0; j < B2C2_USB_FRAMES_PER_ISO; j++) { - deb_ts("urb no: %d, frame: %d, frame_offset: %d\n", - i, j, frame_offset); + dbg_ts("urb no: %d, frame: %d, frame_offset: %d\n", + i, j, frame_offset); urb->iso_frame_desc[j].offset = frame_offset; urb->iso_frame_desc[j].length = frame_size; frame_offset += frame_size; @@ -485,7 +481,7 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb) err("submitting urb %d failed with %d.", i, ret); goto urb_error; } - deb_ts("submitted urb no. %d.\n",i); + dbg_ts("submitted urb no. %d\n", i); } /* SRAM */ diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c index 8a3c0eeed959..b7d4c62875a9 100644 --- a/drivers/media/usb/dvb-usb-v2/lmedm04.c +++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c @@ -83,9 +83,9 @@ static int dvb_usb_lme2510_debug; if ((var >= level)) \ pr_debug(DVB_USB_LOG_PREFIX": " args); \ } while (0) -#define deb_info(level, args...) lme_debug(dvb_usb_lme2510_debug, level, args) +#define dbg_info(level, args...) lme_debug(dvb_usb_lme2510_debug, level, args) #define debug_data_snipet(level, name, p) \ - deb_info(level, name" (%8phN)", p); + dbg_info(level, name " (%8phN)", p); #define info(args...) pr_info(DVB_USB_LOG_PREFIX": "args) module_param_named(debug, dvb_usb_lme2510_debug, int, 0644); @@ -185,7 +185,7 @@ static int lme2510_enable_pid(struct dvb_usb_device *d, u8 index, u16 pid_out) u8 pid_no = index * 2; u8 pid_len = pid_no + 2; int ret = 0; - deb_info(1, "PID Setting Pid %04x", pid_out); + dbg_info(1, "PID Setting Pid %04x", pid_out); if (st->pid_size == 0) ret |= lme2510_stream_restart(d); @@ -293,8 +293,8 @@ static void lme2510_int_response(struct urb *lme_urb) for (i = 0; i < offset; ++i) { ibuf = (u8 *)&rbuf[i*8]; - deb_info(5, "INT O/S C =%02x C/O=%02x Type =%02x%02x", - offset, i, ibuf[0], ibuf[1]); + dbg_info(5, "INT O/S C =%02x C/O=%02x Type =%02x%02x", + offset, i, ibuf[0], ibuf[1]); switch (ibuf[0]) { case 0xaa: @@ -307,7 +307,7 @@ static void lme2510_int_response(struct urb *lme_urb) ibuf[4] << 8 | ibuf[5]); - deb_info(1, "INT Key = 0x%08x", key); + dbg_info(1, "INT Key = 0x%08x", key); rc_keydown(adap_to_d(adap)->rc_dev, RC_PROTO_NEC32, key, 0); break; @@ -407,7 +407,7 @@ static int lme2510_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff) static u8 rbuf[1]; int ret = 0; - deb_info(1, "PID Clearing Filter"); + dbg_info(1, "PID Clearing Filter"); mutex_lock(&d->i2c_mutex); @@ -431,8 +431,8 @@ static int lme2510_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, struct dvb_usb_device *d = adap_to_d(adap); int ret = 0; - deb_info(3, "%s PID=%04x Index=%04x onoff=%02x", __func__, - pid, index, onoff); + dbg_info(3, "%s PID=%04x Index=%04x onoff=%02x", + __func__, pid, index, onoff); if (onoff) { mutex_lock(&d->i2c_mutex); @@ -521,7 +521,7 @@ static int lme2510_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], } if (lme2510_msg(d, obuf, len, ibuf, 64) < 0) { - deb_info(1, "i2c transfer failed."); + dbg_info(1, "i2c transfer failed."); mutex_unlock(&d->i2c_mutex); return -EAGAIN; } @@ -559,13 +559,13 @@ static int lme2510_streaming_ctrl(struct dvb_frontend *fe, int onoff) static u8 rbuf[1]; int ret = 0, rlen = sizeof(rbuf); - deb_info(1, "STM (%02x)", onoff); + dbg_info(1, "STM (%02x)", onoff); /* Streaming is started by FE_HAS_LOCK */ if (onoff == 1) st->stream_on = 1; else { - deb_info(1, "STM Steam Off"); + dbg_info(1, "STM Steam Off"); /* mutex is here only to avoid collision with I2C */ mutex_lock(&d->i2c_mutex); @@ -625,8 +625,8 @@ static int lme2510_download_firmware(struct dvb_usb_device *d, memcpy(&data[2], fw_data, dlen+1); wlen = (u8) dlen + 4; data[wlen-1] = check_sum(fw_data, dlen+1); - deb_info(1, "Data S=%02x:E=%02x CS= %02x", data[3], - data[dlen+2], data[dlen+3]); + dbg_info(1, "Data S=%02x:E=%02x CS= %02x", + data[3], data[dlen + 2], data[dlen + 3]); lme2510_usb_talk(d, data, wlen, data, len_in); ret |= (data[0] == 0x88) ? 0 : -1; } @@ -756,7 +756,7 @@ static int lme2510_kill_urb(struct usb_data_stream *stream) int i; for (i = 0; i < stream->urbs_submitted; i++) { - deb_info(3, "killing URB no. %d.", i); + dbg_info(3, "killing URB no. %d.", i); /* stop the URB */ usb_kill_urb(stream->urb_list[i]); } diff --git a/drivers/media/usb/dvb-usb/a800.c b/drivers/media/usb/dvb-usb/a800.c index 36b5b6227412..a8383a3c4fc8 100644 --- a/drivers/media/usb/dvb-usb/a800.c +++ b/drivers/media/usb/dvb-usb/a800.c @@ -18,7 +18,7 @@ MODULE_PARM_DESC(debug, "set debugging level (rc=1 (or-able))." DVB_USB_DEBUG_ST DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); -#define deb_rc(args...) dprintk(debug,0x01,args) +#define dbg_rc(fmt, ...) dprintk(debug, 0x01, fmt, ##__VA_ARGS__) static int a800_power_ctrl(struct dvb_usb_device *d, int onoff) { diff --git a/drivers/media/usb/dvb-usb/af9005-fe.c b/drivers/media/usb/dvb-usb/af9005-fe.c index 9d6fa0556d7b..e78615d4d5bf 100644 --- a/drivers/media/usb/dvb-usb/af9005-fe.c +++ b/drivers/media/usb/dvb-usb/af9005-fe.c @@ -139,7 +139,7 @@ static int af9005_get_post_vit_err_cw_count(struct dvb_frontend *fe, if (ret) return ret; if (!temp) { - deb_info("rsd counter not ready\n"); + dbg_info("rsd counter not ready\n"); return 100; } /* get abort count */ @@ -192,7 +192,7 @@ static int af9005_get_post_vit_err_cw_count(struct dvb_frontend *fe, err("wrong RSD packet count"); return -EIO; } - deb_info("POST abort count %d err count %d rsd packets %d\n", + dbg_info("POST abort count %d err count %d rsd packets %d\n", loc_abort_count, err_count, cw_count); *post_cw_count = cw_count - (u32) loc_abort_count; *abort_count = loc_abort_count; @@ -236,7 +236,7 @@ static int af9005_get_pre_vit_err_bit_count(struct dvb_frontend *fe, if (ret) return ret; if (!temp) { - deb_info("viterbi counter not ready\n"); + dbg_info("viterbi counter not ready\n"); return 101; /* ERR_APO_VTB_COUNTER_NOT_READY; */ } ret = @@ -268,7 +268,7 @@ static int af9005_get_pre_vit_err_bit_count(struct dvb_frontend *fe, return ret; super_frame_count = ((u32) temp1 << 8) + temp0; if (super_frame_count == 0) { - deb_info("super frame count 0\n"); + dbg_info("super frame count 0\n"); return 102; } @@ -312,7 +312,7 @@ static int af9005_get_pre_vit_err_bit_count(struct dvb_frontend *fe, return -EINVAL; } *pre_bit_count = super_frame_count * 68 * 4 * x * bits; - deb_info("PRE err count %d frame count %d bit count %d\n", + dbg_info("PRE err count %d frame count %d bit count %d\n", *pre_err_count, super_frame_count, *pre_bit_count); return 0; } @@ -372,12 +372,12 @@ static int af9005_get_statistic(struct dvb_frontend *fe) int ret, fecavailable; u64 numerator, denominator; - deb_info("GET STATISTIC\n"); + dbg_info("GET STATISTIC\n"); ret = af9005_is_fecmon_available(fe, &fecavailable); if (ret) return ret; if (!fecavailable) { - deb_info("fecmon not available\n"); + dbg_info("fecmon not available\n"); return 0; } @@ -414,7 +414,7 @@ static int af9005_fe_refresh_state(struct dvb_frontend *fe) { struct af9005_fe_state *state = fe->demodulator_priv; if (time_after(jiffies, state->next_status_check)) { - deb_info("REFRESH STATE\n"); + dbg_info("REFRESH STATE\n"); /* statistics */ if (af9005_get_statistic(fe)) @@ -468,7 +468,7 @@ static int af9005_fe_read_status(struct dvb_frontend *fe, if (ret) return ret; if (temp != state->strong) { - deb_info("adjust for strong signal %d\n", temp); + dbg_info("adjust for strong signal %d\n", temp); state->strong = temp; } return 0; @@ -787,7 +787,7 @@ static int af9005_fe_power(struct dvb_frontend *fe, int on) struct af9005_fe_state *state = fe->demodulator_priv; u8 temp = on; int ret; - deb_info("power %s tuner\n", on ? "on" : "off"); + dbg_info("power %s tuner\n", on ? "on" : "off"); ret = af9005_send_command(state->d, 0x03, &temp, 1, NULL, 0); return ret; } @@ -809,10 +809,10 @@ static int af9005_fe_init(struct dvb_frontend *fe) u8 buf[2]; u16 if1; - deb_info("in af9005_fe_init\n"); + dbg_info("in %s\n", __func__); /* reset */ - deb_info("reset\n"); + dbg_info("reset\n"); if ((ret = af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst_en, 4, 1, 0x01))) @@ -820,7 +820,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) if ((ret = af9005_write_ofdm_register(state->d, APO_REG_RESET, 0))) return ret; /* clear ofdm reset */ - deb_info("clear ofdm reset\n"); + dbg_info("clear ofdm reset\n"); for (i = 0; i < 150; i++) { if ((ret = af9005_read_ofdm_register(state->d, @@ -876,7 +876,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) return ret; /* set stand alone chip */ - deb_info("set stand alone chip\n"); + dbg_info("set stand alone chip\n"); if ((ret = af9005_write_register_bits(state->d, xd_p_reg_dca_stand_alone, reg_dca_stand_alone_pos, @@ -884,7 +884,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) return ret; /* set dca upper & lower chip */ - deb_info("set dca upper & lower chip\n"); + dbg_info("set dca upper & lower chip\n"); if ((ret = af9005_write_register_bits(state->d, xd_p_reg_dca_upper_chip, reg_dca_upper_chip_pos, @@ -897,13 +897,13 @@ static int af9005_fe_init(struct dvb_frontend *fe) return ret; /* set 2wire master clock to 0x14 (for 60KHz) */ - deb_info("set 2wire master clock to 0x14 (for 60KHz)\n"); + dbg_info("set 2wire master clock to 0x14 (for 60KHz)\n"); if ((ret = af9005_write_ofdm_register(state->d, xd_I2C_i2c_m_period, 0x14))) return ret; /* clear dca enable chip */ - deb_info("clear dca enable chip\n"); + dbg_info("clear dca enable chip\n"); if ((ret = af9005_write_register_bits(state->d, xd_p_reg_dca_en, reg_dca_en_pos, reg_dca_en_len, 0))) @@ -917,12 +917,12 @@ static int af9005_fe_init(struct dvb_frontend *fe) return ret; /* init other parameters: program cfoe and select bandwidth */ - deb_info("program cfoe\n"); + dbg_info("program cfoe\n"); ret = af9005_fe_program_cfoe(state->d, 6000000); if (ret) return ret; /* set read-update bit for modulation */ - deb_info("set read-update bit for modulation\n"); + dbg_info("set read-update bit for modulation\n"); if ((ret = af9005_write_register_bits(state->d, xd_p_reg_feq_read_update, reg_feq_read_update_pos, @@ -933,7 +933,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) but sniffing reveals that it doesn't do it */ /* set read-update bit to 1 for DCA modulation */ - deb_info("set read-update bit 1 for DCA modulation\n"); + dbg_info("set read-update bit 1 for DCA modulation\n"); if ((ret = af9005_write_register_bits(state->d, xd_p_reg_dca_read_update, reg_dca_read_update_pos, @@ -941,7 +941,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) return ret; /* enable fec monitor */ - deb_info("enable fec monitor\n"); + dbg_info("enable fec monitor\n"); if ((ret = af9005_write_register_bits(state->d, xd_p_fec_vtb_rsd_mon_en, fec_vtb_rsd_mon_en_pos, @@ -952,12 +952,12 @@ static int af9005_fe_init(struct dvb_frontend *fe) ret = af9005_write_ofdm_register(state->d, 0xa601, 0); /* set api_retrain_never_freeze */ - deb_info("set api_retrain_never_freeze\n"); + dbg_info("set api_retrain_never_freeze\n"); if ((ret = af9005_write_ofdm_register(state->d, 0xaefb, 0x01))) return ret; /* load init script */ - deb_info("load init script\n"); + dbg_info("load init script\n"); scriptlen = sizeof(script) / sizeof(RegDesc); for (i = 0; i < scriptlen; i++) { if ((ret = @@ -989,7 +989,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) /* save original TOPs */ - deb_info("save original TOPs\n"); + dbg_info("save original TOPs\n"); /* RF TOP */ ret = @@ -1031,7 +1031,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) err("Impossible to read EEPROM\n"); return ret; } - deb_info("Tuner id %d, board id %d\n", buf[0], buf[1]); + dbg_info("Tuner id %d, board id %d\n", buf[0], buf[1]); switch (buf[0]) { case 2: /* MT2060 */ /* read if1 from eeprom */ @@ -1043,7 +1043,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) if1 = (u16) (buf[0] << 8) + buf[1]; if (dvb_attach(mt2060_attach, fe, &adap->dev->i2c_adap, &af9005_mt2060_config, if1) == NULL) { - deb_info("MT2060 attach failed\n"); + dbg_info("MT2060 attach failed\n"); return -ENODEV; } break; @@ -1051,7 +1051,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) case 9: /* QT1010B */ if (dvb_attach(qt1010_attach, fe, &adap->dev->i2c_adap, &af9005_qt1010_config) ==NULL) { - deb_info("QT1010 attach failed\n"); + dbg_info("QT1010 attach failed\n"); return -ENODEV; } break; @@ -1064,7 +1064,7 @@ static int af9005_fe_init(struct dvb_frontend *fe) return ret; } - deb_info("profit!\n"); + dbg_info("profit!\n"); return 0; } @@ -1095,14 +1095,14 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe) int ret; u8 temp, temp0, temp1, temp2; - deb_info("af9005_fe_set_frontend freq %d bw %d\n", fep->frequency, - fep->bandwidth_hz); + dbg_info("%s: freq %d bw %d\n", + __func__, fep->frequency, fep->bandwidth_hz); if (fe->ops.tuner_ops.release == NULL) { err("Tuner not attached"); return -ENODEV; } - deb_info("turn off led\n"); + dbg_info("turn off led\n"); /* not in the log */ ret = af9005_led_control(state->d, 0); if (ret) @@ -1113,7 +1113,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe) return ret; /* set FCW to default value */ - deb_info("set FCW to default value\n"); + dbg_info("set FCW to default value\n"); temp0 = (u8) (state->original_fcw & 0x000000ff); temp1 = (u8) ((state->original_fcw & 0x0000ff00) >> 8); temp2 = (u8) ((state->original_fcw & 0x00ff0000) >> 16); @@ -1128,7 +1128,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe) return ret; /* restore original TOPs */ - deb_info("restore original TOPs\n"); + dbg_info("restore original TOPs\n"); ret = af9005_write_word_agc(state->d, xd_p_reg_aagc_rf_top_numerator_9_8, @@ -1155,7 +1155,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe) return ret; /* select bandwidth */ - deb_info("select bandwidth"); + dbg_info("select bandwidth"); ret = af9005_fe_select_bw(state->d, fep->bandwidth_hz); if (ret) return ret; @@ -1164,33 +1164,33 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe) return ret; /* clear easy mode flag */ - deb_info("clear easy mode flag\n"); + dbg_info("clear easy mode flag\n"); ret = af9005_write_ofdm_register(state->d, 0xaefd, 0); if (ret) return ret; /* set unplug threshold to original value */ - deb_info("set unplug threshold to original value\n"); + dbg_info("set unplug threshold to original value\n"); ret = af9005_write_ofdm_register(state->d, xd_p_reg_unplug_th, state->original_if_unplug_th); if (ret) return ret; /* set tuner */ - deb_info("set tuner\n"); + dbg_info("set tuner\n"); ret = fe->ops.tuner_ops.set_params(fe); if (ret) return ret; /* trigger ofsm */ - deb_info("trigger ofsm\n"); + dbg_info("trigger ofsm\n"); temp = 0; ret = af9005_write_tuner_registers(state->d, 0xffff, &temp, 1); if (ret) return ret; /* clear retrain and freeze flag */ - deb_info("clear retrain and freeze flag\n"); + dbg_info("clear retrain and freeze flag\n"); ret = af9005_write_register_bits(state->d, xd_p_reg_api_retrain_request, @@ -1228,20 +1228,20 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, &temp); if (ret) return ret; - deb_info("===== fe_get_frontend_legacy = =============\n"); - deb_info("CONSTELLATION "); + dbg_info("===== fe_get_frontend_legacy = =============\n"); + dbg_info("CONSTELLATION "); switch (temp) { case 0: fep->modulation = QPSK; - deb_info("QPSK\n"); + dbg_info("QPSK\n"); break; case 1: fep->modulation = QAM_16; - deb_info("QAM_16\n"); + dbg_info("QAM_16\n"); break; case 2: fep->modulation = QAM_64; - deb_info("QAM_64\n"); + dbg_info("QAM_64\n"); break; } @@ -1252,23 +1252,23 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, &temp); if (ret) return ret; - deb_info("HIERARCHY "); + dbg_info("HIERARCHY "); switch (temp) { case 0: fep->hierarchy = HIERARCHY_NONE; - deb_info("NONE\n"); + dbg_info("NONE\n"); break; case 1: fep->hierarchy = HIERARCHY_1; - deb_info("1\n"); + dbg_info("1\n"); break; case 2: fep->hierarchy = HIERARCHY_2; - deb_info("2\n"); + dbg_info("2\n"); break; case 3: fep->hierarchy = HIERARCHY_4; - deb_info("4\n"); + dbg_info("4\n"); break; } @@ -1279,7 +1279,7 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, if (ret) return ret; /* if temp is set = high priority */ - deb_info("PRIORITY %s\n", temp ? "high" : "low"); + dbg_info("PRIORITY %s\n", temp ? "high" : "low"); /* high coderate */ ret = @@ -1288,27 +1288,27 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, &temp); if (ret) return ret; - deb_info("CODERATE HP "); + dbg_info("CODERATE HP "); switch (temp) { case 0: fep->code_rate_HP = FEC_1_2; - deb_info("FEC_1_2\n"); + dbg_info("FEC_1_2\n"); break; case 1: fep->code_rate_HP = FEC_2_3; - deb_info("FEC_2_3\n"); + dbg_info("FEC_2_3\n"); break; case 2: fep->code_rate_HP = FEC_3_4; - deb_info("FEC_3_4\n"); + dbg_info("FEC_3_4\n"); break; case 3: fep->code_rate_HP = FEC_5_6; - deb_info("FEC_5_6\n"); + dbg_info("FEC_5_6\n"); break; case 4: fep->code_rate_HP = FEC_7_8; - deb_info("FEC_7_8\n"); + dbg_info("FEC_7_8\n"); break; } @@ -1319,27 +1319,27 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, &temp); if (ret) return ret; - deb_info("CODERATE LP "); + dbg_info("CODERATE LP "); switch (temp) { case 0: fep->code_rate_LP = FEC_1_2; - deb_info("FEC_1_2\n"); + dbg_info("FEC_1_2\n"); break; case 1: fep->code_rate_LP = FEC_2_3; - deb_info("FEC_2_3\n"); + dbg_info("FEC_2_3\n"); break; case 2: fep->code_rate_LP = FEC_3_4; - deb_info("FEC_3_4\n"); + dbg_info("FEC_3_4\n"); break; case 3: fep->code_rate_LP = FEC_5_6; - deb_info("FEC_5_6\n"); + dbg_info("FEC_5_6\n"); break; case 4: fep->code_rate_LP = FEC_7_8; - deb_info("FEC_7_8\n"); + dbg_info("FEC_7_8\n"); break; } @@ -1349,23 +1349,23 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, reg_tpsd_gi_pos, reg_tpsd_gi_len, &temp); if (ret) return ret; - deb_info("GUARD INTERVAL "); + dbg_info("GUARD INTERVAL "); switch (temp) { case 0: fep->guard_interval = GUARD_INTERVAL_1_32; - deb_info("1_32\n"); + dbg_info("1_32\n"); break; case 1: fep->guard_interval = GUARD_INTERVAL_1_16; - deb_info("1_16\n"); + dbg_info("1_16\n"); break; case 2: fep->guard_interval = GUARD_INTERVAL_1_8; - deb_info("1_8\n"); + dbg_info("1_8\n"); break; case 3: fep->guard_interval = GUARD_INTERVAL_1_4; - deb_info("1_4\n"); + dbg_info("1_4\n"); break; } @@ -1376,15 +1376,15 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, &temp); if (ret) return ret; - deb_info("TRANSMISSION MODE "); + dbg_info("TRANSMISSION MODE "); switch (temp) { case 0: fep->transmission_mode = TRANSMISSION_MODE_2K; - deb_info("2K\n"); + dbg_info("2K\n"); break; case 1: fep->transmission_mode = TRANSMISSION_MODE_8K; - deb_info("8K\n"); + dbg_info("8K\n"); break; } @@ -1392,19 +1392,19 @@ static int af9005_fe_get_frontend(struct dvb_frontend *fe, ret = af9005_read_register_bits(state->d, xd_g_reg_bw, reg_bw_pos, reg_bw_len, &temp); - deb_info("BANDWIDTH "); + dbg_info("BANDWIDTH "); switch (temp) { case 0: fep->bandwidth_hz = 6000000; - deb_info("6\n"); + dbg_info("6\n"); break; case 1: fep->bandwidth_hz = 7000000; - deb_info("7\n"); + dbg_info("7\n"); break; case 2: fep->bandwidth_hz = 8000000; - deb_info("8\n"); + dbg_info("8\n"); break; } return 0; @@ -1428,7 +1428,7 @@ struct dvb_frontend *af9005_fe_attach(struct dvb_usb_device *d) if (state == NULL) goto error; - deb_info("attaching frontend af9005\n"); + dbg_info("attaching frontend af9005\n"); state->d = d; state->opened = 0; diff --git a/drivers/media/usb/dvb-usb/af9005-remote.c b/drivers/media/usb/dvb-usb/af9005-remote.c index 41d48b3c8d05..9eff44ff7967 100644 --- a/drivers/media/usb/dvb-usb/af9005-remote.c +++ b/drivers/media/usb/dvb-usb/af9005-remote.c @@ -18,7 +18,8 @@ MODULE_PARM_DESC(debug, "enable (1) or disable (0) debug messages." DVB_USB_DEBUG_STATUS); -#define deb_decode(args...) dprintk(dvb_usb_af9005_remote_debug,0x01,args) +#define dbg_decode(fmt, ...) \ + dprintk(dvb_usb_af9005_remote_debug, 0x01, fmt, ##__VA_ARGS__) struct rc_map_table rc_map_af9005_table[] = { @@ -86,12 +87,12 @@ int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, u32 * event, if (d->last_event == repeatable_keys[i]) { *state = REMOTE_KEY_REPEAT; *event = d->last_event; - deb_decode("repeat key, event %x\n", + dbg_decode("repeat key, event %x\n", *event); return 0; } } - deb_decode("repeated key ignored (non repeatable)\n"); + dbg_decode("repeated key ignored (non repeatable)\n"); return 0; } else if (len >= 33 * 4) { /*32 bits + start code */ result = 0; @@ -104,17 +105,16 @@ int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, u32 * event, if (mark * 2 > space) result += 1; } - deb_decode("key pressed, raw value %x\n", result); + dbg_decode("key pressed, raw value %x\n", result); if ((result & 0xff000000) != 0xfe000000) { - deb_decode - ("doesn't start with 0xfe, ignored\n"); + dbg_decode("doesn't start with 0xfe, ignored\n"); return 0; } cust = (result >> 16) & 0xff; dat = (result >> 8) & 0xff; invdat = (~result) & 0xff; if (dat != invdat) { - deb_decode("code != inverted code\n"); + dbg_decode("code != inverted code\n"); return 0; } for (i = 0; i < rc_map_af9005_table_size; i++) { @@ -122,12 +122,12 @@ int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, u32 * event, && rc5_data(&rc_map_af9005_table[i]) == dat) { *event = rc_map_af9005_table[i].keycode; *state = REMOTE_KEY_PRESSED; - deb_decode - ("key pressed, event %x\n", *event); + dbg_decode("key pressed, event %x\n", + *event); return 0; } } - deb_decode("not found in table\n"); + dbg_decode("not found in table\n"); } } return 0; diff --git a/drivers/media/usb/dvb-usb/af9005.c b/drivers/media/usb/dvb-usb/af9005.c index b6a2436d16e9..c7239ae61552 100644 --- a/drivers/media/usb/dvb-usb/af9005.c +++ b/drivers/media/usb/dvb-usb/af9005.c @@ -134,14 +134,13 @@ static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg, int af9005_read_ofdm_register(struct dvb_usb_device *d, u16 reg, u8 * value) { int ret; - deb_reg("read register %x ", reg); ret = af9005_generic_read_write(d, reg, AF9005_CMD_READ, AF9005_OFDM_REG, value, 1); if (ret) - deb_reg("failed\n"); + dbg_reg("read register %x failed\n", reg); else - deb_reg("value %x\n", *value); + dbg_reg("read register %x value %x\n", reg, *value); return ret; } @@ -149,14 +148,14 @@ int af9005_read_ofdm_registers(struct dvb_usb_device *d, u16 reg, u8 * values, int len) { int ret; - deb_reg("read %d registers %x ", len, reg); ret = af9005_generic_read_write(d, reg, AF9005_CMD_READ, AF9005_OFDM_REG, values, len); if (ret) - deb_reg("failed\n"); + dbg_reg("read %d registers %x failed\n", len, reg); else - debug_dump(values, len, deb_reg); + dbg_reg("read %d registers %x %*ph\n", len, reg, len, values); + return ret; } @@ -164,14 +163,12 @@ int af9005_write_ofdm_register(struct dvb_usb_device *d, u16 reg, u8 value) { int ret; u8 temp = value; - deb_reg("write register %x value %x ", reg, value); ret = af9005_generic_read_write(d, reg, AF9005_CMD_WRITE, AF9005_OFDM_REG, &temp, 1); - if (ret) - deb_reg("failed\n"); - else - deb_reg("ok\n"); + dbg_reg("write register %x value %x %s\n", + reg, value, ret ? "failed" : "ok"); + return ret; } @@ -179,16 +176,15 @@ int af9005_write_ofdm_registers(struct dvb_usb_device *d, u16 reg, u8 * values, int len) { int ret; - deb_reg("write %d registers %x values ", len, reg); - debug_dump(values, len, deb_reg); + dbg_reg("write %d registers %x values %*ph\n", len, reg, len, values); ret = af9005_generic_read_write(d, reg, AF9005_CMD_WRITE, AF9005_OFDM_REG, values, len); if (ret) - deb_reg("failed\n"); + dbg_reg("failed\n"); else - deb_reg("ok\n"); + dbg_reg("ok\n"); return ret; } @@ -197,14 +193,14 @@ int af9005_read_register_bits(struct dvb_usb_device *d, u16 reg, u8 pos, { u8 temp; int ret; - deb_reg("read bits %x %x %x", reg, pos, len); + dbg_reg("read bits %x %x %x", reg, pos, len); ret = af9005_read_ofdm_register(d, reg, &temp); if (ret) { - deb_reg(" failed\n"); + dbg_reg("read bits %x %x %x failed\n", reg, pos, len); return ret; } *value = (temp >> pos) & regmask[len - 1]; - deb_reg(" value %x\n", *value); + dbg_reg("read bits %x %x %x value %x\n", reg, pos, len, *value); return 0; } @@ -214,7 +210,7 @@ int af9005_write_register_bits(struct dvb_usb_device *d, u16 reg, u8 pos, { u8 temp, mask; int ret; - deb_reg("write bits %x %x %x value %x\n", reg, pos, len, value); + dbg_reg("write bits %x %x %x value %x\n", reg, pos, len, value); if (pos == 0 && len == 8) return af9005_write_ofdm_register(d, reg, value); ret = af9005_read_ofdm_register(d, reg, &temp); @@ -353,9 +349,8 @@ static int af9005_i2c_write(struct dvb_usb_device *d, u8 i2caddr, u8 reg, { int ret, i; u8 buf[3]; - deb_i2c("i2c_write i2caddr %x, reg %x, len %d data ", i2caddr, - reg, len); - debug_dump(data, len, deb_i2c); + dbg_i2c("i2c_write i2caddr %x, reg %x, len %d data %*ph\n", + i2caddr, reg, len, len, data); for (i = 0; i < len; i++) { buf[0] = i2caddr; @@ -366,11 +361,11 @@ static int af9005_i2c_write(struct dvb_usb_device *d, u8 i2caddr, u8 reg, APO_REG_I2C_RW_SILICON_TUNER, buf, 3); if (ret) { - deb_i2c("i2c_write failed\n"); + dbg_i2c("i2c_write failed\n"); return ret; } } - deb_i2c("i2c_write ok\n"); + dbg_i2c("i2c_write ok\n"); return 0; } @@ -379,7 +374,7 @@ static int af9005_i2c_read(struct dvb_usb_device *d, u8 i2caddr, u8 reg, { int ret, i; u8 temp; - deb_i2c("i2c_read i2caddr %x, reg %x, len %d\n ", i2caddr, reg, len); + dbg_i2c("i2c_read i2caddr %x, reg %x, len %d\n ", i2caddr, reg, len); for (i = 0; i < len; i++) { temp = reg + i; ret = @@ -387,13 +382,12 @@ static int af9005_i2c_read(struct dvb_usb_device *d, u8 i2caddr, u8 reg, APO_REG_I2C_RW_SILICON_TUNER, i2caddr, &temp, 1); if (ret) { - deb_i2c("i2c_read failed\n"); + dbg_i2c("i2c_read failed\n"); return ret; } data[i] = temp; } - deb_i2c("i2c data read: "); - debug_dump(data, len, deb_i2c); + dbg_i2c("i2c data read: %*ph\n", len, data); return 0; } @@ -597,8 +591,7 @@ static int af9005_boot_packet(struct usb_device *udev, int type, u8 *reply, err("boot packet invalid boot packet type"); return -EINVAL; } - deb_fw(">>> "); - debug_dump(buf, FW_BULKOUT_SIZE + 2, deb_fw); + dbg_fw(">>> %*ph\n", FW_BULKOUT_SIZE + 2, buf); ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 0x02), @@ -617,8 +610,7 @@ static int af9005_boot_packet(struct usb_device *udev, int type, u8 *reply, err("boot packet recv bulk message failed: %d", ret); return ret; } - deb_fw("<<< "); - debug_dump(buf, act_len, deb_fw); + dbg_fw("<<< %*ph\n", act_len, buf); checksum = 0; switch (type) { case FW_CONFIG: @@ -731,8 +723,7 @@ static int af9005_download_firmware(struct usb_device *udev, const struct firmwa for (i = 0; i < packets; i++) { memcpy(&buf[2], fw->data + i * FW_BULKOUT_SIZE, FW_BULKOUT_SIZE); - deb_fw(">>> "); - debug_dump(buf, FW_BULKOUT_SIZE + 2, deb_fw); + dbg_fw(">>> %*ph\n", FW_BULKOUT_SIZE + 2, buf); ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 0x02), buf, FW_BULKOUT_SIZE + 2, &act_len, 1000); @@ -810,10 +801,10 @@ static int af9005_frontend_attach(struct dvb_usb_adapter *adap) usb_clear_halt(udev, usb_sndbulkpipe(udev, 2)); usb_clear_halt(udev, usb_rcvbulkpipe(udev, 1)); if (dvb_usb_af9005_dump_eeprom) { - printk("EEPROM DUMP\n"); + printk(KERN_DEBUG "EEPROM DUMP\n"); for (i = 0; i < 255; i += 8) { af9005_read_eeprom(adap->dev, i, buf, 8); - debug_dump(buf, 8, printk); + printk(KERN_DEBUG "%*ph\n", 8, buf); } } adap->fe_adap[0].fe = af9005_fe_attach(adap->dev); @@ -834,7 +825,7 @@ static int af9005_rc_query(struct dvb_usb_device *d, u32 * event, int *state) mutex_lock(&d->data_mutex); - /* deb_info("rc_query\n"); */ + /* dbg_info("rc_query\n"); */ st->data[0] = 3; /* rest of packet length low */ st->data[1] = 0; /* rest of packet length high */ st->data[2] = 0x40; /* read remote */ @@ -861,14 +852,13 @@ static int af9005_rc_query(struct dvb_usb_device *d, u32 * event, int *state) goto ret; } if (len > 0) { - deb_rc("rc data (%d) ", len); - debug_dump((st->data + 6), len, deb_rc); + dbg_rc("rc data (%d) %*ph\n", len, len, st->data + 6); ret = rc_decode(d, &st->data[6], len, event, state); if (ret) { err("rc_decode failed"); goto ret; } else { - deb_rc("rc_decode state %x event %x\n", *state, *event); + dbg_rc("rc_decode state %x event %x\n", *state, *event); if (*state == REMOTE_KEY_REPEAT) *event = d->last_event; } @@ -888,7 +878,7 @@ static int af9005_power_ctrl(struct dvb_usb_device *d, int onoff) static int af9005_pid_filter_control(struct dvb_usb_adapter *adap, int onoff) { int ret; - deb_info("pid filter control onoff %d\n", onoff); + dbg_info("pid filter control onoff %d\n", onoff); if (onoff) { ret = af9005_write_ofdm_register(adap->dev, XD_MP2IF_DMX_CTRL, 1); @@ -906,7 +896,7 @@ static int af9005_pid_filter_control(struct dvb_usb_adapter *adap, int onoff) af9005_write_ofdm_register(adap->dev, XD_MP2IF_DMX_CTRL, 0); if (ret) return ret; - deb_info("pid filter control ok\n"); + dbg_info("pid filter control ok\n"); return 0; } @@ -915,13 +905,13 @@ static int af9005_pid_filter(struct dvb_usb_adapter *adap, int index, { u8 cmd = index & 0x1f; int ret; - deb_info("set pid filter, index %d, pid %x, onoff %d\n", index, + dbg_info("set pid filter, index %d, pid %x, onoff %d\n", index, pid, onoff); if (onoff) { /* cannot use it as pid_filter_ctrl since it has to be done before setting the first pid */ if (adap->feedcount == 1) { - deb_info("first pid set, enable pid table\n"); + dbg_info("first pid set, enable pid table\n"); ret = af9005_pid_filter_control(adap, onoff); if (ret) return ret; @@ -941,7 +931,7 @@ static int af9005_pid_filter(struct dvb_usb_adapter *adap, int index, cmd |= 0x20 | 0x40; } else { if (adap->feedcount == 0) { - deb_info("last pid unset, disable pid table\n"); + dbg_info("last pid unset, disable pid table\n"); ret = af9005_pid_filter_control(adap, onoff); if (ret) return ret; @@ -950,7 +940,7 @@ static int af9005_pid_filter(struct dvb_usb_adapter *adap, int index, ret = af9005_write_ofdm_register(adap->dev, XD_MP2IF_PID_IDX, cmd); if (ret) return ret; - deb_info("set pid ok\n"); + dbg_info("set pid ok\n"); return 0; } @@ -970,7 +960,7 @@ static int af9005_identify_state(struct usb_device *udev, buf, FW_BULKOUT_SIZE + 2); if (ret) goto err; - deb_info("result of FW_CONFIG in identify state %d\n", reply); + dbg_info("result of FW_CONFIG in identify state %d\n", reply); if (reply == 0x01) *cold = 1; else if (reply == 0x02) @@ -978,7 +968,7 @@ static int af9005_identify_state(struct usb_device *udev, else ret = -EIO; if (!ret) - deb_info("Identify state cold = %d\n", *cold); + dbg_info("Identify state cold = %d\n", *cold); err: kfree(buf); diff --git a/drivers/media/usb/dvb-usb/af9005.h b/drivers/media/usb/dvb-usb/af9005.h index 11d74dc26d83..360fa719fe3f 100644 --- a/drivers/media/usb/dvb-usb/af9005.h +++ b/drivers/media/usb/dvb-usb/af9005.h @@ -15,12 +15,18 @@ #include "dvb-usb.h" extern int dvb_usb_af9005_debug; -#define deb_info(args...) dprintk(dvb_usb_af9005_debug,0x01,args) -#define deb_xfer(args...) dprintk(dvb_usb_af9005_debug,0x02,args) -#define deb_rc(args...) dprintk(dvb_usb_af9005_debug,0x04,args) -#define deb_reg(args...) dprintk(dvb_usb_af9005_debug,0x08,args) -#define deb_i2c(args...) dprintk(dvb_usb_af9005_debug,0x10,args) -#define deb_fw(args...) dprintk(dvb_usb_af9005_debug,0x20,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_af9005_debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) \ + dprintk(dvb_usb_af9005_debug, 0x02, fmt, ##__VA_ARGS__) +#define dbg_rc(fmt, ...) \ + dprintk(dvb_usb_af9005_debug, 0x04, fmt, ##__VA_ARGS__) +#define dbg_reg(fmt, ...) \ + dprintk(dvb_usb_af9005_debug, 0x08, fmt, ##__VA_ARGS__) +#define dbg_i2c(fmt, ...) \ + dprintk(dvb_usb_af9005_debug, 0x10, fmt, ##__VA_ARGS__) +#define dbg_fw(fmt, ...) \ + dprintk(dvb_usb_af9005_debug, 0x20, fmt, ##__VA_ARGS__) extern bool dvb_usb_af9005_led; diff --git a/drivers/media/usb/dvb-usb/az6027.c b/drivers/media/usb/dvb-usb/az6027.c index 1c39b61cde29..82160c22aba5 100644 --- a/drivers/media/usb/dvb-usb/az6027.c +++ b/drivers/media/usb/dvb-usb/az6027.c @@ -318,8 +318,8 @@ static int az6027_usb_in_op(struct dvb_usb_device *d, u8 req, } else ret = 0; - deb_xfer("in: req. %02x, val: %04x, ind: %04x, buffer: ", req, value, index); - debug_dump(b, blen, deb_xfer); + dbg_xfer("in: req. %02x, val: %04x, ind: %04x, buffer: %*ph\n", + req, value, index, blen, b); mutex_unlock(&d->usb_mutex); return ret; @@ -334,8 +334,8 @@ static int az6027_usb_out_op(struct dvb_usb_device *d, { int ret; - deb_xfer("out: req. %02x, val: %04x, ind: %04x, buffer: ", req, value, index); - debug_dump(b, blen, deb_xfer); + dbg_xfer("out: req. %02x, val: %04x, ind: %04x, buffer: %*ph\n", + req, value, index, blen, b); if (mutex_lock_interruptible(&d->usb_mutex)) return -EAGAIN; @@ -368,7 +368,7 @@ static int az6027_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) u16 index; int blen; - deb_info("%s %d", __func__, onoff); + dbg_info("%s %d", __func__, onoff); req = 0xBC; value = onoff; @@ -457,7 +457,7 @@ static int az6027_ci_write_attribute_mem(struct dvb_ca_en50221 *ca, u16 index; int blen; - deb_info("%s %d", __func__, slot); + dbg_info("%s %d", __func__, slot); if (slot != 0) return -EINVAL; @@ -512,7 +512,7 @@ static int az6027_ci_read_cam_control(struct dvb_ca_en50221 *ca, warn("Read CI IO error"); ret = b[1]; - deb_info("read cam data = %x from 0x%x", b[1], value); + dbg_info("read cam data = %x from 0x%x", b[1], value); } mutex_unlock(&state->ca_mutex); @@ -625,7 +625,7 @@ static int az6027_ci_slot_reset(struct dvb_ca_en50221 *ca, int slot) msleep(100); if (CI_CamReady(ca, slot)) { - deb_info("CAM Ready"); + dbg_info("CAM Ready"); break; } } @@ -652,7 +652,7 @@ static int az6027_ci_slot_ts_enable(struct dvb_ca_en50221 *ca, int slot) u16 index; int blen; - deb_info("%s", __func__); + dbg_info("%s", __func__); mutex_lock(&state->ca_mutex); req = 0xC7; value = 1; @@ -713,7 +713,7 @@ static void az6027_ci_uninit(struct dvb_usb_device *d) { struct az6027_device_state *state; - deb_info("%s", __func__); + dbg_info("%s", __func__); if (NULL == d) return; @@ -737,7 +737,7 @@ static int az6027_ci_init(struct dvb_usb_adapter *a) struct az6027_device_state *state = (struct az6027_device_state *)d->priv; int ret; - deb_info("%s", __func__); + dbg_info("%s", __func__); mutex_init(&state->ca_mutex); @@ -762,7 +762,7 @@ static int az6027_ci_init(struct dvb_usb_adapter *a) return ret; } - deb_info("CI initialized."); + dbg_info("CI initialized."); return 0; } @@ -906,13 +906,15 @@ static int az6027_frontend_attach(struct dvb_usb_adapter *adap) az6027_frontend_poweron(adap); az6027_frontend_reset(adap); - deb_info("adap = %p, dev = %p\n", adap, adap->dev); + dbg_info("adap = %p, dev = %p\n", adap, adap->dev); adap->fe_adap[0].fe = stb0899_attach(&az6027_stb0899_config, &adap->dev->i2c_adap); if (adap->fe_adap[0].fe) { - deb_info("found STB0899 DVB-S/DVB-S2 frontend @0x%02x", az6027_stb0899_config.demod_address); + dbg_info("found STB0899 DVB-S/DVB-S2 frontend @0x%02x\n", + az6027_stb0899_config.demod_address); if (stb6100_attach(adap->fe_adap[0].fe, &az6027_stb6100_config, &adap->dev->i2c_adap)) { - deb_info("found STB6100 DVB-S/DVB-S2 frontend @0x%02x", az6027_stb6100_config.tuner_address); + dbg_info("found STB6100 DVB-S/DVB-S2 frontend @0x%02x\n", + az6027_stb6100_config.tuner_address); adap->fe_adap[0].fe->ops.set_voltage = az6027_set_voltage; az6027_ci_init(adap); } else { @@ -1074,7 +1076,7 @@ static int az6027_identify_state(struct usb_device *udev, *cold = ret <= 0; kfree(b); - deb_info("cold: %d\n", *cold); + dbg_info("cold: %d\n", *cold); return 0; } diff --git a/drivers/media/usb/dvb-usb/az6027.h b/drivers/media/usb/dvb-usb/az6027.h index 95b056b36030..42c57a13835c 100644 --- a/drivers/media/usb/dvb-usb/az6027.h +++ b/drivers/media/usb/dvb-usb/az6027.h @@ -7,9 +7,9 @@ extern int dvb_usb_az6027_debug; -#define deb_info(args...) dprintk(dvb_usb_az6027_debug, 0x01, args) -#define deb_xfer(args...) dprintk(dvb_usb_az6027_debug, 0x02, args) -#define deb_rc(args...) dprintk(dvb_usb_az6027_debug, 0x04, args) -#define deb_fe(args...) dprintk(dvb_usb_az6027_debug, 0x08, args) +#define dbg_info(args...) dprintk(dvb_usb_az6027_debug, 0x01, args) +#define dbg_xfer(args...) dprintk(dvb_usb_az6027_debug, 0x02, args) +#define dbg_rc(args...) dprintk(dvb_usb_az6027_debug, 0x04, args) +#define dbg_fe(args...) dprintk(dvb_usb_az6027_debug, 0x08, args) #endif diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c index 969a7ec71dff..54aad0187af5 100644 --- a/drivers/media/usb/dvb-usb/cinergyT2-core.c +++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c @@ -78,7 +78,7 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap) ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 3, 0); if (ret < 0) { - deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep state info\n"); + dbg_rc("cinergyt2_power_ctrl() Failed to retrieve sleep state info\n"); } mutex_unlock(&d->data_mutex); @@ -164,12 +164,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state) if (d->last_event == repeatable_keys[i]) { *state = REMOTE_KEY_REPEAT; *event = d->last_event; - deb_rc("repeat key, event %x\n", - *event); + dbg_rc("repeat key, event %x\n", + *event); goto ret; } } - deb_rc("repeated key (non repeatable)\n"); + dbg_rc("repeated key (non repeatable)\n"); } goto ret; } @@ -181,7 +181,7 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state) if (*event != d->last_event) st->rc_counter = 0; - deb_rc("key: %*ph\n", 5, st->data); + dbg_rc("key: %*ph\n", 5, st->data); } ret: diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c index efb207c23a64..fa801bd6a8e7 100644 --- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c +++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c @@ -210,7 +210,7 @@ static int cinergyt2_fe_init(struct dvb_frontend *fe) static int cinergyt2_fe_sleep(struct dvb_frontend *fe) { - deb_info("cinergyt2_fe_sleep() Called\n"); + dbg_info("cinergyt2_fe_sleep() Called\n"); return 0; } diff --git a/drivers/media/usb/dvb-usb/cinergyT2.h b/drivers/media/usb/dvb-usb/cinergyT2.h index 18905a0ec43e..b1e2c5021a95 100644 --- a/drivers/media/usb/dvb-usb/cinergyT2.h +++ b/drivers/media/usb/dvb-usb/cinergyT2.h @@ -25,15 +25,15 @@ extern int dvb_usb_cinergyt2_debug; -#define deb_info(args...) dprintk(dvb_usb_cinergyt2_debug, 0x001, args) -#define deb_xfer(args...) dprintk(dvb_usb_cinergyt2_debug, 0x002, args) -#define deb_pll(args...) dprintk(dvb_usb_cinergyt2_debug, 0x004, args) -#define deb_ts(args...) dprintk(dvb_usb_cinergyt2_debug, 0x008, args) -#define deb_err(args...) dprintk(dvb_usb_cinergyt2_debug, 0x010, args) -#define deb_rc(args...) dprintk(dvb_usb_cinergyt2_debug, 0x020, args) -#define deb_fw(args...) dprintk(dvb_usb_cinergyt2_debug, 0x040, args) -#define deb_mem(args...) dprintk(dvb_usb_cinergyt2_debug, 0x080, args) -#define deb_uxfer(args...) dprintk(dvb_usb_cinergyt2_debug, 0x100, args) +#define dbg_info(args...) dprintk(dvb_usb_cinergyt2_debug, 0x001, args) +#define dbg_xfer(args...) dprintk(dvb_usb_cinergyt2_debug, 0x002, args) +#define dbg_pll(args...) dprintk(dvb_usb_cinergyt2_debug, 0x004, args) +#define dbg_ts(args...) dprintk(dvb_usb_cinergyt2_debug, 0x008, args) +#define dbg_err(args...) dprintk(dvb_usb_cinergyt2_debug, 0x010, args) +#define dbg_rc(args...) dprintk(dvb_usb_cinergyt2_debug, 0x020, args) +#define dbg_fw(args...) dprintk(dvb_usb_cinergyt2_debug, 0x040, args) +#define dbg_mem(args...) dprintk(dvb_usb_cinergyt2_debug, 0x080, args) +#define dbg_uxfer(args...) dprintk(dvb_usb_cinergyt2_debug, 0x100, args) diff --git a/drivers/media/usb/dvb-usb/dib0700.h b/drivers/media/usb/dvb-usb/dib0700.h index 2defbd8b6fc1..a2aecae27a28 100644 --- a/drivers/media/usb/dvb-usb/dib0700.h +++ b/drivers/media/usb/dvb-usb/dib0700.h @@ -12,10 +12,14 @@ #include "dib07x0.h" extern int dvb_usb_dib0700_debug; -#define deb_info(args...) dprintk(dvb_usb_dib0700_debug,0x01,args) -#define deb_fw(args...) dprintk(dvb_usb_dib0700_debug,0x02,args) -#define deb_fwdata(args...) dprintk(dvb_usb_dib0700_debug,0x04,args) -#define deb_data(args...) dprintk(dvb_usb_dib0700_debug,0x08,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_dib0700_debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_fw(fmt, ...) \ + dprintk(dvb_usb_dib0700_debug, 0x02, fmt, ##__VA_ARGS__) +#define dbg_fwdata(fmt, ...) \ + dprintk(dvb_usb_dib0700_debug, 0x04, fmt, ##__VA_ARGS__) +#define dbg_data(fmt, ...) \ + dprintk(dvb_usb_dib0700_debug, 0x08, fmt, ##__VA_ARGS__) #define REQUEST_SET_USB_XFER_LEN 0x0 /* valid only for firmware version */ /* higher than 1.21 */ diff --git a/drivers/media/usb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c index 70219b3e8566..8a8d68d70479 100644 --- a/drivers/media/usb/dvb-usb/dib0700_core.c +++ b/drivers/media/usb/dvb-usb/dib0700_core.c @@ -54,15 +54,15 @@ static int dib0700_ctrl_wr(struct dvb_usb_device *d, u8 *tx, u8 txlen) { int status; - deb_data(">>> "); - debug_dump(tx, txlen, deb_data); + dbg_data(">>> %*ph\n", (int)txlen, tx); status = usb_control_msg(d->udev, usb_sndctrlpipe(d->udev,0), tx[0], USB_TYPE_VENDOR | USB_DIR_OUT, 0, 0, tx, txlen, USB_CTRL_GET_TIMEOUT); if (status != txlen) - deb_data("ep 0 write error (status = %d, len: %d)\n",status,txlen); + dbg_data("ep 0 write error (status = %d, len: %d)\n", + status, txlen); return status < 0 ? status : 0; } @@ -82,8 +82,7 @@ int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen return -EINVAL; } - deb_data(">>> "); - debug_dump(tx,txlen,deb_data); + dbg_data(">>> %*ph\n", (int)txlen, tx); value = ((txlen - 2) << 8) | tx[1]; index = 0; @@ -97,10 +96,9 @@ int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen USB_CTRL_GET_TIMEOUT); if (status < 0) - deb_info("ep 0 read error (status = %d)\n",status); + dbg_info("ep 0 read error (status = %d)\n", status); - deb_data("<<< "); - debug_dump(rx, rxlen, deb_data); + dbg_data("<<< %*ph\n", (int)rxlen, rx); return status; /* length in case of success */ } @@ -140,12 +138,12 @@ static int dib0700_set_usb_xfer_len(struct dvb_usb_device *d, u16 nb_ts_packets) st->buf[1] = (nb_ts_packets >> 8) & 0xff; st->buf[2] = nb_ts_packets & 0xff; - deb_info("set the USB xfer len to %i Ts packet\n", nb_ts_packets); + dbg_info("set the USB xfer len to %i Ts packet\n", nb_ts_packets); ret = dib0700_ctrl_wr(d, st->buf, 3); mutex_unlock(&d->usb_mutex); } else { - deb_info("this firmware does not allow to change the USB xfer len\n"); + dbg_info("this firmware does not allow to change the USB xfer len\n"); ret = -EIO; } @@ -211,12 +209,12 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, msg[i].len, USB_CTRL_GET_TIMEOUT); if (result < 0) { - deb_info("i2c read error (status = %d)\n", result); + dbg_info("i2c read error (status = %d)\n", result); goto unlock; } if (msg[i].len > sizeof(st->buf)) { - deb_info("buffer too small to fit %d bytes\n", + dbg_info("buffer too small to fit %d bytes\n", msg[i].len); result = -EIO; goto unlock; @@ -224,8 +222,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, memcpy(msg[i].buf, st->buf, msg[i].len); - deb_data("<<< "); - debug_dump(msg[i].buf, msg[i].len, deb_data); + dbg_data("<<< %*ph\n", (int)msg[i].len, msg[i].buf); } else { /* Write request */ @@ -243,7 +240,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, ((bus_mode << 4) & 0x30); if (msg[i].len > sizeof(st->buf) - 4) { - deb_info("i2c message to big: %d\n", + dbg_info("i2c message to big: %d\n", msg[i].len); mutex_unlock(&d->usb_mutex); result = -EIO; @@ -253,8 +250,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, /* The Actual i2c payload */ memcpy(&st->buf[4], msg[i].buf, msg[i].len); - deb_data(">>> "); - debug_dump(st->buf, msg[i].len + 4, deb_data); + dbg_data(">>> %*ph\n", (int)(msg[i].len + 4), st->buf); result = usb_control_msg(d->udev, usb_sndctrlpipe(d->udev, 0), @@ -264,7 +260,7 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg, USB_CTRL_GET_TIMEOUT); mutex_unlock(&d->usb_mutex); if (result < 0) { - deb_info("i2c write error (status = %d)\n", result); + dbg_info("i2c write error (status = %d)\n", result); break; } } @@ -299,8 +295,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap, st->buf[1] = msg[i].addr << 1; /* fill the buffer */ if (msg[i].len > sizeof(st->buf) - 2) { - deb_info("i2c xfer to big: %d\n", - msg[i].len); + dbg_info("i2c xfer too big: %d\n", msg[i].len); result = -EIO; goto unlock; } @@ -315,15 +310,15 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap, len = dib0700_ctrl_rd(d, st->buf, msg[i].len + 2, st->buf, msg[i + 1].len); if (len <= 0) { - deb_info("I2C read failed on address 0x%02x\n", - msg[i].addr); + dbg_info("I2C read failed on address 0x%02x\n", + msg[i].addr); result = -EIO; goto unlock; } if (msg[i + 1].len > sizeof(st->buf)) { - deb_info("i2c xfer buffer to small for %d\n", - msg[i].len); + dbg_info("i2c xfer buffer too small for %d\n", + msg[i].len); result = -EIO; goto unlock; } @@ -388,10 +383,10 @@ int dib0700_identify_state(struct usb_device *udev, ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), REQUEST_GET_VERSION, USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, b, 16, USB_CTRL_GET_TIMEOUT); - deb_info("FW GET_VERSION length: %d\n",ret); + dbg_info("FW GET_VERSION length: %d\n", ret); *cold = ret <= 0; - deb_info("cold: %d\n", *cold); + dbg_info("cold: %d\n", *cold); kfree(b); return 0; @@ -453,9 +448,11 @@ int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz) st->buf[6] = (u8) (divider >> 8); st->buf[7] = (u8) (divider & 0xff); - deb_info("setting I2C speed: %04x %04x %04x (%d kHz).", - (st->buf[2] << 8) | (st->buf[3]), (st->buf[4] << 8) | - st->buf[5], (st->buf[6] << 8) | st->buf[7], scl_kHz); + dbg_info("setting I2C speed: %04x %04x %04x (%d kHz)\n", + (st->buf[2] << 8) | (st->buf[3]), + (st->buf[4] << 8) | (st->buf[5]), + (st->buf[6] << 8) | (st->buf[7]), + scl_kHz); ret = dib0700_ctrl_wr(d, st->buf, 8); mutex_unlock(&d->usb_mutex); @@ -491,11 +488,11 @@ static int dib0700_jumpram(struct usb_device *udev, u32 address) buf[7] = address & 0xff; if ((ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 0x01),buf,8,&actlen,1000)) < 0) { - deb_fw("jumpram to 0x%x failed\n",address); + dbg_fw("jumpram to 0x%x failed\n", address); goto out; } if (actlen != 8) { - deb_fw("jumpram to 0x%x failed\n",address); + dbg_fw("jumpram to 0x%x failed\n", address); ret = -EIO; goto out; } @@ -516,8 +513,8 @@ int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw return -ENOMEM; while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) { - deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n", - hx.addr, hx.len, hx.chk); + dbg_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n", + hx.addr, hx.len, hx.chk); buf[0] = hx.len; buf[1] = (hx.addr >> 8) & 0xff; @@ -591,7 +588,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) ret = dib0700_set_usb_xfer_len(adap->dev, st->nb_packet_buffer_size); if (ret < 0) { - deb_info("can not set the USB xfer len\n"); + dbg_info("can not set the USB xfer len\n"); return ret; } } @@ -610,12 +607,13 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) st->buf[3] = 0x00; - deb_info("modifying (%d) streaming state for %d\n", onoff, adap->id); + dbg_info("modifying (%d) streaming state for %d\n", onoff, adap->id); st->channel_state &= ~0x3; if ((adap->fe_adap[0].stream.props.endpoint != 2) && (adap->fe_adap[0].stream.props.endpoint != 3)) { - deb_info("the endpoint number (%i) is not correct, use the adapter id instead", adap->fe_adap[0].stream.props.endpoint); + dbg_info("the endpoint number (%i) is not correct, use the adapter id instead\n", + adap->fe_adap[0].stream.props.endpoint); if (onoff) st->channel_state |= 1 << (adap->id); else @@ -629,7 +627,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) st->buf[2] |= st->channel_state; - deb_info("data for streaming: %x %x\n", st->buf[1], st->buf[2]); + dbg_info("data for streaming: %x %x\n", st->buf[1], st->buf[2]); ret = dib0700_ctrl_wr(adap->dev, st->buf, 4); mutex_unlock(&adap->dev->usb_mutex); @@ -715,7 +713,7 @@ static void dib0700_rc_urb_completion(struct urb *purb) u32 keycode; u8 toggle; - deb_info("%s()\n", __func__); + dbg_info("%s()\n", __func__); if (d->rc_dev == NULL) { /* This will occur if disable_rc_polling=1 */ kfree(purb->transfer_buffer); @@ -726,18 +724,18 @@ static void dib0700_rc_urb_completion(struct urb *purb) poll_reply = purb->transfer_buffer; if (purb->status < 0) { - deb_info("discontinuing polling\n"); + dbg_info("discontinuing polling\n"); kfree(purb->transfer_buffer); usb_free_urb(purb); return; } if (purb->actual_length != RC_MSG_SIZE_V1_20) { - deb_info("malformed rc msg size=%d\n", purb->actual_length); + dbg_info("malformed rc msg size=%d\n", purb->actual_length); goto resubmit; } - deb_data("IR ID = %02X state = %02X System = %02X %02X Cmd = %02X %02X (len %d)\n", + dbg_data("IR ID = %02X state = %02X System = %02X %02X Cmd = %02X %02X (len %d)\n", poll_reply->report_id, poll_reply->data_state, poll_reply->nec.system, poll_reply->nec.not_system, poll_reply->nec.data, poll_reply->nec.not_data, @@ -758,21 +756,21 @@ static void dib0700_rc_urb_completion(struct urb *purb) } if ((poll_reply->nec.data ^ poll_reply->nec.not_data) != 0xff) { - deb_data("NEC32 protocol\n"); + dbg_data("NEC32 protocol\n"); keycode = RC_SCANCODE_NEC32(poll_reply->nec.system << 24 | poll_reply->nec.not_system << 16 | poll_reply->nec.data << 8 | poll_reply->nec.not_data); protocol = RC_PROTO_NEC32; } else if ((poll_reply->nec.system ^ poll_reply->nec.not_system) != 0xff) { - deb_data("NEC extended protocol\n"); + dbg_data("NEC extended protocol\n"); keycode = RC_SCANCODE_NECX(poll_reply->nec.system << 8 | poll_reply->nec.not_system, poll_reply->nec.data); protocol = RC_PROTO_NECX; } else { - deb_data("NEC normal protocol\n"); + dbg_data("NEC normal protocol\n"); keycode = RC_SCANCODE_NEC(poll_reply->nec.system, poll_reply->nec.data); protocol = RC_PROTO_NEC; @@ -780,7 +778,7 @@ static void dib0700_rc_urb_completion(struct urb *purb) break; default: - deb_data("RC5 protocol\n"); + dbg_data("RC5 protocol\n"); protocol = RC_PROTO_RC5; toggle = poll_reply->report_id; keycode = RC_SCANCODE_RC5(poll_reply->rc5.system, poll_reply->rc5.data); @@ -890,8 +888,8 @@ static int dib0700_probe(struct usb_interface *intf, dib0700_get_version(dev, &hwversion, &romversion, &fw_version, &fwtype); - deb_info("Firmware version: %x, %d, 0x%x, %d\n", - hwversion, romversion, fw_version, fwtype); + dbg_info("Firmware version: %x, %d, 0x%x, %d\n", + hwversion, romversion, fw_version, fwtype); st->fw_version = fw_version; st->nb_packet_buffer_size = (u32)nb_packet_buffer_size; diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c index 4ef3fa98d20f..4e04d146b78d 100644 --- a/drivers/media/usb/dvb-usb/dib0700_devices.c +++ b/drivers/media/usb/dvb-usb/dib0700_devices.c @@ -798,7 +798,7 @@ static int dib7070_tuner_reset(struct dvb_frontend *fe, int onoff) struct dvb_usb_adapter *adap = fe->dvb->priv; struct dib0700_adapter_state *state = adap->priv; - deb_info("reset: %d", onoff); + dbg_info("reset: %d", onoff); return state->dib7000p_ops.set_gpio(fe, 8, 0, !onoff); } @@ -807,7 +807,7 @@ static int dib7070_tuner_sleep(struct dvb_frontend *fe, int onoff) struct dvb_usb_adapter *adap = fe->dvb->priv; struct dib0700_adapter_state *state = adap->priv; - deb_info("sleep: %d", onoff); + dbg_info("sleep: %d", onoff); return state->dib7000p_ops.set_gpio(fe, 9, 0, onoff); } @@ -851,7 +851,7 @@ static int dib7070_set_param_override(struct dvb_frontend *fe) case BAND_UHF: default: offset = 550; break; } - deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe)); + dbg_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe)); state->dib7000p_ops.set_wbd_ref(fe, offset + dib0070_wbd_offset(fe)); return state->set_param_save(fe); } @@ -875,7 +875,7 @@ static int dib7770_set_param_override(struct dvb_frontend *fe) offset = 250; break; } - deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe)); + dbg_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe)); state->dib7000p_ops.set_wbd_ref(fe, offset + dib0070_wbd_offset(fe)); return state->set_param_save(fe); } @@ -1296,7 +1296,7 @@ static int dib807x_set_param_override(struct dvb_frontend *fe) default: offset += 250; break; } - deb_info("WBD for DiB8000: %d\n", offset); + dbg_info("WBD for DiB8000: %d\n", offset); state->dib8000_ops.set_wbd_ref(fe, offset); return state->set_param_save(fe); @@ -1543,7 +1543,7 @@ static int dib8090_get_adc_power(struct dvb_frontend *fe) static void dib8090_agc_control(struct dvb_frontend *fe, u8 restart) { - deb_info("AGC control callback: %i\n", restart); + dbg_info("AGC control callback: %i\n", restart); dib0090_dcc_freq(fe, restart); if (restart == 0) /* before AGC startup */ @@ -1636,13 +1636,13 @@ static u8 dib8090_compute_pll_parameters(struct dvb_frontend *fe) if (rest > freq_adc / 2) rest = freq_adc - rest; - deb_info("PLL ratio=%i rest=%i\n", pll_ratio, rest); + dbg_info("PLL ratio=%i rest=%i\n", pll_ratio, rest); if ((rest > max) && (rest > 717)) { optimal_pll_ratio = pll_ratio; max = rest; } } - deb_info("optimal PLL ratio=%i\n", optimal_pll_ratio); + dbg_info("optimal PLL ratio=%i\n", optimal_pll_ratio); return optimal_pll_ratio; } @@ -1659,14 +1659,15 @@ static int dib8096_set_param_override(struct dvb_frontend *fe) switch (band) { default: - deb_info("Warning : Rf frequency (%iHz) is not in the supported range, using VHF switch ", fe->dtv_property_cache.frequency); - /* fall through */ + dbg_info("Warning : Rf frequency (%iHz) is not in the supported range, using VHF switch\n", + fe->dtv_property_cache.frequency); + fallthrough; case BAND_VHF: - state->dib8000_ops.set_gpio(fe, 3, 0, 1); - break; + state->dib8000_ops.set_gpio(fe, 3, 0, 1); + break; case BAND_UHF: - state->dib8000_ops.set_gpio(fe, 3, 0, 0); - break; + state->dib8000_ops.set_gpio(fe, 3, 0, 0); + break; } ret = state->set_param_save(fe); @@ -1674,7 +1675,7 @@ static int dib8096_set_param_override(struct dvb_frontend *fe) return ret; if (fe->dtv_property_cache.bandwidth_hz != 6000000) { - deb_info("only 6MHz bandwidth is supported\n"); + dbg_info("only 6MHz bandwidth is supported\n"); return -EINVAL; } @@ -1704,7 +1705,7 @@ static int dib8096_set_param_override(struct dvb_frontend *fe) } if (band == BAND_CBAND) { - deb_info("tuning in CBAND - soft-AGC startup\n"); + dbg_info("tuning in CBAND - soft-AGC startup\n"); dib0090_set_tune_state(fe, CT_AGC_START); do { @@ -1720,13 +1721,13 @@ static int dib8096_set_param_override(struct dvb_frontend *fe) } } while (tune_state < CT_AGC_STOP); - deb_info("switching to PWM AGC\n"); + dbg_info("switching to PWM AGC\n"); dib0090_pwm_gain_reset(fe); state->dib8000_ops.pwm_agc_reset(fe); state->dib8000_ops.set_tune_state(fe, CT_DEMOD_START); } else { /* for everything else than CBAND we are using standard AGC */ - deb_info("not tuning in CBAND - standard AGC startup\n"); + dbg_info("not tuning in CBAND - standard AGC startup\n"); dib0090_pwm_gain_reset(fe); } @@ -2057,7 +2058,7 @@ static int dib8096p_get_best_sampling(struct dvb_frontend *fe, struct dibx090p_b adc->pll_loopdiv = loopdiv; adc->pll_prediv = prediv; - deb_info("bandwidth = %d", fe->dtv_property_cache.bandwidth_hz); + dbg_info("bandwidth = %d", fe->dtv_property_cache.bandwidth_hz); /* Find Min and Max prediv */ while ((xtal / max_prediv) >= fcp_min) @@ -2070,7 +2071,7 @@ static int dib8096p_get_best_sampling(struct dvb_frontend *fe, struct dibx090p_b if (min_prediv == 1) break; } - deb_info("MIN prediv = %d : MAX prediv = %d", min_prediv, max_prediv); + dbg_info("MIN prediv = %d : MAX prediv = %d", min_prediv, max_prediv); min_prediv = 1; @@ -2099,7 +2100,12 @@ static int dib8096p_get_best_sampling(struct dvb_frontend *fe, struct dibx090p_b adc->timf = (4260880253U / fdem) * (1 << 8); adc->timf += ((4260880253U % fdem) << 8) / fdem; - deb_info("RF %6d; BW %6d; Xtal %6d; Fmem %6d; Fdem %6d; Fs %6d; Prediv %2d; Loopdiv %2d; Timf %8d;", fe->dtv_property_cache.frequency, fe->dtv_property_cache.bandwidth_hz, xtal, fmem, fdem, fs, prediv, loopdiv, adc->timf); + dbg_info("RF %6d; BW %6d; Xtal %6d; Fmem %6d; Fdem %6d; Fs %6d; Prediv %2d; Loopdiv %2d; Timf %8d;\n", + fe->dtv_property_cache.frequency, + fe->dtv_property_cache.bandwidth_hz, + xtal, fmem, fdem, fs, + prediv, loopdiv, + adc->timf); break; } } @@ -2240,16 +2246,16 @@ static int dib01x0_pmu_update(struct i2c_adapter *i2c, u16 *data, u8 len) switch (rb[0] << 8 | rb[1]) { case 0: - deb_info("Found DiB0170 rev1: This version of DiB0170 is not supported any longer.\n"); + dbg_info("Found DiB0170 rev1: This version of DiB0170 is not supported any longer.\n"); return -EIO; case 1: - deb_info("Found DiB0170 rev2"); + dbg_info("Found DiB0170 rev2"); break; case 2: - deb_info("Found DiB0190 rev2"); + dbg_info("Found DiB0190 rev2"); break; default: - deb_info("DiB01x0 not found"); + dbg_info("DiB01x0 not found"); return -EIO; } @@ -2414,10 +2420,11 @@ static int stk9090m_frontend_attach(struct dvb_usb_adapter *adap) dib9000_i2c_enumeration(&adap->dev->i2c_adap, 1, 0x10, 0x80); if (request_firmware(&state->frontend_firmware, "dib9090.fw", &adap->dev->udev->dev)) { - deb_info("%s: Upload failed. (file not found?)\n", __func__); + dbg_info("%s: Upload failed. (file not found?)\n", __func__); return -ENODEV; } else { - deb_info("%s: firmware read %zu bytes.\n", __func__, state->frontend_firmware->size); + dbg_info("%s: firmware read %zu bytes\n", + __func__, state->frontend_firmware->size); } stk9090m_config.microcode_B_fe_size = state->frontend_firmware->size; stk9090m_config.microcode_B_fe_buffer = state->frontend_firmware->data; @@ -2484,10 +2491,11 @@ static int nim9090md_frontend_attach(struct dvb_usb_adapter *adap) dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1); if (request_firmware(&state->frontend_firmware, "dib9090.fw", &adap->dev->udev->dev)) { - deb_info("%s: Upload failed. (file not found?)\n", __func__); + dbg_info("%s: Upload failed. (file not found?)\n", __func__); return -EIO; } else { - deb_info("%s: firmware read %zu bytes.\n", __func__, state->frontend_firmware->size); + dbg_info("%s: firmware read %zu bytes\n", + __func__, state->frontend_firmware->size); } nim9090md_config[0].microcode_B_fe_size = state->frontend_firmware->size; nim9090md_config[0].microcode_B_fe_buffer = state->frontend_firmware->data; @@ -2571,7 +2579,7 @@ static int dib7090p_get_best_sampling(struct dvb_frontend *fe , struct dibx090p_ adc->pll_prediv = prediv; adc->timf = 0; - deb_info("bandwidth = %d fdem_min =%d", fe->dtv_property_cache.bandwidth_hz, fdem_min); + dbg_info("bandwidth = %d fdem_min =%d", fe->dtv_property_cache.bandwidth_hz, fdem_min); /* Find Min and Max prediv */ while ((xtal/max_prediv) >= fcp_min) @@ -2584,7 +2592,7 @@ static int dib7090p_get_best_sampling(struct dvb_frontend *fe , struct dibx090p_ if (min_prediv == 1) break; } - deb_info("MIN prediv = %d : MAX prediv = %d", min_prediv, max_prediv); + dbg_info("MIN prediv = %d : MAX prediv = %d", min_prediv, max_prediv); min_prediv = 2; @@ -2611,7 +2619,9 @@ static int dib7090p_get_best_sampling(struct dvb_frontend *fe , struct dibx090p_ adc->pll_prediv = prediv; adc->timf = 2396745143UL/fdem*(1 << 9); adc->timf += ((2396745143UL%fdem) << 9)/fdem; - deb_info("loopdiv=%i prediv=%i timf=%i", loopdiv, prediv, adc->timf); + dbg_info("loopdiv=%i prediv=%i timf=%i\n", + loopdiv, prediv, + adc->timf); break; } } @@ -2658,7 +2668,7 @@ static int dib7090_agc_startup(struct dvb_frontend *fe) static int dib7090_agc_restart(struct dvb_frontend *fe, u8 restart) { - deb_info("AGC restart callback: %d", restart); + dbg_info("AGC restart callback: %d", restart); if (restart == 0) /* before AGC startup */ dib0090_set_dc_servo(fe, 1); return 0; @@ -2669,7 +2679,7 @@ static int tfe7790p_update_lna(struct dvb_frontend *fe, u16 agc_global) struct dvb_usb_adapter *adap = fe->dvb->priv; struct dib0700_adapter_state *state = adap->priv; - deb_info("update LNA: agc global=%i", agc_global); + dbg_info("update LNA: agc global=%i", agc_global); if (agc_global < 25000) { state->dib7000p_ops.set_gpio(fe, 8, 0, 0); @@ -2824,7 +2834,7 @@ static int tfe7090p_pvr_update_lna(struct dvb_frontend *fe, u16 agc_global) struct dvb_usb_adapter *adap = fe->dvb->priv; struct dib0700_adapter_state *state = adap->priv; - deb_info("TFE7090P-PVR update LNA: agc global=%i", agc_global); + dbg_info("TFE7090P-PVR update LNA: agc global=%i", agc_global); if (agc_global < 25000) { state->dib7000p_ops.set_gpio(fe, 5, 0, 0); state->dib7000p_ops.set_agc1_min(fe, 0); diff --git a/drivers/media/usb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c index 02b51d1a1b67..fdc0df47678c 100644 --- a/drivers/media/usb/dvb-usb/dibusb-common.c +++ b/drivers/media/usb/dvb-usb/dibusb-common.c @@ -16,7 +16,7 @@ module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info (|-able))." DVB_USB_DEBUG_STATUS); MODULE_LICENSE("GPL"); -#define deb_info(args...) dprintk(debug,0x01,args) +#define dbg_info(fmt, ...) dprintk(debug, 0x01, fmt, ##__VA_ARGS__) /* common stuff used by the different dibusb modules */ int dibusb_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) @@ -389,7 +389,7 @@ int dibusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state) dvb_usb_nec_rc_key_to_event(d, buf, event, state); if (buf[0] != 0) - deb_info("key: %*ph\n", 5, buf); + dbg_info("key: %*ph\n", 5, buf); ret: kfree(buf); diff --git a/drivers/media/usb/dvb-usb/digitv.c b/drivers/media/usb/dvb-usb/digitv.c index 4e3b3c064bcf..3b07928b2996 100644 --- a/drivers/media/usb/dvb-usb/digitv.c +++ b/drivers/media/usb/dvb-usb/digitv.c @@ -20,7 +20,8 @@ MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_ST DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); -#define deb_rc(args...) dprintk(dvb_usb_digitv_debug,0x01,args) +#define dbg_rc(fmt, ...) \ + dprintk(dvb_usb_digitv_debug, 0x01, fmt, ##__VA_ARGS__) static int digitv_ctrl_msg(struct dvb_usb_device *d, u8 cmd, u8 vv, u8 *wbuf, int wlen, u8 *rbuf, int rlen) @@ -262,7 +263,7 @@ static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state) } } - deb_rc("key: %*ph\n", 4, key); + dbg_rc("key: %*ph\n", 4, key); } return 0; diff --git a/drivers/media/usb/dvb-usb/dtt200u-fe.c b/drivers/media/usb/dvb-usb/dtt200u-fe.c index 9f83560ba63d..2c2e842dc187 100644 --- a/drivers/media/usb/dvb-usb/dtt200u-fe.c +++ b/drivers/media/usb/dvb-usb/dtt200u-fe.c @@ -210,7 +210,7 @@ struct dvb_frontend* dtt200u_fe_attach(struct dvb_usb_device *d) if (state == NULL) goto error; - deb_info("attaching frontend dtt200u\n"); + dbg_info("attaching frontend dtt200u\n"); state->d = d; mutex_init(&state->data_mutex); diff --git a/drivers/media/usb/dvb-usb/dtt200u.c b/drivers/media/usb/dvb-usb/dtt200u.c index 24efa023d827..465f05c38891 100644 --- a/drivers/media/usb/dvb-usb/dtt200u.c +++ b/drivers/media/usb/dvb-usb/dtt200u.c @@ -121,7 +121,7 @@ static int dtt200u_rc_query(struct dvb_usb_device *d) } if (st->data[0] != 0) - deb_info("st->data: %*ph\n", 5, st->data); + dbg_info("st->data: %*ph\n", 5, st->data); ret: mutex_unlock(&d->data_mutex); diff --git a/drivers/media/usb/dvb-usb/dtt200u.h b/drivers/media/usb/dvb-usb/dtt200u.h index 696c2c1f3af3..22dca506216d 100644 --- a/drivers/media/usb/dvb-usb/dtt200u.h +++ b/drivers/media/usb/dvb-usb/dtt200u.h @@ -14,8 +14,10 @@ #include "dvb-usb.h" extern int dvb_usb_dtt200u_debug; -#define deb_info(args...) dprintk(dvb_usb_dtt200u_debug,0x01,args) -#define deb_xfer(args...) dprintk(dvb_usb_dtt200u_debug,0x02,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_dtt200u_debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) \ + dprintk(dvb_usb_dtt200u_debug, 0x02, fmt, ##__VA_ARGS__) /* guessed protocol description (reverse engineered): * read diff --git a/drivers/media/usb/dvb-usb/dvb-usb-common.h b/drivers/media/usb/dvb-usb/dvb-usb-common.h index 70f4eedd7c48..c5a4abc01f73 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-common.h +++ b/drivers/media/usb/dvb-usb/dvb-usb-common.h @@ -15,15 +15,24 @@ extern int dvb_usb_debug; extern int dvb_usb_disable_rc_polling; -#define deb_info(args...) dprintk(dvb_usb_debug,0x001,args) -#define deb_xfer(args...) dprintk(dvb_usb_debug,0x002,args) -#define deb_pll(args...) dprintk(dvb_usb_debug,0x004,args) -#define deb_ts(args...) dprintk(dvb_usb_debug,0x008,args) -#define deb_err(args...) dprintk(dvb_usb_debug,0x010,args) -#define deb_rc(args...) dprintk(dvb_usb_debug,0x020,args) -#define deb_fw(args...) dprintk(dvb_usb_debug,0x040,args) -#define deb_mem(args...) dprintk(dvb_usb_debug,0x080,args) -#define deb_uxfer(args...) dprintk(dvb_usb_debug,0x100,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_debug, 0x001, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) \ + dprintk(dvb_usb_debug, 0x002, fmt, ##__VA_ARGS__) +#define dbg_pll(fmt, ...) \ + dprintk(dvb_usb_debug, 0x004, fmt, ##__VA_ARGS__) +#define dbg_ts(fmt, ...) \ + dprintk(dvb_usb_debug, 0x008, fmt, ##__VA_ARGS__) +#define dbg_err(fmt, ...) \ + dprintk(dvb_usb_debug, 0x010, fmt, ##__VA_ARGS__) +#define dbg_rc(fmt, ...) \ + dprintk(dvb_usb_debug, 0x020, fmt, ##__VA_ARGS__) +#define dbg_fw(fmt, ...) \ + dprintk(dvb_usb_debug, 0x040, fmt, ##__VA_ARGS__) +#define dbg_mem(fmt, ...) \ + dprintk(dvb_usb_debug, 0x080, fmt, ##__VA_ARGS__) +#define dbg_uxfer(fmt, ...) \ + dprintk(dvb_usb_debug, 0x100, fmt, ##__VA_ARGS__) /* commonly used methods */ int dvb_usb_download_firmware(struct usb_device *udev, diff --git a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c index 0a7f8ba90992..fa9f80938813 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-dvb.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-dvb.c @@ -28,7 +28,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) /* stop feed before setting a new pid if there will be no pid anymore */ if (newfeedcount == 0) { - deb_ts("stop feeding\n"); + dbg_ts("stop feeding\n"); usb_urb_kill(&adap->fe_adap[adap->active_fe].stream); if (adap->props.fe[adap->active_fe].streaming_ctrl != NULL) { @@ -43,10 +43,10 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) adap->feedcount = newfeedcount; /* activate the pid on the device specific pid_filter */ - deb_ts("setting pid (%s): %5d %04x at index %d '%s'\n", - adap->fe_adap[adap->active_fe].pid_filtering ? - "yes" : "no", dvbdmxfeed->pid, dvbdmxfeed->pid, - dvbdmxfeed->index, onoff ? "on" : "off"); + dbg_ts("setting pid (%s): %5d %04x at index %d '%s'\n", + adap->fe_adap[adap->active_fe].pid_filtering ? "yes" : "no", + dvbdmxfeed->pid, dvbdmxfeed->pid, dvbdmxfeed->index, + onoff ? "on" : "off"); if (adap->props.fe[adap->active_fe].caps & DVB_USB_ADAP_HAS_PID_FILTER && adap->fe_adap[adap->active_fe].pid_filtering && adap->props.fe[adap->active_fe].pid_filter != NULL) @@ -56,7 +56,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) * for reception. */ if (adap->feedcount == onoff && adap->feedcount > 0) { - deb_ts("controlling pid parser\n"); + dbg_ts("controlling pid parser\n"); if (adap->props.fe[adap->active_fe].caps & DVB_USB_ADAP_HAS_PID_FILTER && adap->props.fe[adap->active_fe].caps & DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF && @@ -68,7 +68,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) return ret; } } - deb_ts("start feeding\n"); + dbg_ts("start feeding\n"); if (adap->props.fe[adap->active_fe].streaming_ctrl != NULL) { ret = adap->props.fe[adap->active_fe].streaming_ctrl(adap, 1); if (ret < 0) { @@ -77,7 +77,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) } } - deb_ts("submitting all URBs\n"); + dbg_ts("submitting all URBs\n"); usb_urb_submit(&adap->fe_adap[adap->active_fe].stream); } return 0; @@ -85,14 +85,14 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) static int dvb_usb_start_feed(struct dvb_demux_feed *dvbdmxfeed) { - deb_ts("start pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, + dbg_ts("start pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type); return dvb_usb_ctrl_feed(dvbdmxfeed, 1); } static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed) { - deb_ts("stop pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type); + dbg_ts("stop pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type); return dvb_usb_ctrl_feed(dvbdmxfeed, 0); } @@ -150,14 +150,14 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums) adapter_nums); if (ret < 0) { - deb_info("dvb_register_adapter failed: error %d", ret); + dbg_info("dvb_register_adapter failed: error %d", ret); goto err; } adap->dvb_adap.priv = adap; ret = dvb_usb_media_device_init(adap); if (ret < 0) { - deb_info("dvb_usb_media_device_init failed: error %d", ret); + dbg_info("dvb_usb_media_device_init failed: error %d", ret); goto err_mc; } @@ -218,7 +218,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums) int dvb_usb_adapter_dvb_exit(struct dvb_usb_adapter *adap) { if (adap->state & DVB_USB_ADAP_STATE_DVB) { - deb_info("unregistering DVB part\n"); + dbg_info("unregistering DVB part\n"); dvb_net_release(&adap->dvb_net); adap->demux.dmx.close(&adap->demux.dmx); dvb_dmxdev_release(&adap->dmxdev); diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c index 0fb3fa6100e4..0c9748ab1853 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c @@ -52,7 +52,8 @@ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw err("could not stop the USB controller CPU."); while ((ret = dvb_usb_get_hexline(fw, hx, &pos)) > 0) { - deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n", hx->addr, hx->len, hx->chk); + dbg_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n", + hx->addr, hx->len, hx->chk); ret = usb_cypress_writemem(udev, hx->addr, hx->data, hx->len); if (ret != hx->len) { diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c index c1a7634e27b4..52374ed73b57 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-init.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c @@ -124,11 +124,11 @@ static int dvb_usb_adapter_exit(struct dvb_usb_device *d) /* general initialization functions */ static int dvb_usb_exit(struct dvb_usb_device *d) { - deb_info("state before exiting everything: %x\n", d->state); + dbg_info("state before exiting everything: %x\n", d->state); dvb_usb_remote_exit(d); dvb_usb_adapter_exit(d); dvb_usb_i2c_exit(d); - deb_info("state should be zero now: %x\n", d->state); + dbg_info("state should be zero now: %x\n", d->state); d->state = DVB_USB_STATE_INIT; if (d->priv != NULL && d->props.priv_destroy != NULL) @@ -194,7 +194,9 @@ static const struct dvb_usb_device_description *dvb_usb_find_device(struct usb_d for (i = 0; i < props->num_device_descs; i++) { for (j = 0; j < DVB_USB_ID_MAX_NUM && props->devices[i].cold_ids[j] != NULL; j++) { - deb_info("check for cold %x %x\n", props->devices[i].cold_ids[j]->idVendor, props->devices[i].cold_ids[j]->idProduct); + dbg_info("check for cold %x %x\n", + props->devices[i].cold_ids[j]->idVendor, + props->devices[i].cold_ids[j]->idProduct); if (props->devices[i].cold_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) && props->devices[i].cold_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) { *cold = 1; @@ -207,7 +209,9 @@ static const struct dvb_usb_device_description *dvb_usb_find_device(struct usb_d break; for (j = 0; j < DVB_USB_ID_MAX_NUM && props->devices[i].warm_ids[j] != NULL; j++) { - deb_info("check for warm %x %x\n", props->devices[i].warm_ids[j]->idVendor, props->devices[i].warm_ids[j]->idProduct); + dbg_info("check for warm %x %x\n", + props->devices[i].warm_ids[j]->idVendor, + props->devices[i].warm_ids[j]->idProduct); if (props->devices[i].warm_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) && props->devices[i].warm_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) { *cold = 0; @@ -231,7 +235,7 @@ int dvb_usb_device_power_ctrl(struct dvb_usb_device *d, int onoff) d->powered--; if (d->powered == 0 || (onoff && d->powered == 1)) { /* when switching from 1 to 0 or from 0 to 1 */ - deb_info("power control: %d\n", onoff); + dbg_info("power control: %d\n", onoff); if (d->props.power_ctrl) return d->props.power_ctrl(d, onoff); } @@ -256,7 +260,7 @@ int dvb_usb_device_init(struct usb_interface *intf, *du = NULL; if ((desc = dvb_usb_find_device(udev, props, &cold)) == NULL) { - deb_err("something went very wrong, device was not found in current device list - let's see what comes next.\n"); + dbg_err("something went very wrong, device was not found in current device list - let's see what comes next.\n"); return -ENODEV; } diff --git a/drivers/media/usb/dvb-usb/dvb-usb-remote.c b/drivers/media/usb/dvb-usb/dvb-usb-remote.c index 65e2c9e2cdc9..dcc6cafb69e7 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-remote.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-remote.c @@ -130,7 +130,7 @@ static void legacy_dvb_usb_read_remote_control(struct work_struct *work) case REMOTE_NO_KEY_PRESSED: break; case REMOTE_KEY_PRESSED: - deb_rc("key pressed\n"); + dbg_rc("key pressed\n"); d->last_event = event; input_event(d->input_dev, EV_KEY, event, 1); input_sync(d->input_dev); @@ -138,7 +138,7 @@ static void legacy_dvb_usb_read_remote_control(struct work_struct *work) input_sync(d->input_dev); break; case REMOTE_KEY_REPEAT: - deb_rc("key repeated\n"); + dbg_rc("key repeated\n"); input_event(d->input_dev, EV_KEY, event, 1); input_sync(d->input_dev); input_event(d->input_dev, EV_KEY, d->last_event, 0); @@ -151,9 +151,9 @@ static void legacy_dvb_usb_read_remote_control(struct work_struct *work) /* improved repeat handling ??? switch (state) { case REMOTE_NO_KEY_PRESSED: - deb_rc("NO KEY PRESSED\n"); + dbg_rc("NO KEY PRESSED\n"); if (d->last_state != REMOTE_NO_KEY_PRESSED) { - deb_rc("releasing event %d\n",d->last_event); + dbg_rc("releasing event %d\n", d->last_event); input_event(d->rc_input_dev, EV_KEY, d->last_event, 0); input_sync(d->rc_input_dev); } @@ -161,8 +161,8 @@ static void legacy_dvb_usb_read_remote_control(struct work_struct *work) d->last_event = 0; break; case REMOTE_KEY_PRESSED: - deb_rc("KEY PRESSED\n"); - deb_rc("pressing event %d\n",event); + dbg_rc("KEY PRESSED\n"); + dbg_rc("pressing event %d\n", event); input_event(d->rc_input_dev, EV_KEY, event, 1); input_sync(d->rc_input_dev); @@ -171,9 +171,9 @@ static void legacy_dvb_usb_read_remote_control(struct work_struct *work) d->last_state = REMOTE_KEY_PRESSED; break; case REMOTE_KEY_REPEAT: - deb_rc("KEY_REPEAT\n"); + dbg_rc("KEY_REPEAT\n"); if (d->last_state != REMOTE_NO_KEY_PRESSED) { - deb_rc("repeating event %d\n",d->last_event); + dbg_rc("repeating event %d\n", d->last_event); input_event(d->rc_input_dev, EV_KEY, d->last_event, 2); input_sync(d->rc_input_dev); d->last_state = REMOTE_KEY_REPEAT; @@ -208,10 +208,10 @@ static int legacy_dvb_usb_remote_init(struct dvb_usb_device *d) input_dev->setkeycode = legacy_dvb_usb_setkeycode; /* set the bits for the keys */ - deb_rc("key map size: %d\n", d->props.rc.legacy.rc_map_size); + dbg_rc("key map size: %d\n", d->props.rc.legacy.rc_map_size); for (i = 0; i < d->props.rc.legacy.rc_map_size; i++) { - deb_rc("setting bit for event %d item %d\n", - d->props.rc.legacy.rc_map_table[i].keycode, i); + dbg_rc("setting bit for event %d item %d\n", + d->props.rc.legacy.rc_map_table[i].keycode, i); set_bit(d->props.rc.legacy.rc_map_table[i].keycode, input_dev->keybit); } @@ -372,7 +372,7 @@ int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *d, case DVB_USB_RC_NEC_KEY_PRESSED: if ((u8) ~keybuf[1] != keybuf[2] || (u8) ~keybuf[3] != keybuf[4]) { - deb_err("remote control checksum failed.\n"); + dbg_err("remote control checksum failed.\n"); break; } /* See if we can match the raw key code. */ @@ -383,13 +383,14 @@ int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *d, *state = REMOTE_KEY_PRESSED; return 0; } - deb_err("key mapping failed - no appropriate key found in keymapping\n"); + dbg_err("key mapping failed - no appropriate key found in keymapping\n"); break; case DVB_USB_RC_NEC_KEY_REPEATED: *state = REMOTE_KEY_REPEAT; break; default: - deb_err("unknown type of remote status: %d\n",keybuf[0]); + dbg_err("unknown type of remote status: %d\n", + keybuf[0]); break; } return 0; diff --git a/drivers/media/usb/dvb-usb/dvb-usb-urb.c b/drivers/media/usb/dvb-usb/dvb-usb-urb.c index 2aabf90d8697..a7b405906627 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-urb.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-urb.c @@ -25,8 +25,7 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf, if ((ret = mutex_lock_interruptible(&d->usb_mutex))) return ret; - deb_xfer(">>> "); - debug_dump(wbuf,wlen,deb_xfer); + dbg_xfer(">>> %*ph\n", (int)wlen, wbuf); ret = usb_bulk_msg(d->udev,usb_sndbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint), wbuf,wlen,&actlen, @@ -51,8 +50,7 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf, if (ret) err("recv bulk message failed: %d",ret); else { - deb_xfer("<<< "); - debug_dump(rbuf,actlen,deb_xfer); + dbg_xfer("<<< %*ph\n", actlen, rbuf); } } diff --git a/drivers/media/usb/dvb-usb/dvb-usb.h b/drivers/media/usb/dvb-usb/dvb-usb.h index 741be0e69447..51b6a2e339a1 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb.h +++ b/drivers/media/usb/dvb-usb/dvb-usb.h @@ -28,19 +28,17 @@ /* debug */ #ifdef CONFIG_DVB_USB_DEBUG -#define dprintk(var,level,args...) \ - do { if ((var & level)) { printk(args); } } while (0) -#define debug_dump(b,l,func) {\ - int loop_; \ - for (loop_ = 0; loop_ < l; loop_++) func("%02x ", b[loop_]); \ - func("\n");\ -} +#define dprintk(var, level, fmt, ...) \ +do { \ + if (var & (level)) \ + printk(KERN_DEBUG fmt, ##__VA_ARGS__); \ +} while (0) #define DVB_USB_DEBUG_STATUS + #else -#define dprintk(args...) -#define debug_dump(b,l,func) +#define dprintk(fmt, ...) no_printk(KERN_DEBUG fmt, ##__VA_ARGS__) #define DVB_USB_DEBUG_STATUS " (debugging is not enabled)" #endif diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c index f96626fe2c0b..a31e401f17fd 100644 --- a/drivers/media/usb/dvb-usb/dw2102.c +++ b/drivers/media/usb/dvb-usb/dw2102.c @@ -542,9 +542,10 @@ static int dw3101_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], } for (i = 0; i < num; i++) { - deb_xfer("%02x:%02x: %s ", i, msg[i].addr, - msg[i].flags == 0 ? ">>>" : "<<<"); - debug_dump(msg[i].buf, msg[i].len, deb_xfer); + dbg_xfer("%02x:%02x: %s %*ph\n", + i, msg[i].addr, + msg[i].flags == 0 ? ">>>" : "<<<", + (int)msg[i].len, msg[i].buf); } ret = num; @@ -835,10 +836,8 @@ static int dw210x_read_mac_address(struct dvb_usb_device *d, u8 mac[6]) eepromline[i%16] = ibuf[0]; eeprom[i] = ibuf[0]; } - if ((i % 16) == 15) { - deb_xfer("%02x: ", i - 15); - debug_dump(eepromline, 16, deb_xfer); - } + if ((i % 16) == 15) + dbg_xfer("%02x: %*ph\n", i - 15, 16, eepromline); } memcpy(mac, eeprom + 8, 6); @@ -875,10 +874,8 @@ static int s6x0_read_mac_address(struct dvb_usb_device *d, u8 mac[6]) eeprom[i] = ibuf[0]; } - if ((i % 16) == 15) { - deb_xfer("%02x: ", i - 15); - debug_dump(eepromline, 16, deb_xfer); - } + if ((i % 16) == 15) + dbg_xfer("%02x: %*ph", i - 15, 16, eepromline); } memcpy(mac, eeprom + 16, 6); @@ -1705,8 +1702,8 @@ static int dw2102_rc_query(struct dvb_usb_device *d) if (d->props.i2c_algo->master_xfer(&d->i2c_adap, &msg, 1) == 1) { if (msg.buf[0] != 0xff) { - deb_rc("%s: rc code: %x, %x\n", - __func__, key[0], key[1]); + dbg_rc("%s: rc code: %x, %x\n", + __func__, key[0], key[1]); rc_keydown(d->rc_dev, RC_PROTO_UNKNOWN, key[0], 0); } } @@ -1726,8 +1723,8 @@ static int prof_rc_query(struct dvb_usb_device *d) if (d->props.i2c_algo->master_xfer(&d->i2c_adap, &msg, 1) == 1) { if (msg.buf[0] != 0xff) { - deb_rc("%s: rc code: %x, %x\n", - __func__, key[0], key[1]); + dbg_rc("%s: rc code: %x, %x\n", + __func__, key[0], key[1]); rc_keydown(d->rc_dev, RC_PROTO_UNKNOWN, key[0] ^ 0xff, 0); } @@ -1748,8 +1745,8 @@ static int su3000_rc_query(struct dvb_usb_device *d) if (d->props.i2c_algo->master_xfer(&d->i2c_adap, &msg, 1) == 1) { if (msg.buf[0] != 0xff) { - deb_rc("%s: rc code: %x, %x\n", - __func__, key[0], key[1]); + dbg_rc("%s: rc code: %x, %x\n", + __func__, key[0], key[1]); rc_keydown(d->rc_dev, RC_PROTO_RC5, RC_SCANCODE_RC5(key[1], key[0]), 0); } diff --git a/drivers/media/usb/dvb-usb/dw2102.h b/drivers/media/usb/dvb-usb/dw2102.h index f64cf79b7934..ff728355a785 100644 --- a/drivers/media/usb/dvb-usb/dw2102.h +++ b/drivers/media/usb/dvb-usb/dw2102.h @@ -5,6 +5,6 @@ #define DVB_USB_LOG_PREFIX "dw2102" #include "dvb-usb.h" -#define deb_xfer(args...) dprintk(dvb_usb_dw2102_debug, 0x02, args) -#define deb_rc(args...) dprintk(dvb_usb_dw2102_debug, 0x04, args) +#define dbg_xfer(args...) dprintk(dvb_usb_dw2102_debug, 0x02, args) +#define dbg_rc(args...) dprintk(dvb_usb_dw2102_debug, 0x04, args) #endif diff --git a/drivers/media/usb/dvb-usb/gp8psk.c b/drivers/media/usb/dvb-usb/gp8psk.c index c07f46f5176e..946d63beff13 100644 --- a/drivers/media/usb/dvb-usb/gp8psk.c +++ b/drivers/media/usb/dvb-usb/gp8psk.c @@ -45,7 +45,7 @@ static int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, USB_TYPE_VENDOR | USB_DIR_IN, value, index, st->data, blen, 2000); - deb_info("reading number %d (ret: %d)\n",try,ret); + dbg_info("reading number %d (ret: %d)\n", try, ret); try++; } @@ -57,8 +57,8 @@ static int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, memcpy(b, st->data, blen); } - deb_xfer("in: req. %x, val: %x, ind: %x, buffer: ",req,value,index); - debug_dump(b,blen,deb_xfer); + dbg_xfer("in: req. %x, val: %x, ind: %x, buffer: %*ph\n", + req, value, index, blen, b); mutex_unlock(&d->usb_mutex); @@ -71,8 +71,8 @@ static int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value, struct gp8psk_state *st = d->priv; int ret; - deb_xfer("out: req. %x, val: %x, ind: %x, buffer: ",req,value,index); - debug_dump(b,blen,deb_xfer); + dbg_xfer("out: req. %x, val: %x, ind: %x, buffer: %*ph\n", + req, value, index, blen, b); if (blen > sizeof(st->data)) return -EIO; @@ -230,7 +230,7 @@ static int gp8psk_bcm4500_reload(struct dvb_usb_device *d) u8 buf; int gp_product_id = le16_to_cpu(d->udev->descriptor.idProduct); - deb_xfer("reloading firmware\n"); + dbg_xfer("reloading firmware\n"); /* Turn off 8psk power */ if (gp8psk_usb_in_op(d, BOOT_8PSK, 0, 0, &buf, 1)) diff --git a/drivers/media/usb/dvb-usb/gp8psk.h b/drivers/media/usb/dvb-usb/gp8psk.h index 5293dfdd2609..c44895ce3b3a 100644 --- a/drivers/media/usb/dvb-usb/gp8psk.h +++ b/drivers/media/usb/dvb-usb/gp8psk.h @@ -18,9 +18,12 @@ #include "dvb-usb.h" extern int dvb_usb_gp8psk_debug; -#define deb_info(args...) dprintk(dvb_usb_gp8psk_debug,0x01,args) -#define deb_xfer(args...) dprintk(dvb_usb_gp8psk_debug,0x02,args) -#define deb_rc(args...) dprintk(dvb_usb_gp8psk_debug,0x04,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_gp8psk_debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) \ + dprintk(dvb_usb_gp8psk_debug, 0x02, fmt, ##__VA_ARGS__) +#define dbg_rc(fmt, ...) \ + dprintk(dvb_usb_gp8psk_debug, 0x04, fmt, ##__VA_ARGS__) #define GET_USB_SPEED 0x07 diff --git a/drivers/media/usb/dvb-usb/nova-t-usb2.c b/drivers/media/usb/dvb-usb/nova-t-usb2.c index e7b290552b66..71df4c357ef2 100644 --- a/drivers/media/usb/dvb-usb/nova-t-usb2.c +++ b/drivers/media/usb/dvb-usb/nova-t-usb2.c @@ -14,8 +14,8 @@ MODULE_PARM_DESC(debug, "set debugging level (1=rc,2=eeprom (|-able))." DVB_USB_ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); -#define deb_rc(args...) dprintk(debug,0x01,args) -#define deb_ee(args...) dprintk(debug,0x02,args) +#define dbg_rc(fmt, ...) dprintk(debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_ee(fmt, ...) dprintk(debug, 0x02, fmt, ##__VA_ARGS__) /* Hauppauge NOVA-T USB2 keys */ static struct rc_map_table rc_map_haupp_table[] = { @@ -94,15 +94,16 @@ static int nova_t_rc_query(struct dvb_usb_device *d, u32 *event, int *state) data = raw & 0x3f; custom = (raw >> 6) & 0x1f; - deb_rc("raw key code 0x%02x, 0x%02x, 0x%02x to c: %02x d: %02x toggle: %d\n", + dbg_rc("raw key code 0x%02x, 0x%02x, 0x%02x to c: %02x d: %02x toggle: %d\n", buf[1], buf[2], buf[3], custom, data, toggle); for (i = 0; i < ARRAY_SIZE(rc_map_haupp_table); i++) { if (rc5_data(&rc_map_haupp_table[i]) == data && rc5_custom(&rc_map_haupp_table[i]) == custom) { - deb_rc("c: %x, d: %x\n", rc5_data(&rc_map_haupp_table[i]), - rc5_custom(&rc_map_haupp_table[i])); + dbg_rc("c: %x, d: %x\n", + rc5_data(&rc_map_haupp_table[i]), + rc5_custom(&rc_map_haupp_table[i])); *event = rc_map_haupp_table[i].keycode; *state = REMOTE_KEY_PRESSED; diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c index f172120db2aa..4402823fa717 100644 --- a/drivers/media/usb/dvb-usb/technisat-usb2.c +++ b/drivers/media/usb/dvb-usb/technisat-usb2.c @@ -60,10 +60,10 @@ struct technisat_usb2_state { }; /* debug print helpers */ -#define deb_info(args...) dprintk(debug, 0x01, args) -#define deb_eeprom(args...) dprintk(debug, 0x02, args) -#define deb_i2c(args...) dprintk(debug, 0x04, args) -#define deb_rc(args...) dprintk(debug, 0x08, args) +#define dbg_info(args...) dprintk(debug, 0x01, args) +#define dbg_eeprom(args...) dprintk(debug, 0x02, args) +#define dbg_i2c(args...) dprintk(debug, 0x04, args) +#define dbg_rc(args...) dprintk(debug, 0x08, args) /* vendor requests */ #define SET_IFCLK_TO_EXTERNAL_TSCLK_VENDOR_REQUEST 0xB3 @@ -91,9 +91,7 @@ static int technisat_usb2_i2c_access(struct usb_device *udev, if (!b) return -ENOMEM; - deb_i2c("i2c-access: %02x, tx: ", device_addr); - debug_dump(tx, txlen, deb_i2c); - deb_i2c(" "); + dbg_i2c("i2c-access: %02x, tx: %*ph\n", device_addr, (int)txlen, tx); if (txlen > 62) { err("i2c TX buffer can't exceed 62 bytes (dev 0x%02x)", @@ -142,17 +140,15 @@ static int technisat_usb2_i2c_access(struct usb_device *udev, goto err; } - deb_i2c("status: %d, ", b[0]); - if (rx != NULL) { memcpy(rx, &b[2], rxlen); - deb_i2c("rx (%d): ", rxlen); - debug_dump(rx, rxlen, deb_i2c); + dbg_i2c("status: %d, rx (%d): %*ph\n", + b[0], rxlen, (int)rxlen, rx); + } else { + dbg_i2c("status: %d\n", b[0]); } - deb_i2c("\n"); - err: kfree(b); return ret; @@ -397,10 +393,10 @@ static void technisat_usb2_eeprom_dump(struct dvb_usb_device *d) if (technisat_usb2_i2c_access(d->udev, 0x50 + j / 256, ®, 1, b, 16) != 0) break; - deb_eeprom("EEPROM: %01x%02x: ", j / 256, reg); + dbg_eeprom("EEPROM: %01x%02x: ", j / 256, reg); for (i = 0; i < 16; i++) - deb_eeprom("%02x ", b[i]); - deb_eeprom("\n"); + dbg_eeprom("%02x ", b[i]); + dbg_eeprom("\n"); } } #endif @@ -648,8 +644,7 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d) /* decoding */ #if 0 - deb_rc("RC: %d ", ret); - debug_dump(buf + 1, ret, deb_rc); + dbg_rc("RC: %d %*ph", ret, ret, buf + 1); #endif ev.pulse = 0; diff --git a/drivers/media/usb/dvb-usb/ttusb2.c b/drivers/media/usb/dvb-usb/ttusb2.c index 294274fd8f55..e5a6df348f9d 100644 --- a/drivers/media/usb/dvb-usb/ttusb2.c +++ b/drivers/media/usb/dvb-usb/ttusb2.c @@ -35,7 +35,8 @@ /* debug */ static int dvb_usb_ttusb2_debug; -#define deb_info(args...) dprintk(dvb_usb_ttusb2_debug,0x01,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_ttusb2_debug, 0x01, fmt, ##__VA_ARGS__) module_param_named(debug,dvb_usb_ttusb2_debug, int, 0644); MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able))." DVB_USB_DEBUG_STATUS); static int dvb_usb_ttusb2_debug_ci; @@ -44,11 +45,11 @@ MODULE_PARM_DESC(debug_ci, "set debugging ci." DVB_USB_DEBUG_STATUS); DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); -#define ci_dbg(format, arg...) \ -do { \ +#define ci_dbg(fmt, ...) \ +do { \ if (dvb_usb_ttusb2_debug_ci) \ - printk(KERN_DEBUG DVB_USB_LOG_PREFIX \ - ": %s " format "\n" , __func__, ## arg); \ + printk(KERN_DEBUG DVB_USB_LOG_PREFIX ": %s " fmt "\n", \ + __func__, ##__VA_ARGS__); \ } while (0) enum { @@ -455,7 +456,7 @@ static int tt3650_rc_query(struct dvb_usb_device *d) if (rx[8] & 0x01) { /* got a "press" event */ st->last_rc_key = RC_SCANCODE_RC5(rx[3], rx[2]); - deb_info("%s: cmd=0x%02x sys=0x%02x\n", __func__, rx[2], rx[3]); + dbg_info("%s: cmd=0x%02x sys=0x%02x\n", __func__, rx[2], rx[3]); rc_keydown(d->rc_dev, RC_PROTO_RC5, st->last_rc_key, rx[1]); } else if (st->last_rc_key) { rc_keyup(d->rc_dev); @@ -526,7 +527,7 @@ static int ttusb2_frontend_tda10086_attach(struct dvb_usb_adapter *adap) err("set interface to alts=3 failed"); if ((adap->fe_adap[0].fe = dvb_attach(tda10086_attach, &tda10086_config, &adap->dev->i2c_adap)) == NULL) { - deb_info("TDA10086 attach failed\n"); + dbg_info("TDA10086 attach failed\n"); return -ENODEV; } @@ -551,7 +552,7 @@ static int ttusb2_frontend_tda10023_attach(struct dvb_usb_adapter *adap) &tda10023_config, &adap->dev->i2c_adap, 0x48); if (adap->fe_adap[0].fe == NULL) { - deb_info("TDA10023 attach failed\n"); + dbg_info("TDA10023 attach failed\n"); return -ENODEV; } tt3650_ci_init(adap); @@ -560,7 +561,7 @@ static int ttusb2_frontend_tda10023_attach(struct dvb_usb_adapter *adap) &tda10048_config, &adap->dev->i2c_adap); if (adap->fe_adap[1].fe == NULL) { - deb_info("TDA10048 attach failed\n"); + dbg_info("TDA10048 attach failed\n"); return -ENODEV; } @@ -593,12 +594,12 @@ static int ttusb2_tuner_tda827x_attach(struct dvb_usb_adapter *adap) static int ttusb2_tuner_tda826x_attach(struct dvb_usb_adapter *adap) { if (dvb_attach(tda826x_attach, adap->fe_adap[0].fe, 0x60, &adap->dev->i2c_adap, 0) == NULL) { - deb_info("TDA8263 attach failed\n"); + dbg_info("TDA8263 attach failed\n"); return -ENODEV; } if (dvb_attach(lnbp21_attach, adap->fe_adap[0].fe, &adap->dev->i2c_adap, 0, 0) == NULL) { - deb_info("LNBP21 attach failed\n"); + dbg_info("LNBP21 attach failed\n"); return -ENODEV; } return 0; diff --git a/drivers/media/usb/dvb-usb/usb-urb.c b/drivers/media/usb/dvb-usb/usb-urb.c index 9771f0954c69..26da9ef1d1ca 100644 --- a/drivers/media/usb/dvb-usb/usb-urb.c +++ b/drivers/media/usb/dvb-usb/usb-urb.c @@ -19,10 +19,10 @@ static void usb_urb_complete(struct urb *urb) int i; u8 *b; - deb_uxfer("'%s' urb completed. status: %d, length: %d/%d, pack_num: %d, errors: %d\n", - ptype == PIPE_ISOCHRONOUS ? "isoc" : "bulk", - urb->status,urb->actual_length,urb->transfer_buffer_length, - urb->number_of_packets,urb->error_count); + dbg_uxfer("'%s' urb completed. status: %d, length: %d/%d, pack_num: %d, errors: %d\n", + ptype == PIPE_ISOCHRONOUS ? "isoc" : "bulk", + urb->status, urb->actual_length, urb->transfer_buffer_length, + urb->number_of_packets, urb->error_count); switch (urb->status) { case 0: /* success */ @@ -33,7 +33,7 @@ static void usb_urb_complete(struct urb *urb) case -ESHUTDOWN: return; default: /* error */ - deb_ts("urb completion error %d.\n", urb->status); + dbg_ts("urb completion error %d\n", urb->status); break; } @@ -43,14 +43,15 @@ static void usb_urb_complete(struct urb *urb) for (i = 0; i < urb->number_of_packets; i++) { if (urb->iso_frame_desc[i].status != 0) - deb_ts("iso frame descriptor has an error: %d\n",urb->iso_frame_desc[i].status); + dbg_ts("iso frame descriptor has an error: %d\n", + urb->iso_frame_desc[i].status); else if (urb->iso_frame_desc[i].actual_length > 0) stream->complete(stream, b + urb->iso_frame_desc[i].offset, urb->iso_frame_desc[i].actual_length); urb->iso_frame_desc[i].status = 0; urb->iso_frame_desc[i].actual_length = 0; } - debug_dump(b,20,deb_uxfer); + dbg_uxfer("%*ph\n", 20, b); break; case PIPE_BULK: if (urb->actual_length > 0) @@ -67,7 +68,7 @@ int usb_urb_kill(struct usb_data_stream *stream) { int i; for (i = 0; i < stream->urbs_submitted; i++) { - deb_ts("killing URB no. %d.\n",i); + dbg_ts("killing URB no. %d\n", i); /* stop the URB */ usb_kill_urb(stream->urb_list[i]); @@ -80,7 +81,7 @@ int usb_urb_submit(struct usb_data_stream *stream) { int i,ret; for (i = 0; i < stream->urbs_initialized; i++) { - deb_ts("submitting URB no. %d\n",i); + dbg_ts("submitting URB no. %d\n", i); if ((ret = usb_submit_urb(stream->urb_list[i],GFP_ATOMIC))) { err("could not submit URB no. %d - get them all back",i); usb_urb_kill(stream); @@ -96,7 +97,7 @@ static int usb_free_stream_buffers(struct usb_data_stream *stream) if (stream->state & USB_STATE_URB_BUF) { while (stream->buf_num) { stream->buf_num--; - deb_mem("freeing buffer %d\n",stream->buf_num); + dbg_mem("freeing buffer %d\n", stream->buf_num); usb_free_coherent(stream->udev, stream->buf_size, stream->buf_list[stream->buf_num], stream->dma_addr[stream->buf_num]); @@ -113,24 +114,25 @@ static int usb_allocate_stream_buffers(struct usb_data_stream *stream, int num, stream->buf_num = 0; stream->buf_size = size; - deb_mem("all in all I will use %lu bytes for streaming\n",num*size); + dbg_mem("all in all I will use %lu bytes for streaming\n", num * size); for (stream->buf_num = 0; stream->buf_num < num; stream->buf_num++) { - deb_mem("allocating buffer %d\n",stream->buf_num); + dbg_mem("allocating buffer %d\n", stream->buf_num); if (( stream->buf_list[stream->buf_num] = usb_alloc_coherent(stream->udev, size, GFP_KERNEL, &stream->dma_addr[stream->buf_num]) ) == NULL) { - deb_mem("not enough memory for urb-buffer allocation.\n"); + dbg_mem("not enough memory for urb-buffer allocation.\n"); usb_free_stream_buffers(stream); return -ENOMEM; } - deb_mem("buffer %d: %p (dma: %Lu)\n", + dbg_mem("buffer %d: %p (dma: %llu)\n", stream->buf_num, -stream->buf_list[stream->buf_num], (long long)stream->dma_addr[stream->buf_num]); + stream->buf_list[stream->buf_num], + (long long)stream->dma_addr[stream->buf_num]); memset(stream->buf_list[stream->buf_num],0,size); stream->state |= USB_STATE_URB_BUF; } - deb_mem("allocation successful\n"); + dbg_mem("allocation successful\n"); return 0; } @@ -147,7 +149,7 @@ static int usb_bulk_urb_init(struct usb_data_stream *stream) for (i = 0; i < stream->props.count; i++) { stream->urb_list[i] = usb_alloc_urb(0, GFP_KERNEL); if (!stream->urb_list[i]) { - deb_mem("not enough memory for urb_alloc_urb!.\n"); + dbg_mem("not enough memory for urb_alloc_urb!.\n"); for (j = 0; j < i; j++) usb_free_urb(stream->urb_list[j]); return -ENOMEM; @@ -180,7 +182,7 @@ static int usb_isoc_urb_init(struct usb_data_stream *stream) stream->urb_list[i] = usb_alloc_urb(stream->props.u.isoc.framesperurb, GFP_KERNEL); if (!stream->urb_list[i]) { - deb_mem("not enough memory for urb_alloc_urb!\n"); + dbg_mem("not enough memory for urb_alloc_urb!\n"); for (j = 0; j < i; j++) usb_free_urb(stream->urb_list[j]); return -ENOMEM; @@ -243,7 +245,7 @@ int usb_urb_exit(struct usb_data_stream *stream) for (i = 0; i < stream->urbs_initialized; i++) { if (stream->urb_list[i] != NULL) { - deb_mem("freeing URB no. %d.\n",i); + dbg_mem("freeing URB no. %d\n", i); /* free the URBs */ usb_free_urb(stream->urb_list[i]); } diff --git a/drivers/media/usb/dvb-usb/vp702x-fe.c b/drivers/media/usb/dvb-usb/vp702x-fe.c index c1e7931900ee..d2cf0858ed94 100644 --- a/drivers/media/usb/dvb-usb/vp702x-fe.c +++ b/drivers/media/usb/dvb-usb/vp702x-fe.c @@ -73,7 +73,7 @@ static int vp702x_fe_read_status(struct dvb_frontend *fe, { struct vp702x_fe_state *st = fe->demodulator_priv; vp702x_fe_refresh_state(st); - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); if (st->lock == 0) *status = FE_HAS_LOCK | FE_HAS_SYNC | FE_HAS_VITERBI | FE_HAS_SIGNAL | FE_HAS_CARRIER; @@ -127,7 +127,7 @@ static int vp702x_fe_read_snr(struct dvb_frontend* fe, u16 *snr) static int vp702x_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune) { - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); tune->min_delay_ms = 2000; return 0; } @@ -158,9 +158,9 @@ static int vp702x_fe_set_frontend(struct dvb_frontend *fe) cmd[4] = (sr >> 4) & 0xff; cmd[5] = (sr << 4) & 0xf0; - deb_fe("setting frontend to: %u -> %u (%x) LNB-based GHz, symbolrate: %d -> %lu (%lx)\n", - fep->frequency, freq, freq, fep->symbol_rate, - (unsigned long) sr, (unsigned long) sr); + dbg_fe("setting frontend to: %u -> %u (%x) LNB-based GHz, symbolrate: %d -> %lu (%lx)\n", + fep->frequency, freq, freq, fep->symbol_rate, + (unsigned long)sr, (unsigned long)sr); /* if (fep->inversion == INVERSION_ON) cmd[6] |= 0x80; */ @@ -185,9 +185,9 @@ static int vp702x_fe_set_frontend(struct dvb_frontend *fe) vp702x_usb_inout_op(st->d, cmd, 8, cmd, 10, 100); if (cmd[2] == 0 && cmd[3] == 0) - deb_fe("tuning failed.\n"); + dbg_fe("tuning failed.\n"); else - deb_fe("tuning succeeded.\n"); + dbg_fe("tuning succeeded.\n"); mutex_unlock(&dst->buf_mutex); @@ -197,14 +197,14 @@ static int vp702x_fe_set_frontend(struct dvb_frontend *fe) static int vp702x_fe_init(struct dvb_frontend *fe) { struct vp702x_fe_state *st = fe->demodulator_priv; - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); vp702x_usb_in_op(st->d, RESET_TUNER, 0, 0, NULL, 0); return 0; } static int vp702x_fe_sleep(struct dvb_frontend *fe) { - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); return 0; } @@ -215,7 +215,7 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe, struct vp702x_fe_state *st = fe->demodulator_priv; struct vp702x_device_state *dst = st->d->priv; - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); if (m->msg_len > 4) return -EINVAL; @@ -231,9 +231,9 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe, vp702x_usb_inout_op(st->d, cmd, 8, cmd, 10, 100); if (cmd[2] == 0 && cmd[3] == 0) - deb_fe("diseqc cmd failed.\n"); + dbg_fe("diseqc cmd failed.\n"); else - deb_fe("diseqc cmd succeeded.\n"); + dbg_fe("diseqc cmd succeeded.\n"); mutex_unlock(&dst->buf_mutex); @@ -243,7 +243,7 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe, static int vp702x_fe_send_diseqc_burst(struct dvb_frontend *fe, enum fe_sec_mini_cmd burst) { - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); return 0; } @@ -254,7 +254,7 @@ static int vp702x_fe_set_tone(struct dvb_frontend *fe, struct vp702x_device_state *dst = st->d->priv; u8 *buf; - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); st->tone_mode = tone; @@ -272,9 +272,9 @@ static int vp702x_fe_set_tone(struct dvb_frontend *fe, vp702x_usb_inout_op(st->d, buf, 8, buf, 10, 100); if (buf[2] == 0 && buf[3] == 0) - deb_fe("set_tone cmd failed.\n"); + dbg_fe("set_tone cmd failed.\n"); else - deb_fe("set_tone cmd succeeded.\n"); + dbg_fe("set_tone cmd succeeded.\n"); mutex_unlock(&dst->buf_mutex); @@ -287,7 +287,7 @@ static int vp702x_fe_set_voltage(struct dvb_frontend *fe, struct vp702x_fe_state *st = fe->demodulator_priv; struct vp702x_device_state *dst = st->d->priv; u8 *buf; - deb_fe("%s\n",__func__); + dbg_fe("%s\n", __func__); st->voltage = voltage; @@ -305,9 +305,9 @@ static int vp702x_fe_set_voltage(struct dvb_frontend *fe, vp702x_usb_inout_op(st->d, buf, 8, buf, 10, 100); if (buf[2] == 0 && buf[3] == 0) - deb_fe("set_voltage cmd failed.\n"); + dbg_fe("set_voltage cmd failed.\n"); else - deb_fe("set_voltage cmd succeeded.\n"); + dbg_fe("set_voltage cmd succeeded.\n"); mutex_unlock(&dst->buf_mutex); return 0; diff --git a/drivers/media/usb/dvb-usb/vp702x.c b/drivers/media/usb/dvb-usb/vp702x.c index bf54747e2e01..6e5c3bf1786f 100644 --- a/drivers/media/usb/dvb-usb/vp702x.c +++ b/drivers/media/usb/dvb-usb/vp702x.c @@ -46,8 +46,8 @@ static int vp702x_usb_in_op_unlocked(struct dvb_usb_device *d, u8 req, ret = 0; - deb_xfer("in: req. %02x, val: %04x, ind: %04x, buffer: ",req,value,index); - debug_dump(b,blen,deb_xfer); + dbg_xfer("in: req. %02x, val: %04x, ind: %04x, buffer: %*ph\n", + req, value, index, blen, b); return ret; } @@ -68,8 +68,8 @@ static int vp702x_usb_out_op_unlocked(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen) { int ret; - deb_xfer("out: req. %02x, val: %04x, ind: %04x, buffer: ",req,value,index); - debug_dump(b,blen,deb_xfer); + dbg_xfer("out: req. %02x, val: %04x, ind: %04x, buffer: %*ph\n", + req, value, index, blen, b); if ((ret = usb_control_msg(d->udev, usb_sndctrlpipe(d->udev,0), @@ -267,7 +267,7 @@ static int vp702x_rc_query(struct dvb_usb_device *d, u32 *event, int *state) vp702x_usb_in_op(d,READ_REMOTE_REQ,0,0,key,10); - deb_rc("remote query key: %x %d\n",key[1],key[1]); + dbg_rc("remote query key: %x %d\n", key[1], key[1]); if (key[1] == 0x44) { *state = REMOTE_NO_KEY_PRESSED; diff --git a/drivers/media/usb/dvb-usb/vp702x.h b/drivers/media/usb/dvb-usb/vp702x.h index 18ad7ced2045..04117d5d1a97 100644 --- a/drivers/media/usb/dvb-usb/vp702x.h +++ b/drivers/media/usb/dvb-usb/vp702x.h @@ -6,10 +6,14 @@ #include "dvb-usb.h" extern int dvb_usb_vp702x_debug; -#define deb_info(args...) dprintk(dvb_usb_vp702x_debug,0x01,args) -#define deb_xfer(args...) dprintk(dvb_usb_vp702x_debug,0x02,args) -#define deb_rc(args...) dprintk(dvb_usb_vp702x_debug,0x04,args) -#define deb_fe(args...) dprintk(dvb_usb_vp702x_debug,0x08,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_vp702x_debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) \ + dprintk(dvb_usb_vp702x_debug, 0x02, fmt, ##__VA_ARGS__) +#define dbg_rc(fmt, ...) \ + dprintk(dvb_usb_vp702x_debug, 0x04, fmt, ##__VA_ARGS__) +#define dbg_fe(fmt, ...) \ + dprintk(dvb_usb_vp702x_debug, 0x08, fmt, ##__VA_ARGS__) /* commands are read and written with USB control messages */ diff --git a/drivers/media/usb/dvb-usb/vp7045.c b/drivers/media/usb/dvb-usb/vp7045.c index 23e3a90af1f4..e06b9d627285 100644 --- a/drivers/media/usb/dvb-usb/vp7045.c +++ b/drivers/media/usb/dvb-usb/vp7045.c @@ -18,9 +18,12 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,rc=4 (or-able))." DV DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); -#define deb_info(args...) dprintk(dvb_usb_vp7045_debug,0x01,args) -#define deb_xfer(args...) dprintk(dvb_usb_vp7045_debug,0x02,args) -#define deb_rc(args...) dprintk(dvb_usb_vp7045_debug,0x04,args) +#define dbg_info(fmt, ...) \ + dprintk(dvb_usb_vp7045_debug, 0x01, fmt, ##__VA_ARGS__) +#define dbg_xfer(fmt, ...) \ + dprintk(dvb_usb_vp7045_debug, 0x02, fmt, ##__VA_ARGS__) +#define dbg_rc(fmt, ...) \ + dprintk(dvb_usb_vp7045_debug, 0x04, fmt, ##__VA_ARGS__) int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in, int inlen, int msec) { @@ -42,9 +45,7 @@ int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in, if (out != NULL && outlen > 0) memcpy(&buf[1], out, outlen); - deb_xfer("out buffer: "); - debug_dump(buf, outlen+1, deb_xfer); - + dbg_xfer("out buffer: %*ph\n", outlen + 1, buf); if (usb_control_msg(d->udev, usb_sndctrlpipe(d->udev,0), @@ -66,8 +67,7 @@ int vp7045_usb_op(struct dvb_usb_device *d, u8 cmd, u8 *out, int outlen, u8 *in, goto unlock; } - deb_xfer("in buffer: "); - debug_dump(buf, 12, deb_xfer); + dbg_xfer("in buffer: %*ph\n", 12, buf); if (in != NULL && inlen > 0) memcpy(in, &buf[1], inlen); @@ -103,7 +103,7 @@ static int vp7045_rc_query(struct dvb_usb_device *d) if (ret) return ret; - deb_rc("remote query key: %x\n", key); + dbg_rc("remote query key: %x\n", key); if (key != 0x44) { /* @@ -129,8 +129,9 @@ static int vp7045_read_eeprom(struct dvb_usb_device *d,u8 *buf, int len, int off buf[i] = br[1]; } - deb_info("VP7045 EEPROM read (offs: %d, len: %d) : ", offset, i); - debug_dump(buf, i, deb_info); + dbg_info("VP7045 EEPROM read (offs: %d, len: %d) : %*ph\n", + offset, i, i, buf); + return 0; } @@ -145,15 +146,15 @@ static int vp7045_frontend_attach(struct dvb_usb_adapter *adap) vp7045_usb_op(adap->dev,VENDOR_STRING_READ,NULL,0,buf,20,0); buf[10] = '\0'; - deb_info("firmware says: %s ",buf); + dbg_info("firmware says: %s\n", buf); vp7045_usb_op(adap->dev,PRODUCT_STRING_READ,NULL,0,buf,20,0); buf[10] = '\0'; - deb_info("%s ",buf); + dbg_info("%s\n", buf); vp7045_usb_op(adap->dev,FW_VERSION_READ,NULL,0,buf,20,0); buf[10] = '\0'; - deb_info("v%s\n",buf); + dbg_info("v%s\n", buf); /* Dump the EEPROM */ /* vp7045_read_eeprom(d,buf, 255, FX2_ID_ADDR); */ _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 36/44] staging: regulator: hi6421v600-regulator: initialize ramp_delay 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Without that, the regulator's core complains with: ldo17: ramp_delay not set For now, use the enable time, as we don't have any datasheets from this device. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421v600-regulator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 5ddaf7f8cacc..21467fce9980 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -267,6 +267,9 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, return ret; } + /* FIXME: are there a better value for this? */ + rdesc->ramp_delay = rdesc->enable_time; + /* parse .eco_uA */ ret = of_property_read_u32(np, "eco-microamp", &sreg->eco_uA); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 36/44] staging: regulator: hi6421v600-regulator: initialize ramp_delay @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Without that, the regulator's core complains with: ldo17: ramp_delay not set For now, use the enable time, as we don't have any datasheets from this device. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/hi6421v600-regulator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 5ddaf7f8cacc..21467fce9980 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -267,6 +267,9 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, return ret; } + /* FIXME: are there a better value for this? */ + rdesc->ramp_delay = rdesc->enable_time; + /* parse .eco_uA */ ret = of_property_read_u32(np, "eco-microamp", &sreg->eco_uA); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 37/44] staging: regulator: hi6421v600-regulator: cleanup DT settings 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Currently, an array is used to store both vsel and enable settings, mixing registers, masks and bit settings. Change it in order to have one separate property for each. This makes easier to understand the contents of the DT file, and to describe it at the Documentation/. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 69 +++++++++++-------- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 21467fce9980..72f51594b5ff 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -45,8 +45,7 @@ struct hi6421v600_regulator { struct regulator_desc rdesc; struct hi6421_spmi_pmic *pmic; - u8 eco_mode_mask; - u32 eco_uA; + u32 eco_mode_mask, eco_uA; }; static DEFINE_MUTEX(enable_mutex); @@ -226,36 +225,49 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; - unsigned int register_info[3] = {0}; unsigned int *v_table; int ret; - /* parse .register_info.enable_reg */ - ret = of_property_read_u32_array(np, "hi6421-ctrl", - register_info, 3); + ret = of_property_read_u32(np, "reg", &rdesc->enable_reg); if (ret) { - dev_err(dev, "no hi6421-ctrl property set\n"); + dev_err(dev, "missing reg property\nn"); return ret; } - rdesc->enable_reg = register_info[0]; - rdesc->enable_mask = register_info[1]; - sreg->eco_mode_mask = register_info[2]; - /* parse .register_info.vsel_reg */ - ret = of_property_read_u32_array(np, "hi6421-vsel", - register_info, 2); + ret = of_property_read_u32(np, "vsel-reg", &rdesc->vsel_reg); if (ret) { - dev_err(dev, "no hi6421-vsel property set\n"); + dev_err(dev, "missing vsel-reg property\n"); return ret; } - rdesc->vsel_reg = register_info[0]; - rdesc->vsel_mask = register_info[1]; + + ret = of_property_read_u32(np, "enable-mask", &rdesc->enable_mask); + if (ret) { + dev_err(dev, "missing enable-mask property\n"); + return ret; + } + + /* + * Not all regulators work on idle mode + */ + ret = of_property_read_u32(np, "idle-mode-mask", &sreg->eco_mode_mask); + if (ret) { + dev_dbg(dev, "LDO doesn't support economy mode.\n"); + sreg->eco_mode_mask = 0; + sreg->eco_uA = 0; + } else { + ret = of_property_read_u32(np, "eco-microamp", + &sreg->eco_uA); + if (ret) { + dev_err(dev, "missing eco-microamp property\n"); + return ret; + } + } /* parse .off-on-delay */ ret = of_property_read_u32(np, "off-on-delay-us", &rdesc->off_on_delay); if (ret) { - dev_err(dev, "no off-on-delay-us property set\n"); + dev_err(dev, "missing off-on-delay-us property\n"); return ret; } @@ -263,21 +275,13 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, ret = of_property_read_u32(np, "startup-delay-us", &rdesc->enable_time); if (ret) { - dev_err(dev, "no startup-delay-us property set\n"); + dev_err(dev, "missing startup-delay-us property\n"); return ret; } /* FIXME: are there a better value for this? */ rdesc->ramp_delay = rdesc->enable_time; - /* parse .eco_uA */ - ret = of_property_read_u32(np, "eco-microamp", - &sreg->eco_uA); - if (ret) { - sreg->eco_uA = 0; - ret = 0; - } - /* parse volt_table */ rdesc->n_voltages = of_property_count_u32_elems(np, "voltage-table"); @@ -291,10 +295,21 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, ret = of_property_read_u32_array(np, "voltage-table", v_table, rdesc->n_voltages); if (ret) { - dev_err(dev, "no voltage-table property set\n"); + dev_err(dev, "missing voltage-table property\n"); return ret; } + /* + * Instead of explicitly requiring a mask for the voltage selector, + * as they all start from bit zero (at least on the known LDOs), + * just use the number of voltages at the voltage table, getting the + * minimal mask that would pick everything. + */ + rdesc->vsel_mask = (1 << (fls(rdesc->n_voltages) - 1)) - 1; + + dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x", + rdesc->vsel_reg, rdesc->vsel_mask); + return 0; } -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 37/44] staging: regulator: hi6421v600-regulator: cleanup DT settings @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Currently, an array is used to store both vsel and enable settings, mixing registers, masks and bit settings. Change it in order to have one separate property for each. This makes easier to understand the contents of the DT file, and to describe it at the Documentation/. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 69 +++++++++++-------- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 21467fce9980..72f51594b5ff 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -45,8 +45,7 @@ struct hi6421v600_regulator { struct regulator_desc rdesc; struct hi6421_spmi_pmic *pmic; - u8 eco_mode_mask; - u32 eco_uA; + u32 eco_mode_mask, eco_uA; }; static DEFINE_MUTEX(enable_mutex); @@ -226,36 +225,49 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, { struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; - unsigned int register_info[3] = {0}; unsigned int *v_table; int ret; - /* parse .register_info.enable_reg */ - ret = of_property_read_u32_array(np, "hi6421-ctrl", - register_info, 3); + ret = of_property_read_u32(np, "reg", &rdesc->enable_reg); if (ret) { - dev_err(dev, "no hi6421-ctrl property set\n"); + dev_err(dev, "missing reg property\nn"); return ret; } - rdesc->enable_reg = register_info[0]; - rdesc->enable_mask = register_info[1]; - sreg->eco_mode_mask = register_info[2]; - /* parse .register_info.vsel_reg */ - ret = of_property_read_u32_array(np, "hi6421-vsel", - register_info, 2); + ret = of_property_read_u32(np, "vsel-reg", &rdesc->vsel_reg); if (ret) { - dev_err(dev, "no hi6421-vsel property set\n"); + dev_err(dev, "missing vsel-reg property\n"); return ret; } - rdesc->vsel_reg = register_info[0]; - rdesc->vsel_mask = register_info[1]; + + ret = of_property_read_u32(np, "enable-mask", &rdesc->enable_mask); + if (ret) { + dev_err(dev, "missing enable-mask property\n"); + return ret; + } + + /* + * Not all regulators work on idle mode + */ + ret = of_property_read_u32(np, "idle-mode-mask", &sreg->eco_mode_mask); + if (ret) { + dev_dbg(dev, "LDO doesn't support economy mode.\n"); + sreg->eco_mode_mask = 0; + sreg->eco_uA = 0; + } else { + ret = of_property_read_u32(np, "eco-microamp", + &sreg->eco_uA); + if (ret) { + dev_err(dev, "missing eco-microamp property\n"); + return ret; + } + } /* parse .off-on-delay */ ret = of_property_read_u32(np, "off-on-delay-us", &rdesc->off_on_delay); if (ret) { - dev_err(dev, "no off-on-delay-us property set\n"); + dev_err(dev, "missing off-on-delay-us property\n"); return ret; } @@ -263,21 +275,13 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, ret = of_property_read_u32(np, "startup-delay-us", &rdesc->enable_time); if (ret) { - dev_err(dev, "no startup-delay-us property set\n"); + dev_err(dev, "missing startup-delay-us property\n"); return ret; } /* FIXME: are there a better value for this? */ rdesc->ramp_delay = rdesc->enable_time; - /* parse .eco_uA */ - ret = of_property_read_u32(np, "eco-microamp", - &sreg->eco_uA); - if (ret) { - sreg->eco_uA = 0; - ret = 0; - } - /* parse volt_table */ rdesc->n_voltages = of_property_count_u32_elems(np, "voltage-table"); @@ -291,10 +295,21 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, ret = of_property_read_u32_array(np, "voltage-table", v_table, rdesc->n_voltages); if (ret) { - dev_err(dev, "no voltage-table property set\n"); + dev_err(dev, "missing voltage-table property\n"); return ret; } + /* + * Instead of explicitly requiring a mask for the voltage selector, + * as they all start from bit zero (at least on the known LDOs), + * just use the number of voltages at the voltage table, getting the + * minimal mask that would pick everything. + */ + rdesc->vsel_mask = (1 << (fls(rdesc->n_voltages) - 1)) - 1; + + dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x", + rdesc->vsel_reg, rdesc->vsel_mask); + return 0; } -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 38/44] staging: regulator: hi6421v600-regulator: fix some coding style issues 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Fix the remaining issues complained by checkpatch. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 72f51594b5ff..c80dfac1e4c3 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -40,7 +40,7 @@ #include <linux/spmi.h> #define rdev_dbg(rdev, fmt, arg...) \ - pr_debug("%s: %s: " fmt, rdev->desc->name, __func__, ##arg) + pr_debug("%s: %s: " fmt, (rdev)->desc->name, __func__, ##arg) struct hi6421v600_regulator { struct regulator_desc rdesc; @@ -105,7 +105,7 @@ static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev) rdev->desc->enable_reg, rdev->desc->enable_mask); hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, - rdev->desc->enable_mask, 0); + rdev->desc->enable_mask, 0); return 0; } @@ -122,7 +122,7 @@ static int hi6421_spmi_regulator_get_voltage_sel(struct regulator_dev *rdev) selector = (reg_val & rdev->desc->vsel_mask) >> (ffs(rdev->desc->vsel_mask) - 1); rdev_dbg(rdev, - "vsel_reg=0x%x, value=0x%x, entry=0x%x, voltage=%d mV\n", + "vsel_reg=0x%x, value=0x%x, entry=0x%x, voltage=%d mV\n", rdev->desc->vsel_reg, reg_val, selector, rdev->desc->ops->list_voltage(rdev, selector) / 1000); @@ -144,7 +144,7 @@ static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev, /* set voltage selector */ rdev_dbg(rdev, - "vsel_reg=0x%x, mask=0x%x, value=0x%x, voltage=%d mV\n", + "vsel_reg=0x%x, mask=0x%x, value=0x%x, voltage=%d mV\n", rdev->desc->vsel_reg, rdev->desc->vsel_mask, reg_val, rdev->desc->ops->list_voltage(rdev, selector) / 1000); @@ -169,7 +169,7 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) mode = REGULATOR_MODE_NORMAL; rdev_dbg(rdev, - "enable_reg=0x%x, eco_mode_mask=0x%x, reg_val=0x%x, %s mode\n", + "enable_reg=0x%x, eco_mode_mask=0x%x, reg_val=0x%x, %s mode\n", rdev->desc->enable_reg, sreg->eco_mode_mask, reg_val, mode == REGULATOR_MODE_IDLE ? "idle" : "normal"); @@ -177,7 +177,7 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) } static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev, - unsigned int mode) + unsigned int mode) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; @@ -204,9 +204,10 @@ static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev, return 0; } -static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev, - int input_uV, int output_uV, - int load_uA) +static unsigned int +hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev, + int input_uV, int output_uV, + int load_uA) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); @@ -220,7 +221,7 @@ static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev } static int hi6421_spmi_dt_parse(struct platform_device *pdev, - struct hi6421v600_regulator *sreg, + struct hi6421v600_regulator *sreg, struct regulator_desc *rdesc) { struct device *dev = &pdev->dev; @@ -256,7 +257,7 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, sreg->eco_uA = 0; } else { ret = of_property_read_u32(np, "eco-microamp", - &sreg->eco_uA); + &sreg->eco_uA); if (ret) { dev_err(dev, "missing eco-microamp property\n"); return ret; @@ -331,8 +332,8 @@ static struct regulator_ops hi6421_spmi_ldo_rops = { */ static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, - struct device_node *np, - struct hi6421_spmi_pmic *pmic) + struct device_node *np, + struct hi6421_spmi_pmic *pmic) { struct device *dev = &pdev->dev; struct regulator_desc *rdesc; @@ -404,7 +405,6 @@ static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, return ret; } - static int hi6421_spmi_regulator_probe(struct platform_device *pdev) { struct device *pmic_dev = pdev->dev.parent; -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 38/44] staging: regulator: hi6421v600-regulator: fix some coding style issues @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Fix the remaining issues complained by checkpatch. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 72f51594b5ff..c80dfac1e4c3 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -40,7 +40,7 @@ #include <linux/spmi.h> #define rdev_dbg(rdev, fmt, arg...) \ - pr_debug("%s: %s: " fmt, rdev->desc->name, __func__, ##arg) + pr_debug("%s: %s: " fmt, (rdev)->desc->name, __func__, ##arg) struct hi6421v600_regulator { struct regulator_desc rdesc; @@ -105,7 +105,7 @@ static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev) rdev->desc->enable_reg, rdev->desc->enable_mask); hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg, - rdev->desc->enable_mask, 0); + rdev->desc->enable_mask, 0); return 0; } @@ -122,7 +122,7 @@ static int hi6421_spmi_regulator_get_voltage_sel(struct regulator_dev *rdev) selector = (reg_val & rdev->desc->vsel_mask) >> (ffs(rdev->desc->vsel_mask) - 1); rdev_dbg(rdev, - "vsel_reg=0x%x, value=0x%x, entry=0x%x, voltage=%d mV\n", + "vsel_reg=0x%x, value=0x%x, entry=0x%x, voltage=%d mV\n", rdev->desc->vsel_reg, reg_val, selector, rdev->desc->ops->list_voltage(rdev, selector) / 1000); @@ -144,7 +144,7 @@ static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev, /* set voltage selector */ rdev_dbg(rdev, - "vsel_reg=0x%x, mask=0x%x, value=0x%x, voltage=%d mV\n", + "vsel_reg=0x%x, mask=0x%x, value=0x%x, voltage=%d mV\n", rdev->desc->vsel_reg, rdev->desc->vsel_mask, reg_val, rdev->desc->ops->list_voltage(rdev, selector) / 1000); @@ -169,7 +169,7 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) mode = REGULATOR_MODE_NORMAL; rdev_dbg(rdev, - "enable_reg=0x%x, eco_mode_mask=0x%x, reg_val=0x%x, %s mode\n", + "enable_reg=0x%x, eco_mode_mask=0x%x, reg_val=0x%x, %s mode\n", rdev->desc->enable_reg, sreg->eco_mode_mask, reg_val, mode == REGULATOR_MODE_IDLE ? "idle" : "normal"); @@ -177,7 +177,7 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) } static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev, - unsigned int mode) + unsigned int mode) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; @@ -204,9 +204,10 @@ static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev, return 0; } -static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev, - int input_uV, int output_uV, - int load_uA) +static unsigned int +hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev, + int input_uV, int output_uV, + int load_uA) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); @@ -220,7 +221,7 @@ static unsigned int hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev } static int hi6421_spmi_dt_parse(struct platform_device *pdev, - struct hi6421v600_regulator *sreg, + struct hi6421v600_regulator *sreg, struct regulator_desc *rdesc) { struct device *dev = &pdev->dev; @@ -256,7 +257,7 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, sreg->eco_uA = 0; } else { ret = of_property_read_u32(np, "eco-microamp", - &sreg->eco_uA); + &sreg->eco_uA); if (ret) { dev_err(dev, "missing eco-microamp property\n"); return ret; @@ -331,8 +332,8 @@ static struct regulator_ops hi6421_spmi_ldo_rops = { */ static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, - struct device_node *np, - struct hi6421_spmi_pmic *pmic) + struct device_node *np, + struct hi6421_spmi_pmic *pmic) { struct device *dev = &pdev->dev; struct regulator_desc *rdesc; @@ -404,7 +405,6 @@ static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, return ret; } - static int hi6421_spmi_regulator_probe(struct platform_device *pdev) { struct device *pmic_dev = pdev->dev.parent; -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 39/44] staging: regulator: hi6421v600-regulator: add it to the building system 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Change the binding logic to ensure that the PMIC SPMI driver will run before the regulator code and add it to the building system. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/Kconfig | 10 +++++++++- drivers/staging/hikey9xx/Makefile | 5 +++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig index 7ca083b7e94d..76267b9be562 100644 --- a/drivers/staging/hikey9xx/Kconfig +++ b/drivers/staging/hikey9xx/Kconfig @@ -15,7 +15,6 @@ config MFD_HI6421_SPMI tristate "HiSilicon Hi6421v600 SPMI PMU/Codec IC" depends on OF select MFD_CORE - select REGMAP_MMIO help Add support for HiSilicon Hi6421v600 SPMI PMIC. Hi6421 includes multi-functions, such as regulators, RTC, codec, Coulomb counter, @@ -25,3 +24,12 @@ config MFD_HI6421_SPMI individual components like voltage regulators under corresponding menus in order to enable them. We communicate with the Hi6421v600 via a SPMI bus. + +# to be placed at drivers/regulator +config REGULATOR_HI6421V600 + tristate "HiSilicon Hi6421v600 PMIC voltage regulator support" + depends on MFD_HI6421_PMIC && OF + help + This driver provides support for the voltage regulators on + HiSilicon Hi6421v600 PMU / Codec IC. + This is used on Kirin 3670 boards, like HiKey 970. diff --git a/drivers/staging/hikey9xx/Makefile b/drivers/staging/hikey9xx/Makefile index 79de37da7a8f..9371dcc3d35b 100644 --- a/drivers/staging/hikey9xx/Makefile +++ b/drivers/staging/hikey9xx/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o -obj-$(CONFIG_MFD_HI6421_SPMI) += hi6421-spmi-pmic.o +obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o +obj-$(CONFIG_MFD_HI6421_SPMI) += hi6421-spmi-pmic.o +obj-$(CONFIG_REGULATOR_HI6421V600) += hi6421v600-regulator.o -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 39/44] staging: regulator: hi6421v600-regulator: add it to the building system @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Change the binding logic to ensure that the PMIC SPMI driver will run before the regulator code and add it to the building system. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/Kconfig | 10 +++++++++- drivers/staging/hikey9xx/Makefile | 5 +++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig index 7ca083b7e94d..76267b9be562 100644 --- a/drivers/staging/hikey9xx/Kconfig +++ b/drivers/staging/hikey9xx/Kconfig @@ -15,7 +15,6 @@ config MFD_HI6421_SPMI tristate "HiSilicon Hi6421v600 SPMI PMU/Codec IC" depends on OF select MFD_CORE - select REGMAP_MMIO help Add support for HiSilicon Hi6421v600 SPMI PMIC. Hi6421 includes multi-functions, such as regulators, RTC, codec, Coulomb counter, @@ -25,3 +24,12 @@ config MFD_HI6421_SPMI individual components like voltage regulators under corresponding menus in order to enable them. We communicate with the Hi6421v600 via a SPMI bus. + +# to be placed at drivers/regulator +config REGULATOR_HI6421V600 + tristate "HiSilicon Hi6421v600 PMIC voltage regulator support" + depends on MFD_HI6421_PMIC && OF + help + This driver provides support for the voltage regulators on + HiSilicon Hi6421v600 PMU / Codec IC. + This is used on Kirin 3670 boards, like HiKey 970. diff --git a/drivers/staging/hikey9xx/Makefile b/drivers/staging/hikey9xx/Makefile index 79de37da7a8f..9371dcc3d35b 100644 --- a/drivers/staging/hikey9xx/Makefile +++ b/drivers/staging/hikey9xx/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o -obj-$(CONFIG_MFD_HI6421_SPMI) += hi6421-spmi-pmic.o +obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o +obj-$(CONFIG_MFD_HI6421_SPMI) += hi6421-spmi-pmic.o +obj-$(CONFIG_REGULATOR_HI6421V600) += hi6421v600-regulator.o -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 40/44] staging: regulator: hi6421v600-regulator: code cleanup 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel, Jonathan Cameron Do some code cleanup in order to make it cleaner for moving it out of staging in the future. Suggested-by: Jonathan Cameron <Jonathan.Cameron@Huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 74 ++++++++----------- 1 file changed, 30 insertions(+), 44 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index c80dfac1e4c3..29ef6bcadd84 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -15,29 +15,28 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * */ -#include <linux/slab.h> +#include <linux/delay.h> #include <linux/device.h> -#include <linux/module.h> #include <linux/err.h> #include <linux/io.h> -#include <linux/platform_device.h> -#include <linux/of.h> -#include <linux/of_device.h> +#include <linux/mfd/hi6421-spmi-pmic.h> +#include <linux/module.h> #include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> #include <linux/regulator/of_regulator.h> -#include <linux/mfd/hi6421-spmi-pmic.h> -#include <linux/delay.h> -#include <linux/time.h> -#include <linux/version.h> #include <linux/seq_file.h> -#include <linux/uaccess.h> +#include <linux/slab.h> #include <linux/spmi.h> +#include <linux/time.h> +#include <linux/uaccess.h> +#include <linux/version.h> #define rdev_dbg(rdev, fmt, arg...) \ pr_debug("%s: %s: " fmt, (rdev)->desc->name, __func__, ##arg) @@ -50,15 +49,16 @@ struct hi6421v600_regulator { static DEFINE_MUTEX(enable_mutex); -/* helper function to ensure when it returns it is at least 'delay_us' +/* + * helper function to ensure when it returns it is at least 'delay_us' * microseconds after 'since'. */ static int hi6421_spmi_regulator_is_enabled(struct regulator_dev *rdev) { - u32 reg_val; struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; + u32 reg_val; reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->enable_reg); @@ -136,7 +136,6 @@ static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev, struct hi6421_spmi_pmic *pmic = sreg->pmic; u32 reg_val; - /* unlikely to happen. sanity test done by regulator core */ if (unlikely(selector >= rdev->desc->n_voltages)) return -EINVAL; @@ -158,8 +157,8 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; - u32 reg_val; unsigned int mode; + u32 reg_val; reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->enable_reg); @@ -211,13 +210,10 @@ hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev, { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { - rdev_dbg(rdev, "normal mode"); + if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) return REGULATOR_MODE_NORMAL; - } else { - rdev_dbg(rdev, "idle mode"); - return REGULATOR_MODE_IDLE; - } + + return REGULATOR_MODE_IDLE; } static int hi6421_spmi_dt_parse(struct platform_device *pdev, @@ -256,8 +252,7 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, sreg->eco_mode_mask = 0; sreg->eco_uA = 0; } else { - ret = of_property_read_u32(np, "eco-microamp", - &sreg->eco_uA); + ret = of_property_read_u32(np, "eco-microamp", &sreg->eco_uA); if (ret) { dev_err(dev, "missing eco-microamp property\n"); return ret; @@ -327,23 +322,19 @@ static struct regulator_ops hi6421_spmi_ldo_rops = { .get_optimum_mode = hi6421_spmi_regulator_get_optimum_mode, }; -/* - * Used only for parsing the DT properties - */ - static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, struct device_node *np, struct hi6421_spmi_pmic *pmic) { - struct device *dev = &pdev->dev; - struct regulator_desc *rdesc; - struct regulator_dev *rdev; - struct hi6421v600_regulator *sreg = NULL; + struct regulation_constraints *constraint; struct regulator_init_data *initdata; struct regulator_config config = { }; - struct regulation_constraints *constraint; - const char *supplyname = NULL; - int ret = 0; + struct hi6421v600_regulator *sreg; + struct device *dev = &pdev->dev; + struct regulator_desc *rdesc; + struct regulator_dev *rdev; + const char *supplyname; + int ret; initdata = of_get_regulator_init_data(dev, np, NULL); if (!initdata) { @@ -351,7 +342,7 @@ static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, return -EINVAL; } - sreg = kzalloc(sizeof(*sreg), GFP_KERNEL); + sreg = devm_kzalloc(dev, sizeof(*sreg), GFP_KERNEL); if (!sreg) return -ENOMEM; @@ -370,7 +361,7 @@ static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, /* parse device tree data for regulator specific */ ret = hi6421_spmi_dt_parse(pdev, sreg, rdesc); if (ret) - goto probe_end; + return ret; /* hisi regulator supports two modes */ constraint = &initdata->constraints; @@ -391,18 +382,15 @@ static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, if (IS_ERR(rdev)) { dev_err(dev, "failed to register %s\n", rdesc->name); - ret = PTR_ERR(rdev); - goto probe_end; + return PTR_ERR(rdev); } rdev_dbg(rdev, "valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", constraint->valid_modes_mask, constraint->valid_ops_mask); dev_set_drvdata(dev, rdev); -probe_end: - if (ret) - kfree(sreg); - return ret; + + return 0; } static int hi6421_spmi_regulator_probe(struct platform_device *pdev) @@ -414,7 +402,6 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev) struct hi6421_spmi_pmic *pmic; int ret; - dev_dbg(&pdev->dev, "probing hi6421v600 regulator\n"); /* * This driver is meant to be called by hi6421-spmi-core, * which should first set drvdata. If this doesn't happen, hit @@ -463,7 +450,6 @@ static int hi6421_spmi_regulator_remove(struct platform_device *pdev) regulator_unregister(rdev); - /* TODO: should i worry about that? devm_kzalloc */ if (rdev->desc->volt_table) devm_kfree(&pdev->dev, (unsigned int *)rdev->desc->volt_table); -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 40/44] staging: regulator: hi6421v600-regulator: code cleanup @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, Jonathan Cameron, mauro.chehab Do some code cleanup in order to make it cleaner for moving it out of staging in the future. Suggested-by: Jonathan Cameron <Jonathan.Cameron@Huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../staging/hikey9xx/hi6421v600-regulator.c | 74 ++++++++----------- 1 file changed, 30 insertions(+), 44 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index c80dfac1e4c3..29ef6bcadd84 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -15,29 +15,28 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * */ -#include <linux/slab.h> +#include <linux/delay.h> #include <linux/device.h> -#include <linux/module.h> #include <linux/err.h> #include <linux/io.h> -#include <linux/platform_device.h> -#include <linux/of.h> -#include <linux/of_device.h> +#include <linux/mfd/hi6421-spmi-pmic.h> +#include <linux/module.h> #include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> #include <linux/regulator/of_regulator.h> -#include <linux/mfd/hi6421-spmi-pmic.h> -#include <linux/delay.h> -#include <linux/time.h> -#include <linux/version.h> #include <linux/seq_file.h> -#include <linux/uaccess.h> +#include <linux/slab.h> #include <linux/spmi.h> +#include <linux/time.h> +#include <linux/uaccess.h> +#include <linux/version.h> #define rdev_dbg(rdev, fmt, arg...) \ pr_debug("%s: %s: " fmt, (rdev)->desc->name, __func__, ##arg) @@ -50,15 +49,16 @@ struct hi6421v600_regulator { static DEFINE_MUTEX(enable_mutex); -/* helper function to ensure when it returns it is at least 'delay_us' +/* + * helper function to ensure when it returns it is at least 'delay_us' * microseconds after 'since'. */ static int hi6421_spmi_regulator_is_enabled(struct regulator_dev *rdev) { - u32 reg_val; struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; + u32 reg_val; reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->enable_reg); @@ -136,7 +136,6 @@ static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev, struct hi6421_spmi_pmic *pmic = sreg->pmic; u32 reg_val; - /* unlikely to happen. sanity test done by regulator core */ if (unlikely(selector >= rdev->desc->n_voltages)) return -EINVAL; @@ -158,8 +157,8 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_pmic *pmic = sreg->pmic; - u32 reg_val; unsigned int mode; + u32 reg_val; reg_val = hi6421_spmi_pmic_read(pmic, rdev->desc->enable_reg); @@ -211,13 +210,10 @@ hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev, { struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); - if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { - rdev_dbg(rdev, "normal mode"); + if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) return REGULATOR_MODE_NORMAL; - } else { - rdev_dbg(rdev, "idle mode"); - return REGULATOR_MODE_IDLE; - } + + return REGULATOR_MODE_IDLE; } static int hi6421_spmi_dt_parse(struct platform_device *pdev, @@ -256,8 +252,7 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, sreg->eco_mode_mask = 0; sreg->eco_uA = 0; } else { - ret = of_property_read_u32(np, "eco-microamp", - &sreg->eco_uA); + ret = of_property_read_u32(np, "eco-microamp", &sreg->eco_uA); if (ret) { dev_err(dev, "missing eco-microamp property\n"); return ret; @@ -327,23 +322,19 @@ static struct regulator_ops hi6421_spmi_ldo_rops = { .get_optimum_mode = hi6421_spmi_regulator_get_optimum_mode, }; -/* - * Used only for parsing the DT properties - */ - static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, struct device_node *np, struct hi6421_spmi_pmic *pmic) { - struct device *dev = &pdev->dev; - struct regulator_desc *rdesc; - struct regulator_dev *rdev; - struct hi6421v600_regulator *sreg = NULL; + struct regulation_constraints *constraint; struct regulator_init_data *initdata; struct regulator_config config = { }; - struct regulation_constraints *constraint; - const char *supplyname = NULL; - int ret = 0; + struct hi6421v600_regulator *sreg; + struct device *dev = &pdev->dev; + struct regulator_desc *rdesc; + struct regulator_dev *rdev; + const char *supplyname; + int ret; initdata = of_get_regulator_init_data(dev, np, NULL); if (!initdata) { @@ -351,7 +342,7 @@ static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, return -EINVAL; } - sreg = kzalloc(sizeof(*sreg), GFP_KERNEL); + sreg = devm_kzalloc(dev, sizeof(*sreg), GFP_KERNEL); if (!sreg) return -ENOMEM; @@ -370,7 +361,7 @@ static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, /* parse device tree data for regulator specific */ ret = hi6421_spmi_dt_parse(pdev, sreg, rdesc); if (ret) - goto probe_end; + return ret; /* hisi regulator supports two modes */ constraint = &initdata->constraints; @@ -391,18 +382,15 @@ static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, if (IS_ERR(rdev)) { dev_err(dev, "failed to register %s\n", rdesc->name); - ret = PTR_ERR(rdev); - goto probe_end; + return PTR_ERR(rdev); } rdev_dbg(rdev, "valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n", constraint->valid_modes_mask, constraint->valid_ops_mask); dev_set_drvdata(dev, rdev); -probe_end: - if (ret) - kfree(sreg); - return ret; + + return 0; } static int hi6421_spmi_regulator_probe(struct platform_device *pdev) @@ -414,7 +402,6 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev) struct hi6421_spmi_pmic *pmic; int ret; - dev_dbg(&pdev->dev, "probing hi6421v600 regulator\n"); /* * This driver is meant to be called by hi6421-spmi-core, * which should first set drvdata. If this doesn't happen, hit @@ -463,7 +450,6 @@ static int hi6421_spmi_regulator_remove(struct platform_device *pdev) regulator_unregister(rdev); - /* TODO: should i worry about that? devm_kzalloc */ if (rdev->desc->volt_table) devm_kfree(&pdev->dev, (unsigned int *)rdev->desc->volt_table); -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 41/44] staging: hikey9xx: add a TODO list 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Greg Kroah-Hartman, linux-kernel, devel Place the things that are needed to be able to move those drivers out of staging. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/TODO | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 drivers/staging/hikey9xx/TODO diff --git a/drivers/staging/hikey9xx/TODO b/drivers/staging/hikey9xx/TODO new file mode 100644 index 000000000000..65e7996a3066 --- /dev/null +++ b/drivers/staging/hikey9xx/TODO @@ -0,0 +1,5 @@ +ToDo list: + +- Port other drivers needed by Hikey 960/970; +- Test drivers on Hikey 960; +- Validate device tree bindings. -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 41/44] staging: hikey9xx: add a TODO list @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devel, Mauro Carvalho Chehab, Greg Kroah-Hartman, linuxarm, linux-kernel, mauro.chehab Place the things that are needed to be able to move those drivers out of staging. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/hikey9xx/TODO | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 drivers/staging/hikey9xx/TODO diff --git a/drivers/staging/hikey9xx/TODO b/drivers/staging/hikey9xx/TODO new file mode 100644 index 000000000000..65e7996a3066 --- /dev/null +++ b/drivers/staging/hikey9xx/TODO @@ -0,0 +1,5 @@ +ToDo list: + +- Port other drivers needed by Hikey 960/970; +- Test drivers on Hikey 960; +- Validate device tree bindings. -- 2.26.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 42/44] MAINTAINERS: add an entry for HiSilicon 6421v600 drivers 2020-08-12 15:56 ` Mauro Carvalho Chehab ` (42 preceding siblings ...) (?) @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, David S. Miller, Rob Herring, linux-kernel Add an entry for the SPMI, MFD and PMIC parts of the HiSilicon 6421v600 support. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 956ecd5ba426..e2de0b2119fd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7824,6 +7824,12 @@ F: drivers/crypto/hisilicon/sec2/sec_crypto.c F: drivers/crypto/hisilicon/sec2/sec_crypto.h F: drivers/crypto/hisilicon/sec2/sec_main.c +HISILICON STAGING DRIVERS FOR HIKEY 960/970 +M: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> +L: linux-kernel@vger.kernel.org +S: Maintained +F: drivers/staging/hikey9xx/ + HISILICON TRUE RANDOM NUMBER GENERATOR V2 SUPPORT M: Zaibo Xu <xuzaibo@huawei.com> S: Maintained -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 43/44] dt: document HiSilicon SPMI controller and mfd/regulator properties 2020-08-12 15:56 ` Mauro Carvalho Chehab ` (43 preceding siblings ...) (?) @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-14 20:17 ` Rob Herring -1 siblings, 1 reply; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Lee Jones, Rob Herring, Stephen Boyd, devicetree, linux-kernel, linux-arm-msm Add documentation for the properties needed by the HiSilicon 6421v600 driver, and by the SPMI controller used to access the chipset. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../mfd/hisilicon,hi6421-spmi-pmic.yaml | 182 ++++++++++++++++++ .../spmi/hisilicon,hisi-spmi-controller.yaml | 54 ++++++ 2 files changed, 236 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml create mode 100644 Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml diff --git a/Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml new file mode 100644 index 000000000000..95494114554d --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml @@ -0,0 +1,182 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/hisilicon,hi6421-spmi-pmic.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: HiSilicon 6421v600 SPMI PMIC + +maintainers: + - Mauro Carvalho Chehab <mchehab+huawei@kernel.org> + +description: | + HiSilicon 6421v600 uses a MIPI System Power Management (SPMI) bus in order + to provide interrupts and power supply. + + The GPIO and interrupt settings are represented as part of the top-level PMIC + node. + + The SPMI controller part is provided by + Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml. + +properties: + $nodename: + pattern: "pmic@[0-9a-f]" + + compatible: + const: hisilicon,hi6421-spmi-pmic + + reg: + maxItems: 1 + + spmi-channel: + description: number of the SPMI channel where the PMIC is connected + + '#interrupt-cells': + const: 2 + + interrupt-controller: + description: + Identify that the PMIC is capable of behaving as an interrupt controller. + + gpios: + maxItems: 1 + + irq-num: + description: Interrupt request number + + 'irq-array': + description: Interrupt request array + + 'irq-mask-addr': + description: Address for the interrupt request mask + + 'irq-addr': + description: Address for the interrupt request + + regulators: + type: object + + properties: + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + patternProperties: + '^ldo@[0-9]+$': + type: object + + $ref: "/schemas/regulator/regulator.yaml#" + + properties: + reg: + description: Enable register. + + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + vsel-reg: + description: Voltage selector register. + + enable-mask: + description: Bitmask used to enable the regulator. + + voltage-table: + description: Table with the selector items for the voltage regulator. + minItems: 2 + maxItems: 16 + + off-on-delay-us: + description: Time required for changing state to enabled in microseconds. + + startup-delay-us: + description: Startup time in microseconds. + + idle-mode-mask: + description: Bitmask used to put the regulator on idle mode. + + eco-microamp: + description: Maximum current while on idle mode. + + required: + - reg + - vsel-reg + - enable-mask + - voltage-table + - off-on-delay-us + - startup-delay-us + +required: + - compatible + - reg + - regulators + +examples: + - | + /* pmic properties */ + + pmic: pmic@0 { + compatible = "hisilicon,hi6421-spmi-pmic"; + slave_id = <0>; + reg = <0 0>; + + #interrupt-cells = <2>; + interrupt-controller; + gpios = <&gpio28 0 0>; + irq-num = <16>; + irq-array = <2>; + irq-mask-addr = <0x202 2>; + irq-addr = <0x212 2>; + + #address-cells = <1>; + #size-cells = <0>; + + regulators { + #address-cells = <1>; + #size-cells = <0>; + + ldo3: ldo3@16 { + reg = <0x16>; + vsel-reg = <0x51>; + + regulator-name = "ldo3"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <2000000>; + regulator-boot-on; + + enable-mask = <0x01>; + + voltage-table = <1500000>, <1550000>, <1600000>, <1650000>, + <1700000>, <1725000>, <1750000>, <1775000>, + <1800000>, <1825000>, <1850000>, <1875000>, + <1900000>, <1925000>, <1950000>, <2000000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + + ldo4: ldo4@17 { /* 40 PIN */ + reg = <0x17>; + vsel-reg = <0x52>; + + regulator-name = "ldo4"; + regulator-min-microvolt = <1725000>; + regulator-max-microvolt = <1900000>; + regulator-boot-on; + + enable-mask = <0x01>; + idle-mode-mask = <0x10>; + eco-microamp = <10000>; + + hi6421-vsel = <0x52 0x07>; + voltage-table = <1725000>, <1750000>, <1775000>, <1800000>, + <1825000>, <1850000>, <1875000>, <1900000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml b/Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml new file mode 100644 index 000000000000..5aeb2ae12024 --- /dev/null +++ b/Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/spmi/hisilicon,hisi-spmi-controller.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: HiSilicon SPMI controller + +maintainers: + - Mauro Carvalho Chehab <mchehab+huawei@kernel.org> + +description: | + The HiSilicon SPMI controller is found on some Kirin-based designs. + It is a MIPI System Power Management (SPMI) controller. + + The PMIC part is provided by + Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml. + +properties: + $nodename: + pattern: "spmi@[0-9a-f]" + + compatible: + const: hisilicon,spmi-controller + + reg: + maxItems: 1 + + "#address-cells": + const: 2 + + "#size-cells": + const: 0 + + spmi-channel: + description: number of the SPMI channel where the PMIC is connected + +patternProperties: + "^pmic@[0-9a-f]$": + $ref: "/schemas/mfd/hisilicon,hi6421-spmi-pmic.yaml#" + +examples: + - | + spmi: spmi@fff24000 { + compatible = "hisilicon,spmi-controller"; + #address-cells = <2>; + #size-cells = <0>; + status = "ok"; + reg = <0x0 0xfff24000 0x0 0x1000>; + spmi-channel = <2>; + + /* pmic properties */ + + }; -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* Re: [PATCH 43/44] dt: document HiSilicon SPMI controller and mfd/regulator properties 2020-08-12 15:56 ` [PATCH 43/44] dt: document HiSilicon SPMI controller and mfd/regulator properties Mauro Carvalho Chehab @ 2020-08-14 20:17 ` Rob Herring 2020-08-15 9:55 ` Mauro Carvalho Chehab 0 siblings, 1 reply; 129+ messages in thread From: Rob Herring @ 2020-08-14 20:17 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: mauro.chehab, linux-kernel, Lee Jones, Rob Herring, linuxarm, linux-arm-msm, devicetree, Stephen Boyd On Wed, 12 Aug 2020 17:56:53 +0200, Mauro Carvalho Chehab wrote: > Add documentation for the properties needed by the HiSilicon > 6421v600 driver, and by the SPMI controller used to access > the chipset. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > .../mfd/hisilicon,hi6421-spmi-pmic.yaml | 182 ++++++++++++++++++ > .../spmi/hisilicon,hisi-spmi-controller.yaml | 54 ++++++ > 2 files changed, 236 insertions(+) > create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml > create mode 100644 Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml > My bot found errors running 'make dt_binding_check' on your patch: /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.example.dt.yaml: example-0: spmi@fff24000:reg:0: [0, 4294066176, 0, 4096] is too long See https://patchwork.ozlabs.org/patch/1343770 If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure dt-schema is up to date: pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade Please check and re-submit. ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 43/44] dt: document HiSilicon SPMI controller and mfd/regulator properties 2020-08-14 20:17 ` Rob Herring @ 2020-08-15 9:55 ` Mauro Carvalho Chehab 2020-08-17 14:13 ` Rob Herring 0 siblings, 1 reply; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-15 9:55 UTC (permalink / raw) To: Rob Herring Cc: mauro.chehab, linux-kernel, Lee Jones, Rob Herring, linuxarm, linux-arm-msm, devicetree, Stephen Boyd Hi Rob, Em Fri, 14 Aug 2020 14:17:08 -0600 Rob Herring <robh@kernel.org> escreveu: > On Wed, 12 Aug 2020 17:56:53 +0200, Mauro Carvalho Chehab wrote: > > Add documentation for the properties needed by the HiSilicon > > 6421v600 driver, and by the SPMI controller used to access > > the chipset. > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > --- > > .../mfd/hisilicon,hi6421-spmi-pmic.yaml | 182 ++++++++++++++++++ > > .../spmi/hisilicon,hisi-spmi-controller.yaml | 54 ++++++ > > 2 files changed, 236 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml > > create mode 100644 Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml > > > > > My bot found errors running 'make dt_binding_check' on your patch: > > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.example.dt.yaml: example-0: spmi@fff24000:reg:0: [0, 4294066176, 0, 4096] is too long I was unable to find any way to solve this one. What's the proper way to set the length of the root reg on some example? Thanks, Mauro ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 43/44] dt: document HiSilicon SPMI controller and mfd/regulator properties 2020-08-15 9:55 ` Mauro Carvalho Chehab @ 2020-08-17 14:13 ` Rob Herring 0 siblings, 0 replies; 129+ messages in thread From: Rob Herring @ 2020-08-17 14:13 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: mauro.chehab, linux-kernel, Lee Jones, Linuxarm, linux-arm-msm, devicetree, Stephen Boyd On Sat, Aug 15, 2020 at 3:55 AM Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: > > Hi Rob, > > Em Fri, 14 Aug 2020 14:17:08 -0600 > Rob Herring <robh@kernel.org> escreveu: > > > On Wed, 12 Aug 2020 17:56:53 +0200, Mauro Carvalho Chehab wrote: > > > Add documentation for the properties needed by the HiSilicon > > > 6421v600 driver, and by the SPMI controller used to access > > > the chipset. > > > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > > --- > > > .../mfd/hisilicon,hi6421-spmi-pmic.yaml | 182 ++++++++++++++++++ > > > .../spmi/hisilicon,hisi-spmi-controller.yaml | 54 ++++++ > > > 2 files changed, 236 insertions(+) > > > create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml > > > create mode 100644 Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml > > > > > > > > > My bot found errors running 'make dt_binding_check' on your patch: > > > > /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.example.dt.yaml: example-0: spmi@fff24000:reg:0: [0, 4294066176, 0, 4096] is too long > > I was unable to find any way to solve this one. What's the proper > way to set the length of the root reg on some example? The default is 1 address and size cell. Either adjust 'reg' for that or you can define a bus node: bus { #address-cells = <2>; #size-cells = <2>; spmi@123 { ... }; }; My preference is doing the former. Rob ^ permalink raw reply [flat|nested] 129+ messages in thread
* [PATCH 44/44] dt: hisilicon: add support for the PMIC found on Hikey 970 2020-08-12 15:56 ` Mauro Carvalho Chehab @ 2020-08-12 15:56 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Wei Xu, Rob Herring, linux-arm-kernel, devicetree, linux-kernel Add a device tree for the HiSilicon 6421v600 SPMI PMIC, used on HiKey970 board. As we now have support for it, change the fixed regulators used by the SD I/O to use the proper LDO supplies. We'll keep the 3v3 fixed regulator, as this will be used by the DRM/KMS driver. So, let's just rename it. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../boot/dts/hisilicon/hi3670-hikey970.dts | 16 +- .../boot/dts/hisilicon/hikey970-pmic.dtsi | 200 ++++++++++++++++++ 2 files changed, 204 insertions(+), 12 deletions(-) create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi diff --git a/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts b/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts index 01234a175dcd..c8a72c0873bf 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts @@ -12,6 +12,7 @@ #include "hi3670.dtsi" #include "hikey970-pinctrl.dtsi" +#include "hikey970-pmic.dtsi" / { model = "HiKey970"; @@ -39,7 +40,7 @@ memory@0 { reg = <0x0 0x0 0x0 0x0>; }; - sd_1v8: regulator-1v8 { + fixed_1v8: regulator-1v8 { compatible = "regulator-fixed"; regulator-name = "fixed-1.8V"; regulator-min-microvolt = <1800000>; @@ -47,15 +48,6 @@ sd_1v8: regulator-1v8 { regulator-always-on; }; - sd_3v3: regulator-3v3 { - compatible = "regulator-fixed"; - regulator-name = "fixed-3.3V"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - regulator-always-on; - }; - wlan_en: wlan-en-1-8v { compatible = "regulator-fixed"; regulator-name = "wlan-en-regulator"; @@ -402,8 +394,8 @@ &dwmmc1 { pinctrl-0 = <&sd_pmx_func &sd_clk_cfg_func &sd_cfg_func>; - vmmc-supply = <&sd_3v3>; - vqmmc-supply = <&sd_1v8>; + vmmc-supply = <&ldo16>; + vqmmc-supply = <&ldo9>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi b/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi new file mode 100644 index 000000000000..2a6c366d9be6 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi @@ -0,0 +1,200 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dts file for Hi6421v600 SPMI PMIC used at the HiKey970 Development Board + * + * Copyright (C) 2020, Huawei Tech. Co., Ltd. + */ + +/ { + spmi: spmi@fff24000 { + compatible = "hisilicon,spmi-controller"; + #address-cells = <2>; + #size-cells = <0>; + status = "ok"; + reg = <0x0 0xfff24000 0x0 0x1000>; + spmi-channel = <2>; + + pmic: pmic@0 { + compatible = "hisilicon,hi6421-spmi-pmic"; + slave_id = <0>; + reg = <0 0>; + + #interrupt-cells = <2>; + interrupt-controller; + gpios = <&gpio28 0 0>; + irq-num = <16>; + irq-array = <2>; + irq-mask-addr = <0x202 2>; + irq-addr = <0x212 2>; + + regulators { + #address-cells = <1>; + #size-cells = <0>; + + ldo3: ldo3@16 { + reg = <0x16>; + vsel-reg = <0x51>; + + regulator-name = "ldo3"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <2000000>; + regulator-boot-on; + + enable-mask = <0x01>; + + voltage-table = <1500000>, <1550000>, + <1600000>, <1650000>, + <1700000>, <1725000>, + <1750000>, <1775000>, + <1800000>, <1825000>, + <1850000>, <1875000>, + <1900000>, <1925000>, + <1950000>, <2000000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + + ldo4: ldo4@17 { /* 40 PIN */ + reg = <0x17>; + vsel-reg = <0x52>; + + regulator-name = "ldo4"; + regulator-min-microvolt = <1725000>; + regulator-max-microvolt = <1900000>; + regulator-boot-on; + + enable-mask = <0x01>; + idle-mode-mask = <0x10>; + eco-microamp = <10000>; + + hi6421-vsel = <0x52 0x07>; + voltage-table = <1725000>, <1750000>, + <1775000>, <1800000>, + <1825000>, <1850000>, + <1875000>, <1900000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + + ldo9: ldo9@1C { /* SDCARD I/O */ + reg = <0x1C>; + vsel-reg = <0x57>; + + regulator-name = "ldo9"; + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + + enable-mask = <0x01>; + idle-mode-mask = <0x10>; + eco-microamp = <10000>; + + voltage-table = <1750000>, <1800000>, + <1825000>, <2800000>, + <2850000>, <2950000>, + <3000000>, <3300000>; + off-on-delay-us = <20000>; + startup-delay-us = <360>; + }; + + ldo15: ldo15@21 { /* UFS */ + reg = <0x21>; + vsel-reg = <0x5c>; + + regulator-name = "ldo15"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3000000>; + regulator-always-on; + + enable-mask = <0x01>; + idle-mode-mask = <0x10>; + eco-microamp = <10000>; + + voltage-table = <1800000>, <1850000>, + <2400000>, <2600000>, + <2700000>, <2850000>, + <2950000>, <3000000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + + ldo16: ldo16@22 { /* SD */ + reg = <0x22>; + vsel-reg = <0x5d>; + + regulator-name = "ldo16"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3000000>; + regulator-boot-on; + + enable-mask = <0x01>; + idle-mode-mask = <0x10>; + eco-microamp = <10000>; + + voltage-table = <1800000>, <1850000>, + <2400000>, <2600000>, + <2700000>, <2850000>, + <2950000>, <3000000>; + off-on-delay-us = <20000>; + startup-delay-us = <360>; + }; + + ldo17: ldo17@23 { + reg = <0x23>; + vsel-reg = <0x5e>; + + regulator-name = "ldo17"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <3300000>; + + enable-mask = <0x01>; + idle-mode-mask = <0x10>; + eco-microamp = <10000>; + + voltage-table = <2500000>, <2600000>, + <2700000>, <2800000>, + <3000000>, <3100000>, + <3200000>, <3300000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + + ldo33: ldo33@32 { /* PEX8606 */ + reg = <0x32>; + vsel-reg = <0x6d>; + regulator-name = "ldo33"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + + enable-mask = <0x01>; + + voltage-table = <2500000>, <2600000>, + <2700000>, <2800000>, + <3000000>, <3100000>, + <3200000>, <3300000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + + ldo34: ldo34@33 { /* GPS AUX IN VDD */ + reg = <0x33>; + vsel-reg = <0x6e>; + + regulator-name = "ldo34"; + regulator-min-microvolt = <2600000>; + regulator-max-microvolt = <3300000>; + + enable-mask = <0x01>; + + voltage-table = <2600000>, <2700000>, + <2800000>, <2900000>, + <3000000>, <3100000>, + <3200000>, <3300000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + }; + }; + }; +}; -- 2.26.2 ^ permalink raw reply related [flat|nested] 129+ messages in thread
* [PATCH 44/44] dt: hisilicon: add support for the PMIC found on Hikey 970 @ 2020-08-12 15:56 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 15:56 UTC (permalink / raw) Cc: devicetree, Mauro Carvalho Chehab, linuxarm, Wei Xu, linux-kernel, Rob Herring, mauro.chehab, linux-arm-kernel Add a device tree for the HiSilicon 6421v600 SPMI PMIC, used on HiKey970 board. As we now have support for it, change the fixed regulators used by the SD I/O to use the proper LDO supplies. We'll keep the 3v3 fixed regulator, as this will be used by the DRM/KMS driver. So, let's just rename it. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../boot/dts/hisilicon/hi3670-hikey970.dts | 16 +- .../boot/dts/hisilicon/hikey970-pmic.dtsi | 200 ++++++++++++++++++ 2 files changed, 204 insertions(+), 12 deletions(-) create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi diff --git a/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts b/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts index 01234a175dcd..c8a72c0873bf 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts @@ -12,6 +12,7 @@ #include "hi3670.dtsi" #include "hikey970-pinctrl.dtsi" +#include "hikey970-pmic.dtsi" / { model = "HiKey970"; @@ -39,7 +40,7 @@ memory@0 { reg = <0x0 0x0 0x0 0x0>; }; - sd_1v8: regulator-1v8 { + fixed_1v8: regulator-1v8 { compatible = "regulator-fixed"; regulator-name = "fixed-1.8V"; regulator-min-microvolt = <1800000>; @@ -47,15 +48,6 @@ sd_1v8: regulator-1v8 { regulator-always-on; }; - sd_3v3: regulator-3v3 { - compatible = "regulator-fixed"; - regulator-name = "fixed-3.3V"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - regulator-always-on; - }; - wlan_en: wlan-en-1-8v { compatible = "regulator-fixed"; regulator-name = "wlan-en-regulator"; @@ -402,8 +394,8 @@ &dwmmc1 { pinctrl-0 = <&sd_pmx_func &sd_clk_cfg_func &sd_cfg_func>; - vmmc-supply = <&sd_3v3>; - vqmmc-supply = <&sd_1v8>; + vmmc-supply = <&ldo16>; + vqmmc-supply = <&ldo9>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi b/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi new file mode 100644 index 000000000000..2a6c366d9be6 --- /dev/null +++ b/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi @@ -0,0 +1,200 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dts file for Hi6421v600 SPMI PMIC used at the HiKey970 Development Board + * + * Copyright (C) 2020, Huawei Tech. Co., Ltd. + */ + +/ { + spmi: spmi@fff24000 { + compatible = "hisilicon,spmi-controller"; + #address-cells = <2>; + #size-cells = <0>; + status = "ok"; + reg = <0x0 0xfff24000 0x0 0x1000>; + spmi-channel = <2>; + + pmic: pmic@0 { + compatible = "hisilicon,hi6421-spmi-pmic"; + slave_id = <0>; + reg = <0 0>; + + #interrupt-cells = <2>; + interrupt-controller; + gpios = <&gpio28 0 0>; + irq-num = <16>; + irq-array = <2>; + irq-mask-addr = <0x202 2>; + irq-addr = <0x212 2>; + + regulators { + #address-cells = <1>; + #size-cells = <0>; + + ldo3: ldo3@16 { + reg = <0x16>; + vsel-reg = <0x51>; + + regulator-name = "ldo3"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <2000000>; + regulator-boot-on; + + enable-mask = <0x01>; + + voltage-table = <1500000>, <1550000>, + <1600000>, <1650000>, + <1700000>, <1725000>, + <1750000>, <1775000>, + <1800000>, <1825000>, + <1850000>, <1875000>, + <1900000>, <1925000>, + <1950000>, <2000000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + + ldo4: ldo4@17 { /* 40 PIN */ + reg = <0x17>; + vsel-reg = <0x52>; + + regulator-name = "ldo4"; + regulator-min-microvolt = <1725000>; + regulator-max-microvolt = <1900000>; + regulator-boot-on; + + enable-mask = <0x01>; + idle-mode-mask = <0x10>; + eco-microamp = <10000>; + + hi6421-vsel = <0x52 0x07>; + voltage-table = <1725000>, <1750000>, + <1775000>, <1800000>, + <1825000>, <1850000>, + <1875000>, <1900000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + + ldo9: ldo9@1C { /* SDCARD I/O */ + reg = <0x1C>; + vsel-reg = <0x57>; + + regulator-name = "ldo9"; + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + + enable-mask = <0x01>; + idle-mode-mask = <0x10>; + eco-microamp = <10000>; + + voltage-table = <1750000>, <1800000>, + <1825000>, <2800000>, + <2850000>, <2950000>, + <3000000>, <3300000>; + off-on-delay-us = <20000>; + startup-delay-us = <360>; + }; + + ldo15: ldo15@21 { /* UFS */ + reg = <0x21>; + vsel-reg = <0x5c>; + + regulator-name = "ldo15"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3000000>; + regulator-always-on; + + enable-mask = <0x01>; + idle-mode-mask = <0x10>; + eco-microamp = <10000>; + + voltage-table = <1800000>, <1850000>, + <2400000>, <2600000>, + <2700000>, <2850000>, + <2950000>, <3000000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + + ldo16: ldo16@22 { /* SD */ + reg = <0x22>; + vsel-reg = <0x5d>; + + regulator-name = "ldo16"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3000000>; + regulator-boot-on; + + enable-mask = <0x01>; + idle-mode-mask = <0x10>; + eco-microamp = <10000>; + + voltage-table = <1800000>, <1850000>, + <2400000>, <2600000>, + <2700000>, <2850000>, + <2950000>, <3000000>; + off-on-delay-us = <20000>; + startup-delay-us = <360>; + }; + + ldo17: ldo17@23 { + reg = <0x23>; + vsel-reg = <0x5e>; + + regulator-name = "ldo17"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <3300000>; + + enable-mask = <0x01>; + idle-mode-mask = <0x10>; + eco-microamp = <10000>; + + voltage-table = <2500000>, <2600000>, + <2700000>, <2800000>, + <3000000>, <3100000>, + <3200000>, <3300000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + + ldo33: ldo33@32 { /* PEX8606 */ + reg = <0x32>; + vsel-reg = <0x6d>; + regulator-name = "ldo33"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + + enable-mask = <0x01>; + + voltage-table = <2500000>, <2600000>, + <2700000>, <2800000>, + <3000000>, <3100000>, + <3200000>, <3300000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + + ldo34: ldo34@33 { /* GPS AUX IN VDD */ + reg = <0x33>; + vsel-reg = <0x6e>; + + regulator-name = "ldo34"; + regulator-min-microvolt = <2600000>; + regulator-max-microvolt = <3300000>; + + enable-mask = <0x01>; + + voltage-table = <2600000>, <2700000>, + <2800000>, <2900000>, + <3000000>, <3100000>, + <3200000>, <3300000>; + off-on-delay-us = <20000>; + startup-delay-us = <120>; + }; + }; + }; + }; +}; -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 2020-08-12 15:56 ` Mauro Carvalho Chehab (?) @ 2020-08-12 17:13 ` Joe Perches -1 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 17:13 UTC (permalink / raw) To: Mauro Carvalho Chehab, Greg Kroah-Hartman Cc: linuxarm, mauro.chehab, Stephen Boyd, Lee Jones, devicetree, linux-arm-kernel, Wei Xu, David S. Miller, Rob Herring, linux-kernel, Rob Herring, devel, linux-arm-msm, Mark Brown, Jonathan Cameron Perhaps these trivial bits on top: --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 5 +++-- drivers/staging/hikey9xx/hi6421v600-regulator.c | 6 +++--- drivers/staging/hikey9xx/hisi-spmi-controller.c | 21 +++++++++++++-------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 76766e7b8bf9..9d73458ca65a 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -99,7 +99,7 @@ int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val) EXPORT_SYMBOL(hi6421_spmi_pmic_write); int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, - u32 mask, u32 bits) + u32 mask, u32 bits) { unsigned long flags; u32 data; @@ -130,7 +130,8 @@ static irqreturn_t hi6421_spmi_irq_handler(int irq, void *data) hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr), pending); /* solve powerkey order */ - if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { + if ((i == HISI_IRQ_KEY_NUM) && + ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_DOWN]); generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_UP]); pending &= (~HISI_IRQ_KEY_VALUE); diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 29ef6bcadd84..82635ff54a74 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -227,7 +227,7 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, ret = of_property_read_u32(np, "reg", &rdesc->enable_reg); if (ret) { - dev_err(dev, "missing reg property\nn"); + dev_err(dev, "missing reg property\n"); return ret; } @@ -303,13 +303,13 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, */ rdesc->vsel_mask = (1 << (fls(rdesc->n_voltages) - 1)) - 1; - dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x", + dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x\n", rdesc->vsel_reg, rdesc->vsel_mask); return 0; } -static struct regulator_ops hi6421_spmi_ldo_rops = { +static const struct regulator_ops hi6421_spmi_ldo_rops = { .is_enabled = hi6421_spmi_regulator_is_enabled, .enable = hi6421_spmi_regulator_enable, .disable = hi6421_spmi_regulator_disable, diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 583df10cbf1a..513d962b8bce 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -102,7 +102,7 @@ static int spmi_controller_wait_for_done(struct device *dev, return 0; } udelay(1); - } while(timeout--); + } while (timeout--); dev_err(dev, "%s: timeout, status 0x%x\n", __func__, status); return -ETIMEDOUT; @@ -121,7 +121,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { dev_err(&ctrl->dev, - "spmi_controller supports 1..%d bytes per trans, but:%ld requested", + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n", SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); return -EINVAL; } @@ -137,7 +137,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, op_code = SPMI_CMD_EXT_REG_READ_L; break; default: - dev_err(&ctrl->dev, "invalid read cmd 0x%x", opc); + dev_err(&ctrl->dev, "invalid read cmd 0x%x\n", opc); return -EINVAL; } @@ -157,7 +157,10 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, goto done; for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) { - data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * slave_id + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); + data = readl(spmi_controller->base + chnl_ofst + + SPMI_SLAVE_OFFSET * slave_id + + SPMI_APB_SPMI_RDATA0_BASE_ADDR + + i * SPMI_PER_DATAREG_BYTE); data = be32_to_cpu((__be32)data); if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(buf, &data, sizeof(data)); @@ -194,7 +197,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { dev_err(&ctrl->dev, - "spmi_controller supports 1..%d bytes per trans, but:%ld requested", + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n", SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); return -EINVAL; } @@ -210,7 +213,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, op_code = SPMI_CMD_EXT_REG_WRITE_L; break; default: - dev_err(&ctrl->dev, "invalid write cmd 0x%x", opc); + dev_err(&ctrl->dev, "invalid write cmd 0x%x\n", opc); return -EINVAL; } @@ -234,8 +237,10 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, } writel((u32)cpu_to_be32(data), - spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); - }; + spmi_controller->base + chnl_ofst + + SPMI_APB_SPMI_WDATA0_BASE_ADDR + + SPMI_PER_DATAREG_BYTE * i); + } /* Start the transaction */ writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); ^ permalink raw reply related [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-12 17:13 ` Joe Perches 0 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 17:13 UTC (permalink / raw) To: Mauro Carvalho Chehab, Greg Kroah-Hartman Cc: devel, devicetree, Rob Herring, Stephen Boyd, linux-arm-msm, Mark Brown, linuxarm, Wei Xu, linux-kernel, Rob Herring, Jonathan Cameron, mauro.chehab, Lee Jones, David S. Miller, linux-arm-kernel Perhaps these trivial bits on top: --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 5 +++-- drivers/staging/hikey9xx/hi6421v600-regulator.c | 6 +++--- drivers/staging/hikey9xx/hisi-spmi-controller.c | 21 +++++++++++++-------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 76766e7b8bf9..9d73458ca65a 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -99,7 +99,7 @@ int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val) EXPORT_SYMBOL(hi6421_spmi_pmic_write); int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, - u32 mask, u32 bits) + u32 mask, u32 bits) { unsigned long flags; u32 data; @@ -130,7 +130,8 @@ static irqreturn_t hi6421_spmi_irq_handler(int irq, void *data) hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr), pending); /* solve powerkey order */ - if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { + if ((i == HISI_IRQ_KEY_NUM) && + ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_DOWN]); generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_UP]); pending &= (~HISI_IRQ_KEY_VALUE); diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 29ef6bcadd84..82635ff54a74 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -227,7 +227,7 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, ret = of_property_read_u32(np, "reg", &rdesc->enable_reg); if (ret) { - dev_err(dev, "missing reg property\nn"); + dev_err(dev, "missing reg property\n"); return ret; } @@ -303,13 +303,13 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, */ rdesc->vsel_mask = (1 << (fls(rdesc->n_voltages) - 1)) - 1; - dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x", + dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x\n", rdesc->vsel_reg, rdesc->vsel_mask); return 0; } -static struct regulator_ops hi6421_spmi_ldo_rops = { +static const struct regulator_ops hi6421_spmi_ldo_rops = { .is_enabled = hi6421_spmi_regulator_is_enabled, .enable = hi6421_spmi_regulator_enable, .disable = hi6421_spmi_regulator_disable, diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 583df10cbf1a..513d962b8bce 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -102,7 +102,7 @@ static int spmi_controller_wait_for_done(struct device *dev, return 0; } udelay(1); - } while(timeout--); + } while (timeout--); dev_err(dev, "%s: timeout, status 0x%x\n", __func__, status); return -ETIMEDOUT; @@ -121,7 +121,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { dev_err(&ctrl->dev, - "spmi_controller supports 1..%d bytes per trans, but:%ld requested", + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n", SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); return -EINVAL; } @@ -137,7 +137,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, op_code = SPMI_CMD_EXT_REG_READ_L; break; default: - dev_err(&ctrl->dev, "invalid read cmd 0x%x", opc); + dev_err(&ctrl->dev, "invalid read cmd 0x%x\n", opc); return -EINVAL; } @@ -157,7 +157,10 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, goto done; for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) { - data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * slave_id + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); + data = readl(spmi_controller->base + chnl_ofst + + SPMI_SLAVE_OFFSET * slave_id + + SPMI_APB_SPMI_RDATA0_BASE_ADDR + + i * SPMI_PER_DATAREG_BYTE); data = be32_to_cpu((__be32)data); if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(buf, &data, sizeof(data)); @@ -194,7 +197,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { dev_err(&ctrl->dev, - "spmi_controller supports 1..%d bytes per trans, but:%ld requested", + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n", SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); return -EINVAL; } @@ -210,7 +213,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, op_code = SPMI_CMD_EXT_REG_WRITE_L; break; default: - dev_err(&ctrl->dev, "invalid write cmd 0x%x", opc); + dev_err(&ctrl->dev, "invalid write cmd 0x%x\n", opc); return -EINVAL; } @@ -234,8 +237,10 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, } writel((u32)cpu_to_be32(data), - spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); - }; + spmi_controller->base + chnl_ofst + + SPMI_APB_SPMI_WDATA0_BASE_ADDR + + SPMI_PER_DATAREG_BYTE * i); + } /* Start the transaction */ writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-12 17:13 ` Joe Perches 0 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 17:13 UTC (permalink / raw) To: Mauro Carvalho Chehab, Greg Kroah-Hartman Cc: devel, devicetree, Rob Herring, Stephen Boyd, linux-arm-msm, Mark Brown, linuxarm, Wei Xu, linux-kernel, Rob Herring, Jonathan Cameron, mauro.chehab, Lee Jones, David S. Miller, linux-arm-kernel Perhaps these trivial bits on top: --- drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 5 +++-- drivers/staging/hikey9xx/hi6421v600-regulator.c | 6 +++--- drivers/staging/hikey9xx/hisi-spmi-controller.c | 21 +++++++++++++-------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c index 76766e7b8bf9..9d73458ca65a 100644 --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c @@ -99,7 +99,7 @@ int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val) EXPORT_SYMBOL(hi6421_spmi_pmic_write); int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, - u32 mask, u32 bits) + u32 mask, u32 bits) { unsigned long flags; u32 data; @@ -130,7 +130,8 @@ static irqreturn_t hi6421_spmi_irq_handler(int irq, void *data) hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr), pending); /* solve powerkey order */ - if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { + if ((i == HISI_IRQ_KEY_NUM) && + ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_DOWN]); generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_UP]); pending &= (~HISI_IRQ_KEY_VALUE); diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c index 29ef6bcadd84..82635ff54a74 100644 --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c @@ -227,7 +227,7 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, ret = of_property_read_u32(np, "reg", &rdesc->enable_reg); if (ret) { - dev_err(dev, "missing reg property\nn"); + dev_err(dev, "missing reg property\n"); return ret; } @@ -303,13 +303,13 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, */ rdesc->vsel_mask = (1 << (fls(rdesc->n_voltages) - 1)) - 1; - dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x", + dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x\n", rdesc->vsel_reg, rdesc->vsel_mask); return 0; } -static struct regulator_ops hi6421_spmi_ldo_rops = { +static const struct regulator_ops hi6421_spmi_ldo_rops = { .is_enabled = hi6421_spmi_regulator_is_enabled, .enable = hi6421_spmi_regulator_enable, .disable = hi6421_spmi_regulator_disable, diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c index 583df10cbf1a..513d962b8bce 100644 --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c @@ -102,7 +102,7 @@ static int spmi_controller_wait_for_done(struct device *dev, return 0; } udelay(1); - } while(timeout--); + } while (timeout--); dev_err(dev, "%s: timeout, status 0x%x\n", __func__, status); return -ETIMEDOUT; @@ -121,7 +121,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { dev_err(&ctrl->dev, - "spmi_controller supports 1..%d bytes per trans, but:%ld requested", + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n", SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); return -EINVAL; } @@ -137,7 +137,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, op_code = SPMI_CMD_EXT_REG_READ_L; break; default: - dev_err(&ctrl->dev, "invalid read cmd 0x%x", opc); + dev_err(&ctrl->dev, "invalid read cmd 0x%x\n", opc); return -EINVAL; } @@ -157,7 +157,10 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, goto done; for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) { - data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * slave_id + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); + data = readl(spmi_controller->base + chnl_ofst + + SPMI_SLAVE_OFFSET * slave_id + + SPMI_APB_SPMI_RDATA0_BASE_ADDR + + i * SPMI_PER_DATAREG_BYTE); data = be32_to_cpu((__be32)data); if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { memcpy(buf, &data, sizeof(data)); @@ -194,7 +197,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { dev_err(&ctrl->dev, - "spmi_controller supports 1..%d bytes per trans, but:%ld requested", + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n", SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); return -EINVAL; } @@ -210,7 +213,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, op_code = SPMI_CMD_EXT_REG_WRITE_L; break; default: - dev_err(&ctrl->dev, "invalid write cmd 0x%x", opc); + dev_err(&ctrl->dev, "invalid write cmd 0x%x\n", opc); return -EINVAL; } @@ -234,8 +237,10 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, } writel((u32)cpu_to_be32(data), - spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); - }; + spmi_controller->base + chnl_ofst + + SPMI_APB_SPMI_WDATA0_BASE_ADDR + + SPMI_PER_DATAREG_BYTE * i); + } /* Start the transaction */ writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply related [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 2020-08-12 17:13 ` Joe Perches (?) @ 2020-08-12 18:47 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 18:47 UTC (permalink / raw) To: Joe Perches Cc: Greg Kroah-Hartman, linuxarm, mauro.chehab, Stephen Boyd, Lee Jones, devicetree, linux-arm-kernel, Wei Xu, David S. Miller, Rob Herring, linux-kernel, Rob Herring, devel, linux-arm-msm, Mark Brown, Jonathan Cameron Em Wed, 12 Aug 2020 10:13:51 -0700 Joe Perches <joe@perches.com> escreveu: > Perhaps these trivial bits on top: Sounds fine for me. Feel free to send it with your SOB, adding my reviewed by: Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 5 +++-- > drivers/staging/hikey9xx/hi6421v600-regulator.c | 6 +++--- > drivers/staging/hikey9xx/hisi-spmi-controller.c | 21 +++++++++++++-------- > 3 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c > index 76766e7b8bf9..9d73458ca65a 100644 > --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c > +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c > @@ -99,7 +99,7 @@ int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val) > EXPORT_SYMBOL(hi6421_spmi_pmic_write); > > int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, > - u32 mask, u32 bits) > + u32 mask, u32 bits) > { > unsigned long flags; > u32 data; > @@ -130,7 +130,8 @@ static irqreturn_t hi6421_spmi_irq_handler(int irq, void *data) > hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr), pending); > > /* solve powerkey order */ > - if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { > + if ((i == HISI_IRQ_KEY_NUM) && > + ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { > generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_DOWN]); > generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_UP]); > pending &= (~HISI_IRQ_KEY_VALUE); > diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c > index 29ef6bcadd84..82635ff54a74 100644 > --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c > +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c > @@ -227,7 +227,7 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, > > ret = of_property_read_u32(np, "reg", &rdesc->enable_reg); > if (ret) { > - dev_err(dev, "missing reg property\nn"); > + dev_err(dev, "missing reg property\n"); > return ret; > } > > @@ -303,13 +303,13 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, > */ > rdesc->vsel_mask = (1 << (fls(rdesc->n_voltages) - 1)) - 1; > > - dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x", > + dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x\n", > rdesc->vsel_reg, rdesc->vsel_mask); > > return 0; > } > > -static struct regulator_ops hi6421_spmi_ldo_rops = { > +static const struct regulator_ops hi6421_spmi_ldo_rops = { > .is_enabled = hi6421_spmi_regulator_is_enabled, > .enable = hi6421_spmi_regulator_enable, > .disable = hi6421_spmi_regulator_disable, > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c > index 583df10cbf1a..513d962b8bce 100644 > --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c > +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c > @@ -102,7 +102,7 @@ static int spmi_controller_wait_for_done(struct device *dev, > return 0; > } > udelay(1); > - } while(timeout--); > + } while (timeout--); > > dev_err(dev, "%s: timeout, status 0x%x\n", __func__, status); > return -ETIMEDOUT; > @@ -121,7 +121,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > > if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { > dev_err(&ctrl->dev, > - "spmi_controller supports 1..%d bytes per trans, but:%ld requested", > + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n", > SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); > return -EINVAL; > } > @@ -137,7 +137,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > op_code = SPMI_CMD_EXT_REG_READ_L; > break; > default: > - dev_err(&ctrl->dev, "invalid read cmd 0x%x", opc); > + dev_err(&ctrl->dev, "invalid read cmd 0x%x\n", opc); > return -EINVAL; > } > > @@ -157,7 +157,10 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > goto done; > > for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) { > - data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * slave_id + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); > + data = readl(spmi_controller->base + chnl_ofst + > + SPMI_SLAVE_OFFSET * slave_id + > + SPMI_APB_SPMI_RDATA0_BASE_ADDR + > + i * SPMI_PER_DATAREG_BYTE); > data = be32_to_cpu((__be32)data); > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > memcpy(buf, &data, sizeof(data)); > @@ -194,7 +197,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { > dev_err(&ctrl->dev, > - "spmi_controller supports 1..%d bytes per trans, but:%ld requested", > + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n", > SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); > return -EINVAL; > } > @@ -210,7 +213,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > op_code = SPMI_CMD_EXT_REG_WRITE_L; > break; > default: > - dev_err(&ctrl->dev, "invalid write cmd 0x%x", opc); > + dev_err(&ctrl->dev, "invalid write cmd 0x%x\n", opc); > return -EINVAL; > } > > @@ -234,8 +237,10 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > } > > writel((u32)cpu_to_be32(data), > - spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > - }; > + spmi_controller->base + chnl_ofst + > + SPMI_APB_SPMI_WDATA0_BASE_ADDR + > + SPMI_PER_DATAREG_BYTE * i); > + } > > /* Start the transaction */ > writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); > > ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-12 18:47 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 18:47 UTC (permalink / raw) To: Joe Perches Cc: devel, devicetree, Rob Herring, Stephen Boyd, Greg Kroah-Hartman, Mark Brown, Jonathan Cameron, linuxarm, Wei Xu, linux-kernel, Rob Herring, linux-arm-msm, mauro.chehab, Lee Jones, David S. Miller, linux-arm-kernel Em Wed, 12 Aug 2020 10:13:51 -0700 Joe Perches <joe@perches.com> escreveu: > Perhaps these trivial bits on top: Sounds fine for me. Feel free to send it with your SOB, adding my reviewed by: Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 5 +++-- > drivers/staging/hikey9xx/hi6421v600-regulator.c | 6 +++--- > drivers/staging/hikey9xx/hisi-spmi-controller.c | 21 +++++++++++++-------- > 3 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c > index 76766e7b8bf9..9d73458ca65a 100644 > --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c > +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c > @@ -99,7 +99,7 @@ int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val) > EXPORT_SYMBOL(hi6421_spmi_pmic_write); > > int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, > - u32 mask, u32 bits) > + u32 mask, u32 bits) > { > unsigned long flags; > u32 data; > @@ -130,7 +130,8 @@ static irqreturn_t hi6421_spmi_irq_handler(int irq, void *data) > hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr), pending); > > /* solve powerkey order */ > - if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { > + if ((i == HISI_IRQ_KEY_NUM) && > + ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { > generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_DOWN]); > generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_UP]); > pending &= (~HISI_IRQ_KEY_VALUE); > diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c > index 29ef6bcadd84..82635ff54a74 100644 > --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c > +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c > @@ -227,7 +227,7 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, > > ret = of_property_read_u32(np, "reg", &rdesc->enable_reg); > if (ret) { > - dev_err(dev, "missing reg property\nn"); > + dev_err(dev, "missing reg property\n"); > return ret; > } > > @@ -303,13 +303,13 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, > */ > rdesc->vsel_mask = (1 << (fls(rdesc->n_voltages) - 1)) - 1; > > - dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x", > + dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x\n", > rdesc->vsel_reg, rdesc->vsel_mask); > > return 0; > } > > -static struct regulator_ops hi6421_spmi_ldo_rops = { > +static const struct regulator_ops hi6421_spmi_ldo_rops = { > .is_enabled = hi6421_spmi_regulator_is_enabled, > .enable = hi6421_spmi_regulator_enable, > .disable = hi6421_spmi_regulator_disable, > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c > index 583df10cbf1a..513d962b8bce 100644 > --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c > +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c > @@ -102,7 +102,7 @@ static int spmi_controller_wait_for_done(struct device *dev, > return 0; > } > udelay(1); > - } while(timeout--); > + } while (timeout--); > > dev_err(dev, "%s: timeout, status 0x%x\n", __func__, status); > return -ETIMEDOUT; > @@ -121,7 +121,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > > if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { > dev_err(&ctrl->dev, > - "spmi_controller supports 1..%d bytes per trans, but:%ld requested", > + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n", > SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); > return -EINVAL; > } > @@ -137,7 +137,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > op_code = SPMI_CMD_EXT_REG_READ_L; > break; > default: > - dev_err(&ctrl->dev, "invalid read cmd 0x%x", opc); > + dev_err(&ctrl->dev, "invalid read cmd 0x%x\n", opc); > return -EINVAL; > } > > @@ -157,7 +157,10 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > goto done; > > for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) { > - data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * slave_id + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); > + data = readl(spmi_controller->base + chnl_ofst + > + SPMI_SLAVE_OFFSET * slave_id + > + SPMI_APB_SPMI_RDATA0_BASE_ADDR + > + i * SPMI_PER_DATAREG_BYTE); > data = be32_to_cpu((__be32)data); > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > memcpy(buf, &data, sizeof(data)); > @@ -194,7 +197,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { > dev_err(&ctrl->dev, > - "spmi_controller supports 1..%d bytes per trans, but:%ld requested", > + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n", > SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); > return -EINVAL; > } > @@ -210,7 +213,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > op_code = SPMI_CMD_EXT_REG_WRITE_L; > break; > default: > - dev_err(&ctrl->dev, "invalid write cmd 0x%x", opc); > + dev_err(&ctrl->dev, "invalid write cmd 0x%x\n", opc); > return -EINVAL; > } > > @@ -234,8 +237,10 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > } > > writel((u32)cpu_to_be32(data), > - spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > - }; > + spmi_controller->base + chnl_ofst + > + SPMI_APB_SPMI_WDATA0_BASE_ADDR + > + SPMI_PER_DATAREG_BYTE * i); > + } > > /* Start the transaction */ > writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-12 18:47 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 18:47 UTC (permalink / raw) To: Joe Perches Cc: devel, devicetree, Rob Herring, Stephen Boyd, Greg Kroah-Hartman, Mark Brown, Jonathan Cameron, linuxarm, Wei Xu, linux-kernel, Rob Herring, linux-arm-msm, mauro.chehab, Lee Jones, David S. Miller, linux-arm-kernel Em Wed, 12 Aug 2020 10:13:51 -0700 Joe Perches <joe@perches.com> escreveu: > Perhaps these trivial bits on top: Sounds fine for me. Feel free to send it with your SOB, adding my reviewed by: Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 5 +++-- > drivers/staging/hikey9xx/hi6421v600-regulator.c | 6 +++--- > drivers/staging/hikey9xx/hisi-spmi-controller.c | 21 +++++++++++++-------- > 3 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c > index 76766e7b8bf9..9d73458ca65a 100644 > --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c > +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c > @@ -99,7 +99,7 @@ int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val) > EXPORT_SYMBOL(hi6421_spmi_pmic_write); > > int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg, > - u32 mask, u32 bits) > + u32 mask, u32 bits) > { > unsigned long flags; > u32 data; > @@ -130,7 +130,8 @@ static irqreturn_t hi6421_spmi_irq_handler(int irq, void *data) > hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr), pending); > > /* solve powerkey order */ > - if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { > + if ((i == HISI_IRQ_KEY_NUM) && > + ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) { > generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_DOWN]); > generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_UP]); > pending &= (~HISI_IRQ_KEY_VALUE); > diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c > index 29ef6bcadd84..82635ff54a74 100644 > --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c > +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c > @@ -227,7 +227,7 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, > > ret = of_property_read_u32(np, "reg", &rdesc->enable_reg); > if (ret) { > - dev_err(dev, "missing reg property\nn"); > + dev_err(dev, "missing reg property\n"); > return ret; > } > > @@ -303,13 +303,13 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev, > */ > rdesc->vsel_mask = (1 << (fls(rdesc->n_voltages) - 1)) - 1; > > - dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x", > + dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x\n", > rdesc->vsel_reg, rdesc->vsel_mask); > > return 0; > } > > -static struct regulator_ops hi6421_spmi_ldo_rops = { > +static const struct regulator_ops hi6421_spmi_ldo_rops = { > .is_enabled = hi6421_spmi_regulator_is_enabled, > .enable = hi6421_spmi_regulator_enable, > .disable = hi6421_spmi_regulator_disable, > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c > index 583df10cbf1a..513d962b8bce 100644 > --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c > +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c > @@ -102,7 +102,7 @@ static int spmi_controller_wait_for_done(struct device *dev, > return 0; > } > udelay(1); > - } while(timeout--); > + } while (timeout--); > > dev_err(dev, "%s: timeout, status 0x%x\n", __func__, status); > return -ETIMEDOUT; > @@ -121,7 +121,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > > if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { > dev_err(&ctrl->dev, > - "spmi_controller supports 1..%d bytes per trans, but:%ld requested", > + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n", > SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); > return -EINVAL; > } > @@ -137,7 +137,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > op_code = SPMI_CMD_EXT_REG_READ_L; > break; > default: > - dev_err(&ctrl->dev, "invalid read cmd 0x%x", opc); > + dev_err(&ctrl->dev, "invalid read cmd 0x%x\n", opc); > return -EINVAL; > } > > @@ -157,7 +157,10 @@ static int spmi_read_cmd(struct spmi_controller *ctrl, > goto done; > > for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) { > - data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * slave_id + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE); > + data = readl(spmi_controller->base + chnl_ofst + > + SPMI_SLAVE_OFFSET * slave_id + > + SPMI_APB_SPMI_RDATA0_BASE_ADDR + > + i * SPMI_PER_DATAREG_BYTE); > data = be32_to_cpu((__be32)data); > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) { > memcpy(buf, &data, sizeof(data)); > @@ -194,7 +197,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > > if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) { > dev_err(&ctrl->dev, > - "spmi_controller supports 1..%d bytes per trans, but:%ld requested", > + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n", > SPMI_CONTROLLER_MAX_TRANS_BYTES, bc); > return -EINVAL; > } > @@ -210,7 +213,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > op_code = SPMI_CMD_EXT_REG_WRITE_L; > break; > default: > - dev_err(&ctrl->dev, "invalid write cmd 0x%x", opc); > + dev_err(&ctrl->dev, "invalid write cmd 0x%x\n", opc); > return -EINVAL; > } > > @@ -234,8 +237,10 @@ static int spmi_write_cmd(struct spmi_controller *ctrl, > } > > writel((u32)cpu_to_be32(data), > - spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i); > - }; > + spmi_controller->base + chnl_ofst + > + SPMI_APB_SPMI_WDATA0_BASE_ADDR + > + SPMI_PER_DATAREG_BYTE * i); > + } > > /* Start the transaction */ > writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR); > > _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 2020-08-12 18:47 ` Mauro Carvalho Chehab (?) @ 2020-08-12 18:58 ` Joe Perches -1 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 18:58 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: Greg Kroah-Hartman, linuxarm, mauro.chehab, Stephen Boyd, Lee Jones, devicetree, linux-arm-kernel, Wei Xu, David S. Miller, Rob Herring, linux-kernel, Rob Herring, devel, linux-arm-msm, Mark Brown, Jonathan Cameron On Wed, 2020-08-12 at 15:47 -0300, Mauro Carvalho Chehab wrote: > Em Wed, 12 Aug 2020 10:13:51 -0700 > Joe Perches <joe@perches.com> escreveu: > > > Perhaps these trivial bits on top: > > Sounds fine for me. Feel free to send it with your SOB, adding my reviewed by: > > Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> I don't know that your original series is going to be applied as-is so I think you should carry it. cheers, Joe ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-12 18:58 ` Joe Perches 0 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 18:58 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: devel, devicetree, Rob Herring, Stephen Boyd, Greg Kroah-Hartman, Mark Brown, Jonathan Cameron, linuxarm, Wei Xu, linux-kernel, Rob Herring, linux-arm-msm, mauro.chehab, Lee Jones, David S. Miller, linux-arm-kernel On Wed, 2020-08-12 at 15:47 -0300, Mauro Carvalho Chehab wrote: > Em Wed, 12 Aug 2020 10:13:51 -0700 > Joe Perches <joe@perches.com> escreveu: > > > Perhaps these trivial bits on top: > > Sounds fine for me. Feel free to send it with your SOB, adding my reviewed by: > > Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> I don't know that your original series is going to be applied as-is so I think you should carry it. cheers, Joe _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-12 18:58 ` Joe Perches 0 siblings, 0 replies; 129+ messages in thread From: Joe Perches @ 2020-08-12 18:58 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: devel, devicetree, Rob Herring, Stephen Boyd, Greg Kroah-Hartman, Mark Brown, Jonathan Cameron, linuxarm, Wei Xu, linux-kernel, Rob Herring, linux-arm-msm, mauro.chehab, Lee Jones, David S. Miller, linux-arm-kernel On Wed, 2020-08-12 at 15:47 -0300, Mauro Carvalho Chehab wrote: > Em Wed, 12 Aug 2020 10:13:51 -0700 > Joe Perches <joe@perches.com> escreveu: > > > Perhaps these trivial bits on top: > > Sounds fine for me. Feel free to send it with your SOB, adding my reviewed by: > > Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> I don't know that your original series is going to be applied as-is so I think you should carry it. cheers, Joe _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 2020-08-12 18:58 ` Joe Perches (?) @ 2020-08-12 19:07 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 19:07 UTC (permalink / raw) To: Joe Perches Cc: Greg Kroah-Hartman, linuxarm, mauro.chehab, Stephen Boyd, Lee Jones, devicetree, linux-arm-kernel, Wei Xu, David S. Miller, Rob Herring, linux-kernel, Rob Herring, devel, linux-arm-msm, Mark Brown, Jonathan Cameron Em Wed, 12 Aug 2020 11:58:55 -0700 Joe Perches <joe@perches.com> escreveu: > On Wed, 2020-08-12 at 15:47 -0300, Mauro Carvalho Chehab wrote: > > Em Wed, 12 Aug 2020 10:13:51 -0700 > > Joe Perches <joe@perches.com> escreveu: > > > > > Perhaps these trivial bits on top: > > > > Sounds fine for me. Feel free to send it with your SOB, adding my reviewed by: > > > > Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > I don't know that your original > series is going to be applied as-is > so I think you should carry it. Ok. I'll then add the hunks you wrote to the affected changesets. > > cheers, Joe > > ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-12 19:07 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 19:07 UTC (permalink / raw) To: Joe Perches Cc: devel, devicetree, Rob Herring, Stephen Boyd, Greg Kroah-Hartman, Mark Brown, Jonathan Cameron, linuxarm, Wei Xu, linux-kernel, Rob Herring, linux-arm-msm, mauro.chehab, Lee Jones, David S. Miller, linux-arm-kernel Em Wed, 12 Aug 2020 11:58:55 -0700 Joe Perches <joe@perches.com> escreveu: > On Wed, 2020-08-12 at 15:47 -0300, Mauro Carvalho Chehab wrote: > > Em Wed, 12 Aug 2020 10:13:51 -0700 > > Joe Perches <joe@perches.com> escreveu: > > > > > Perhaps these trivial bits on top: > > > > Sounds fine for me. Feel free to send it with your SOB, adding my reviewed by: > > > > Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > I don't know that your original > series is going to be applied as-is > so I think you should carry it. Ok. I'll then add the hunks you wrote to the affected changesets. > > cheers, Joe > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-12 19:07 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-12 19:07 UTC (permalink / raw) To: Joe Perches Cc: devel, devicetree, Rob Herring, Stephen Boyd, Greg Kroah-Hartman, Mark Brown, Jonathan Cameron, linuxarm, Wei Xu, linux-kernel, Rob Herring, linux-arm-msm, mauro.chehab, Lee Jones, David S. Miller, linux-arm-kernel Em Wed, 12 Aug 2020 11:58:55 -0700 Joe Perches <joe@perches.com> escreveu: > On Wed, 2020-08-12 at 15:47 -0300, Mauro Carvalho Chehab wrote: > > Em Wed, 12 Aug 2020 10:13:51 -0700 > > Joe Perches <joe@perches.com> escreveu: > > > > > Perhaps these trivial bits on top: > > > > Sounds fine for me. Feel free to send it with your SOB, adding my reviewed by: > > > > Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > I don't know that your original > series is going to be applied as-is > so I think you should carry it. Ok. I'll then add the hunks you wrote to the affected changesets. > > cheers, Joe > > _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 2020-08-12 15:56 ` Mauro Carvalho Chehab (?) @ 2020-08-13 7:58 ` Lee Jones -1 siblings, 0 replies; 129+ messages in thread From: Lee Jones @ 2020-08-13 7:58 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: Greg Kroah-Hartman, linuxarm, mauro.chehab, Stephen Boyd, devicetree, linux-arm-kernel, Wei Xu, David S. Miller, Rob Herring, linux-kernel, Rob Herring, devel, linux-arm-msm, Mark Brown, Jonathan Cameron On Wed, 12 Aug 2020, Mauro Carvalho Chehab wrote: > Hi Greg, > > This patch series is part of a work I'm doing in order to be able to support > a HiKey 970 board that I recently got on my hands. > > I received some freedback from Mark and from Jonathan on a first > attempt I made to upstream this. > > I'm opting to submit it via staging, because I had to start from the > patch that originally added this driver on a 4.9 Kernel tree: > > https://github.com/96boards-hikey/linux/tree/hikey970-v4.9 > > In order to preserve the original SOB from the driver's author. > > The patches following it are on the standard way: one patch per > logical change. > > This is part of a bigger work whose goal is to have upstream support > for USB and DRM/KMS on such boards. > > I suspect that, maybe except for the DT part, those 3 specific drivers > are more or less ready to be moved from staging, but the other > drivers that are also part of this attempt aren't ready. Specially the > DRM driver has some bugs that came from the OOT version. > > So, my current plan is to submit those drivers to staging for 5.9 > and move the ones that are ok out of staging on Kernel 5.10. What a mess. This is no way to upstream a new driver. Firstly, could you please add versioning to your submissions. I know this at least version 2. Were there previous submissions? Is this the latest? Secondly and more importantly, you have submitted what looks like a new driver (bearing in mind that I'm only concerning myself with the MFD related changes), then in the same submission you are adding and removing large chunks. Please just submit the new driver, on its own as a single patch, complete with its associated Makefile and Kconfig changes. What are your reasons for submitting this via Staging? Is it not ready yet? Are the resultant components not at a high enough level of quality or enablement to go straight into the subsystems, which is more typical? From an MFD perspective, I would be reviewing the driver as a whole when (if) it moves from Staging into MFD anyway, so why are you jumping through hoops with this additional, seemingly superfluous step? Finally, the subject of authorship is often a contentious one, but this is a problem you need to work out with the original author, not something that should require special handing by upstream. You have a couple of choices, but bear in mind that upstreaming a non-suitable driver then bringing it up to standard is not one of them. 1. Keep the original author's authorship and SoB, make your changes and get them to review to ensure they are still happy about being associated with the resultant code. Ensure you mention all of the changes you make in the commit message and follow-up by adding your own SoB. 2. This is the contentious bit. If you've made enough changes, there is an argument for you to adopt authorship. You should discuss with the original author whether they are happy for you to retain their SoB. My suggestion is always try to keep the SoB as a bare minimum to preserve patch history and out of pure courtesy. > Mauro Carvalho Chehab (41): > staging: spmi: hisi-spmi-controller: coding style fixup > staging: spmi: hisi-spmi-controller: fix it to probe successfully > staging: spmi: hisi-spmi-controller: fix a typo > staging: spmi: hisi-spmi-controller: adjust whitespaces at defines > staging: spmi: hisi-spmi-controller: use le32 macros where needed > staging: spmi: hisi-spmi-controller: add debug when values are > read/write > staging: spmi: hisi-spmi-controller: fix the dev_foo() logic > staging: spmi: hisi-spmi-controller: add it to the building system > staging: spmi: hisi-spmi-controller: do some code cleanups > staging: mfd: hi6421-spmi-pmic: get rid of unused code > staging: mfd: hi6421-spmi-pmic: deal with non-static functions > staging: mfd: hi6421-spmi-pmic: get rid of the static vars > staging: mfd: hi6421-spmi-pmic: cleanup hi6421-spmi-pmic.h header > staging: mfd: hi6421-spmi-pmic: change the binding logic > staging: mfd: hi6421-spmi-pmic: get rid of unused OF properties > staging: mfd: hi6421-spmi-pmic: cleanup OF properties > staging: mfd: hi6421-spmi-pmic: change namespace on its functions > staging: mfd: hi6421-spmi-pmic: fix some coding style issues > staging: mfd: hi6421-spmi-pmic: add it to the building system > staging: mfd: hi6421-spmi-pmic: cleanup the code > staging: regulator: hi6421v600-regulator: get rid of unused code > staging: regulator: hi6421v600-regulator: port it to upstream > staging: regulator: hi6421v600-regulator: coding style fixups > staging: regulator: hi6421v600-regulator: change the binding logic > staging: regulator: hi6421v600-regulator: cleanup struct > hisi_regulator > staging: regulator: hi6421v600-regulator: cleanup debug messages > staging: regulator: hi6421v600-regulator: use shorter names for OF > properties > staging: regulator: hi6421v600-regulator: better handle modes > staging: regulator: hi6421v600-regulator: change namespace > staging: regulator: hi6421v600-regulator: convert to use get/set > voltage_sel > staging: regulator: hi6421v600-regulator: don't use usleep_range for > off_on_delay > staging: regulator: hi6421v600-regulator: add a driver-specific debug > macro > staging: regulator: hi6421v600-regulator: initialize ramp_delay > staging: regulator: hi6421v600-regulator: cleanup DT settings > staging: regulator: hi6421v600-regulator: fix some coding style issues > staging: regulator: hi6421v600-regulator: add it to the building > system > staging: regulator: hi6421v600-regulator: code cleanup > staging: hikey9xx: add a TODO list > MAINTAINERS: add an entry for HiSilicon 6421v600 drivers > dt: document HiSilicon SPMI controller and mfd/regulator properties > dt: hisilicon: add support for the PMIC found on Hikey 970 > > Mayulong (3): > staging: spmi: add Hikey 970 SPMI controller driver > staging: mfd: add a PMIC driver for HiSilicon 6421 SPMI version > staging: regulator: add a regulator driver for HiSilicon 6421v600 SPMI > PMIC > > .../mfd/hisilicon,hi6421-spmi-pmic.yaml | 182 +++++++ > .../spmi/hisilicon,hisi-spmi-controller.yaml | 54 ++ > MAINTAINERS | 6 + > .../boot/dts/hisilicon/hi3670-hikey970.dts | 16 +- > .../boot/dts/hisilicon/hikey970-pmic.dtsi | 200 ++++++++ > drivers/staging/Kconfig | 2 + > drivers/staging/Makefile | 1 + > drivers/staging/hikey9xx/Kconfig | 35 ++ > drivers/staging/hikey9xx/Makefile | 5 + > drivers/staging/hikey9xx/TODO | 5 + > drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 381 ++++++++++++++ > .../staging/hikey9xx/hi6421v600-regulator.c | 479 ++++++++++++++++++ > .../staging/hikey9xx/hisi-spmi-controller.c | 351 +++++++++++++ > include/linux/mfd/hi6421-spmi-pmic.h | 68 +++ > 14 files changed, 1773 insertions(+), 12 deletions(-) > create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml > create mode 100644 Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml > create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi > create mode 100644 drivers/staging/hikey9xx/Kconfig > create mode 100644 drivers/staging/hikey9xx/Makefile > create mode 100644 drivers/staging/hikey9xx/TODO > create mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c > create mode 100644 drivers/staging/hikey9xx/hi6421v600-regulator.c > create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c > create mode 100644 include/linux/mfd/hi6421-spmi-pmic.h > -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-13 7:58 ` Lee Jones 0 siblings, 0 replies; 129+ messages in thread From: Lee Jones @ 2020-08-13 7:58 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: devel, devicetree, Rob Herring, Stephen Boyd, Greg Kroah-Hartman, Mark Brown, Jonathan Cameron, linuxarm, Wei Xu, linux-kernel, Rob Herring, linux-arm-msm, mauro.chehab, David S. Miller, linux-arm-kernel On Wed, 12 Aug 2020, Mauro Carvalho Chehab wrote: > Hi Greg, > > This patch series is part of a work I'm doing in order to be able to support > a HiKey 970 board that I recently got on my hands. > > I received some freedback from Mark and from Jonathan on a first > attempt I made to upstream this. > > I'm opting to submit it via staging, because I had to start from the > patch that originally added this driver on a 4.9 Kernel tree: > > https://github.com/96boards-hikey/linux/tree/hikey970-v4.9 > > In order to preserve the original SOB from the driver's author. > > The patches following it are on the standard way: one patch per > logical change. > > This is part of a bigger work whose goal is to have upstream support > for USB and DRM/KMS on such boards. > > I suspect that, maybe except for the DT part, those 3 specific drivers > are more or less ready to be moved from staging, but the other > drivers that are also part of this attempt aren't ready. Specially the > DRM driver has some bugs that came from the OOT version. > > So, my current plan is to submit those drivers to staging for 5.9 > and move the ones that are ok out of staging on Kernel 5.10. What a mess. This is no way to upstream a new driver. Firstly, could you please add versioning to your submissions. I know this at least version 2. Were there previous submissions? Is this the latest? Secondly and more importantly, you have submitted what looks like a new driver (bearing in mind that I'm only concerning myself with the MFD related changes), then in the same submission you are adding and removing large chunks. Please just submit the new driver, on its own as a single patch, complete with its associated Makefile and Kconfig changes. What are your reasons for submitting this via Staging? Is it not ready yet? Are the resultant components not at a high enough level of quality or enablement to go straight into the subsystems, which is more typical? From an MFD perspective, I would be reviewing the driver as a whole when (if) it moves from Staging into MFD anyway, so why are you jumping through hoops with this additional, seemingly superfluous step? Finally, the subject of authorship is often a contentious one, but this is a problem you need to work out with the original author, not something that should require special handing by upstream. You have a couple of choices, but bear in mind that upstreaming a non-suitable driver then bringing it up to standard is not one of them. 1. Keep the original author's authorship and SoB, make your changes and get them to review to ensure they are still happy about being associated with the resultant code. Ensure you mention all of the changes you make in the commit message and follow-up by adding your own SoB. 2. This is the contentious bit. If you've made enough changes, there is an argument for you to adopt authorship. You should discuss with the original author whether they are happy for you to retain their SoB. My suggestion is always try to keep the SoB as a bare minimum to preserve patch history and out of pure courtesy. > Mauro Carvalho Chehab (41): > staging: spmi: hisi-spmi-controller: coding style fixup > staging: spmi: hisi-spmi-controller: fix it to probe successfully > staging: spmi: hisi-spmi-controller: fix a typo > staging: spmi: hisi-spmi-controller: adjust whitespaces at defines > staging: spmi: hisi-spmi-controller: use le32 macros where needed > staging: spmi: hisi-spmi-controller: add debug when values are > read/write > staging: spmi: hisi-spmi-controller: fix the dev_foo() logic > staging: spmi: hisi-spmi-controller: add it to the building system > staging: spmi: hisi-spmi-controller: do some code cleanups > staging: mfd: hi6421-spmi-pmic: get rid of unused code > staging: mfd: hi6421-spmi-pmic: deal with non-static functions > staging: mfd: hi6421-spmi-pmic: get rid of the static vars > staging: mfd: hi6421-spmi-pmic: cleanup hi6421-spmi-pmic.h header > staging: mfd: hi6421-spmi-pmic: change the binding logic > staging: mfd: hi6421-spmi-pmic: get rid of unused OF properties > staging: mfd: hi6421-spmi-pmic: cleanup OF properties > staging: mfd: hi6421-spmi-pmic: change namespace on its functions > staging: mfd: hi6421-spmi-pmic: fix some coding style issues > staging: mfd: hi6421-spmi-pmic: add it to the building system > staging: mfd: hi6421-spmi-pmic: cleanup the code > staging: regulator: hi6421v600-regulator: get rid of unused code > staging: regulator: hi6421v600-regulator: port it to upstream > staging: regulator: hi6421v600-regulator: coding style fixups > staging: regulator: hi6421v600-regulator: change the binding logic > staging: regulator: hi6421v600-regulator: cleanup struct > hisi_regulator > staging: regulator: hi6421v600-regulator: cleanup debug messages > staging: regulator: hi6421v600-regulator: use shorter names for OF > properties > staging: regulator: hi6421v600-regulator: better handle modes > staging: regulator: hi6421v600-regulator: change namespace > staging: regulator: hi6421v600-regulator: convert to use get/set > voltage_sel > staging: regulator: hi6421v600-regulator: don't use usleep_range for > off_on_delay > staging: regulator: hi6421v600-regulator: add a driver-specific debug > macro > staging: regulator: hi6421v600-regulator: initialize ramp_delay > staging: regulator: hi6421v600-regulator: cleanup DT settings > staging: regulator: hi6421v600-regulator: fix some coding style issues > staging: regulator: hi6421v600-regulator: add it to the building > system > staging: regulator: hi6421v600-regulator: code cleanup > staging: hikey9xx: add a TODO list > MAINTAINERS: add an entry for HiSilicon 6421v600 drivers > dt: document HiSilicon SPMI controller and mfd/regulator properties > dt: hisilicon: add support for the PMIC found on Hikey 970 > > Mayulong (3): > staging: spmi: add Hikey 970 SPMI controller driver > staging: mfd: add a PMIC driver for HiSilicon 6421 SPMI version > staging: regulator: add a regulator driver for HiSilicon 6421v600 SPMI > PMIC > > .../mfd/hisilicon,hi6421-spmi-pmic.yaml | 182 +++++++ > .../spmi/hisilicon,hisi-spmi-controller.yaml | 54 ++ > MAINTAINERS | 6 + > .../boot/dts/hisilicon/hi3670-hikey970.dts | 16 +- > .../boot/dts/hisilicon/hikey970-pmic.dtsi | 200 ++++++++ > drivers/staging/Kconfig | 2 + > drivers/staging/Makefile | 1 + > drivers/staging/hikey9xx/Kconfig | 35 ++ > drivers/staging/hikey9xx/Makefile | 5 + > drivers/staging/hikey9xx/TODO | 5 + > drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 381 ++++++++++++++ > .../staging/hikey9xx/hi6421v600-regulator.c | 479 ++++++++++++++++++ > .../staging/hikey9xx/hisi-spmi-controller.c | 351 +++++++++++++ > include/linux/mfd/hi6421-spmi-pmic.h | 68 +++ > 14 files changed, 1773 insertions(+), 12 deletions(-) > create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml > create mode 100644 Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml > create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi > create mode 100644 drivers/staging/hikey9xx/Kconfig > create mode 100644 drivers/staging/hikey9xx/Makefile > create mode 100644 drivers/staging/hikey9xx/TODO > create mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c > create mode 100644 drivers/staging/hikey9xx/hi6421v600-regulator.c > create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c > create mode 100644 include/linux/mfd/hi6421-spmi-pmic.h > -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-13 7:58 ` Lee Jones 0 siblings, 0 replies; 129+ messages in thread From: Lee Jones @ 2020-08-13 7:58 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: devel, devicetree, Rob Herring, Stephen Boyd, Greg Kroah-Hartman, Mark Brown, Jonathan Cameron, linuxarm, Wei Xu, linux-kernel, Rob Herring, linux-arm-msm, mauro.chehab, David S. Miller, linux-arm-kernel On Wed, 12 Aug 2020, Mauro Carvalho Chehab wrote: > Hi Greg, > > This patch series is part of a work I'm doing in order to be able to support > a HiKey 970 board that I recently got on my hands. > > I received some freedback from Mark and from Jonathan on a first > attempt I made to upstream this. > > I'm opting to submit it via staging, because I had to start from the > patch that originally added this driver on a 4.9 Kernel tree: > > https://github.com/96boards-hikey/linux/tree/hikey970-v4.9 > > In order to preserve the original SOB from the driver's author. > > The patches following it are on the standard way: one patch per > logical change. > > This is part of a bigger work whose goal is to have upstream support > for USB and DRM/KMS on such boards. > > I suspect that, maybe except for the DT part, those 3 specific drivers > are more or less ready to be moved from staging, but the other > drivers that are also part of this attempt aren't ready. Specially the > DRM driver has some bugs that came from the OOT version. > > So, my current plan is to submit those drivers to staging for 5.9 > and move the ones that are ok out of staging on Kernel 5.10. What a mess. This is no way to upstream a new driver. Firstly, could you please add versioning to your submissions. I know this at least version 2. Were there previous submissions? Is this the latest? Secondly and more importantly, you have submitted what looks like a new driver (bearing in mind that I'm only concerning myself with the MFD related changes), then in the same submission you are adding and removing large chunks. Please just submit the new driver, on its own as a single patch, complete with its associated Makefile and Kconfig changes. What are your reasons for submitting this via Staging? Is it not ready yet? Are the resultant components not at a high enough level of quality or enablement to go straight into the subsystems, which is more typical? From an MFD perspective, I would be reviewing the driver as a whole when (if) it moves from Staging into MFD anyway, so why are you jumping through hoops with this additional, seemingly superfluous step? Finally, the subject of authorship is often a contentious one, but this is a problem you need to work out with the original author, not something that should require special handing by upstream. You have a couple of choices, but bear in mind that upstreaming a non-suitable driver then bringing it up to standard is not one of them. 1. Keep the original author's authorship and SoB, make your changes and get them to review to ensure they are still happy about being associated with the resultant code. Ensure you mention all of the changes you make in the commit message and follow-up by adding your own SoB. 2. This is the contentious bit. If you've made enough changes, there is an argument for you to adopt authorship. You should discuss with the original author whether they are happy for you to retain their SoB. My suggestion is always try to keep the SoB as a bare minimum to preserve patch history and out of pure courtesy. > Mauro Carvalho Chehab (41): > staging: spmi: hisi-spmi-controller: coding style fixup > staging: spmi: hisi-spmi-controller: fix it to probe successfully > staging: spmi: hisi-spmi-controller: fix a typo > staging: spmi: hisi-spmi-controller: adjust whitespaces at defines > staging: spmi: hisi-spmi-controller: use le32 macros where needed > staging: spmi: hisi-spmi-controller: add debug when values are > read/write > staging: spmi: hisi-spmi-controller: fix the dev_foo() logic > staging: spmi: hisi-spmi-controller: add it to the building system > staging: spmi: hisi-spmi-controller: do some code cleanups > staging: mfd: hi6421-spmi-pmic: get rid of unused code > staging: mfd: hi6421-spmi-pmic: deal with non-static functions > staging: mfd: hi6421-spmi-pmic: get rid of the static vars > staging: mfd: hi6421-spmi-pmic: cleanup hi6421-spmi-pmic.h header > staging: mfd: hi6421-spmi-pmic: change the binding logic > staging: mfd: hi6421-spmi-pmic: get rid of unused OF properties > staging: mfd: hi6421-spmi-pmic: cleanup OF properties > staging: mfd: hi6421-spmi-pmic: change namespace on its functions > staging: mfd: hi6421-spmi-pmic: fix some coding style issues > staging: mfd: hi6421-spmi-pmic: add it to the building system > staging: mfd: hi6421-spmi-pmic: cleanup the code > staging: regulator: hi6421v600-regulator: get rid of unused code > staging: regulator: hi6421v600-regulator: port it to upstream > staging: regulator: hi6421v600-regulator: coding style fixups > staging: regulator: hi6421v600-regulator: change the binding logic > staging: regulator: hi6421v600-regulator: cleanup struct > hisi_regulator > staging: regulator: hi6421v600-regulator: cleanup debug messages > staging: regulator: hi6421v600-regulator: use shorter names for OF > properties > staging: regulator: hi6421v600-regulator: better handle modes > staging: regulator: hi6421v600-regulator: change namespace > staging: regulator: hi6421v600-regulator: convert to use get/set > voltage_sel > staging: regulator: hi6421v600-regulator: don't use usleep_range for > off_on_delay > staging: regulator: hi6421v600-regulator: add a driver-specific debug > macro > staging: regulator: hi6421v600-regulator: initialize ramp_delay > staging: regulator: hi6421v600-regulator: cleanup DT settings > staging: regulator: hi6421v600-regulator: fix some coding style issues > staging: regulator: hi6421v600-regulator: add it to the building > system > staging: regulator: hi6421v600-regulator: code cleanup > staging: hikey9xx: add a TODO list > MAINTAINERS: add an entry for HiSilicon 6421v600 drivers > dt: document HiSilicon SPMI controller and mfd/regulator properties > dt: hisilicon: add support for the PMIC found on Hikey 970 > > Mayulong (3): > staging: spmi: add Hikey 970 SPMI controller driver > staging: mfd: add a PMIC driver for HiSilicon 6421 SPMI version > staging: regulator: add a regulator driver for HiSilicon 6421v600 SPMI > PMIC > > .../mfd/hisilicon,hi6421-spmi-pmic.yaml | 182 +++++++ > .../spmi/hisilicon,hisi-spmi-controller.yaml | 54 ++ > MAINTAINERS | 6 + > .../boot/dts/hisilicon/hi3670-hikey970.dts | 16 +- > .../boot/dts/hisilicon/hikey970-pmic.dtsi | 200 ++++++++ > drivers/staging/Kconfig | 2 + > drivers/staging/Makefile | 1 + > drivers/staging/hikey9xx/Kconfig | 35 ++ > drivers/staging/hikey9xx/Makefile | 5 + > drivers/staging/hikey9xx/TODO | 5 + > drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 381 ++++++++++++++ > .../staging/hikey9xx/hi6421v600-regulator.c | 479 ++++++++++++++++++ > .../staging/hikey9xx/hisi-spmi-controller.c | 351 +++++++++++++ > include/linux/mfd/hi6421-spmi-pmic.h | 68 +++ > 14 files changed, 1773 insertions(+), 12 deletions(-) > create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml > create mode 100644 Documentation/devicetree/bindings/spmi/hisilicon,hisi-spmi-controller.yaml > create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi > create mode 100644 drivers/staging/hikey9xx/Kconfig > create mode 100644 drivers/staging/hikey9xx/Makefile > create mode 100644 drivers/staging/hikey9xx/TODO > create mode 100644 drivers/staging/hikey9xx/hi6421-spmi-pmic.c > create mode 100644 drivers/staging/hikey9xx/hi6421v600-regulator.c > create mode 100644 drivers/staging/hikey9xx/hisi-spmi-controller.c > create mode 100644 include/linux/mfd/hi6421-spmi-pmic.h > -- Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 2020-08-13 7:58 ` Lee Jones (?) @ 2020-08-13 9:58 ` Mauro Carvalho Chehab -1 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-13 9:58 UTC (permalink / raw) To: Lee Jones Cc: Greg Kroah-Hartman, linuxarm, mauro.chehab, Stephen Boyd, devicetree, linux-arm-kernel, Wei Xu, David S. Miller, Rob Herring, linux-kernel, Rob Herring, devel, linux-arm-msm, Mark Brown, Jonathan Cameron Hi Lee, Em Thu, 13 Aug 2020 08:58:27 +0100 Lee Jones <lee.jones@linaro.org> escreveu: > On Wed, 12 Aug 2020, Mauro Carvalho Chehab wrote: > > > Hi Greg, > > > > This patch series is part of a work I'm doing in order to be able to support > > a HiKey 970 board that I recently got on my hands. > > > > I received some freedback from Mark and from Jonathan on a first > > attempt I made to upstream this. > > > > I'm opting to submit it via staging, because I had to start from the > > patch that originally added this driver on a 4.9 Kernel tree: > > > > https://github.com/96boards-hikey/linux/tree/hikey970-v4.9 > > > > In order to preserve the original SOB from the driver's author. > > > > The patches following it are on the standard way: one patch per > > logical change. > > > > This is part of a bigger work whose goal is to have upstream support > > for USB and DRM/KMS on such boards. > > > > I suspect that, maybe except for the DT part, those 3 specific drivers > > are more or less ready to be moved from staging, but the other > > drivers that are also part of this attempt aren't ready. Specially the > > DRM driver has some bugs that came from the OOT version. > > > > So, my current plan is to submit those drivers to staging for 5.9 > > and move the ones that are ok out of staging on Kernel 5.10. > > What a mess. This is no way to upstream a new driver. > > Firstly, could you please add versioning to your submissions. I know > this at least version 2. Were there previous submissions? Is this > the latest? Yeah, that's the second attempt. The first one was: https://lore.kernel.org/lkml/176043f329dfa9889f014feec04e7e1553077873.1597160086.git.mchehab+huawei@kernel.org/T/#u I was in doubt about adding a v2 in this specific case or not, since I ended submitting it to the staging tree. > Secondly and more importantly, you have submitted what looks like a > new driver (bearing in mind that I'm only concerning myself with the > MFD related changes), then in the same submission you are adding and > removing large chunks. Please just submit the new driver, on its own > as a single patch, complete with its associated Makefile and Kconfig > changes. I can't do like that because I'm not the author of the original patch that added the driver. The original patch came from the 96board's android-kernel based 4.9 tree: https://github.com/96boards-hikey/linux/tree/hikey970-v4.9 > What are your reasons for submitting this via Staging? The main reason is to preserve both the patch authorship and its history. After the original patch, I wrote several incremental changes cleaning up the original driver and stripping parts of it that aren't needed. By preserving the history, if someone wants to restore some removed functionality, it is just a matter of reverting a patch. For example, the original driver had its own sysfs interface for debugging the regulator driver. This is not needed for it to work. Also, the right interface for such things is via configfs. Yet, someone could think on restoring such feat and start from the existing code, instead of coming with something else from scratch. > Is it not ready yet? From my side, I believe that, after my changes, the code now meets upstream requirements, maybe except for DT (and the parsing code). There are a few things at the DT properties on this driver that could be named on a different (more standard way). Yet, I'm not a regular contributor for mfd/regulator/spmi. So, I may have missed something. > Are the resultant components not at a high enough level of > quality or enablement to go straight into the subsystems, which is > more typical? From an MFD perspective, I would be reviewing the > driver as a whole when (if) it moves from Staging into MFD anyway, so > why are you jumping through hoops with this additional, seemingly > superfluous step? I'm OK if this gets reviewed by MFD people only after moving it out of staging. Assuming that this would be merged for Kernel 5.10, I'll likely send a patch moving it out of staging for 5.11. Then, you can do a comprehensive review. > Finally, the subject of authorship is often a contentious one, but > this is a problem you need to work out with the original author, not > something that should require special handing by upstream. You have a > couple of choices, but bear in mind that upstreaming a non-suitable > driver then bringing it up to standard is not one of them. > > 1. Keep the original author's authorship and SoB, make your changes > and get them to review to ensure they are still happy about being > associated with the resultant code. Ensure you mention all of the > changes you make in the commit message and follow-up by adding your > own SoB. > > 2. This is the contentious bit. If you've made enough changes, there > is an argument for you to adopt authorship. You should discuss > with the original author whether they are happy for you to retain > their SoB. My suggestion is always try to keep the SoB as a bare > minimum to preserve patch history and out of pure courtesy. It is not only the above. Both the original author and anyone touching the code should comply with applicable internal policies. From my experience, dealing with such things takes a lot more of time then coding, as it require talking with legal departments on different continents, and with developers and with their bosses in order to be able to do things like that. This can also be a very frustrating process. During almost 20 years of being the media maintainer, I've seen several cases where trying to enforce a folded initial patch caused devs to receive NACKS, preventing them so submit otherwise good stuff. So, at the media subsystem, I'm perfectly fine if someone starts from the original OOT driver, preserving its original authorships. We're also dealing there with the patches sent to drivers/staging/media. I'm not saying that other subsystem maintainers should do the same. Dealing with staging is time consuming, and I completely understand that most maintainers prefer to stay out of it ;-) - Since when staging tree started, if someone has to start from the original patch, such things can be merged at staging. Then, incremental patches are applied at the top until it reaches what's required to be promoted. That's said, there's no hush to have those drivers out of staging. My end goal is to have DRM/KMS and USB support for Hikey 970. The patchsets I have so far are at: https://github.com/mchehab/linux/commits/hikey970/to_upstream-2.0-v1.1 (this branch has the v1 of my patchset) Porting this driver is part of such effort. While this driver is on a good situation, the other ones may require some time to mature. The DRM/KMS driver for example, is not ready to be merged outside staging, as it carries several bugs that came from the original driver and are present at the official tree at 96boards. For example, there is a a very dirty hack that enforces the HDMI chipset to only work with a limited set of resolutions that are known to work: https://github.com/96boards-hikey/linux/blob/hikey970-v4.9/drivers/gpu/drm/hisilicon/kirin9xx/hdmi/adv7535.c#L869 It also has problems reading the frequencies via EDID interface. Due to that, the driver fakes an EDID table: https://github.com/96boards-hikey/linux/blob/hikey970-v4.9/drivers/gpu/drm/hisilicon/kirin9xx/hdmi/adv7535.c#L463 It sounds to me that some clocks are not properly set for a random resolution, but fixing it is not trivial and requires deep knowledge about how the display registers should be tuned to better support resolutions. The current settings cause underflows with 1080p, which in turn makes the display driver to (silently) stop working. So, in summary, I believe that some drivers from my port will require being at staging for a while. While I was planning to do that on my next patch submission, placing the PM drivers there won't make much difference from my side, as I'll need to be submitting patches anyway moving drivers out of staging as they become ready. Thanks, Mauro ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-13 9:58 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-13 9:58 UTC (permalink / raw) To: Lee Jones Cc: devel, devicetree, Rob Herring, Stephen Boyd, Greg Kroah-Hartman, Mark Brown, Jonathan Cameron, linuxarm, Wei Xu, linux-kernel, Rob Herring, linux-arm-msm, mauro.chehab, David S. Miller, linux-arm-kernel Hi Lee, Em Thu, 13 Aug 2020 08:58:27 +0100 Lee Jones <lee.jones@linaro.org> escreveu: > On Wed, 12 Aug 2020, Mauro Carvalho Chehab wrote: > > > Hi Greg, > > > > This patch series is part of a work I'm doing in order to be able to support > > a HiKey 970 board that I recently got on my hands. > > > > I received some freedback from Mark and from Jonathan on a first > > attempt I made to upstream this. > > > > I'm opting to submit it via staging, because I had to start from the > > patch that originally added this driver on a 4.9 Kernel tree: > > > > https://github.com/96boards-hikey/linux/tree/hikey970-v4.9 > > > > In order to preserve the original SOB from the driver's author. > > > > The patches following it are on the standard way: one patch per > > logical change. > > > > This is part of a bigger work whose goal is to have upstream support > > for USB and DRM/KMS on such boards. > > > > I suspect that, maybe except for the DT part, those 3 specific drivers > > are more or less ready to be moved from staging, but the other > > drivers that are also part of this attempt aren't ready. Specially the > > DRM driver has some bugs that came from the OOT version. > > > > So, my current plan is to submit those drivers to staging for 5.9 > > and move the ones that are ok out of staging on Kernel 5.10. > > What a mess. This is no way to upstream a new driver. > > Firstly, could you please add versioning to your submissions. I know > this at least version 2. Were there previous submissions? Is this > the latest? Yeah, that's the second attempt. The first one was: https://lore.kernel.org/lkml/176043f329dfa9889f014feec04e7e1553077873.1597160086.git.mchehab+huawei@kernel.org/T/#u I was in doubt about adding a v2 in this specific case or not, since I ended submitting it to the staging tree. > Secondly and more importantly, you have submitted what looks like a > new driver (bearing in mind that I'm only concerning myself with the > MFD related changes), then in the same submission you are adding and > removing large chunks. Please just submit the new driver, on its own > as a single patch, complete with its associated Makefile and Kconfig > changes. I can't do like that because I'm not the author of the original patch that added the driver. The original patch came from the 96board's android-kernel based 4.9 tree: https://github.com/96boards-hikey/linux/tree/hikey970-v4.9 > What are your reasons for submitting this via Staging? The main reason is to preserve both the patch authorship and its history. After the original patch, I wrote several incremental changes cleaning up the original driver and stripping parts of it that aren't needed. By preserving the history, if someone wants to restore some removed functionality, it is just a matter of reverting a patch. For example, the original driver had its own sysfs interface for debugging the regulator driver. This is not needed for it to work. Also, the right interface for such things is via configfs. Yet, someone could think on restoring such feat and start from the existing code, instead of coming with something else from scratch. > Is it not ready yet? From my side, I believe that, after my changes, the code now meets upstream requirements, maybe except for DT (and the parsing code). There are a few things at the DT properties on this driver that could be named on a different (more standard way). Yet, I'm not a regular contributor for mfd/regulator/spmi. So, I may have missed something. > Are the resultant components not at a high enough level of > quality or enablement to go straight into the subsystems, which is > more typical? From an MFD perspective, I would be reviewing the > driver as a whole when (if) it moves from Staging into MFD anyway, so > why are you jumping through hoops with this additional, seemingly > superfluous step? I'm OK if this gets reviewed by MFD people only after moving it out of staging. Assuming that this would be merged for Kernel 5.10, I'll likely send a patch moving it out of staging for 5.11. Then, you can do a comprehensive review. > Finally, the subject of authorship is often a contentious one, but > this is a problem you need to work out with the original author, not > something that should require special handing by upstream. You have a > couple of choices, but bear in mind that upstreaming a non-suitable > driver then bringing it up to standard is not one of them. > > 1. Keep the original author's authorship and SoB, make your changes > and get them to review to ensure they are still happy about being > associated with the resultant code. Ensure you mention all of the > changes you make in the commit message and follow-up by adding your > own SoB. > > 2. This is the contentious bit. If you've made enough changes, there > is an argument for you to adopt authorship. You should discuss > with the original author whether they are happy for you to retain > their SoB. My suggestion is always try to keep the SoB as a bare > minimum to preserve patch history and out of pure courtesy. It is not only the above. Both the original author and anyone touching the code should comply with applicable internal policies. From my experience, dealing with such things takes a lot more of time then coding, as it require talking with legal departments on different continents, and with developers and with their bosses in order to be able to do things like that. This can also be a very frustrating process. During almost 20 years of being the media maintainer, I've seen several cases where trying to enforce a folded initial patch caused devs to receive NACKS, preventing them so submit otherwise good stuff. So, at the media subsystem, I'm perfectly fine if someone starts from the original OOT driver, preserving its original authorships. We're also dealing there with the patches sent to drivers/staging/media. I'm not saying that other subsystem maintainers should do the same. Dealing with staging is time consuming, and I completely understand that most maintainers prefer to stay out of it ;-) - Since when staging tree started, if someone has to start from the original patch, such things can be merged at staging. Then, incremental patches are applied at the top until it reaches what's required to be promoted. That's said, there's no hush to have those drivers out of staging. My end goal is to have DRM/KMS and USB support for Hikey 970. The patchsets I have so far are at: https://github.com/mchehab/linux/commits/hikey970/to_upstream-2.0-v1.1 (this branch has the v1 of my patchset) Porting this driver is part of such effort. While this driver is on a good situation, the other ones may require some time to mature. The DRM/KMS driver for example, is not ready to be merged outside staging, as it carries several bugs that came from the original driver and are present at the official tree at 96boards. For example, there is a a very dirty hack that enforces the HDMI chipset to only work with a limited set of resolutions that are known to work: https://github.com/96boards-hikey/linux/blob/hikey970-v4.9/drivers/gpu/drm/hisilicon/kirin9xx/hdmi/adv7535.c#L869 It also has problems reading the frequencies via EDID interface. Due to that, the driver fakes an EDID table: https://github.com/96boards-hikey/linux/blob/hikey970-v4.9/drivers/gpu/drm/hisilicon/kirin9xx/hdmi/adv7535.c#L463 It sounds to me that some clocks are not properly set for a random resolution, but fixing it is not trivial and requires deep knowledge about how the display registers should be tuned to better support resolutions. The current settings cause underflows with 1080p, which in turn makes the display driver to (silently) stop working. So, in summary, I believe that some drivers from my port will require being at staging for a while. While I was planning to do that on my next patch submission, placing the PM drivers there won't make much difference from my side, as I'll need to be submitting patches anyway moving drivers out of staging as they become ready. Thanks, Mauro _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 129+ messages in thread
* Re: [PATCH 00/44] SPMI patches needed by Hikey 970 @ 2020-08-13 9:58 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 129+ messages in thread From: Mauro Carvalho Chehab @ 2020-08-13 9:58 UTC (permalink / raw) To: Lee Jones Cc: devel, devicetree, Rob Herring, Stephen Boyd, Greg Kroah-Hartman, Mark Brown, Jonathan Cameron, linuxarm, Wei Xu, linux-kernel, Rob Herring, linux-arm-msm, mauro.chehab, David S. Miller, linux-arm-kernel Hi Lee, Em Thu, 13 Aug 2020 08:58:27 +0100 Lee Jones <lee.jones@linaro.org> escreveu: > On Wed, 12 Aug 2020, Mauro Carvalho Chehab wrote: > > > Hi Greg, > > > > This patch series is part of a work I'm doing in order to be able to support > > a HiKey 970 board that I recently got on my hands. > > > > I received some freedback from Mark and from Jonathan on a first > > attempt I made to upstream this. > > > > I'm opting to submit it via staging, because I had to start from the > > patch that originally added this driver on a 4.9 Kernel tree: > > > > https://github.com/96boards-hikey/linux/tree/hikey970-v4.9 > > > > In order to preserve the original SOB from the driver's author. > > > > The patches following it are on the standard way: one patch per > > logical change. > > > > This is part of a bigger work whose goal is to have upstream support > > for USB and DRM/KMS on such boards. > > > > I suspect that, maybe except for the DT part, those 3 specific drivers > > are more or less ready to be moved from staging, but the other > > drivers that are also part of this attempt aren't ready. Specially the > > DRM driver has some bugs that came from the OOT version. > > > > So, my current plan is to submit those drivers to staging for 5.9 > > and move the ones that are ok out of staging on Kernel 5.10. > > What a mess. This is no way to upstream a new driver. > > Firstly, could you please add versioning to your submissions. I know > this at least version 2. Were there previous submissions? Is this > the latest? Yeah, that's the second attempt. The first one was: https://lore.kernel.org/lkml/176043f329dfa9889f014feec04e7e1553077873.1597160086.git.mchehab+huawei@kernel.org/T/#u I was in doubt about adding a v2 in this specific case or not, since I ended submitting it to the staging tree. > Secondly and more importantly, you have submitted what looks like a > new driver (bearing in mind that I'm only concerning myself with the > MFD related changes), then in the same submission you are adding and > removing large chunks. Please just submit the new driver, on its own > as a single patch, complete with its associated Makefile and Kconfig > changes. I can't do like that because I'm not the author of the original patch that added the driver. The original patch came from the 96board's android-kernel based 4.9 tree: https://github.com/96boards-hikey/linux/tree/hikey970-v4.9 > What are your reasons for submitting this via Staging? The main reason is to preserve both the patch authorship and its history. After the original patch, I wrote several incremental changes cleaning up the original driver and stripping parts of it that aren't needed. By preserving the history, if someone wants to restore some removed functionality, it is just a matter of reverting a patch. For example, the original driver had its own sysfs interface for debugging the regulator driver. This is not needed for it to work. Also, the right interface for such things is via configfs. Yet, someone could think on restoring such feat and start from the existing code, instead of coming with something else from scratch. > Is it not ready yet? From my side, I believe that, after my changes, the code now meets upstream requirements, maybe except for DT (and the parsing code). There are a few things at the DT properties on this driver that could be named on a different (more standard way). Yet, I'm not a regular contributor for mfd/regulator/spmi. So, I may have missed something. > Are the resultant components not at a high enough level of > quality or enablement to go straight into the subsystems, which is > more typical? From an MFD perspective, I would be reviewing the > driver as a whole when (if) it moves from Staging into MFD anyway, so > why are you jumping through hoops with this additional, seemingly > superfluous step? I'm OK if this gets reviewed by MFD people only after moving it out of staging. Assuming that this would be merged for Kernel 5.10, I'll likely send a patch moving it out of staging for 5.11. Then, you can do a comprehensive review. > Finally, the subject of authorship is often a contentious one, but > this is a problem you need to work out with the original author, not > something that should require special handing by upstream. You have a > couple of choices, but bear in mind that upstreaming a non-suitable > driver then bringing it up to standard is not one of them. > > 1. Keep the original author's authorship and SoB, make your changes > and get them to review to ensure they are still happy about being > associated with the resultant code. Ensure you mention all of the > changes you make in the commit message and follow-up by adding your > own SoB. > > 2. This is the contentious bit. If you've made enough changes, there > is an argument for you to adopt authorship. You should discuss > with the original author whether they are happy for you to retain > their SoB. My suggestion is always try to keep the SoB as a bare > minimum to preserve patch history and out of pure courtesy. It is not only the above. Both the original author and anyone touching the code should comply with applicable internal policies. From my experience, dealing with such things takes a lot more of time then coding, as it require talking with legal departments on different continents, and with developers and with their bosses in order to be able to do things like that. This can also be a very frustrating process. During almost 20 years of being the media maintainer, I've seen several cases where trying to enforce a folded initial patch caused devs to receive NACKS, preventing them so submit otherwise good stuff. So, at the media subsystem, I'm perfectly fine if someone starts from the original OOT driver, preserving its original authorships. We're also dealing there with the patches sent to drivers/staging/media. I'm not saying that other subsystem maintainers should do the same. Dealing with staging is time consuming, and I completely understand that most maintainers prefer to stay out of it ;-) - Since when staging tree started, if someone has to start from the original patch, such things can be merged at staging. Then, incremental patches are applied at the top until it reaches what's required to be promoted. That's said, there's no hush to have those drivers out of staging. My end goal is to have DRM/KMS and USB support for Hikey 970. The patchsets I have so far are at: https://github.com/mchehab/linux/commits/hikey970/to_upstream-2.0-v1.1 (this branch has the v1 of my patchset) Porting this driver is part of such effort. While this driver is on a good situation, the other ones may require some time to mature. The DRM/KMS driver for example, is not ready to be merged outside staging, as it carries several bugs that came from the original driver and are present at the official tree at 96boards. For example, there is a a very dirty hack that enforces the HDMI chipset to only work with a limited set of resolutions that are known to work: https://github.com/96boards-hikey/linux/blob/hikey970-v4.9/drivers/gpu/drm/hisilicon/kirin9xx/hdmi/adv7535.c#L869 It also has problems reading the frequencies via EDID interface. Due to that, the driver fakes an EDID table: https://github.com/96boards-hikey/linux/blob/hikey970-v4.9/drivers/gpu/drm/hisilicon/kirin9xx/hdmi/adv7535.c#L463 It sounds to me that some clocks are not properly set for a random resolution, but fixing it is not trivial and requires deep knowledge about how the display registers should be tuned to better support resolutions. The current settings cause underflows with 1080p, which in turn makes the display driver to (silently) stop working. So, in summary, I believe that some drivers from my port will require being at staging for a while. While I was planning to do that on my next patch submission, placing the PM drivers there won't make much difference from my side, as I'll need to be submitting patches anyway moving drivers out of staging as they become ready. Thanks, Mauro _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel ^ permalink raw reply [flat|nested] 129+ messages in thread
end of thread, other threads:[~2020-08-17 14:14 UTC | newest] Thread overview: 129+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-08-12 15:56 [PATCH 00/44] SPMI patches needed by Hikey 970 Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 01/44] staging: spmi: add Hikey 970 SPMI controller driver Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 16:28 ` Greg Kroah-Hartman 2020-08-12 16:28 ` Greg Kroah-Hartman 2020-08-12 18:59 ` Mauro Carvalho Chehab 2020-08-12 18:59 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 02/44] staging: spmi: hisi-spmi-controller: coding style fixup Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 03/44] staging: spmi: hisi-spmi-controller: fix it to probe successfully Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 04/44] staging: spmi: hisi-spmi-controller: fix a typo Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 05/44] staging: spmi: hisi-spmi-controller: adjust whitespaces at defines Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 06/44] staging: spmi: hisi-spmi-controller: use le32 macros where needed Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 16:21 ` Joe Perches 2020-08-12 16:21 ` Joe Perches 2020-08-12 19:02 ` Mauro Carvalho Chehab 2020-08-12 19:02 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 07/44] staging: spmi: hisi-spmi-controller: add debug when values are read/write Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 08/44] staging: spmi: hisi-spmi-controller: fix the dev_foo() logic Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 09/44] staging: spmi: hisi-spmi-controller: add it to the building system Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 10/44] staging: spmi: hisi-spmi-controller: do some code cleanups Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 16:17 ` Joe Perches 2020-08-12 16:17 ` Joe Perches 2020-08-12 15:56 ` [PATCH 11/44] staging: mfd: add a PMIC driver for HiSilicon 6421 SPMI version Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 12/44] staging: mfd: hi6421-spmi-pmic: get rid of unused code Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 13/44] staging: mfd: hi6421-spmi-pmic: deal with non-static functions Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 14/44] staging: mfd: hi6421-spmi-pmic: get rid of the static vars Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 15/44] staging: mfd: hi6421-spmi-pmic: cleanup hi6421-spmi-pmic.h header Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 16/44] staging: mfd: hi6421-spmi-pmic: change the binding logic Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 17/44] staging: mfd: hi6421-spmi-pmic: get rid of unused OF properties Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 18/44] staging: mfd: hi6421-spmi-pmic: cleanup " Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 19/44] staging: mfd: hi6421-spmi-pmic: change namespace on its functions Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 20/44] staging: mfd: hi6421-spmi-pmic: fix some coding style issues Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 16:12 ` Joe Perches 2020-08-12 16:12 ` Joe Perches 2020-08-12 15:56 ` [PATCH 21/44] staging: mfd: hi6421-spmi-pmic: add it to the building system Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 22/44] staging: mfd: hi6421-spmi-pmic: cleanup the code Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 23/44] staging: regulator: add a regulator driver for HiSilicon 6421v600 SPMI PMIC Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 24/44] staging: regulator: hi6421v600-regulator: get rid of unused code Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 25/44] staging: regulator: hi6421v600-regulator: port it to upstream Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 26/44] staging: regulator: hi6421v600-regulator: coding style fixups Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 27/44] staging: regulator: hi6421v600-regulator: change the binding logic Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 28/44] staging: regulator: hi6421v600-regulator: cleanup struct hisi_regulator Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 29/44] staging: regulator: hi6421v600-regulator: cleanup debug messages Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 30/44] staging: regulator: hi6421v600-regulator: use shorter names for OF properties Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 31/44] staging: regulator: hi6421v600-regulator: better handle modes Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 32/44] staging: regulator: hi6421v600-regulator: change namespace Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 33/44] staging: regulator: hi6421v600-regulator: convert to use get/set voltage_sel Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 34/44] staging: regulator: hi6421v600-regulator: don't use usleep_range for off_on_delay Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 35/44] staging: regulator: hi6421v600-regulator: add a driver-specific debug macro Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 16:10 ` Joe Perches 2020-08-12 16:10 ` Joe Perches 2020-08-13 10:10 ` Mauro Carvalho Chehab 2020-08-13 10:10 ` Mauro Carvalho Chehab 2020-08-13 15:07 ` Joe Perches 2020-08-13 15:07 ` Joe Perches 2020-08-14 4:01 ` [PATCH] media: debugging logging cleanup Joe Perches 2020-08-14 4:01 ` Joe Perches 2020-08-12 15:56 ` [PATCH 36/44] staging: regulator: hi6421v600-regulator: initialize ramp_delay Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 37/44] staging: regulator: hi6421v600-regulator: cleanup DT settings Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 38/44] staging: regulator: hi6421v600-regulator: fix some coding style issues Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 39/44] staging: regulator: hi6421v600-regulator: add it to the building system Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 40/44] staging: regulator: hi6421v600-regulator: code cleanup Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 41/44] staging: hikey9xx: add a TODO list Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 42/44] MAINTAINERS: add an entry for HiSilicon 6421v600 drivers Mauro Carvalho Chehab 2020-08-12 15:56 ` [PATCH 43/44] dt: document HiSilicon SPMI controller and mfd/regulator properties Mauro Carvalho Chehab 2020-08-14 20:17 ` Rob Herring 2020-08-15 9:55 ` Mauro Carvalho Chehab 2020-08-17 14:13 ` Rob Herring 2020-08-12 15:56 ` [PATCH 44/44] dt: hisilicon: add support for the PMIC found on Hikey 970 Mauro Carvalho Chehab 2020-08-12 15:56 ` Mauro Carvalho Chehab 2020-08-12 17:13 ` [PATCH 00/44] SPMI patches needed by " Joe Perches 2020-08-12 17:13 ` Joe Perches 2020-08-12 17:13 ` Joe Perches 2020-08-12 18:47 ` Mauro Carvalho Chehab 2020-08-12 18:47 ` Mauro Carvalho Chehab 2020-08-12 18:47 ` Mauro Carvalho Chehab 2020-08-12 18:58 ` Joe Perches 2020-08-12 18:58 ` Joe Perches 2020-08-12 18:58 ` Joe Perches 2020-08-12 19:07 ` Mauro Carvalho Chehab 2020-08-12 19:07 ` Mauro Carvalho Chehab 2020-08-12 19:07 ` Mauro Carvalho Chehab 2020-08-13 7:58 ` Lee Jones 2020-08-13 7:58 ` Lee Jones 2020-08-13 7:58 ` Lee Jones 2020-08-13 9:58 ` Mauro Carvalho Chehab 2020-08-13 9:58 ` Mauro Carvalho Chehab 2020-08-13 9:58 ` Mauro Carvalho Chehab
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.