mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	Boards based on imx23 have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx23.dtsi file. Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts. Reported-by: Rob Herring <robh@kernel.org> Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
		
			
				
	
	
		
			180 lines
		
	
	
	
		
			4.5 KiB
		
	
	
	
		
			Text
		
	
	
	
	
	
			
		
		
	
	
			180 lines
		
	
	
	
		
			4.5 KiB
		
	
	
	
		
			Text
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (C) 2013-2016 Marek Vasut <marek.vasut@gmail.com>
 | 
						|
 *
 | 
						|
 * This file is dual-licensed: you can use it either under the terms
 | 
						|
 * of the GPL or the X11 license, at your option. Note that this dual
 | 
						|
 * licensing only applies to this file, and not this project as a
 | 
						|
 * whole.
 | 
						|
 *
 | 
						|
 *  a) This file is free software; you can redistribute it and/or
 | 
						|
 *     modify it under the terms of the GNU General Public License as
 | 
						|
 *     published by the Free Software Foundation; either version 2 of
 | 
						|
 *     the License, or (at your option) any later version.
 | 
						|
 *
 | 
						|
 *     This file is distributed in the hope that it will be useful,
 | 
						|
 *     but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 *     GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 * Or, alternatively,
 | 
						|
 *
 | 
						|
 *  b) Permission is hereby granted, free of charge, to any person
 | 
						|
 *     obtaining a copy of this software and associated documentation
 | 
						|
 *     files (the "Software"), to deal in the Software without
 | 
						|
 *     restriction, including without limitation the rights to use,
 | 
						|
 *     copy, modify, merge, publish, distribute, sublicense, and/or
 | 
						|
 *     sell copies of the Software, and to permit persons to whom the
 | 
						|
 *     Software is furnished to do so, subject to the following
 | 
						|
 *     conditions:
 | 
						|
 *
 | 
						|
 *     The above copyright notice and this permission notice shall be
 | 
						|
 *     included in all copies or substantial portions of the Software.
 | 
						|
 *
 | 
						|
 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 | 
						|
 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 | 
						|
 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 | 
						|
 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 | 
						|
 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 | 
						|
 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 | 
						|
 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 | 
						|
 *     OTHER DEALINGS IN THE SOFTWARE.
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
/dts-v1/;
 | 
						|
#include "imx23.dtsi"
 | 
						|
 | 
						|
