| Message ID | 1414525992-3678-5-git-send-email-sbranden@broadcom.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, A bunch of small comments below, should be quick to fix. On Tue, Oct 28, 2014 at 12:53 PM, Scott Branden <sbranden@broadcom.com> wrote: > DT files to enable cygnus consisting on reference designs > and cygnus core configuration. > > Reviewed-by: Ray Jui <rjui@broadcom.com> > Reviewed-by: Arun Parameswaran <aparames@broadcom.com> > Tested-by: Jonathan Richardson <jonathar@broadcom.com> > Reviewed-by: JD (Jiandong) Zheng <jdzheng@broadcom.com> > Signed-off-by: Scott Branden <sbranden@broadcom.com> > --- > arch/arm/boot/dts/Makefile | 4 ++ > arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 73 ++++++++++++++++++++++ > arch/arm/boot/dts/bcm-cygnus.dtsi | 100 +++++++++++++++++++++++++++++++ > arch/arm/boot/dts/bcm911360_entphn.dts | 32 ++++++++++ > arch/arm/boot/dts/bcm911360k.dts | 32 ++++++++++ > arch/arm/boot/dts/bcm958300k.dts | 32 ++++++++++ > 6 files changed, 273 insertions(+) > create mode 100644 arch/arm/boot/dts/bcm-cygnus-clock.dtsi > create mode 100644 arch/arm/boot/dts/bcm-cygnus.dtsi > create mode 100644 arch/arm/boot/dts/bcm911360_entphn.dts > create mode 100644 arch/arm/boot/dts/bcm911360k.dts > create mode 100644 arch/arm/boot/dts/bcm958300k.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 38c89ca..4b3a590 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -54,6 +54,10 @@ dtb-$(CONFIG_ARCH_AT91) += at91-sama5d4ek.dtb > dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb > dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb > dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb > +dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \ > + bcm911360_entphn.dtb \ > + bcm911360k.dtb \ > + bcm958300k.dtb > dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb > dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb > dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ Please add new entries in alphabetical/alphanumerical order. Also, first entry is commonly added on the first line > diff --git a/arch/arm/boot/dts/bcm-cygnus-clock.dtsi b/arch/arm/boot/dts/bcm-cygnus-clock.dtsi > new file mode 100644 > index 0000000..d06172b > --- /dev/null > +++ b/arch/arm/boot/dts/bcm-cygnus-clock.dtsi > @@ -0,0 +1,73 @@ > +/* > + * Copyright 2014 Broadcom Corporation. All rights reserved. > + * > + * Unless you and Broadcom execute a separate written software license > + * agreement governing use of this software, this software is licensed to you > + * under the terms of the GNU General Public License as > + * published by the Free Software Foundation version 2. > + * > + * This program is distributed "as is" WITHOUT ANY WARRANTY of any > + * kind, whether express or implied; without even the implied warranty > + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. We ask for new DT contents to be added with dual BSD/GPL license, to allow for reuse of the DT data structures in other projects as well. There's currently a lot of activity going on relicensing the current files so I recommend sorting it out before they are added if you can. > + */ > + > +clocks { > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + > + osc: oscillator { > + compatible = "fixed-clock"; > + #clock-cells = <1>; > + clock-frequency = <25000000>; > + }; > + > + apb_clk: apb_clk { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <1000000000>; > + }; > + > + periph_clk: periph_clk { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <500000000>; > + }; > + > + sdio_clk: lcpll_ch2 { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <200000000>; > + }; > + > + axi81_clk: axi81_clk { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <100000000>; > + }; > + > + keypad_clk: keypad_clk { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <31806>; > + }; > + > + adc_clk: adc_clk { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <1562500>; > + }; > + > + pwm_clk: pwm_clk { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <1000000>; > + }; > + > + lcd_clk: mipipll_ch1 { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <100000000>; > + }; > +}; > diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi > new file mode 100644 > index 0000000..9c650ab > --- /dev/null > +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi > @@ -0,0 +1,100 @@ > +/* > + * Copyright 2014 Broadcom Corporation. All rights reserved. > + * > + * Unless you and Broadcom execute a separate written software license > + * agreement governing use of this software, this software is licensed to you > + * under the terms of the GNU General Public License as > + * published by the Free Software Foundation version 2. > + * > + * This program is distributed "as is" WITHOUT ANY WARRANTY of any > + * kind, whether express or implied; without even the implied warranty > + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + */ > + > +#include <dt-bindings/interrupt-controller/arm-gic.h> > +#include <dt-bindings/interrupt-controller/irq.h> > + > +#include "skeleton.dtsi" > + > +/ { > + compatible = "brcm,cygnus"; > + model = "Broadcom Cygnus SoC"; > + interrupt-parent = <&gic>; > + > + cpus { > + #address-cells = <1>; > + #size-cells = <0>; > + > + cpu@0 { > + device_type = "cpu"; > + compatible = "arm,cortex-a9"; > + next-level-cache = <&L2>; > + reg = <0x0>; > + }; > + }; > + > + /include/ "bcm-cygnus-clock.dtsi" > + > + amba { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "arm,amba-bus", "simple-bus"; > + interrupt-parent = <&gic>; > + ranges; > + > + wdt@18009000 { > + compatible = "arm,sp805" , "arm,primecell"; > + reg = <0x18009000 0x1000>; > + interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&axi81_clk>; > + clock-names = "apb_pclk"; > + }; > + }; > + > + uart3: serial@18023000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x18023000 0x100>; > + reg-shift = <2>; > + reg-io-width = <4>; > + interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; > + clock-frequency = <100000000>; > + clocks = <&axi81_clk>; > + status = "okay"; It is common to leave these disabled in the SoC/common dtsi, and enable them in the per-board dts files, since different boards might not use all peripherals, etc. It seems like all your boards currently use both uarts, but if it changes in the future please consider switching over. It might be worth doing so now to avoid churn later on. That also allows you to define all the uards (I'm going to guess that there's a total of at least 4 on this system :). > + }; > + > + uart0: serial@18020000 { These are also out of order, uart3 is before uart0 (and the registers are in reverse order). We normally recommend that you add entries sorted by reg/unit address -- that way there's less risk of conflict due to add/add compared to if people just append new entries at the end of the file. > + compatible = "snps,dw-apb-uart"; > + reg = <0x18020000 0x100>; > + reg-shift = <2>; > + reg-io-width = <4>; > + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&axi81_clk>; > + clock-frequency = <100000000>; > + status = "okay"; > + }; > + > + gic: interrupt-controller@19021000 { > + compatible = "arm,cortex-a9-gic"; > + #interrupt-cells = <3>; > + #address-cells = <0>; > + interrupt-controller; > + reg = <0x19021000 0x1000>, > + <0x19020100 0x100>; > + }; > + > + L2: l2-cache { l2-cache@19022000 > + compatible = "arm,pl310-cache"; > + reg = <0x19022000 0x1000>; > + cache-unified; > + cache-level = <2>; > + }; > + > + timer@19020200 { > + compatible = "arm,cortex-a9-global-timer"; > + reg = <0x19020200 0x100>; > + interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&periph_clk>; > + }; > + > +}; > diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts > new file mode 100644 > index 0000000..9de5e87 > --- /dev/null > +++ b/arch/arm/boot/dts/bcm911360_entphn.dts > @@ -0,0 +1,32 @@ > +/* > + * Copyright 2014 Broadcom Corporation. All rights reserved. > + * > + * Unless you and Broadcom execute a separate written software license > + * agreement governing use of this software, this software is licensed to you > + * under the terms of the GNU General Public License as > + * published by the Free Software Foundation version 2. > + * > + * This program is distributed "as is" WITHOUT ANY WARRANTY of any > + * kind, whether express or implied; without even the implied warranty > + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + */ > + > +/dts-v1/; > + > +#include "bcm-cygnus.dtsi" > + > +/ { > + model = "Cygnus Enterprise Phone (BCM911360_ENTPHN)"; > + compatible = "brcm,bcm11360", "brcm,cygnus"; > + > + aliases { > + serial0 = &uart3; > + serial1 = &uart0; > + }; > + > + chosen { > + stdout-path = &uart3; > + bootargs = "console=ttyS0,115200"; > + }; > +}; > diff --git a/arch/arm/boot/dts/bcm911360k.dts b/arch/arm/boot/dts/bcm911360k.dts > new file mode 100644 > index 0000000..dd4f102 > --- /dev/null > +++ b/arch/arm/boot/dts/bcm911360k.dts > @@ -0,0 +1,32 @@ > +/* > + * Copyright 2014 Broadcom Corporation. All rights reserved. > + * > + * Unless you and Broadcom execute a separate written software license > + * agreement governing use of this software, this software is licensed to you > + * under the terms of the GNU General Public License as > + * published by the Free Software Foundation version 2. > + * > + * This program is distributed "as is" WITHOUT ANY WARRANTY of any > + * kind, whether express or implied; without even the implied warranty > + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + */ > + > +/dts-v1/; > + > +#include "bcm-cygnus.dtsi" > + > +/ { > + model = "Cygnus SVK (BCM911360K)"; > + compatible = "brcm,bcm11360", "brcm,cygnus"; > + > + aliases { > + serial0 = &uart3; > + serial1 = &uart0; > + }; > + > + chosen { > + stdout-path = &uart3; > + bootargs = "console=ttyS0,115200"; > + }; > +}; > diff --git a/arch/arm/boot/dts/bcm958300k.dts b/arch/arm/boot/dts/bcm958300k.dts > new file mode 100644 > index 0000000..f8b9625 > --- /dev/null > +++ b/arch/arm/boot/dts/bcm958300k.dts > @@ -0,0 +1,32 @@ > +/* > + * Copyright 2014 Broadcom Corporation. All rights reserved. > + * > + * Unless you and Broadcom execute a separate written software license > + * agreement governing use of this software, this software is licensed to you > + * under the terms of the GNU General Public License as > + * published by the Free Software Foundation version 2. > + * > + * This program is distributed "as is" WITHOUT ANY WARRANTY of any > + * kind, whether express or implied; without even the implied warranty > + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + */ > + > +/dts-v1/; > + > +#include "bcm-cygnus.dtsi" > + > +/ { > + model = "Cygnus SVK (BCM958300K)"; > + compatible = "brcm,bcm58300", "brcm,cygnus"; > + > + aliases { > + serial0 = &uart3; > + serial1 = &uart0; > + }; > + > + chosen { > + stdout-path = &uart3; > + bootargs = "console=ttyS0,115200"; > + }; > +}; > -- > 1.7.9.5 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On 14-11-08 04:22 PM, Olof Johansson wrote: > Hi, > > A bunch of small comments below, should be quick to fix. > > On Tue, Oct 28, 2014 at 12:53 PM, Scott Branden <sbranden@broadcom.com> wrote: >> DT files to enable cygnus consisting on reference designs >> and cygnus core configuration. >> >> Reviewed-by: Ray Jui <rjui@broadcom.com> >> Reviewed-by: Arun Parameswaran <aparames@broadcom.com> >> Tested-by: Jonathan Richardson <jonathar@broadcom.com> >> Reviewed-by: JD (Jiandong) Zheng <jdzheng@broadcom.com> >> Signed-off-by: Scott Branden <sbranden@broadcom.com> >> --- >> arch/arm/boot/dts/Makefile | 4 ++ >> arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 73 ++++++++++++++++++++++ >> arch/arm/boot/dts/bcm-cygnus.dtsi | 100 +++++++++++++++++++++++++++++++ >> arch/arm/boot/dts/bcm911360_entphn.dts | 32 ++++++++++ >> arch/arm/boot/dts/bcm911360k.dts | 32 ++++++++++ >> arch/arm/boot/dts/bcm958300k.dts | 32 ++++++++++ >> 6 files changed, 273 insertions(+) >> create mode 100644 arch/arm/boot/dts/bcm-cygnus-clock.dtsi >> create mode 100644 arch/arm/boot/dts/bcm-cygnus.dtsi >> create mode 100644 arch/arm/boot/dts/bcm911360_entphn.dts >> create mode 100644 arch/arm/boot/dts/bcm911360k.dts >> create mode 100644 arch/arm/boot/dts/bcm958300k.dts >> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >> index 38c89ca..4b3a590 100644 >> --- a/arch/arm/boot/dts/Makefile >> +++ b/arch/arm/boot/dts/Makefile >> @@ -54,6 +54,10 @@ dtb-$(CONFIG_ARCH_AT91) += at91-sama5d4ek.dtb >> dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb >> dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb >> dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb >> +dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \ >> + bcm911360_entphn.dtb \ >> + bcm911360k.dtb \ >> + bcm958300k.dtb >> dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb >> dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb >> dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ > > Please add new entries in alphabetical/alphanumerical order. Also, > first entry is commonly added on the first line > > >> diff --git a/arch/arm/boot/dts/bcm-cygnus-clock.dtsi b/arch/arm/boot/dts/bcm-cygnus-clock.dtsi >> new file mode 100644 >> index 0000000..d06172b >> --- /dev/null >> +++ b/arch/arm/boot/dts/bcm-cygnus-clock.dtsi >> @@ -0,0 +1,73 @@ >> +/* >> + * Copyright 2014 Broadcom Corporation. All rights reserved. >> + * >> + * Unless you and Broadcom execute a separate written software license >> + * agreement governing use of this software, this software is licensed to you >> + * under the terms of the GNU General Public License as >> + * published by the Free Software Foundation version 2. >> + * >> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any >> + * kind, whether express or implied; without even the implied warranty >> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. > > We ask for new DT contents to be added with dual BSD/GPL license, to > allow for reuse of the DT data structures in other projects as well. > There's currently a lot of activity going on relicensing the current > files so I recommend sorting it out before they are added if you can. This may take more time than you think. I am going to have to go through legal to get such a license created. Also, why would you need dual license? If it is BSD that should serve both purposes? > >> + */ >> + >> +clocks { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + ranges; >> + >> + osc: oscillator { >> + compatible = "fixed-clock"; >> + #clock-cells = <1>; >> + clock-frequency = <25000000>; >> + }; >> + >> + apb_clk: apb_clk { >> + compatible = "fixed-clock"; >> + #clock-cells = <0>; >> + clock-frequency = <1000000000>; >> + }; >> + >> + periph_clk: periph_clk { >> + compatible = "fixed-clock"; >> + #clock-cells = <0>; >> + clock-frequency = <500000000>; >> + }; >> + >> + sdio_clk: lcpll_ch2 { >> + compatible = "fixed-clock"; >> + #clock-cells = <0>; >> + clock-frequency = <200000000>; >> + }; >> + >> + axi81_clk: axi81_clk { >> + compatible = "fixed-clock"; >> + #clock-cells = <0>; >> + clock-frequency = <100000000>; >> + }; >> + >> + keypad_clk: keypad_clk { >> + compatible = "fixed-clock"; >> + #clock-cells = <0>; >> + clock-frequency = <31806>; >> + }; >> + >> + adc_clk: adc_clk { >> + compatible = "fixed-clock"; >> + #clock-cells = <0>; >> + clock-frequency = <1562500>; >> + }; >> + >> + pwm_clk: pwm_clk { >> + compatible = "fixed-clock"; >> + #clock-cells = <0>; >> + clock-frequency = <1000000>; >> + }; >> + >> + lcd_clk: mipipll_ch1 { >> + compatible = "fixed-clock"; >> + #clock-cells = <0>; >> + clock-frequency = <100000000>; >> + }; >> +}; >> diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi >> new file mode 100644 >> index 0000000..9c650ab >> --- /dev/null >> +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi >> @@ -0,0 +1,100 @@ >> +/* >> + * Copyright 2014 Broadcom Corporation. All rights reserved. >> + * >> + * Unless you and Broadcom execute a separate written software license >> + * agreement governing use of this software, this software is licensed to you >> + * under the terms of the GNU General Public License as >> + * published by the Free Software Foundation version 2. >> + * >> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any >> + * kind, whether express or implied; without even the implied warranty >> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + */ >> + >> +#include <dt-bindings/interrupt-controller/arm-gic.h> >> +#include <dt-bindings/interrupt-controller/irq.h> >> + >> +#include "skeleton.dtsi" >> + >> +/ { >> + compatible = "brcm,cygnus"; >> + model = "Broadcom Cygnus SoC"; >> + interrupt-parent = <&gic>; >> + >> + cpus { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + cpu@0 { >> + device_type = "cpu"; >> + compatible = "arm,cortex-a9"; >> + next-level-cache = <&L2>; >> + reg = <0x0>; >> + }; >> + }; >> + >> + /include/ "bcm-cygnus-clock.dtsi" >> + >> + amba { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + compatible = "arm,amba-bus", "simple-bus"; >> + interrupt-parent = <&gic>; >> + ranges; >> + >> + wdt@18009000 { >> + compatible = "arm,sp805" , "arm,primecell"; >> + reg = <0x18009000 0x1000>; >> + interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&axi81_clk>; >> + clock-names = "apb_pclk"; >> + }; >> + }; >> + >> + uart3: serial@18023000 { >> + compatible = "snps,dw-apb-uart"; >> + reg = <0x18023000 0x100>; >> + reg-shift = <2>; >> + reg-io-width = <4>; >> + interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; >> + clock-frequency = <100000000>; >> + clocks = <&axi81_clk>; >> + status = "okay"; > > It is common to leave these disabled in the SoC/common dtsi, and > enable them in the per-board dts files, since different boards might > not use all peripherals, etc. > > It seems like all your boards currently use both uarts, but if it > changes in the future please consider switching over. It might be > worth doing so now to avoid churn later on. That also allows you to > define all the uards (I'm going to guess that there's a total of at > least 4 on this system :). > >> + }; >> + >> + uart0: serial@18020000 { > > These are also out of order, uart3 is before uart0 (and the registers > are in reverse order). > > We normally recommend that you add entries sorted by reg/unit address > -- that way there's less risk of conflict due to add/add compared to > if people just append new entries at the end of the file. > >> + compatible = "snps,dw-apb-uart"; >> + reg = <0x18020000 0x100>; >> + reg-shift = <2>; >> + reg-io-width = <4>; >> + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&axi81_clk>; >> + clock-frequency = <100000000>; >> + status = "okay"; >> + }; >> + >> + gic: interrupt-controller@19021000 { >> + compatible = "arm,cortex-a9-gic"; >> + #interrupt-cells = <3>; >> + #address-cells = <0>; >> + interrupt-controller; >> + reg = <0x19021000 0x1000>, >> + <0x19020100 0x100>; >> + }; >> + >> + L2: l2-cache { > > l2-cache@19022000 > >> + compatible = "arm,pl310-cache"; >> + reg = <0x19022000 0x1000>; >> + cache-unified; >> + cache-level = <2>; >> + }; >> + >> + timer@19020200 { >> + compatible = "arm,cortex-a9-global-timer"; >> + reg = <0x19020200 0x100>; >> + interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&periph_clk>; >> + }; >> + >> +}; >> diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts >> new file mode 100644 >> index 0000000..9de5e87 >> --- /dev/null >> +++ b/arch/arm/boot/dts/bcm911360_entphn.dts >> @@ -0,0 +1,32 @@ >> +/* >> + * Copyright 2014 Broadcom Corporation. All rights reserved. >> + * >> + * Unless you and Broadcom execute a separate written software license >> + * agreement governing use of this software, this software is licensed to you >> + * under the terms of the GNU General Public License as >> + * published by the Free Software Foundation version 2. >> + * >> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any >> + * kind, whether express or implied; without even the implied warranty >> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + */ >> + >> +/dts-v1/; >> + >> +#include "bcm-cygnus.dtsi" >> + >> +/ { >> + model = "Cygnus Enterprise Phone (BCM911360_ENTPHN)"; >> + compatible = "brcm,bcm11360", "brcm,cygnus"; >> + >> + aliases { >> + serial0 = &uart3; >> + serial1 = &uart0; >> + }; >> + >> + chosen { >> + stdout-path = &uart3; >> + bootargs = "console=ttyS0,115200"; >> + }; >> +}; >> diff --git a/arch/arm/boot/dts/bcm911360k.dts b/arch/arm/boot/dts/bcm911360k.dts >> new file mode 100644 >> index 0000000..dd4f102 >> --- /dev/null >> +++ b/arch/arm/boot/dts/bcm911360k.dts >> @@ -0,0 +1,32 @@ >> +/* >> + * Copyright 2014 Broadcom Corporation. All rights reserved. >> + * >> + * Unless you and Broadcom execute a separate written software license >> + * agreement governing use of this software, this software is licensed to you >> + * under the terms of the GNU General Public License as >> + * published by the Free Software Foundation version 2. >> + * >> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any >> + * kind, whether express or implied; without even the implied warranty >> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + */ >> + >> +/dts-v1/; >> + >> +#include "bcm-cygnus.dtsi" >> + >> +/ { >> + model = "Cygnus SVK (BCM911360K)"; >> + compatible = "brcm,bcm11360", "brcm,cygnus"; >> + >> + aliases { >> + serial0 = &uart3; >> + serial1 = &uart0; >> + }; >> + >> + chosen { >> + stdout-path = &uart3; >> + bootargs = "console=ttyS0,115200"; >> + }; >> +}; >> diff --git a/arch/arm/boot/dts/bcm958300k.dts b/arch/arm/boot/dts/bcm958300k.dts >> new file mode 100644 >> index 0000000..f8b9625 >> --- /dev/null >> +++ b/arch/arm/boot/dts/bcm958300k.dts >> @@ -0,0 +1,32 @@ >> +/* >> + * Copyright 2014 Broadcom Corporation. All rights reserved. >> + * >> + * Unless you and Broadcom execute a separate written software license >> + * agreement governing use of this software, this software is licensed to you >> + * under the terms of the GNU General Public License as >> + * published by the Free Software Foundation version 2. >> + * >> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any >> + * kind, whether express or implied; without even the implied warranty >> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + */ >> + >> +/dts-v1/; >> + >> +#include "bcm-cygnus.dtsi" >> + >> +/ { >> + model = "Cygnus SVK (BCM958300K)"; >> + compatible = "brcm,bcm58300", "brcm,cygnus"; >> + >> + aliases { >> + serial0 = &uart3; >> + serial1 = &uart0; >> + }; >> + >> + chosen { >> + stdout-path = &uart3; >> + bootargs = "console=ttyS0,115200"; >> + }; >> +}; >> -- >> 1.7.9.5 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Sat, Nov 8, 2014 at 10:13 PM, Scott Branden <sbranden@broadcom.com> wrote: > On 14-11-08 04:22 PM, Olof Johansson wrote: >> >> Hi, >> >> A bunch of small comments below, should be quick to fix. >> >> On Tue, Oct 28, 2014 at 12:53 PM, Scott Branden <sbranden@broadcom.com> >> wrote: >>> >>> DT files to enable cygnus consisting on reference designs >>> and cygnus core configuration. >>> >>> Reviewed-by: Ray Jui <rjui@broadcom.com> >>> Reviewed-by: Arun Parameswaran <aparames@broadcom.com> >>> Tested-by: Jonathan Richardson <jonathar@broadcom.com> >>> Reviewed-by: JD (Jiandong) Zheng <jdzheng@broadcom.com> >>> Signed-off-by: Scott Branden <sbranden@broadcom.com> >>> --- >>> arch/arm/boot/dts/Makefile | 4 ++ >>> arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 73 ++++++++++++++++++++++ >>> arch/arm/boot/dts/bcm-cygnus.dtsi | 100 >>> +++++++++++++++++++++++++++++++ >>> arch/arm/boot/dts/bcm911360_entphn.dts | 32 ++++++++++ >>> arch/arm/boot/dts/bcm911360k.dts | 32 ++++++++++ >>> arch/arm/boot/dts/bcm958300k.dts | 32 ++++++++++ >>> 6 files changed, 273 insertions(+) >>> create mode 100644 arch/arm/boot/dts/bcm-cygnus-clock.dtsi >>> create mode 100644 arch/arm/boot/dts/bcm-cygnus.dtsi >>> create mode 100644 arch/arm/boot/dts/bcm911360_entphn.dts >>> create mode 100644 arch/arm/boot/dts/bcm911360k.dts >>> create mode 100644 arch/arm/boot/dts/bcm958300k.dts >>> >>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile >>> index 38c89ca..4b3a590 100644 >>> --- a/arch/arm/boot/dts/Makefile >>> +++ b/arch/arm/boot/dts/Makefile >>> @@ -54,6 +54,10 @@ dtb-$(CONFIG_ARCH_AT91) += at91-sama5d4ek.dtb >>> dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb >>> dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb >>> dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb >>> +dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \ >>> + bcm911360_entphn.dtb \ >>> + bcm911360k.dtb \ >>> + bcm958300k.dtb >>> dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb >>> dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb >>> dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ >> >> >> Please add new entries in alphabetical/alphanumerical order. Also, >> first entry is commonly added on the first line >> >> >>> diff --git a/arch/arm/boot/dts/bcm-cygnus-clock.dtsi >>> b/arch/arm/boot/dts/bcm-cygnus-clock.dtsi >>> new file mode 100644 >>> index 0000000..d06172b >>> --- /dev/null >>> +++ b/arch/arm/boot/dts/bcm-cygnus-clock.dtsi >>> @@ -0,0 +1,73 @@ >>> +/* >>> + * Copyright 2014 Broadcom Corporation. All rights reserved. >>> + * >>> + * Unless you and Broadcom execute a separate written software license >>> + * agreement governing use of this software, this software is licensed >>> to you >>> + * under the terms of the GNU General Public License as >>> + * published by the Free Software Foundation version 2. >>> + * >>> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any >>> + * kind, whether express or implied; without even the implied warranty >>> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >>> + * GNU General Public License for more details. >> >> >> We ask for new DT contents to be added with dual BSD/GPL license, to >> allow for reuse of the DT data structures in other projects as well. >> There's currently a lot of activity going on relicensing the current >> files so I recommend sorting it out before they are added if you can. > > > This may take more time than you think. I am going to have to go through > legal to get such a license created. Also, why would you need dual license? > If it is BSD that should serve both purposes? I haven't followed the discussion close enough to know if there's been discussion about single-license BSD vs dual BSD/GPL. At the very least, please start the process of getting it changed. Also, I see now that this isn't even a clean GPL v2, given "Unless you and Broadcom..." language. I see the bnx2x driver had that in the past, but none of the Kona contributions did. I strongly suggest sticking to the normal copyrights here and not making things more complicated than they have to. -Olof
On Sat, Nov 08, 2014 at 10:49:09PM -0800, Olof Johansson wrote: > >>> +/* > >>> + * Copyright 2014 Broadcom Corporation. All rights reserved. > >>> + * > >>> + * Unless you and Broadcom execute a separate written software license > >>> + * agreement governing use of this software, this software is licensed > >>> to you > >>> + * under the terms of the GNU General Public License as > >>> + * published by the Free Software Foundation version 2. > >>> + * > >>> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any > >>> + * kind, whether express or implied; without even the implied warranty > >>> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > >>> + * GNU General Public License for more details. > >> > >> > >> We ask for new DT contents to be added with dual BSD/GPL license, to > >> allow for reuse of the DT data structures in other projects as well. > >> There's currently a lot of activity going on relicensing the current > >> files so I recommend sorting it out before they are added if you can. > > > > > > This may take more time than you think. I am going to have to go through > > legal to get such a license created. Also, why would you need dual license? > > If it is BSD that should serve both purposes? > > I haven't followed the discussion close enough to know if there's been > discussion about single-license BSD vs dual BSD/GPL. > > At the very least, please start the process of getting it changed. > > Also, I see now that this isn't even a clean GPL v2, given "Unless you > and Broadcom..." language. I see the bnx2x driver had that in the > past, but none of the Kona contributions did. I strongly suggest > sticking to the normal copyrights here and not making things more > complicated than they have to. I'm thinking that the "unless you and Broadcom..." language really doesn't mean much other than what all other files in the kernel mean from what I can tell. This should just default to GPLv2 and everyone should be ok. But note, I'm not a lawyer, it would be good to get a confirmation from Broadcom that this is the exact wording they want in this file, and that they are happy with it being "just" GPLv2 for all intensive purposes, as it does "differ" from the wording we are "accustomed" to seeing in kernel files. thanks, greg k-h
On Sunday 09 November 2014 09:23:11 Greg Kroah-Hartman wrote: > On Sat, Nov 08, 2014 at 10:49:09PM -0800, Olof Johansson wrote: > > >>> +/* > > >>> + * Copyright 2014 Broadcom Corporation. All rights reserved. > > >>> + * > > >>> + * Unless you and Broadcom execute a separate written software license > > >>> + * agreement governing use of this software, this software is licensed > > >>> to you > > >>> + * under the terms of the GNU General Public License as > > >>> + * published by the Free Software Foundation version 2. > > >>> + * > > >>> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any > > >>> + * kind, whether express or implied; without even the implied warranty > > >>> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > >>> + * GNU General Public License for more details. > > >> > > >> > > >> We ask for new DT contents to be added with dual BSD/GPL license, to > > >> allow for reuse of the DT data structures in other projects as well. > > >> There's currently a lot of activity going on relicensing the current > > >> files so I recommend sorting it out before they are added if you can. > > > > > > > > > This may take more time than you think. I am going to have to go through > > > legal to get such a license created. Also, why would you need dual license? > > > If it is BSD that should serve both purposes? > > > > I haven't followed the discussion close enough to know if there's been > > discussion about single-license BSD vs dual BSD/GPL. I think for all practical purposes, BSD and dual BSD/GPL is the same and listing it as dual was meant as a clarification to make it easier to see that all files in the kernel are GPLv2 compatible. > > At the very least, please start the process of getting it changed. > > > > Also, I see now that this isn't even a clean GPL v2, given "Unless you > > and Broadcom..." language. I see the bnx2x driver had that in the > > past, but none of the Kona contributions did. I strongly suggest > > sticking to the normal copyrights here and not making things more > > complicated than they have to. > > I'm thinking that the "unless you and Broadcom..." language really > doesn't mean much other than what all other files in the kernel mean > from what I can tell. This should just default to GPLv2 and everyone > should be ok. I would hope so at least. It's certainly not obvious whether that means Broadcom can give additional rights to someone over what someone else contributed upstream, or worse if this becomes GPL-incompatible and makes the kernel undistributable for anybody who has an additional license agreement that doesn't give them all the rights that they already had under the GPL. Arnd
On 14-11-09 12:38 PM, Arnd Bergmann wrote: > On Sunday 09 November 2014 09:23:11 Greg Kroah-Hartman wrote: >> On Sat, Nov 08, 2014 at 10:49:09PM -0800, Olof Johansson wrote: >>>>>> +/* >>>>>> + * Copyright 2014 Broadcom Corporation. All rights reserved. >>>>>> + * >>>>>> + * Unless you and Broadcom execute a separate written software license >>>>>> + * agreement governing use of this software, this software is licensed >>>>>> to you >>>>>> + * under the terms of the GNU General Public License as >>>>>> + * published by the Free Software Foundation version 2. >>>>>> + * >>>>>> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any >>>>>> + * kind, whether express or implied; without even the implied warranty >>>>>> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >>>>>> + * GNU General Public License for more details. >>>>> >>>>> >>>>> We ask for new DT contents to be added with dual BSD/GPL license, to >>>>> allow for reuse of the DT data structures in other projects as well. >>>>> There's currently a lot of activity going on relicensing the current >>>>> files so I recommend sorting it out before they are added if you can. >>>> >>>> >>>> This may take more time than you think. I am going to have to go through >>>> legal to get such a license created. Also, why would you need dual license? >>>> If it is BSD that should serve both purposes? >>> >>> I haven't followed the discussion close enough to know if there's been >>> discussion about single-license BSD vs dual BSD/GPL. > > I think for all practical purposes, BSD and dual BSD/GPL is the same and > listing it as dual was meant as a clarification to make it easier to see > that all files in the kernel are GPLv2 compatible. A dual BSD/GPL may involve having me get a lawyer to create such a header. I would prefer to leave it as GPL for now until some concrete decision has finally been made on this by the rest of the community? Or, I can put it as BSD right now if that helps? > >>> At the very least, please start the process of getting it changed. >>> >>> Also, I see now that this isn't even a clean GPL v2, given "Unless you >>> and Broadcom..." language. I see the bnx2x driver had that in the >>> past, but none of the Kona contributions did. I strongly suggest >>> sticking to the normal copyrights here and not making things more >>> complicated than they have to. >> >> I'm thinking that the "unless you and Broadcom..." language really >> doesn't mean much other than what all other files in the kernel mean >> from what I can tell. This should just default to GPLv2 and everyone >> should be ok. > > I would hope so at least. It's certainly not obvious whether that means > Broadcom can give additional rights to someone over what someone else > contributed upstream, or worse if this becomes GPL-incompatible and > makes the kernel undistributable for anybody who has an additional > license agreement that doesn't give them all the rights that they already > had under the GPL. I'll change the header on these files so there are no disagreements. > > Arnd >
On Sunday 09 November 2014 21:17:37 Scott Branden wrote: > On 14-11-09 12:38 PM, Arnd Bergmann wrote: > > On Sunday 09 November 2014 09:23:11 Greg Kroah-Hartman wrote: > >> On Sat, Nov 08, 2014 at 10:49:09PM -0800, Olof Johansson wrote: > >>>>>> +/* > >>>>>> + * Copyright 2014 Broadcom Corporation. All rights reserved. > >>>>>> + * > >>>>>> + * Unless you and Broadcom execute a separate written software license > >>>>>> + * agreement governing use of this software, this software is licensed > >>>>>> to you > >>>>>> + * under the terms of the GNU General Public License as > >>>>>> + * published by the Free Software Foundation version 2. > >>>>>> + * > >>>>>> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any > >>>>>> + * kind, whether express or implied; without even the implied warranty > >>>>>> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > >>>>>> + * GNU General Public License for more details. > >>>>> > >>>>> > >>>>> We ask for new DT contents to be added with dual BSD/GPL license, to > >>>>> allow for reuse of the DT data structures in other projects as well. > >>>>> There's currently a lot of activity going on relicensing the current > >>>>> files so I recommend sorting it out before they are added if you can. > >>>> > >>>> > >>>> This may take more time than you think. I am going to have to go through > >>>> legal to get such a license created. Also, why would you need dual license? > >>>> If it is BSD that should serve both purposes? > >>> > >>> I haven't followed the discussion close enough to know if there's been > >>> discussion about single-license BSD vs dual BSD/GPL. > > > > I think for all practical purposes, BSD and dual BSD/GPL is the same and > > listing it as dual was meant as a clarification to make it easier to see > > that all files in the kernel are GPLv2 compatible. > A dual BSD/GPL may involve having me get a lawyer to create such a > header. I would prefer to leave it as GPL for now until some concrete > decision has finally been made on this by the rest of the community? > Or, I can put it as BSD right now if that helps? I would prefer a pure BSD header for the moment over a pure GPL header. The last thing we want is to force other operating systems to create another set of dts files for the same hardware. Arnd
On 14-11-10 12:11 AM, Arnd Bergmann wrote: > On Sunday 09 November 2014 21:17:37 Scott Branden wrote: >> On 14-11-09 12:38 PM, Arnd Bergmann wrote: >>> On Sunday 09 November 2014 09:23:11 Greg Kroah-Hartman wrote: >>>> On Sat, Nov 08, 2014 at 10:49:09PM -0800, Olof Johansson wrote: >>>>>>>> +/* >>>>>>>> + * Copyright 2014 Broadcom Corporation. All rights reserved. >>>>>>>> + * >>>>>>>> + * Unless you and Broadcom execute a separate written software license >>>>>>>> + * agreement governing use of this software, this software is licensed >>>>>>>> to you >>>>>>>> + * under the terms of the GNU General Public License as >>>>>>>> + * published by the Free Software Foundation version 2. >>>>>>>> + * >>>>>>>> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any >>>>>>>> + * kind, whether express or implied; without even the implied warranty >>>>>>>> + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >>>>>>>> + * GNU General Public License for more details. >>>>>>> >>>>>>> >>>>>>> We ask for new DT contents to be added with dual BSD/GPL license, to >>>>>>> allow for reuse of the DT data structures in other projects as well. >>>>>>> There's currently a lot of activity going on relicensing the current >>>>>>> files so I recommend sorting it out before they are added if you can. >>>>>> >>>>>> >>>>>> This may take more time than you think. I am going to have to go through >>>>>> legal to get such a license created. Also, why would you need dual license? >>>>>> If it is BSD that should serve both purposes? >>>>> >>>>> I haven't followed the discussion close enough to know if there's been >>>>> discussion about single-license BSD vs dual BSD/GPL. >>> >>> I think for all practical purposes, BSD and dual BSD/GPL is the same and >>> listing it as dual was meant as a clarification to make it easier to see >>> that all files in the kernel are GPLv2 compatible. >> A dual BSD/GPL may involve having me get a lawyer to create such a >> header. I would prefer to leave it as GPL for now until some concrete >> decision has finally been made on this by the rest of the community? >> Or, I can put it as BSD right now if that helps? > > I would prefer a pure BSD header for the moment over a pure GPL header. > The last thing we want is to force other operating systems to create > another set of dts files for the same hardware. I have changed the headers to pure BSD. I hope this is acceptable. > > Arnd >
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 38c89ca..4b3a590 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -54,6 +54,10 @@ dtb-$(CONFIG_ARCH_AT91) += at91-sama5d4ek.dtb dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb +dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \ + bcm911360_entphn.dtb \ + bcm911360k.dtb \ + bcm958300k.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ diff --git a/arch/arm/boot/dts/bcm-cygnus-clock.dtsi b/arch/arm/boot/dts/bcm-cygnus-clock.dtsi new file mode 100644 index 0000000..d06172b --- /dev/null +++ b/arch/arm/boot/dts/bcm-cygnus-clock.dtsi @@ -0,0 +1,73 @@ +/* + * Copyright 2014 Broadcom Corporation. All rights reserved. + * + * Unless you and Broadcom execute a separate written software license + * agreement governing use of this software, this software is licensed to you + * under the terms of the GNU General Public License as + * published by the Free Software Foundation version 2. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + osc: oscillator { + compatible = "fixed-clock"; + #clock-cells = <1>; + clock-frequency = <25000000>; + }; + + apb_clk: apb_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <1000000000>; + }; + + periph_clk: periph_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <500000000>; + }; + + sdio_clk: lcpll_ch2 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <200000000>; + }; + + axi81_clk: axi81_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <100000000>; + }; + + keypad_clk: keypad_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <31806>; + }; + + adc_clk: adc_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <1562500>; + }; + + pwm_clk: pwm_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <1000000>; + }; + + lcd_clk: mipipll_ch1 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <100000000>; + }; +}; diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi new file mode 100644 index 0000000..9c650ab --- /dev/null +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -0,0 +1,100 @@ +/* + * Copyright 2014 Broadcom Corporation. All rights reserved. + * + * Unless you and Broadcom execute a separate written software license + * agreement governing use of this software, this software is licensed to you + * under the terms of the GNU General Public License as + * published by the Free Software Foundation version 2. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/interrupt-controller/irq.h> + +#include "skeleton.dtsi" + +/ { + compatible = "brcm,cygnus"; + model = "Broadcom Cygnus SoC"; + interrupt-parent = <&gic>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + next-level-cache = <&L2>; + reg = <0x0>; + }; + }; + + /include/ "bcm-cygnus-clock.dtsi" + + amba { + #address-cells = <1>; + #size-cells = <1>; + compatible = "arm,amba-bus", "simple-bus"; + interrupt-parent = <&gic>; + ranges; + + wdt@18009000 { + compatible = "arm,sp805" , "arm,primecell"; + reg = <0x18009000 0x1000>; + interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&axi81_clk>; + clock-names = "apb_pclk"; + }; + }; + + uart3: serial@18023000 { + compatible = "snps,dw-apb-uart"; + reg = <0x18023000 0x100>; + reg-shift = <2>; + reg-io-width = <4>; + interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; + clock-frequency = <100000000>; + clocks = <&axi81_clk>; + status = "okay"; + }; + + uart0: serial@18020000 { + compatible = "snps,dw-apb-uart"; + reg = <0x18020000 0x100>; + reg-shift = <2>; + reg-io-width = <4>; + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&axi81_clk>; + clock-frequency = <100000000>; + status = "okay"; + }; + + gic: interrupt-controller@19021000 { + compatible = "arm,cortex-a9-gic"; + #interrupt-cells = <3>; + #address-cells = <0>; + interrupt-controller; + reg = <0x19021000 0x1000>, + <0x19020100 0x100>; + }; + + L2: l2-cache { + compatible = "arm,pl310-cache"; + reg = <0x19022000 0x1000>; + cache-unified; + cache-level = <2>; + }; + + timer@19020200 { + compatible = "arm,cortex-a9-global-timer"; + reg = <0x19020200 0x100>; + interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&periph_clk>; + }; + +}; diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts new file mode 100644 index 0000000..9de5e87 --- /dev/null +++ b/arch/arm/boot/dts/bcm911360_entphn.dts @@ -0,0 +1,32 @@ +/* + * Copyright 2014 Broadcom Corporation. All rights reserved. + * + * Unless you and Broadcom execute a separate written software license + * agreement governing use of this software, this software is licensed to you + * under the terms of the GNU General Public License as + * published by the Free Software Foundation version 2. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; + +#include "bcm-cygnus.dtsi" + +/ { + model = "Cygnus Enterprise Phone (BCM911360_ENTPHN)"; + compatible = "brcm,bcm11360", "brcm,cygnus"; + + aliases { + serial0 = &uart3; + serial1 = &uart0; + }; + + chosen { + stdout-path = &uart3; + bootargs = "console=ttyS0,115200"; + }; +}; diff --git a/arch/arm/boot/dts/bcm911360k.dts b/arch/arm/boot/dts/bcm911360k.dts new file mode 100644 index 0000000..dd4f102 --- /dev/null +++ b/arch/arm/boot/dts/bcm911360k.dts @@ -0,0 +1,32 @@ +/* + * Copyright 2014 Broadcom Corporation. All rights reserved. + * + * Unless you and Broadcom execute a separate written software license + * agreement governing use of this software, this software is licensed to you + * under the terms of the GNU General Public License as + * published by the Free Software Foundation version 2. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; + +#include "bcm-cygnus.dtsi" + +/ { + model = "Cygnus SVK (BCM911360K)"; + compatible = "brcm,bcm11360", "brcm,cygnus"; + + aliases { + serial0 = &uart3; + serial1 = &uart0; + }; + + chosen { + stdout-path = &uart3; + bootargs = "console=ttyS0,115200"; + }; +}; diff --git a/arch/arm/boot/dts/bcm958300k.dts b/arch/arm/boot/dts/bcm958300k.dts new file mode 100644 index 0000000..f8b9625 --- /dev/null +++ b/arch/arm/boot/dts/bcm958300k.dts @@ -0,0 +1,32 @@ +/* + * Copyright 2014 Broadcom Corporation. All rights reserved. + * + * Unless you and Broadcom execute a separate written software license + * agreement governing use of this software, this software is licensed to you + * under the terms of the GNU General Public License as + * published by the Free Software Foundation version 2. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; + +#include "bcm-cygnus.dtsi" + +/ { + model = "Cygnus SVK (BCM958300K)"; + compatible = "brcm,bcm58300", "brcm,cygnus"; + + aliases { + serial0 = &uart3; + serial1 = &uart0; + }; + + chosen { + stdout-path = &uart3; + bootargs = "console=ttyS0,115200"; + }; +};