January 2020 - U-Boot

[PATCH] spi: ti_qspi: Add support for CS other than CS0
by Vignesh Raghavendra 26 Jan '20

26 Jan '20

Make sure corresponding setup registers are updated depending on CS. This ensures that driver can support QSPI flashes on ChipSelects other than on CS0 Reported-by: Andreas Dannenberg <dannenberg(a)ti.com> Signed-off-by: Vignesh Raghavendra <vigneshr(a)ti.com> --- drivers/spi/ti_qspi.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index c3d9e7f2ee0c..664b9cad79d9 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -60,6 +60,8 @@ DECLARE_GLOBAL_DATA_PTR; #define QSPI_SETUP0_ADDR_SHIFT (8) #define QSPI_SETUP0_DBITS_SHIFT (10) +#define TI_QSPI_SETUP_REG(priv, cs) (&(priv)->base->setup0 + (cs)) + /* ti qspi register set */ struct ti_qspi_regs { u32 pid; @@ -275,8 +277,8 @@ static void ti_qspi_copy_mmap(void *data, void *offset, size_t len) *((unsigned int *)offset) += len; } -static void ti_qspi_setup_mmap_read(struct ti_qspi_priv *priv, u8 opcode, - u8 data_nbits, u8 addr_width, +static void ti_qspi_setup_mmap_read(struct ti_qspi_priv *priv, int cs, + u8 opcode, u8 data_nbits, u8 addr_width, u8 dummy_bytes) { u32 memval = opcode; @@ -296,7 +298,7 @@ static void ti_qspi_setup_mmap_read(struct ti_qspi_priv *priv, u8 opcode, memval |= ((addr_width - 1) << QSPI_SETUP0_ADDR_SHIFT | dummy_bytes << QSPI_SETUP0_DBITS_SHIFT); - writel(memval, &priv->base->setup0); + writel(memval, TI_QSPI_SETUP_REG(priv, cs)); } static int ti_qspi_set_mode(struct udevice *bus, uint mode) @@ -317,13 +319,15 @@ static int ti_qspi_set_mode(struct udevice *bus, uint mode) static int ti_qspi_exec_mem_op(struct spi_slave *slave, const struct spi_mem_op *op) { + struct dm_spi_slave_platdata *slave_plat; struct ti_qspi_priv *priv; struct udevice *bus; + u32 from = 0; + int ret = 0; bus = slave->dev->parent; priv = dev_get_priv(bus); - u32 from = 0; - int ret = 0; + slave_plat = dev_get_parent_platdata(slave->dev); /* Only optimize read path. */ if (!op->data.nbytes || op->data.dir != SPI_MEM_DATA_IN || @@ -335,8 +339,9 @@ static int ti_qspi_exec_mem_op(struct spi_slave *slave, if (from + op->data.nbytes > priv->mmap_size) return -ENOTSUPP; - ti_qspi_setup_mmap_read(priv, op->cmd.opcode, op->data.buswidth, - op->addr.nbytes, op->dummy.nbytes); + ti_qspi_setup_mmap_read(priv, slave_plat->cs, op->cmd.opcode, + op->data.buswidth, op->addr.nbytes, + op->dummy.nbytes); ti_qspi_copy_mmap((void *)op->data.buf.in, (void *)priv->memory_map + from, op->data.nbytes); @@ -390,7 +395,7 @@ static int ti_qspi_release_bus(struct udevice *dev) writel(0, &priv->base->dc); writel(0, &priv->base->cmd); writel(0, &priv->base->data); - writel(0, &priv->base->setup0); + writel(0, TI_QSPI_SETUP_REG(priv, slave_plat->cs)); return 0; } -- 2.24.0

2 1

[U-Boot] [PATCH] spi: prevent overriding established bus settings
by Marcin Wojtas 26 Jan '20

26 Jan '20