/ {
 | 
						|
	model = "Creative ZEN X-Fi3";
 | 
						|
	compatible = "creative,x-fi3", "fsl,imx23";
 | 
						|
 | 
						|
	memory@40000000 {
 | 
						|
		device_type = "memory";
 | 
						|
		reg = <0x40000000 0x04000000>;
 | 
						|
	};
 | 
						|
 | 
						|
	apb@80000000 {
 | 
						|
		apbh@80000000 {
 | 
						|
			ssp0: spi@80010000 {
 | 
						|
				compatible = "fsl,imx23-mmc";
 | 
						|
				pinctrl-names = "default";
 | 
						|
				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;
 | 
						|
				bus-width = <4>;
 | 
						|
				vmmc-supply = <®_vddio_sd0>;
 | 
						|
				cd-inverted;
 | 
						|
				status = "okay";
 | 
						|
			};
 | 
						|
 | 
						|
			ssp1: spi@80034000 {
 | 
						|
				compatible = "fsl,imx23-mmc";
 | 
						|
				pinctrl-names = "default";
 | 
						|
				pinctrl-0 = <&mmc1_4bit_pins_a>;
 | 
						|
				bus-width = <4>;
 | 
						|
				non-removable;
 | 
						|
				status = "okay";
 | 
						|
			};
 | 
						|
 | 
						|
			pinctrl@80018000 {
 | 
						|
				pinctrl-names = "default";
 | 
						|
				pinctrl-0 = <&hog_pins_a>;
 | 
						|
 | 
						|
				hog_pins_a: hog@0 {
 | 
						|
					reg = <0>;
 | 
						|
					fsl,pinmux-ids = <
 | 
						|
						MX23_PAD_GPMI_D07__GPIO_0_7
 | 
						|
					>;
 | 
						|
					fsl,drive-strength = <0>;
 | 
						|
					fsl,voltage = <1>;
 | 
						|
					fsl,pull-up = <0>;
 | 
						|
				};
 | 
						|
 | 
						|
				key_pins_a: keys@0 {
 | 
						|
					reg = <0>;
 | 
						|
					fsl,pinmux-ids = <
 | 
						|
						MX23_PAD_ROTARYA__GPIO_2_7
 | 
						|
						MX23_PAD_ROTARYB__GPIO_2_8
 | 
						|
					>;
 | 
						|
					fsl,drive-strength = <0>;
 | 
						|
					fsl,voltage = <1>;
 | 
						|
					fsl,pull-up = <1>;
 | 
						|
				};
 | 
						|
			};
 | 
						|
		};
 | 
						|
 | 
						|
		apbx@80040000 {
 | 
						|
			i2c: i2c@80058000 {
 | 
						|
				pinctrl-names = "default";
 | 
						|
				pinctrl-0 = <&i2c_pins_a>;
 | 
						|
				status = "okay";
 | 
						|
			};
 | 
						|
 | 
						|
			pwm: pwm@80064000 {
 | 
						|
				pinctrl-names = "default";
 | 
						|
				pinctrl-0 = <&pwm2_pins_a>;
 | 
						|
				status = "okay";
 | 
						|
			};
 | 
						|
 | 
						|
			duart: serial@80070000 {
 | 
						|
				pinctrl-names = "default";
 | 
						|
				pinctrl-0 = <&duart_pins_a>;
 | 
						|
				status = "okay";
 | 
						|
			};
 | 
						|
 | 
						|
			auart1: serial@8006e000 {
 | 
						|
				pinctrl-names = "default";
 | 
						|
				pinctrl-0 = <&auart1_2pins_a>;
 | 
						|
				status = "okay";
 | 
						|
			};
 | 
						|
 | 
						|
			usbphy0: usbphy@8007c000 {
 | 
						|
				status = "okay";
 | 
						|
			};
 | 
						|
 | 
						|
			lradc@80050000 {
 | 
						|
				status = "okay";
 | 
						|
			};
 | 
						|
		};
 | 
						|
	};
 | 
						|
 | 
						|
	ahb@80080000 {
 | 
						|
		usb0: usb@80080000 {
 | 
						|
			dr_mode = "peripheral";
 | 
						|
			status = "okay";
 | 
						|
		};
 | 
						|
	};
 | 
						|
 | 
						|
	reg_vddio_sd0: regulator-vddio-sd0 {
 | 
						|
		compatible = "regulator-fixed";
 | 
						|
		regulator-name = "vddio-sd0";
 | 
						|
		regulator-min-microvolt = <3300000>;
 | 
						|
		regulator-max-microvolt = <3300000>;
 | 
						|
		gpio = <&gpio0 7 0>;
 | 
						|
	};
 | 
						|
 | 
						|
	backlight {
 | 
						|
		compatible = "pwm-backlight";
 | 
						|
		pwms = <&pwm 2 5000000>;
 | 
						|
		brightness-levels = <0 4 8 16 32 64 128 255>;
 | 
						|
		default-brightness-level = <6>;
 | 
						|
	};
 | 
						|
 | 
						|
	gpio_keys {
 | 
						|
		compatible = "gpio-keys";
 | 
						|
		pinctrl-names = "default";
 | 
						|
		pinctrl-0 = <&key_pins_a>;
 | 
						|
 | 
						|
		voldown {
 | 
						|
			label = "volume-down";
 | 
						|
			linux,code = <114>;
 | 
						|
			gpios = <&gpio2 7 0>;
 | 
						|
			debounce-interval = <20>;
 | 
						|
		};
 | 
						|
 | 
						|
		volup {
 | 
						|
			label = "volume-up";
 | 
						|
			linux,code = <115>;
 | 
						|
			gpios = <&gpio2 8 0>;
 | 
						|
			debounce-interval = <20>;
 | 
						|
		};
 | 
						|
	};
 | 
						|
};
 |