1
0
Fork 0
Commit Graph

717017 Commits (d0430a4914934561551da66043589a9a900a0208)

Author SHA1 Message Date
Robin Gong d0430a4914 MLK-12928-16 regulator: pf1550: check device node check
Do not probe if the device node is not correct in dts.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong b2e7c737f9 MLK-12928-15 mfd/regulator: pf1550: check OTP_SW2_DVS_ENB bit for different voltages
check OTP_SW2_DVS_ENB bit for the different voltage list while SW2
regulator registered.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 1cc345be75 MLK-12928-14 mfd: pf1550: add otp read interface
add otp read interface to let pf1550 regulator driver or other sub driver
to read out otp register.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 890e6a154d MLK-12928-13 ARM: dts: imx6ul-14x14-evk-pf1550: add onkey device node
Add onkey device node in dts.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 03cb430a3b MLK-12928-12 input: keyboard: pf1550: enable ONKEY wakeup interrupt before suspend
Enable ONKEY wakeup interrupt before suspend, and remove usless marocs.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 18ac895536 MLK-12928-11 mfd: pf1550: add irq ack for pf1550
add ".use_ack" ..etc for pf1550 irq, since we have to clear irq status in
pf1550, else no any more interrupt trigged.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong ba5cd77c08 MLK-12928-10 mfd: pf1550: correct virtual irqs for every sub-driver of pf1550
Correct virtual irqs macro from zero for every sub-driver of pf1550,
otherwise,below warning will be triggered:
------------[ cut here ]------------
WARNING: CPU: 0 PID: 1 at kernel/irq/irqdomain.c:280 irq_domain_associate+0x148/0x1d4()
error: hwirq 0xb is too large for (null)
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.1.15-01689-gb67ecb6-dirty #195
Hardware name: Freescale i.MX6 Ultralite (Device Tree)
[<80015e04>] (unwind_backtrace) from [<80012754>] (show_stack+0x10/0x14)
[<80012754>] (show_stack) from [<807909c0>] (dump_stack+0x84/0xc4)
[<807909c0>] (dump_stack) from [<80034914>] (warn_slowpath_common+0x84/0xb4)
[<80034914>] (warn_slowpath_common) from [<80034974>] (warn_slowpath_fmt+0x30/0x40)
[<80034974>] (warn_slowpath_fmt) from [<800717fc>] (irq_domain_associate+0x148/0x1d4)
[<800717fc>] (irq_domain_associate) from [<80071da4>] (irq_create_mapping+0x60/0xc4)
[<80071da4>] (irq_create_mapping) from [<804910a4>] (pf1550_onkey_probe+0xe8/0x230)
[<804910a4>] (pf1550_onkey_probe) from [<803823e8>] (platform_drv_probe+0x44/0xa4)
[<803823e8>] (platform_drv_probe) from [<80380ca0>] (driver_probe_device+0x174/0x2b4)
[<80380ca0>] (driver_probe_device) from [<80380eb0>] (__driver_attach+0x8c/0x90)
[<80380eb0>] (__driver_attach) from [<8037f1e8>] (bus_for_each_dev+0x6c/0xa0)
[<8037f1e8>] (bus_for_each_dev) from [<8038043c>] (bus_add_driver+0x148/0x1f0)
[<8038043c>] (bus_add_driver) from [<803814b4>] (driver_register+0x78/0xf8)
[<803814b4>] (driver_register) from [<80009730>] (do_one_initcall+0x8c/0x1d4)
[<80009730>] (do_one_initcall) from [<80a8bdac>] (kernel_init_freeable+0x144/0x1e4)
[<80a8bdac>] (kernel_init_freeable) from [<8078ca20>] (kernel_init+0x8/0xe8)
[<8078ca20>] (kernel_init) from [<8000f568>] (ret_from_fork+0x14/0x2c)
---[ end trace dc402f301115a3b2 ]---

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 9a76bf0c32 MLK-12928-9 ARM: configs: imx_v7_defconfig: add pf1550 driver
Add new pf1550 pmic driver which based on MFD framework including
regulator ,charger and ONKEY driver.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 50ea437808 MLK-12928-8 ARM: dts: imx6ul-14x14-evk: add new imx6ul-14x14-evk-pf1550 boad
Add new pf1550 board support.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 33b8f2e10d MLK-12928-7 regulator: pf1550: correct ldo ops setting
The voltage of LDO1 and LDO3 are not linear, use voltage_table instead,so
add new ops for them. Meanwhile, correct 12500uV for one step of SW1/SW2
rather than 125000uV.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 3821d7fdc7 MLK-12928-6 mfd: pf1550: correct num_regs of regmap_irq_chip
Correct num_regs of regmap_irq_chip structure, otherwise request irq
failed.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 49e774e493 MLK-12928-5 input: keyboard: pf1550_onkey: add onkey driver for pf1550
Add pf1550_onkey driver, so that POWERON key can link to pf1550 instead of
i.mx6ul.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 81285630c4 MLK-12928-4 power: pf1550_charger: add pf1550 charger driver
Add basic pf1550 charger driver.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong bb1432c9b1 MLK-12928-3: mfd: pf1550: add headfile for pf1550 mfd
Add head file for pf1550 mfd.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong c8bf7c7bf1 MLK-12928-2 regulator: pf1550: add pf1550 regulator driver
Add basic pf1550 regulator driver.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Robin Gong 4c6aea937e MLK-12928-1 mfd: pf1550: add pf1550 mfd driver
Add basic pf1550 mfd driver.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 1df5d708aa MLK-13333-3 ARM: imx: enable bus clock auto gating for i.mx6sll
i.MX6SLL has new hardware function of bus auto clock gating,
whenerve bus is idle, its clock will be auto gated to save
power, enable this function.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang ab3529170a MLK-13333-2 ARM: dts: imx6sll: add compatible string for iomuxc gpr
Add "fsl,imx6q-iomuxc-gpr" compatible string for i.MX6SLL.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 64bcb9c87a MLK-13333-1 ARM: imx: correct i.mx6sll dram io low power mode
i.MX6SLL has different DRAM IO offset, and it has no
CAS/RAS/ODT/RESET pin now, correct the DRAM IO offset.

