chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0x7f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0xfe0000 0x020000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0x7f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
};
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
};
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
linux,part-probe = "bcm63xxpart";
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0xfe0000 0x020000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-0 = <&pinctrl_ephy0_act_led &pinctrl_ephy1_act_led
&pinctrl_ephy2_act_led &pinctrl_ephy3_act_led>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
};
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
};
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ext_mii &pinctrl_pci>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0xfe0000 0x020000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb_pwron>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb_pwron>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
linux,part-probe = "bcm63xxpart";
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
linux,part-probe = "bcm63xxpart";
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
linux,part-probe = "bcm63xxpart";
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb_port1_device>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
linux,part-probe = "bcm63xxpart";
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
linux,part-probe = "bcm63xxpart";
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
};
linux,part-probe = "bcm63xxpart";
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
linux,part-probe = "bcm63xxpart";
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
linux,part-probe = "bcm63xxpart";
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0x7f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0x7f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
reg = <0x3f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
+
+&uart1 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
};
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
reg = <0x3f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
reg = <0x7f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0x3f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
};
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-0 = <&pinctrl_ephy0_act_led &pinctrl_ephy1_act_led
&pinctrl_ephy2_act_led &pinctrl_ephy3_act_led>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
};
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0x7f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
};
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
};
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
};
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
};
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0x3f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0xfe0000 0x020000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0xfe0000 0x020000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0xfe0000 0x020000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0xfe0000 0x020000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
&pinctrl_pci_intb &pinctrl_pci_gnt1
&pinctrl_pci_req1>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-0 = <&pinctrl_pci &pinctrl_ephy0_led &pinctrl_ephy1_led
&pinctrl_ephy2_led &pinctrl_ephy3_led>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0xfe0000 0x020000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
linux,part-probe = "bcm63xxpart";
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
linux,part-probe = "bcm63xxpart";
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
};
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0x1fe0000 0x20000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
+
+&uart1 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
};
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
reg = <0xfe0000 0x020000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
};
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
reg = <0x3f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0x3f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0x3f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0x7f0000 0x010000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-leds {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
linux,part-probe = "bcm63xxpart";
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
reg = <0x1fe0000 0x020000>;
};
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-0 = <&pinctrl_pci &pinctrl_ephy0_led &pinctrl_ephy1_led
&pinctrl_ephy2_led &pinctrl_ephy3_led>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-0 = <&pinctrl_pci &pinctrl_ephy0_led &pinctrl_ephy1_led
&pinctrl_ephy2_led &pinctrl_ephy3_led>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-0 = <&pinctrl_pci &pinctrl_ephy0_led &pinctrl_ephy1_led
&pinctrl_ephy2_led &pinctrl_ephy3_led>;
};
+
+&uart0 {
+ status = "ok";
+};
chosen {
bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pci>;
};
+
+&uart0 {
+ status = "ok";
+};
--- /dev/null
+From a59388668d0ce19dadea909e09f4eb905a27b1ce Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Wed, 8 Jun 2016 12:08:43 +0200
+Subject: [PATCH] serial/bcm63xx_uart: use correct alias naming
+
+The bcm63xx_uart driver uses the of alias for determing its id. Recent
+changes in dts files changed the expected 'uartX' to the recommended
+'serialX', breaking serial output. Fix this by checking for a 'serialX'
+alias as well.
+
+Fixes: e3b992d028f8 ("MIPS: BMIPS: Improve BCM6328 device tree")
+Fixes: 2d52ee82b475 ("MIPS: BMIPS: Improve BCM6368 device tree")
+Fixes: 7537d273e2f3 ("MIPS: BMIPS: Add device tree example for BCM6358")
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+Acked-by: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/tty/serial/bcm63xx_uart.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/drivers/tty/serial/bcm63xx_uart.c
++++ b/drivers/tty/serial/bcm63xx_uart.c
+@@ -813,8 +813,12 @@ static int bcm_uart_probe(struct platfor
+ struct clk *clk;
+ int ret;
+
+- if (pdev->dev.of_node)
+- pdev->id = of_alias_get_id(pdev->dev.of_node, "uart");
++ if (pdev->dev.of_node) {
++ pdev->id = of_alias_get_id(pdev->dev.of_node, "serial");
++
++ if (pdev->id < 0)
++ pdev->id = of_alias_get_id(pdev->dev.of_node, "uart");
++ }
+
+ if (pdev->id < 0 || pdev->id >= BCM63XX_NR_UARTS)
+ return -EINVAL;
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
-@@ -838,7 +838,7 @@ static int bcm_uart_probe(struct platfor
+@@ -842,7 +842,7 @@ static int bcm_uart_probe(struct platfor
return -ENODEV;
clk = pdev->dev.of_node ? of_clk_get(pdev->dev.of_node, 0) :
clocks {
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
-@@ -837,8 +837,10 @@ static int bcm_uart_probe(struct platfor
+@@ -841,8 +841,10 @@ static int bcm_uart_probe(struct platfor
if (!res_irq)
return -ENODEV;
bcm63xx_flash_register();
bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
+--- a/arch/mips/bcm63xx/Makefile
++++ b/arch/mips/bcm63xx/Makefile
+@@ -1,6 +1,6 @@
+ obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
+ setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
+- dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
++ dev-pcmcia.o dev-rng.o dev-uart.o \
+ dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
+ usb-common.o sprom.o
+ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+--- a/arch/mips/bcm63xx/dev-hsspi.c
++++ /dev/null
+@@ -1,48 +0,0 @@
+-/*
+- * This file is subject to the terms and conditions of the GNU General Public
+- * License. See the file "COPYING" in the main directory of this archive
+- * for more details.
+- *
+- * Copyright (C) 2012 Jonas Gorski <jonas.gorski@gmail.com>
+- */
+-
+-#include <linux/init.h>
+-#include <linux/kernel.h>
+-#include <linux/platform_device.h>
+-
+-#include <bcm63xx_cpu.h>
+-#include <bcm63xx_dev_hsspi.h>
+-#include <bcm63xx_regs.h>
+-
+-static struct resource spi_resources[] = {
+- {
+- .start = -1, /* filled at runtime */
+- .end = -1, /* filled at runtime */
+- .flags = IORESOURCE_MEM,
+- },
+- {
+- .start = -1, /* filled at runtime */
+- .flags = IORESOURCE_IRQ,
+- },
+-};
+-
+-static struct platform_device bcm63xx_hsspi_device = {
+- .name = "bcm63xx-hsspi",
+- .id = 0,
+- .num_resources = ARRAY_SIZE(spi_resources),
+- .resource = spi_resources,
+-};
+-
+-int __init bcm63xx_hsspi_register(void)
+-{
+- if (!BCMCPU_IS_6318() && !BCMCPU_IS_6328() && !BCMCPU_IS_6362() &&
+- !BCMCPU_IS_63268())
+- return -ENODEV;
+-
+- spi_resources[0].start = bcm63xx_regset_address(RSET_HSSPI);
+- spi_resources[0].end = spi_resources[0].start;
+- spi_resources[0].end += RSET_HSSPI_SIZE - 1;
+- spi_resources[1].start = bcm63xx_get_irq_number(IRQ_HSSPI);
+-
+- return platform_device_register(&bcm63xx_hsspi_device);
+-}
+--- a/arch/mips/bcm63xx/dev-spi.c
++++ /dev/null
+@@ -1,60 +0,0 @@
+-/*
+- * This file is subject to the terms and conditions of the GNU General Public
+- * License. See the file "COPYING" in the main directory of this archive
+- * for more details.
+- *
+- * Copyright (C) 2009-2011 Florian Fainelli <florian@openwrt.org>
+- * Copyright (C) 2010 Tanguy Bouzeloc <tanguy.bouzeloc@efixo.com>
+- */
+-
+-#include <linux/init.h>
+-#include <linux/kernel.h>
+-#include <linux/export.h>
+-#include <linux/platform_device.h>
+-#include <linux/err.h>
+-#include <linux/clk.h>
+-
+-#include <bcm63xx_cpu.h>
+-#include <bcm63xx_dev_spi.h>
+-#include <bcm63xx_regs.h>
+-
+-static struct resource spi_resources[] = {
+- {
+- .start = -1, /* filled at runtime */
+- .end = -1, /* filled at runtime */
+- .flags = IORESOURCE_MEM,
+- },
+- {
+- .start = -1, /* filled at runtime */
+- .flags = IORESOURCE_IRQ,
+- },
+-};
+-
+-static struct platform_device bcm63xx_spi_device = {
+- .id = -1,
+- .num_resources = ARRAY_SIZE(spi_resources),
+- .resource = spi_resources,
+-};
+-
+-int __init bcm63xx_spi_register(void)
+-{
+- if (BCMCPU_IS_6318() || BCMCPU_IS_6328() || BCMCPU_IS_6345())
+- return -ENODEV;
+-
+- spi_resources[0].start = bcm63xx_regset_address(RSET_SPI);
+- spi_resources[0].end = spi_resources[0].start;
+- spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI);
+-
+- if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) {
+- bcm63xx_spi_device.name = "bcm6348-spi",
+- spi_resources[0].end += BCM_6348_RSET_SPI_SIZE - 1;
+- }
+-
+- if (BCMCPU_IS_3368() || BCMCPU_IS_6358() || BCMCPU_IS_6362() ||
+- BCMCPU_IS_6368() || BCMCPU_IS_63268()) {
+- bcm63xx_spi_device.name = "bcm6358-spi",
+- spi_resources[0].end += BCM_6358_RSET_SPI_SIZE - 1;
+- }
+-
+- return platform_device_register(&bcm63xx_spi_device);
+-}
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#ifndef BCM63XX_DEV_HSSPI_H
+-#define BCM63XX_DEV_HSSPI_H
+-
+-#include <linux/types.h>
+-
+-int bcm63xx_hsspi_register(void);
+-
+-#endif /* BCM63XX_DEV_HSSPI_H */
--- /dev/null
+--- a/arch/mips/bcm63xx/Makefile
++++ b/arch/mips/bcm63xx/Makefile
+@@ -1,6 +1,6 @@
+ obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
+ setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
+- dev-pcmcia.o dev-rng.o dev-uart.o \
++ dev-pcmcia.o dev-rng.o \
+ dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
+ usb-common.o sprom.o
+ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+--- a/arch/mips/bcm63xx/dev-uart.c
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/*
+- * This file is subject to the terms and conditions of the GNU General Public
+- * License. See the file "COPYING" in the main directory of this archive
+- * for more details.
+- *
+- * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
+- */
+-
+-#include <linux/init.h>
+-#include <linux/kernel.h>
+-#include <linux/platform_device.h>
+-#include <bcm63xx_cpu.h>
+-
+-static struct resource uart0_resources[] = {
+- {
+- /* start & end filled at runtime */
+- .flags = IORESOURCE_MEM,
+- },
+- {
+- /* start filled at runtime */
+- .flags = IORESOURCE_IRQ,
+- },
+-};
+-
+-static struct resource uart1_resources[] = {
+- {
+- /* start & end filled at runtime */
+- .flags = IORESOURCE_MEM,
+- },
+- {
+- /* start filled at runtime */
+- .flags = IORESOURCE_IRQ,
+- },
+-};
+-
+-static struct platform_device bcm63xx_uart_devices[] = {
+- {
+- .name = "bcm63xx_uart",
+- .id = 0,
+- .num_resources = ARRAY_SIZE(uart0_resources),
+- .resource = uart0_resources,
+- },
+-
+- {
+- .name = "bcm63xx_uart",
+- .id = 1,
+- .num_resources = ARRAY_SIZE(uart1_resources),
+- .resource = uart1_resources,
+- }
+-};
+-
+-int __init bcm63xx_uart_register(unsigned int id)
+-{
+- if (id >= ARRAY_SIZE(bcm63xx_uart_devices))
+- return -ENODEV;
+-
+- if (id == 1 && (!BCMCPU_IS_3368() && !BCMCPU_IS_6358() &&
+- !BCMCPU_IS_6368()))
+- return -ENODEV;
+-
+- if (id == 0) {
+- uart0_resources[0].start = bcm63xx_regset_address(RSET_UART0);
+- uart0_resources[0].end = uart0_resources[0].start +
+- RSET_UART_SIZE - 1;
+- uart0_resources[1].start = bcm63xx_get_irq_number(IRQ_UART0);
+- }
+-
+- if (id == 1) {
+- uart1_resources[0].start = bcm63xx_regset_address(RSET_UART1);
+- uart1_resources[0].end = uart1_resources[0].start +
+- RSET_UART_SIZE - 1;
+- uart1_resources[1].start = bcm63xx_get_irq_number(IRQ_UART1);
+- }
+-
+- return platform_device_register(&bcm63xx_uart_devices[id]);
+-}
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#ifndef BCM63XX_DEV_UART_H_
+-#define BCM63XX_DEV_UART_H_
+-
+-int bcm63xx_uart_register(unsigned int id);
+-
+-#endif /* BCM63XX_DEV_UART_H_ */
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -33,8 +33,6 @@ struct board_info {
+ unsigned int has_ehci0:1;
+ unsigned int has_usbd:1;
+ unsigned int has_dsp:1;
+- unsigned int has_uart0:1;
+- unsigned int has_uart1:1;
+ unsigned int use_fallback_sprom:1;
+
+ /* ethernet config */
+--- a/arch/mips/bcm63xx/boards/board_common.c
++++ b/arch/mips/bcm63xx/boards/board_common.c
+@@ -20,7 +20,6 @@
+ #include <asm/prom.h>
+ #include <bcm63xx_board.h>
+ #include <bcm63xx_cpu.h>
+-#include <bcm63xx_dev_uart.h>
+ #include <bcm63xx_regs.h>
+ #include <bcm63xx_io.h>
+ #include <bcm63xx_gpio.h>
+@@ -189,12 +188,6 @@ int __init board_register_devices(void)
+
+ bcm63xx_gpio_init();
+
+- if (board.has_uart0)
+- bcm63xx_uart_register(0);
+-
+- if (board.has_uart1)
+- bcm63xx_uart_register(1);
+-
+ if (board.has_pccard)
+ bcm63xx_pcmcia_register();
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -35,9 +35,6 @@ static struct board_info __initdata boar
+ .name = "CVG834G_E15R3921",
+ .expected_cpu_id = 0x3368,
+
+- .has_uart0 = 1,
+- .has_uart1 = 1,
+-
+ .has_enet0 = 1,
+ .has_pci = 1,
+
+@@ -67,7 +64,6 @@ static struct board_info __initdata boar
+ .name = "96328avng",
+ .expected_cpu_id = 0x6328,
+
+- .has_uart0 = 1,
+ .has_pci = 1,
+ .has_usbd = 0,
+ .use_fallback_sprom = 1,
+@@ -116,7 +112,6 @@ static struct board_info __initdata boar
+ .name = "96338GW",
+ .expected_cpu_id = 0x6338,
+
+- .has_uart0 = 1,
+ .has_enet0 = 1,
+ .enet0 = {
+ .force_speed_100 = 1,
+@@ -159,7 +154,6 @@ static struct board_info __initdata boar
+ .name = "96338W",
+ .expected_cpu_id = 0x6338,
+
+- .has_uart0 = 1,
+ .has_enet0 = 1,
+ .enet0 = {
+ .force_speed_100 = 1,
+@@ -204,8 +198,6 @@ static struct board_info __initdata boar
+ static struct board_info __initdata board_96345gw2 = {
+ .name = "96345GW2",
+ .expected_cpu_id = 0x6345,
+-
+- .has_uart0 = 1,
+ };
+ #endif
+
+@@ -217,7 +209,6 @@ static struct board_info __initdata boar
+ .name = "96348R",
+ .expected_cpu_id = 0x6348,
+
+- .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+@@ -262,7 +253,6 @@ static struct board_info __initdata boar
+ .name = "96348GW-10",
+ .expected_cpu_id = 0x6348,
+
+- .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+@@ -323,7 +313,6 @@ static struct board_info __initdata boar
+ .name = "96348GW-11",
+ .expected_cpu_id = 0x6348,
+
+- .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+@@ -378,7 +367,6 @@ static struct board_info __initdata boar
+ .name = "96348GW",
+ .expected_cpu_id = 0x6348,
+
+- .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+@@ -437,7 +425,6 @@ static struct board_info __initdata boar
+ .name = "F@ST2404",
+ .expected_cpu_id = 0x6348,
+
+- .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+@@ -482,7 +469,6 @@ static struct board_info __initdata boar
+ .name = "DV201AMR",
+ .expected_cpu_id = 0x6348,
+
+- .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
+@@ -503,7 +489,6 @@ static struct board_info __initdata boar
+ .name = "96348GW-A",
+ .expected_cpu_id = 0x6348,
+
+- .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+@@ -530,7 +515,6 @@ static struct board_info __initdata boar
+ .name = "96358VW",
+ .expected_cpu_id = 0x6358,
+
+- .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+@@ -583,7 +567,6 @@ static struct board_info __initdata boar
+ .name = "96358VW2",
+ .expected_cpu_id = 0x6358,
+
+- .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+@@ -633,7 +616,6 @@ static struct board_info __initdata boar
+ .name = "AGPF-S0",
+ .expected_cpu_id = 0x6358,
+
+- .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
--- /dev/null
+From 997f53b174c63153335508c22dc4493e8e5808d6 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Sun, 22 Feb 2015 17:52:32 +0100
+Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
+
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 262 -----------------------------
+ 1 file changed, 262 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -43,14 +43,6 @@ static struct board_info __initdata boar
+ .use_internal_phy = 1,
+ },
+
+- .leds = {
+- {
+- .name = "CVG834G:green:power",
+- .gpio = 37,
+- .default_trigger= "default-on",
+- },
+- },
+-
+ .ephy_reset_gpio = 36,
+ .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW,
+ };
+@@ -72,35 +64,6 @@ static struct board_info __initdata boar
+ .use_fullspeed = 0,
+ .port_no = 0,
+ },
+-
+- .leds = {
+- {
+- .name = "96328avng::ppp-fail",
+- .gpio = 2,
+- .active_low = 1,
+- },
+- {
+- .name = "96328avng::power",
+- .gpio = 4,
+- .active_low = 1,
+- .default_trigger = "default-on",
+- },
+- {
+- .name = "96328avng::power-fail",
+- .gpio = 8,
+- .active_low = 1,
+- },
+- {
+- .name = "96328avng::wps",
+- .gpio = 9,
+- .active_low = 1,
+- },
+- {
+- .name = "96328avng::ppp",
+- .gpio = 11,
+- .active_low = 1,
+- },
+- },
+ };
+ #endif
+
+@@ -119,35 +82,6 @@ static struct board_info __initdata boar
+ },
+
+ .has_ohci0 = 1,
+-
+- .leds = {
+- {
+- .name = "adsl",
+- .gpio = 3,
+- .active_low = 1,
+- },
+- {
+- .name = "ses",
+- .gpio = 5,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp-fail",
+- .gpio = 4,
+- .active_low = 1,
+- },
+- {
+- .name = "power",
+- .gpio = 0,
+- .active_low = 1,
+- .default_trigger = "default-on",
+- },
+- {
+- .name = "stop",
+- .gpio = 1,
+- .active_low = 1,
+- }
+- },
+ };
+
+ static struct board_info __initdata board_96338w = {
+@@ -159,35 +93,6 @@ static struct board_info __initdata boar
+ .force_speed_100 = 1,
+ .force_duplex_full = 1,
+ },
+-
+- .leds = {
+- {
+- .name = "adsl",
+- .gpio = 3,
+- .active_low = 1,
+- },
+- {
+- .name = "ses",
+- .gpio = 5,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp-fail",
+- .gpio = 4,
+- .active_low = 1,
+- },
+- {
+- .name = "power",
+- .gpio = 0,
+- .active_low = 1,
+- .default_trigger = "default-on",
+- },
+- {
+- .name = "stop",
+- .gpio = 1,
+- .active_low = 1,
+- },
+- },
+ };
+ #endif
+
+@@ -217,36 +122,6 @@ static struct board_info __initdata boar
+ .has_phy = 1,
+ .use_internal_phy = 1,
+ },
+-
+- .leds = {
+- {
+- .name = "adsl-fail",
+- .gpio = 2,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp",
+- .gpio = 3,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp-fail",
+- .gpio = 4,
+- .active_low = 1,
+- },
+- {
+- .name = "power",
+- .gpio = 0,
+- .active_low = 1,
+- .default_trigger = "default-on",
+-
+- },
+- {
+- .name = "stop",
+- .gpio = 1,
+- .active_low = 1,
+- },
+- },
+ };
+
+ static struct board_info __initdata board_96348gw_10 = {
+@@ -278,35 +153,6 @@ static struct board_info __initdata boar
+ .cs = 2,
+ .ext_irq = 2,
+ },
+-
+- .leds = {
+- {
+- .name = "adsl-fail",
+- .gpio = 2,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp",
+- .gpio = 3,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp-fail",
+- .gpio = 4,
+- .active_low = 1,
+- },
+- {
+- .name = "power",
+- .gpio = 0,
+- .active_low = 1,
+- .default_trigger = "default-on",
+- },
+- {
+- .name = "stop",
+- .gpio = 1,
+- .active_low = 1,
+- },
+- },
+ };
+
+ static struct board_info __initdata board_96348gw_11 = {
+@@ -332,35 +178,6 @@ static struct board_info __initdata boar
+ .has_ohci0 = 1,
+ .has_pccard = 1,
+ .has_ehci0 = 1,
+-
+- .leds = {
+- {
+- .name = "adsl-fail",
+- .gpio = 2,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp",
+- .gpio = 3,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp-fail",
+- .gpio = 4,
+- .active_low = 1,
+- },
+- {
+- .name = "power",
+- .gpio = 0,
+- .active_low = 1,
+- .default_trigger = "default-on",
+- },
+- {
+- .name = "stop",
+- .gpio = 1,
+- .active_low = 1,
+- },
+- },
+ };
+
+ static struct board_info __initdata board_96348gw = {
+@@ -390,35 +207,6 @@ static struct board_info __initdata boar
+ .ext_irq = 2,
+ .cs = 2,
+ },
+-
+- .leds = {
+- {
+- .name = "adsl-fail",
+- .gpio = 2,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp",
+- .gpio = 3,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp-fail",
+- .gpio = 4,
+- .active_low = 1,
+- },
+- {
+- .name = "power",
+- .gpio = 0,
+- .active_low = 1,
+- .default_trigger = "default-on",
+- },
+- {
+- .name = "stop",
+- .gpio = 1,
+- .active_low = 1,
+- },
+- },
+ };
+
+ static struct board_info __initdata board_FAST2404 = {
+@@ -534,33 +322,6 @@ static struct board_info __initdata boar
+ .has_ohci0 = 1,
+ .has_pccard = 1,
+ .has_ehci0 = 1,
+-
+- .leds = {
+- {
+- .name = "adsl-fail",
+- .gpio = 15,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp",
+- .gpio = 22,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp-fail",
+- .gpio = 23,
+- .active_low = 1,
+- },
+- {
+- .name = "power",
+- .gpio = 4,
+- .default_trigger = "default-on",
+- },
+- {
+- .name = "stop",
+- .gpio = 5,
+- },
+- },
+ };
+
+ static struct board_info __initdata board_96358vw2 = {
+@@ -587,29 +348,6 @@ static struct board_info __initdata boar
+ .has_pccard = 1,
+ .has_ehci0 = 1,
+ .num_usbh_ports = 2,
+-
+- .leds = {
+- {
+- .name = "adsl",
+- .gpio = 22,
+- .active_low = 1,
+- },
+- {
+- .name = "ppp-fail",
+- .gpio = 23,
+- },
+- {
+- .name = "power",
+- .gpio = 5,
+- .active_low = 1,
+- .default_trigger = "default-on",
+- },
+- {
+- .name = "stop",
+- .gpio = 4,
+- .active_low = 1,
+- },
+- },
+ };
+
+ static struct board_info __initdata board_AGPFS0 = {
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -99,6 +99,8 @@ void __init board_early_setup(const stru
+@@ -98,6 +98,8 @@ void __init board_early_setup(const stru
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G3_EXT_MII |
GPIO_MODE_6348_G0_EXT_MII;
--- a/arch/mips/bcm63xx/dev-flash.c
+++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -17,9 +17,13 @@
+@@ -17,6 +17,9 @@
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/spi-nor.h>
#include <bcm63xx_cpu.h>
#include <bcm63xx_dev_flash.h>
-+#include <bcm63xx_dev_hsspi.h>
- #include <bcm63xx_regs.h>
- #include <bcm63xx_io.h>
-
-@@ -66,6 +70,41 @@ void __init bcm63xx_flash_force_phys_bas
+@@ -66,6 +69,41 @@ void __init bcm63xx_flash_force_phys_bas
mtd_resources[0].end = end;
}
static int __init bcm63xx_detect_flash_type(void)
{
u32 val;
-@@ -73,9 +112,15 @@ static int __init bcm63xx_detect_flash_t
+@@ -73,9 +111,15 @@ static int __init bcm63xx_detect_flash_t
switch (bcm63xx_get_cpu_id()) {
case BCM6318_CPU_ID:
/* only support serial flash */
if (val & STRAPBUS_6328_BOOT_SEL_SERIAL)
return BCM63XX_FLASH_TYPE_SERIAL;
else
-@@ -94,12 +139,20 @@ static int __init bcm63xx_detect_flash_t
+@@ -94,12 +138,20 @@ static int __init bcm63xx_detect_flash_t
return BCM63XX_FLASH_TYPE_SERIAL;
case BCM6362_CPU_ID:
val = bcm_misc_readl(MISC_STRAPBUS_6362_REG);
switch (val & STRAPBUS_6368_BOOT_SEL_MASK) {
case STRAPBUS_6368_BOOT_SEL_NAND:
return BCM63XX_FLASH_TYPE_NAND;
-@@ -110,6 +163,11 @@ static int __init bcm63xx_detect_flash_t
+@@ -110,6 +162,11 @@ static int __init bcm63xx_detect_flash_t
}
case BCM63268_CPU_ID:
val = bcm_misc_readl(MISC_STRAPBUS_63268_REG);
if (val & STRAPBUS_63268_BOOT_SEL_SERIAL)
return BCM63XX_FLASH_TYPE_SERIAL;
else
-@@ -176,6 +234,7 @@ void __init bcm63xx_flash_detect(void)
+@@ -176,6 +233,7 @@ void __init bcm63xx_flash_detect(void)
int __init bcm63xx_flash_register(void)
{
u32 val;
switch (flash_type) {
-@@ -195,8 +254,14 @@ int __init bcm63xx_flash_register(void)
+@@ -195,8 +253,14 @@ int __init bcm63xx_flash_register(void)
return platform_device_register(&mtd_dev);
case BCM63XX_FLASH_TYPE_SERIAL:
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -33,6 +33,7 @@
+@@ -32,6 +32,7 @@
#include <bcm63xx_dev_usb_ohci.h>
#include <bcm63xx_dev_usb_usbd.h>
#include <board_bcm963xx.h>
#include "board_common.h"
-@@ -179,6 +180,7 @@ static struct of_device_id of_ids[] = {
+@@ -178,6 +179,7 @@ static struct of_device_id of_ids[] = {
int __init board_register_devices(void)
{
int usbh_ports = 0;
#if CONFIG_OF
if (of_have_populated_dt()) {
-@@ -252,6 +254,10 @@ int __init board_register_devices(void)
+@@ -245,6 +247,10 @@ int __init board_register_devices(void)
board.ephy_reset_gpio_flags);
}
/*
* board definition
*/
-@@ -36,6 +42,10 @@ struct board_info {
- unsigned int has_uart0:1;
- unsigned int has_uart1:1;
+@@ -34,6 +40,10 @@ struct board_info {
+ unsigned int has_usbd:1;
+ unsigned int has_dsp:1;
unsigned int use_fallback_sprom:1;
+ unsigned int has_caldata:2;
+
--- a/arch/mips/bcm63xx/dev-flash.c
+++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -271,3 +271,8 @@ int __init bcm63xx_flash_register(void)
+@@ -270,3 +270,8 @@ int __init bcm63xx_flash_register(void)
return -ENODEV;
}
}
+++ b/arch/mips/bcm63xx/Makefile
@@ -2,7 +2,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o
setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
- dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
+ dev-pcmcia.o dev-rng.o \
dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
- usb-common.o sprom.o
+ pci-ath9k-fixup.o usb-common.o sprom.o
obj-y += boards/
--- /dev/null
+++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c
-@@ -0,0 +1,201 @@
+@@ -0,0 +1,200 @@
+/*
+ * Broadcom BCM63XX Ath9k EEPROM fixup helper.
+ *
+#include <bcm63xx_nvram.h>
+#include <bcm63xx_dev_pci.h>
+#include <bcm63xx_dev_flash.h>
-+#include <bcm63xx_dev_hsspi.h>
+#include <pci_ath9k_fixup.h>
+
+#define bcm_hsspi_writel(v, o) bcm_rset_writel(RSET_HSSPI, (v), (o))
/*
--- a/arch/mips/bcm63xx/pci-ath9k-fixup.c
+++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c
-@@ -183,12 +183,14 @@ static void ath9k_pci_fixup(struct pci_d
+@@ -182,12 +182,14 @@ static void ath9k_pci_fixup(struct pci_d
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup);
return;
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -256,7 +256,8 @@ int __init board_register_devices(void)
+@@ -249,7 +249,8 @@ int __init board_register_devices(void)
/* register any fixups */
for (i = 0; i < board.has_caldata; i++)
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -257,7 +257,7 @@ int __init board_register_devices(void)
+@@ -250,7 +250,7 @@ int __init board_register_devices(void)
/* register any fixups */
for (i = 0; i < board.has_caldata; i++)
pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset,
}
--- a/arch/mips/bcm63xx/pci-ath9k-fixup.c
+++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c
-@@ -184,13 +184,15 @@ static void ath9k_pci_fixup(struct pci_d
+@@ -183,13 +183,15 @@ static void ath9k_pci_fixup(struct pci_d
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup);
void __init pci_enable_ath9k_fixup(unsigned slot, u32 offset,
+++ b/arch/mips/bcm63xx/Makefile
@@ -2,7 +2,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o
setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
- dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
+ dev-pcmcia.o dev-rng.o \
dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
- pci-ath9k-fixup.o usb-common.o sprom.o
+ pci-ath9k-fixup.o pci-rt2x00-fixup.o usb-common.o sprom.o
obj-y += boards/
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -34,6 +34,7 @@
+@@ -33,6 +33,7 @@
#include <bcm63xx_dev_usb_usbd.h>
#include <board_bcm963xx.h>
#include <pci_ath9k_fixup.h>
#include "board_common.h"
-@@ -255,9 +256,19 @@ int __init board_register_devices(void)
+@@ -248,9 +249,19 @@ int __init board_register_devices(void)
}
/* register any fixups */
};
/*
-@@ -48,7 +53,7 @@ struct board_info {
+@@ -46,7 +51,7 @@ struct board_info {
unsigned int has_caldata:2;
/* wifi calibration data config */
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -119,6 +119,8 @@ static struct board_info __initdata boar
- .has_uart0 = 1,
+@@ -77,6 +77,8 @@ static struct board_info __initdata boar
+
.has_enet0 = 1,
.enet0 = {
+ .has_phy = 1,
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -162,6 +164,8 @@ static struct board_info __initdata boar
- .has_uart0 = 1,
+@@ -90,6 +92,8 @@ static struct board_info __initdata boar
+
.has_enet0 = 1,
.enet0 = {
+ .has_phy = 1,
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -273,6 +277,8 @@ static struct board_info __initdata boar
+@@ -138,6 +142,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -335,6 +341,8 @@ static struct board_info __initdata boar
+@@ -170,6 +176,8 @@ static struct board_info __initdata boar
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -389,6 +397,8 @@ static struct board_info __initdata boar
+@@ -194,6 +202,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -449,6 +459,8 @@ static struct board_info __initdata boar
+@@ -224,6 +234,8 @@ static struct board_info __initdata boar
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -472,6 +484,8 @@ static struct board_info __initdata boar
+@@ -247,6 +259,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -491,6 +505,8 @@ static struct board_info __initdata boar
- .has_enet1 = 1,
- .enet0 = {
- .has_phy = 1,
-+ .phy_id = 0,
-+ .has_phy = 1,
+@@ -268,6 +282,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
-@@ -514,6 +530,8 @@ static struct board_info __initdata boar
++ .has_phy = 1,
++ .phy_id = 0,
+ .force_speed_100 = 1,
+ .force_duplex_full = 1,
+ },
+@@ -287,6 +303,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -542,6 +560,8 @@ static struct board_info __initdata boar
+@@ -314,6 +332,8 @@ static struct board_info __initdata boar
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -595,6 +615,8 @@ static struct board_info __initdata boar
+@@ -339,6 +359,8 @@ static struct board_info __initdata boar
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -644,6 +666,8 @@ static struct board_info __initdata boar
+@@ -364,6 +386,8 @@ static struct board_info __initdata boar
},
.enet1 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -667,6 +691,8 @@ static struct board_info __initdata boar
+@@ -387,6 +411,8 @@ static struct board_info __initdata boar
},
.enet1 = {
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -57,7 +57,7 @@ static struct board_info __initdata boar
+@@ -46,7 +46,7 @@ static struct board_info __initdata boar
.ephy_reset_gpio = 36,
.ephy_reset_gpio_flags = GPIO_ACTIVE_LOW,
};
/*
* known 6328 boards
-@@ -106,7 +106,7 @@ static struct board_info __initdata boar
- },
+@@ -65,7 +65,7 @@ static struct board_info __initdata boar
+ .port_no = 0,
},
};
-#endif
/*
* known 6338 boards
-@@ -199,7 +199,7 @@ static struct board_info __initdata boar
- },
+@@ -98,7 +98,7 @@ static struct board_info __initdata boar
+ .force_duplex_full = 1,
},
};
-#endif
/*
* known 6345 boards
-@@ -211,7 +211,7 @@ static struct board_info __initdata boar
-
- .has_uart0 = 1,
+@@ -108,7 +108,7 @@ static struct board_info __initdata boar
+ .name = "96345GW2",
+ .expected_cpu_id = 0x6345,
};
-#endif
+#endif /* CONFIG_BCM63XX_CPU_6345 */
/*
* known 6348 boards
-@@ -538,7 +538,7 @@ static struct board_info __initdata boar
+@@ -311,7 +311,7 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
/*
* known 6358 boards
-@@ -699,7 +699,7 @@ static struct board_info __initdata boar
+@@ -419,7 +419,7 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -538,6 +538,22 @@ static struct board_info __initdata boar
+@@ -311,6 +311,21 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
+
+ .has_enet1 = 1,
+ .has_pci = 1,
-+ .has_uart0 = 1,
+
+ .enet1 = {
+ .has_phy = 1,
#endif /* CONFIG_BCM63XX_CPU_6348 */
/*
-@@ -727,6 +743,7 @@ static const struct board_info __initcon
+@@ -447,6 +462,7 @@ static const struct board_info __initcon
&board_DV201AMR,
&board_96348gw_a,
&board_rta1025w_16,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -758,6 +775,7 @@ static struct of_device_id const bcm963x
+@@ -478,6 +494,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -715,6 +715,62 @@ static struct board_info __initdata boar
+@@ -434,6 +434,60 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
+ .name = "NB4-SER-r0",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+ .name = "NB4-FXC-r1",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
-@@ -751,6 +807,8 @@ static const struct board_info __initcon
+@@ -470,6 +524,8 @@ static const struct board_info __initcon
&board_96358vw2,
&board_AGPFS0,
&board_DWVS0,
#endif
};
-@@ -792,6 +850,8 @@ static struct of_device_id const bcm963x
+@@ -511,6 +567,8 @@ static struct of_device_id const bcm963x
{ .compatible = "pirelli,a226m", .data = &board_DWVS0, },
{ .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, },
{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -199,6 +199,20 @@ static struct board_info __initdata boar
- },
+@@ -98,6 +98,20 @@ static struct board_info __initdata boar
+ .force_duplex_full = 1,
},
};
+
#endif /* CONFIG_BCM63XX_CPU_6338 */
/*
-@@ -786,6 +800,7 @@ static const struct board_info __initcon
+@@ -503,6 +517,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
&board_96338w,
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
-@@ -823,6 +838,7 @@ static struct of_device_id const bcm963x
+@@ -540,6 +555,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6338
{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
{ .compatible = "brcm,bcm96338w", .data = &board_96338w, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -681,6 +681,26 @@ static struct board_info __initdata boar
- },
+@@ -401,6 +401,25 @@ static struct board_info __initdata boar
+ .num_usbh_ports = 2,
};
+static struct board_info __initdata board_CPVA642 = {
+ .name = "CPVA642",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+
static struct board_info __initdata board_AGPFS0 = {
.name = "AGPF-S0",
.expected_cpu_id = 0x6358,
-@@ -821,6 +841,7 @@ static const struct board_info __initcon
+@@ -538,6 +557,7 @@ static const struct board_info __initcon
&board_96358vw,
&board_96358vw2,
&board_AGPFS0,
&board_DWVS0,
&board_nb4_ser_r0,
&board_nb4_fxc_r1,
-@@ -868,6 +889,7 @@ static struct of_device_id const bcm963x
+@@ -585,6 +605,7 @@ static struct of_device_id const bcm963x
{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
{ .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, },
{ .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -750,6 +750,23 @@ static struct board_info __initdata boar
+@@ -468,6 +468,22 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
+ .name = "AW4139",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+
static struct board_info __initdata board_nb4_ser_r0 = {
.name = "NB4-SER-r0",
.expected_cpu_id = 0x6358,
-@@ -843,6 +860,7 @@ static const struct board_info __initcon
+@@ -559,6 +575,7 @@ static const struct board_info __initcon
&board_AGPFS0,
&board_CPVA642,
&board_DWVS0,
&board_nb4_ser_r0,
&board_nb4_fxc_r1,
#endif
-@@ -882,6 +900,7 @@ static struct of_device_id const bcm963x
+@@ -598,6 +615,7 @@ static struct of_device_id const bcm963x
{ .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
{ .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -568,6 +568,45 @@ static struct board_info __initdata boar
+@@ -340,6 +340,44 @@ static struct board_info __initdata boar
.force_duplex_full = 1,
},
};
+ .name = "SPW500V",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
#endif /* CONFIG_BCM63XX_CPU_6348 */
/*
-@@ -852,6 +891,7 @@ static const struct board_info __initcon
+@@ -567,6 +605,7 @@ static const struct board_info __initcon
&board_96348gw_a,
&board_rta1025w_16,
&board_96348_D4PW,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -893,6 +933,7 @@ static struct of_device_id const bcm963x
+@@ -608,6 +647,7 @@ static struct of_device_id const bcm963x
{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
{ .compatible = "sagem,f@st2404", .data = &board_FAST2404, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -457,6 +457,66 @@ static struct board_info __initdata boar
+@@ -233,6 +233,64 @@ static struct board_info __initdata boar
},
};
+ .name = "GW6200",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+ .name = "GW6000",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404",
.expected_cpu_id = 0x6348,
-@@ -884,6 +944,8 @@ static const struct board_info __initcon
+@@ -598,6 +656,8 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
&board_96348gw,
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,
-@@ -934,6 +996,8 @@ static struct of_device_id const bcm963x
+@@ -648,6 +708,8 @@ static struct of_device_id const bcm963x
{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
{ .compatible = "sagem,f@st2404", .data = &board_FAST2404, },
{ .compatible = "t-com,spw500v", .data = &board_spw500v, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -667,6 +667,40 @@ static struct board_info __initdata boar
+@@ -436,6 +436,39 @@ static struct board_info __initdata boar
.num_board_fixups = ARRAY_SIZE(spw500v_fixups),
},
};
+ .name = "MAGIC",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
#endif /* CONFIG_BCM63XX_CPU_6348 */
/*
-@@ -954,6 +988,7 @@ static const struct board_info __initcon
+@@ -666,6 +699,7 @@ static const struct board_info __initcon
&board_rta1025w_16,
&board_96348_D4PW,
&board_spw500v,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -998,6 +1033,7 @@ static struct of_device_id const bcm963x
+@@ -710,6 +744,7 @@ static struct of_device_id const bcm963x
{ .compatible = "t-com,spw500v", .data = &board_spw500v, },
{ .compatible = "tecom,gw6000", .data = &board_gw6000, },
{ .compatible = "tecom,gw6200", .data = &board_gw6200, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -955,6 +955,34 @@ static struct board_info __initdata boar
+@@ -666,6 +666,32 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
.num_usbh_ports = 2,
};
+ .name = "HW553",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
-+
+ .has_enet1 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
-@@ -1000,6 +1028,7 @@ static const struct board_info __initcon
+@@ -711,6 +737,7 @@ static const struct board_info __initcon
&board_dsl_274xb_rev_c,
&board_nb4_ser_r0,
&board_nb4_fxc_r1,
#endif
};
-@@ -1043,6 +1072,7 @@ static struct of_device_id const bcm963x
+@@ -754,6 +781,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },
{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -213,6 +213,21 @@ static struct board_info __initdata boar
+@@ -112,6 +112,20 @@ static struct board_info __initdata boar
.force_duplex_full = 1,
},
};
+ .name = "RTA1320_16M",
+ .expected_cpu_id = 0x6338,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+
+ .enet0 = {
#endif /* CONFIG_BCM63XX_CPU_6338 */
/*
-@@ -999,6 +1014,7 @@ static const struct board_info __initcon
+@@ -708,6 +722,7 @@ static const struct board_info __initcon
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
-@@ -1043,6 +1059,7 @@ static struct of_device_id const bcm963x
+@@ -752,6 +767,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6338
{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
{ .compatible = "brcm,bcm96338w", .data = &board_96338w, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -998,6 +998,21 @@ static struct board_info __initdata boar
+@@ -706,6 +706,20 @@ static struct board_info __initdata boar
.pci_dev = 1,
},
};
+ .name = "96358-502V",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_pci = 1,
+
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
-@@ -1045,6 +1060,7 @@ static const struct board_info __initcon
+@@ -753,6 +767,7 @@ static const struct board_info __initcon
&board_nb4_ser_r0,
&board_nb4_fxc_r1,
&board_HW553,
#endif
};
-@@ -1096,6 +1112,7 @@ static struct of_device_id const bcm963x
+@@ -804,6 +819,7 @@ static struct of_device_id const bcm963x
{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
{ .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, },
{ .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -716,6 +716,27 @@ static struct board_info __initdata boar
+@@ -483,6 +483,26 @@ static struct board_info __initdata boar
.ext_irq = 2,
},
};
+ .name = "V2500V_BB",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
#endif /* CONFIG_BCM63XX_CPU_6348 */
/*
-@@ -1048,6 +1069,7 @@ static const struct board_info __initcon
+@@ -755,6 +775,7 @@ static const struct board_info __initcon
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1087,6 +1109,7 @@ static struct of_device_id const bcm963x
+@@ -794,6 +815,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
{ .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, },
{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
-@@ -1146,6 +1169,22 @@ void __init board_bcm963xx_init(void)
+@@ -853,6 +875,22 @@ void __init board_bcm963xx_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);
+#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
#include <bcm63xx_dev_flash.h>
- #include <bcm63xx_dev_hsspi.h>
-@@ -248,6 +249,13 @@ int __init bcm63xx_flash_register(void)
+ #include <bcm63xx_regs.h>
+@@ -247,6 +248,13 @@ int __init bcm63xx_flash_register(void)
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -411,6 +411,25 @@ static struct board_info __initdata boar
- },
+@@ -216,6 +216,24 @@ static struct board_info __initdata boar
+ .has_ehci0 = 1,
};
+
+ .name = "V2110",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -1070,6 +1089,7 @@ static const struct board_info __initcon
+@@ -776,6 +794,7 @@ static const struct board_info __initcon
&board_spw500v,
&board_96348sv,
&board_V2500V_BB,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1109,6 +1129,7 @@ static struct of_device_id const bcm963x
+@@ -815,6 +834,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
+obj-$(CONFIG_BOARD_LIVEBOX) += board_livebox.o
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -56,7 +56,7 @@ void __init board_prom_init(void)
+@@ -55,7 +55,7 @@ void __init board_prom_init(void)
if (fw_arg3 == CFE_EPTSEAL)
board_bcm963xx_init();
else
#endif /* __BOARD_COMMON_H */
--- /dev/null
+++ b/arch/mips/bcm63xx/boards/board_livebox.c
-@@ -0,0 +1,164 @@
+@@ -0,0 +1,163 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ .name = "Livebox-blue-5g",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -430,6 +430,34 @@ static struct board_info __initdata boar
+@@ -234,6 +234,33 @@ static struct board_info __initdata boar
};
+ .name = "CT536_CT5621",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 0,
+ .has_enet1 = 1,
+ .has_pci = 1,
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -1090,6 +1118,7 @@ static const struct board_info __initcon
+@@ -795,6 +822,7 @@ static const struct board_info __initcon
&board_96348sv,
&board_V2500V_BB,
&board_V2110,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1131,6 +1160,8 @@ static struct of_device_id const bcm963x
+@@ -836,6 +864,8 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
{ .compatible = "bt,v2110", .data = &board_V2110, },
{ .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -946,6 +946,8 @@ static struct board_info __initdata boar
- .name = "DWV-S0",
- .expected_cpu_id = 0x6358,
-
-+ .has_uart0 = 1,
-+
- .has_enet0 = 1,
- .has_enet1 = 1,
- .has_pci = 1,
-@@ -964,6 +966,7 @@ static struct board_info __initdata boar
+@@ -674,6 +674,7 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -458,6 +458,31 @@ static struct board_info __initdata boar
+@@ -261,6 +261,30 @@ static struct board_info __initdata boar
},
};
+ .name = "96348A-122",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -1122,6 +1147,7 @@ static const struct board_info __initcon
+@@ -824,6 +848,7 @@ static const struct board_info __initcon
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1164,6 +1190,7 @@ static struct of_device_id const bcm963x
+@@ -866,6 +891,7 @@ static struct of_device_id const bcm963x
{ .compatible = "bt,v2110", .data = &board_V2110, },
{ .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, },
{ .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, },
+++ /dev/null
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -635,6 +635,7 @@ static struct board_info __initdata boar
- .name = "RTA1025W_16",
- .expected_cpu_id = 0x6348,
-
-+ .has_uart0 = 1,
- .has_enet0 = 1,
- .has_enet1 = 1,
- .has_pci = 1,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -429,6 +429,34 @@ static struct board_info __initdata boar
+@@ -233,6 +233,33 @@ static struct board_info __initdata boar
},
};
+ .name = "CPVA502+",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
static struct board_info __initdata board_ct536_ct5621 = {
.name = "CT536_CT5621",
-@@ -1149,6 +1177,7 @@ static const struct board_info __initcon
+@@ -849,6 +876,7 @@ static const struct board_info __initcon
&board_V2110,
&board_ct536_ct5621,
&board_96348A_122,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1201,6 +1230,7 @@ static struct of_device_id const bcm963x
+@@ -901,6 +929,7 @@ static struct of_device_id const bcm963x
{ .compatible = "t-com,spw500v", .data = &board_spw500v, },
{ .compatible = "tecom,gw6000", .data = &board_gw6000, },
{ .compatible = "tecom,gw6200", .data = &board_gw6200, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1141,6 +1141,59 @@ static struct board_info __initdata boar
+@@ -840,6 +840,58 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
+ .name = "96368MVWG",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+
+ .has_usbd = 1,
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1192,6 +1245,10 @@ static const struct board_info __initcon
+@@ -891,6 +943,10 @@ static const struct board_info __initcon
&board_HW553,
&board_spw303v,
#endif
};
static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1252,6 +1309,7 @@ static struct of_device_id const bcm963x
+@@ -951,6 +1007,7 @@ static struct of_device_id const bcm963x
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
#endif
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -83,12 +83,25 @@ void __init board_early_setup(const stru
+@@ -82,12 +82,25 @@ void __init board_early_setup(const stru
bcm63xx_pci_enabled = 1;
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G2_PCI;
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1191,6 +1191,46 @@ static struct board_info __initdata boar
+@@ -889,6 +889,45 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
+ .name = "96368MVNgr",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .has_enetsw = 1,
+
#endif /* CONFIG_BCM63XX_CPU_6368 */
/*
-@@ -1248,6 +1288,7 @@ static const struct board_info __initcon
+@@ -946,6 +985,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
#endif
};
-@@ -1309,6 +1350,7 @@ static struct of_device_id const bcm963x
+@@ -1007,6 +1047,7 @@ static struct of_device_id const bcm963x
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -105,6 +105,33 @@ static struct board_info __initdata boar
- .active_low = 1,
- },
+@@ -64,6 +64,33 @@ static struct board_info __initdata boar
+ .use_fullspeed = 0,
+ .port_no = 0,
},
+
+ .has_enetsw = 1,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -133,6 +133,41 @@ static struct board_info __initdata boar
+@@ -92,6 +92,40 @@ static struct board_info __initdata boar
},
},
};
+ .name = "963281TAN",
+ .expected_cpu_id = 0x6328,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+
+ .has_enetsw = 1,
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
-@@ -1269,6 +1304,7 @@ static const struct board_info __initcon
+@@ -966,6 +1000,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
#endif
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
-@@ -1325,6 +1361,7 @@ static struct of_device_id const bcm963x
+@@ -1022,6 +1057,7 @@ static struct of_device_id const bcm963x
{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -168,6 +168,52 @@ static struct board_info __initdata boar
+@@ -126,6 +126,51 @@ static struct board_info __initdata boar
},
},
};
+ .name = "AW4339U",
+ .expected_cpu_id = 0x6328,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+
+ .has_caldata = 1,
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
-@@ -1305,6 +1351,7 @@ static const struct board_info __initcon
+@@ -1001,6 +1046,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
#endif
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
-@@ -1363,6 +1410,7 @@ static struct of_device_id const bcm963x
+@@ -1059,6 +1105,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6328
{ .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -837,6 +837,25 @@ static struct board_info __initdata boar
+@@ -600,6 +600,24 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
+ .name = "96348W3",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+
static struct board_info __initdata board_96348_D4PW = {
.name = "D-4P-W",
.expected_cpu_id = 0x6348,
-@@ -1381,6 +1400,7 @@ static const struct board_info __initcon
+@@ -1076,6 +1094,7 @@ static const struct board_info __initcon
&board_ct536_ct5621,
&board_96348A_122,
&board_CPVA502plus,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1436,6 +1456,7 @@ static struct of_device_id const bcm963x
+@@ -1131,6 +1150,7 @@ static struct of_device_id const bcm963x
{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1223,6 +1223,31 @@ static struct board_info __initdata boar
+@@ -922,6 +922,30 @@ static struct board_info __initdata boar
.num_usbh_ports = 2,
};
+ .name = "CT6373-1",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -1412,6 +1437,7 @@ static const struct board_info __initcon
+@@ -1106,6 +1130,7 @@ static const struct board_info __initcon
&board_dsl_274xb_rev_c,
&board_nb4_ser_r0,
&board_nb4_fxc_r1,
&board_HW553,
&board_spw303v,
#endif
-@@ -1470,6 +1496,7 @@ static struct of_device_id const bcm963x
+@@ -1164,6 +1189,7 @@ static struct of_device_id const bcm963x
{ .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
{ .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1290,6 +1290,36 @@ static struct board_info __initdata boar
+@@ -985,6 +985,35 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
};
+ .name = "DVAG3810BN",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
-@@ -1440,6 +1470,7 @@ static const struct board_info __initcon
+@@ -1133,6 +1162,7 @@ static const struct board_info __initcon
&board_ct6373_1,
&board_HW553,
&board_spw303v,
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1499,6 +1530,7 @@ static struct of_device_id const bcm963x
+@@ -1192,6 +1222,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, },
{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1322,6 +1322,34 @@ static struct board_info __initdata boar
+@@ -1016,6 +1016,32 @@ static struct board_info __initdata boar
};
#endif /* CONFIG_BCM63XX_CPU_6358 */
+ .name = "NB6",
+ .expected_cpu_id = 0x6362,
+
-+ .has_uart0 = 1,
-+
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
+ .num_usbh_ports = 2,
/*
* known 6368 boards
*/
-@@ -1473,6 +1501,10 @@ static const struct board_info __initcon
+@@ -1165,6 +1191,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
-@@ -1541,6 +1573,9 @@ static struct of_device_id const bcm963x
+@@ -1233,6 +1263,9 @@ static struct of_device_id const bcm963x
{ .compatible = "t-com,spw303v", .data = &board_spw303v, },
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
#endif
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -767,6 +767,23 @@ static struct board_info __initdata boar
+@@ -533,6 +533,22 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
+ .name = "F@ST2604",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .has_ohci0 = 1,
+
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -1472,6 +1489,7 @@ static const struct board_info __initcon
+@@ -1162,6 +1178,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,
&board_DV201AMR,
&board_96348gw_a,
&board_rta1025w_16,
-@@ -1547,6 +1565,7 @@ static struct of_device_id const bcm963x
+@@ -1237,6 +1254,7 @@ static struct of_device_id const bcm963x
{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
{ .compatible = "netgear,dg834g-v4", .data = &board_96348W3, },
{ .compatible = "sagem,f@st2404", .data = &board_FAST2404, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -169,6 +169,50 @@ static struct board_info __initdata boar
+@@ -127,6 +127,49 @@ static struct board_info __initdata boar
},
};
+ .name = "963281T_TEF",
+ .expected_cpu_id = 0x6328,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U",
.expected_cpu_id = 0x6328,
-@@ -1470,6 +1514,7 @@ static const struct board_info __initcon
+@@ -1159,6 +1202,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
&board_dsl_274xb_f1,
#endif
#ifdef CONFIG_BCM63XX_CPU_6338
-@@ -1535,6 +1580,7 @@ static struct of_device_id const bcm963x
+@@ -1224,6 +1268,7 @@ static struct of_device_id const bcm963x
{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -134,6 +134,79 @@ static struct board_info __initdata boar
+@@ -93,6 +93,78 @@ static struct board_info __initdata boar
},
};
+ .name = "96328A-1441N1",
+ .expected_cpu_id = 0x6328,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
static struct board_info __initdata board_963281TAN = {
.name = "963281TAN",
.expected_cpu_id = 0x6328,
-@@ -1513,6 +1586,7 @@ static const struct board_info __initcon
+@@ -1201,6 +1273,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
-@@ -1583,6 +1657,7 @@ static struct of_device_id const bcm963x
+@@ -1271,6 +1344,7 @@ static struct of_device_id const bcm963x
{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
{ .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -134,6 +134,61 @@ static struct board_info __initdata boar
+@@ -93,6 +93,60 @@ static struct board_info __initdata boar
},
};
+ .name = "96328A-1241N",
+ .expected_cpu_id = 0x6328,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
static struct sprom_fixup __initdata ar5387un_fixups[] = {
{ .offset = 2, .value = 0x05bb },
{ .offset = 65, .value = 0x1204 },
-@@ -1586,6 +1641,7 @@ static const struct board_info __initcon
+@@ -1273,6 +1327,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_AR5387un,
&board_963281TAN,
&board_A4001N1,
-@@ -1657,6 +1713,7 @@ static struct of_device_id const bcm963x
+@@ -1344,6 +1399,7 @@ static struct of_device_id const bcm963x
{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
{ .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -520,6 +520,22 @@ static struct board_info __initdata boar
-
- .has_uart0 = 1,
+@@ -411,6 +411,20 @@ static struct board_info __initdata boar
+ .name = "96345GW2",
+ .expected_cpu_id = 0x6345,
};
+
+static struct board_info __initdata board_rta770bw = {
+ .name = "RTA770BW",
+ .expected_cpu_id = 0x6345,
+
-+ .has_uart0 = 1,
-+
+ .has_enet0 = 1,
+
+ .enet0 = {
#endif /* CONFIG_BCM63XX_CPU_6345 */
/*
-@@ -1655,6 +1671,7 @@ static const struct board_info __initcon
+@@ -1341,6 +1355,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
#endif
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
-@@ -1725,6 +1742,7 @@ static struct of_device_id const bcm963x
+@@ -1411,6 +1426,7 @@ static struct of_device_id const bcm963x
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
-@@ -1481,6 +1482,95 @@ static struct board_info __initdata boar
+@@ -1171,6 +1172,92 @@ static struct board_info __initdata boar
},
};
+ .name = "HW556_C",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
+ .name = "HW556_A",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
+ .name = "HW556_B",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
-@@ -1707,6 +1797,9 @@ static const struct board_info __initcon
+@@ -1391,6 +1478,9 @@ static const struct board_info __initcon
&board_nb4_fxc_r1,
&board_ct6373_1,
&board_HW553,
&board_spw303v,
&board_DVAG3810BN,
#endif
-@@ -1779,6 +1872,9 @@ static struct of_device_id const bcm963x
+@@ -1463,6 +1553,9 @@ static struct of_device_id const bcm963x
{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
{ .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, },
{ .compatible = "huawei,hg553", .data = &board_HW553, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -537,6 +537,27 @@ static struct board_info __initdata boar
+@@ -426,6 +426,25 @@ static struct board_info __initdata boar
.force_duplex_full = 1,
},
};
+ .name = "RTA770W",
+ .expected_cpu_id = 0x6345,
+
-+ .has_uart0 = 1,
-+
+ .has_enet0 = 1,
+
+ .enet0 = {
#endif /* CONFIG_BCM63XX_CPU_6345 */
/*
-@@ -1762,6 +1783,7 @@ static const struct board_info __initcon
+@@ -1443,6 +1462,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,
#endif
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
-@@ -1836,6 +1858,7 @@ static struct of_device_id const bcm963x
+@@ -1517,6 +1537,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6345
{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
{ .compatible = "dynalink,rta770bw", .data = &board_rta770bw, },
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -387,6 +387,44 @@ static struct board_info __initdata boar
+@@ -341,6 +341,43 @@ static struct board_info __initdata boar
},
},
};
+ .name = "F@ST2704V2",
+ .expected_cpu_id = 0x6328,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
-@@ -1773,6 +1811,7 @@ static const struct board_info __initcon
+@@ -1452,6 +1489,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
#endif
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
-@@ -1848,6 +1887,7 @@ static struct of_device_id const bcm963x
+@@ -1527,6 +1565,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
{ .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, },
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1702,6 +1702,43 @@ static struct board_info __initdata boar
+@@ -1382,6 +1382,41 @@ static struct board_info __initdata boar
},
},
};
+ .name = "F@ST2504n",
+ .expected_cpu_id = 0x6362,
+
-+ .has_uart0 = 1,
-+
+ .has_enetsw = 1,
+
+ .enetsw = {
#endif /* CONFIG_BCM63XX_CPU_6362 */
/*
-@@ -1867,6 +1904,7 @@ static const struct board_info __initcon
+@@ -1545,6 +1580,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1948,6 +1986,7 @@ static struct of_device_id const bcm963x
+@@ -1626,6 +1662,7 @@ static struct of_device_id const bcm963x
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6362
+++ /dev/null
-From 997f53b174c63153335508c22dc4493e8e5808d6 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Sun, 22 Feb 2015 17:52:32 +0100
-Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
-
----
- arch/mips/bcm63xx/boards/board_bcm963xx.c | 262 -----------------------------
- 1 file changed, 262 deletions(-)
-
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -47,14 +47,6 @@ static struct board_info __initdata boar
- .use_internal_phy = 1,
- },
-
-- .leds = {
-- {
-- .name = "CVG834G:green:power",
-- .gpio = 37,
-- .default_trigger= "default-on",
-- },
-- },
--
- .ephy_reset_gpio = 36,
- .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW,
- };
-@@ -78,35 +70,6 @@ static struct board_info __initdata boar
- .port_no = 0,
- },
-
-- .leds = {
-- {
-- .name = "96328avng::ppp-fail",
-- .gpio = 2,
-- .active_low = 1,
-- },
-- {
-- .name = "96328avng::power",
-- .gpio = 4,
-- .active_low = 1,
-- .default_trigger = "default-on",
-- },
-- {
-- .name = "96328avng::power-fail",
-- .gpio = 8,
-- .active_low = 1,
-- },
-- {
-- .name = "96328avng::wps",
-- .gpio = 9,
-- .active_low = 1,
-- },
-- {
-- .name = "96328avng::ppp",
-- .gpio = 11,
-- .active_low = 1,
-- },
-- },
--
- .has_enetsw = 1,
-
- .enetsw = {
-@@ -445,35 +408,6 @@ static struct board_info __initdata boar
- },
-
- .has_ohci0 = 1,
--
-- .leds = {
-- {
-- .name = "adsl",
-- .gpio = 3,
-- .active_low = 1,
-- },
-- {
-- .name = "ses",
-- .gpio = 5,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp-fail",
-- .gpio = 4,
-- .active_low = 1,
-- },
-- {
-- .name = "power",
-- .gpio = 0,
-- .active_low = 1,
-- .default_trigger = "default-on",
-- },
-- {
-- .name = "stop",
-- .gpio = 1,
-- .active_low = 1,
-- }
-- },
- };
-
- static struct board_info __initdata board_96338w = {
-@@ -488,35 +422,6 @@ static struct board_info __initdata boar
- .force_speed_100 = 1,
- .force_duplex_full = 1,
- },
--
-- .leds = {
-- {
-- .name = "adsl",
-- .gpio = 3,
-- .active_low = 1,
-- },
-- {
-- .name = "ses",
-- .gpio = 5,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp-fail",
-- .gpio = 4,
-- .active_low = 1,
-- },
-- {
-- .name = "power",
-- .gpio = 0,
-- .active_low = 1,
-- .default_trigger = "default-on",
-- },
-- {
-- .name = "stop",
-- .gpio = 1,
-- .active_low = 1,
-- },
-- },
- };
-
- static struct board_info __initdata board_96338w2_e7t = {
-@@ -615,36 +520,6 @@ static struct board_info __initdata boar
- .has_phy = 1,
- .use_internal_phy = 1,
- },
--
-- .leds = {
-- {
-- .name = "adsl-fail",
-- .gpio = 2,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp",
-- .gpio = 3,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp-fail",
-- .gpio = 4,
-- .active_low = 1,
-- },
-- {
-- .name = "power",
-- .gpio = 0,
-- .active_low = 1,
-- .default_trigger = "default-on",
--
-- },
-- {
-- .name = "stop",
-- .gpio = 1,
-- .active_low = 1,
-- },
-- },
- };
-
- static struct board_info __initdata board_96348gw_10 = {
-@@ -679,35 +554,6 @@ static struct board_info __initdata boar
- .cs = 2,
- .ext_irq = 2,
- },
--
-- .leds = {
-- {
-- .name = "adsl-fail",
-- .gpio = 2,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp",
-- .gpio = 3,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp-fail",
-- .gpio = 4,
-- .active_low = 1,
-- },
-- {
-- .name = "power",
-- .gpio = 0,
-- .active_low = 1,
-- .default_trigger = "default-on",
-- },
-- {
-- .name = "stop",
-- .gpio = 1,
-- .active_low = 1,
-- },
-- },
- };
-
- static struct board_info __initdata board_96348gw_11 = {
-@@ -736,35 +582,6 @@ static struct board_info __initdata boar
- .has_ohci0 = 1,
- .has_pccard = 1,
- .has_ehci0 = 1,
--
-- .leds = {
-- {
-- .name = "adsl-fail",
-- .gpio = 2,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp",
-- .gpio = 3,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp-fail",
-- .gpio = 4,
-- .active_low = 1,
-- },
-- {
-- .name = "power",
-- .gpio = 0,
-- .active_low = 1,
-- .default_trigger = "default-on",
-- },
-- {
-- .name = "stop",
-- .gpio = 1,
-- .active_low = 1,
-- },
-- },
- };
-
-
-@@ -897,35 +714,6 @@ static struct board_info __initdata boar
- .ext_irq = 2,
- .cs = 2,
- },
--
-- .leds = {
-- {
-- .name = "adsl-fail",
-- .gpio = 2,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp",
-- .gpio = 3,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp-fail",
-- .gpio = 4,
-- .active_low = 1,
-- },
-- {
-- .name = "power",
-- .gpio = 0,
-- .active_low = 1,
-- .default_trigger = "default-on",
-- },
-- {
-- .name = "stop",
-- .gpio = 1,
-- .active_low = 1,
-- },
-- },
- };
-
- static struct board_info __initdata board_gw6200 = {
-@@ -1262,33 +1050,6 @@ static struct board_info __initdata boar
- .has_ohci0 = 1,
- .has_pccard = 1,
- .has_ehci0 = 1,
--
-- .leds = {
-- {
-- .name = "adsl-fail",
-- .gpio = 15,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp",
-- .gpio = 22,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp-fail",
-- .gpio = 23,
-- .active_low = 1,
-- },
-- {
-- .name = "power",
-- .gpio = 4,
-- .default_trigger = "default-on",
-- },
-- {
-- .name = "stop",
-- .gpio = 5,
-- },
-- },
- };
-
- static struct board_info __initdata board_96358vw2 = {
-@@ -1318,29 +1079,6 @@ static struct board_info __initdata boar
- .has_pccard = 1,
- .has_ehci0 = 1,
- .num_usbh_ports = 2,
--
-- .leds = {
-- {
-- .name = "adsl",
-- .gpio = 22,
-- .active_low = 1,
-- },
-- {
-- .name = "ppp-fail",
-- .gpio = 23,
-- },
-- {
-- .name = "power",
-- .gpio = 5,
-- .active_low = 1,
-- .default_trigger = "default-on",
-- },
-- {
-- .name = "stop",
-- .gpio = 4,
-- .active_low = 1,
-- },
-- },
- };
-
- static struct board_info __initdata board_CPVA642 = {
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -53,6 +53,56 @@ static struct board_info __initdata boar
+@@ -50,6 +50,55 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_3368 */
/*
+ .name = "96318REF",
+ .expected_cpu_id = 0x6318,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+
+ .has_usbd = 1,
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1579,6 +1629,9 @@ static const struct board_info __initcon
+@@ -1517,6 +1566,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_AR5381u,
-@@ -1656,6 +1709,9 @@ static struct of_device_id const bcm963x
+@@ -1594,6 +1646,9 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_3368
{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
#endif
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -100,6 +100,51 @@ static struct board_info __initdata boar
+@@ -96,6 +96,50 @@ static struct board_info __initdata boar
},
},
};
+ .name = "96318REF_P300",
+ .expected_cpu_id = 0x6318,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+
+ .has_usbd = 1,
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -1631,6 +1676,7 @@ static const struct board_info __initcon
+@@ -1568,6 +1612,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -1711,6 +1757,7 @@ static struct of_device_id const bcm963x
+@@ -1648,6 +1693,7 @@ static struct of_device_id const bcm963x
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1668,6 +1668,52 @@ static struct board_info __initdata boar
+@@ -1604,6 +1604,50 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_6368 */
/*
+ .name = "963269BHR",
+ .expected_cpu_id = 0x63268,
+
-+ .has_uart0 = 1,
-+
+ .has_pci = 1,
+
+ .has_ehci0 = 1,
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1748,6 +1794,9 @@ static const struct board_info __initcon
+@@ -1684,6 +1728,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif
};
static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1835,6 +1884,7 @@ static struct of_device_id const bcm963x
+@@ -1771,6 +1818,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -679,6 +679,22 @@ static struct board_info __initdata boar
+@@ -655,6 +655,21 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
+ .name = "AR1004G",
+ .expected_cpu_id = 0x6348,
+
-+ .has_uart0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+
/* BT Voyager 2110 */
static struct board_info __initdata board_V2110 = {
-@@ -1765,6 +1781,7 @@ static const struct board_info __initcon
+@@ -1699,6 +1714,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1829,6 +1846,7 @@ static struct of_device_id const bcm963x
+@@ -1763,6 +1779,7 @@ static struct of_device_id const bcm963x
{ .compatible = "dynalink,rta770w", .data = &board_rta770w, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6348
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1727,6 +1727,53 @@ static struct board_info __initdata boar
+@@ -1660,6 +1660,51 @@ static struct board_info __initdata boar
},
},
};
+ .name = "VW6339GU",
+ .expected_cpu_id = 0x63268,
+
-+ .has_uart0 = 1,
-+
+ .has_ehci0 = 1,
+ .has_ohci0 = 1,
+ .num_usbh_ports = 1,
#endif /* CONFIG_BCM63XX_CPU_63268 */
/*
-@@ -1813,6 +1860,7 @@ static const struct board_info __initcon
+@@ -1746,6 +1791,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,
#endif
};
-@@ -1903,6 +1951,7 @@ static struct of_device_id const bcm963x
+@@ -1836,6 +1882,7 @@ static struct of_device_id const bcm963x
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1687,6 +1687,66 @@ static struct board_info __initdata boar
+@@ -1622,6 +1622,64 @@ static struct board_info __initdata boar
* known 63268/63269 boards
*/
#ifdef CONFIG_BCM63XX_CPU_63268
+ .name = "963268BU_P300",
+ .expected_cpu_id = 0x63268,
+
-+ .has_uart0 = 1,
-+
+ .has_ehci0 = 1,
+ .has_ohci0 = 1,
+ .num_usbh_ports = 1,
static struct board_info __initdata board_963269bhr = {
.name = "963269BHR",
.expected_cpu_id = 0x63268,
-@@ -1859,6 +1919,7 @@ static const struct board_info __initcon
+@@ -1790,6 +1848,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,
&board_vw6339gu,
#endif
-@@ -1950,6 +2011,7 @@ static struct of_device_id const bcm963x
+@@ -1881,6 +1940,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
-@@ -1681,6 +1683,48 @@ static struct board_info __initdata boar
+@@ -1616,6 +1618,47 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
+ .name = "96369R-1231N",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
#endif /* CONFIG_BCM63XX_CPU_6368 */
/*
-@@ -1917,6 +1961,7 @@ static const struct board_info __initcon
+@@ -1846,6 +1889,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963268bu_p300,
-@@ -2009,6 +2054,7 @@ static struct of_device_id const bcm963x
+@@ -1938,6 +1982,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6368
{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1684,6 +1684,60 @@ static struct board_info __initdata boar
+@@ -1619,6 +1619,59 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
+ .name = "96368M-1541N",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
static struct sprom_fixup __initdata wap5813n_fixups[] = {
{ .offset = 97, .value = 0xfeed },
{ .offset = 98, .value = 0x15d1 },
-@@ -1961,6 +2015,7 @@ static const struct board_info __initcon
+@@ -1889,6 +1942,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
&board_WAP5813n,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2054,6 +2109,7 @@ static struct of_device_id const bcm963x
+@@ -1982,6 +2036,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6368
{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1738,6 +1738,60 @@ static struct board_info __initdata boar
+@@ -1672,6 +1672,59 @@ static struct board_info __initdata boar
},
};
+ .name = "96368M-1341N",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
static struct sprom_fixup __initdata wap5813n_fixups[] = {
{ .offset = 97, .value = 0xfeed },
{ .offset = 98, .value = 0x15d1 },
-@@ -2016,6 +2070,7 @@ static const struct board_info __initcon
+@@ -1943,6 +1996,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_VR3025u,
&board_WAP5813n,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2110,6 +2165,7 @@ static struct of_device_id const bcm963x
+@@ -2037,6 +2091,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1693,6 +1693,49 @@ static struct sprom_fixup __initdata vr3
+@@ -1628,6 +1628,48 @@ static struct sprom_fixup __initdata vr3
{ .offset = 115, .value = 0xfad9 },
};
+ .name = "P870HW-51a_v2",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
static struct board_info __initdata board_VR3025u = {
.name = "96368M-1541N",
.expected_cpu_id = 0x6368,
-@@ -2069,6 +2112,7 @@ static const struct board_info __initcon
+@@ -1995,6 +2037,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
&board_VR3025u,
&board_VR3025un,
&board_WAP5813n,
-@@ -2167,6 +2211,7 @@ static struct of_device_id const bcm963x
+@@ -2093,6 +2136,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1364,6 +1364,37 @@ static struct board_info __initdata boar
+@@ -1312,6 +1312,36 @@ static struct board_info __initdata boar
},
};
+ .name = "HW6358GW_B",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -2096,6 +2127,7 @@ static const struct board_info __initcon
+@@ -2021,6 +2051,7 @@ static const struct board_info __initcon
&board_nb4_ser_r0,
&board_nb4_fxc_r1,
&board_ct6373_1,
&board_HW553,
&board_HW556_A,
&board_HW556_B,
-@@ -2188,6 +2220,7 @@ static struct of_device_id const bcm963x
+@@ -2113,6 +2144,7 @@ static struct of_device_id const bcm963x
{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
{ .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -358,6 +358,50 @@ static struct board_info __initdata boar
+@@ -349,6 +349,49 @@ static struct board_info __initdata boar
},
};
+ .name = "96328dg2x2",
+ .expected_cpu_id = 0x6328,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
static struct board_info __initdata board_A4001N1 = {
.name = "963281T_TEF",
.expected_cpu_id = 0x6328,
-@@ -2078,6 +2122,7 @@ static const struct board_info __initcon
+@@ -2002,6 +2045,7 @@ static const struct board_info __initcon
&board_AR5381u,
&board_AR5387un,
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
&board_FAST2704V2,
-@@ -2166,6 +2211,7 @@ static struct of_device_id const bcm963x
+@@ -2090,6 +2134,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -147,6 +147,75 @@ static struct board_info __initdata boar
+@@ -142,6 +142,74 @@ static struct board_info __initdata boar
},
},
};
+ .name = "AW5200B",
+ .expected_cpu_id = 0x6318,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -2116,6 +2185,7 @@ static const struct board_info __initcon
+@@ -2039,6 +2107,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
&board_96318ref_p300,
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -2209,6 +2279,7 @@ static struct of_device_id const bcm963x
+@@ -2132,6 +2201,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6318
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1828,6 +1828,31 @@ static struct board_info __initdata boar
+@@ -1760,6 +1760,30 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
+ .name = "DGND3700v1_3800B",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 },
-@@ -2259,6 +2284,7 @@ static const struct board_info __initcon
+@@ -2181,6 +2205,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
-@@ -2361,6 +2387,7 @@ static struct of_device_id const bcm963x
+@@ -2283,6 +2308,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1477,6 +1477,32 @@ static struct board_info __initdata boar
+@@ -1423,6 +1423,31 @@ static struct board_info __initdata boar
},
};
+ .name = "HOMEHUB2A",
+ .expected_cpu_id = 0x6358,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
static struct board_info __initdata board_HW520 = {
.name = "HW6358GW_B",
.expected_cpu_id = 0x6358,
-@@ -2267,6 +2293,7 @@ static const struct board_info __initcon
+@@ -2188,6 +2213,7 @@ static const struct board_info __initcon
&board_nb4_ser_r0,
&board_nb4_fxc_r1,
&board_ct6373_1,
&board_HW520,
&board_HW553,
&board_HW556_A,
-@@ -2376,6 +2403,7 @@ static struct of_device_id const bcm963x
+@@ -2297,6 +2323,7 @@ static struct of_device_id const bcm963x
{ .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },
{ .compatible = "t-com,spw303v", .data = &board_spw303v, },
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1879,6 +1879,53 @@ static struct board_info __initdata boar
+@@ -1809,6 +1809,52 @@ static struct board_info __initdata boar
},
};
+ .name = "HW65x",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 },
-@@ -2312,6 +2359,7 @@ static const struct board_info __initcon
+@@ -2232,6 +2278,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
-@@ -2415,6 +2463,7 @@ static struct of_device_id const bcm963x
+@@ -2335,6 +2382,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -216,6 +216,46 @@ static struct board_info __initdata boar
+@@ -210,6 +210,45 @@ static struct board_info __initdata boar
.num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups),
},
};
+ .name = "F@ST2704N",
+ .expected_cpu_id = 0x6318,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
-@@ -2284,6 +2324,7 @@ static const struct board_info __initcon
+@@ -2203,6 +2242,7 @@ static const struct board_info __initcon
&board_96318ref,
&board_96318ref_p300,
&board_dsl_2751b_d1,
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-@@ -2381,6 +2422,7 @@ static struct of_device_id const bcm963x
+@@ -2300,6 +2340,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
{ .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2117,6 +2117,60 @@ static struct board_info __initdata boar
+@@ -2042,6 +2042,59 @@ static struct board_info __initdata boar
},
};
+ .name = "96368MT-1341N1",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
static struct sprom_fixup __initdata wap5813n_fixups[] = {
{ .offset = 97, .value = 0xfeed },
{ .offset = 98, .value = 0x15d1 },
-@@ -2404,6 +2458,7 @@ static const struct board_info __initcon
+@@ -2322,6 +2375,7 @@ static const struct board_info __initcon
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
&board_WAP5813n,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2504,6 +2559,7 @@ static struct of_device_id const bcm963x
+@@ -2422,6 +2476,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -638,6 +638,51 @@ static struct board_info __initdata boar
+@@ -623,6 +623,50 @@ static struct board_info __initdata boar
},
},
};
+ .name = "96328ang",
+ .expected_cpu_id = 0x6328,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+ .has_ohci0 = 1,
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
-@@ -2389,6 +2434,7 @@ static const struct board_info __initcon
+@@ -2306,6 +2350,7 @@ static const struct board_info __initcon
&board_A4001N1,
&board_dsl_274xb_f1,
&board_FAST2704V2,
#endif
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
-@@ -2487,6 +2533,7 @@ static struct of_device_id const bcm963x
+@@ -2404,6 +2449,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
{ .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2011,6 +2011,53 @@ static struct board_info __initdata boar
+@@ -1938,6 +1938,52 @@ static struct board_info __initdata boar
},
};
+ .name = "96368MVWG_hg622",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 },
-@@ -2500,6 +2547,7 @@ static const struct board_info __initcon
+@@ -2416,6 +2462,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
&board_HG655b,
&board_P870HW51A_V2,
&board_VR3025u,
-@@ -2608,6 +2656,7 @@ static struct of_device_id const bcm963x
+@@ -2524,6 +2571,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
{ .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, },
{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1964,6 +1964,43 @@ static struct board_info __initdata boar
+@@ -1892,6 +1892,42 @@ static struct board_info __initdata boar
},
};
+ .name = "96369PVG",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
static struct board_info __initdata board_HG655b = {
.name = "HW65x",
.expected_cpu_id = 0x6368,
-@@ -2547,6 +2584,7 @@ static const struct board_info __initcon
+@@ -2462,6 +2498,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
&board_HG622,
&board_HG655b,
&board_P870HW51A_V2,
-@@ -2659,6 +2697,7 @@ static struct of_device_id const bcm963x
+@@ -2574,6 +2611,7 @@ static struct of_device_id const bcm963x
{ .compatible = "huawei,hg622", .data = &board_HG622, },
{ .compatible = "huawei,hg655b", .data = &board_HG655b, },
{ .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1851,6 +1851,52 @@ static struct board_info __initdata boar
+@@ -1782,6 +1782,51 @@ static struct board_info __initdata boar
* known 6368 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6368
+ .name = "96368_Swiss_S1",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
static struct board_info __initdata board_96368mvwg = {
.name = "96368MVWG",
.expected_cpu_id = 0x6368,
-@@ -2581,6 +2627,7 @@ static const struct board_info __initcon
+@@ -2495,6 +2540,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
-@@ -2688,6 +2735,7 @@ static struct of_device_id const bcm963x
+@@ -2602,6 +2648,7 @@ static struct of_device_id const bcm963x
{ .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2346,6 +2346,45 @@ static struct board_info __initdata boar
+@@ -2266,6 +2266,44 @@ static struct board_info __initdata boar
},
};
+ .name = "VH4032N",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
static struct sprom_fixup __initdata wap5813n_fixups[] = {
{ .offset = 97, .value = 0xfeed },
{ .offset = 98, .value = 0x15d1 },
-@@ -2635,6 +2674,7 @@ static const struct board_info __initcon
+@@ -2548,6 +2586,7 @@ static const struct board_info __initcon
&board_HG622,
&board_HG655b,
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
&board_VR3026e,
-@@ -2746,6 +2786,7 @@ static struct of_device_id const bcm963x
+@@ -2659,6 +2698,7 @@ static struct of_device_id const bcm963x
{ .compatible = "huawei,hg655b", .data = &board_HG655b, },
{ .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, },
{ .compatible = "netgear,evg2000", .data = &board_EVG2000, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2193,6 +2193,31 @@ static struct board_info __initdata boar
+@@ -2116,6 +2116,29 @@ static struct board_info __initdata boar
},
};
+ .name = "R1000H",
+ .expected_cpu_id = 0x6368,
+
-+ .has_uart0 = 1,
-+ .has_uart1 = 1,
+ .has_pci = 1,
+ .has_ohci0 = 1,
+ .has_ehci0 = 1,
static struct board_info __initdata board_VR3025u = {
.name = "96368M-1541N",
.expected_cpu_id = 0x6368,
-@@ -2674,6 +2699,7 @@ static const struct board_info __initcon
+@@ -2586,6 +2609,7 @@ static const struct board_info __initcon
&board_HG622,
&board_HG655b,
&board_P870HW51A_V2,
&board_VH4032N,
&board_VR3025u,
&board_VR3025un,
-@@ -2775,6 +2801,7 @@ static struct of_device_id const bcm963x
+@@ -2687,6 +2711,7 @@ static struct of_device_id const bcm963x
{ .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -148,6 +148,68 @@ static struct board_info __initdata boar
+@@ -143,6 +143,67 @@ static struct board_info __initdata boar
},
};
+ .name = "96318A-1441N1",
+ .expected_cpu_id = 0x6318,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+
static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = {
{ .offset = 96, .value = 0x2046 },
{ .offset = 97, .value = 0xfe9d },
-@@ -2616,6 +2678,7 @@ static const struct board_info __initcon
+@@ -2526,6 +2587,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
&board_96318ref_p300,
&board_dsl_2751b_d1,
&board_FAST2704N,
#endif
-@@ -2721,6 +2784,7 @@ static struct of_device_id const bcm963x
+@@ -2631,6 +2693,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6318
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -366,6 +366,74 @@ static struct board_info __initdata boar
+@@ -357,6 +357,73 @@ static struct board_info __initdata boar
},
};
+ .name = "96328avngr",
+ .expected_cpu_id = 0x6328,
+
-+ .has_uart0 = 1,
+ .has_pci = 1,
+ .use_fallback_sprom = 1,
+
static struct sprom_fixup __initdata ar5381u_fixups[] = {
{ .offset = 97, .value = 0xfee5 },
{ .offset = 98, .value = 0x157c },
-@@ -2684,6 +2752,7 @@ static const struct board_info __initcon
+@@ -2593,6 +2660,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_AR5381u,
&board_AR5387un,
&board_963281TAN,
-@@ -2798,6 +2867,7 @@ static struct of_device_id const bcm963x
+@@ -2707,6 +2775,7 @@ static struct of_device_id const bcm963x
{ .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, },
{ .compatible = "nucom,r5010unv2", .data = &board_R5010UNV2, },
{ .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, },
projects / openwrt / staging / lynxis.git / commitdiff