The SPI stack relies on a proper bus speed/mode configuration by calling dm_spi_claim_bus(). However the hitherto code allowed to accidentally override those settings in the spi_get_bus_and_cs() routine. The initially established speed could be discarded by using the slave platdata, which turned out to be an issue on the platforms whose slave maximum supported frequency is not on par with the maximum frequency of the bus controller. This patch fixes above issue by configuring the bus from spi_get_bus_and_cs() only in case it was not done before. Signed-off-by: Marcin Wojtas <mw(a)semihalf.com> --- drivers/spi/spi-uclass.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index 76c4b53..fcbe532 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -296,6 +296,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, { struct udevice *bus, *dev; struct dm_spi_slave_platdata *plat; + struct spi_slave *slave; bool created = false; int ret; @@ -351,19 +352,20 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, slave->dev = dev; } - plat = dev_get_parent_platdata(dev); + slave = dev_get_parent_priv(dev); - /* get speed and mode from platdata when available */ - if (plat->max_hz) { - speed = plat->max_hz; - mode = plat->mode; + /* + * In case the operation speed is not yet established by + * dm_spi_claim_bus() ensure the bus is configured properly. + */ + if (!slave->speed) { + ret = spi_claim_bus(slave); + if (ret) + goto err; } - ret = spi_set_speed_mode(bus, speed, mode); - if (ret) - goto err; *busp = bus; - *devp = dev_get_parent_priv(dev); + *devp = slave; debug("%s: bus=%p, slave=%p\n", __func__, bus, *devp); return 0; -- 2.7.4

3 6

[PATCH] cmd: spi: Permit setting bus frequency
by Marek Vasut 26 Jan '20

26 Jan '20

The 'sspi' command hard-coded 1 MHz bus frequency for all transmissions. Allow changing that at runtime by specifying '@freq' bus frequency in Hz. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> --- cmd/spi.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/cmd/spi.c b/cmd/spi.c index 75226fd368..bfa185b6ae 100644 --- a/cmd/spi.c +++ b/cmd/spi.c @@ -28,6 +28,7 @@ static unsigned int bus; static unsigned int cs; static unsigned int mode; +static unsigned int freq; static int bitlen; static uchar dout[MAX_SPI_BYTES]; static uchar din[MAX_SPI_BYTES]; @@ -45,12 +46,12 @@ static int do_spi_xfer(int bus, int cs) str = strdup(name); if (!str) return -ENOMEM; - ret = spi_get_bus_and_cs(bus, cs, 1000000, mode, "spi_generic_drv", + ret = spi_get_bus_and_cs(bus, cs, freq, mode, "spi_generic_drv", str, &dev, &slave); if (ret) return ret; #else - slave = spi_setup_slave(bus, cs, 1000000, mode); + slave = spi_setup_slave(bus, cs, freq, mode); if (!slave) { printf("Invalid device %d:%d\n", bus, cs); return -EINVAL; @@ -106,6 +107,8 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * We use the last specified parameters, unless new ones are * entered. */ + if (freq == 0) + freq = 1000000; if ((flag & CMD_FLAG_REPEAT) == 0) { @@ -119,7 +122,9 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bus = CONFIG_DEFAULT_SPI_BUS; } if (*cp == '.') - mode = simple_strtoul(cp+1, NULL, 10); + mode = simple_strtoul(cp+1, &cp, 10); + if (*cp == '@') + freq = simple_strtoul(cp+1, &cp, 10); } if (argc >= 3) bitlen = simple_strtoul(argv[2], NULL, 10); @@ -159,10 +164,11 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( sspi, 5, 1, do_spi, "SPI utility command", - "[<bus>:]<cs>[.<mode>] <bit_len> <dout> - Send and receive bits\n" + "[<bus>:]<cs>[.<mode>][@<freq>] <bit_len> <dout> - Send and receive bits\n" "<bus> - Identifies the SPI bus\n" "<cs> - Identifies the chip select\n" "<mode> - Identifies the SPI mode to use\n" + "<freq> - Identifies the SPI bus frequency in Hz\n" "<bit_len> - Number of bits to send (base 10)\n" "<dout> - Hexadecimal string that gets sent" ); -- 2.24.1

3 2

[PATCH] video: mxsfb: call remove() when booting OS
by Anatolij Gustschin 26 Jan '20

26 Jan '20

Add DM_FLAG_OS_PREPARE flag to ensure that the driver's remove() callback is invoked before booting the kernel. This is required to stop the LCDIF controller. This was the behaviour with old driver without DM_VIDEO support. Without stopping the LCDIF we sometimes observe incorrect Linux logo position. Fixes: ae0760584b38 ("imx: mx6ul_14x14_evk: convert to DM_VIDEO") Signed-off-by: Anatolij Gustschin <agust(a)denx.de> Reported-by: Fabio Estevam <festevam(a)gmail.com> --- drivers/video/mxsfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index c52981053e..c097682d00 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -429,6 +429,6 @@ U_BOOT_DRIVER(mxs_video) = { .bind = mxs_video_bind, .probe = mxs_video_probe, .remove = mxs_video_remove, - .flags = DM_FLAG_PRE_RELOC, + .flags = DM_FLAG_PRE_RELOC | DM_FLAG_OS_PREPARE, }; #endif /* ifndef CONFIG_DM_VIDEO */ -- 2.17.1

3 4

pull request u-boot-fsl-qoriq for v2020.04-rc1
by Priyanka Jain 26 Jan '20

26 Jan '20

Dear Tom, Please find my pull-request for u-boot-fsl-qoriq/master to next branch https://travis-ci.org/p-priyanka-jain/u-boot/builds/641264692 Summary Updates and fixes for ls1028a, lx2160a, ls1012a, ls1021a, ls2080a, ls1088a platforms; lx2-rev2 pcie support, enetc related updates, layerscape-pcie fixes priyankajain --------------- The following changes since commit 2c871f9e084b2c03d1961884228a6901387ab8d6: Merge branch '2020-01-22-master-imports' (2020-01-23 16:28:17 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq.git HEAD for you to fetch changes up to 6666408535523377428846bad5a9362d589e396c: configs: ls1028aqds: enable mdio muxing by default (2020-01-24 14:28:26 +0530) ---------------------------------------------------------------- Alex Marginean (9): drivers: net: fsl_enetc: Pass on primary MAC address to Linux drivers: net: fsl_enetc: fix SXGMII MAC configuration armv8: ls1028a_serdes: Add few missing serdes protocols board: fsl: lx2160a: free up arch_misc_init board: fsl: ls2080a/ls2081a: remove empty arch_misc_init board: fsl: ls1088a: remove empty arch_misc_init board: fsl: ls1028a: free up arch_misc_init arch: armv8: fsl-layerscape: export serdes config to environment configs: ls1028aqds: enable mdio muxing by default Biwen Li (2): include/configs: ls1012ardb: adjust kernel_addr_r include/configs: ls1012afrwy: adjust kernel_addr_r Hou Zhiqiang (2): pci: layerscape: Fix the disabling of Expansion ROM BAR pci: layerscape: Fix the BARs disable function Masahiro Yamada (1): ARM: LS1021A: remove redundant "depends on ARCH_LS1021A" Meenakshi Aggarwal (1): lx2160: Correct default environment variable Michael Walle (2): drivers: net: fsl_enetc: use write_hwaddr() drivers: net: fsl_enetc: add write_hwaddr() for LS1028A Pankaj Bansal (1): board: fsl: lx2160a: Fix the loop in board_fix_fdt function Pramod Kumar (2): board: ls1046afwry: Disable sgmii support armv8: fsl-layerscape: LS1044A/1048A: enable Only 1x 10GE port Ran Wang (1): armv8: ls1012a: Make USB masters snoopable Udit Agarwal (1): configs: fsl-layerscape: secure_boot: Enable setexpr command Wasim Khan (4): pci: layerscape: Common device tree fixup for NXP SoCs pci: layerscape: Move streamId allocation to common device tree fixup pci: layerscape: device tree fixup based on SoC and configs: lx2160a: enable CONFIG_OF_BOARD_FIXUP for SECURE_BOOT defconfig Xiaowei Bao (1): board/lx2160aqds: Update the DSPI status fixup Yinbo Zhu (3): configs: ls1046afwry: Enable usb network cards support configs: ls1088ardb: Enable usb network cards support configs: ls1012afwry: Enable usb network cards support

2 1

[PATCH v1 0/5] board: toradex: add Verdin iMX8MM 2GB WB IT v1.0a
by Igor Opaniuk 26 Jan '20

26 Jan '20

This add initial minimal support for the Toradex Verdin iMX8MM 2GB WB IT V1.0A module. They are now strapped to boot from eFuses which are factory fused to properly boot from their on-module eMMC. U-Boot supports booting from the on-module eMMC only, SDP support is disabled for now. Functionality wise the following is known to be working: - eMMC, 8-bit and 4-bit MMC/SD card slots - Ethernet - GPIOs - I2C Boot sequence is: SPL ---> ATF (TF-A) ---> U-boot proper ATF, U-boot proper and u-boot.dtb images are packed into FIT image, loaded by SPL. Boot: U-Boot SPL 2020.01-01840-gd92bdc79cf-dirty (Jan 22 2020 - 18:50:57 +0200) Normal Boot Trying to boot from MMC1 U-Boot 2020.01-01840-gd92bdc79cf-dirty (Jan 22 2020 - 18:50:57 +0200) CPU: Freescale i.MX8MMQ rev1.0 at 0 MHz Reset cause: POR DRAM: 2 GiB MMC: FSL_SDHC: 0, FSL_SDHC: 1 Loading Environment from MMC... OK In: serial Out: serial Err: serial Model: Toradex Verdin iMX8M Mini 2GB Wi-Fi / BT IT V1.0A, Serial# 06535148 Net: Could not get PHY for FEC0: addr 7 eth0: ethernet@30be0000 Hit any key to stop autoboot: 0 Igor Opaniuk (3): board: toradex: add Verdin iMX8MM 2GB WB IT v1.0a board: toradex: verdin-imx8mm: add README board: toradex: verdin-imx8mm: add MAINTAINERS Marcel Ziswiler (1): toradex: tdx-cfg-block: add Verdin i.MX8MM support Max Krummenacher (1): dt-bindings: pinctrl: imx8mm: add alternative uart muxings arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx8mm-pinfunc.h | 21 + arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 103 ++ arch/arm/dts/imx8mm-verdin.dts | 854 +++++++++ arch/arm/mach-imx/imx8m/Kconfig | 7 + board/toradex/common/tdx-cfg-block.c | 17 +- board/toradex/common/tdx-cfg-block.h | 1 + board/toradex/verdin-imx8mm/Kconfig | 30 + board/toradex/verdin-imx8mm/MAINTAINERS | 9 + board/toradex/verdin-imx8mm/Makefile | 12 + board/toradex/verdin-imx8mm/README | 81 + board/toradex/verdin-imx8mm/imximage.cfg | 16 + board/toradex/verdin-imx8mm/lpddr4_timing.c | 1851 +++++++++++++++++++ board/toradex/verdin-imx8mm/spl.c | 183 ++ board/toradex/verdin-imx8mm/verdin-imx8mm.c | 74 + configs/verdin-imx8mm_defconfig | 88 + include/configs/verdin-imx8mm.h | 121 ++ 17 files changed, 3468 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/imx8mm-verdin-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mm-verdin.dts create mode 100644 board/toradex/verdin-imx8mm/Kconfig create mode 100644 board/toradex/verdin-imx8mm/MAINTAINERS create mode 100644 board/toradex/verdin-imx8mm/Makefile create mode 100644 board/toradex/verdin-imx8mm/README create mode 100644 board/toradex/verdin-imx8mm/imximage.cfg create mode 100644 board/toradex/verdin-imx8mm/lpddr4_timing.c create mode 100644 board/toradex/verdin-imx8mm/spl.c create mode 100644 board/toradex/verdin-imx8mm/verdin-imx8mm.c create mode 100644 configs/verdin-imx8mm_defconfig create mode 100644 include/configs/verdin-imx8mm.h -- 2.17.1

5 17

lcdif_power_down() no longer called with DM_VIDEO
by Fabio Estevam 25 Jan '20

25 Jan '20

Hi Anatolij, I noticed that after mxsfb has been converted to DM the lcdif_power_down() function is no longer called. This causes issues in the kernel, where the Linux logo sometimes appears in the incorrect position, for example. I see this issue on a imx6ul-evk board. If I do the same steps of U-Boot lcdif_power_down() inside the mxsfb driverl I can make the logo to always appear in the correct position, but in order to avoid regressions when booting existing kernels I think that lcdif_power_down() still needs to be called when DM_VIDEO is selected. Not sure how to do this cleanly though. Any suggestions? Thanks, Fabio Estevam

2 2

imx6ull: random crashes when setting REFTOP_SELBIASOFF
by Heiko Schocher 25 Jan '20

25 Jan '20

Hello Fabio, Peng, I have here an imx6ull based board from DH electronics [1] which has the IMX_THERMAL driver enabled in U-Boot and Linux. We see on Linux boot random crashes (random means not on every boot, also not even the same crash dump/reason in linux). My first suggestion was instable RMA, but RAM seems stable. After some investigation it turned out, that setting the REFTOP_SELBIASOFF bit in the linux thermal driver seems the problem. I saw that the kernel driver does not check first if REFTOP_VBGUP is set and added this, but this did not helped. U-Boot does this check here: https://gitlab.denx.de/u-boot/u-boot/blob/master/arch/arm/mach-imx/mx6/soc.… More investigation into this problem and we found how U-Boot handles this bit: U-Boot: sets this bit in arch_cpu_init() U-Boot: sets this bit in IMX_THERMAL driver U-Boot: clears this bit in IMX_THERMAL driver If we now remove the clearing of this bit in U-Boot in the thermal driver, we also see no crashes anymore in Linux (more than 12000 power on/off cycles) My question is now, - do you now more about this bit as in the RM is described? Or know somebody we can ask? - What effect has this bit? May it leads in more power consumption? - Is it valid to not clear it in U-Boot? Thanks in advance! bye, Heiko [1] https://github.com/dh-electronics/u-boot-imx6qdl/blob/dev/2018.05_dhcom/inc… -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

2 1

Re: [PATCH v2 01/11] clk: Always use the supplied struct clk
by Rick Chen 25 Jan '20

25 Jan '20

Hi Sean > From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Sean Anderson > Sent: Thursday, January 16, 2020 6:48 AM > To: U-Boot Mailing List > Subject: [PATCH v2 01/11] clk: Always use the supplied struct clk > > CCF clocks should always use the struct clock passed to their methods for extracting the driver-specific clock information struct. Previously, many functions would use the clk->dev->priv if the device was bound. This could cause problems with composite clocks. The individual clocks in a composite clock did not have the ->dev field filled in. This was fine, because the device-specific clock information would be used. However, since there was no ->dev, there was no way to get the parent clock. This caused the recalc_rate method of the CCF divider clock to fail. One option would be to use the clk->priv field to get the composite clock and from there get the appropriate parent device. However, this would tie the implementation to the composite clock. In general, different devices should not rely on the contents of ->priv from another device. > > The simple solution to this problem is to just always use the supplied struct clock. The composite clock now fills in the ->dev pointer of its child clocks. > This allows child clocks to make calls like clk_get_parent() without issue. > > imx avoided the above problem by using a custom get_rate function with composite clocks. > > Signed-off-by: Sean Anderson <seanga2(a)gmail.com> > --- > drivers/clk/clk-composite.c | 8 ++++++++ > drivers/clk/clk-divider.c | 6 ++---- > drivers/clk/clk-fixed-factor.c | 3 +-- > drivers/clk/clk-gate.c | 6 ++---- > drivers/clk/clk-mux.c | 12 ++++-------- > drivers/clk/imx/clk-gate2.c | 4 ++-- > 6 files changed, 19 insertions(+), 20 deletions(-) This patch is clock relative patch, if it is not a necessary patch for Sipeed Maix support. Please remove patch 1/11 and 2/11, and send them in another patch-sets. Rick, Thanks > > diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c index a5626c33d1..d0f273d47f 100644 > --- a/drivers/clk/clk-composite.c > +++ b/drivers/clk/clk-composite.c > @@ -145,6 +145,14 @@ struct clk *clk_register_composite(struct device *dev, const char *name, > goto err; > } > > + if (composite->mux) > + composite->mux->dev = clk->dev; > + if (composite->rate) > + composite->rate->dev = clk->dev; > + if (composite->gate) > + composite->gate->dev = clk->dev; > + > + > return clk; > > err: > diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index 822e09b084..bfa05f24a3 100644 > --- a/drivers/clk/clk-divider.c > +++ b/drivers/clk/clk-divider.c > @@ -70,8 +70,7 @@ unsigned long divider_recalc_rate(struct clk *hw, unsigned long parent_rate, > > static ulong clk_divider_recalc_rate(struct clk *clk) { > - struct clk_divider *divider = to_clk_divider(clk_dev_binded(clk) ? > - dev_get_clk_ptr(clk->dev) : clk); > + struct clk_divider *divider = to_clk_divider(clk); > unsigned long parent_rate = clk_get_parent_rate(clk); > unsigned int val; > > @@ -150,8 +149,7 @@ int divider_get_val(unsigned long rate, unsigned long parent_rate, > > static ulong clk_divider_set_rate(struct clk *clk, unsigned long rate) { > - struct clk_divider *divider = to_clk_divider(clk_dev_binded(clk) ? > - dev_get_clk_ptr(clk->dev) : clk); > + struct clk_divider *divider = to_clk_divider(clk); > unsigned long parent_rate = clk_get_parent_rate(clk); > int value; > u32 val; > diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c index 711b0588bc..d2401cf440 100644 > --- a/drivers/clk/clk-fixed-factor.c > +++ b/drivers/clk/clk-fixed-factor.c > @@ -18,8 +18,7 @@ > > static ulong clk_factor_recalc_rate(struct clk *clk) { > - struct clk_fixed_factor *fix = > - to_clk_fixed_factor(dev_get_clk_ptr(clk->dev)); > + struct clk_fixed_factor *fix = to_clk_fixed_factor(clk); > unsigned long parent_rate = clk_get_parent_rate(clk); > unsigned long long int rate; > > diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c index 70b8794554..b2933bc24a 100644 > --- a/drivers/clk/clk-gate.c > +++ b/drivers/clk/clk-gate.c > @@ -43,8 +43,7 @@ > */ > static void clk_gate_endisable(struct clk *clk, int enable) { > - struct clk_gate *gate = to_clk_gate(clk_dev_binded(clk) ? > - dev_get_clk_ptr(clk->dev) : clk); > + struct clk_gate *gate = to_clk_gate(clk); > int set = gate->flags & CLK_GATE_SET_TO_DISABLE ? 1 : 0; > u32 reg; > > @@ -86,8 +85,7 @@ static int clk_gate_disable(struct clk *clk) > > int clk_gate_is_enabled(struct clk *clk) { > - struct clk_gate *gate = to_clk_gate(clk_dev_binded(clk) ? > - dev_get_clk_ptr(clk->dev) : clk); > + struct clk_gate *gate = to_clk_gate(clk); > u32 reg; > > #if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) > diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index 5acc0b8cbd..67b4afef28 100644 > --- a/drivers/clk/clk-mux.c > +++ b/drivers/clk/clk-mux.c > @@ -35,8 +35,7 @@ > int clk_mux_val_to_index(struct clk *clk, u32 *table, unsigned int flags, > unsigned int val) > { > - struct clk_mux *mux = to_clk_mux(clk_dev_binded(clk) ? > - dev_get_clk_ptr(clk->dev) : clk); > + struct clk_mux *mux = to_clk_mux(clk); > int num_parents = mux->num_parents; > > if (table) { > @@ -79,8 +78,7 @@ unsigned int clk_mux_index_to_val(u32 *table, unsigned int flags, u8 index) > > u8 clk_mux_get_parent(struct clk *clk) > { > - struct clk_mux *mux = to_clk_mux(clk_dev_binded(clk) ? > - dev_get_clk_ptr(clk->dev) : clk); > + struct clk_mux *mux = to_clk_mux(clk); > u32 val; > > #if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) > @@ -97,8 +95,7 @@ u8 clk_mux_get_parent(struct clk *clk) static int clk_fetch_parent_index(struct clk *clk, > struct clk *parent) > { > - struct clk_mux *mux = to_clk_mux(clk_dev_binded(clk) ? > - dev_get_clk_ptr(clk->dev) : clk); > + struct clk_mux *mux = to_clk_mux(clk); > > int i; > > @@ -115,8 +112,7 @@ static int clk_fetch_parent_index(struct clk *clk, > > static int clk_mux_set_parent(struct clk *clk, struct clk *parent) { > - struct clk_mux *mux = to_clk_mux(clk_dev_binded(clk) ? > - dev_get_clk_ptr(clk->dev) : clk); > + struct clk_mux *mux = to_clk_mux(clk); > int index; > u32 val; > u32 reg; > diff --git a/drivers/clk/imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c index 1b9db6e791..e32c0cb53e 100644 > --- a/drivers/clk/imx/clk-gate2.c > +++ b/drivers/clk/imx/clk-gate2.c > @@ -37,7 +37,7 @@ struct clk_gate2 { > > static int clk_gate2_enable(struct clk *clk) { > - struct clk_gate2 *gate = to_clk_gate2(dev_get_clk_ptr(clk->dev)); > + struct clk_gate2 *gate = to_clk_gate2(clk); > u32 reg; > > reg = readl(gate->reg); > @@ -50,7 +50,7 @@ static int clk_gate2_enable(struct clk *clk) > > static int clk_gate2_disable(struct clk *clk) { > - struct clk_gate2 *gate = to_clk_gate2(dev_get_clk_ptr(clk->dev)); > + struct clk_gate2 *gate = to_clk_gate2(clk); > u32 reg; > > reg = readl(gate->reg); > -- > 2.24.1 >

3 7

[PATCH 1/1] watchdog: cannot select CONFIG_CONFIG_MPC8xx_WATCHDOG
by Heinrich Schuchardt 25 Jan '20

25 Jan '20

There is no configuration option CONFIG_CONFIG_MPC8xx_WATCHDOG. So we should not try to select it. The select statement was introduced in a patch that was meant to only sort config options without changing them. Fixes: b3134ffbd944 ("watchdog: Kconfig: Sort entry alphabetically") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/watchdog/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 2b8064dfae..8b65b5a88c 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -103,7 +103,6 @@ config WDT_CDNS config WDT_MPC8xx bool "MPC8xx watchdog timer support" depends on WDT && MPC8xx - select CONFIG_MPC8xx_WATCHDOG help Select this to enable mpc8xx watchdog timer -- 2.24.1

2 1