From 1ea639b8d081bf7ace93e1c4e130615d1684ad5e Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Fri, 24 Jun 2016 15:03:48 +0200 Subject: lantiq: VGV7519 update bomb lantiq: VGV7519 - remove/merge redundant parts in dts lantiq: VGV7519 - cleanup pinmux configuration lantiq: VGV7519 - add second usb port lantiq: VGV7519 - add vlan support lantiq: VGV7519 - get mac address from board_config partition lantiq: VGV7519 - fix brn partition layout Signed-off-by: Zoltan HERPAI --- target/linux/lantiq/dts/VGV7519.dtsi | 78 ++++++++++++---------------------- target/linux/lantiq/dts/VGV7519BRN.dts | 65 ++++++++++++++++++++-------- target/linux/lantiq/dts/VGV7519NOR.dts | 18 -------- 3 files changed, 75 insertions(+), 86 deletions(-) (limited to 'target/linux/lantiq/dts') diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/dts/VGV7519.dtsi index 95de6e56e7..ad6393e12e 100644 --- a/target/linux/lantiq/dts/VGV7519.dtsi +++ b/target/linux/lantiq/dts/VGV7519.dtsi @@ -23,54 +23,44 @@ }; fpi@10000000 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "lantiq,fpi", "simple-bus"; - ranges = <0x0 0x10000000 0xEEFFFFF>; - reg = <0x10000000 0xEF00000>; - localbus@0 { - #address-cells = <2>; - #size-cells = <1>; - compatible = "lantiq,localbus", "simple-bus"; + nor-boot@0 { + compatible = "lantiq,nor"; + bank-width = <2>; + reg = <0 0x0 0x800000>, <1 0x800000 0x800000>; + #address-cells = <1>; + #size-cells = <1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + boardconfig: partition@40000 { + label = "board_config"; + reg = <0x40000 0x10000>; + read-only; + }; + }; + }; }; gpio: pinmux@E100B10 { - compatible = "lantiq,pinctrl-xr9"; pinctrl-names = "default"; pinctrl-0 = <&state_default>; - interrupt-parent = <&icu0>; - interrupts = <166 135 66 40 41 42 38>; - - #gpio-cells = <2>; - gpio-controller; - reg = <0xE100B10 0xA0>; - state_default: pinmux { stp { lantiq,groups = "stp"; lantiq,function = "stp"; - }; - spi { - lantiq,groups = "spi_di", "spi_do", "spi_clk"; - lantiq,function = "spi"; + lantiq,open-drain = <0>; + lantiq,output = <1>; + lantiq,pull = <0>; }; mdio { lantiq,groups = "mdio"; lantiq,function = "mdio"; }; - gphy-leds_out { - lantiq,pins = "io7", "io44"; - lantiq,pull = <0>; - lantiq,output = <1>; - }; - stp_out { - lantiq,pins = "io4", "io5", "io6"; - lantiq,open-drain = <0>; - lantiq,output = <1>; - lantiq,pull = <0>; - }; pci-rst { lantiq,pins = "io21"; lantiq,open-drain = <0>; @@ -109,19 +99,7 @@ pci@E105400 { status = "okay"; - #address-cells = <3>; - #size-cells = <2>; - #interrupt-cells = <1>; - compatible = "lantiq,pci-xway"; - bus-range = <0x0 0x0>; - ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000 /* pci memory */ - 0x1000000 0 0x00000000 0xAE00000 0 0x200000>; /* io space */ - reg = <0x7000000 0x8000 /* config space */ - 0xE105400 0x400>; /* pci bridge */ lantiq,bus-clock = <33333333>; - /*lantiq,external-clock;*/ - lantiq,delay-hi = <0>; /* 0ns delay */ - lantiq,delay-lo = <0>; /* 0.0ns delay */ interrupt-map-mask = <0xf800 0x0 0x0 0x7>; interrupt-map = < 0x7000 0 0 1 &icu0 30 1 // slot 14, irq 30 @@ -243,7 +221,8 @@ #address-cells = <1>; #size-cells = <0>; reg = <0>; - mac-address = [ 00 11 22 33 44 55 ]; + mtd-mac-address = <&boardconfig 0x16>; + lantiq,switch; ethernet@0 { compatible = "lantiq,xrx200-pdi-port"; @@ -276,8 +255,10 @@ #address-cells = <1>; #size-cells = <0>; reg = <1>; - mac-address = [ 00 11 22 33 44 56 ]; + mtd-mac-address = <&boardconfig 0x16>; + mtd-mac-address-increment = <2>; lantiq,wan; + ethernet@5 { compatible = "lantiq,xrx200-pdi-port"; reg = <5>; @@ -293,27 +274,22 @@ phy0: ethernet-phy@0 { reg = <0x0>; compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22"; - lantiq,c45-reg-init = <1 0 0 0>; }; phy1: ethernet-phy@1 { reg = <0x1>; compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22"; - lantiq,c45-reg-init = <1 0 0 0>; }; phy5: ethernet-phy@5 { reg = <0x5>; compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22"; - lantiq,c45-reg-init = <1 0 0 0>; }; phy11: ethernet-phy@11 { reg = <0x11>; compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22"; - lantiq,c45-reg-init = <1 0 0 0>; }; phy13: ethernet-phy@13 { reg = <0x13>; compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22"; - lantiq,c45-reg-init = <1 0 0 0>; }; }; }; diff --git a/target/linux/lantiq/dts/VGV7519BRN.dts b/target/linux/lantiq/dts/VGV7519BRN.dts index 4f56ba8974..b225acf57d 100644 --- a/target/linux/lantiq/dts/VGV7519BRN.dts +++ b/target/linux/lantiq/dts/VGV7519BRN.dts @@ -6,31 +6,62 @@ / { fpi@10000000 { localbus@0 { - nor-flash@0 { - compatible = "lantiq,nor", "cfi-flash"; - bank-width = <2>; - reg = <0 0x0 0x800000>, <1 0x800000 0x800000>; - #address-cells = <1>; - #size-cells = <1>; - + nor-boot@0 { partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; + partition@0 { + label = "Boot"; + reg = <0x00000 0x40000>; + read-only; + }; + + partition@50000 { + label = "Certificate"; + reg = <0x50000 0x10000>; + read-only; + }; + partition@60000 { + label = "Special_Area"; + reg = <0x60000 0x10000>; + read-only; + }; - partition@40000 { - label = "board_config"; - reg = <0x40000 0x10000>; + partition@70000 { + label = " Reserve_0"; + reg = <0x70000 0x10000>; read-only; }; + partition@80000 { - label = "firmware"; + label = "Code_Image_0"; reg = <0x80000 0x780000>; + brnboot,root-id = <0x00>; + read-only; + }; + + partition@4000000 { + compatible = "brnboot,root-selector"; + label = "Primary_Setting"; + reg = <0x4000000 0x10000>; + read-only; + }; + + partition@4010000 { + label = "Configuration"; + reg = <0x4010000 0x60000>; read-only; }; - partition@880000 { - label = "rootfs_data"; - reg = <0x880000 0x780000>; + + partition@4070000 { + label = " Reserve_1"; + reg = <0x4070000 0x10000>; + read-only; + }; + + partition@4080000 { + label = "Code_Image_1"; + reg = <0x4080000 0x780000>; + brnboot,root-id = <0x01>; + read-only; }; }; }; diff --git a/target/linux/lantiq/dts/VGV7519NOR.dts b/target/linux/lantiq/dts/VGV7519NOR.dts index 24a3d1666a..69b0a1f450 100644 --- a/target/linux/lantiq/dts/VGV7519NOR.dts +++ b/target/linux/lantiq/dts/VGV7519NOR.dts @@ -7,26 +7,11 @@ fpi@10000000 { localbus@0 { nor-boot@0 { - compatible = "lantiq,nor"; - bank-width = <2>; - reg = <0 0x0 0x800000>, <1 0x800000 0x800000>; - #address-cells = <1>; - #size-cells = <1>; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - partition@0 { label = "uboot"; reg = <0x00000 0x40000>; }; - partition@40000 { - label = "board_config"; - reg = <0x40000 0x10000>; - read-only; - }; partition@60000 { label = "uboot_env"; reg = <0x60000 0x10000>; @@ -34,9 +19,6 @@ partition@80000 { label = "firmware"; reg = <0x80000 0xf80000>; - // 0x080000 - 0x01b0000 : kernel - // 0x1b0000 - 0x1000000 : rootfs (squashfs) - // 0x390000 - 0x1000000 : rootfs_data }; }; }; -- cgit v1.2.3