To better support all different i.MX6 SoCs and different
DRAM types, introduce a new column to store the low power
settings for DRAM IO, then suspend asm code no need to check
SoC or DRAM type, just get the DRAM IO's low power
settings from OCRAM pm_info and set to each DRAM IO.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Guoniu.Zhou ec4959e099 MLK-13329 IPU: add return value check after calling ipu_init_channel()
Fix coverity CID 17574 uncheck return value.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
2018-10-29 11:10:38 +08:00
Haibo Chen ed5c3872f8 MLK-13332-2 arm: dts: imx6sll-lpddr3-arm2: add SD3 slot support
Add SD3 support, now can support SD3.0 card. Due to the WP pin
DNP, so SD3 slot do not support write protect feature.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Haibo Chen d5e50be0f3 MLK-13332-1 arm: dts: imx6sll-lpddr3-arm2: add SD3.0 support for SD1 slot
Add SD1 slot support for SD3.0 card.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
2018-10-29 11:10:38 +08:00
Bai Ping 3b0ff335aa MLK-13310-02 ARM: dts: imx: Correct the clock node property on imx6sll
Add more properties to the clock node.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2018-10-29 11:10:38 +08:00
Bai Ping 9f8a74fca7 MLK-13310-01 ARM: dts: imx: remove unnecessary node on imx6sll
On i.MX6SLL, there're no LDO_ARM, LDO_SOC and LOD_PU regulator,
so remove these device node.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2018-10-29 11:10:38 +08:00
Bai Ping 5fb9888733 MLK-13309-02 ARM: dts: imx: fix a typo of l2 cache node
fix a typo of L2 cache device node.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2018-10-29 11:10:38 +08:00
Bai Ping e4daf45c61 MLK-13309-01 ARM: imx: clear the L2_PGE bit on imx6sll
On i.MX6SLL, the 'L2_PGE' bit in GPC CNTR register is set
by default,this bit must be clear, otherwise, system will
failed to resume from DSM mode if L2 cache is enabled.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2018-10-29 11:10:38 +08:00
Bai Ping 8ed74419c8 MLK-13305 ARM: dts: Correct the setpoints table on imx6ull arm2 board
Correct the setpoints when LDO enabled on i.MX6ULL DDR3 arm2 board.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 0089e24c7e MLK-13306-2 ARM: imx: update MMDC restore settings for i.mx6sll
i.MX6SLL LPDDR3 script v1.2 is released, update MMDC
restore settings accordingly.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang f43ccca743 MLK-13306-1 ARM: imx: correct ddr type for i.mx6sll
For MMDC, LPDDR3 type's value is 2b'11, which is
different from DDRC, so correct it.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang f4fbe442ab MLK-13303-11 ARM: imx: add cpufreq support for i.mx6sll
Add cpufreq support for i.MX6SLL, uses i.MX6SL's
opp table for now.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 12ad7b1d14 MLK-13303-10 ARM: imx: add DSM mode support for i.mx6sll
Add DSM mode support for i.MX6SLL, Mega/Fast mix
can be off now.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 02a9e5e1ee MLK-13303-9 arm: configs: enable i.mx6sll by default
Enable i.MX6SLL by default.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
2018-10-29 11:10:38 +08:00
Octavian Purdila b2437e134d MLK-14424 ARM: imx: fix PM CCM init on imx6sll
Since we share the same machine code for both imx6sll and imx6sl we
need to check the CPU in order to select the right device tree
binding for the PM CCM.

Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang d3d26408d5 MLK-13303-8 ARM: imx: add i.mx6sll msl support
Add i.MX6SLL MSL support, machine code reuses
i.MX6SL.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Bai Ping <ping.bai@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 60cefcefb0 MLK-13303-7 ARM: imx: add gpt timer support for i.mx6sll
Add i.MX6SLL GPT timer support.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Bai Ping <ping.bai@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 0b3fbc60d5 MLK-13303-6 pinctrl: freescale: imx6sll: add pinctrl driver
Add pinctrl driver support for i.MX6SLL.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Bai Ping <ping.bai@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 45063f188a MLK-13303-5 ARM: imx: add clock driver for i.mx6sll
Add clock driver for i.MX6SLL.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
2018-10-29 11:10:38 +08:00
Bai Ping a5160d02ea MLK-13303-4 arm: debug: add low level debug support for i.mx6sll
Add low level debug support for i.MX6SLL.

