mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 22:44:27 -05:00 
			
		
		
		
	brcm63xx: register serial through device tree
Register serial consoles through device tree instead of through board data. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
This commit is contained in:
		
							parent
							
								
									a3384088a2
								
							
						
					
					
						commit
						aba4e29ead
					
				@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -111,3 +112,7 @@
 | 
			
		||||
		reg = <0x7f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -111,3 +112,7 @@
 | 
			
		||||
		reg = <0xfe0000 0x020000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -111,3 +112,7 @@
 | 
			
		||||
		reg = <0x7f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -90,3 +91,7 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -118,3 +119,7 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -134,3 +135,7 @@
 | 
			
		||||
		linux,part-probe = "bcm63xxpart";
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -115,3 +116,7 @@
 | 
			
		||||
		reg = <0xfe0000 0x020000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -104,3 +105,7 @@
 | 
			
		||||
	pinctrl-0 = <&pinctrl_ephy0_act_led &pinctrl_ephy1_act_led
 | 
			
		||||
		     &pinctrl_ephy2_act_led &pinctrl_ephy3_act_led>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -77,3 +78,7 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -85,3 +86,7 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -71,3 +72,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_ext_mii &pinctrl_pci>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -11,6 +11,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -88,3 +89,7 @@
 | 
			
		||||
		reg = <0xfe0000 0x020000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -73,3 +74,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_usb_pwron>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -79,3 +80,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_usb_pwron>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -49,3 +50,7 @@
 | 
			
		||||
		linux,part-probe = "bcm63xxpart";
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -57,3 +58,7 @@
 | 
			
		||||
		linux,part-probe = "bcm63xxpart";
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -59,3 +60,7 @@
 | 
			
		||||
		linux,part-probe = "bcm63xxpart";
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -64,3 +65,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_usb_port1_device>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -44,3 +45,7 @@
 | 
			
		||||
 | 
			
		||||
	linux,part-probe = "bcm63xxpart";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -44,3 +45,7 @@
 | 
			
		||||
 | 
			
		||||
	linux,part-probe = "bcm63xxpart";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -18,3 +19,7 @@
 | 
			
		||||
 | 
			
		||||
	linux,part-probe = "bcm63xxpart";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -63,3 +64,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -63,3 +64,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -63,3 +64,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -49,3 +50,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -44,3 +45,7 @@
 | 
			
		||||
 | 
			
		||||
	linux,part-probe = "bcm63xxpart";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -40,3 +41,7 @@
 | 
			
		||||
 | 
			
		||||
	linux,part-probe = "bcm63xxpart";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -49,3 +50,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -49,3 +50,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -67,3 +68,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -99,3 +100,7 @@
 | 
			
		||||
		reg = <0x7f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -81,3 +82,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -97,3 +98,7 @@
 | 
			
		||||
		reg = <0x7f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -67,3 +68,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -44,3 +45,11 @@
 | 
			
		||||
		reg = <0x3f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart1 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -75,3 +76,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -79,3 +80,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -169,3 +170,7 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -75,3 +76,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -54,3 +55,7 @@
 | 
			
		||||
		reg = <0x3f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -56,3 +57,7 @@
 | 
			
		||||
		reg = <0x7f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -74,3 +75,7 @@
 | 
			
		||||
		reg = <0x3f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -105,3 +106,7 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -119,3 +120,7 @@
 | 
			
		||||
	pinctrl-0 = <&pinctrl_ephy0_act_led &pinctrl_ephy1_act_led
 | 
			
		||||
		     &pinctrl_ephy2_act_led &pinctrl_ephy3_act_led>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -39,3 +40,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -74,3 +75,7 @@
 | 
			
		||||
		reg = <0x7f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -110,3 +111,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -79,3 +80,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -39,3 +40,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -94,3 +95,7 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -75,3 +76,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -119,3 +120,7 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -103,3 +104,7 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -53,3 +54,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -74,3 +75,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -57,3 +58,7 @@
 | 
			
		||||
		reg = <0x3f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -96,3 +97,7 @@
 | 
			
		||||
		reg = <0xfe0000 0x020000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -128,3 +129,7 @@
 | 
			
		||||
		reg = <0xfe0000 0x020000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -128,3 +129,7 @@
 | 
			
		||||
		reg = <0xfe0000 0x020000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -123,3 +124,7 @@
 | 
			
		||||
		reg = <0xfe0000 0x020000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -84,3 +85,7 @@
 | 
			
		||||
		     &pinctrl_pci_intb &pinctrl_pci_gnt1
 | 
			
		||||
		     &pinctrl_pci_req1>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -105,3 +106,7 @@
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ephy0_led &pinctrl_ephy1_led
 | 
			
		||||
		     &pinctrl_ephy2_led &pinctrl_ephy3_led>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -155,3 +156,7 @@
 | 
			
		||||
		reg = <0xfe0000 0x020000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -75,3 +76,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -79,3 +80,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -103,3 +104,7 @@
 | 
			
		||||
 | 
			
		||||
	linux,part-probe = "bcm63xxpart";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -103,3 +104,7 @@
 | 
			
		||||
 | 
			
		||||
	linux,part-probe = "bcm63xxpart";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -82,3 +83,7 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -84,3 +85,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -91,3 +92,11 @@
 | 
			
		||||
		reg = <0x1fe0000 0x20000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart1 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	
 | 
			
		||||
