Broadcom Cygnus device tree changes
Subsystems (2)
Ray Jui
maintainerv3 cover Broadcom Cygnus device tree changes
This patch series cleans up the Broadcom Cygnus device tree files and makes it more consistent with the rest of Broadcom iProc device tree files. This patch series also enables various peripherals on Cygnus boards. They include:
bcm11360_entphn:
NAND
bcm958300k:
touchscreen
bcm958305k:
I2C, PCIe, NAND, touchscreen
Code is based on v4.3-rc1 and is available on GITHUB:
https://github.com/Broadcom/cygnus-linux/tree/cygnus-dt-v3
Changes from V2:
- Drop PCIe device node change that removes the I/O resource
- Set up appropriate address range for the 'core' bus
- Rename the 'soc' bus node to 'axi'
- Remove incorrect 3rd compatible string 'brcm,brcmnand' in the NAND node
Chages from V1:
- Break the major clean up change into separate patches
Ray Jui (9):
ARM: dts: consolidate aliases for Cygnus dt files
ARM: dts: Use label for device nodes in Cygnus dts
ARM: dts: Put Cygnus core components under core bus
ARM: dts: Move all Cygnus peripherals into axi bus
ARM: dts: Reorder Cygnus peripherals
ARM: dts: Enable various peripherals on bcm958305k
ARM: dts: Enable NAND support on bcm911360_entphn
ARM: dts: enable touchscreen support on Cygnus
ARM: dts: fix Cygnus nand device node
arch/arm/boot/dts/bcm-cygnus.dtsi | 338 +++++++++++++++++---------------- arch/arm/boot/dts/bcm911360_entphn.dts | 28 ++- arch/arm/boot/dts/bcm911360k.dts | 10 +- arch/arm/boot/dts/bcm958300k.dts | 45 ++--- arch/arm/boot/dts/bcm958305k.dts | 41 +++- arch/arm/boot/dts/bcm9hmidc.dtsi | 42 ++++ 6 files changed, 300 insertions(+), 204 deletions(-) create mode 100644 arch/arm/boot/dts/bcm9hmidc.dtsi
Signature · 1 line
1.9.1
Ray Jui
maintainerPATCH v3 1/9 ARM: dts: consolidate aliases for Cygnus dt files
Move aliases into bcm-cygnus.dtsi to avoid duplications in Cygnus dts files
--- arch/arm/boot/dts/bcm-cygnus.dtsi | 4 ++++ arch/arm/boot/dts/bcm911360_entphn.dts | 4 ---- arch/arm/boot/dts/bcm911360k.dts | 4 ---- arch/arm/boot/dts/bcm958300k.dts | 4 ---- arch/arm/boot/dts/bcm958305k.dts | 4 ---- 5 files changed, 4 insertions(+), 16 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +4 -0
@@ -40,6 +40,10 @@ model = "Broadcom Cygnus SoC"; interrupt-parent = <&gic>; + aliases { + serial0 = &uart3; + }; + cpus { #address-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/bcm911360_entphn.dts +0 -4
@@ -39,10 +39,6 @@ model = "Cygnus Enterprise Phone (BCM911360_ENTPHN)"; compatible = "brcm,bcm11360", "brcm,cygnus"; - aliases { - serial0 = &uart3; - }; - chosen { stdout-path = &uart3; bootargs = "console=ttyS0,115200";
arch/arm/boot/dts/bcm911360k.dts +0 -4
@@ -38,10 +38,6 @@ model = "Cygnus SVK (BCM911360K)"; compatible = "brcm,bcm11360", "brcm,cygnus"; - aliases { - serial0 = &uart3; - }; - chosen { stdout-path = &uart3; bootargs = "console=ttyS0,115200";
arch/arm/boot/dts/bcm958300k.dts +0 -4
@@ -38,10 +38,6 @@ model = "Cygnus SVK (BCM958300K)"; compatible = "brcm,bcm58300", "brcm,cygnus"; - aliases { - serial0 = &uart3; - }; - chosen { stdout-path = &uart3; bootargs = "console=ttyS0,115200";
arch/arm/boot/dts/bcm958305k.dts +0 -4
@@ -38,10 +38,6 @@ model = "Cygnus Wireless Audio (BCM958305K)"; compatible = "brcm,bcm58305", "brcm,cygnus"; - aliases { - serial0 = &uart3; - }; - chosen { stdout-path = &uart3; bootargs = "console=ttyS0,115200";
Signature · 1 line
1.9.1
Ray Jui
maintainerPATCH v3 2/9 ARM: dts: Use label for device nodes in Cygnus dts
In reply to Ray JuiUse label instead of full path to reference device nodes in Cygnus dts files
--- arch/arm/boot/dts/bcm911360_entphn.dts | 8 +++---- arch/arm/boot/dts/bcm911360k.dts | 6 ++--- arch/arm/boot/dts/bcm958300k.dts | 40 +++++++++++++++++----------------- arch/arm/boot/dts/bcm958305k.dts | 6 ++--- 4 files changed, 30 insertions(+), 30 deletions(-)
arch/arm/boot/dts/bcm911360_entphn.dts +4 -4
@@ -44,10 +44,6 @@ bootargs = "console=ttyS0,115200"; }; - uart3: serial@18023000 { - status = "okay"; - }; - gpio_keys { compatible = "gpio-keys"; #address-cells = <1>;
@@ -60,3 +56,7 @@ }; }; }; + +&uart3 { + status = "okay"; +};
arch/arm/boot/dts/bcm911360k.dts +3 -3
@@ -42,8 +42,8 @@ stdout-path = &uart3; bootargs = "console=ttyS0,115200"; }; +}; - uart3: serial@18023000 { - status = "okay"; - }; +&uart3 { + status = "okay"; };
arch/arm/boot/dts/bcm958300k.dts +20 -20
@@ -42,32 +42,32 @@ stdout-path = &uart3; bootargs = "console=ttyS0,115200"; }; +}; - pcie0: pcie@18012000 { - status = "okay"; - }; +&pcie0 { + status = "okay"; +}; - pcie1: pcie@18013000 { - status = "okay"; - }; +&pcie1 { + status = "okay"; +}; - uart3: serial@18023000 { - status = "okay"; - }; +&uart3 { + status = "okay"; +}; - nand: nand@18046000 { - nandcs@1 { - compatible = "brcm,nandcs"; - reg = <0>; - nand-on-flash-bbt; +&nand { + nandcs@1 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; - #address-cells = <1>; - #size-cells = <1>; + #address-cells = <1>; + #size-cells = <1>; - nand-ecc-strength = <24>; - nand-ecc-step-size = <1024>; + nand-ecc-strength = <24>; + nand-ecc-step-size = <1024>; - brcm,nand-oob-sector-size = <27>; - }; + brcm,nand-oob-sector-size = <27>; }; };
arch/arm/boot/dts/bcm958305k.dts +3 -3
@@ -42,8 +42,8 @@ stdout-path = &uart3; bootargs = "console=ttyS0,115200"; }; +}; - uart3: serial@18023000 { - status = "okay"; - }; +&uart3 { + status = "okay"; };
Signature · 1 line
1.9.1
Ray Jui
maintainerPATCH v3 3/9 ARM: dts: Put Cygnus core components under core bus
In reply to Ray JuiPut all Cygnus core components into "core" node of type "simple-bus" in bcm-cygnus.dtsi
--- arch/arm/boot/dts/bcm-cygnus.dtsi | 54 ++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 24 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +30 -24
@@ -58,6 +58,36 @@ /include/ "bcm-cygnus-clock.dtsi" + core { + compatible = "simple-bus"; + ranges = <0x00000000 0x19000000 0x1000000>; + #address-cells = <1>; + #size-cells = <1>; + + timer@20200 { + compatible = "arm,cortex-a9-global-timer"; + reg = <0x20200 0x100>; + interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&periph_clk>; + }; + + gic: interrupt-controller@21000 { + compatible = "arm,cortex-a9-gic"; + #interrupt-cells = <3>; + #address-cells = <0>; + interrupt-controller; + reg = <0x21000 0x1000>, + <0x20100 0x100>; + }; + + L2: l2-cache { + compatible = "arm,pl310-cache"; + reg = <0x22000 0x1000>; + cache-unified; + cache-level = <2>; + }; + }; + pinctrl: pinctrl@0x0301d0c8 { compatible = "brcm,cygnus-pinmux"; reg = <0x0301d0c8 0x30>,
@@ -227,28 +257,4 @@ brcm,nand-has-wp; }; - - 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>; - }; - };
Signature · 1 line
1.9.1
Ray Jui
maintainerPATCH v3 4/9 ARM: dts: Move all Cygnus peripherals into axi bus
In reply to Ray JuiMove all Cygnus peripherals to be under the "axi" bus node of type "simple-bus"
--- arch/arm/boot/dts/bcm-cygnus.dtsi | 279 +++++++++++++++++++------------------- 1 file changed, 140 insertions(+), 139 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +140 -139
@@ -88,173 +88,174 @@ }; }; - pinctrl: pinctrl at 0x0301d0c8 { - compatible = "brcm,cygnus-pinmux"; - reg = <0x0301d0c8 0x30>, - <0x0301d24c 0x2c>; - }; + axi { + compatible = "simple-bus"; + ranges; + #address-cells = <1>; + #size-cells = <1>; - gpio_crmu: gpio at 03024800 { - compatible = "brcm,cygnus-crmu-gpio"; - reg = <0x03024800 0x50>, - <0x03024008 0x18>; - #gpio-cells = <2>; - gpio-controller; - }; + pinctrl: pinctrl at 0x0301d0c8 { + compatible = "brcm,cygnus-pinmux"; + reg = <0x0301d0c8 0x30>, + <0x0301d24c 0x2c>; + }; - gpio_ccm: gpio at 1800a000 { - compatible = "brcm,cygnus-ccm-gpio"; - reg = <0x1800a000 0x50>, - <0x0301d164 0x20>; - #gpio-cells = <2>; - gpio-controller; - interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; - interrupt-controller; - }; + gpio_crmu: gpio at 03024800 { + compatible = "brcm,cygnus-crmu-gpio"; + reg = <0x03024800 0x50>, + <0x03024008 0x18>; + #gpio-cells = <2>; + gpio-controller; + }; - gpio_asiu: gpio at 180a5000 { - compatible = "brcm,cygnus-asiu-gpio"; - reg = <0x180a5000 0x668>; - #gpio-cells = <2>; - gpio-controller; + gpio_ccm: gpio at 1800a000 { + compatible = "brcm,cygnus-ccm-gpio"; + reg = <0x1800a000 0x50>, + <0x0301d164 0x20>; + #gpio-cells = <2>; + gpio-controller; + interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + }; - pinmux = <&pinctrl>; + gpio_asiu: gpio at 180a5000 { + compatible = "brcm,cygnus-asiu-gpio"; + reg = <0x180a5000 0x668>; + #gpio-cells = <2>; + gpio-controller; - interrupt-controller; - interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; - }; + pinmux = <&pinctrl>; - amba { - #address-cells = <1>; - #size-cells = <1>; - compatible = "arm,amba-bus", "simple-bus"; - interrupt-parent = <&gic>; - ranges; + interrupt-controller; + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; + }; - wdt at 18009000 { - compatible = "arm,sp805" , "arm,primecell"; - reg = <0x18009000 0x1000>; - interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&axi81_clk>; - clock-names = "apb_pclk"; + wdt0: wdt at 18009000 { + compatible = "arm,sp805" , "arm,primecell"; + reg = <0x18009000 0x1000>; + interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&axi81_clk>; + clock-names = "apb_pclk"; }; - }; - i2c0: i2c at 18008000 { - compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c"; - reg = <0x18008000 0x100>; - #address-cells = <1>; - #size-cells = <0>; - interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>; - clock-frequency = <100000>; - status = "disabled"; - }; + i2c0: i2c at 18008000 { + compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c"; + reg = <0x18008000 0x100>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>; + clock-frequency = <100000>; + status = "disabled"; + }; - i2c1: i2c at 1800b000 { - compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c"; - reg = <0x1800b000 0x100>; - #address-cells = <1>; - #size-cells = <0>; - interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>; - clock-frequency = <100000>; - status = "disabled"; - }; + i2c1: i2c at 1800b000 { + compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c"; + reg = <0x1800b000 0x100>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>; + clock-frequency = <100000>; + status = "disabled"; + }; - pcie0: pcie at 18012000 { - compatible = "brcm,iproc-pcie"; - reg = <0x18012000 0x1000>; + pcie0: pcie at 18012000 { + compatible = "brcm,iproc-pcie"; + reg = <0x18012000 0x1000>; - #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>; - linux,pci-domain = <0>; + linux,pci-domain = <0>; - bus-range = <0x00 0xff>; + bus-range = <0x00 0xff>; - #address-cells = <3>; - #size-cells = <2>; - device_type = "pci"; - ranges = <0x81000000 0 0 0x28000000 0 0x00010000 - 0x82000000 0 0x20000000 0x20000000 0 0x04000000>; + #address-cells = <3>; + #size-cells = <2>; + device_type = "pci"; + ranges = <0x81000000 0 0 0x28000000 0 0x00010000 + 0x82000000 0 0x20000000 0x20000000 0 0x04000000>; - status = "disabled"; - }; + status = "disabled"; + }; - pcie1: pcie at 18013000 { - compatible = "brcm,iproc-pcie"; - reg = <0x18013000 0x1000>; + pcie1: pcie at 18013000 { + compatible = "brcm,iproc-pcie"; + reg = <0x18013000 0x1000>; - #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>; - linux,pci-domain = <1>; + linux,pci-domain = <1>; - bus-range = <0x00 0xff>; + bus-range = <0x00 0xff>; - #address-cells = <3>; - #size-cells = <2>; - device_type = "pci"; - ranges = <0x81000000 0 0 0x48000000 0 0x00010000 - 0x82000000 0 0x40000000 0x40000000 0 0x04000000>; + #address-cells = <3>; + #size-cells = <2>; + device_type = "pci"; + ranges = <0x81000000 0 0 0x48000000 0 0x00010000 + 0x82000000 0 0x40000000 0x40000000 0 0x04000000>; - status = "disabled"; - }; + status = "disabled"; + }; - uart0: serial at 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 = "disabled"; - }; + uart0: serial at 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 = "disabled"; + }; - uart1: serial at 18021000 { - compatible = "snps,dw-apb-uart"; - reg = <0x18021000 0x100>; - reg-shift = <2>; - reg-io-width = <4>; - interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&axi81_clk>; - clock-frequency = <100000000>; - status = "disabled"; - }; + uart1: serial at 18021000 { + compatible = "snps,dw-apb-uart"; + reg = <0x18021000 0x100>; + reg-shift = <2>; + reg-io-width = <4>; + interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&axi81_clk>; + clock-frequency = <100000000>; + status = "disabled"; + }; - uart2: serial at 18022000 { - compatible = "snps,dw-apb-uart"; - reg = <0x18020000 0x100>; - reg-shift = <2>; - reg-io-width = <4>; - interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&axi81_clk>; - clock-frequency = <100000000>; - status = "disabled"; - }; + uart2: serial at 18022000 { + compatible = "snps,dw-apb-uart"; + reg = <0x18020000 0x100>; + reg-shift = <2>; + reg-io-width = <4>; + interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&axi81_clk>; + clock-frequency = <100000000>; + status = "disabled"; + }; - uart3: serial at 18023000 { - compatible = "snps,dw-apb-uart"; - reg = <0x18023000 0x100>; - reg-shift = <2>; - reg-io-width = <4>; - interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&axi81_clk>; - clock-frequency = <100000000>; - status = "disabled"; - }; + uart3: serial at 18023000 { + compatible = "snps,dw-apb-uart"; + reg = <0x18023000 0x100>; + reg-shift = <2>; + reg-io-width = <4>; + interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&axi81_clk>; + clock-frequency = <100000000>; + status = "disabled"; + }; - nand: nand at 18046000 { - compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand"; - reg = <0x18046000 0x600>, <0xf8105408 0x600>, <0x18046f00 0x20>; - reg-names = "nand", "iproc-idm", "iproc-ext"; - interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; + nand: nand at 18046000 { + compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", + "brcm,brcmnand"; + reg = <0x18046000 0x600>, <0xf8105408 0x600>, + <0x18046f00 0x20>; + reg-names = "nand", "iproc-idm", "iproc-ext"; + interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; - #address-cells = <1>; - #size-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; - brcm,nand-has-wp; + brcm,nand-has-wp; + }; }; };
Signature · 1 line
1.9.1
Ray Jui
maintainerPATCH v3 5/9 ARM: dts: Reorder Cygnus peripherals
In reply to Ray JuiReorder all Cygnus peripherals based on base register addresses in bcm-cygnus.dtsi
--- arch/arm/boot/dts/bcm-cygnus.dtsi | 56 +++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 28 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +28 -28
@@ -108,26 +108,14 @@ gpio-controller; }; - gpio_ccm: gpio at 1800a000 { - compatible = "brcm,cygnus-ccm-gpio"; - reg = <0x1800a000 0x50>, - <0x0301d164 0x20>; - #gpio-cells = <2>; - gpio-controller; - interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; - interrupt-controller; - }; - - gpio_asiu: gpio at 180a5000 { - compatible = "brcm,cygnus-asiu-gpio"; - reg = <0x180a5000 0x668>; - #gpio-cells = <2>; - gpio-controller; - - pinmux = <&pinctrl>; - - interrupt-controller; - interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; + i2c0: i2c at 18008000 { + compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c"; + reg = <0x18008000 0x100>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>; + clock-frequency = <100000>; + status = "disabled"; }; wdt0: wdt at 18009000 {
@@ -138,14 +126,14 @@ clock-names = "apb_pclk"; }; - i2c0: i2c at 18008000 { - compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c"; - reg = <0x18008000 0x100>; - #address-cells = <1>; - #size-cells = <0>; - interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>; - clock-frequency = <100000>; - status = "disabled"; + gpio_ccm: gpio at 1800a000 { + compatible = "brcm,cygnus-ccm-gpio"; + reg = <0x1800a000 0x50>, + <0x0301d164 0x20>; + #gpio-cells = <2>; + gpio-controller; + interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; }; i2c1: i2c at 1800b000 {
@@ -257,5 +245,17 @@ brcm,nand-has-wp; }; + + gpio_asiu: gpio at 180a5000 { + compatible = "brcm,cygnus-asiu-gpio"; + reg = <0x180a5000 0x668>; + #gpio-cells = <2>; + gpio-controller; + + pinmux = <&pinctrl>; + + interrupt-controller; + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; + }; }; };
Signature · 1 line
1.9.1
Ray Jui
maintainerPATCH v3 6/9 ARM: dts: Enable various peripherals on bcm958305k
In reply to Ray JuiThis patch enables various peripherals on Broadcom Cygnus wireless audio board (bcm958305k). These peripherals include I2C, PCIe, and NAND
--- arch/arm/boot/dts/bcm958305k.dts | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
arch/arm/boot/dts/bcm958305k.dts +32 -0
@@ -44,6 +44,38 @@ }; }; +&i2c0 { + status = "okay"; +}; + +&i2c1 { + status = "okay"; +}; + +&pcie0 { + status = "okay"; +}; + +&pcie1 { + status = "okay"; +}; + &uart3 { status = "okay"; }; + +&nand { + nandcs at 1 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; + + #address-cells = <1>; + #size-cells = <1>; + + nand-ecc-strength = <24>; + nand-ecc-step-size = <1024>; + + brcm,nand-oob-sector-size = <27>; + }; +};
Signature · 1 line
1.9.1
Ray Jui
maintainerPATCH v3 7/9 ARM: dts: Enable NAND support on bcm911360_entphn
In reply to Ray JuiThis patch enables NAND support on Broadcom Cygnus form factor board (bcm911360_entphn)
--- arch/arm/boot/dts/bcm911360_entphn.dts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/arm/boot/dts/bcm911360_entphn.dts +16 -0
@@ -60,3 +60,19 @@ &uart3 { status = "okay"; }; + +&nand { + nandcs at 1 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; + + #address-cells = <1>; + #size-cells = <1>; + + nand-ecc-strength = <24>; + nand-ecc-step-size = <1024>; + + brcm,nand-oob-sector-size = <27>; + }; +};
Signature · 1 line
1.9.1
Ray Jui
maintainerPATCH v3 8/9 ARM: dts: enable touchscreen support on Cygnus
In reply to Ray JuiThis patch enables touchscreen support on bcm958300k and bcm958305k. Touchscreen is connected to these boards through the bcm9hmidc daughter card, and therefore also adding bcm9hmidc.dtsi that describes the daughter card
--- arch/arm/boot/dts/bcm-cygnus.dtsi | 10 ++++++++++ arch/arm/boot/dts/bcm958300k.dts | 1 + arch/arm/boot/dts/bcm958305k.dts | 1 + arch/arm/boot/dts/bcm9hmidc.dtsi | 42 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 arch/arm/boot/dts/bcm9hmidc.dtsi
arch/arm/boot/dts/bcm-cygnus.dtsi +10 -0
@@ -32,6 +32,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/clock/bcm-cygnus.h> #include "skeleton.dtsi"
@@ -257,5 +258,14 @@ interrupt-controller; interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; }; + + touchscreen: tsc@180a6000 { + compatible = "brcm,iproc-touchscreen"; + reg = <0x180a6000 0x40>; + clocks = <&asiu_clks BCM_CYGNUS_ASIU_ADC_CLK>; + clock-names = "tsc_clk"; + interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; }; };
arch/arm/boot/dts/bcm958300k.dts +1 -0
@@ -33,6 +33,7 @@ /dts-v1/; #include "bcm-cygnus.dtsi" +#include "bcm9hmidc.dtsi" / { model = "Cygnus SVK (BCM958300K)";
arch/arm/boot/dts/bcm958305k.dts +1 -0
@@ -33,6 +33,7 @@ /dts-v1/; #include "bcm-cygnus.dtsi" +#include "bcm9hmidc.dtsi" / { model = "Cygnus Wireless Audio (BCM958305K)";
arch/arm/boot/dts/bcm9hmidc.dtsi new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
1.9.1
Ray Jui
maintainerPATCH v3 9/9 ARM: dts: fix Cygnus nand device node
In reply to Ray JuiThe third compatible string "brcm,brcmnand" in bcm-cygnus.dtsi nand node is incorrect, redundant and should be removed. "brcm,brcmnand" is meant to be used by STB based Broadcom SoCs. All iProc based SoCs should use "brcm,nand-iproc".
--- arch/arm/boot/dts/bcm-cygnus.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +1 -2
@@ -234,8 +234,7 @@ }; nand: nand@18046000 { - compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", - "brcm,brcmnand"; + compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x18046000 0x600>, <0xf8105408 0x600>, <0x18046f00 0x20>; reg-names = "nand", "iproc-idm", "iproc-ext";
Signature · 1 line
1.9.1
Quoted 16 lines · Ray Jui
This patch series cleans up the Broadcom Cygnus device tree files and makes it more consistent with the rest of Broadcom iProc device tree files. This patch series also enables various peripherals on Cygnus boards. They include:
bcm11360_entphn:
NANDbcm958300k:
touchscreenbcm958305k:
I2C, PCIe, NAND, touchscreenCode is based on v4.3-rc1 and is available on GITHUB:
https://github.com/Broadcom/cygnus-linux/tree/cygnus-dt-v3
Quoted 8 lines
Changes from V2:
- Drop PCIe device node change that removes the I/O resource
- Set up appropriate address range for the 'core' bus
- Rename the 'soc' bus node to 'axi'
- Remove incorrect 3rd compatible string 'brcm,brcmnand' in the NAND nodeChages from V1:
- Break the major clean up change into separate patches
Series applied, thanks!
Signature · 1 line
Florian