Skip to content

Commit

Permalink
Merge pull request #2 from avifishman/Poleg-4.10.15
Browse files Browse the repository at this point in the history 
Poleg 4.10.15
  • Loading branch information
@tmaimon
tmaimon authored Jun 28, 2017
2 parents 88f9b75 + 8a74e86 commit 1bd32f9
Show file tree
Hide file tree
Showing 15 changed files with 5,515 additions and 3,718 deletions.
80 changes: 61 additions & 19 deletions arch/arm/boot/dts/npcm750.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,22 @@
udc9 = &udc9;
emmc1 = &sdhci1;
emmc0 = &sdhci0;
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c3 = &i2c3;
i2c4 = &i2c4;
i2c5 = &i2c5;
i2c6 = &i2c6;
i2c7 = &i2c7;
i2c8 = &i2c8;
i2c9 = &i2c9;
i2c10 = &i2c10;
i2c11 = &i2c11;
i2c12 = &i2c12;
i2c13 = &i2c13;
i2c14 = &i2c14;
i2c15 = &i2c15;
};

memory {
Expand Down Expand Up @@ -196,7 +212,33 @@
otp:otp@f0189000 {
status = "okay";
};

i2c1: i2c-bus@f0081000 {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";

lm75@48 {
compatible = "lm75";
reg = <0x48>;
status = "okay";
};
};

i2c2: i2c-bus@f0082000 {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";

tmp100@48 {
compatible = "tmp100";
reg = <0x48>;
status = "okay";
};
};
};



planar@01 {
SVB {
Expand All @@ -209,35 +251,35 @@
&gpio1_pins
&gpio2o_pins
&gpio3_pins
&smb1d_pins
&smb2d_pins
/*&smb1d_pins
&smb2d_pins*/
&gpio8_pins
&gpio9o_pins
&gpio10_pins
&gpio11o_pins
&smb5b_pins
&smb5c_pins
/*&smb5b_pins
&smb5c_pins*/
&gpio16_pins
&gpio17_pins
&smb4b_pins
/*&smb4b_pins
&smb4c_pins
&smb4d_pins
&smb4d_pins*/
&gpio24o_pins
&gpio25ol_pins
&smb5_pins
/*&smb5_pins
&smb4_pins
&smb3_pins
&smb3_pins*/
&gpio32o_pins
&spi0quad_pins
&smb3c_pins
&smb3b_pins
/*&smb3c_pins
&smb3b_pins*/
/*&gpio41_pins
&gpio42_pins*/
&jtag2_pins
/*&r1err_pins
&gpio57_pins
&gpio58_pins*/
&smb3d_pins
/*smb3d_pins*/
&gpio61o_pins
&gpio62o_pins
&gpio63o_pins
Expand All @@ -261,16 +303,16 @@
&gpio81_pins
&gpio82_pins
&gpio83_pins
&smb5d_pins
/*&smb5d_pins*/
&lpc_pins
&smb0_pins
/*&smb0_pins
&smb1_pins
&smb2_pins
&smb2c_pins
&smb2b_pins
&smb1c_pins
&smb1b_pins
&smb8_pins
&smb8_pins*/
&gpio132o_pins
&gpio133_pins
&gpio134_pins
Expand All @@ -286,8 +328,8 @@
&gpio168_pins
&gpio169_pins
&gpio170_pins
&smb6_pins
&smb7_pins
/*&smb6_pins
&smb7_pins*/
&gpio175_pins
&gpio176_pins
&gpio177o_pins
Expand All @@ -297,10 +339,10 @@
&gpio190_pins
&gpio191o_pins
&gpio192o_pins
&smb0b_pins
&smb0c_pins
/*&smb0b_pins
&smb0c_pins*/
&gpio197ol_pins
&smb0d_pins
/*&smb0d_pins*/
/*&gpio200_pins*/
&gpio203o_pins
&ddc_pins
Expand Down
187 changes: 176 additions & 11 deletions arch/arm/boot/dts/npcmx50.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,17 +449,6 @@
clock-names = "clk_apb5";
};

smb: smb@f0080000 {
compatible = "nuvoton,npcm750-smb";
reg = <0xf0080000 0x10000>;
interrupts = <0 64 4>, <0 65 4>, <0 66 4>, <0 67 4>,
<0 68 4>, <0 69 4>, <0 70 4>, <0 71 4>,
<0 72 4>, <0 73 4>, <0 74 4>, <0 75 4>,
<0 76 4>, <0 77 4>, <0 78 4>, <0 79 4>;
clocks = <&clk NPCMX50_CLK_APB2>;
clock-names = "clk_apb2";
};

mft: mft@0 {
compatible = "nuvoton,npcm750-mft";
reg = <0xf0180000 0x8000>;
Expand Down Expand Up @@ -585,6 +574,182 @@
clocks = <&clk NPCMX50_CLK_APB3>;
clock-names = "clk_apb3";
};

i2c0: i2c-bus@f0080000 {
reg = <0xf0080000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 64 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb0_pins>;
status = "disabled";
};

i2c1: i2c-bus@f0081000 {
reg = <0xf0081000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 65 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb1_pins>;
status = "disabled";
};

i2c2: i2c-bus@f0082000 {
reg = <0xf0082000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 66 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb2_pins>;
status = "disabled";
};

i2c3: i2c-bus@f0083000 {
reg = <0xf0083000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 67 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb3_pins>;
status = "disabled";
};

i2c4: i2c-bus@f0084000 {
reg = <0xf0084000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 68 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb4_pins>;
status = "disabled";
};

i2c5: i2c-bus@f0085000 {
reg = <0xf0085000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 69 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb5_pins>;
status = "disabled";
};

i2c6: i2c-bus@f0086000 {
reg = <0xf0086000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 70 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb6_pins>;
status = "disabled";
};

i2c7: i2c-bus@f0087000 {
reg = <0xf0087000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 71 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb7_pins>;
status = "disabled";
};

i2c8: i2c-bus@f0088000 {
reg = <0xf0088000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 72 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb8_pins>;
status = "disabled";
};

i2c9: i2c-bus@f0089000 {
reg = <0xf0089000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 73 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb9_pins>;
status = "disabled";
};

i2c10: i2c-bus@f008a000 {
reg = <0xf008a000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 74 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb10_pins>;
status = "disabled";
};

i2c11: i2c-bus@f008b000 {
reg = <0xf008b000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 75 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb11_pins>;
status = "disabled";
};

i2c12: i2c-bus@f008c000 {
reg = <0xf008c000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 76 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb12_pins>;
status = "disabled";
};

i2c13: i2c-bus@f008d000 {
reg = <0xf008d000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 77 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb13_pins>;
status = "disabled";
};

i2c14: i2c-bus@f008e000 {
reg = <0xf008e000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 78 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb14_pins>;
status = "disabled";
};

i2c15: i2c-bus@f008f000 {
reg = <0xf008f000 0x1000>;
compatible = "nuvoton,npcm750-i2c-bus";
clocks = <&clk NPCMX50_CLK_APB2>;
bus-frequency = <100000>;
interrupts = <0 79 4>;
pinctrl-names = "default";
pinctrl-0 = <&smb15_pins>;
status = "disabled";
};
};

pinctrl: pinctrl@0 {
Expand Down
Loading

0 comments on commit 1bd32f9

Please sign in to comment.