| Message ID | 1406940750-15880-5-git-send-email-afaerber@suse.de |
|---|---|
| State | New |
| Headers | show |
Andreas, On Fri, Aug 1, 2014 at 5:52 PM, Andreas Färber <afaerber@suse.de> wrote: > Use the new style of referencing inherited nodes and use symbolic names. > Reorder one pinctrl node in GPIO order. > > Goal is the alignment of all exynos5250 based device trees for comparison. > > Suggested-by: Doug Anderson <dianders@chromium.org> > Reviewed-by: Doug Anderson <dianders@chromium.org> > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > v5 -> v6: > * Split off label additions (Doug Anderson) > * Fixed alphabetical order of sd3_* nodes (Doug Anderson) > > v4 -> v5: > * Introduced labels to consistently use new referencing style (Tomasz Figa) > * Use IRQ_TYPE_* constants > * Use some more GPIO_ACTIVE_* > > v3 -> v4: Unchanged > > v3: New (Doug Anderson) > > arch/arm/boot/dts/exynos5250-snow.dts | 291 +++++++++++++++++----------------- > 1 file changed, 145 insertions(+), 146 deletions(-) I'm happy now. :) Thank you for putting up with me... Reviewed-by: Doug Anderson <dianders@chromium.org>
On 02.08.2014 02:52, Andreas Färber wrote: > Use the new style of referencing inherited nodes and use symbolic names. > Reorder one pinctrl node in GPIO order. > > Goal is the alignment of all exynos5250 based device trees for comparison. > > Suggested-by: Doug Anderson <dianders@chromium.org> > Reviewed-by: Doug Anderson <dianders@chromium.org> > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > v5 -> v6: > * Split off label additions (Doug Anderson) > * Fixed alphabetical order of sd3_* nodes (Doug Anderson) > > v4 -> v5: > * Introduced labels to consistently use new referencing style (Tomasz Figa) > * Use IRQ_TYPE_* constants > * Use some more GPIO_ACTIVE_* > > v3 -> v4: Unchanged > > v3: New (Doug Anderson) > > arch/arm/boot/dts/exynos5250-snow.dts | 291 +++++++++++++++++----------------- > 1 file changed, 145 insertions(+), 146 deletions(-) Reviewed-by: Tomasz Figa <t.figa@samsung.com> Best regards, Tomasz
On 02.08.2014 14:21, Tomasz Figa wrote: > On 02.08.2014 02:52, Andreas Färber wrote: >> Use the new style of referencing inherited nodes and use symbolic names. >> Reorder one pinctrl node in GPIO order. >> >> Goal is the alignment of all exynos5250 based device trees for comparison. >> >> Suggested-by: Doug Anderson <dianders@chromium.org> >> Reviewed-by: Doug Anderson <dianders@chromium.org> >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> --- >> v5 -> v6: >> * Split off label additions (Doug Anderson) >> * Fixed alphabetical order of sd3_* nodes (Doug Anderson) >> >> v4 -> v5: >> * Introduced labels to consistently use new referencing style (Tomasz Figa) >> * Use IRQ_TYPE_* constants >> * Use some more GPIO_ACTIVE_* >> >> v3 -> v4: Unchanged >> >> v3: New (Doug Anderson) >> >> arch/arm/boot/dts/exynos5250-snow.dts | 291 +++++++++++++++++----------------- >> 1 file changed, 145 insertions(+), 146 deletions(-) > > Reviewed-by: Tomasz Figa <t.figa@samsung.com> Just for convenience of other reviewers, here are actual changes done do the device tree after compiling into dtb and then back into dts: > --- exynos5250-snow.dtb.dts 2014-08-02 14:54:15.145905921 +0200 > +++ ../dtbs.post/exynos5250-snow.dtb.dts 2014-08-02 14:54:15.146905921 +0200 > @@ -8,6 +8,7 @@ > model = "Google Snow"; > > chosen { > + bootargs = "console=tty1"; > }; > > aliases { > @@ -829,15 +830,6 @@ > phandle = <0x44>; > }; > > - hdmi-hpd-irq { > - samsung,pins = "gpx3-7"; > - samsung,pin-function = <0x0>; > - samsung,pin-pud = <0x1>; > - samsung,pin-drv = <0x0>; > - linux,phandle = <0x33>; > - phandle = <0x33>; > - }; > - > max77686-irq { > samsung,pins = "gpx3-2"; > samsung,pin-function = <0x0>; > @@ -846,6 +838,15 @@ > linux,phandle = <0xe>; > phandle = <0xe>; > }; > + > + hdmi-hpd-irq { > + samsung,pins = "gpx3-7"; > + samsung,pin-function = <0x0>; > + samsung,pin-pud = <0x1>; > + samsung,pin-drv = <0x0>; > + linux,phandle = <0x33>; > + phandle = <0x33>; > + }; > }; > > pinctrl@13400000 { > @@ -1703,12 +1704,12 @@ > samsung,dw-mshc-ciu-div = <0x3>; > samsung,dw-mshc-sdr-timing = <0x2 0x3>; > samsung,dw-mshc-ddr-timing = <0x1 0x2>; > + pinctrl-names = "default"; > + pinctrl-0 = <0x27 0x28 0x29>; > > slot@0 { > reg = <0x0>; > bus-width = <0x4>; > - pinctrl-names = "default"; > - pinctrl-0 = <0x27 0x28 0x29>; > }; > }; > Best regards, Tomasz
Am 02.08.2014 14:56, schrieb Tomasz Figa: > On 02.08.2014 14:21, Tomasz Figa wrote: >> On 02.08.2014 02:52, Andreas Färber wrote: >>> Use the new style of referencing inherited nodes and use symbolic names. >>> Reorder one pinctrl node in GPIO order. >>> >>> Goal is the alignment of all exynos5250 based device trees for comparison. >>> >>> Suggested-by: Doug Anderson <dianders@chromium.org> >>> Reviewed-by: Doug Anderson <dianders@chromium.org> >>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>> --- >>> v5 -> v6: >>> * Split off label additions (Doug Anderson) >>> * Fixed alphabetical order of sd3_* nodes (Doug Anderson) >>> >>> v4 -> v5: >>> * Introduced labels to consistently use new referencing style (Tomasz Figa) >>> * Use IRQ_TYPE_* constants >>> * Use some more GPIO_ACTIVE_* >>> >>> v3 -> v4: Unchanged >>> >>> v3: New (Doug Anderson) >>> >>> arch/arm/boot/dts/exynos5250-snow.dts | 291 +++++++++++++++++----------------- >>> 1 file changed, 145 insertions(+), 146 deletions(-) >> >> Reviewed-by: Tomasz Figa <t.figa@samsung.com> > > Just for convenience of other reviewers, here are actual changes done do > the device tree after compiling into dtb and then back into dts: Erm, to not confuse reviewers, this must be over the whole series: >> --- exynos5250-snow.dtb.dts 2014-08-02 14:54:15.145905921 +0200 >> +++ ../dtbs.post/exynos5250-snow.dtb.dts 2014-08-02 14:54:15.146905921 +0200 >> @@ -8,6 +8,7 @@ >> model = "Google Snow"; >> >> chosen { >> + bootargs = "console=tty1"; >> }; >> >> aliases { This is optional follow-on patch 05/10. >> @@ -829,15 +830,6 @@ >> phandle = <0x44>; >> }; >> >> - hdmi-hpd-irq { >> - samsung,pins = "gpx3-7"; >> - samsung,pin-function = <0x0>; >> - samsung,pin-pud = <0x1>; >> - samsung,pin-drv = <0x0>; >> - linux,phandle = <0x33>; >> - phandle = <0x33>; >> - }; >> - >> max77686-irq { >> samsung,pins = "gpx3-2"; >> samsung,pin-function = <0x0>; >> @@ -846,6 +838,15 @@ >> linux,phandle = <0xe>; >> phandle = <0xe>; >> }; >> + >> + hdmi-hpd-irq { >> + samsung,pins = "gpx3-7"; >> + samsung,pin-function = <0x0>; >> + samsung,pin-pud = <0x1>; >> + samsung,pin-drv = <0x0>; >> + linux,phandle = <0x33>; >> + phandle = <0x33>; >> + }; >> }; >> >> pinctrl@13400000 { This is this patch 04/10. Just a movement. >> @@ -1703,12 +1704,12 @@ >> samsung,dw-mshc-ciu-div = <0x3>; >> samsung,dw-mshc-sdr-timing = <0x2 0x3>; >> samsung,dw-mshc-ddr-timing = <0x1 0x2>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <0x27 0x28 0x29>; >> >> slot@0 { >> reg = <0x0>; >> bus-width = <0x4>; >> - pinctrl-names = "default"; >> - pinctrl-0 = <0x27 0x28 0x29>; >> }; >> }; >> This is preceding patch 01/10. Regards, Andreas
On 02.08.2014 15:08, Andreas Färber wrote: > Am 02.08.2014 14:56, schrieb Tomasz Figa: >> On 02.08.2014 14:21, Tomasz Figa wrote: >>> On 02.08.2014 02:52, Andreas Färber wrote: >>>> Use the new style of referencing inherited nodes and use symbolic names. >>>> Reorder one pinctrl node in GPIO order. >>>> >>>> Goal is the alignment of all exynos5250 based device trees for comparison. >>>> >>>> Suggested-by: Doug Anderson <dianders@chromium.org> >>>> Reviewed-by: Doug Anderson <dianders@chromium.org> >>>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>>> --- >>>> v5 -> v6: >>>> * Split off label additions (Doug Anderson) >>>> * Fixed alphabetical order of sd3_* nodes (Doug Anderson) >>>> >>>> v4 -> v5: >>>> * Introduced labels to consistently use new referencing style (Tomasz Figa) >>>> * Use IRQ_TYPE_* constants >>>> * Use some more GPIO_ACTIVE_* >>>> >>>> v3 -> v4: Unchanged >>>> >>>> v3: New (Doug Anderson) >>>> >>>> arch/arm/boot/dts/exynos5250-snow.dts | 291 +++++++++++++++++----------------- >>>> 1 file changed, 145 insertions(+), 146 deletions(-) >>> >>> Reviewed-by: Tomasz Figa <t.figa@samsung.com> >> >> Just for convenience of other reviewers, here are actual changes done do >> the device tree after compiling into dtb and then back into dts: > > Erm, to not confuse reviewers, this must be over the whole series: Erm, right, I have forgot to state this, sorry. Similarly for other dtb diffs. Best regards, Tomasz
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index 1c36cd72905f..40cad43f8a11 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -6,9 +6,12 @@ * 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. -*/ + */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/input/input.h> #include "exynos5250.dtsi" / { @@ -26,89 +29,19 @@ chosen { }; - rtc@101E0000 { - status = "okay"; - }; - - pinctrl@11400000 { - ec_irq: ec-irq { - samsung,pins = "gpx1-6"; - samsung,pin-function = <0>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - sd3_clk: sd3-clk { - samsung,pin-drv = <0>; - }; - - sd3_cmd: sd3-cmd { - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - sd3_bus4: sd3-bus-width4 { - samsung,pin-drv = <0>; - }; - - max98095_en: max98095-en { - samsung,pins = "gpx1-7"; - samsung,pin-function = <0>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - tps65090_irq: tps65090-irq { - samsung,pins = "gpx2-6"; - samsung,pin-function = <0>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - usb3_vbus_en: usb3-vbus-en { - samsung,pins = "gpx2-7"; - samsung,pin-function = <1>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - hdmi_hpd_irq: hdmi-hpd-irq { - samsung,pins = "gpx3-7"; - samsung,pin-function = <0>; - samsung,pin-pud = <1>; - samsung,pin-drv = <0>; - }; - }; - - pinctrl@13400000 { - arb_their_claim: arb-their-claim { - samsung,pins = "gpe0-4"; - samsung,pin-function = <0>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - arb_our_claim: arb-our-claim { - samsung,pins = "gpf0-3"; - samsung,pin-function = <1>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - }; - gpio-keys { compatible = "gpio-keys"; power { label = "Power"; - gpios = <&gpx1 3 1>; - linux,code = <116>; /* KEY_POWER */ + gpios = <&gpx1 3 GPIO_ACTIVE_LOW>; + linux,code = <KEY_POWER>; gpio-key,wakeup; }; lid-switch { label = "Lid"; - gpios = <&gpx3 5 1>; + gpios = <&gpx3 5 GPIO_ACTIVE_LOW>; linux,input-type = <5>; /* EV_SW */ linux,code = <0>; /* SW_LID */ debounce-interval = <1>; @@ -129,8 +62,8 @@ i2c-parent = <&{/i2c@12CA0000}>; - our-claim-gpio = <&gpf0 3 1>; - their-claim-gpios = <&gpe0 4 1>; + our-claim-gpio = <&gpf0 3 GPIO_ACTIVE_LOW>; + their-claim-gpios = <&gpe0 4 GPIO_ACTIVE_LOW>; slew-delay-us = <10>; wait-retry-us = <3000>; wait-free-us = <50000>; @@ -153,7 +86,7 @@ cros_ec: embedded-controller { compatible = "google,cros-ec-i2c"; reg = <0x1e>; - interrupts = <6 0>; + interrupts = <6 IRQ_TYPE_NONE>; interrupt-parent = <&gpx1>; pinctrl-names = "default"; pinctrl-0 = <&ec_irq>; @@ -239,19 +172,6 @@ }; }; - i2c@12CD0000 { - max98095: codec@11 { - compatible = "maxim,max98095"; - reg = <0x11>; - pinctrl-0 = <&max98095_en>; - pinctrl-names = "default"; - }; - }; - - i2s0: i2s@03830000 { - status = "okay"; - }; - sound { compatible = "google,snow-audio-max98095"; @@ -265,20 +185,12 @@ regulator-name = "P5.0V_USB3CON"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpx2 7 0>; + gpio = <&gpx2 7 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&usb3_vbus_en>; enable-active-high; }; - phy@12100000 { - vbus-supply = <&usb3_vbus_reg>; - }; - - usb@12110000 { - samsung,vbus-gpio = <&gpx1 1 0>; - }; - fixed-rate-clocks { xxti { compatible = "samsung,clock-xxti"; @@ -286,19 +198,7 @@ }; }; - hdmi { - hpd-gpio = <&gpx3 7 0>; - pinctrl-names = "default"; - pinctrl-0 = <&hdmi_hpd_irq>; - phy = <&hdmiphy>; - ddc = <&i2c_2>; - hdmi-en-supply = <&tps65090_fet7>; - vdd-supply = <&ldo8_reg>; - vdd_osc-supply = <&ldo10_reg>; - vdd_pll-supply = <&ldo8_reg>; - }; - - backlight { + backlight: backlight { compatible = "pwm-backlight"; pwms = <&pwm 0 1000000 0>; brightness-levels = <0 100 500 1000 1500 2000 2500 2800>; @@ -306,42 +206,58 @@ pinctrl-0 = <&pwm0_out>; pinctrl-names = "default"; }; +}; - fimd@14400000 { - status = "okay"; - samsung,invert-vclk; - }; - - dp-controller@145B0000 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&dp_hpd>; - samsung,color-space = <0>; - samsung,dynamic-range = <0>; - samsung,ycbcr-coeff = <0>; - samsung,color-depth = <1>; - samsung,link-rate = <0x0a>; - samsung,lane-count = <2>; - samsung,hpd-gpio = <&gpx0 7 0>; - - display-timings { - native-mode = <&timing1>; - - timing1: timing@1 { - clock-frequency = <70589280>; - hactive = <1366>; - vactive = <768>; - hfront-porch = <40>; - hback-porch = <40>; - hsync-len = <32>; - vback-porch = <10>; - vfront-porch = <12>; - vsync-len = <6>; - }; +&dp { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&dp_hpd>; + samsung,color-space = <0>; + samsung,dynamic-range = <0>; + samsung,ycbcr-coeff = <0>; + samsung,color-depth = <1>; + samsung,link-rate = <0x0a>; + samsung,lane-count = <2>; + samsung,hpd-gpio = <&gpx0 7 GPIO_ACTIVE_HIGH>; + + display-timings { + native-mode = <&timing1>; + + timing1: timing@1 { + clock-frequency = <70589280>; + hactive = <1366>; + vactive = <768>; + hfront-porch = <40>; + hback-porch = <40>; + hsync-len = <32>; + vback-porch = <10>; + vfront-porch = <12>; + vsync-len = <6>; }; }; }; +&ehci { + samsung,vbus-gpio = <&gpx1 1 GPIO_ACTIVE_HIGH>; +}; + +&fimd { + status = "okay"; + samsung,invert-vclk; +}; + +&hdmi { + hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_hpd_irq>; + phy = <&hdmiphy>; + ddc = <&i2c_2>; + hdmi-en-supply = <&tps65090_fet7>; + vdd-supply = <&ldo8_reg>; + vdd_osc-supply = <&ldo10_reg>; + vdd_pll-supply = <&ldo8_reg>; +}; + &i2c_0 { status = "okay"; samsung,i2c-sda-delay = <100>; @@ -350,7 +266,7 @@ max77686@09 { compatible = "maxim,max77686"; interrupt-parent = <&gpx3>; - interrupts = <2 0>; + interrupts = <2 IRQ_TYPE_NONE>; pinctrl-names = "default"; pinctrl-0 = <&max77686_irq>; wakeup-source; @@ -500,7 +416,7 @@ trackpad { reg = <0x67>; compatible = "cypress,cyapa"; - interrupts = <2 0>; + interrupts = <2 IRQ_TYPE_NONE>; interrupt-parent = <&gpx1>; wakeup-source; }; @@ -547,6 +463,13 @@ status = "okay"; samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>; + + max98095: codec@11 { + compatible = "maxim,max98095"; + reg = <0x11>; + pinctrl-0 = <&max98095_en>; + pinctrl-names = "default"; + }; }; &i2c_8 { @@ -560,6 +483,10 @@ }; }; +&i2s0 { + status = "okay"; +}; + &mmc_0 { status = "okay"; num-slots = <1>; @@ -592,7 +519,7 @@ slot@0 { reg = <0>; bus-width = <4>; - wp-gpios = <&gpc2 1 0>; + wp-gpios = <&gpc2 1 GPIO_ACTIVE_HIGH>; }; }; @@ -619,12 +546,80 @@ }; &pinctrl_0 { + ec_irq: ec-irq { + samsung,pins = "gpx1-6"; + samsung,pin-function = <0>; + samsung,pin-pud = <0>; + samsung,pin-drv = <0>; + }; + + max98095_en: max98095-en { + samsung,pins = "gpx1-7"; + samsung,pin-function = <0>; + samsung,pin-pud = <3>; + samsung,pin-drv = <0>; + }; + + tps65090_irq: tps65090-irq { + samsung,pins = "gpx2-6"; + samsung,pin-function = <0>; + samsung,pin-pud = <0>; + samsung,pin-drv = <0>; + }; + + usb3_vbus_en: usb3-vbus-en { + samsung,pins = "gpx2-7"; + samsung,pin-function = <1>; + samsung,pin-pud = <0>; + samsung,pin-drv = <0>; + }; + max77686_irq: max77686-irq { samsung,pins = "gpx3-2"; samsung,pin-function = <0>; samsung,pin-pud = <0>; samsung,pin-drv = <0>; }; + + hdmi_hpd_irq: hdmi-hpd-irq { + samsung,pins = "gpx3-7"; + samsung,pin-function = <0>; + samsung,pin-pud = <1>; + samsung,pin-drv = <0>; + }; +}; + +&pinctrl_1 { + arb_their_claim: arb-their-claim { + samsung,pins = "gpe0-4"; + samsung,pin-function = <0>; + samsung,pin-pud = <3>; + samsung,pin-drv = <0>; + }; + + arb_our_claim: arb-our-claim { + samsung,pins = "gpf0-3"; + samsung,pin-function = <1>; + samsung,pin-pud = <0>; + samsung,pin-drv = <0>; + }; +}; + +&rtc { + status = "okay"; +}; + +&sd3_bus4 { + samsung,pin-drv = <0>; +}; + +&sd3_clk { + samsung,pin-drv = <0>; +}; + +&sd3_cmd { + samsung,pin-pud = <3>; + samsung,pin-drv = <0>; }; &spi_1 { @@ -633,4 +628,8 @@ num-cs = <1>; }; +&usbdrd_phy { + vbus-supply = <&usb3_vbus_reg>; +}; + #include "cros-ec-keyboard.dtsi"