@ -99,3 +100,7 @@
 | 
			
		||||
		};
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -56,3 +57,7 @@
 | 
			
		||||
		reg = <0xfe0000 0x020000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -39,3 +40,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -56,3 +57,7 @@
 | 
			
		||||
		reg = <0x3f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -72,3 +73,7 @@
 | 
			
		||||
		reg = <0x3f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -72,3 +73,7 @@
 | 
			
		||||
		reg = <0x3f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -83,3 +84,7 @@
 | 
			
		||||
		reg = <0x7f0000 0x010000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -79,3 +80,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -79,3 +80,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii &pinctrl_mii_pccard>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-leds {
 | 
			
		||||
@ -52,3 +53,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -78,3 +79,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -78,3 +79,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ext_mii>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -49,3 +50,7 @@
 | 
			
		||||
		linux,part-probe = "bcm63xxpart";
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -100,3 +101,7 @@
 | 
			
		||||
		reg = <0x1fe0000 0x020000>;
 | 
			
		||||
	};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -80,3 +81,7 @@
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ephy0_led &pinctrl_ephy1_led
 | 
			
		||||
		     &pinctrl_ephy2_led &pinctrl_ephy3_led>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -80,3 +81,7 @@
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ephy0_led &pinctrl_ephy1_led
 | 
			
		||||
		     &pinctrl_ephy2_led &pinctrl_ephy3_led>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -80,3 +81,7 @@
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci &pinctrl_ephy0_led &pinctrl_ephy1_led
 | 
			
		||||
		     &pinctrl_ephy2_led &pinctrl_ephy3_led>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -10,6 +10,7 @@
 | 
			
		||||
 | 
			
		||||
	chosen {
 | 
			
		||||
		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
			
		||||
		stdout-path = "serial0:115200n8";
 | 
			
		||||
	};
 | 
			
		||||
 | 
			
		||||
	gpio-keys-polled {
 | 
			
		||||
@ -141,3 +142,7 @@
 | 
			
		||||
	pinctrl-names = "default";
 | 
			
		||||
	pinctrl-0 = <&pinctrl_pci>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
&uart0 {
 | 
			
		||||
	status = "ok";
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -0,0 +1,37 @@
 | 
			
		||||
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;
 | 
			
		||||
@ -15,7 +15,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 | 
			
		||||
 | 
			
		||||
--- 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) :
 | 
			
		||||
 | 
			
		||||
@ -40,7 +40,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 | 
			
		||||
 	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;
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
@ -33,3 +33,138 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 | 
			
		||||
 	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 */
 | 
			
		||||
 | 
			
		||||
@ -0,0 +1,257 @@
 | 
			
		||||
--- 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,
 | 
			
		||||
@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 | 
			
		||||
 | 
			
		||||
--- 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
 | 
			
		||||
@@ -43,14 +43,6 @@ static struct board_info __initdata boar
 | 
			
		||||
 		.use_internal_phy	= 1,
 | 
			
		||||
 	},
 | 
			
		||||
 
 | 
			
		||||
