| Message ID | 5418C1D2.4000303@sonymobile.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sep 16, 2014, at 4:03 PM, Tim Bird <tim.bird@sonymobile.com> wrote: > This DTS has initial support for just a serial console, for the > Sony Xperia Z1 phone. This phone uses a QualComm 8074 processor. > Qualcomm, the C isn’t caps. > Signed-off-by: Tim Bird <tim.bird@sonymobile.com> > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts | 18 ++++++++++++++++++ > 2 files changed, 19 insertions(+) > create mode 100644 arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index b8c5cd3..680ce7e 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -341,6 +341,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb > dtb-$(CONFIG_ARCH_QCOM) += \ > qcom-apq8064-ifc6410.dtb \ > qcom-apq8074-dragonboard.dtb \ > + qcom-apq8074-xperia-z1.dtb \ > qcom-apq8084-mtp.dtb \ > qcom-msm8660-surf.dtb \ > qcom-msm8960-cdp.dtb > diff --git a/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts b/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts > new file mode 100644 > index 0000000..59b3fa1 > --- /dev/null > +++ b/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts > @@ -0,0 +1,18 @@ > +#include "qcom-msm8974.dtsi" > + > +/ { > + model = "Sony Xperia Z1 phone"; > + compatible = "qcom,msm8974”; Should have a board compat as well > + qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>; We don’t have qcom,msm-id upstream at this time. > + > + memory@0 { > + reg = <0 0x40000000>, <0x40000000 0x40000000>; > + device_type = "memory"; > + }; > +}; > + > +&soc { > + serial@f991e000 { > + status = "ok"; > + }; > +}; > -- > 1.7.9.5 >
On 09/16/2014 04:08 PM, Kumar Gala wrote: > > On Sep 16, 2014, at 4:03 PM, Tim Bird <tim.bird@sonymobile.com> wrote: > >> This DTS has initial support for just a serial console, for the >> Sony Xperia Z1 phone. This phone uses a QualComm 8074 processor. >> > > Qualcomm, the C isn’t caps. Will fix. > >> Signed-off-by: Tim Bird <tim.bird@sonymobile.com> >> --- >> arch/arm/boot/dts/Makefile | 1 + >> arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts | 18 ++++++++++++++++++ >> 2 files changed, 19 insertions(+) >> create mode 100644 arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts >> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >> index b8c5cd3..680ce7e 100644 >> --- a/arch/arm/boot/dts/Makefile >> +++ b/arch/arm/boot/dts/Makefile >> @@ -341,6 +341,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb >> dtb-$(CONFIG_ARCH_QCOM) += \ >> qcom-apq8064-ifc6410.dtb \ >> qcom-apq8074-dragonboard.dtb \ >> + qcom-apq8074-xperia-z1.dtb \ >> qcom-apq8084-mtp.dtb \ >> qcom-msm8660-surf.dtb \ >> qcom-msm8960-cdp.dtb >> diff --git a/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts b/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts >> new file mode 100644 >> index 0000000..59b3fa1 >> --- /dev/null >> +++ b/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts >> @@ -0,0 +1,18 @@ >> +#include "qcom-msm8974.dtsi" >> + >> +/ { >> + model = "Sony Xperia Z1 phone"; >> + compatible = "qcom,msm8974”; > > Should have a board compat as well I'll ask Bjorn what we want to do here. There was a compat that I stripped, but I'm not sure we settled on the official name we want. In any event, will fix. > >> + qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>; > > We don’t have qcom,msm-id upstream at this time. Do I just leave this out, then? Thanks. -- Tim P.S. By now you probably noticed I mis-typed device-tree@vger.kernel.org. I'll fix that also.
On Sep 16, 2014, at 4:14 PM, Tim Bird <tim.bird@sonymobile.com> wrote: > > > On 09/16/2014 04:08 PM, Kumar Gala wrote: >> >> On Sep 16, 2014, at 4:03 PM, Tim Bird <tim.bird@sonymobile.com> wrote: >> >>> This DTS has initial support for just a serial console, for the >>> Sony Xperia Z1 phone. This phone uses a QualComm 8074 processor. >>> >> >> Qualcomm, the C isn’t caps. > > Will fix. >> >>> Signed-off-by: Tim Bird <tim.bird@sonymobile.com> >>> --- >>> arch/arm/boot/dts/Makefile | 1 + >>> arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts | 18 ++++++++++++++++++ >>> 2 files changed, 19 insertions(+) >>> create mode 100644 arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts >>> >>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >>> index b8c5cd3..680ce7e 100644 >>> --- a/arch/arm/boot/dts/Makefile >>> +++ b/arch/arm/boot/dts/Makefile >>> @@ -341,6 +341,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb >>> dtb-$(CONFIG_ARCH_QCOM) += \ >>> qcom-apq8064-ifc6410.dtb \ >>> qcom-apq8074-dragonboard.dtb \ >>> + qcom-apq8074-xperia-z1.dtb \ >>> qcom-apq8084-mtp.dtb \ >>> qcom-msm8660-surf.dtb \ >>> qcom-msm8960-cdp.dtb >>> diff --git a/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts b/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts >>> new file mode 100644 >>> index 0000000..59b3fa1 >>> --- /dev/null >>> +++ b/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts >>> @@ -0,0 +1,18 @@ >>> +#include "qcom-msm8974.dtsi" >>> + >>> +/ { >>> + model = "Sony Xperia Z1 phone"; >>> + compatible = "qcom,msm8974”; >> >> Should have a board compat as well > I'll ask Bjorn what we want to do here. There was a compat that I stripped, > but I'm not sure we settled on the official name we want. In any event, > will fix. >> >>> + qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>; >> >> We don’t have qcom,msm-id upstream at this time. > Do I just leave this out, then? yes, lets drop it for now, unless you guys need it to boot the upstream kernel on your hw. > > Thanks. > -- Tim > > P.S. By now you probably noticed I mis-typed device-tree@vger.kernel.org. I'll fix that also.
On Tue 16 Sep 16:14 PDT 2014, Tim Bird wrote: > > > On 09/16/2014 04:08 PM, Kumar Gala wrote: > > > > On Sep 16, 2014, at 4:03 PM, Tim Bird <tim.bird@sonymobile.com> wrote: [..] > > > >> + qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>; > > > > We don’t have qcom,msm-id upstream at this time. > Do I just leave this out, then? Both our tool to generate boot.img [1] and the Qualcomm equivalent require these to be there. Last time I tried to concatenate the dtb to zImage and using the Google mkbootimg the bootloader refused to load the result. But please give it a test and maybe we can postpone adding this definition. Otherwise we need to add a definition - covering both the 8974 and 8974ab format. [1] https://github.com/sonyxperiadev/mkqcdtbootimg Regards, Bjorn
On 9/16/2014 4:14 PM, Tim Bird wrote: > > > On 09/16/2014 04:08 PM, Kumar Gala wrote: >> >> On Sep 16, 2014, at 4:03 PM, Tim Bird <tim.bird@sonymobile.com> wrote: >> >>> This DTS has initial support for just a serial console, for the >>> Sony Xperia Z1 phone. This phone uses a QualComm 8074 processor. >>> >> >> Qualcomm, the C isn’t caps. > > Will fix. >> >>> Signed-off-by: Tim Bird <tim.bird@sonymobile.com> >>> --- >>> arch/arm/boot/dts/Makefile | 1 + >>> arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts | 18 ++++++++++++++++++ >>> 2 files changed, 19 insertions(+) >>> create mode 100644 arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts >>> >>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >>> index b8c5cd3..680ce7e 100644 >>> --- a/arch/arm/boot/dts/Makefile >>> +++ b/arch/arm/boot/dts/Makefile >>> @@ -341,6 +341,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb >>> dtb-$(CONFIG_ARCH_QCOM) += \ >>> qcom-apq8064-ifc6410.dtb \ >>> qcom-apq8074-dragonboard.dtb \ >>> + qcom-apq8074-xperia-z1.dtb \ >>> qcom-apq8084-mtp.dtb \ >>> qcom-msm8660-surf.dtb \ >>> qcom-msm8960-cdp.dtb >>> diff --git a/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts b/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts >>> new file mode 100644 >>> index 0000000..59b3fa1 >>> --- /dev/null >>> +++ b/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts >>> @@ -0,0 +1,18 @@ >>> +#include "qcom-msm8974.dtsi" >>> + >>> +/ { >>> + model = "Sony Xperia Z1 phone"; >>> + compatible = "qcom,msm8974”; >> >> Should have a board compat as well Also need to add the board compat string, and "qcom,msm8974” to the list of strings in arch/arm/mach-qcom/board.c: qcom_dt_match[]. > I'll ask Bjorn what we want to do here. There was a compat that I stripped, > but I'm not sure we settled on the official name we want. In any event, > will fix. >> >>> + qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>; >> >> We don’t have qcom,msm-id upstream at this time. > Do I just leave this out, then? > > Thanks. > -- Tim > > P.S. By now you probably noticed I mis-typed device-tree@vger.kernel.org. I'll fix that also. > -- > To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > . >
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b8c5cd3..680ce7e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -341,6 +341,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8064-ifc6410.dtb \ qcom-apq8074-dragonboard.dtb \ + qcom-apq8074-xperia-z1.dtb \ qcom-apq8084-mtp.dtb \ qcom-msm8660-surf.dtb \ qcom-msm8960-cdp.dtb diff --git a/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts b/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts new file mode 100644 index 0000000..59b3fa1 --- /dev/null +++ b/arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts @@ -0,0 +1,18 @@ +#include "qcom-msm8974.dtsi" + +/ { + model = "Sony Xperia Z1 phone"; + compatible = "qcom,msm8974"; + qcom,msm-id = <126 8 0>, <185 8 0>, <186 8 0>; + + memory@0 { + reg = <0 0x40000000>, <0x40000000 0x40000000>; + device_type = "memory"; + }; +}; + +&soc { + serial@f991e000 { + status = "ok"; + }; +};
This DTS has initial support for just a serial console, for the Sony Xperia Z1 phone. This phone uses a QualComm 8074 processor. Signed-off-by: Tim Bird <tim.bird@sonymobile.com> --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 arch/arm/boot/dts/qcom-apq8074-xperia-z1.dts