| Message ID | 1467818724-21500-3-git-send-email-ayaka@soulik.info (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, Am Mittwoch, 6. Juli 2016, 23:25:23 schrieb ayaka: > The regulator settings are the same in the firefly beta and > firefly. But the firefly reload is different. I remove > the difference part from the common header dtsi, but remained those > common one to keep references. > > Signed-off-by: ayaka <ayaka@soulik.info> applies to all 3 patches: we require real names both in the patch/mail from as well as the Signed-off-by line, see [0] at number 11. To my untrained eye the name given doesn't look like a real name, please correct me if I'm wrong. [0] https://www.kernel.org/doc/Documentation/SubmittingPatches > --- > arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 > ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts > | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi > | 14 +++++++------- > 3 files changed, 67 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts > b/arch/arm/boot/dts/rk3288-firefly-beta.dts index 75d77e3..6c08dae2 > 100644 > --- a/arch/arm/boot/dts/rk3288-firefly-beta.dts > +++ b/arch/arm/boot/dts/rk3288-firefly-beta.dts > @@ -69,3 +69,33 @@ > &pwm0 { > status = "okay"; > }; > + > +&gmac { > + phy-supply = <&vcc_lan>; > +}; Not 100% sure, but I guess this does not need to be duplicated. The supply is named vcc_lan in all board revisions only the supplying regulator seems different, so it should be enough to point the vcc_lan phandle to the correct regulator in the relevant file, but the gmac assignment could stay in the main file? > + > +&io_domains { > + audio-supply = <&vcca_33>; > + flash1-supply = <&vcc_lan>; > +}; same here > + > +®ulators { > + vcca_18: REG7 { > + regulator-name = "vcca_18"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + }; > + > + vcca_33: REG8 { > + regulator-name = "vcca_33"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > + vcc_lan: REG9 { > + regulator-name = "vcc_lan"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + }; > +}; > diff --git a/arch/arm/boot/dts/rk3288-firefly.dts > b/arch/arm/boot/dts/rk3288-firefly.dts index c07fe92..1964b6f 100644 > --- a/arch/arm/boot/dts/rk3288-firefly.dts > +++ b/arch/arm/boot/dts/rk3288-firefly.dts > @@ -69,3 +69,33 @@ > &pwm1 { > status = "okay"; > }; > + > +&gmac { > + phy-supply = <&vcc_lan>; > +}; > + > +&io_domains { > + audio-supply = <&vcca_33>; > + flash1-supply = <&vcc_lan>; > +}; > + > +®ulators { > + vcca_18: REG7 { > + regulator-name = "vcca_18"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + }; > + > + vcca_33: REG8 { > + regulator-name = "vcca_33"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > + vcc_lan: REG9 { > + regulator-name = "vcc_lan"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + }; > +}; > diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi > b/arch/arm/boot/dts/rk3288-firefly.dtsi index 1d7f03c..205348f 100644 > --- a/arch/arm/boot/dts/rk3288-firefly.dtsi > +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi > @@ -68,11 +68,9 @@ > compatible = "rockchip,rk3288-io-voltage-domain"; > rockchip,grf = <&grf>; > > - audio-supply = <&vcca_33>; > bb-supply = <&vcc_io>; > dvp-supply = <&dovdd_1v8>; > flash0-supply = <&vcc_flash>; > - flash1-supply = <&vcc_lan>; > gpio30-supply = <&vcc_io>; > gpio1830-supply = <&vcc_io>; > lcdc-supply = <&vcc_io>; > @@ -225,7 +223,6 @@ > clock_in_out = "input"; > pinctrl-names = "default"; > pinctrl-0 = <&rgmii_pins>, <&phy_rst>, <&phy_pmeb>, <&phy_int>; > - phy-supply = <&vcc_lan>; > phy-mode = "rgmii"; > snps,reset-active-low; > snps,reset-delays-us = <0 10000 1000000>; > @@ -296,7 +293,7 @@ > inl2-supply = <&vcc_sys>; > inl3-supply = <&vcc_20>; > > - regulators { > + regulators: regulators { the phandle name is to generic, as this is part of the act8846 and not something generic. So please name the phandle act8846_regulators / act8846_regs or so. > vcc_ddr: REG1 { > regulator-name = "vcc_ddr"; > regulator-min-microvolt = <1200000>; > @@ -339,24 +336,27 @@ > regulator-always-on; > }; > > - vcca_18: REG7 { > + REG7 { > regulator-name = "vcca_18"; > regulator-min-microvolt = <1800000>; > regulator-max-microvolt = <1800000>; > }; > > - vcca_33: REG8 { > + unecessary new empty line > + REG8 { > regulator-name = "vcca_33"; > regulator-min-microvolt = <3300000>; > regulator-max-microvolt = <3300000>; > + regulator-always-on; > }; > > - vcc_lan: REG9 { > + REG9 { > regulator-name = "vcc_lan"; > regulator-min-microvolt = <3300000>; > regulator-max-microvolt = <3300000>; > }; > > + unecessary new empty line > vdd_10: REG10 { > regulator-name = "vdd_10"; > regulator-min-microvolt = <1000000>; > -- > 2.7.4 Heiko
I am sorry to make this mistake. I have re-sent my patches. Thank you for reminding me that. I hope that I make it correct this time. ayaka (3): ARM: dts: add label leds for rk3288-firefly.dtsi ARM: dts: move regulator settings from common to specifics ARM: dts: add rk3288-firefly-reload arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 109 ++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 16 ++-- 5 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
I am very sorry very sorry, the last time I sent are still wrong. I forget to reset the author. Please drop the below ones, and have a review on this time. I am sorry to waste your time. Randy Li (3): ARM: dts: add label leds for rk3288-firefly.dtsi ARM: dts: move regulator settings from common to specifics ARM: dts: add rk3288-firefly-reload arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 109 ++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 16 ++-- 5 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
at July, 7th, Heiko Stuebner Wrote: > Hi, > > Am Mittwoch, 6. Juli 2016, 23:25:23 schrieb ayaka: >> The regulator settings are the same in the firefly beta and >> firefly. But the firefly reload is different. I remove >> the difference part from the common header dtsi, but remained those >> common one to keep references. >> >> Signed-off-by: ayaka <ayaka@soulik.info> > applies to all 3 patches: we require real names both in the patch/mail from > as well as the Signed-off-by line, see [0] at number 11. To my untrained eye > the name given doesn't look like a real name, please correct me if I'm > wrong. > > > [0] https://www.kernel.org/doc/Documentation/SubmittingPatches > > >> --- >> arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 >> ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts >> | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi >> | 14 +++++++------- >> 3 files changed, 67 insertions(+), 7 deletions(-) >> >> diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts >> b/arch/arm/boot/dts/rk3288-firefly-beta.dts index 75d77e3..6c08dae2 >> 100644 >> --- a/arch/arm/boot/dts/rk3288-firefly-beta.dts >> +++ b/arch/arm/boot/dts/rk3288-firefly-beta.dts >> @@ -69,3 +69,33 @@ >> &pwm0 { >> status = "okay"; >> }; >> + >> +&gmac { >> + phy-supply = <&vcc_lan>; >> +}; > Not 100% sure, but I guess this does not need to be duplicated. > The supply is named vcc_lan in all board revisions only the supplying > regulator seems different, so it should be enough to point the vcc_lan > phandle to the correct regulator in the relevant file, but the gmac > assignment could stay in the main file? > But I can't have two label in two different place. So I have no choice but to do so. If the dts compiler in kernel support the overwrite now and unresolved symbols now, I would glad to know that. >> + >> +&io_domains { >> + audio-supply = <&vcca_33>; >> + flash1-supply = <&vcc_lan>; >> +}; > same here > >> + >> +®ulators { >> + vcca_18: REG7 { >> + regulator-name = "vcca_18"; >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <1800000>; >> + }; >> + >> + vcca_33: REG8 { >> + regulator-name = "vcca_33"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + }; >> + >> + vcc_lan: REG9 { >> + regulator-name = "vcc_lan"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + }; >> +}; >> diff --git a/arch/arm/boot/dts/rk3288-firefly.dts >> b/arch/arm/boot/dts/rk3288-firefly.dts index c07fe92..1964b6f 100644 >> --- a/arch/arm/boot/dts/rk3288-firefly.dts >> +++ b/arch/arm/boot/dts/rk3288-firefly.dts >> @@ -69,3 +69,33 @@ >> &pwm1 { >> status = "okay"; >> }; >> + >> +&gmac { >> + phy-supply = <&vcc_lan>; >> +}; >> + >> +&io_domains { >> + audio-supply = <&vcca_33>; >> + flash1-supply = <&vcc_lan>; >> +}; >> + >> +®ulators { >> + vcca_18: REG7 { >> + regulator-name = "vcca_18"; >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <1800000>; >> + }; >> + >> + vcca_33: REG8 { >> + regulator-name = "vcca_33"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + }; >> + >> + vcc_lan: REG9 { >> + regulator-name = "vcc_lan"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + }; >> +}; >> diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi >> b/arch/arm/boot/dts/rk3288-firefly.dtsi index 1d7f03c..205348f 100644 >> --- a/arch/arm/boot/dts/rk3288-firefly.dtsi >> +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi >> @@ -68,11 +68,9 @@ >> compatible = "rockchip,rk3288-io-voltage-domain"; >> rockchip,grf = <&grf>; >> >> - audio-supply = <&vcca_33>; >> bb-supply = <&vcc_io>; >> dvp-supply = <&dovdd_1v8>; >> flash0-supply = <&vcc_flash>; >> - flash1-supply = <&vcc_lan>; >> gpio30-supply = <&vcc_io>; >> gpio1830-supply = <&vcc_io>; >> lcdc-supply = <&vcc_io>; >> @@ -225,7 +223,6 @@ >> clock_in_out = "input"; >> pinctrl-names = "default"; >> pinctrl-0 = <&rgmii_pins>, <&phy_rst>, <&phy_pmeb>, <&phy_int>; >> - phy-supply = <&vcc_lan>; >> phy-mode = "rgmii"; >> snps,reset-active-low; >> snps,reset-delays-us = <0 10000 1000000>; >> @@ -296,7 +293,7 @@ >> inl2-supply = <&vcc_sys>; >> inl3-supply = <&vcc_20>; >> >> - regulators { >> + regulators: regulators { > the phandle name is to generic, as this is part of the act8846 and not > something generic. So please name the phandle act8846_regulators / > act8846_regs or so. I forget that, I would re-send new patches. I am very sorry to re-send the same patches three times. I should not be such hurry. > >> vcc_ddr: REG1 { >> regulator-name = "vcc_ddr"; >> regulator-min-microvolt = <1200000>; >> @@ -339,24 +336,27 @@ >> regulator-always-on; >> }; >> >> - vcca_18: REG7 { >> + REG7 { >> regulator-name = "vcca_18"; >> regulator-min-microvolt = <1800000>; >> regulator-max-microvolt = <1800000>; >> }; >> >> - vcca_33: REG8 { >> + > unecessary new empty line It would be removed >> + REG8 { >> regulator-name = "vcca_33"; >> regulator-min-microvolt = <3300000>; >> regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> }; >> >> - vcc_lan: REG9 { >> + REG9 { >> regulator-name = "vcc_lan"; >> regulator-min-microvolt = <3300000>; >> regulator-max-microvolt = <3300000>; >> }; >> >> + > unecessary new empty line It would be removed > >> vdd_10: REG10 { >> regulator-name = "vdd_10"; >> regulator-min-microvolt = <1000000>; >> -- >> 2.7.4 > > Heiko
The rk3288 firefly reload is a Rockchip RK3288 based board be found by core board and main board. The regulators are connected in a different way to the previous version of firefly boards, it is necessary to move some common code to uncommon place. I only tested the ethernet and confirmed that works. The usb in this board won't caused by the bugs in the driver. This version follow the suggests from Heiko Stuebner, except the duplicated supply name problem, I don't think it could be fixed in that way. Randy Li (3): ARM: dts: add label leds for rk3288-firefly.dtsi ARM: dts: move regulator settings from common to specifics ARM: dts: add rk3288-firefly-reload arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 109 ++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 16 ++-- 5 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
Hi Randy, Am Donnerstag, 7. Juli 2016, 02:22:57 schrieb Randy Li: > The rk3288 firefly reload is a Rockchip RK3288 based board be found by > core board and main board. The regulators are connected in a different > way to the previous version of firefly boards, it is necessary to > move some common code to uncommon place. > > I only tested the ethernet and confirmed that works. > The usb in this board won't caused by the bugs in the driver. > > This version follow the suggests from Heiko Stuebner, > except the duplicated supply name problem, I don't think > it could be fixed in that way. I've now had a chance to look at that reload board on the firefly site. Firefly also is the company name, so a board named that way is not necessarily a "variant" :-) . And looking at the "reload" board this definitly seems to be a very different product with it being a system-on-module+baseboard design with additional peripherals like that sata bridge, camera interfaces and probably more. As you might've seen, most Rockchip boards are based on some reference- design, so are similar in a big part of their core layout. So, looking at the vastly different product the reload is, I'd really like to have a separate dts for the reload, to not run into more confusing differences later on. Also, when adding a new board, please also add an entry to Documentation/devicetree/bindingd/arm/rockchip.txt Thanks Heiko
Thank you for you review, HeiKo On 07/08/2016 05:35 AM, Heiko Stuebner wrote: > Hi Randy, > > Am Donnerstag, 7. Juli 2016, 02:22:57 schrieb Randy Li: >> The rk3288 firefly reload is a Rockchip RK3288 based board be found by >> core board and main board. The regulators are connected in a different >> way to the previous version of firefly boards, it is necessary to >> move some common code to uncommon place. >> >> I only tested the ethernet and confirmed that works. >> The usb in this board won't caused by the bugs in the driver. >> >> This version follow the suggests from Heiko Stuebner, >> except the duplicated supply name problem, I don't think >> it could be fixed in that way. > I've now had a chance to look at that reload board on the firefly site. > Firefly also is the company name, so a board named that way is not > necessarily a "variant" :-) . > > And looking at the "reload" board this definitly seems to be a very > different product with it being a system-on-module+baseboard design with > additional peripherals like that sata bridge, camera interfaces and probably sata bridge is just a SATA to usb bridge and the "reload" bring back the DVP camera interface and a HDMI rx chip connected to the other MIPI camera interface. > more. > > As you might've seen, most Rockchip boards are based on some reference- > design, so are similar in a big part of their core layout. Yes, from the evb. But the even the main board of evb in rockchip company have at lease 3 versions as I known. Also the evb is found by power board, main board and core board. > So, looking at the vastly different product the reload is, I'd really like > to have a separate dts for the reload, to not run into more confusing > differences later on. The main problem is that power connections are different. That is why I decide to make a separate dts. If the kernel introduce the override dts, I could have a better way to implement it. > Also, when adding a new board, please also add an entry to > Documentation/devicetree/bindingd/arm/rockchip.txt I would send a patch set in a few days. > Thanks > Heiko Thank you for you review and you patient again Randy
Hi Randy, Am Samstag, 9. Juli 2016, 23:42:28 schrieb ayaka: > On 07/08/2016 05:35 AM, Heiko Stuebner wrote: > > Am Donnerstag, 7. Juli 2016, 02:22:57 schrieb Randy Li: > >> The rk3288 firefly reload is a Rockchip RK3288 based board be found by > >> core board and main board. The regulators are connected in a different > >> way to the previous version of firefly boards, it is necessary to > >> move some common code to uncommon place. > >> > >> I only tested the ethernet and confirmed that works. > >> The usb in this board won't caused by the bugs in the driver. > >> > >> This version follow the suggests from Heiko Stuebner, > >> except the duplicated supply name problem, I don't think > >> it could be fixed in that way. > > > > I've now had a chance to look at that reload board on the firefly site. > > Firefly also is the company name, so a board named that way is not > > necessarily a "variant" :-) . > > > > And looking at the "reload" board this definitly seems to be a very > > different product with it being a system-on-module+baseboard design with > > additional peripherals like that sata bridge, camera interfaces and > > probably > sata bridge is just a SATA to usb bridge and the "reload" bring back the > DVP camera interface and > a HDMI rx chip connected to the other MIPI camera interface. there are always more things to control (reset pins, regulators) and the usb subsystem is currently in the process of getting support for such "embedded" uses. > > more. > > > > As you might've seen, most Rockchip boards are based on some reference- > > design, so are similar in a big part of their core layout. > > Yes, from the evb. But the even the main board of evb in rockchip > company have at lease 3 versions > as I known. > Also the evb is found by power board, main board and core board. > > > So, looking at the vastly different product the reload is, I'd really > > like to have a separate dts for the reload, to not run into more > > confusing differences later on. > > The main problem is that power connections are different. That is why I > decide to make a > separate dts. If the kernel introduce the override dts, I could have a > better way to implement > it. Just to make sure we're not talking about different things. This was meant to illustrate that even though core layouts often look similar we should not try to connect different product board files unnecessarily, as the small differences will make everything more complicated. The "reload" definitly is a completely different product that only shares the manufacturer (firefly) and the soc (rk3288) with the other product and as I wrote should get its own independent dts file. If anything you could do a split into a reload-core dtsi for the system-on- module part and a baseboard dts that includes that (something like what is done for rk3288-rock2). > > Also, when adding a new board, please also add an entry to > > Documentation/devicetree/bindingd/arm/rockchip.txt > > I would send a patch set in a few days. > > > Thanks > > Heiko > > Thank you for you review and you patient again no problem, always nice to have more people play with Rockchip stuff on a mainline kernel :-) Heiko
This version is split into a reload core dtsi for the SoC module part and a baseboard dts for the reload baseboard. Thanks to the Heiko's advise. Randy Li (1): ARM: dts: add rk3288-firefly-reload Documentation/devicetree/bindings/arm/rockchip.txt | 4 + arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 304 ++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly-reload.dts | 320 +++++++++++++++++++++ 4 files changed, 629 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi create mode 100644 arch/arm/boot/dts/rk3288-firefly-reload.dts
diff --git a/arch/arm/boot/dts/rk3288-firefly-beta.dts b/arch/arm/boot/dts/rk3288-firefly-beta.dts index 75d77e3..6c08dae2 100644 --- a/arch/arm/boot/dts/rk3288-firefly-beta.dts +++ b/arch/arm/boot/dts/rk3288-firefly-beta.dts @@ -69,3 +69,33 @@ &pwm0 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +®ulators { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +}; diff --git a/arch/arm/boot/dts/rk3288-firefly.dts b/arch/arm/boot/dts/rk3288-firefly.dts index c07fe92..1964b6f 100644 --- a/arch/arm/boot/dts/rk3288-firefly.dts +++ b/arch/arm/boot/dts/rk3288-firefly.dts @@ -69,3 +69,33 @@ &pwm1 { status = "okay"; }; + +&gmac { + phy-supply = <&vcc_lan>; +}; + +&io_domains { + audio-supply = <&vcca_33>; + flash1-supply = <&vcc_lan>; +}; + +®ulators { + vcca_18: REG7 { + regulator-name = "vcca_18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + vcca_33: REG8 { + regulator-name = "vcca_33"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vcc_lan: REG9 { + regulator-name = "vcc_lan"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +}; diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi index 1d7f03c..205348f 100644 --- a/arch/arm/boot/dts/rk3288-firefly.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi @@ -68,11 +68,9 @@ compatible = "rockchip,rk3288-io-voltage-domain"; rockchip,grf = <&grf>; - audio-supply = <&vcca_33>; bb-supply = <&vcc_io>; dvp-supply = <&dovdd_1v8>; flash0-supply = <&vcc_flash>; - flash1-supply = <&vcc_lan>; gpio30-supply = <&vcc_io>; gpio1830-supply = <&vcc_io>; lcdc-supply = <&vcc_io>; @@ -225,7 +223,6 @@ clock_in_out = "input"; pinctrl-names = "default"; pinctrl-0 = <&rgmii_pins>, <&phy_rst>, <&phy_pmeb>, <&phy_int>; - phy-supply = <&vcc_lan>; phy-mode = "rgmii"; snps,reset-active-low; snps,reset-delays-us = <0 10000 1000000>; @@ -296,7 +293,7 @@ inl2-supply = <&vcc_sys>; inl3-supply = <&vcc_20>; - regulators { + regulators: regulators { vcc_ddr: REG1 { regulator-name = "vcc_ddr"; regulator-min-microvolt = <1200000>; @@ -339,24 +336,27 @@ regulator-always-on; }; - vcca_18: REG7 { + REG7 { regulator-name = "vcca_18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - vcca_33: REG8 { + + REG8 { regulator-name = "vcca_33"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on; }; - vcc_lan: REG9 { + REG9 { regulator-name = "vcc_lan"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; + vdd_10: REG10 { regulator-name = "vdd_10"; regulator-min-microvolt = <1000000>;
The regulator settings are the same in the firefly beta and firefly. But the firefly reload is different. I remove the difference part from the common header dtsi, but remained those common one to keep references. Signed-off-by: ayaka <ayaka@soulik.info> --- arch/arm/boot/dts/rk3288-firefly-beta.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3288-firefly.dtsi | 14 +++++++------- 3 files changed, 67 insertions(+), 7 deletions(-)