@ -24,10 +24,11 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 | 
			
		||||
 	.ephy_reset_gpio		= 36,
 | 
			
		||||
 	.ephy_reset_gpio_flags		= GPIO_ACTIVE_LOW,
 | 
			
		||||
 };
 | 
			
		||||
@@ -78,35 +70,6 @@ static struct board_info __initdata boar
 | 
			
		||||
@@ -72,35 +64,6 @@ static struct board_info __initdata boar
 | 
			
		||||
 		.use_fullspeed		= 0,
 | 
			
		||||
 		.port_no		= 0,
 | 
			
		||||
 	},
 | 
			
		||||
 
 | 
			
		||||
-
 | 
			
		||||
-	.leds = {
 | 
			
		||||
-		{
 | 
			
		||||
-			.name		= "96328avng::ppp-fail",
 | 
			
		||||
@ -56,11 +57,10 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 | 
			
		||||
-			.active_low	= 1,
 | 
			
		||||
-		},
 | 
			
		||||
-	},
 | 
			
		||||
-
 | 
			
		||||
 	.has_enetsw			= 1,
 | 
			
		||||
 };
 | 
			
		||||
 #endif
 | 
			
		||||
 
 | 
			
		||||
 	.enetsw = {
 | 
			
		||||
@@ -445,35 +408,6 @@ static struct board_info __initdata boar
 | 
			
		||||
@@ -119,35 +82,6 @@ static struct board_info __initdata boar
 | 
			
		||||
 	},
 | 
			
		||||
 
 | 
			
		||||
 	.has_ohci0			= 1,
 | 
			
		||||
@ -96,7 +96,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
 static struct board_info __initdata board_96338w = {
 | 
			
		||||
@@ -488,35 +422,6 @@ static struct board_info __initdata boar
 | 
			
		||||
@@ -159,35 +93,6 @@ static struct board_info __initdata boar
 | 
			
		||||
 		.force_speed_100	= 1,
 | 
			
		||||
 		.force_duplex_full	= 1,
 | 
			
		||||
 	},
 | 
			
		||||
@ -130,9 +130,9 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 | 
			
		||||
-		},
 | 
			
		||||
-	},
 | 
			
		||||
 };
 | 
			
		||||
 #endif
 | 
			
		||||
 
 | 
			
		||||
 static struct board_info __initdata board_96338w2_e7t = {
 | 
			
		||||
@@ -615,36 +520,6 @@ static struct board_info __initdata boar
 | 
			
		||||
@@ -217,36 +122,6 @@ static struct board_info __initdata boar
 | 
			
		||||
 		.has_phy		= 1,
 | 
			
		||||
 		.use_internal_phy	= 1,
 | 
			
		||||
 	},
 | 
			
		||||
@ -169,7 +169,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
 static struct board_info __initdata board_96348gw_10 = {
 | 
			
		||||
@@ -679,35 +554,6 @@ static struct board_info __initdata boar
 | 
			
		||||
@@ -278,35 +153,6 @@ static struct board_info __initdata boar
 | 
			
		||||
 		.cs			= 2,
 | 
			
		||||
 		.ext_irq		= 2,
 | 
			
		||||
 	},
 | 
			
		||||
