Merge branch 'devicetree/next-console' into devicetree/next (b775e642) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm/boot/dts/versatile-ab.dts

+4 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,10 @@
		i2c0 = &i2c0;
		};

		chosen {
		stdout-path = &uart0;
		};

		memory {
		reg = <0x0 0x08000000>;
		};

arch/powerpc/platforms/powermac/feature.c

+5 −15

Original line number	Diff line number	Diff line
		@@ -2805,25 +2805,20 @@ set_initial_features(void)
		/* Enable GMAC for now for PCI probing. It will be disabled
		* later on after PCI probe
		*/
		np = of_find_node_by_name(NULL, "ethernet");
		while(np) {
		for_each_node_by_name(np, "ethernet")
		if (of_device_is_compatible(np, "K2-GMAC"))
		g5_gmac_enable(np, 0, 1);
		np = of_find_node_by_name(np, "ethernet");
		}

		/* Enable FW before PCI probe. Will be disabled later on
		* Note: We should have a batter way to check that we are
		* dealing with uninorth internal cell and not a PCI cell
		* on the external PCI. The code below works though.
		*/
		np = of_find_node_by_name(NULL, "firewire");
		while(np) {
		for_each_node_by_name(np, "firewire") {
		if (of_device_is_compatible(np, "pci106b,5811")) {
		macio_chips[0].flags \|= MACIO_FLAG_FW_SUPPORTED;
		g5_fw_enable(np, 0, 1);
		}
		np = of_find_node_by_name(np, "firewire");
		}
		}
		#else /* CONFIG_POWER4 */
		@@ -2834,13 +2829,11 @@ set_initial_features(void)
		/* Enable GMAC for now for PCI probing. It will be disabled
		* later on after PCI probe
		*/
		np = of_find_node_by_name(NULL, "ethernet");
		while(np) {
		for_each_node_by_name(np, "ethernet") {
		if (np->parent
		&& of_device_is_compatible(np->parent, "uni-north")
		&& of_device_is_compatible(np, "gmac"))
		core99_gmac_enable(np, 0, 1);
		np = of_find_node_by_name(np, "ethernet");
		}

		/* Enable FW before PCI probe. Will be disabled later on
		@@ -2848,8 +2841,7 @@ set_initial_features(void)
		* dealing with uninorth internal cell and not a PCI cell
		* on the external PCI. The code below works though.
		*/
		np = of_find_node_by_name(NULL, "firewire");
		while(np) {
		for_each_node_by_name(np, "firewire") {
		if (np->parent
		&& of_device_is_compatible(np->parent, "uni-north")
		&& (of_device_is_compatible(np, "pci106b,18") \|\|
		@@ -2858,18 +2850,16 @@ set_initial_features(void)
		macio_chips[0].flags \|= MACIO_FLAG_FW_SUPPORTED;
		core99_firewire_enable(np, 0, 1);
		}
		np = of_find_node_by_name(np, "firewire");
		}

		/* Enable ATA-100 before PCI probe. */
		np = of_find_node_by_name(NULL, "ata-6");
		while(np) {
		for_each_node_by_name(np, "ata-6") {
		if (np->parent
		&& of_device_is_compatible(np->parent, "uni-north")
		&& of_device_is_compatible(np, "kauai-ata")) {
		core99_ata100_enable(np, 1);
		}
		np = of_find_node_by_name(np, "ata-6");
		}

		/* Switch airport off */

arch/powerpc/platforms/powermac/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -698,7 +698,7 @@ static void __init fixup_nec_usb2(void)
		{
		struct device_node *nec;

		for (nec = NULL; (nec = of_find_node_by_name(nec, "usb")) != NULL;) {
		for_each_node_by_name(nec, "usb") {
		struct pci_controller *hose;
		u32 data;
		const u32 *prop;

arch/powerpc/platforms/powermac/smp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -577,7 +577,7 @@ static void __init smp_core99_setup_i2c_hwsync(int ncpus)
		int ok;

		/* Look for the clock chip */
		while ((cc = of_find_node_by_name(cc, "i2c-hwclock")) != NULL) {
		for_each_node_by_name(cc, "i2c-hwclock") {
		p = of_get_parent(cc);
		ok = p && of_device_is_compatible(p, "uni-n-i2c");
		of_node_put(p);

arch/powerpc/platforms/powermac/udbg_adb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@ int __init udbg_adb_init(int force_btext)
		* of type "adb". If not, we return a failure, but we keep the
		* bext output set for now
		*/
		for (np = NULL; (np = of_find_node_by_name(np, "keyboard")) != NULL;) {
		for_each_node_by_name(np, "keyboard") {
		struct device_node *parent = of_get_parent(np);
		int found = (parent && strcmp(parent->type, "adb") == 0);
		of_node_put(parent);