Signed-off-by: Bai Ping <ping.bai@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang ab2ae69690 MLK-13303-3 ARM: dts: imx6sll: add lpddr3 arm2 board support
Add i.MX6SLL-LPDDR3-ARM2 board support.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang 6f5af56731 MLK-13303-2 ARM: dts: imx6sll: add dtsi file
Add i.MX6SLL dtsi file.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
2018-10-29 11:10:38 +08:00
Anson Huang c3bec985cc MLK-13303-1 ARM: dts: imx6sll: add pin and clock head file
Add i.MX6SLL pin and clock head files.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Bai Ping <ping.bai@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
2018-10-29 11:10:38 +08:00
Nitin Garg 071b158977 MLK-13299: Fix the letter case in i.MX 6UltraLite text string
Fix "l" in UltraLite text string

Signed-off-by: Nitin Garg <nitin.garg@nxp.com>
2018-10-29 11:10:38 +08:00
Adrian Alonso 417ede3028 MLK-13243: arm: imx6q: busfreq: lpddr2 fix system clocks audio mode
Fix system clock topology used by lpddr2 for audio mode
Keep pll2_pfd2 as clock root for periph_pre_clk to match
lpddr2_freq_imx6q.S switching mechanism.

(Rework from commit id 427b1b6d628827ca83887b92c8331a261a254151)

Signed-off-by: Adrian Alonso <adrian.alonso@nxp.com>
2018-10-29 11:10:38 +08:00
Adrian Alonso 0e27911405 MLK-13240: arm: imx6q: lpddr2 freq fix switch to 100Mhz
Fix switch_to_100Mhz miss to store updated podf dividers
for system clocks running at 100Mhz (audio mode)

Signed-off-by: Adrian Alonso <adrian.alonso@nxp.com>
2018-10-29 11:10:38 +08:00
Quan Zhang aa26b06044 MLK-13206 dcp: mx6sl: add missing components in dts
After MX6ULL DCP issue is fixed in commit 7a1cc1f, it introduces a new issue,
MX6SL will meet issue as no dcp clock is defined when initializing:
[    3.061344] mxs-dcp 20fc000.dcp: can't identify DCP clk: -2

On mx6sl, dcp clock is always on, so the patch use dummy as dcp clock directly.

Signed-off-by: Quan Zhang <spring.zhang@nxp.com>
2018-10-29 11:10:38 +08:00
Sandor Yu 6e99718257 MLK-13237: dts: Add vadc to i.MX6SX display power domain
VADC module is in i.MX6SX display power domain.
It should enabled with display power domain,
otherwise vadc will fail to be work when
display in low power mode.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
(cherry picked from commit 8ab2cc06a6900889bd61e8de6f5436523e8227d2)
2018-10-29 11:10:38 +08:00
ye li 8da9a292a1 MLK-12990 arm: dts: Fix CAAM JR interrupt parent issue on i.MX6SX
To enable a IRQ as a wakeup source, we should set its interrupt parent to
gpc not the intc. Fix the wrong CAAM JR interrupts setting by removing the
its interrupt parent to use default SOC's interrupt parent "gpc". Otherwise,
irq_set_irq_wake will return error.

Signed-off-by: ye li <ye.li@nxp.com>
2018-10-29 11:10:38 +08:00
Richard Zhu 1ed573eb90 MLK-13186-4 PCI: imx: enable external osc support
In order to pass the pcie gen2 compliance tests,
the external oscillator is mandatory required by
imx6 legacy platforms.
add the external osc support by this patch.
- pll6 should be set bypass mode.
- src of the pll6_bypass should be lvds_clk1
- adjust the swing/deemphase value
- re-configure the phy if the external 100Mhz
differential osc is used. Because that phy used
the 125Mhz before.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
2018-10-29 11:10:38 +08:00
Richard Zhu 580867f63a MLK-13186-3 arm: clk: configure pcie ext osc clk
When the external oscillator is used as pcie ref clk.
the below configurations should done.
- set the lvds_clk1 as input
- set the source of the pll6_bypass to be lvds_clk1
- set the pll6 to be bypass mode.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
2018-10-29 11:10:38 +08:00
Richard Zhu 3a97cd5908 MLK-13186-2 arm: imx6qp: add imx6qp standalone pcie dtb
In order to pass the pcie gen2 compliance tests on imx6qp
sd revb board, add one standalone imx6qp sd ldo pcie dtb
- disalbe fec/sata, because that the fec/sata can't work
when pll6 is in bypass mode.
NOTE: Bypass mode of pll6 is mandatory required when
external oscillator is used as pcie ref clk.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
2018-10-29 11:10:38 +08:00