@ -205,7 +205,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
 static struct board_info __initdata board_96348gw_11 = {
 | 
			
		||||
@@ -736,35 +582,6 @@ static struct board_info __initdata boar
 | 
			
		||||
@@ -332,35 +178,6 @@ static struct board_info __initdata boar
 | 
			
		||||
 	.has_ohci0 = 1,
 | 
			
		||||
 	.has_pccard = 1,
 | 
			
		||||
 	.has_ehci0 = 1,
 | 
			
		||||
@ -240,8 +240,8 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 | 
			
		||||
-	},
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -897,35 +714,6 @@ static struct board_info __initdata boar
 | 
			
		||||
 static struct board_info __initdata board_96348gw = {
 | 
			
		||||
@@ -390,35 +207,6 @@ static struct board_info __initdata boar
 | 
			
		||||
 		.ext_irq		= 2,
 | 
			
		||||
 		.cs			= 2,
 | 
			
		||||
 	},
 | 
			
		||||
@ -276,8 +276,8 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 | 
			
		||||
-	},
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
 static struct board_info __initdata board_gw6200 = {
 | 
			
		||||
@@ -1262,33 +1050,6 @@ static struct board_info __initdata boar
 | 
			
		||||
 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,
 | 
			
		||||
@ -311,7 +311,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
 static struct board_info __initdata board_96358vw2 = {
 | 
			
		||||
@@ -1318,29 +1079,6 @@ static struct board_info __initdata boar
 | 
			
		||||
@@ -587,29 +348,6 @@ static struct board_info __initdata boar
 | 
			
		||||
 	.has_pccard = 1,
 | 
			
		||||
 	.has_ehci0 = 1,
 | 
			
		||||
 	.num_usbh_ports			= 2,
 | 
			
		||||
@ -340,4 +340,4 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 | 
			
		||||
-	},
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
 static struct board_info __initdata board_CPVA642 = {
 | 
			
		||||
 static struct board_info __initdata board_AGPFS0 = {
 | 
			
		||||
@ -1,6 +1,6 @@
 | 
			
		||||
--- 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;
 | 
			
		||||
 | 
			
		||||
@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 | 
			
		||||
 | 
			
		||||
--- 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>
 | 
			
		||||
@ -21,11 +21,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 | 
			
		||||
 
 | 
			
		||||
 #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;
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
@ -67,7 +63,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 | 
			
		||||
 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 */
 | 
			
		||||
@ -83,7 +79,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 | 
			
		||||
 		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);
 | 
			
		||||
@ -104,7 +100,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 | 
			
		||||
 		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);
 | 
			
		||||
@ -116,7 +112,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 | 
			
		||||
 		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)
 | 
			
		||||
 {
 | 
			
		||||
@ -124,7 +120,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 | 
			
		||||
 	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:
 | 
			
		||||
 | 
			
		||||
@ -10,7 +10,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
 | 
			
		||||
 | 
			
		||||
--- 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>
 | 
			
		||||
@ -18,7 +18,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
 | 
			
		||||
 
 | 
			
		||||
 #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;
 | 
			
		||||
@ -26,7 +26,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
 | 
			
		||||
 
 | 
			
		||||
 #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);
 | 
			
		||||
 	}
 | 
			
		||||
 
 | 
			
		||||
@ -59,9 +59,9 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
 | 
			
		||||
 /*
 | 
			
		||||
  * 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;
 | 
			
		||||
+
 | 
			
		||||
 | 
			
		||||
@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 | 
			
		||||
 | 
			
		||||
--- 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;
 | 
			
		||||
 	}
 | 
			
		||||
 }
 | 
			
		||||
 | 
			
		||||
@ -15,7 +15,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices
 | 
			
		||||
+++ 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
 | 
			
		||||
@ -24,7 +24,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices
 | 
			
		||||
 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.
 | 
			
		||||
+ *
 | 
			
		||||
@ -52,7 +52,6 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices
 | 
			
		||||
+#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))
 | 
			
		||||
 | 
			
		||||
@ -21,7 +21,7 @@
 | 
			
		||||
 /*
 | 
			
		||||
--- 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);
 | 
			
		||||
 
 | 
			
		||||
@ -39,7 +39,7 @@
 | 
			
		||||
 		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++)
 | 
			
		||||
 | 
			
		||||
Some files were not shown because too many files have changed in this diff Show More
		Loading…
	
		Reference in New Issue
	
	Block a user