MIPS: Fixes and improvements for CI20 board (JZ4780)
Subsystems (4)
v5 cover MIPS: Fixes and improvements for CI20 board (JZ4780)
* add #include irq.h not in PMU patch but in RTC patch
* added Reviewed-by: Paul Cercueil <[email protected]>
PATCH V4 2020-02-28 19:02:57:
* use KEY_F13 for SW1 button to avoid conflict with Enter of an USB keyboard (suggested by Paul Cercueil <[email protected]>)
* tidy up all new #includes to be at beginning of file and alphabetically sorted (suggested by Paul Cercueil <[email protected]>)
* add new #include to DTS only when needed (suggested by Paul Cercueil <[email protected]>)
PATCH V3 2020-02-16 21:21:07:
* dropped "drm: ingenic-drm: add MODULE_DEVICE_TABLE" because it will be resubmitted
with a HDMI driver solution
* added Cc: [email protected] where appropriate (suggested by Paul Cercueil <[email protected]>)
* squashed all other DTS and CONFIG changes into single patches (suggested by Paul Cercueil <[email protected]>)
PATCH V2 2020-02-14 17:10:33:
* dropped "net: davicom: dm9000: allow to pass MAC address through mac_addr module parameter" from this series because it goes through the netdev tree
(suggested by Andrew Lunn <[email protected]>)
* added a "fixes:" for "MIPS: DTS: CI20: fix PMU definitions for ACT8600"
and "MIPS: DTS: CI20: fix interrupt for pcf8563 RTC"
(suggested by Andreas Kemnade <[email protected]>)
* "i2c: jz4780: silence log flood on txabrt" dropped because it is
replaced by a new version in v5.6 by Wolfram Sang <[email protected]>
PATCH V1 2020-02-11 22:41:43:
This patch set provides several improvements for the CI20 board:
* suppress warnings from i2c if device is not responding
* make ingenic-drm found through DT
* allow davicom dm9000 ethernet controller to use MAC address provided by U-Boot
* fix #include in jz4780.dtsi
* configure for loadable kernel modules
* add DTS for IR sensor and SW1 button
* configure so that LEDs, IR sensor, SW1 button have drivers
* fix DTS for ACT8600 PMU and configure driver
* fix interrupt of nxp,pcf8563
There is another patch set in our queue to add HDMI support on top of this work.
Alex Smith (1):
MIPS: DTS: CI20: add DT node for IR sensor
H. Nikolaus Schaller (4):
MIPS: DTS: CI20: fix PMU definitions for ACT8600
MIPS: DTS: CI20: fix interrupt for pcf8563 RTC
MIPS: DTS: CI20: multiple DTS improvements
MIPS: CI20: defconfig: multiple improvements
arch/mips/boot/dts/ingenic/ci20.dts | 71 ++++++++++++++++++++++------- arch/mips/configs/ci20_defconfig | 21 +++++++++ 2 files changed, 76 insertions(+), 16 deletions(-)
Signature · 1 line
2.23.0
PATCH v5 1/5 MIPS: DTS: CI20: add DT node for IR sensor
From: Alex Smith <[email protected]>
The infrared sensor on the CI20 board is connected to a GPIO and can be operated by using the gpio-ir-recv driver. Add a DT node for the sensor to allow that driver to be used.
--- arch/mips/boot/dts/ingenic/ci20.dts | 5 +++++ 1 file changed, 5 insertions(+)
arch/mips/boot/dts/ingenic/ci20.dts +5 -0
@@ -60,6 +60,11 @@ enable-active-high; }; + ir: ir-receiver { + compatible = "gpio-ir-receiver"; + gpios = <&gpe 3 GPIO_ACTIVE_LOW>; + }; + wlan0_power: fixedregulator@1 { compatible = "regulator-fixed"; regulator-name = "wlan0_power";
Signature · 1 line
2.23.0
PATCH v5 2/5 MIPS: DTS: CI20: fix PMU definitions for ACT8600
In reply to H. Nikolaus SchallerThere is a ACT8600 on the CI20 board and the bindings of the ACT8865 driver have changed without updating the CI20 device tree. Therefore the PMU can not be probed successfully and is running in power-on reset state.
Fix DT to match the latest act8865-regulator bindings.
--- arch/mips/boot/dts/ingenic/ci20.dts | 47 ++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 15 deletions(-)
arch/mips/boot/dts/ingenic/ci20.dts +32 -15
@@ -4,6 +4,7 @@ #include "jz4780.dtsi" #include <dt-bindings/clock/ingenic,tcu.h> #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/regulator/active-semi,8865-regulator.h> / { compatible = "img,ci20", "ingenic,jz4780";
@@ -166,65 +167,81 @@ reg = <0x5a>; status = "okay"; +/* +Optional input supply properties: +- for act8600: + - vp1-supply: The input supply for DCDC_REG1 + - vp2-supply: The input supply for DCDC_REG2 + - vp3-supply: The input supply for DCDC_REG3 + - inl-supply: The input supply for LDO_REG5, LDO_REG6, LDO_REG7 and LDO_REG8 + SUDCDC_REG4, LDO_REG9 and LDO_REG10 do not have separate supplies. +*/ + regulators { vddcore: SUDCDC1 { - regulator-name = "VDDCORE"; + regulator-name = "DCDC_REG1"; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; regulator-always-on; }; vddmem: SUDCDC2 { - regulator-name = "VDDMEM"; + regulator-name = "DCDC_REG2"; regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; regulator-always-on; }; vcc_33: SUDCDC3 { - regulator-name = "VCC33"; + regulator-name = "DCDC_REG3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; vcc_50: SUDCDC4 { - regulator-name = "VCC50"; + regulator-name = "SUDCDC_REG4"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; }; vcc_25: LDO_REG5 { - regulator-name = "VCC25"; + regulator-name = "LDO_REG5"; regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; wifi_io: LDO_REG6 { - regulator-name = "WIFIIO"; + regulator-name = "LDO_REG6"; regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; vcc_28: LDO_REG7 { - regulator-name = "VCC28"; + regulator-name = "LDO_REG7"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; regulator-always-on; }; vcc_15: LDO_REG8 { - regulator-name = "VCC15"; + regulator-name = "LDO_REG8"; regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; regulator-always-on; }; - vcc_18: LDO_REG9 { - regulator-name = "VCC18"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + vrtc_18: LDO_REG9 { + regulator-name = "LDO_REG9"; + /* Despite the datasheet stating 3.3V for REG9 and + driver expecting that, REG9 outputs 1.8V. + Likely the CI20 uses a chip variant. + Since it is a simple on/off LDO the exact values + do not matter. + */ + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; regulator-always-on; }; vcc_11: LDO_REG10 { - regulator-name = "VCC11"; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; + regulator-name = "LDO_REG10"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; regulator-always-on; }; };
Signature · 1 line
2.23.0
Thomas Bogendoerfer
maintainerRe: [PATCH v5 2/5] MIPS: DTS: CI20: fix PMU definitions for ACT8600
Quoted 8 lines · H. Nikolaus Schaller
There is a ACT8600 on the CI20 board and the bindings of the ACT8865 driver have changed without updating the CI20 device tree. Therefore the PMU can not be probed successfully and is running in power-on reset state.
Fix DT to match the latest act8865-regulator bindings.
Fixes 73f2b940474d ("MIPS: CI20: DTS: Add I2C nodes")
I see checkpatch warnings in this patch, could please fix them ? And please seperate fixes from improvments, thank you.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Re: [PATCH v5 2/5] MIPS: DTS: CI20: fix PMU definitions for ACT8600
Hi Thomas,
Quoted 8 lines
Am 03.03.2020 um 11:18 schrieb Thomas Bogendoerfer <[email protected]>:
Quoted 5 lines · H. Nikolaus Schaller
There is a ACT8600 on the CI20 board and the bindings of the ACT8865 driver have changed without updating the CI20 device tree. Therefore the PMU can not be probed successfully and is running in power-on reset state.
Quoted 5 lines
Quoted 3 lines
Fix DT to match the latest act8865-regulator bindings.
Fixes 73f2b940474d ("MIPS: CI20: DTS: Add I2C nodes")I see checkpatch warnings in this patch, could please fix them ?
Ah, ok. The comment. Well, on a 5k screen this 80 character limit is really outdated. But checkpatch is the king :)
Noted for v6.
Quoted 1 line
And please seperate fixes from improvments, thank you.
What do you mean by "separate"? Two separate patches? This patch only contains fixes (which I would consider all of them to be improvements).
Quoted 2 lines
Thomas.
BR and thanks,
Nikolaus
Thomas Bogendoerfer
maintainerRe: [PATCH v5 2/5] MIPS: DTS: CI20: fix PMU definitions for ACT8600
Quoted 5 lines · H. Nikolaus Schaller
Quoted 1 line
And please seperate fixes from improvments, thank you.
What do you mean by "separate"? Two separate patches? This patch only contains fixes (which I would consider all of them to be improvements).
There are two patches with Fixes tag, which IMHO should go into 5.6 via mips-fixes branch. All others are going via mips-next into 5.7. So it helps me, if they come in different patch series (or as single patches).
I see other DT changes in your other patch series. Are the changes there independent from each other or do they require correct order when appling them ?
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Re: [PATCH v5 2/5] MIPS: DTS: CI20: fix PMU definitions for ACT8600
Quoted 6 lines
Am 03.03.2020 um 13:32 schrieb Thomas Bogendoerfer <[email protected]>:
Quoted 2 lines · H. Nikolaus Schaller
Quoted 1 line
And please seperate fixes from improvments, thank you.
Quoted 8 lines
Quoted 3 lines
What do you mean by "separate"? Two separate patches? This patch only contains fixes (which I would consider all of them to be improvements).
There are two patches with Fixes tag, which IMHO should go into 5.6 via mips-fixes branch. All others are going via mips-next into 5.7. So it helps me, if they come in different patch series (or as single patches).
Ah, ok. I didn't know that there are two branches and originally I didn't see them as fixes - they became by review suggestions.
Quoted 3 lines
I see other DT changes in your other patch series. Are the changes there independent from each other or do they require correct order when appling them ?
I think they are independent. Only the fixes should go to stable as well. The others can wait.
Quoted 2 lines
Thomas.
BR and thanks,
Nikolaus
PATCH v5 3/5 MIPS: DTS: CI20: fix interrupt for pcf8563 RTC
In reply to H. Nikolaus SchallerInterrupts should not be specified by interrupt line but by gpio parent and reference.
--- arch/mips/boot/dts/ingenic/ci20.dts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/mips/boot/dts/ingenic/ci20.dts +4 -1
@@ -4,6 +4,7 @@ #include "jz4780.dtsi" #include <dt-bindings/clock/ingenic,tcu.h> #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/regulator/active-semi,8865-regulator.h> / {
@@ -283,7 +284,9 @@ Optional input supply properties: rtc@51 { compatible = "nxp,pcf8563"; reg = <0x51>; - interrupts = <110>; + + interrupt-parent = <&gpf>; + interrupts = <30 IRQ_TYPE_LEVEL_LOW>; }; };
Signature · 1 line
2.23.0
Sasha Levin
maintainerRe: [PATCH v5 3/5] MIPS: DTS: CI20: fix interrupt for pcf8563 RTC
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag fixing commit: 73f2b940474d ("MIPS: CI20: DTS: Add I2C nodes").
The bot has tested the following trees: v5.5.7.
v5.5.7: Failed to apply! Possible dependencies:
5314215430e5 ("MIPS: DTS: CI20: fix PMU definitions for ACT8600")NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
Signature · 2 lines
Thanks Sasha
PATCH v5 4/5 MIPS: DTS: CI20: multiple DTS improvements
In reply to H. Nikolaus Schallera) add DT node for SW1 as Enter button
The SW1 button can be used as a simple one-button keyboard and is connected to PD17.
Note: SW1 has a second meaning to change the boot sequence when pressed while powering on.
b) give eth0_power a defined voltage.
This is a 3.3V power switch (DVNET3.3V).
--- arch/mips/boot/dts/ingenic/ci20.dts | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/mips/boot/dts/ingenic/ci20.dts +14 -0
@@ -4,6 +4,7 @@ #include "jz4780.dtsi" #include <dt-bindings/clock/ingenic,tcu.h> #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/regulator/active-semi,8865-regulator.h>
@@ -27,6 +28,17 @@ 0x30000000 0x30000000>; }; + gpio-keys { + compatible = "gpio-keys"; + + sw1 { + label = "ci20:sw1"; + linux,code = <KEY_F13>; + gpios = <&gpd 17 GPIO_ACTIVE_HIGH>; + wakeup-source; + }; + }; + leds { compatible = "gpio-leds";
@@ -58,6 +70,8 @@ eth0_power: fixedregulator@0 { compatible = "regulator-fixed"; regulator-name = "eth0_power"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; gpio = <&gpb 25 GPIO_ACTIVE_LOW>; enable-active-high; };
Signature · 1 line
2.23.0
PATCH v5 5/5 MIPS: CI20: defconfig: multiple improvements
In reply to H. Nikolaus Schallera) configure for supporting modules
Not all drivers need to be compiled into the kernel. Support building and loading of kernel modules.
b) compile leds-gpio driver into the kernel and configure for LED triggers
DTS has been augmented to add some gpio-leds. We need the leds-gpio driver and enable the triggers.
c) configure CONFIG_REGULATOR_ACT8865 for PMU
The PMU on the CI20 board is an ACT8600 using the ACT8865 driver. Since it is not compiled, the PMU and the CI20 board is running in power-on reset state of the PMU.
d) compile gpio-ir driver
The CI20 board has a gpio based IR receiver.
e) configure for CONFIG_KEYBOARD_GPIO=m
The SW1 button is hooked up to send input events.
--- arch/mips/configs/ci20_defconfig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/mips/configs/ci20_defconfig +21 -0
@@ -1,4 +1,5 @@ # CONFIG_LOCALVERSION_AUTO is not set +CONFIG_MODULES=y CONFIG_KERNEL_XZ=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y
@@ -88,12 +89,14 @@ CONFIG_I2C_JZ4780=y CONFIG_SPI=y CONFIG_SPI_GPIO=y CONFIG_GPIO_SYSFS=y +CONFIG_KEYBOARD_GPIO=m # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_JZ4740_WDT=y CONFIG_REGULATOR=y CONFIG_REGULATOR_DEBUG=y CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_ACT8865=y # CONFIG_VGA_CONSOLE is not set # CONFIG_HID is not set # CONFIG_USB_SUPPORT is not set
@@ -166,3 +169,21 @@ CONFIG_STACKTRACE=y # CONFIG_FTRACE is not set CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="earlycon console=ttyS4,115200 clk_ignore_unused" +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_MTD=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_ONESHOT=y +CONFIG_LEDS_TRIGGER_ONESHOT=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_LEDS_TRIGGER_TRANSIENT=y +CONFIG_LEDS_TRIGGER_CAMERA=m +CONFIG_LIRC=y +CONFIG_MEDIA_SUPPORT=m +CONFIG_RC_DEVICES=y +CONFIG_IR_GPIO_CIR=m +CONFIG_IR_GPIO_TX=m
Signature · 1 line
2.23.0